diff --git a/config/variables.properties b/config/variables.properties index 91ee5d0..b13491c 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,2 +1,2 @@ -#Tue Dec 10 09:46:42 CET 2019 -FileSequentialNumber=219 +#Tue Dec 10 11:03:32 CET 2019 +FileSequentialNumber=227 diff --git a/plugins/ManipulatorScan.form b/plugins/ManipulatorScan.form index 9384d9a..8a402ec 100755 --- a/plugins/ManipulatorScan.form +++ b/plugins/ManipulatorScan.form @@ -513,6 +513,11 @@ + + + + + @@ -523,6 +528,8 @@ + + @@ -544,6 +551,11 @@ + + + + + diff --git a/plugins/ManipulatorScan.java b/plugins/ManipulatorScan.java index 5da9b63..ee918a9 100755 --- a/plugins/ManipulatorScan.java +++ b/plugins/ManipulatorScan.java @@ -172,6 +172,7 @@ public class ManipulatorScan extends Panel { jPanel3 = new javax.swing.JPanel(); buttonStart = new javax.swing.JButton(); buttonAbort = new javax.swing.JButton(); + jButton1 = new javax.swing.JButton(); panelPositioner.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioner")); @@ -264,7 +265,7 @@ public class ManipulatorScan extends Panel { .addComponent(comboMotor, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))) .addGroup(panelPositionerLayout.createSequentialGroup() .addComponent(jLabel3) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 85, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 92, Short.MAX_VALUE) .addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) .addGroup(panelPositionerLayout.createSequentialGroup() .addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -470,6 +471,8 @@ public class ManipulatorScan extends Panel { } }); + jButton1.setText("jButton1"); + javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); jPanel3.setLayout(jPanel3Layout); jPanel3Layout.setHorizontalGroup( @@ -478,8 +481,12 @@ public class ManipulatorScan extends Panel { .addContainerGap() .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 203, Short.MAX_VALUE)) + .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 244, Short.MAX_VALUE)) .addContainerGap()) + .addGroup(jPanel3Layout.createSequentialGroup() + .addGap(21, 21, 21) + .addComponent(jButton1) + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) ); jPanel3Layout.setVerticalGroup( jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) @@ -488,7 +495,9 @@ public class ManipulatorScan extends Panel { .addComponent(buttonStart) .addGap(18, 18, 18) .addComponent(buttonAbort) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(jButton1) + .addGap(143, 143, 143)) ); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); @@ -584,6 +593,7 @@ public class ManipulatorScan extends Panel { private javax.swing.JCheckBox checkSpectrum; private javax.swing.JCheckBox checkTotalCount; private javax.swing.JComboBox comboMotor; + private javax.swing.JButton jButton1; private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel3; private javax.swing.JLabel jLabel4;