From e6ea1cc047f69e41e84d6beb9eaff5867b7aba0a Mon Sep 17 00:00:00 2001 From: boccioli_m Date: Thu, 3 Sep 2015 16:00:46 +0200 Subject: [PATCH] Startup --- plugins/TestingList.java | 1 - plugins/TestingPanel.java | 359 -------------------------------------- 2 files changed, 360 deletions(-) delete mode 100644 plugins/TestingPanel.java diff --git a/plugins/TestingList.java b/plugins/TestingList.java index ee9f79f..94a0c86 100644 --- a/plugins/TestingList.java +++ b/plugins/TestingList.java @@ -1865,7 +1865,6 @@ public class TestingList extends Panel { totalRows = model.getRowCount(); row=0; } - } } diff --git a/plugins/TestingPanel.java b/plugins/TestingPanel.java deleted file mode 100644 index 0bf7615..0000000 --- a/plugins/TestingPanel.java +++ /dev/null @@ -1,359 +0,0 @@ -/* - * Copyright (c) 2014 Paul Scherrer Institute. All rights reserved. - */ - -import ch.psi.pshell.device.Motor; -import ch.psi.pshell.plot.LinePlotBase; -import ch.psi.pshell.plot.LinePlotJFree; -import ch.psi.pshell.plot.LinePlotSeries; -import ch.psi.pshell.plot.Plot; -import ch.psi.pshell.swing.MotorPanel; -import ch.psi.utils.swing.MonitoredPanel; -import ch.psi.pshell.ui.Panel; -import ch.psi.utils.swing.SwingUtils; -import ch.psi.wsaf.Task; -import ch.psi.wsaf.TaskRunMode; -import java.util.HashMap; -import javax.swing.JPanel; - -/** - * - */ -public class TestingPanel extends Panel { - MotorPanel motorPanel; - LinePlotBase plot ; - LinePlotSeries series; - Motor motor; - - Task task = new Task() { - @Override - protected Object execute() throws Exception { - series.clear(); - for (int i=0;i<1000;i++){ - double pos = motor.read(); - Thread.sleep(2); - plot.getAxis(Plot.AxisId.X).setRange(0, 1000); - series.appendData(i, pos); - } - return true; - } - }; - - - @Override - protected JPanel create() { - getApp().addTask(task); - return new NetbeansPluginPanel(); - - } - - @Override - protected void onInitialize(int runCount){ - motor = (Motor) TestingPanel.this.getDevice("motor"); - motorPanel.setDevice(motor); - } - - public class NetbeansPluginPanel extends MonitoredPanel { - - public NetbeansPluginPanel() { - initComponents(); - motorPanel = new MotorPanel(); - panel.add(motorPanel); - onInitialize(-1); - - plot = new LinePlotJFree(); - plot.setTitle("bo"); - panelPlot.add(plot); - series=new LinePlotSeries("Position"); - plot.addSeries(series); - - } - - @SuppressWarnings("unchecked") - // //GEN-BEGIN:initComponents - private void initComponents() { - - buttonExecute = new javax.swing.JButton(); - buttonAbort = new javax.swing.JButton(); - jButton1 = new javax.swing.JButton(); - check = new javax.swing.JCheckBox(); - spinner = new javax.swing.JSpinner(); - panel = new javax.swing.JPanel(); - panelPlot = new javax.swing.JPanel(); - jButton2 = new javax.swing.JButton(); - jButton3 = new javax.swing.JButton(); - jCheckBox1 = new javax.swing.JCheckBox(); - jButton4 = new javax.swing.JButton(); - txtTestPSRes = new javax.swing.JTextField(); - - buttonExecute.setText("Execute test11"); - buttonExecute.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - buttonExecuteActionPerformed(evt); - } - }); - - buttonAbort.setText("Abort"); - buttonAbort.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - buttonAbortActionPerformed(evt); - } - }); - - jButton1.setText("Test with params"); - jButton1.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jButton1ActionPerformed(evt); - } - }); - - check.setText("Var1"); - - spinner.setModel(new javax.swing.SpinnerNumberModel(1, 1, 10, 1)); - - panel.setLayout(new java.awt.BorderLayout()); - - panelPlot.setLayout(new java.awt.BorderLayout()); - - jButton2.setText("Java Code"); - jButton2.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jButton2ActionPerformed(evt); - } - }); - - jButton3.setText("Test PS"); - jButton3.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jButton3ActionPerformed(evt); - } - }); - - jCheckBox1.setActionCommand("check2"); - jCheckBox1.setLabel("check2"); - jCheckBox1.setName("check2"); // NOI18N - jCheckBox1.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jCheckBox1ActionPerformed(evt); - } - }); - - jButton4.setText("Test LS"); - jButton4.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - jButton4ActionPerformed(evt); - } - }); - - javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); - this.setLayout(layout); - layout.setHorizontalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGap(41, 41, 41) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(check) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) - .addComponent(buttonExecute, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(buttonAbort, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) - .addComponent(jButton1) - .addComponent(spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGap(277, 277, 277) - .addComponent(jButton2) - .addGap(0, 0, Short.MAX_VALUE)) - .addGroup(layout.createSequentialGroup() - .addGap(87, 87, 87) - .addComponent(panel, javax.swing.GroupLayout.PREFERRED_SIZE, 394, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(jButton3) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(txtTestPSRes, javax.swing.GroupLayout.DEFAULT_SIZE, 57, Short.MAX_VALUE)) - .addComponent(jCheckBox1) - .addComponent(jButton4)) - .addContainerGap()))) - .addGroup(layout.createSequentialGroup() - .addComponent(panelPlot, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addContainerGap()))) - ); - layout.setVerticalGroup( - layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addGap(27, 27, 27) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addGroup(layout.createSequentialGroup() - .addComponent(buttonExecute) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(buttonAbort)) - .addComponent(panel, javax.swing.GroupLayout.PREFERRED_SIZE, 137, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addGap(32, 32, 32) - .addComponent(check)) - .addGroup(layout.createSequentialGroup() - .addGap(46, 46, 46) - .addComponent(jCheckBox1) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) - .addComponent(jButton3) - .addComponent(txtTestPSRes, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jButton4))) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(spinner, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) - .addComponent(jButton1) - .addComponent(jButton2)) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED) - .addComponent(panelPlot, javax.swing.GroupLayout.DEFAULT_SIZE, 185, Short.MAX_VALUE) - .addContainerGap()) - ); - }// //GEN-END:initComponents - - private void buttonExecuteActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonExecuteActionPerformed - try { - //Run script - //run("test1"); - - //Alternatives to run script with arguments - - - eval("start = 22.0"); - eval("end = 32.0"); - eval("step = 10"); - run("test11"); - - - /* - HashMap args = new HashMap(); - args.put("start", 12.0); - args.put("end", 52.0); - args.put("step", 10); - run("test11", args); - */ - - //eval("run('test11', locals = {'start':10.0, 'end':50.0, 'step':40})"); - - // evalAsync("run('test11', locals = {'start':10.0, 'end':50.0, 'step':40})"); - - - } catch (Exception ex) { - SwingUtils.showException(this, ex); - } - }//GEN-LAST:event_buttonExecuteActionPerformed - - private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed - abort(); - }//GEN-LAST:event_buttonAbortActionPerformed - - private void jButton1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed - try { - boolean var1 = check.isSelected(); - int var2 = (Integer)spinner.getValue(); - - HashMap args = new HashMap(); - args.put("relative", var1); - args.put("steps", var2); - run("args", args); - - - //evalAsync("run('args', locals = {'relative':" + (var1 ? "True" :"False") + ", 'steps':" + var2 + "})"); - - } catch (Exception ex) { - SwingUtils.showException(this, ex); - } - - }//GEN-LAST:event_jButton1ActionPerformed - - private void jButton2ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton2ActionPerformed - - try { - getApp().startTask(task); - - task.start(TaskRunMode.async); - } catch (Exception ex) { - SwingUtils.showException(NetbeansPluginPanel.this, ex); - } - - /* - new Thread(() -> { - try { - series.clear(); - for (int i=0;i<1000;i++){ - double pos = motor.read(); - Thread.sleep(2); - plot.getAxis(Plot.AxisId.X).setRange(0, 1000); - series.appendData(i, pos); - } - } catch (Exception ex) { - SwingUtils.showException(NetbeansPluginPanel.this, ex); - } - }).start(); */ - - }//GEN-LAST:event_jButton2ActionPerformed - - private void jButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton3ActionPerformed - try { - boolean var1 = jCheckBox1.isSelected(); - int var2 = 2;// (Integer)spinner.getValue(); - - HashMap args = new HashMap(); - args.put("relative", var1); - args.put("steps", var2); - run("power-supply", args); - - //try to print the result - txtTestPSRes.setText(args.get("steps").toString()); - - - //evalAsync("run('args', locals = {'relative':" + (var1 ? "True" :"False") + ", 'steps':" + var2 + "})"); - - } catch (Exception ex) { - SwingUtils.showException(this, ex); - } // TODO add your handling code here: - }//GEN-LAST:event_jButton3ActionPerformed - - private void jCheckBox1ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jCheckBox1ActionPerformed - // TODO add your handling code here: - }//GEN-LAST:event_jCheckBox1ActionPerformed - - private void jButton4ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton4ActionPerformed - // TODO add your handling code here: - try { - boolean var1 = jCheckBox1.isSelected(); - int var2 = 2;// (Integer)spinner.getValue(); - - HashMap args = new HashMap(); - args.put("relative", var1); - args.put("steps", var2); - run("motor-slide", args); - - //evalAsync("run('args', locals = {'relative':" + (var1 ? "True" :"False") + ", 'steps':" + var2 + "})"); - - } catch (Exception ex) { - SwingUtils.showException(this, ex); - } // TODO add your handling code here: - }//GEN-LAST:event_jButton4ActionPerformed - - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton buttonAbort; - private javax.swing.JButton buttonExecute; - private javax.swing.JCheckBox check; - private javax.swing.JButton jButton1; - private javax.swing.JButton jButton2; - private javax.swing.JButton jButton3; - private javax.swing.JButton jButton4; - private javax.swing.JCheckBox jCheckBox1; - private javax.swing.JPanel panel; - private javax.swing.JPanel panelPlot; - private javax.swing.JSpinner spinner; - private javax.swing.JTextField txtTestPSRes; - // End of variables declaration//GEN-END:variables -} -}