Closedown
This commit is contained in:
@@ -115,7 +115,8 @@ public class ManipulatorScan extends Panel {
|
||||
}
|
||||
args.put("LATENCY", (Double) spinnerLatency.getValue());
|
||||
args.put("RELATIVE", radioRelative.isSelected());
|
||||
args.put("ENDSCAN", checkEndScan.isSelected());
|
||||
args.put("ENDSCAN", checkEndScan.isSelected());
|
||||
args.put("FLY_SCAN", checkFlyScan.isSelected());
|
||||
|
||||
runAsync("ManipulatorScan", args);
|
||||
|
||||
@@ -182,6 +183,7 @@ public class ManipulatorScan extends Panel {
|
||||
jLabel6 = new javax.swing.JLabel();
|
||||
jLabel7 = new javax.swing.JLabel();
|
||||
jLabel8 = new javax.swing.JLabel();
|
||||
checkFlyScan = new javax.swing.JCheckBox();
|
||||
panelSensors = new javax.swing.JPanel();
|
||||
checkImage = new javax.swing.JCheckBox();
|
||||
checkImageIntegration = new javax.swing.JCheckBox();
|
||||
@@ -281,6 +283,8 @@ public class ManipulatorScan extends Panel {
|
||||
|
||||
jLabel8.setText("Steps:");
|
||||
|
||||
checkFlyScan.setText("Fly Scan");
|
||||
|
||||
javax.swing.GroupLayout panelPositionerLayout = new javax.swing.GroupLayout(panelPositioner);
|
||||
panelPositioner.setLayout(panelPositionerLayout);
|
||||
panelPositionerLayout.setHorizontalGroup(
|
||||
@@ -301,12 +305,6 @@ public class ManipulatorScan extends Panel {
|
||||
.addComponent(jLabel3)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, 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)
|
||||
.addComponent(radioStepSize)
|
||||
.addComponent(radioAbsolute)
|
||||
.addComponent(radioRelative))
|
||||
.addGap(0, 0, Short.MAX_VALUE))
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelPositionerLayout.createSequentialGroup()
|
||||
.addGap(0, 0, Short.MAX_VALUE)
|
||||
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
@@ -327,7 +325,14 @@ public class ManipulatorScan extends Panel {
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelPositionerLayout.createSequentialGroup()
|
||||
.addComponent(txtSize)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(spinnerStepSize, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))))
|
||||
.addComponent(spinnerStepSize, 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)
|
||||
.addComponent(radioStepSize)
|
||||
.addComponent(radioAbsolute)
|
||||
.addComponent(radioRelative)
|
||||
.addComponent(checkFlyScan))
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
);
|
||||
|
||||
@@ -376,7 +381,9 @@ public class ManipulatorScan extends Panel {
|
||||
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel3)
|
||||
.addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(checkFlyScan)
|
||||
.addGap(26, 26, 26))
|
||||
);
|
||||
|
||||
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
|
||||
@@ -538,12 +545,11 @@ public class ManipulatorScan extends Panel {
|
||||
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(textTotalTime, javax.swing.GroupLayout.Alignment.TRAILING)
|
||||
.addComponent(dvpAcqTime, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 76, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGap(1, 1, 1)))
|
||||
.addGap(1, 1, 1))
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
|
||||
.addComponent(checkEndScan)
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel3Layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(checkEndScan)
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
jPanel3Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {dvpAcqTime, textTotalTime});
|
||||
@@ -670,6 +676,7 @@ public class ManipulatorScan extends Panel {
|
||||
private javax.swing.JCheckBox checkCur3;
|
||||
private javax.swing.JCheckBox checkCurrent;
|
||||
private javax.swing.JCheckBox checkEndScan;
|
||||
private javax.swing.JCheckBox checkFlyScan;
|
||||
private javax.swing.JCheckBox checkImage;
|
||||
private javax.swing.JCheckBox checkImageIntegration;
|
||||
private javax.swing.JCheckBox checkSpectrum;
|
||||
|
||||
Reference in New Issue
Block a user