diff --git a/plugins/HoloScan.form b/plugins/HoloScan.form index b7c0c70d..0cc66bd3 100644 --- a/plugins/HoloScan.form +++ b/plugins/HoloScan.form @@ -189,7 +189,7 @@ - + @@ -526,15 +526,21 @@ - + + + - + + + + + + + - - @@ -548,6 +554,11 @@ + + + + + @@ -576,6 +587,13 @@ + + + + + + + diff --git a/plugins/HoloScan.java b/plugins/HoloScan.java index 3e82d3de..96580c8d 100644 --- a/plugins/HoloScan.java +++ b/plugins/HoloScan.java @@ -36,8 +36,10 @@ public class HoloScan extends Panel { public void onInitialize(int runCount) { Motor phi = (Motor) getDevice("ManipulatorPhi"); Motor theta = (Motor) getDevice("ManipulatorTheta"); + Scienta scienta = (Scienta) getDevice("Scienta"); motorPanelPhi.setDevice(phi); motorPanelTheta.setDevice(theta); + dvpAcqTime.setDevice(scienta.getAcquisitionTime()); try{ spinnerFromPhi.setModel(new SpinnerNumberModel(Math.max(phi.getMinValue(),(Double)spinnerFromPhi.getValue()), phi.getMinValue(), phi.getMaxValue(), 1.0)); spinnerToPhi.setModel(new SpinnerNumberModel(Math.min(phi.getMaxValue(),(Double)spinnerToPhi.getValue()), phi.getMinValue(), phi.getMaxValue(), 1.0)); @@ -170,6 +172,8 @@ public class HoloScan extends Panel { buttonStart = new javax.swing.JButton(); buttonAbort = new javax.swing.JButton(); checkEndScan = new javax.swing.JCheckBox(); + jLabel1 = new javax.swing.JLabel(); + dvpAcqTime = new ch.psi.pshell.swing.DeviceValuePanel(); panelPositioners.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioners")); panelPositioners.setPreferredSize(new java.awt.Dimension(239, 538)); @@ -343,7 +347,7 @@ public class HoloScan extends Panel { .addComponent(jLabel14)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(checkZigzag) - .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addContainerGap(103, Short.MAX_VALUE)) ); panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors")); @@ -481,6 +485,8 @@ public class HoloScan extends Panel { checkEndScan.setText("Turn off beam at end"); + jLabel1.setText("Acquisition time(s):"); + javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3); jPanel3.setLayout(jPanel3Layout); jPanel3Layout.setHorizontalGroup( @@ -488,11 +494,16 @@ public class HoloScan extends Panel { .addGroup(jPanel3Layout.createSequentialGroup() .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, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addGroup(jPanel3Layout.createSequentialGroup() .addComponent(checkEndScan) - .addGap(0, 45, Short.MAX_VALUE)) - .addComponent(buttonStart, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 205, Short.MAX_VALUE)) + .addGap(0, 0, Short.MAX_VALUE)) + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup() + .addGap(0, 0, Short.MAX_VALUE) + .addComponent(jLabel1) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addComponent(dvpAcqTime, javax.swing.GroupLayout.PREFERRED_SIZE, 76, javax.swing.GroupLayout.PREFERRED_SIZE))) .addContainerGap()) ); jPanel3Layout.setVerticalGroup( @@ -503,6 +514,10 @@ public class HoloScan extends Panel { .addGap(18, 18, 18) .addComponent(buttonAbort) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addComponent(jLabel1, javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(dvpAcqTime, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) + .addGap(159, 159, 159) .addComponent(checkEndScan) .addGap(26, 26, 26)) ); @@ -585,6 +600,8 @@ public class HoloScan extends Panel { private javax.swing.JCheckBox checkSpectrum; private javax.swing.JCheckBox checkTotalCount; private javax.swing.JCheckBox checkZigzag; + private ch.psi.pshell.swing.DeviceValuePanel dvpAcqTime; + private javax.swing.JLabel jLabel1; private javax.swing.JLabel jLabel11; private javax.swing.JLabel jLabel12; private javax.swing.JLabel jLabel13;