Closedown
This commit is contained in:
sfop
@@ -34,7 +34,7 @@
|
||||
<Group type="103" groupAlignment="0" attributes="0">
|
||||
<Group type="102" alignment="1" attributes="0">
|
||||
<EmptySpace min="-2" pref="12" max="-2" attributes="0"/>
|
||||
<Component id="progressBar" pref="272" max="32767" attributes="0"/>
|
||||
<Component id="progressBar" pref="367" max="32767" attributes="0"/>
|
||||
<EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
|
||||
<Component id="buttonClear" min="-2" max="-2" attributes="0"/>
|
||||
</Group>
|
||||
@@ -144,6 +144,8 @@
|
||||
<Component id="radioBackMultiple" min="-2" max="-2" attributes="0"/>
|
||||
</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>
|
||||
@@ -193,7 +195,11 @@
|
||||
</Group>
|
||||
<EmptySpace min="-2" pref="57" max="-2" attributes="0"/>
|
||||
<Component id="checkSaveImages" min="-2" max="-2" attributes="0"/>
|
||||
<EmptySpace pref="70" max="32767" 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"/>
|
||||
</Group>
|
||||
</Group>
|
||||
</DimensionLayout>
|
||||
@@ -309,6 +315,18 @@
|
||||
</Property>
|
||||
</Properties>
|
||||
</Component>
|
||||
<Component class="javax.swing.JCheckBox" name="checkElog">
|
||||
<Properties>
|
||||
<Property name="selected" type="boolean" value="true"/>
|
||||
<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">
|
||||
|
||||
@@ -107,6 +107,8 @@ public class GunSolenoidAlignment extends Panel {
|
||||
radioBackMultiple = new javax.swing.JRadioButton();
|
||||
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();
|
||||
@@ -175,6 +177,12 @@ public class GunSolenoidAlignment extends Panel {
|
||||
|
||||
spinnerNumImages.setModel(new javax.swing.SpinnerNumberModel(0, 0, 10, 1));
|
||||
|
||||
checkElog.setSelected(true);
|
||||
checkElog.setText("ELOG");
|
||||
|
||||
checkZeroSolenoids.setSelected(true);
|
||||
checkZeroSolenoids.setText("Zero solenoids");
|
||||
|
||||
javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
|
||||
jPanel1.setLayout(jPanel1Layout);
|
||||
jPanel1Layout.setHorizontalGroup(
|
||||
@@ -214,7 +222,9 @@ public class GunSolenoidAlignment extends Panel {
|
||||
.addGroup(jPanel1Layout.createSequentialGroup()
|
||||
.addGap(36, 36, 36)
|
||||
.addComponent(radioBackMultiple))
|
||||
.addComponent(checkSaveImages))
|
||||
.addComponent(checkSaveImages)
|
||||
.addComponent(checkElog)
|
||||
.addComponent(checkZeroSolenoids))
|
||||
.addGap(0, 0, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
);
|
||||
@@ -258,7 +268,11 @@ public class GunSolenoidAlignment extends Panel {
|
||||
.addComponent(spinnerNumBackgrounds, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
|
||||
.addGap(57, 57, 57)
|
||||
.addComponent(checkSaveImages)
|
||||
.addContainerGap(70, Short.MAX_VALUE))
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkElog)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(checkZeroSolenoids)
|
||||
.addContainerGap(34, Short.MAX_VALUE))
|
||||
);
|
||||
|
||||
centroidPlot.setLegendVisible(true);
|
||||
@@ -291,7 +305,7 @@ public class GunSolenoidAlignment extends Panel {
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
|
||||
.addGap(12, 12, 12)
|
||||
.addComponent(progressBar, javax.swing.GroupLayout.DEFAULT_SIZE, 272, Short.MAX_VALUE)
|
||||
.addComponent(progressBar, javax.swing.GroupLayout.DEFAULT_SIZE, 367, Short.MAX_VALUE)
|
||||
.addGap(18, 18, 18)
|
||||
.addComponent(buttonClear))
|
||||
.addComponent(centroidPlot, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE))))
|
||||
@@ -346,6 +360,9 @@ public class GunSolenoidAlignment extends Panel {
|
||||
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("do_elog", checkElog.isSelected());
|
||||
|
||||
((Plugin)this).runAsync("Alignment/Gun_solenoid_alignment",args).thenAccept((Object t) -> {
|
||||
List ret = (List)t;
|
||||
onEndScan((ScanResult)ret.get(0), (List)ret.get(1), (List)ret.get(2) );
|
||||
@@ -379,7 +396,9 @@ public class GunSolenoidAlignment extends Panel {
|
||||
private javax.swing.JButton buttonRun;
|
||||
private ch.psi.pshell.plot.LinePlotJFree centroidPlot;
|
||||
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;
|
||||
|
||||
@@ -14,9 +14,6 @@ import org.apache.commons.math3.linear.Array2DRowRealMatrix as Matrix
|
||||
import ch.psi.utils.Convert.toBidimensional as mono_to_bidi
|
||||
import datetime
|
||||
|
||||
zero_solenoids=False
|
||||
do_elog = False
|
||||
|
||||
if get_context().source == CommandSource.ui:
|
||||
I1 = 95.0
|
||||
I2 = 100.0
|
||||
@@ -27,6 +24,8 @@ if get_context().source == CommandSource.ui:
|
||||
use_background = True
|
||||
multiple_background = True
|
||||
number_backgrounds = 5
|
||||
zero_solenoids=False
|
||||
do_elog = False
|
||||
centroid_excursion_plot = True
|
||||
else:
|
||||
centroid_excursion_plot = False
|
||||
|
||||
Reference in New Issue
Block a user