From 3c4df207ff6319e2e9dc15ae7bb5679f41ad0da7 Mon Sep 17 00:00:00 2001 From: sfop Date: Fri, 26 Aug 2016 11:05:13 +0200 Subject: [PATCH] Startup --- config/devices.properties | 4 +-- config/plugins.properties | 1 + devices/cam1.properties | 13 ++++++++- devices/cam2.properties | 13 ++++++++- devices/image.properties | 13 ++++++++- plugins/Cameras.form | 28 ++++++++++++++++++++ plugins/Cameras.java | 56 +++++++++++++++++++++++++++++++++++++++ 7 files changed, 123 insertions(+), 5 deletions(-) create mode 100644 plugins/Cameras.form create mode 100644 plugins/Cameras.java diff --git a/config/devices.properties b/config/devices.properties index f1a393b..1e8bca5 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -16,5 +16,5 @@ $gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RS image=ch.psi.pshell.imaging.FileSource|/afs/psi.ch/intranet/SF/Applications/config/pshell_op/context/beam.jpg||| cam=ch.psi.pshell.epics.ArraySource|SINEG01-DSCR350:FPICTURE Int16 5529600||-200| #matrix=ch.psi.pshell.epics.GenericMatrix|SINEG01-DSCR350:FPICTURE 2560 2160||| -#cam1=ch.psi.pshell.epics.PsiCamera|SINEG01-DSCR350||-200|false -#cam2=ch.psi.pshell.epics.PsiCamera|SINBD01-DSCR010||-200| +cam1=ch.psi.pshell.epics.PsiCamera|SINEG01-DSCR350||-200|false +cam2=ch.psi.pshell.epics.PsiCamera|SINBD01-DSCR010||-200| diff --git a/config/plugins.properties b/config/plugins.properties index 976f381..417bb79 100644 --- a/config/plugins.properties +++ b/config/plugins.properties @@ -1,3 +1,4 @@ +Cameras.java=enabled LaserGunAlignment.java=disabled test2.java=disabled GunSolenoidAlignment.java=enabled diff --git a/devices/cam1.properties b/devices/cam1.properties index 1075b0a..4a0d48f 100644 --- a/devices/cam1.properties +++ b/devices/cam1.properties @@ -1,4 +1,4 @@ -#Wed Aug 24 12:59:56 CEST 2016 +#Fri Aug 26 10:58:13 CEST 2016 colormap=Grayscale colormapAutomatic=true colormapMax=30000.0 @@ -13,7 +13,18 @@ offsetX=0.0 offsetY=0.0 rescaleFactor=1.0 rescaleOffset=0.0 +roiHeight=-1 +roiWidth=-1 +roiX=0 +roiY=0 rotation=0.0 +rotationCrop=false scale=1.0 scaleX=1.0 scaleY=1.0 +spatialCalOffsetX=NaN +spatialCalOffsetY=NaN +spatialCalScaleX=NaN +spatialCalScaleY=NaN +spatialCalUnits=mm +transpose=false diff --git a/devices/cam2.properties b/devices/cam2.properties index 72cf5e4..8bfd765 100644 --- a/devices/cam2.properties +++ b/devices/cam2.properties @@ -1,4 +1,4 @@ -#Wed Aug 24 13:15:45 CEST 2016 +#Fri Aug 26 10:58:28 CEST 2016 colormap=Grayscale colormapAutomatic=true colormapMax=255.0 @@ -13,7 +13,18 @@ offsetX=0.0 offsetY=0.0 rescaleFactor=1.0 rescaleOffset=0.0 +roiHeight=-1 +roiWidth=-1 +roiX=0 +roiY=0 rotation=0.0 +rotationCrop=false scale=1.0 scaleX=1.0 scaleY=1.0 +spatialCalOffsetX=NaN +spatialCalOffsetY=NaN +spatialCalScaleX=NaN +spatialCalScaleY=NaN +spatialCalUnits=mm +transpose=false diff --git a/devices/image.properties b/devices/image.properties index 015048a..724868d 100644 --- a/devices/image.properties +++ b/devices/image.properties @@ -1,9 +1,20 @@ -#Thu Aug 18 13:52:59 CEST 2016 +#Fri Aug 26 10:47:14 CEST 2016 flipHorizontally=false flipVertically=false grayscale=false invert=false rescaleFactor=1.0 rescaleOffset=0.0 +roiHeight=-1 +roiWidth=-1 +roiX=0 +roiY=0 rotation=0.0 +rotationCrop=false scale=1.0 +spatialCalOffsetX=NaN +spatialCalOffsetY=NaN +spatialCalScaleX=NaN +spatialCalScaleY=NaN +spatialCalUnits=mm +transpose=false diff --git a/plugins/Cameras.form b/plugins/Cameras.form new file mode 100644 index 0000000..ff9cfab --- /dev/null +++ b/plugins/Cameras.form @@ -0,0 +1,28 @@ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/plugins/Cameras.java b/plugins/Cameras.java new file mode 100644 index 0000000..5ce8d1a --- /dev/null +++ b/plugins/Cameras.java @@ -0,0 +1,56 @@ +/* + * Copyright (c) 2014 Paul Scherrer Institute. All rights reserved. + */ + +import ch.psi.pshell.ui.Panel; +import ch.psi.utils.State; + +/** + * + */ +public class Cameras extends Panel { + + public Cameras() { + initComponents(); + } + + //Overridable callbacks + @Override + public void onInitialize(int runCount) { + + } + + @Override + public void onStateChange(State state, State former) { + + } + + @Override + public void onExecutedFile(String fileName, Object result) { + } + + + //Callback to perform update - in event thread + @Override + protected void doUpdate() { + } + + @SuppressWarnings("unchecked") + // //GEN-BEGIN:initComponents + private void initComponents() { + + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); + this.setLayout(layout); + layout.setHorizontalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 449, Short.MAX_VALUE) + ); + layout.setVerticalGroup( + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGap(0, 137, Short.MAX_VALUE) + ); + }// //GEN-END:initComponents + + // Variables declaration - do not modify//GEN-BEGIN:variables + // End of variables declaration//GEN-END:variables +}