Closedown
This commit is contained in:
x03daop
@@ -150,7 +150,11 @@ public class ManipulatorScan extends Panel {
|
||||
jLabel7 = new javax.swing.JLabel();
|
||||
jLabel8 = new javax.swing.JLabel();
|
||||
panelSensors = new javax.swing.JPanel();
|
||||
buttonScientaSetup = new javax.swing.JButton();
|
||||
checkCur1 = new javax.swing.JCheckBox();
|
||||
checkCur2 = new javax.swing.JCheckBox();
|
||||
checkImage = new javax.swing.JCheckBox();
|
||||
checkCur3 = new javax.swing.JCheckBox();
|
||||
checkImageIntegration = new javax.swing.JCheckBox();
|
||||
checkSpectrum = new javax.swing.JCheckBox();
|
||||
checkCounts1 = new javax.swing.JCheckBox();
|
||||
@@ -159,10 +163,6 @@ public class ManipulatorScan extends Panel {
|
||||
checkCounts3 = new javax.swing.JCheckBox();
|
||||
checkCounts4 = new javax.swing.JCheckBox();
|
||||
checkCurrent = new javax.swing.JCheckBox();
|
||||
checkCur1 = new javax.swing.JCheckBox();
|
||||
checkCur2 = new javax.swing.JCheckBox();
|
||||
checkCur3 = new javax.swing.JCheckBox();
|
||||
buttonScientaSetup = new javax.swing.JButton();
|
||||
jPanel3 = new javax.swing.JPanel();
|
||||
buttonStart = new javax.swing.JButton();
|
||||
buttonAbort = new javax.swing.JButton();
|
||||
@@ -171,7 +171,7 @@ public class ManipulatorScan extends Panel {
|
||||
|
||||
jLabel1.setText("Motor:");
|
||||
|
||||
comboMotor.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "dummy", "x", "y", "z", "theta", "tilt", "phi" }));
|
||||
comboMotor.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "dummy", "ManipulatorX", "ManipulatorY", "ManipulatorZ", "ManipulatorTheta", "ManipulatorTilt", "ManipulatorPhi" }));
|
||||
comboMotor.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
comboMotorActionPerformed(evt);
|
||||
@@ -258,7 +258,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, 41, Short.MAX_VALUE)
|
||||
.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)
|
||||
@@ -340,50 +340,6 @@ public class ManipulatorScan extends Panel {
|
||||
|
||||
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
|
||||
|
||||
checkImage.setSelected(true);
|
||||
checkImage.setText("Scienta Image");
|
||||
checkImage.setToolTipText("");
|
||||
checkImage.setContentAreaFilled(false);
|
||||
checkImage.setName("scienta.dataMatrix"); // NOI18N
|
||||
|
||||
checkImageIntegration.setSelected(true);
|
||||
checkImageIntegration.setText("Scienta Image Integration");
|
||||
checkImageIntegration.setToolTipText("");
|
||||
checkImageIntegration.setContentAreaFilled(false);
|
||||
checkImageIntegration.setName("integration"); // NOI18N
|
||||
|
||||
checkSpectrum.setSelected(true);
|
||||
checkSpectrum.setText("Scienta Spectrum");
|
||||
checkSpectrum.setName("scienta.spectrum"); // NOI18N
|
||||
|
||||
checkCounts1.setText("Counts Region 1");
|
||||
checkCounts1.setName("countsr1"); // NOI18N
|
||||
|
||||
checkTotalCount.setSelected(true);
|
||||
checkTotalCount.setText("Total Counts");
|
||||
checkTotalCount.setName("counts"); // NOI18N
|
||||
|
||||
checkCounts2.setText("Counts Region 2");
|
||||
checkCounts2.setName("countsr2"); // NOI18N
|
||||
|
||||
checkCounts3.setText("Counts Region 3");
|
||||
checkCounts3.setName("countsr3"); // NOI18N
|
||||
|
||||
checkCounts4.setText("Counts Region 4");
|
||||
checkCounts4.setName("countsr4"); // NOI18N
|
||||
|
||||
checkCurrent.setText("Current");
|
||||
checkCurrent.setName("current"); // NOI18N
|
||||
|
||||
checkCur1.setText("Cur 1");
|
||||
checkCur1.setName("cur1"); // NOI18N
|
||||
|
||||
checkCur2.setText("Cur 2");
|
||||
checkCur2.setName("cur2"); // NOI18N
|
||||
|
||||
checkCur3.setText("Cur 3");
|
||||
checkCur3.setName("cur3"); // NOI18N
|
||||
|
||||
buttonScientaSetup.setText("Scienta Setup");
|
||||
buttonScientaSetup.addActionListener(new java.awt.event.ActionListener() {
|
||||
public void actionPerformed(java.awt.event.ActionEvent evt) {
|
||||
@@ -391,6 +347,50 @@ public class ManipulatorScan extends Panel {
|
||||
}
|
||||
});
|
||||
|
||||
checkCur1.setText("SampleCurrent");
|
||||
checkCur1.setName("SampleCurrent"); // NOI18N
|
||||
|
||||
checkCur2.setText("RefCurrent");
|
||||
checkCur2.setName("RefCurrent"); // NOI18N
|
||||
|
||||
checkImage.setSelected(true);
|
||||
checkImage.setText("Scienta Image");
|
||||
checkImage.setToolTipText("");
|
||||
checkImage.setContentAreaFilled(false);
|
||||
checkImage.setName("Scienta.dataMatrix"); // NOI18N
|
||||
|
||||
checkCur3.setText("AuxCurrent");
|
||||
checkCur3.setName("AuxCurrent"); // NOI18N
|
||||
|
||||
checkImageIntegration.setSelected(true);
|
||||
checkImageIntegration.setText("Scienta Image Integration");
|
||||
checkImageIntegration.setToolTipText("");
|
||||
checkImageIntegration.setContentAreaFilled(false);
|
||||
checkImageIntegration.setName("Integration"); // NOI18N
|
||||
|
||||
checkSpectrum.setSelected(true);
|
||||
checkSpectrum.setText("Scienta Spectrum");
|
||||
checkSpectrum.setName("Scienta.spectrum"); // NOI18N
|
||||
|
||||
checkCounts1.setText("Counts Region 1");
|
||||
checkCounts1.setName("CountsR1"); // NOI18N
|
||||
|
||||
checkTotalCount.setSelected(true);
|
||||
checkTotalCount.setText("Total Counts");
|
||||
checkTotalCount.setName("Counts"); // NOI18N
|
||||
|
||||
checkCounts2.setText("Counts Region 2");
|
||||
checkCounts2.setName("CountsR2"); // NOI18N
|
||||
|
||||
checkCounts3.setText("Counts Region 3");
|
||||
checkCounts3.setName("CountsR3"); // NOI18N
|
||||
|
||||
checkCounts4.setText("Counts Region 4");
|
||||
checkCounts4.setName("CountsR4"); // NOI18N
|
||||
|
||||
checkCurrent.setText("MachineCurrent");
|
||||
checkCurrent.setName("MachineCurrent"); // NOI18N
|
||||
|
||||
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
|
||||
panelSensors.setLayout(panelSensorsLayout);
|
||||
panelSensorsLayout.setHorizontalGroup(
|
||||
@@ -398,7 +398,7 @@ public class ManipulatorScan extends Panel {
|
||||
.addGroup(panelSensorsLayout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, 212, Short.MAX_VALUE)
|
||||
.addGroup(panelSensorsLayout.createSequentialGroup()
|
||||
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(checkImage)
|
||||
@@ -408,12 +408,12 @@ public class ManipulatorScan extends Panel {
|
||||
.addComponent(checkTotalCount)
|
||||
.addComponent(checkCounts2)
|
||||
.addComponent(checkCounts3)
|
||||
.addComponent(checkCounts4)
|
||||
.addComponent(checkCurrent)
|
||||
.addComponent(checkCur1)
|
||||
.addComponent(checkCur2)
|
||||
.addComponent(checkCur3)
|
||||
.addComponent(checkCounts4))
|
||||
.addGap(0, 14, Short.MAX_VALUE)))
|
||||
.addComponent(checkCur3))
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
);
|
||||
panelSensorsLayout.setVerticalGroup(
|
||||
@@ -445,7 +445,7 @@ public class ManipulatorScan extends Panel {
|
||||
.addComponent(checkCur3)
|
||||
.addGap(18, 18, Short.MAX_VALUE)
|
||||
.addComponent(buttonScientaSetup)
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addGap(26, 26, 26))
|
||||
);
|
||||
|
||||
jPanel3.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Control"));
|
||||
@@ -472,7 +472,7 @@ 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, 212, Short.MAX_VALUE))
|
||||
.addContainerGap())
|
||||
);
|
||||
jPanel3Layout.setVerticalGroup(
|
||||
@@ -515,7 +515,7 @@ public class ManipulatorScan extends Panel {
|
||||
|
||||
private void buttonScientaSetupActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonScientaSetupActionPerformed
|
||||
try {
|
||||
showDevicePanel("scienta");
|
||||
showDevicePanel("Scienta");
|
||||
} catch (Exception ex) {
|
||||
SwingUtils.showException(this, ex);
|
||||
}
|
||||
@@ -532,7 +532,7 @@ public class ManipulatorScan extends Panel {
|
||||
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
|
||||
try {
|
||||
abort();
|
||||
((Scienta) getDevice("scienta")).stop();
|
||||
((Scienta) getDevice("Scienta")).stop();
|
||||
} catch (Exception ex) {
|
||||
showException(ex);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user