diff --git a/plugins/TestingPanel.form b/plugins/TestingPanel.form
index 496bf52..40e36a8 100644
--- a/plugins/TestingPanel.form
+++ b/plugins/TestingPanel.form
@@ -35,7 +35,7 @@
-
+
@@ -45,8 +45,14 @@
-
-
+
+
+
+
+
+
+
+
@@ -87,6 +93,8 @@
+
+
@@ -184,5 +192,13 @@
+
+
+
+
+
+
+
+
diff --git a/plugins/TestingPanel.java b/plugins/TestingPanel.java
index 89ae1c4..8b98333 100644
--- a/plugins/TestingPanel.java
+++ b/plugins/TestingPanel.java
@@ -90,6 +90,7 @@ public class TestingPanel extends Panel {
jCheckBox1 = new javax.swing.JCheckBox();
jButton4 = new javax.swing.JButton();
txtTestPSRes = new javax.swing.JTextField();
+ jButton3 = new javax.swing.JButton();
buttonExecute.setText("Execute test11");
buttonExecute.addActionListener(new java.awt.event.ActionListener() {
@@ -150,6 +151,13 @@ public class TestingPanel extends Panel {
}
});
+ jButton3.setText("jButton3");
+ jButton3.addActionListener(new java.awt.event.ActionListener() {
+ public void actionPerformed(java.awt.event.ActionEvent evt) {
+ jButton3ActionPerformed(evt);
+ }
+ });
+
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
@@ -179,8 +187,12 @@ public class TestingPanel extends Panel {
.addComponent(cmTestPS)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(txtTestPSRes, javax.swing.GroupLayout.DEFAULT_SIZE, 57, Short.MAX_VALUE))
- .addComponent(jCheckBox1)
- .addComponent(jButton4))
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jButton3)
+ .addComponent(jCheckBox1)
+ .addComponent(jButton4))
+ .addGap(0, 0, Short.MAX_VALUE)))
.addContainerGap())))
.addGroup(layout.createSequentialGroup()
.addComponent(panelPlot, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -208,7 +220,9 @@ public class TestingPanel extends Panel {
.addComponent(cmTestPS)
.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)))
+ .addComponent(jButton4)
+ .addGap(37, 37, 37)
+ .addComponent(jButton3)))
.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)
@@ -266,12 +280,7 @@ public class TestingPanel extends Panel {
args.put("relative", var1);
args.put("steps", var2);
run("args", args);
-
- while(i < 100000){
- txtTestPSRes.setText(args.get("steps").toString());
- i++;
- Thread.sleep(1000);
- }
+
//evalAsync("run('args', locals = {'relative':" + (var1 ? "True" :"False") + ", 'steps':" + var2 + "})");
} catch (Exception ex) {
@@ -350,6 +359,13 @@ public class TestingPanel extends Panel {
SwingUtils.showException(this, ex);
} // TODO add your handling code here:
}//GEN-LAST:event_jButton4ActionPerformed
+
+ private void jButton3ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton3ActionPerformed
+
+ // TODO add your handling code here:
+ System.out.println("Working Directory = " +
+ System.getProperty("user.dir"));
+ }//GEN-LAST:event_jButton3ActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton buttonAbort;
@@ -358,6 +374,7 @@ public class TestingPanel extends Panel {
private javax.swing.JButton cmTestPS;
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;
diff --git a/script/power-supply.py b/script/power-supply.py
index e3868db..7a5602c 100644
--- a/script/power-supply.py
+++ b/script/power-supply.py
@@ -61,4 +61,4 @@ ActualIA.close()
scan.end()
-sys.exit(0)
\ No newline at end of file
+#sys.exit(0)
\ No newline at end of file