new version 1.1.40

do not collapse function of functional positioner
Changed version to 1.1.39 and disabled auto collapse (see Request/Issue
2013-09-25 09:32:13 +02:00 · 2013-09-23 11:33:59 +02:00 · 2013-09-23 10:38:15 +02:00 · 2013-05-21 16:03:35 +02:00 · 2013-05-21 14:21:00 +02:00 · 2013-04-16 11:51:41 +02:00
24 changed files with 405 additions and 302 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@
 /nbactions.xml
 /application/nbactions.xml
 /fda.ui.cdump/target/
-/fda.ui.cdump/nbactions.xml
+/fda.ui.cdump/nbactions.xml
+/.project
--- a/Readme.md
+++ b/Readme.md
@@ -0,0 +1,6 @@
+
+To build the whole application use:
+```Bash
+mvn -DskipTests=true --also-make --projects application install
+```
+
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>ch.psi</groupId>
        <artifactId>fda.ui</artifactId>
-        <version>1.1.30</version>
+        <version>1.1.40</version>
    </parent>

    <artifactId>application</artifactId>
--- a/branding/pom.xml
+++ b/branding/pom.xml
@@ -5,7 +5,7 @@
    <parent>
        <groupId>ch.psi</groupId>
        <artifactId>fda.ui</artifactId>
-        <version>1.1.30</version>
+        <version>1.1.40</version>
    </parent>

    <artifactId>branding</artifactId>
--- a/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
+++ b/branding/src/main/nbm-branding/modules/org-netbeans-core-windows.jar/org/netbeans/core/windows/view/ui/Bundle.properties
@@ -1,2 +1,2 @@
-CTL_MainWindow_Title=FDA 1.1.30
-CTL_MainWindow_Title_No_Project=FDA 1.1.30
+CTL_MainWindow_Title=FDA 1.1.40
+CTL_MainWindow_Title_No_Project=FDA 1.1.40
--- a/fda.ui.cdump/pom.xml
+++ b/fda.ui.cdump/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>fda.ui</artifactId>
        <groupId>ch.psi</groupId>
-        <version>1.1.30</version>
+        <version>1.1.40</version>
    </parent>

    <artifactId>fda.ui.cdump</artifactId>
@@ -92,6 +92,11 @@
            <version>0.9.6-SNAPSHOT</version>
            <type>jar</type>
        </dependency>
+        <dependency>
+            <groupId>ch.psi</groupId>
+            <artifactId>ch.psi.fdaq</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
    </dependencies>

    <build>
--- a/fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
+++ b/fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>

 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <AuxValues>
@@ -34,6 +34,7 @@
              </Group>
              <EmptySpace pref="108" max="32767" attributes="0"/>
          </Group>
+          <Component id="jPanel1" alignment="1" max="32767" attributes="0"/>
      </Group>
    </DimensionLayout>
    <DimensionLayout dim="1">
@@ -51,7 +52,8 @@
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="jButton1" min="-2" max="-2" attributes="0"/>
-              <EmptySpace pref="187" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jPanel1" max="32767" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>
@@ -95,5 +97,76 @@
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
      </Events>
    </Component>
+    <Container class="javax.swing.JPanel" name="jPanel1">
+
+      <Layout>
+        <DimensionLayout dim="0">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="0" attributes="0">
+                      <Component id="jLabel3" alignment="0" min="-2" max="-2" attributes="0"/>
+                      <Group type="102" alignment="0" attributes="0">
+                          <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
+                          <EmptySpace type="separate" max="-2" attributes="0"/>
+                          <Component id="jTextField2" min="-2" pref="176" max="-2" attributes="0"/>
+                      </Group>
+                      <Component id="jButton2" alignment="0" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace pref="113" max="32767" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+        <DimensionLayout dim="1">
+          <Group type="103" groupAlignment="0" attributes="0">
+              <Group type="102" alignment="0" attributes="0">
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Group type="103" groupAlignment="3" attributes="0">
+                      <Component id="jLabel4" alignment="3" min="-2" max="-2" attributes="0"/>
+                      <Component id="jTextField2" alignment="3" min="-2" max="-2" attributes="0"/>
+                  </Group>
+                  <EmptySpace max="-2" attributes="0"/>
+                  <Component id="jButton2" min="-2" max="-2" attributes="0"/>
+                  <EmptySpace pref="90" max="32767" attributes="0"/>
+              </Group>
+          </Group>
+        </DimensionLayout>
+      </Layout>
+      <SubComponents>
+        <Component class="javax.swing.JLabel" name="jLabel3">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jLabel3.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JLabel" name="jLabel4">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jLabel4.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JTextField" name="jTextField2">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jTextField2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+        </Component>
+        <Component class="javax.swing.JButton" name="jButton2">
+          <Properties>
+            <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+              <ResourceString bundle="ch/psi/fda/ui/cdump/Bundle.properties" key="CdumpExecutionTopComponent.jButton2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+            </Property>
+          </Properties>
+          <Events>
+            <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
+          </Events>
+        </Component>
+      </SubComponents>
+    </Container>
  </SubComponents>
 </Form>
--- a/fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
+++ b/fda.ui.cdump/src/main/java/ch/psi/fda/ui/cdump/CdumpExecutionTopComponent.java
@@ -20,6 +20,8 @@ import ch.psi.cdump.CdumpConfiguration;
 import ch.psi.cdump.CdumpService;
 import ch.psi.cdump.RunConfiguration;
 import ch.psi.fda.ui.preferences.api.Preferences;
+import ch.psi.fdaq.FdaqConfiguration;
+import ch.psi.fdaq.FdaqService;
 import java.io.File;
 import java.util.Date;
 import java.util.logging.Level;
@@ -47,6 +49,7 @@ public final class CdumpExecutionTopComponent extends TopComponent {
    private static final String PREFERRED_ID = "CdumpExecutionTopComponent";

    private CdumpService service;
+    private FdaqService fdaqService;

    public CdumpExecutionTopComponent() {
        initComponents();
@@ -73,6 +76,11 @@ public final class CdumpExecutionTopComponent extends TopComponent {
        jTextField1 = new javax.swing.JTextField();
        jLabel2 = new javax.swing.JLabel();
        jButton1 = new javax.swing.JButton();
+        jPanel1 = new javax.swing.JPanel();
+        jLabel3 = new javax.swing.JLabel();
+        jLabel4 = new javax.swing.JLabel();
+        jTextField2 = new javax.swing.JTextField();
+        jButton2 = new javax.swing.JButton();

        jComboBox1.setModel(new javax.swing.DefaultComboBoxModel(RunConfiguration.rates));

@@ -89,6 +97,48 @@ public final class CdumpExecutionTopComponent extends TopComponent {
            }
        });

+        org.openide.awt.Mnemonics.setLocalizedText(jLabel3, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jLabel3.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(jLabel4, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jLabel4.text")); // NOI18N
+
+        jTextField2.setText(org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jTextField2.text")); // NOI18N
+
+        org.openide.awt.Mnemonics.setLocalizedText(jButton2, org.openide.util.NbBundle.getMessage(CdumpExecutionTopComponent.class, "CdumpExecutionTopComponent.jButton2.text")); // NOI18N
+        jButton2.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jButton2ActionPerformed(evt);
+            }
+        });
+
+        javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
+        jPanel1.setLayout(jPanel1Layout);
+        jPanel1Layout.setHorizontalGroup(
+            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel1Layout.createSequentialGroup()
+                .addContainerGap()
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel3)
+                    .addGroup(jPanel1Layout.createSequentialGroup()
+                        .addComponent(jLabel4)
+                        .addGap(18, 18, 18)
+                        .addComponent(jTextField2, javax.swing.GroupLayout.PREFERRED_SIZE, 176, javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(jButton2))
+                .addContainerGap(113, Short.MAX_VALUE))
+        );
+        jPanel1Layout.setVerticalGroup(
+            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel1Layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(jLabel3)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel4)
+                    .addComponent(jTextField2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jButton2)
+                .addContainerGap(90, Short.MAX_VALUE))
+        );
+
        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
        this.setLayout(layout);
        layout.setHorizontalGroup(
@@ -106,6 +156,7 @@ public final class CdumpExecutionTopComponent extends TopComponent {
                            .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 173, Short.MAX_VALUE)))
                    .addComponent(jButton1))
                .addContainerGap(108, Short.MAX_VALUE))
