This commit is contained in:
x03daop
2016-04-22 11:03:10 +02:00
parent e0d86c435b
commit 68136adc8a
7 changed files with 87 additions and 68 deletions

View File

@@ -58,6 +58,7 @@ public class HoloScan extends Panel {
c.setEnabled(enableControls);
}
buttonStart.setEnabled(enableControls);
checkEndScan.setEnabled(enableControls);
spinnerStepSizePhi.setEnabled(enableControls && radioStepSize.isSelected());
spinnerStepsPhi.setEnabled(enableControls && radioSteps.isSelected());
@@ -146,10 +147,10 @@ public class HoloScan extends Panel {
checkCur3 = new javax.swing.JCheckBox();
buttonScientaSetup = new javax.swing.JButton();
checkAngleDistribution = new javax.swing.JCheckBox();
checkEndScan = new javax.swing.JCheckBox();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
checkEndScan = new javax.swing.JCheckBox();
panelPhi.setBorder(javax.swing.BorderFactory.createTitledBorder("Positioners"));
panelPhi.setPreferredSize(new java.awt.Dimension(239, 538));
@@ -225,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, 23, Short.MAX_VALUE)
.addGap(0, 28, 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)
@@ -385,8 +386,6 @@ public class HoloScan extends Panel {
checkAngleDistribution.setContentAreaFilled(false);
checkAngleDistribution.setName("AngleDistribution"); // NOI18N
checkEndScan.setText("Turn off beam at end");
javax.swing.GroupLayout panelSensorsLayout = new javax.swing.GroupLayout(panelSensors);
panelSensors.setLayout(panelSensorsLayout);
panelSensorsLayout.setHorizontalGroup(
@@ -394,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, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(buttonScientaSetup, javax.swing.GroupLayout.DEFAULT_SIZE, 199, Short.MAX_VALUE)
.addComponent(checkImage)
.addComponent(checkImageIntegration)
.addComponent(checkSpectrum)
@@ -407,8 +406,7 @@ public class HoloScan extends Panel {
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3)
.addComponent(checkAngleDistribution)
.addComponent(checkEndScan))
.addComponent(checkAngleDistribution))
.addContainerGap())
);
panelSensorsLayout.setVerticalGroup(
@@ -440,9 +438,7 @@ public class HoloScan extends Panel {
.addComponent(checkCur2)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkCur3)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 57, Short.MAX_VALUE)
.addComponent(checkEndScan)
.addGap(18, 18, 18)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 163, Short.MAX_VALUE)
.addComponent(buttonScientaSetup)
.addGap(26, 26, 26))
);
@@ -464,6 +460,8 @@ public class HoloScan extends Panel {
}
});
checkEndScan.setText("Turn off beam at end");
javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
jPanel3.setLayout(jPanel3Layout);
jPanel3Layout.setHorizontalGroup(
@@ -471,8 +469,11 @@ public class HoloScan extends Panel {
.addGroup(jPanel3Layout.createSequentialGroup()
.addContainerGap()
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(checkEndScan)
.addGap(0, 0, 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, 203, Short.MAX_VALUE))
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 205, Short.MAX_VALUE))
.addContainerGap())
);
jPanel3Layout.setVerticalGroup(
@@ -482,7 +483,9 @@ public class HoloScan extends Panel {
.addComponent(buttonStart)
.addGap(18, 18, 18)
.addComponent(buttonAbort)
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(checkEndScan)
.addGap(26, 26, 26))
);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);