Closedown

This commit is contained in:
boccioli_m
2015-06-02 09:02:31 +02:00
parent f33484f9ee
commit 7ca50b031c
2 changed files with 33 additions and 15 deletions

View File

@@ -30,22 +30,27 @@
<Component id="spinner" alignment="0" min="-2" max="-2" attributes="0"/>
</Group>
<Group type="103" groupAlignment="0" attributes="0">
<Group type="102" attributes="0">
<EmptySpace min="-2" pref="277" max="-2" attributes="0"/>
<Component id="jButton2" min="-2" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<EmptySpace min="-2" pref="87" max="-2" attributes="0"/>
<Component id="panel" min="-2" pref="394" max="-2" attributes="0"/>
<EmptySpace type="unrelated" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jButton3" min="-2" max="-2" attributes="0"/>
<Group type="102" attributes="0">
<Component id="jButton3" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="txtTestPSRes" pref="57" max="32767" attributes="0"/>
</Group>
<Component id="jCheckBox1" alignment="0" min="-2" max="-2" attributes="0"/>
<Component id="jButton4" min="-2" max="-2" attributes="0"/>
</Group>
</Group>
<Group type="102" alignment="0" attributes="0">
<EmptySpace min="-2" pref="277" max="-2" attributes="0"/>
<Component id="jButton2" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group>
</Group>
<EmptySpace min="0" pref="35" max="32767" attributes="0"/>
</Group>
<Group type="102" attributes="0">
<Component id="panelPlot" max="32767" attributes="0"/>
@@ -76,7 +81,10 @@
<EmptySpace min="-2" pref="46" max="-2" attributes="0"/>
<Component id="jCheckBox1" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
<Component id="jButton3" min="-2" max="-2" attributes="0"/>
<Group type="103" groupAlignment="0" attributes="0">
<Component id="jButton3" min="-2" max="-2" attributes="0"/>
<Component id="txtTestPSRes" min="-2" max="-2" attributes="0"/>
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="jButton4" min="-2" max="-2" attributes="0"/>
</Group>
@@ -174,5 +182,7 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton4ActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JTextField" name="txtTestPSRes">
</Component>
</SubComponents>
</Form>

View File

@@ -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
}
}