+            .addComponent(jPanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
        );
        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -120,7 +171,8 @@ public final class CdumpExecutionTopComponent extends TopComponent {
                    .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                .addComponent(jButton1)
-                .addContainerGap(187, Short.MAX_VALUE))
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
        );
    }// </editor-fold>//GEN-END:initComponents

@@ -163,12 +215,56 @@ public final class CdumpExecutionTopComponent extends TopComponent {
        }
    }//GEN-LAST:event_jButton1ActionPerformed

+    private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed
+        if(jButton2.getText().equals("Start")){
+            try{
+            // Start acquisition
+                startAcquisitionFdaq();
+                jButton2.setText("Stop");
+            }
+            catch(Exception e){
+                NotifyDescriptor d = new NotifyDescriptor.Message("Unable to start data acquisition:\n" + e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
+                DialogDisplayer.getDefault().notifyLater(d);
+
+                // Print exception to output window of the application
+                InputOutput io = IOProvider.getDefault().getIO("Error", false);
+                // Set output console visible
+                io.select();
+                io.getOut().println("Cannot start fdaq");
+                e.printStackTrace(io.getErr());
+            }
+        }
+        else {
+            try{
+            // Stop acquisition
+            jButton2.setText("Start");
+            stopAcquisitionFdaq();
+            }
+            catch(Exception e){
+                NotifyDescriptor d = new NotifyDescriptor.Message("Unable to stop data acquisition:\n" + e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
+                DialogDisplayer.getDefault().notifyLater(d);
+
+                // Print exception to output window of the application
+                InputOutput io = IOProvider.getDefault().getIO("Error", false);
+                // Set output console visible
+                io.select();
+                io.getOut().println("Cannot stop fdaq");
+                e.printStackTrace(io.getErr());
+            }
+        }
+    }//GEN-LAST:event_jButton2ActionPerformed
+
    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JButton jButton1;
+    private javax.swing.JButton jButton2;
    private javax.swing.JComboBox jComboBox1;
    private javax.swing.JLabel jLabel1;
    private javax.swing.JLabel jLabel2;
+    private javax.swing.JLabel jLabel3;
+    private javax.swing.JLabel jLabel4;
+    private javax.swing.JPanel jPanel1;
    private javax.swing.JTextField jTextField1;
+    private javax.swing.JTextField jTextField2;
    // End of variables declaration//GEN-END:variables
    /**
     * Gets default instance. Do not use directly: reserved for *.settings files only,
@@ -288,4 +384,34 @@ public final class CdumpExecutionTopComponent extends TopComponent {
 //            throw new RuntimeException(e);
 //        }
    }
+    
+    
+    public void startAcquisitionFdaq() {
+        Preferences p = Lookup.getDefault().lookup(Preferences.class);
+        System.setProperty(FdaqService.APP_HOME, p.getHome().getAbsolutePath());
+
+        Logger.getLogger(CdumpExecutionTopComponent.class.getName()).log(Level.INFO, "Start fdaq acquisition");
+
+        // Calculate data file location/name
+        String fname = jTextField2.getText();
+        FdaqConfiguration cc = FdaqConfiguration.getInstance();
+        String d = cc.getDataDirectory() + "/" + cc.replaceMacros(cc.getFilePrefix(), new Date(), fname) + fname + ".txt";
+        File f = new File(d);
+        f.getParentFile().mkdirs(); // Create data base directory
+
+        // Create execution service
+        fdaqService = new FdaqService();
+
+        // Take data
+	fdaqService.startAcquisition(f);
+    }
+
+    public void stopAcquisitionFdaq() {
+
+        if(fdaqService != null){
+            Logger.getLogger(CdumpExecutionTopComponent.class.getName()).log(Level.INFO, "Stop fdaq acquisition");
+            fdaqService.stopAcquisition();
+        }
+    }
+    
 }
--- a/fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/Bundle.properties
+++ b/fda.ui.cdump/src/main/resources/ch/psi/fda/ui/cdump/Bundle.properties
@@ -10,3 +10,7 @@ CdumpExecutionTopComponent.jButton1.text=Start
 CTL_CdumpExecutionAction=Stream Detector Acquisition
 CTL_CdumpExecutionTopComponent=Stream Detector Acquisition
 HINT_CdumpExecutionTopComponent=This is a Continuous Execution window
+CdumpExecutionTopComponent.jLabel3.text=Fdaq Testing
+CdumpExecutionTopComponent.jLabel4.text=Scan Name
+CdumpExecutionTopComponent.jTextField2.text=
+CdumpExecutionTopComponent.jButton2.text=Start
--- a/fda.ui.cdump/src/main/resources/ch/psi/fda/ui/fdaq/Bundle.properties
+++ b/fda.ui.cdump/src/main/resources/ch/psi/fda/ui/fdaq/Bundle.properties
@@ -0,0 +1,21 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+# Localized module labels. Defaults taken from POM (<name>, <description>, <groupId>) if unset.
+#OpenIDE-Module-Name=
+#OpenIDE-Module-Short-Description=
+#OpenIDE-Module-Long-Description=
+#OpenIDE-Module-Display-Category=
+FdaqTopComponent.jLabel1.text=Sampling Rate
+FdaqTopComponent.jTextField1.text=
+FdaqTopComponent.jLabel2.text=Scan Name
+FdaqTopComponent.jButton1.text=Start
+# Localized module labels. Defaults taken from POM (<name>, <description>, <groupId>) if unset.
+#OpenIDE-Module-Name=
+#OpenIDE-Module-Short-Description=
+#OpenIDE-Module-Long-Description=
+#OpenIDE-Module-Display-Category=
+FdaqTopComponent.jLabel1.text_1=Sampling Rate
+FdaqTopComponent.jTextField1.text_1=
+FdaqTopComponent.jLabel2.text_1=Scan Name
+FdaqTopComponent.jButton1.text_1=Start
--- a/fda.ui.ce/pom.xml
+++ b/fda.ui.ce/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>fda.ui</artifactId>
        <groupId>ch.psi</groupId>
-        <version>1.1.30</version>
+        <version>1.1.40</version>
    </parent>

    <artifactId>fda.ui.ce</artifactId>
--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/Bundle.properties
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/Bundle.properties
@@ -1,262 +0,0 @@
-ShellActionPanel.jTextField1.text=Command
-ChannelActionPanel.jLabel2.text=Value:
-ChannelActionPanel.jLabel2.toolTipText=
-ChannelActionPanel.jLabel3.text=Operation:
-ChannelActionPanel.Operation.text=
-ChannelActionPanel.jLabel4.text=Type:
-ChannelActionPanel.jLabel5.text=Timeout [s]:
-ChannelActionPanel.jLabel6.text=Delay [s]:
-ChannelActionPanel.jButton1.text=
-ChannelActionPanel.Type.toolTipText=Type (Optional)
-ChannelActionPanel.Type.text=
-ChannelActionPanel.Timeout.toolTipText=Timeout in seconds (Optional)
-ChannelActionPanel.Timeout.text=
-ChannelActionPanel.Delay.toolTipText=Delay (in seconds) to wait after the action was executed (Optional)
-ChannelActionPanel.Delay.text=
-ShellActionPanel.jButton1.text=jButton1
-ShellActionPanel.jTextField1.toolTipText=Shell command
-ChannelAction2Panel.Timeout.text=
-RegionPanel.jLabel1.text=Start
-RegionPanel.jLabel2.text=End:
-RegionPanel.jLabel3.text=oen
-ChannelActionPanel.jTextFieldValue.toolTipText=Channel value
-ChannelActionPanel.jTextFieldValue.text=
-RegionPanel.jLabel1.text_1=Start:
-RegionPanel.jLabel2.text_1=End:
-RegionPanel.jLabel3.text_1=Step Size:
-DiscreteStepPositionerPanel.jLabel2.text=Readback:
-DiscreteStepPositionerPanel.jLabel3.text=Settling Time:
-DiscreteStepPositionerPanel.jButton1.text=
-DiscreteStepPositionerPanel.jLabel4.text=Done:
-DiscreteStepPositionerPanel.jLabel5.text=Done Value:
-DiscreteStepPositionerPanel.Settling\ Time.text=
-DiscreteStepPositionerPanel.Settling\ Time.toolTipText=Positioner settling time
-DiscreteStepPositionerPanel.Done.toolTipText=Channel indicating done of movement
-DiscreteStepPositionerPanel.Done.text=
-DiscreteStepPositionerPanel.Done\ Value.toolTipText=Value of done channel that indicated done (Integer)
-DiscreteStepPositionerPanel.Done\ Value.text=
-DiscreteStepPositionerPanel.Readback.toolTipText=Readback channel of the positioner
-DiscreteStepPositionerPanel.Readback.text=
-DiscreteStepPositionerPanel.Name.toolTipText=Name of positioner
-DiscreteStepPositionerPanel.Name.text=Channel Name
-RegionPanel.jButton1.text=
-ChannelActionPanel.jFormattedTextFieldChannel.text=Channel Name
-ChannelActionPanel.jFormattedTextFieldChannel.toolTipText=Channel name
-DiscreteStepPositionerPanel.jLabel6.text=Done Delay:
-DiscreteStepPositionerPanel.Done\ Delay.toolTipText=Delay before done channel is checked
-DiscreteStepPositionerPanel.Done\ Delay.text=
-RegionPanel.Step\ Size.toolTipText=Step size
-RegionPanel.Step\ Size.text=
-RegionPanel.Start.toolTipText=Start
-RegionPanel.Start.text=
-RegionPanel.End.toolTipText=End
-RegionPanel.End.text=
-LinearPositionerPanel.jLabel1.text=Start:
-LinearPositionerPanel.jLabel2.text=End:
-LinearPositionerPanel.jLabel3.text=Step Size:
-LinearPositionerPanel.Start.text=
-LinearPositionerPanel.End.text=
-LinearPositionerPanel.StepSize.text=
-ArrayPositionerPanel.jLabel2.text=Positions:
-ArrayPositionerPanel.Positions.toolTipText=Positions [space separated]
-ArrayPositionerPanel.Positions.text=
-ScalarDetectorPanel.jButton1.toolTipText=Add optional field(s)
-ScalarDetectorPanel.jButton1.text=
-ScalarDetectorPanel.jTextFieldName.text=Channel Name
-ArrayDetectorPanel.jLabel2.text=Array Size:
-ArrayDetectorPanel.jButton1.text=
-ArrayDetectorPanel.jTextFieldName.text=Channel Name
-ArrayDetectorPanel.jFormattedTextFieldArraySize.text=
-TimestampDetectorPanel.jLabel1.text=[ms]
-SimpleScalarDetectorPanel.jTextFieldName.text=Channel Name
-ScalerChannelPanel.jLabel1.text=Scaler Number:
-ScalerChannelPanel.jFormattedTextFieldNumber.text=
-ScalerChannelPanel.jFormattedTextFieldNumber.toolTipText=Number of the scaler
-PseudoPositionerPanel.jLabel1.text=Count:
-PseudoPositionerPanel.jFormattedTextFieldCount.toolTipText=Number of pseudo steps
-PseudoPositionerPanel.jFormattedTextFieldCount.text=
-ContinuousPositionerPanel.jLabel2.text=Readback:
-ContinuousPositionerPanel.jLabel3.text=Start:
-ContinuousPositionerPanel.jLabel4.text=End:
-ContinuousPositionerPanel.jLabel5.text=Step Size:
-ContinuousPositionerPanel.jLabel6.text=Integration Time:
-ContinuousPositionerPanel.jLabel7.text=Additional Backlash:
-ContinuousPositionerPanel.Name.toolTipText=Channel Name
-ContinuousPositionerPanel.Name.text=Channel Name
-ContinuousPositionerPanel.Readback.text=
-ContinuousPositionerPanel.jTextFieldReadback.toolTipText=Readback
-ContinuousPositionerPanel.Start.text=
-ContinuousPositionerPanel.End.text=
-ContinuousPositionerPanel.jFormattedTextFieldEnd.toolTipText=End
-ContinuousPositionerPanel.Step\ Size.toolTipText=Step Size
-ContinuousPositionerPanel.Step\ Size.text=
-ContinuousPositionerPanel.Integration\ Time.text=
-ContinuousPositionerPanel.jFormattedTextFieldIntegrationTime.toolTipText=Integration Time
-ContinuousPositionerPanel.Additional\ backlash.toolTipText=Additional backlash
-ContinuousPositionerPanel.Additional\ backlash.text=
-ContinuousPositionerPanel.jButton1.text=
-ContinuousPositionerPanel.jButton1.toolTipText=Add optional item
-ScanPanel.jButton1.text=
-ScanPanel.jButton1.toolTipText=Add optional items
-ScanPanel.collapsibleListContainerDimension.toolTipText=Dimensions
-ConfigurationPanel.Number\ of\ Execution.text=
-ConfigurationPanel.jLabel1.text=Number of Execution:
-GuardConditionPanel.jLabel2.text=Value:
-GuardConditionPanel.jLabel3.text=Type:
-GuardConditionPanel.Channel.toolTipText=Guard channel
-GuardConditionPanel.Channel.text=Channel Name
-GuardConditionPanel.Value.toolTipText=Value
-GuardConditionPanel.Value.text=
-GuardConditionPanel.jButton1.text=
-ConfigurationPanel.jLabel2.text=Data Format:
-ScriptActionPanel.jTextArea1.text=
-DiscreteStepDimensionPanel.jButton1.text=
-ScriptActionPanel.jTextArea1.toolTipText=Jython Script
-SimpleScalarDetectorPanel.jTextFieldName.toolTipText=Channel Name
-ScalarDetectorPanel.jTextFieldName.toolTipText=Channel Name
-ChannelActionPanel.jFormattedTextFieldDelay.toolTipText=Delay in seconds
-ChannelActionPanel.jComboBoxType.toolTipText=Type of channel
-ChannelActionPanel.jComboBoxOperation.toolTipText=Operation to perform
-ArrayDetectorPanel.jTextFieldName.toolTipText=Channel Name
-ArrayDetectorPanel.jFormattedTextFieldArraySize.toolTipText=Array Size
-ConfigurationPanel.jFormattedTextFieldNumber.toolTipText=Number of executions
-ContinuousPositionerPanel.jFormattedTextFieldStart.toolTipText=Start
-LinearPositionerPanel.discreteStepPositionerPanel1.toolTipText=
-LinearPositionerPanel.jFormattedTextFieldStart.toolTipText=Start
-LinearPositionerPanel.jFormattedTextFieldEnd.toolTipText=End
-LinearPositionerPanel.jFormattedTextFieldStepSize.toolTipText=Step Size
-TimestampDetectorPanel.jLabel1.toolTipText=Timestamp in ms
-ConfigurationPanel.jLabel3.text=File Name:
-ConfigurationPanel.jTextFieldFileName.text=
-DiscreteStepDimensionPanel.ZigZag.text=ZigZag
-ContinuousDimensionPanel.jButton1.text=
-ContinuousDimensionPanel.jButton1.toolTipText=Add optional items
-LinePlotPanel.jLabel1.text=Title:
-LinePlotPanel.jLabel2.text=X:
-LinePlotPanel.jLabel3.text=Y:
-LinePlotPanel.jButton1.text=
-LinePlotPanel.Title.text=
-LinePlotPanel.jTextFieldTitle.toolTipText=Title of the plot
-LinePlotPanel.jComboBoxX.toolTipText=x-Axis
-LinePlotPanel.jComboBoxY.toolTipText=y-Axis
-MatrixPlotPanel.jTextFieldTitle.toolTipText=Title of the plot
-MatrixPlotPanel.jComboBoxY.toolTipText=y-Axis
-MatrixPlotPanel.jButton1.text=
-MatrixPlotPanel.jComboBoxX.toolTipText=x-Axis
-MatrixPlotPanel.jLabel3.text=Y:
-MatrixPlotPanel.jLabel2.text=X:
-MatrixPlotPanel.jLabel1.text=Title:
-MatrixPlotPanel.jLabel4.text=Z:
-MatrixPlotPanel.jComboBoxZ.toolTipText=Plot Value
-ConfigurationPanel.jButton1.text=
-ChannelParameterMappingPanel.jLabel1.text=Type:
-ChannelParameterMappingPanel.Type.toolTipText=Id to map this variable
-ChannelParameterMappingPanel.jButton1.text=
-IDParameterMappingPanel.jTextField2.text=Variable
-IDParameterMappingPanel.jLabel1.text=Id:
-IDParameterMappingPanel.jButton1.text=
-IDParameterMappingPanel.jLabel1.text_1=Id:
-IDParameterMappingPanel.jButton1.text_1=
-ScriptManipulationPanel.jButton1.text=
-ScriptManipulationPanel.jTextFieldId.text=Id
-ScriptManipulationPanel.jLabel1.text=Id:
-DiscreteStepPositionerPanel.jLabel1.text=Id:
-DiscreteStepPositionerPanel.jTextFieldId.text=Id
-ContinuousPositionerPanel.jLabel1.text=Id:
-ContinuousPositionerPanel.jTextFieldId.text=Id
-ArrayDetectorPanel.jLabel1.text=Id:
-ArrayDetectorPanel.jTextFieldId.text=Id
-PseudoPositionerPanel.jLabel2.text=Id:
-PseudoPositionerPanel.jTextFieldId.text=Id
-ScalarDetectorPanel.jLabel1.text=Id:
-ScalarDetectorPanel.jTextFieldId.text=Id
-ScalerChannelPanel.jLabel2.text=Id:
-ScalerChannelPanel.jTextFieldId.text=Id
-SimpleScalarDetectorPanel.jLabel1.text=Id:
-SimpleScalarDetectorPanel.jTextFieldId.text=Id
-TimestampDetectorPanel.jLabel2.text=Id:
-TimestampDetectorPanel.jTextFieldId.text=Id
-ConfigurationPanel.jCheckBoxFailOnSensorError.text=Fail on Sensor Error
-ScriptActionPanel.jButton1.text=
-ScriptActionPanel.jButton1.toolTipText=Add optional items
-ConfigurationPanel.jButton2.text=
-PseudoPositionerPanel.Settling\ Time.text=
-PseudoPositionerPanel.jLabel3.text=Settling Time:
-PseudoPositionerPanel.jButton1.text=
-PseudoPositionerPanel.jLabel4.text=Done:
-PseudoPositionerPanel.Done.text=
-PseudoPositionerPanel.jLabel5.text=Done Value:
-PseudoPositionerPanel.Done\ Value.text=
-PseudoPositionerPanel.jLabel6.text=Done Delay:
-PseudoPositionerPanel.Done\ Delay.text=
-DiscreteStepDimensionPanel.Data\ Group.text=Data Group
-ContinuousDimensionPanel.Data\ Group.text=Data Group
-ScalarDetectorPanel.Type.toolTipText=Data type
-ScalarDetectorPanel.jLabel2.text=Type:
-RecipientPanel.jButton1.text=Test
-RecipientPanel.jButton1.toolTipText=Send test notification
-ChannelParameterMappingPanel.jTextFieldVariable.text=Variable
-ChannelParameterMappingPanel.jTextFieldName.text=Channel Name
-DiscreteStepDimensionPanel.jCheckBoxZigZag.toolTipText=ZigZag Dimension
-IDParameterMappingPanel.jTextFieldVariable.text_1=Variable
-RecipientPanel.jTextFieldSms.toolTipText=email address or SMS number
-RecipientPanel.jTextFieldSms.text=SMS, E-Mail
-ContinuousDimensionPanel.ZigZag.toolTipText=ZigZag
-ContinuousDimensionPanel.ZigZag.text=ZigZag
-RecipientPanel.Error.text=Error
-RecipientPanel.Success.text=Success
-RecipientPanel.jButton2.text=
-RegionPanel.jLabel4.text=Function:
-FunctionPositionerPanel.discreteStepPositionerPanel1.toolTipText=
-FunctionPositionerPanel.jFormattedTextFieldStepSize.toolTipText=Step Size
-FunctionPositionerPanel.jLabel3.text=Step Size:
-FunctionPositionerPanel.jFormattedTextFieldStart.toolTipText=Start
-FunctionPositionerPanel.jLabel1.text=Start:
-FunctionPositionerPanel.jFormattedTextFieldEnd.toolTipText=End
-FunctionPositionerPanel.jLabel2.text=End:
-SimpleScalarDetectorPanel.jButton1.text=
-SimpleScalarDetectorPanel.SCR.text=SCR
-LinePlotArrayPanel.jButton1.text=
-LinePlotArrayPanel.jLabel3.text=Y:
-LinePlotArrayPanel.jComboBoxY.toolTipText=y-Axis
-LinePlotArrayPanel.jLabel1.text=Title:
-LinePlotArrayPanel.jTextFieldTitle.toolTipText=Title of the plot
-MatrixPlotArrayPanel.jComboBoxZ.toolTipText=Array value to plot
-MatrixPlotArrayPanel.jLabel4.text=Z:
-MatrixPlotArrayPanel.jLabel1.text=Title:
-MatrixPlotArrayPanel.jButton1.text=
-MatrixPlotArrayPanel.jTextFieldTitle.toolTipText=Title of the plot
-MatrixPlotArrayPanel.jLabel3.text=Y:
-MatrixPlotArrayPanel.jComboBoxY.toolTipText=y-Axis
-MatrixPlotArrayPanel.jLabel2.text=Size:
-LinePlotArrayPanel.jLabel2.text=Max Series:
-LinePlotArrayPanel.jLabel2.toolTipText=Maximum number of series in plot
-LinePlotArrayPanel.Max\ Series.toolTipText=Maximum number of series in plot
-LinePlotArrayPanel.Max\ Series.text=
-LinePlotPanel.jButton2.text=
-LinePlotArrayPanel.jLabel4.text=Offset:
-LinePlotArrayPanel.jLabel5.text=Size:
-LinePlotArrayPanel.Offset.text=
-LinePlotArrayPanel.Size.text=
-MatrixPlotArrayPanel.jLabel5.text=Offset:
-MatrixPlotArrayPanel.Offset.text=
-MatrixPlotArrayPanel.Size.toolTipText=Size of array specified as Z
-MatrixPlotArrayPanel.Size.text=
-LinePlotArrayPanel.jButton2.text=
-GlobalVariablePanel.jLabel1.text=Name:
-GlobalVariablePanel.jLabel2.text=Value:
-GlobalVariablePanel.jTextFieldName.text=
-GlobalVariablePanel.jTextFieldValue.text=
-FunctionPanel.jButton1.text=
-GlobalVariableParameterMappingPanel.jLabel1.text_1=Variable:
-GlobalVariableParameterMappingPanel.jButton1.text_1=
-GlobalVariableParameterMappingPanel.jTextFieldVariable.text_1=Variable
-ConfigurationPanel.Description.text=
-GlobalVariablePanel.jButton1.text=
-GlobalVariablePanel.jTextFieldDescription.text=Description
-ScriptManipulationPanel.Returns\ Array.text=Array
-LinearPositionerPanel.Asynchronous.toolTipText=Asynchronous move
-LinearPositionerPanel.Asynchronous.text=Asynchronous
-DiscreteStepPositionerPanel.Asynchronous.text=Asynchronous:
-DiscreteStepPositionerPanel.jLabel7.text=Type:
-PseudoPositionerPanel.jLabel7.text=Type:
--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>

 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <Properties>
@@ -25,12 +25,12 @@
  <Layout>
    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jPanel1" alignment="0" pref="629" max="32767" attributes="0"/>
+          <Component id="jPanel1" alignment="0" pref="665" max="32767" attributes="0"/>
      </Group>
    </DimensionLayout>
    <DimensionLayout dim="1">
      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
+          <Component id="jPanel1" alignment="0" pref="32" max="32767" attributes="0"/>
      </Group>
    </DimensionLayout>
  </Layout>
@@ -105,10 +105,13 @@
        <Component class="javax.swing.JComboBox" name="jComboBoxOperation">
          <Properties>
            <Property name="model" type="javax.swing.ComboBoxModel" editor="org.netbeans.modules.form.editors2.ComboBoxModelEditor">
-              <StringArray count="3">
+              <StringArray count="6">
                <StringItem index="0" value="put"/>
                <StringItem index="1" value="putq"/>
                <StringItem index="2" value="wait"/>
+                <StringItem index="3" value="waitAND"/>
+                <StringItem index="4" value="waitOR"/>
+                <StringItem index="5" value="waitREGEX"/>
              </StringArray>
            </Property>
            <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ChannelActionPanel.java
@@ -205,7 +205,7 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
        jFormattedTextFieldChannel.setPreferredSize(new java.awt.Dimension(180, 28));
        jPanel1.add(jFormattedTextFieldChannel);

-        jLabel2.setFont(new java.awt.Font("Lucida Grande", 1, 13));
+        jLabel2.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
        jLabel2.setLabelFor(jTextFieldValue);
        jLabel2.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel2.text")); // NOI18N
        jLabel2.setToolTipText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel2.toolTipText")); // NOI18N
@@ -216,17 +216,17 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
        jTextFieldValue.setPreferredSize(new java.awt.Dimension(60, 28));
        jPanel1.add(jTextFieldValue);

-        jLabel3.setFont(new java.awt.Font("Lucida Grande", 1, 13));
+        jLabel3.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
        jLabel3.setLabelFor(jComboBoxOperation);
        jLabel3.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel3.text")); // NOI18N
        jPanel1.add(jLabel3);

-        jComboBoxOperation.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "put", "putq", "wait" }));
+        jComboBoxOperation.setModel(new javax.swing.DefaultComboBoxModel(new String[] { "put", "putq", "wait", "waitAND", "waitOR", "waitREGEX" }));
        jComboBoxOperation.setToolTipText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jComboBoxOperation.toolTipText")); // NOI18N
        jComboBoxOperation.setName("Operation"); // NOI18N
        jPanel1.add(jComboBoxOperation);

-        jLabel4.setFont(new java.awt.Font("Lucida Grande", 1, 13));
+        jLabel4.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
        jLabel4.setLabelFor(jComboBoxType);
        jLabel4.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel4.text")); // NOI18N
        jPanel1.add(jLabel4);
@@ -236,7 +236,7 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
        jComboBoxType.setName("Type"); // NOI18N
        jPanel1.add(jComboBoxType);

-        jLabel5.setFont(new java.awt.Font("Lucida Grande", 1, 13));
+        jLabel5.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
        jLabel5.setLabelFor(jFormattedTextFieldTimeout);
        jLabel5.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel5.text")); // NOI18N
        jPanel1.add(jLabel5);
@@ -247,7 +247,7 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
        jFormattedTextFieldTimeout.setPreferredSize(new java.awt.Dimension(60, 28));
        jPanel1.add(jFormattedTextFieldTimeout);

-        jLabel6.setFont(new java.awt.Font("Lucida Grande", 1, 13));
+        jLabel6.setFont(new java.awt.Font("Lucida Grande", 1, 13)); // NOI18N
        jLabel6.setLabelFor(jFormattedTextFieldDelay);
        jLabel6.setText(org.openide.util.NbBundle.getMessage(ChannelActionPanel.class, "ChannelActionPanel.jLabel6.text")); // NOI18N
        jPanel1.add(jLabel6);
@@ -268,11 +268,11 @@ public class ChannelActionPanel extends javax.swing.JPanel implements ObjectProv
        this.setLayout(layout);
        layout.setHorizontalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 629, Short.MAX_VALUE)
+            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 665, Short.MAX_VALUE)
        );
        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+            .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, 32, Short.MAX_VALUE)
        );
    }// </editor-fold>//GEN-END:initComponents

--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/DefaultSettings.java
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/DefaultSettings.java
@@ -27,7 +27,7 @@ public class DefaultSettings {
    
    private final static DefaultSettings instance = new DefaultSettings();

-    private boolean collapsed = true;
+    private boolean collapsed = false;


    private DefaultSettings(){
--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.form
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>

 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <NonVisualComponents>
@@ -156,4 +156,4 @@
      </AuxValues>
    </Component>
  </SubComponents>
-</Form>
+</Form>
--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.java
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/FunctionPositionerPanel.java
@@ -106,7 +106,7 @@ public class FunctionPositionerPanel extends javax.swing.JPanel implements Objec
        });

        collapsibleContainer1.setHeader("Function");
-        collapsibleContainer1.setCollapsed(true);
+//        collapsibleContainer1.setCollapsed(true);
        collapsibleContainer1.deactivateAddButton(); // Disable add button
        

--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.form
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.form
@@ -1,4 +1,4 @@
-<?xml version="1.1" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8" ?>

 <Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <AuxValues>
@@ -16,12 +16,28 @@
  <Layout>
    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jTextField1" alignment="1" pref="400" max="32767" attributes="0"/>
+          <Group type="102" alignment="1" attributes="0">
+              <Component id="jTextField1" pref="84" max="32767" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jCheckBox1" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jTextField2" min="-2" pref="31" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
+              <Component id="jButton1" min="-2" max="-2" attributes="0"/>
+          </Group>
      </Group>
    </DimensionLayout>
    <DimensionLayout dim="1">
      <Group type="103" groupAlignment="0" attributes="0">
-          <Component id="jTextField1" min="-2" max="-2" attributes="0"/>
+          <Group type="103" groupAlignment="3" attributes="0">
+              <Component id="jTextField1" alignment="3" min="-2" max="-2" attributes="0"/>
+              <Component id="jButton1" alignment="3" min="-2" max="-2" attributes="0"/>
+              <Component id="jCheckBox1" alignment="3" min="-2" max="-2" attributes="0"/>
+              <Component id="jTextField2" alignment="3" min="-2" max="-2" attributes="0"/>
+              <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
+          </Group>
      </Group>
    </DimensionLayout>
  </Layout>
@@ -39,5 +55,47 @@
        </Property>
      </Properties>
    </Component>
+    <Component class="javax.swing.JButton" name="jButton1">
+      <Properties>
+        <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+          <Image iconType="3" name="/ch/psi/fda/ui/ce/icons/plus.png"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="ch/psi/fda/ui/ce/panels/model/Bundle.properties" key="ShellActionPanel.jButton1.text_1" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+        <Property name="borderPainted" type="boolean" value="false"/>
+        <Property name="contentAreaFilled" type="boolean" value="false"/>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JCheckBox" name="jCheckBox1">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="ch/psi/fda/ui/ce/panels/model/Bundle.properties" key="ShellActionPanel.jCheckBox1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+        <Property name="name" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="ch/psi/fda/ui/ce/panels/model/Bundle.properties" key="ShellActionPanel.jCheckBox1.name" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JTextField" name="jTextField2">
+      <Properties>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="ch/psi/fda/ui/ce/panels/model/Bundle.properties" key="ShellActionPanel.jTextField2.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+        <Property name="name" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="ch/psi/fda/ui/ce/panels/model/Bundle.properties" key="ShellActionPanel.jTextField2.name" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
+    <Component class="javax.swing.JLabel" name="jLabel1">
+      <Properties>
+        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
+          <ComponentRef name="jTextField2"/>
+        </Property>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="ch/psi/fda/ui/ce/panels/model/Bundle.properties" key="ShellActionPanel.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+    </Component>
  </SubComponents>
 </Form>
--- a/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.java
+++ b/fda.ui.ce/src/main/java/ch/psi/fda/ui/ce/panels/model/ShellActionPanel.java
@@ -33,6 +33,8 @@ import java.awt.Component;
 import java.util.HashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
 import javax.swing.event.DocumentEvent;

 /**
@@ -58,12 +60,16 @@ public class ShellActionPanel extends javax.swing.JPanel implements ObjectProvid

        HashMap<Component, ComponentMetadata> managedFields = new HashMap<Component,ComponentMetadata>();
        managedFields.put(jTextField1, new ComponentMetadata(true));
+        managedFields.put(jCheckBox1, new ComponentMetadata(false));
+        managedFields.put(jTextField2, new ComponentMetadata(false, "0"));

        this.panelSupport = new PanelSupport();
        this.panelSupport.analyze(managedFields);

        // Update view
        this.jTextField1.setText(action.getCommand());
+        this.jCheckBox1.setSelected(action.isCheckExitValue());
+        this.jTextField2.setText(""+action.getExitValue());

        // Establish bindings
        jTextField1.getDocument().addDocumentListener(new DocumentAdapter() {
@@ -73,9 +79,29 @@ public class ShellActionPanel extends javax.swing.JPanel implements ObjectProvid
                action.setCommand(panelSupport.getRealFieldValue(jTextField1));
            }
        });
+        jCheckBox1.addChangeListener(new ChangeListener() {
+            @Override
+            public void stateChanged(ChangeEvent ce) {
+                modified = true;
+                action.setCheckExitValue(jCheckBox1.isSelected());
+            }
+        });
+        jTextField1.getDocument().addDocumentListener(new DocumentAdapter() {
+            @Override
+            public void valueChange(DocumentEvent de) {
+                modified = true;
+                try{
+                    action.setExitValue(new Integer(panelSupport.getRealFieldValue(jTextField2)));
+                }
+                catch(Exception e){
+                    jTextField2.setText(""+action.getExitValue());
+                }
+                       
+            }
+        });


-        this.panelSupport.manage(this, managedFields, null);
+        this.panelSupport.manage(this, managedFields, jButton1);
    }

    /** This method is called from within the constructor to
@@ -88,26 +114,62 @@ public class ShellActionPanel extends javax.swing.JPanel implements ObjectProvid
    private void initComponents() {

        jTextField1 = new javax.swing.JTextField();
+        jButton1 = new javax.swing.JButton();
+        jCheckBox1 = new javax.swing.JCheckBox();
+        jTextField2 = new javax.swing.JTextField();
+        jLabel1 = new javax.swing.JLabel();

        jTextField1.setText(org.openide.util.NbBundle.getMessage(ShellActionPanel.class, "ShellActionPanel.jTextField1.text")); // NOI18N
        jTextField1.setToolTipText(org.openide.util.NbBundle.getMessage(ShellActionPanel.class, "ShellActionPanel.jTextField1.toolTipText")); // NOI18N
        jTextField1.setPreferredSize(new java.awt.Dimension(200, 28));

+        jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ch/psi/fda/ui/ce/icons/plus.png"))); // NOI18N
+        jButton1.setText(org.openide.util.NbBundle.getMessage(ShellActionPanel.class, "ShellActionPanel.jButton1.text_1")); // NOI18N
+        jButton1.setBorderPainted(false);
+        jButton1.setContentAreaFilled(false);
+
+        jCheckBox1.setText(org.openide.util.NbBundle.getMessage(ShellActionPanel.class, "ShellActionPanel.jCheckBox1.text")); // NOI18N
+        jCheckBox1.setName(org.openide.util.NbBundle.getMessage(ShellActionPanel.class, "ShellActionPanel.jCheckBox1.name")); // NOI18N
+
+        jTextField2.setText(org.openide.util.NbBundle.getMessage(ShellActionPanel.class, "ShellActionPanel.jTextField2.text")); // NOI18N
+        jTextField2.setName(org.openide.util.NbBundle.getMessage(ShellActionPanel.class, "ShellActionPanel.jTextField2.name")); // NOI18N
+
+        jLabel1.setLabelFor(jTextField2);
+        jLabel1.setText(org.openide.util.NbBundle.getMessage(ShellActionPanel.class, "ShellActionPanel.jLabel1.text")); // NOI18N
+
        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
        this.setLayout(layout);
        layout.setHorizontalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jTextField1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 400, Short.MAX_VALUE)
+            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+                .addComponent(jTextField1, javax.swing.GroupLayout.DEFAULT_SIZE, 84, Short.MAX_VALUE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jCheckBox1)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jLabel1)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jTextField2, javax.swing.GroupLayout.PREFERRED_SIZE, 31, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jButton1))
        );
        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                .addComponent(jTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(jButton1)
+                .addComponent(jCheckBox1)
+                .addComponent(jTextField2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addComponent(jLabel1))
        );
    }// </editor-fold>//GEN-END:initComponents


    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JButton jButton1;
+    private javax.swing.JCheckBox jCheckBox1;
+    private javax.swing.JLabel jLabel1;
    private javax.swing.JTextField jTextField1;
+    private javax.swing.JTextField jTextField2;
    // End of variables declaration//GEN-END:variables


--- a/fda.ui.ce/src/main/resources/ch/psi/fda/ui/ce/panels/model/Bundle.properties
+++ b/fda.ui.ce/src/main/resources/ch/psi/fda/ui/ce/panels/model/Bundle.properties
@@ -260,3 +260,9 @@ LinearPositionerPanel.Asynchronous.text=Asynchronous
 DiscreteStepPositionerPanel.Asynchronous.text=Asynchronous:
 DiscreteStepPositionerPanel.jLabel7.text=Type:
 PseudoPositionerPanel.jLabel7.text=Type:
+ShellActionPanel.jButton1.text_1=
+ShellActionPanel.jCheckBox1.text=Check ReturnValue
+ShellActionPanel.jCheckBox1.name=Check ReturnValue
+ShellActionPanel.jTextField2.text=
+ShellActionPanel.jLabel1.text=Return Value
+ShellActionPanel.jTextField2.name=Return Value
--- a/fda.ui.cm/pom.xml
+++ b/fda.ui.cm/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>fda.ui</artifactId>
        <groupId>ch.psi</groupId>
-        <version>1.1.30</version>
+        <version>1.1.40</version>
    </parent>

    <artifactId>fda.ui.cm</artifactId>
--- a/fda.ui.ee/pom.xml
+++ b/fda.ui.ee/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>fda.ui</artifactId>
        <groupId>ch.psi</groupId>
-        <version>1.1.30</version>
+        <version>1.1.40</version>
    </parent>
    
    <artifactId>fda.ui.ee</artifactId>
@@ -87,7 +87,7 @@
        <dependency>
            <groupId>ch.psi</groupId>
            <artifactId>fda</artifactId>
-            <version>1.1.30</version>
+            <version>1.1.40</version>
            <type>jar</type>
        </dependency>
    </dependencies>
--- a/fda.ui.preferences/pom.xml
+++ b/fda.ui.preferences/pom.xml
@@ -4,7 +4,7 @@
    <parent>
        <artifactId>fda.ui</artifactId>
        <groupId>ch.psi</groupId>
-        <version>1.1.30</version>
+        <version>1.1.40</version>
    </parent>

    <artifactId>fda.ui.preferences</artifactId>
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@

    <groupId>ch.psi</groupId>
    <artifactId>fda.ui</artifactId>
-    <version>1.1.30</version>
+    <version>1.1.40</version>
    <packaging>pom</packaging>

    <name>fda.ui - NB App Parent</name>
@@ -69,12 +69,12 @@
        <snapshotRepository>
            <id>i.snapshots</id>
            <name>Artifactory Snapshots</name>
-            <url>http://slsyoke1/artifactory/libs-snapshots-local</url>
+            <url>http://yoke/artifactory/libs-snapshots-local</url>
        </snapshotRepository>
        <repository>
            <id>i.releases</id>
            <name>Atrifactory Releases</name>
-            <url>http://slsyoke1/artifactory/libs-releases-local</url>
+            <url>http://yoke/artifactory/libs-releases-local</url>
        </repository>
    </distributionManagement>

@@ -89,7 +89,7 @@
    </modules>

    <properties>
-        <netbeans.version>RELEASE701</netbeans.version>
+        <netbeans.version>RELEASE712</netbeans.version>
        <brandingToken>fda</brandingToken>
    </properties>
 </project>
Author	SHA1	Message	Date
Simon Ebner	c3ccfb3312	new version 1.1.40	2013-09-25 09:32:13 +02:00
Simon Ebner	58c908d5ad	do not collapse function of functional positioner	2013-09-23 11:33:59 +02:00
Simon Ebner	3026aa7510	Changed version to 1.1.39 and disabled auto collapse (see Request/Issue FDA-74)	2013-09-23 10:38:15 +02:00
Simon Ebner	a9d801bcca	FDA-70 Added support for waitREGEX condition ...	2013-05-21 16:03:35 +02:00
Simon Ebner	fb2b07b133	Added new channel operations bitwise AND and OR	2013-05-21 14:21:00 +02:00
Simon Ebner	b12968b6ce	Added hack for fdaq readout	2013-04-16 11:51:41 +02:00
Simon Ebner	56fbb7b349	Updated version to 1.0.36	2013-03-11 13:47:31 +01:00
ebner	de03e88c8a	Changed Shell Action Panel to support exit value check and exit value. NOTE: the newer versions of netbeans have a strange behavior the Bundles.properties gets generated inside the src/main/java folder but they need to be manually copied to the src/main/resources folder once the form is saved. Otherwise things will crash...	2012-06-27 15:18:33 +02:00
ebner	ee28c20847	Updated to new version 35	2012-06-27 14:40:52 +02:00
ebner	5b14b8bf52	Updated the version to 1.1.34	2012-06-25 15:17:37 +02:00
ebner	d6098fce12	added .project file of Eclipse	2012-05-31 10:11:15 +02:00
ebner	6bcc45d69a	Updated version	2012-05-31 10:09:00 +02:00