Startup
This commit is contained in:
@@ -72,7 +72,7 @@
|
||||
<Component id="motorPanelPhi" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" alignment="1" attributes="0">
|
||||
<EmptySpace min="0" pref="23" max="32767" attributes="0"/>
|
||||
<EmptySpace min="0" pref="28" max="32767" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" alignment="1" attributes="0">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
@@ -357,7 +357,7 @@
|
||||
<Group type="102" attributes="0">
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Component id="buttonScientaSetup" max="32767" attributes="0"/>
|
||||
<Component id="buttonScientaSetup" pref="199" max="32767" attributes="0"/>
|
||||
<Component id="checkImage" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkImageIntegration" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkSpectrum" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
@@ -371,7 +371,6 @@
|
||||
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkEndScan" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
</Group>
|
||||
@@ -406,9 +405,7 @@
|
||||
<Component id="checkCur2" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="checkCur3" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace pref="57" max="32767" attributes="0"/>
|
||||
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<EmptySpace pref="163" max="32767" attributes="0"/>
|
||||
<Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
@@ -512,11 +509,6 @@
|
||||
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JCheckBox" name="checkEndScan">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="Turn off beam at end"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Container>
|
||||
<Container class="javax.swing.JPanel" name="jPanel3">
|
||||
@@ -534,11 +526,15 @@
|
||||
<Layout>
|
||||
<DimensionLayout dim="0">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" attributes="0">
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" attributes="0">
|
||||
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
<Component id="buttonStart" max="32767" attributes="0"/>
|
||||
<Component id="buttonAbort" pref="203" max="32767" attributes="0"/>
|
||||
<Component id="buttonAbort" pref="205" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
</Group>
|
||||
@@ -552,6 +548,8 @@
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@@ -573,6 +571,11 @@
|
||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonAbortActionPerformed"/>
|
||||
</Events>
|
||||
</Component>
|
||||
<Component class="javax.swing.JCheckBox" name="checkEndScan">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="Turn off beam at end"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Container>
|
||||
</SubComponents>
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -72,7 +72,7 @@
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Component id="motorPanel" max="32767" attributes="0"/>
|
||||
<Component id="comboMotor" max="32767" attributes="0"/>
|
||||
<Component id="comboMotor" pref="146" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
@@ -172,7 +172,7 @@
|
||||
<Component id="jLabel3" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="spinnerLatency" alignment="3" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
<EmptySpace pref="55" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@@ -359,7 +359,6 @@
|
||||
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkEndScan" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
</Group>
|
||||
@@ -394,9 +393,7 @@
|
||||
<Component id="checkCur2" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="checkCur3" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace type="separate" max="32767" attributes="0"/>
|
||||
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
<Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
@@ -499,11 +496,6 @@
|
||||
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JCheckBox" name="checkEndScan">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="Turn off beam at end"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Container>
|
||||
<Container class="javax.swing.JPanel" name="jPanel3">
|
||||
@@ -518,9 +510,13 @@
|
||||
<Layout>
|
||||
<DimensionLayout dim="0">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" attributes="0">
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" attributes="0">
|
||||
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
<Component id="buttonStart" max="32767" attributes="0"/>
|
||||
<Component id="buttonAbort" pref="212" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
@@ -536,6 +532,8 @@
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@@ -557,6 +555,11 @@
|
||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonAbortActionPerformed"/>
|
||||
</Events>
|
||||
</Component>
|
||||
<Component class="javax.swing.JCheckBox" name="checkEndScan">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="Turn off beam at end"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Container>
|
||||
</SubComponents>
|
||||
|
||||
@@ -50,6 +50,7 @@ public class ManipulatorScan extends Panel {
|
||||
c.setEnabled(enableControls);
|
||||
}
|
||||
buttonStart.setEnabled(enableControls);
|
||||
checkEndScan.setEnabled(enableControls);
|
||||
spinnerStepSize.setEnabled(enableControls && radioStepSize.isSelected());
|
||||
spinnerSteps.setEnabled(enableControls && radioSteps.isSelected());
|
||||
|
||||
@@ -166,10 +167,10 @@ public class ManipulatorScan extends Panel {
|
||||
checkCurrent = new javax.swing.JCheckBox();
|
||||
checkImageIntegration = 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("Positioner"));
|
||||
|
||||
@@ -259,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, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
|
||||
.addComponent(comboMotor, 0, 146, Short.MAX_VALUE)))
|
||||
.addGroup(panelPositionerLayout.createSequentialGroup()
|
||||
.addComponent(jLabel3)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
@@ -339,7 +340,7 @@ public class ManipulatorScan extends Panel {
|
||||
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
|
||||
.addComponent(jLabel3)
|
||||
.addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addContainerGap(55, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
panelSensors.setBorder(javax.swing.BorderFactory.createTitledBorder("Sensors"));
|
||||
@@ -399,8 +400,6 @@ public class ManipulatorScan 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(
|
||||
@@ -421,8 +420,7 @@ public class ManipulatorScan extends Panel {
|
||||
.addComponent(checkCur1)
|
||||
.addComponent(checkCur2)
|
||||
.addComponent(checkCur3)
|
||||
.addComponent(checkAngleDistribution)
|
||||
.addComponent(checkEndScan))
|
||||
.addComponent(checkAngleDistribution))
|
||||
.addContainerGap())
|
||||
);
|
||||
panelSensorsLayout.setVerticalGroup(
|
||||
@@ -454,9 +452,7 @@ public class ManipulatorScan extends Panel {
|
||||
.addComponent(checkCur2)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkCur3)
|
||||
.addGap(18, 18, Short.MAX_VALUE)
|
||||
.addComponent(checkEndScan)
|
||||
.addGap(18, 18, 18)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(buttonScientaSetup)
|
||||
.addGap(26, 26, 26))
|
||||
);
|
||||
@@ -477,6 +473,8 @@ public class ManipulatorScan extends Panel {
|
||||
}
|
||||
});
|
||||
|
||||
checkEndScan.setText("Turn off beam at end");
|
||||
|
||||
javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
|
||||
jPanel3.setLayout(jPanel3Layout);
|
||||
jPanel3Layout.setHorizontalGroup(
|
||||
@@ -484,6 +482,9 @@ public class ManipulatorScan 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, 212, Short.MAX_VALUE))
|
||||
.addContainerGap())
|
||||
@@ -495,7 +496,9 @@ public class ManipulatorScan 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);
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
<Component id="radioCis" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="radioSwept" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace min="0" pref="76" max="32767" attributes="0"/>
|
||||
<EmptySpace min="0" pref="84" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
<Group type="102" alignment="1" attributes="0">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
@@ -370,7 +370,6 @@
|
||||
<Component id="checkCur2" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkCur3" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkAngleDistribution" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="checkEndScan" alignment="0" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
</Group>
|
||||
@@ -406,8 +405,6 @@
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Component id="checkCur3" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<Component id="buttonScientaSetup" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
@@ -511,11 +508,6 @@
|
||||
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JCheckBox" name="checkEndScan">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="Turn off beam at end"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Container>
|
||||
<Container class="javax.swing.JPanel" name="jPanel3">
|
||||
@@ -530,9 +522,13 @@
|
||||
<Layout>
|
||||
<DimensionLayout dim="0">
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" attributes="0">
|
||||
<Group type="102" alignment="0" attributes="0">
|
||||
<EmptySpace max="-2" attributes="0"/>
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" attributes="0">
|
||||
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
<Component id="buttonStart" max="32767" attributes="0"/>
|
||||
<Component id="buttonAbort" pref="241" max="32767" attributes="0"/>
|
||||
</Group>
|
||||
@@ -548,6 +544,8 @@
|
||||
<EmptySpace type="separate" max="-2" attributes="0"/>
|
||||
<Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace max="32767" attributes="0"/>
|
||||
<Component id="checkEndScan" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace min="-2" pref="26" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@@ -569,6 +567,11 @@
|
||||
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonAbortActionPerformed"/>
|
||||
</Events>
|
||||
</Component>
|
||||
<Component class="javax.swing.JCheckBox" name="checkEndScan">
|
||||
<Properties>
|
||||
<Property name="text" type="java.lang.String" value="Turn off beam at end"/>
|
||||
</Properties>
|
||||
</Component>
|
||||
</SubComponents>
|
||||
</Container>
|
||||
</SubComponents>
|
||||
|
||||
@@ -96,6 +96,7 @@ public class PhotonEnergy extends Panel {
|
||||
|
||||
table.setEnabled(enableControls);
|
||||
buttonStart.setEnabled(enableControls);
|
||||
checkEndScan.setEnabled(enableControls);
|
||||
spinnerLow.setEnabled(enableControls && radioSwept.isSelected());
|
||||
spinnerHigh.setEnabled(enableControls && radioSwept.isSelected());
|
||||
spinnerCenter.setEnabled(enableControls && radioFixed.isSelected());
|
||||
@@ -212,10 +213,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"));
|
||||
|
||||
@@ -351,7 +352,7 @@ public class PhotonEnergy extends Panel {
|
||||
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(radioCis)
|
||||
.addComponent(radioSwept))
|
||||
.addGap(0, 76, Short.MAX_VALUE))
|
||||
.addGap(0, 84, Short.MAX_VALUE))
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelPositionerLayout.createSequentialGroup()
|
||||
.addGroup(panelPositionerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(panelPositionerLayout.createSequentialGroup()
|
||||
@@ -474,8 +475,6 @@ 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(
|
||||
@@ -496,8 +495,7 @@ public class PhotonEnergy extends Panel {
|
||||
.addComponent(checkCur1)
|
||||
.addComponent(checkCur2)
|
||||
.addComponent(checkCur3)
|
||||
.addComponent(checkAngleDistribution)
|
||||
.addComponent(checkEndScan))
|
||||
.addComponent(checkAngleDistribution))
|
||||
.addContainerGap())
|
||||
);
|
||||
panelSensorsLayout.setVerticalGroup(
|
||||
@@ -530,8 +528,6 @@ public class PhotonEnergy extends Panel {
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkCur3)
|
||||
.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))
|
||||
);
|
||||
@@ -552,6 +548,8 @@ 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(
|
||||
@@ -559,6 +557,9 @@ public class PhotonEnergy 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, 241, Short.MAX_VALUE))
|
||||
.addContainerGap())
|
||||
@@ -570,7 +571,9 @@ public class PhotonEnergy 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);
|
||||
|
||||
@@ -126,7 +126,8 @@ public class XPSSpectrum extends Panel {
|
||||
valueTime.setEnabled(value);
|
||||
valueSize.setEnabled(value);
|
||||
valueIterations.setEnabled(value);
|
||||
comboPass.setEnabled(value);
|
||||
comboPass.setEnabled(value);
|
||||
checkEndScan.setEnabled(value);
|
||||
updateButtons();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user