Closedown

This commit is contained in:
boccioli_m
2015-06-01 16:20:37 +02:00
parent 381a2865fe
commit e6d117c707
2 changed files with 23 additions and 32 deletions

View File

@@ -26,11 +26,10 @@ import javax.swing.JPanel;
*/
public class TestingPanel extends Panel {
MotorPanel motorPanel;
LinePlotBase plot;
LinePlotBase plot ;
LinePlotSeries series;
Motor motor;
Task task = new Task() {
@Override
protected Object execute() throws Exception {
@@ -45,6 +44,7 @@ public class TestingPanel extends Panel {
}
};
@Override
protected JPanel create() {
getApp().addTask(task);
@@ -65,15 +65,19 @@ public class TestingPanel extends Panel {
motorPanel = new MotorPanel();
panel.add(motorPanel);
onInitialize(-1);
plot = new LinePlotJFree();
plot.setTitle("aha");
panelPlot.add(plot);
plot.setTitle("bo");
panelPlot.add(plot);
series=new LinePlotSeries("Position");
plot.addSeries(series);
plotPS = new LinePlotJFree();
plotPS.setTitle("PS");
panelPlotPS.add(plotPS);
seriesPS=new LinePlotSeries("Position");
plotPS.addSeries(seriesPS);
}
@SuppressWarnings("unchecked")
@@ -91,7 +95,6 @@ public class TestingPanel extends Panel {
jButton3 = new javax.swing.JButton();
jCheckBox1 = new javax.swing.JCheckBox();
jButton4 = new javax.swing.JButton();
panelPlotPS = new javax.swing.JPanel();
buttonExecute.setText("Execute test11");
buttonExecute.addActionListener(new java.awt.event.ActionListener() {
@@ -152,8 +155,6 @@ public class TestingPanel extends Panel {
}
});
panelPlotPS.setLayout(new java.awt.BorderLayout());
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
@@ -183,9 +184,7 @@ public class TestingPanel extends Panel {
.addComponent(jButton2)))
.addGap(0, 35, Short.MAX_VALUE))
.addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(panelPlot, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(panelPlotPS, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addComponent(panelPlot, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addContainerGap())))
);
layout.setVerticalGroup(
@@ -216,10 +215,8 @@ public class TestingPanel extends Panel {
.addComponent(jButton1)
.addComponent(jButton2))
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(panelPlot, javax.swing.GroupLayout.DEFAULT_SIZE, 90, Short.MAX_VALUE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
.addComponent(panelPlotPS, javax.swing.GroupLayout.DEFAULT_SIZE, 90, Short.MAX_VALUE)
.addGap(5, 5, 5))
.addComponent(panelPlot, javax.swing.GroupLayout.DEFAULT_SIZE, 185, Short.MAX_VALUE)
.addContainerGap())
);
}// </editor-fold>//GEN-END:initComponents
@@ -310,6 +307,10 @@ public class TestingPanel extends Panel {
boolean var1 = jCheckBox1.isSelected();
int var2 = 2;// (Integer)spinner.getValue();
getApp().startTask(taskPS);
taskPS.start(TaskRunMode.async);
HashMap args = new HashMap();
args.put("relative", var1);
args.put("steps", var2);
@@ -359,7 +360,6 @@ public class TestingPanel extends Panel {
private javax.swing.JCheckBox jCheckBox1;
private javax.swing.JPanel panel;
private javax.swing.JPanel panelPlot;
private javax.swing.JPanel panelPlotPS;
private javax.swing.JSpinner spinner;
// End of variables declaration//GEN-END:variables
}