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

@@ -135,9 +135,10 @@ public class HoloScan extends Panel {
panelSensors = new javax.swing.JPanel();
checkImage = new javax.swing.JCheckBox();
checkImageIntegration = new javax.swing.JCheckBox();
checkAngleDistribution = new javax.swing.JCheckBox();
checkSpectrum = new javax.swing.JCheckBox();
checkCounts1 = 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();
@@ -146,7 +147,6 @@ public class HoloScan extends Panel {
checkCur2 = new javax.swing.JCheckBox();
checkCur3 = new javax.swing.JCheckBox();
buttonScientaSetup = new javax.swing.JButton();
checkAngleDistribution = new javax.swing.JCheckBox();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
@@ -226,7 +226,7 @@ public class HoloScan extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(motorPanelPhi, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelPhiLayout.createSequentialGroup()
.addGap(0, 28, Short.MAX_VALUE)
.addGap(0, 23, Short.MAX_VALUE)
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelPhiLayout.createSequentialGroup()
.addGroup(panelPhiLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -342,16 +342,22 @@ public class HoloScan extends Panel {
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
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("CountsR1"); // NOI18N
checkTotalCount.setSelected(true);
checkTotalCount.setText("Total Counts");
checkTotalCount.setName("Counts"); // NOI18N
checkCounts1.setText("Counts Region 1");
checkCounts1.setName("CountsR1"); // NOI18N
checkCounts2.setText("Counts Region 2");
checkCounts2.setName("CountsR2"); // NOI18N
@@ -380,12 +386,6 @@ public class HoloScan extends Panel {
}
});
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);
panelSensorsLayout.setHorizontalGroup(
@@ -393,7 +393,7 @@ public class HoloScan extends Panel {
.addGroup(panelSensorsLayout.createSequentialGroup()
.addContainerGap()
.addGroup(panelSensorsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, 199, Short.MAX_VALUE)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(checkImage)
.addComponent(checkImageIntegration)
.addComponent(checkSpectrum)
@@ -471,7 +471,7 @@ public class HoloScan extends Panel {
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(checkEndScan)
.addGap(0, 0, Short.MAX_VALUE))
.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))
.addContainerGap())