This commit is contained in:
x03daop
2015-11-03 11:42:06 +01:00
parent 53e1d97d63
commit 7ab2717b48
2 changed files with 40 additions and 40 deletions

View File

@@ -152,19 +152,19 @@ public class ManipulatorScan extends Panel {
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();
checkSpectrum = new javax.swing.JCheckBox();
checkCounts1 = new javax.swing.JCheckBox();
checkTotalCount = new javax.swing.JCheckBox();
checkCounts2 = new javax.swing.JCheckBox();
checkCounts3 = new javax.swing.JCheckBox();
checkCounts4 = new javax.swing.JCheckBox();
checkCurrent = new javax.swing.JCheckBox();
checkImageIntegration1 = new javax.swing.JCheckBox();
checkImageIntegration = new javax.swing.JCheckBox();
checkAngleDistribution = new javax.swing.JCheckBox();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
@@ -349,6 +349,10 @@ public class ManipulatorScan extends Panel {
}
});
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("Counts"); // NOI18N
checkCur1.setText("Sample Current");
checkCur1.setName("SampleCurrent"); // NOI18N
@@ -364,12 +368,6 @@ public class ManipulatorScan extends Panel {
checkCur3.setText("Aux Current");
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
@@ -377,10 +375,6 @@ public class ManipulatorScan extends Panel {
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
@@ -393,11 +387,17 @@ public class ManipulatorScan extends Panel {
checkCurrent.setText("Machine Current");
checkCurrent.setName("MachineCurrent"); // NOI18N
checkImageIntegration1.setSelected(true);
checkImageIntegration1.setText("Scienta Angle Distribution");
checkImageIntegration1.setToolTipText("");
checkImageIntegration1.setContentAreaFilled(false);
checkImageIntegration1.setName("AngleDistribution"); // NOI18N
checkImageIntegration.setSelected(true);
checkImageIntegration.setText("Scienta Image Integration");
checkImageIntegration.setToolTipText("");
checkImageIntegration.setContentAreaFilled(false);
checkImageIntegration.setName("Integration"); // NOI18N
checkAngleDistribution.setSelected(true);
checkAngleDistribution.setText("Scienta Angle Distribution");
checkAngleDistribution.setToolTipText("");
checkAngleDistribution.setContentAreaFilled(false);
checkAngleDistribution.setName("AngleDistribution"); // NOI18N
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
panelSensors.setLayout(panelSensorsLayout);
@@ -421,7 +421,7 @@ public class ManipulatorScan extends Panel {
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3)
.addComponent(checkImageIntegration1))
.addComponent(checkAngleDistribution))
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
@@ -433,7 +433,7 @@ public class ManipulatorScan extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkImageIntegration)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkImageIntegration1)
.addComponent(checkAngleDistribution)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkSpectrum)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
@@ -577,6 +577,7 @@ public class ManipulatorScan extends Panel {
private javax.swing.ButtonGroup buttonGroup2;
private javax.swing.JButton buttonScientaSetup;
private javax.swing.JButton buttonStart;
private javax.swing.JCheckBox checkAngleDistribution;
private javax.swing.JCheckBox checkCounts1;
private javax.swing.JCheckBox checkCounts2;
private javax.swing.JCheckBox checkCounts3;
@@ -587,7 +588,6 @@ public class ManipulatorScan extends Panel {
private javax.swing.JCheckBox checkCurrent;
private javax.swing.JCheckBox checkImage;
private javax.swing.JCheckBox checkImageIntegration;
private javax.swing.JCheckBox checkImageIntegration1;
private javax.swing.JCheckBox checkSpectrum;
private javax.swing.JCheckBox checkTotalCount;
private javax.swing.JComboBox comboMotor;