diff --git a/plugins/TestingPanel.form b/plugins/TestingPanel.form index 1187b49..9a3550e 100644 --- a/plugins/TestingPanel.form +++ b/plugins/TestingPanel.form @@ -30,22 +30,27 @@ + + + + + - + + + + + - - - - + - @@ -76,7 +81,10 @@ - + + + + @@ -174,5 +182,7 @@ + + diff --git a/plugins/TestingPanel.java b/plugins/TestingPanel.java index 97fc8fc..a391d94 100644 --- a/plugins/TestingPanel.java +++ b/plugins/TestingPanel.java @@ -89,6 +89,7 @@ public class TestingPanel extends Panel { 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() { @@ -165,18 +166,22 @@ public class TestingPanel extends Panel { .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) - .addComponent(jButton3) + .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))) - .addGroup(layout.createSequentialGroup() - .addGap(277, 277, 277) - .addComponent(jButton2))) - .addGap(0, 35, Short.MAX_VALUE)) + .addComponent(jButton4)) + .addContainerGap()))) .addGroup(layout.createSequentialGroup() .addComponent(panelPlot, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addContainerGap()))) @@ -199,7 +204,9 @@ public class TestingPanel extends Panel { .addGap(46, 46, 46) .addComponent(jCheckBox1) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(jButton3) + .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) @@ -305,7 +312,7 @@ public class TestingPanel extends Panel { args.put("relative", var1); args.put("steps", var2); run("power-supply", args); - + txtTestPSRes.setText((String)args.get("steps")); //evalAsync("run('args', locals = {'relative':" + (var1 ? "True" :"False") + ", 'steps':" + var2 + "})"); } catch (Exception ex) { @@ -347,6 +354,7 @@ public class TestingPanel extends Panel { 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 } }