pshell/MXSC
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix on interpreter parsing empty lines

Browse Source
This commit is contained in:
gobbo_a
2014-12-12 15:59:22 +01:00
parent e2cc7e1fd8
commit 47a5237c1d
2 changed files with 61 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/main/java/ch/psi/plugin/MainPanel.form
View File

@@ -16,46 +16,16 @@
<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="motorPanel1" min="-2" max="-2" attributes="0"/>
<Component id="motorPanel2" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="jPanel1" max="32767" attributes="0"/>
<EmptySpace min="-2" pref="82" max="-2" attributes="0"/>
</Group>
<Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0">
<EmptySpace max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" max="-2" attributes="0">
<Component id="jPanel1" pref="0" max="32767" attributes="0"/>
<Group type="102" attributes="0">
<Component id="motorPanel1" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="motorPanel2" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace pref="30" max="32767" attributes="0"/>
</Group>
<Component id="jPanel1" alignment="0" max="32767" attributes="0"/>
</Group>
</DimensionLayout>
</Layout>
<SubComponents>
<Component class="ch.psi.pshell.swing.MotorPanel" name="motorPanel1">
<Properties>
<Property name="showTitle" type="boolean" value="true"/>
</Properties>
</Component>
<Component class="ch.psi.pshell.swing.MotorPanel" name="motorPanel2">
<Properties>
<Property name="showTitle" type="boolean" value="true"/>
</Properties>
</Component>
<Container class="javax.swing.JPanel" name="jPanel1">
<Properties>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
@@ -69,21 +39,22 @@
<DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace max="32767" attributes="0"/>
<Group type="103" groupAlignment="2" attributes="0">
<Component id="buttonStart1" alignment="2" pref="193" max="32767" attributes="0"/>
<Component id="buttonStart2" alignment="2" pref="193" max="32767" attributes="0"/>
<Component id="buttonStart3" alignment="2" pref="193" max="32767" attributes="0"/>
<Component id="buttonStart4" alignment="2" pref="193" max="32767" attributes="0"/>
<EmptySpace pref="188" max="32767" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="buttonStart1" linkSize="2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="buttonStart2" linkSize="2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="buttonStart3" linkSize="2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="buttonStart4" linkSize="2" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="buttonStart5" linkSize="2" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="32767" attributes="0"/>
<EmptySpace pref="189" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
<DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="1" attributes="0">
<EmptySpace max="32767" attributes="0"/>
<Group type="102" alignment="0" attributes="0">
<EmptySpace pref="17" max="32767" attributes="0"/>
<Component id="buttonStart1" linkSize="1" min="-2" pref="32" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="buttonStart2" linkSize="1" min="-2" max="-2" attributes="0"/>
@@ -91,7 +62,9 @@
<Component id="buttonStart3" linkSize="1" min="-2" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="buttonStart4" linkSize="1" min="-2" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="95" max="-2" attributes="0"/>
<EmptySpace type="separate" max="-2" attributes="0"/>
<Component id="buttonStart5" linkSize="1" min="-2" max="-2" attributes="0"/>
<EmptySpace pref="27" max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -129,6 +102,14 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonStart4ActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JButton" name="buttonStart5">
<Properties>
<Property name="text" type="java.lang.String" value="Start Data Acquisition 5"/>
</Properties>
<Events>
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="buttonStart5ActionPerformed"/>
</Events>
</Component>
</SubComponents>
</Container>
</SubComponents>

76
src/main/java/ch/psi/plugin/MainPanel.java
View File

