This commit is contained in:
sfop
2016-09-13 08:54:50 +02:00
parent 7e474638a7
commit a1ed83ff62
2 changed files with 4 additions and 21 deletions

View File

@@ -145,7 +145,6 @@
</Group>
<Component id="checkSaveImages" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkElog" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="checkZeroSolenoids" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
@@ -197,9 +196,7 @@
<Component id="checkSaveImages" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkElog" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="checkZeroSolenoids" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="34" max="32767" attributes="0"/>
<EmptySpace pref="57" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -321,12 +318,6 @@
<Property name="text" type="java.lang.String" value="ELOG"/>
</Properties>
</Component>
<Component class="javax.swing.JCheckBox" name="checkZeroSolenoids">
<Properties>
<Property name="selected" type="boolean" value="true"/>
<Property name="text" type="java.lang.String" value="Zero solenoids"/>
</Properties>
</Component>
</SubComponents>
</Container>
<Component class="ch.psi.pshell.plot.LinePlotJFree" name="centroidPlot">

View File

@@ -142,7 +142,6 @@ System.out.println("Set");
jLabel6 = new javax.swing.JLabel();
spinnerNumImages = new javax.swing.JSpinner();
checkElog = new javax.swing.JCheckBox();
checkZeroSolenoids = new javax.swing.JCheckBox();
centroidPlot = new ch.psi.pshell.plot.LinePlotJFree();
buttonClear = new javax.swing.JButton();
progressBar = new javax.swing.JProgressBar();
@@ -214,9 +213,6 @@ System.out.println("Set");
checkElog.setSelected(true);
checkElog.setText("ELOG");
checkZeroSolenoids.setSelected(true);
checkZeroSolenoids.setText("Zero solenoids");
javax.swing.GroupLayout panelParametersLayout = new javax.swing.GroupLayout(panelParameters);
panelParameters.setLayout(panelParametersLayout);
panelParametersLayout.setHorizontalGroup(
@@ -257,8 +253,7 @@ System.out.println("Set");
.addGap(36, 36, 36)
.addComponent(radioBackMultiple))
.addComponent(checkSaveImages)
.addComponent(checkElog)
.addComponent(checkZeroSolenoids))
.addComponent(checkElog))
.addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())
);
@@ -304,9 +299,7 @@ System.out.println("Set");
.addComponent(checkSaveImages)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkElog)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(checkZeroSolenoids)
.addContainerGap(34, Short.MAX_VALUE))
.addContainerGap(57, Short.MAX_VALUE))
);
centroidPlot.setLegendVisible(true);
@@ -394,7 +387,7 @@ System.out.println("Set");
args.put("number_backgrounds", spinnerNumBackgrounds.getValue());
args.put("use_background", checkBackground.isSelected());
args.put("multiple_background", radioBackMultiple.isSelected());
args.put("zero_solenoids", checkZeroSolenoids.isSelected());
//args.put("zero_solenoids", checkZeroSolenoids.isSelected());
args.put("do_elog", checkElog.isSelected());
runAsync("Alignment/Laser_gun_alignment", args).thenAccept((Object ret) -> {
@@ -432,7 +425,6 @@ System.out.println("Set");
private javax.swing.JCheckBox checkBackground;
private javax.swing.JCheckBox checkElog;
private javax.swing.JCheckBox checkSaveImages;
private javax.swing.JCheckBox checkZeroSolenoids;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLabel2;
private javax.swing.JLabel jLabel3;