Closedown
This commit is contained in:
@@ -66,9 +66,9 @@ public class TestingPanel extends Panel {
|
||||
panel.add(motorPanel);
|
||||
onInitialize(-1);
|
||||
|
||||
plot = new LinePlotJFree();
|
||||
|
||||
plot.setTitle("bo");
|
||||
panelPlot.add(plot);
|
||||
|
||||
series=new LinePlotSeries("Position");
|
||||
plot.addSeries(series);
|
||||
|
||||
@@ -84,7 +84,6 @@ public class TestingPanel extends Panel {
|
||||
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();
|
||||
cmTestPS = new javax.swing.JButton();
|
||||
jCheckBox1 = new javax.swing.JCheckBox();
|
||||
@@ -93,6 +92,7 @@ public class TestingPanel extends Panel {
|
||||
jButton3 = new javax.swing.JButton();
|
||||
jScrollPane1 = new javax.swing.JScrollPane();
|
||||
txtOutput = new javax.swing.JTextArea();
|
||||
plot = new ch.psi.pshell.plot.LinePlotJFree();
|
||||
|
||||
buttonExecute.setText("Execute test11");
|
||||
buttonExecute.addActionListener(new java.awt.event.ActionListener() {
|
||||
@@ -121,8 +121,6 @@ public class TestingPanel extends Panel {
|
||||
|
||||
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) {
|
||||
@@ -164,14 +162,16 @@ public class TestingPanel extends Panel {
|
||||
txtOutput.setRows(5);
|
||||
jScrollPane1.setViewportView(txtOutput);
|
||||
|
||||
plot.setTitle("");
|
||||
|
||||
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()
|
||||
.addGap(41, 41, 41)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
|
||||
.addComponent(check)
|
||||
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
|
||||
@@ -200,7 +200,9 @@ public class TestingPanel extends Panel {
|
||||
.addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addComponent(jButton2))))
|
||||
.addComponent(panelPlot, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
|
||||
.addGroup(layout.createSequentialGroup()
|
||||
.addContainerGap()
|
||||
.addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
|
||||
.addContainerGap())
|
||||
);
|
||||
layout.setVerticalGroup(
|
||||
@@ -237,8 +239,8 @@ public class TestingPanel extends Panel {
|
||||
.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, 144, Short.MAX_VALUE)
|
||||
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
|
||||
.addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
|
||||
.addContainerGap())
|
||||
);
|
||||
}// </editor-fold>//GEN-END:initComponents
|
||||
@@ -334,9 +336,9 @@ public class TestingPanel extends Panel {
|
||||
args.put("relative", var1);
|
||||
args.put("steps", var2);
|
||||
run("power-supply", args);
|
||||
|
||||
Object ret = eval("ret");
|
||||
//try to print the result
|
||||
txtTestPSRes.setText(args.get("steps").toString());
|
||||
txtTestPSRes.setText(ret.toString());
|
||||
|
||||
|
||||
//evalAsync("run('args', locals = {'relative':" + (var1 ? "True" :"False") + ", 'steps':" + var2 + "})");
|
||||
@@ -387,7 +389,7 @@ public class TestingPanel extends Panel {
|
||||
private javax.swing.JCheckBox jCheckBox1;
|
||||
private javax.swing.JScrollPane jScrollPane1;
|
||||
private javax.swing.JPanel panel;
|
||||
private javax.swing.JPanel panelPlot;
|
||||
private ch.psi.pshell.plot.LinePlotJFree plot;
|
||||
private javax.swing.JSpinner spinner;
|
||||
private javax.swing.JTextArea txtOutput;
|
||||
private javax.swing.JTextField txtTestPSRes;
|
||||
|
||||
Reference in New Issue
Block a user