@@ -33,6 +33,7 @@ public class MainPanel extends javax.swing.JPanel {
@Override
public void onChangedState(State newState, State curState) {
try{
/*
if (newState==State.Ready){
motorPanel1.setDevice(controller.getDevicePool().getByName("motor"));
motorPanel2.setDevice(controller.getDevicePool().getByName("m"));
@@ -42,13 +43,15 @@ public class MainPanel extends javax.swing.JPanel {
motorPanel2.setDevice(null);
}
}
*/
buttonStart1.setEnabled(newState==State.Ready);
buttonStart2.setEnabled(newState==State.Ready);
buttonStart3.setEnabled(newState==State.Ready);
buttonStart4.setEnabled(newState==State.Ready);
motorPanel1.setEnabled(newState==State.Ready);
motorPanel2.setEnabled(newState==State.Ready);
buttonStart5.setEnabled(newState==State.Ready);
//motorPanel1.setEnabled(newState==State.Ready);
//motorPanel2.setEnabled(newState==State.Ready);
}
catch (Exception ex){
ex.printStackTrace();
@@ -78,17 +81,12 @@ public class MainPanel extends javax.swing.JPanel {
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
private void initComponents() {
motorPanel1 = new ch.psi.pshell.swing.MotorPanel();
motorPanel2 = new ch.psi.pshell.swing.MotorPanel();
jPanel1 = new javax.swing.JPanel();
buttonStart1 = new javax.swing.JButton();
buttonStart2 = new javax.swing.JButton();
buttonStart3 = new javax.swing.JButton();
buttonStart4 = new javax.swing.JButton();
motorPanel1.setShowTitle(true);
motorPanel2.setShowTitle(true);
buttonStart5 = new javax.swing.JButton();
jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Tasks"));
@@ -120,23 +118,34 @@ public class MainPanel extends javax.swing.JPanel {
}
});
buttonStart5.setText("Start Data Acquisition 5");
buttonStart5.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) {
buttonStart5ActionPerformed(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(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.CENTER)
.addComponent(buttonStart1, javax.swing.GroupLayout.DEFAULT_SIZE, 193, Short.MAX_VALUE)
.addComponent(buttonStart2, javax.swing.GroupLayout.DEFAULT_SIZE, 193, Short.MAX_VALUE)
.addComponent(buttonStart3, javax.swing.GroupLayout.DEFAULT_SIZE, 193, Short.MAX_VALUE)
.addComponent(buttonStart4, javax.swing.GroupLayout.DEFAULT_SIZE, 193, Short.MAX_VALUE))
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap(188, Short.MAX_VALUE)
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(buttonStart1)
.addComponent(buttonStart2)
.addComponent(buttonStart3)
.addComponent(buttonStart4)
.addComponent(buttonStart5))
.addContainerGap(189, Short.MAX_VALUE))
);
jPanel1Layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {buttonStart1, buttonStart2, buttonStart3, buttonStart4, buttonStart5});
jPanel1Layout.setVerticalGroup(
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
.addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGroup(jPanel1Layout.createSequentialGroup()
.addContainerGap(17, Short.MAX_VALUE)
.addComponent(buttonStart1, javax.swing.GroupLayout.PREFERRED_SIZE, 32, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18)
.addComponent(buttonStart2)
@@ -144,35 +153,22 @@ public class MainPanel extends javax.swing.JPanel {
.addComponent(buttonStart3)
.addGap(18, 18, 18)
.addComponent(buttonStart4)
.addGap(95, 95, 95))
.addGap(18, 18, 18)
.addComponent(buttonStart5)
.addContainerGap(27, Short.MAX_VALUE))
);
jPanel1Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {buttonStart1, buttonStart2, buttonStart3, buttonStart4});
jPanel1Layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {buttonStart1, buttonStart2, buttonStart3, buttonStart4, buttonStart5});
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(motorPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(motorPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
.addGap(18, 18, 18)
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addGap(82, 82, 82))
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
);
layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup()
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
.addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup()
.addComponent(motorPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(18, 18, 18)
.addComponent(motorPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
.addContainerGap(30, Short.MAX_VALUE))
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
);
}// </editor-fold>//GEN-END:initComponents
@@ -196,14 +192,18 @@ public class MainPanel extends javax.swing.JPanel {
runScript("test4");
}//GEN-LAST:event_buttonStart4ActionPerformed
private void buttonStart5ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonStart5ActionPerformed
// TODO add your handling code here:
runScript("test5");
}//GEN-LAST:event_buttonStart5ActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton buttonStart1;
private javax.swing.JButton buttonStart2;
private javax.swing.JButton buttonStart3;
private javax.swing.JButton buttonStart4;
private javax.swing.JButton buttonStart5;
private javax.swing.JPanel jPanel1;
private ch.psi.pshell.swing.MotorPanel motorPanel1;
private ch.psi.pshell.swing.MotorPanel motorPanel2;
// End of variables declaration//GEN-END:variables
}