From 616c7d7af12d3df809c04b2279b1d14f21a70510 Mon Sep 17 00:00:00 2001
From: X11MA <X11MA@x11ma-cons-2.psi.ch>
Date: Thu, 11 Aug 2016 16:33:08 +0200
Subject: [PATCH] Startup

---
 plugins/DelayScan.form | 17 +++++++++--------
 plugins/DelayScan.java | 10 +++++-----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/plugins/DelayScan.form b/plugins/DelayScan.form
index 4535706..607af81 100644
--- a/plugins/DelayScan.form
+++ b/plugins/DelayScan.form
@@ -108,15 +108,14 @@
                               </Group>
                               <Component id="spinnerDelay" min="-2" pref="85" max="-2" attributes="0"/>
                           </Group>
-                          <EmptySpace max="32767" attributes="0"/>
                       </Group>
                       <Group type="102" alignment="0" attributes="0">
                           <Component id="jLabel16" min="-2" max="-2" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
                           <Component id="jTextField1" min="-2" pref="161" max="-2" attributes="0"/>
-                          <EmptySpace max="32767" attributes="0"/>
                       </Group>
                   </Group>
+                  <EmptySpace max="32767" attributes="0"/>
               </Group>
           </Group>
         </DimensionLayout>
@@ -278,13 +277,15 @@
         <Component class="javax.swing.JComboBox" name="comboRunType">
           <Properties>
             <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-              <StringArray count="6">
+              <StringArray count="8">
                 <StringItem index="0" value="+/-"/>
-                <StringItem index="1" value="+"/>
-                <StringItem index="2" value="-"/>
-                <StringItem index="3" value="LH/LV"/>
-                <StringItem index="4" value="LH"/>
-                <StringItem index="5" value="LV"/>
+                <StringItem index="1" value="+,-"/>
+                <StringItem index="2" value="+"/>
+                <StringItem index="3" value="-"/>
+                <StringItem index="4" value="LH/LV"/>
+                <StringItem index="5" value="LH,LV"/>
+                <StringItem index="6" value="LH"/>
+                <StringItem index="7" value="LV"/>
               </StringArray>
             </Property>
           </Properties>
diff --git a/plugins/DelayScan.java b/plugins/DelayScan.java
index e2c77e5..6e6161d 100644
--- a/plugins/DelayScan.java
+++ b/plugins/DelayScan.java
@@ -103,6 +103,7 @@ public class DelayScan extends Panel {
         args.put("Cam_start", jSpinner1.getValue());
         args.put("Cam_end", jSpinner2.getValue());
         args.put("Save_array_data", jCheckBox4.isSelected() ? 1 : 2);
+        args.put("PATH", jTextField2.getText());
 
         buttonAbort.setEnabled(true);
 
@@ -217,7 +218,7 @@ public class DelayScan extends Panel {
 
         jLabel11.setText("Run Type:");
 
-        comboRunType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "+/-", "+", "-", "LH/LV", "LH", "LV" }));
+        comboRunType.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "+/-", "+,-", "+", "-", "LH/LV", "LH,LV", "LH", "LV" }));
 
         spinnerRounds.setModel(new javax.swing.SpinnerNumberModel(1, 1, 10, 1));
 
@@ -274,13 +275,12 @@ public class DelayScan extends Panel {
                                 .addComponent(spinnerRounds, javax.swing.GroupLayout.Alignment.TRAILING)
                                 .addComponent(spinnerAcqTime, javax.swing.GroupLayout.Alignment.TRAILING)
                                 .addComponent(spinnerFineDelay, javax.swing.GroupLayout.Alignment.TRAILING))
-                            .addComponent(spinnerDelay, javax.swing.GroupLayout.PREFERRED_SIZE, 85, javax.swing.GroupLayout.PREFERRED_SIZE))
-                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                            .addComponent(spinnerDelay, javax.swing.GroupLayout.PREFERRED_SIZE, 85, javax.swing.GroupLayout.PREFERRED_SIZE)))
                     .addGroup(panelParametersLayout.createSequentialGroup()
                         .addComponent(jLabel16)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                        .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 161, javax.swing.GroupLayout.PREFERRED_SIZE)
-                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+                        .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, 161, javax.swing.GroupLayout.PREFERRED_SIZE)))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
 
         panelParametersLayout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {jLabel2, jLabel4});