From 47a5237c1d1afd2faa1e908d30134ec20eec4e5e Mon Sep 17 00:00:00 2001 From: Alexandre Gobbo Date: Fri, 12 Dec 2014 15:59:22 +0100 Subject: [PATCH] Fix on interpreter parsing empty lines --- src/main/java/ch/psi/plugin/MainPanel.form | 65 +++++++----------- src/main/java/ch/psi/plugin/MainPanel.java | 76 +++++++++++----------- 2 files changed, 61 insertions(+), 80 deletions(-) diff --git a/src/main/java/ch/psi/plugin/MainPanel.form b/src/main/java/ch/psi/plugin/MainPanel.form index 5607514..b386544 100644 --- a/src/main/java/ch/psi/plugin/MainPanel.form +++ b/src/main/java/ch/psi/plugin/MainPanel.form @@ -16,46 +16,16 @@ - - - - - - - - - - + - - - - - - - - - - - - + - - - - - - - - - - @@ -69,21 +39,22 @@ - - - - - - + + + + + + + - + - - + + @@ -91,7 +62,9 @@ - + + + @@ -129,6 +102,14 @@ + + + + + + + + diff --git a/src/main/java/ch/psi/plugin/MainPanel.java b/src/main/java/ch/psi/plugin/MainPanel.java index d5046da..e6d6568 100644 --- a/src/main/java/ch/psi/plugin/MainPanel.java +++ b/src/main/java/ch/psi/plugin/MainPanel.java @@ -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 { // //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) ); }// //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 }