Closedown

This commit is contained in:
sfop
2016-06-28 15:45:12 +02:00
parent 35a396586d
commit 02cf0ecd2a
3 changed files with 44 additions and 8 deletions

View File

@@ -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;