Closedown

This commit is contained in:
x03daop
2016-04-26 16:46:51 +02:00
parent 2fa00aad22
commit 89283bcd32
7 changed files with 185 additions and 182 deletions

View File

@@ -153,20 +153,20 @@ 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();
checkTotalCount = new javax.swing.JCheckBox();
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();
checkAngleDistribution = new javax.swing.JCheckBox();
checkSpectrum = new javax.swing.JCheckBox();
checkTotalCount = new javax.swing.JCheckBox();
checkCounts1 = new javax.swing.JCheckBox();
checkCounts2 = new javax.swing.JCheckBox();
checkCounts3 = new javax.swing.JCheckBox();
checkCounts4 = new javax.swing.JCheckBox();
checkCurrent = new javax.swing.JCheckBox();
checkImageIntegration = new javax.swing.JCheckBox();
checkAngleDistribution = 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();
@@ -260,7 +260,7 @@ public class ManipulatorScan extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(motorPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(comboMotor, 0, 146, Short.MAX_VALUE)))
.addComponent(comboMotor, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
.addGroup(panelPositionerLayout.createSequentialGroup()
.addComponent(jLabel3)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -345,34 +345,30 @@ public class ManipulatorScan extends Panel {
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
buttonScientaSetup.setText("Scienta Setup");
buttonScientaSetup.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonScientaSetupActionPerformed(evt);
}
});
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("Counts"); // NOI18N
checkCur1.setText("Sample Current");
checkCur1.setName("SampleCurrent"); // NOI18N
checkCur2.setText("Ref Current");
checkCur2.setName("RefCurrent"); // NOI18N
checkImage.setText("Scienta Image");
checkImage.setToolTipText("");
checkImage.setContentAreaFilled(false);
checkImage.setName("Scienta.dataMatrix"); // NOI18N
checkCur3.setText("Aux Current");
checkCur3.setName("AuxCurrent"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Energy Distribution");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("EnergyDistribution"); // NOI18N
checkAngleDistribution.setSelected(true);
checkAngleDistribution.setText("Scienta Angle Distribution");
checkAngleDistribution.setToolTipText("");
checkAngleDistribution.setContentAreaFilled(false);
checkAngleDistribution.setName("AngleDistribution"); // NOI18N
checkSpectrum.setText("Scienta Spectrum");
checkSpectrum.setName("Scienta.spectrum"); // NOI18N
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("Counts"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("CountsR1"); // NOI18N
@@ -388,17 +384,21 @@ public class ManipulatorScan extends Panel {
checkCurrent.setText("Machine Current");
checkCurrent.setName("MachineCurrent"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Energy Distribution");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("EnergyDistribution"); // NOI18N
checkCur1.setText("Sample Current");
checkCur1.setName("SampleCurrent"); // NOI18N
checkAngleDistribution.setSelected(true);
checkAngleDistribution.setText("Scienta Angle Distribution");
checkAngleDistribution.setToolTipText("");
checkAngleDistribution.setContentAreaFilled(false);
checkAngleDistribution.setName("AngleDistribution"); // NOI18N
checkCur2.setText("Ref Current");
checkCur2.setName("RefCurrent"); // NOI18N
checkCur3.setText("Aux Current");
checkCur3.setName("AuxCurrent"); // NOI18N
buttonScientaSetup.setText("Scienta Setup");
buttonScientaSetup.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonScientaSetupActionPerformed(evt);
}
});
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
panelSensors.setLayout(panelSensorsLayout);