This commit is contained in:
x03daop
2015-11-03 16:43:42 +01:00
parent 77f1060e08
commit ebdb175f32
4 changed files with 48 additions and 2 deletions

View File

@@ -433,6 +433,7 @@
<Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
<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"/>
</Group>
<EmptySpace min="0" pref="14" max="32767" attributes="0"/>
</Group>
@@ -449,6 +450,8 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="checkImageIntegration" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkAngleDistribution" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkSpectrum" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkTotalCount" min="-2" max="-2" attributes="0"/>
@@ -564,6 +567,15 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonScientaSetupActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JCheckBox" name="checkAngleDistribution">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Angle Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">

View File

@@ -155,6 +155,7 @@ 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();
@@ -428,6 +429,12 @@ 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(
@@ -449,7 +456,8 @@ public class HoloScan extends Panel {
.addComponent(checkCurrent)
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3))
.addComponent(checkCur3)
.addComponent(checkAngleDistribution))
.addGap(0, 14, Short.MAX_VALUE)))
.addContainerGap())
);
@@ -461,6 +469,8 @@ public class HoloScan extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkImageIntegration)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkAngleDistribution)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkSpectrum)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkTotalCount)
@@ -590,6 +600,7 @@ public class HoloScan 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;

View File

@@ -371,6 +371,7 @@
<Component id="checkCur1" alignment="0" min="-2" max="-2" attributes="0"/>
<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"/>
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
@@ -387,6 +388,8 @@
<EmptySpace max="-2" attributes="0"/>
<Component id="checkImageIntegration" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkAngleDistribution" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkSpectrum" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkTotalCount" min="-2" max="-2" attributes="0"/>
@@ -502,6 +505,15 @@
<Property name="name" type="java.lang.String" value="MachineCurrent" noResource="true"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkAngleDistribution">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Scienta Angle Distribution"/>
<Property name="toolTipText" type="java.lang.String" value=""/>
<Property name="contentAreaFilled" type="boolean" value="false"/>
<Property name="name" type="java.lang.String" value="AngleDistribution" noResource="true"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Container class="javax.swing.JPanel" name="jPanel3">

View File

@@ -206,6 +206,7 @@ public class PhotonEnergy extends Panel {
checkCounts3 = new javax.swing.JCheckBox();
checkCounts4 = new javax.swing.JCheckBox();
checkCurrent = new javax.swing.JCheckBox();
checkAngleDistribution = new javax.swing.JCheckBox();
jPanel3 = new javax.swing.JPanel();
buttonStart = new javax.swing.JButton();
buttonAbort = new javax.swing.JButton();
@@ -462,6 +463,12 @@ public class PhotonEnergy extends Panel {
checkCurrent.setText("Machine Current");
checkCurrent.setName("MachineCurrent"); // 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);
panelSensorsLayout.setHorizontalGroup(
@@ -483,7 +490,8 @@ public class PhotonEnergy extends Panel {
.addComponent(checkCurrent)
.addComponent(checkCur1)
.addComponent(checkCur2)
.addComponent(checkCur3))
.addComponent(checkCur3)
.addComponent(checkAngleDistribution))
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
@@ -495,6 +503,8 @@ public class PhotonEnergy extends Panel {
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkImageIntegration)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkAngleDistribution)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkSpectrum)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkTotalCount)
@@ -624,6 +634,7 @@ public class PhotonEnergy 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;