Closedown

This commit is contained in:
x03daop
2016-04-05 15:42:08 +02:00
parent b988fe084a
commit 11daf206aa
9 changed files with 84 additions and 100 deletions
+10 -12
View File
@@ -212,10 +212,10 @@ public class PhotonEnergy extends Panel {
checkCounts4 = new javax.swing.JCheckBox();
checkCurrent = new javax.swing.JCheckBox();
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();
panelPositioner.setBorder(javax.swing.BorderFactory.createTitledBorder("Acquisition"));
@@ -474,6 +474,8 @@ public class PhotonEnergy 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(
@@ -494,7 +496,8 @@ public class PhotonEnergy extends Panel {
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3)
.addComponent(checkAngleDistribution))
.addComponent(checkAngleDistribution)
.addComponent(checkEndScan))
.addContainerGap())
);
panelSensorsLayout.setVerticalGroup(
@@ -526,7 +529,9 @@ public class PhotonEnergy extends Panel {
.addComponent(checkCur2)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkCur3)
.addGap(18, 18, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(checkEndScan)
.addGap(18, 18, 18)
.addComponent(buttonScientaSetup)
.addGap(26, 26, 26))
);
@@ -547,8 +552,6 @@ public class PhotonEnergy extends Panel {
}
});
checkEndScan.setText("Turn off beam at end");
javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
jPanel3.setLayout(jPanel3Layout);
jPanel3Layout.setHorizontalGroup(
@@ -557,10 +560,7 @@ public class PhotonEnergy 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, 241, Short.MAX_VALUE)
.addGroup(jPanel3Layout.createSequentialGroup()
.addComponent(checkEndScan)
.addGap(0, 0, Short.MAX_VALUE)))
.addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, 241, Short.MAX_VALUE))
.addContainerGap())
);
jPanel3Layout.setVerticalGroup(
@@ -570,9 +570,7 @@ public class PhotonEnergy extends Panel {
.addComponent(buttonStart)
.addGap(18, 18, 18)
.addComponent(buttonAbort)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(checkEndScan)
.addContainerGap())
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);