diff --git a/config/devices.properties b/config/devices.properties
index 35f4daf..5cdb2f7 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -4,6 +4,6 @@ sample_y=ch.psi.pshell.epics.Motor|X09LB-ES2-SMP:TRY|||true
sample_z=ch.psi.pshell.epics.Motor|X09LB-ES2-SMP:TRZ|||true
dummy_x=ch.psi.pshell.device.DummyMotor||||true
dummy_y=ch.psi.pshell.device.DummyMotor||||true
-sample_r=ch.psi.pshell.epics.Motor|X09LB-ES3-SAMPLE:ROT1|||true
+#sample_r=ch.psi.pshell.epics.Motor|X09LB-ES3-SAMPLE:ROT1|||true
ccd=ch.psi.pshell.epics.AreaDetector|X09LB-ES2-CCD|||true
image=ch.psi.pshell.imaging.CameraSource|ccd|||true
diff --git a/config/variables.properties b/config/variables.properties
index 1af3891..721422a 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,4 +1,4 @@
-#Mon Oct 03 10:56:11 CEST 2022
+#Mon Oct 03 11:43:30 CEST 2022
LastRunDate=221003
-DaySequentialNumber=14
-FileSequentialNumber=14
+DaySequentialNumber=26
+FileSequentialNumber=26
diff --git a/plugins/Scan1D.form b/plugins/Scan1D.form
index 6afa086..642ed55 100644
--- a/plugins/Scan1D.form
+++ b/plugins/Scan1D.form
@@ -6,58 +6,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -80,7 +28,9 @@
-
+
+
+
@@ -94,6 +44,7 @@
+
@@ -381,6 +332,58 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/Scan1D.java b/plugins/Scan1D.java
index a9128df..9664c7c 100644
--- a/plugins/Scan1D.java
+++ b/plugins/Scan1D.java
@@ -116,9 +116,6 @@ public class Scan1D extends ScriptProcessor {
buttonGroup1 = new javax.swing.ButtonGroup();
buttonGroup2 = new javax.swing.ButtonGroup();
- panelSensors = new javax.swing.JPanel();
- checkImage = new javax.swing.JCheckBox();
- checkCurrent = new javax.swing.JCheckBox();
panelPositioner = new javax.swing.JPanel();
jLabel1 = new javax.swing.JLabel();
comboMotor = new javax.swing.JComboBox();
@@ -140,43 +137,14 @@ public class Scan1D extends ScriptProcessor {
jLabel6 = new javax.swing.JLabel();
jLabel7 = new javax.swing.JLabel();
jLabel8 = new javax.swing.JLabel();
+ panelSensors = new javax.swing.JPanel();
+ checkImage = new javax.swing.JCheckBox();
+ checkCurrent = new javax.swing.JCheckBox();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
buttonQueue = new javax.swing.JButton();
- panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
-
- checkImage.setSelected(true);
- checkImage.setText("CCD Image");
- checkImage.setToolTipText("");
- checkImage.setContentAreaFilled(false);
- checkImage.setName("ccd.dataMatrix"); // NOI18N
-
- checkCurrent.setText("Machine Current");
- checkCurrent.setName("current"); // NOI18N
-
- javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
- panelSensors.setLayout(panelSensorsLayout);
- panelSensorsLayout.setHorizontalGroup(
- panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(panelSensorsLayout.createSequentialGroup()
- .addContainerGap()
- .addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addComponent(checkImage)
- .addComponent(checkCurrent))
- .addContainerGap(108, Short.MAX_VALUE))
- );
- panelSensorsLayout.setVerticalGroup(
- panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
- .addGroup(panelSensorsLayout.createSequentialGroup()
- .addContainerGap()
- .addComponent(checkImage)
- .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
- .addComponent(checkCurrent)
- .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- );
-
setPreferredSize(new java.awt.Dimension(792, 567));
panelPositioner.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioner"));
@@ -350,6 +318,38 @@ public class Scan1D extends ScriptProcessor {
.addContainerGap(159, Short.MAX_VALUE))
);
+ panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
+
+ checkImage.setSelected(true);
+ checkImage.setText("CCD Image");
+ checkImage.setToolTipText("");
+ checkImage.setContentAreaFilled(false);
+ checkImage.setName("ccd.dataMatrix"); // NOI18N
+
+ checkCurrent.setText("Machine Current");
+ checkCurrent.setName("current"); // NOI18N
+
+ javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
+ panelSensors.setLayout(panelSensorsLayout);
+ panelSensorsLayout.setHorizontalGroup(
+ panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelSensorsLayout.createSequentialGroup()
+ .addContainerGap()
+ .addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(checkImage)
+ .addComponent(checkCurrent))
+ .addContainerGap(108, Short.MAX_VALUE))
+ );
+ panelSensorsLayout.setVerticalGroup(
+ panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(panelSensorsLayout.createSequentialGroup()
+ .addContainerGap()
+ .addComponent(checkImage)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(checkCurrent)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ );
+
jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Control"));
buttonStart.setText("Start");
@@ -402,14 +402,16 @@ public class Scan1D extends ScriptProcessor {
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
- .addGap(292, 292, 292)
+ .addContainerGap()
+ .addComponent(panelSensors, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(panelPositioner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(jPanel3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
);
- layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPositioner});
+ layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jPanel3, panelPositioner, panelSensors});
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -417,6 +419,7 @@ public class Scan1D extends ScriptProcessor {
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(panelPositioner, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(panelSensors, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(jPanel3, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);