Closedown

This commit is contained in:
sfop
2017-01-24 10:24:08 +01:00
parent 304be9deb5
commit 607a4f934c
5 changed files with 57 additions and 121 deletions

View File

@@ -2,6 +2,11 @@
* Copyright (c) 2014-2017 Paul Scherrer Institute. All rights reserved.
*/
import ch.psi.pshell.plot.LinePlotSeries;
import ch.psi.pshell.plot.Plot;
import ch.psi.pshell.scan.Scan;
import ch.psi.pshell.scan.ScanListener;
import ch.psi.pshell.scan.ScanRecord;
import ch.psi.pshell.ui.Panel;
import ch.psi.pshell.ui.Plugin;
import ch.psi.utils.State;
@@ -13,9 +18,12 @@ import java.util.logging.Logger;
*
*/
public class ShottkyScan extends Panel {
LinePlotSeries series = new LinePlotSeries("Values");
public ShottkyScan() {
initComponents();
plot.getAxis(Plot.AxisId.X).setLabel("Phase");
plot.getAxis(Plot.AxisId.Y).setLabel("Charge");
}
//Overridable callbacks
@@ -34,7 +42,7 @@ public class ShottkyScan extends Panel {
spinnerStep.setEnabled(buttonStart.isEnabled());
spinnerSamples.setEnabled(buttonStart.isEnabled());
spinnerLatency.setEnabled(buttonStart.isEnabled());
}
@Override
@@ -46,6 +54,43 @@ public class ShottkyScan extends Panel {
@Override
protected void doUpdate() {
}
@Override
public void onStart() {
super.onStart();
getContext().addScanListener(scanListener);
}
@Override
public void onStop() {
getContext().removeScanListener(scanListener);
super.onStop();
}
ScanListener scanListener = new ScanListener() {
@Override
public void onScanStarted(Scan scan, String plotTitle) {
if ("ShottkyScan".equals(getContext().getExecutionPars().getName())){
plot.removeMarker(null);
series.clear();
}
}
@Override
public void onNewRecord(Scan scan, ScanRecord record) {
if ("ShottkyScan".equals(getContext().getExecutionPars().getName())){
series.appendData((Double)record.getPositions()[0], (Double)record.getValues()[0]);
}
}
@Override
public void onScanEnded(Scan scan, Exception ex) {
}
};
@SuppressWarnings("unchecked")
// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
@@ -64,7 +109,7 @@ public class ShottkyScan extends Panel {
spinnerSamples = new javax.swing.JSpinner();
jLabel4 = new javax.swing.JLabel();
spinnerStart = new javax.swing.JSpinner();
linePlotJFree1 = new ch.psi.pshell.plot.LinePlotJFree();
plot = new ch.psi.pshell.plot.LinePlotJFree();
buttonStart.setText("Start");
buttonStart.addActionListener(new java.awt.event.ActionListener() {
@@ -167,7 +212,7 @@ public class ShottkyScan extends Panel {
.addContainerGap())
);
linePlotJFree1.setTitle("");
plot.setTitle("");
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
@@ -182,7 +227,7 @@ public class ShottkyScan extends Panel {
.addGroup(layout.createSequentialGroup()
.addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(linePlotJFree1, javax.swing.GroupLayout.DEFAULT_SIZE, 393, Short.MAX_VALUE)
.addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, 393, Short.MAX_VALUE)
.addContainerGap())
);
@@ -194,7 +239,7 @@ public class ShottkyScan extends Panel {
.addContainerGap()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
.addComponent(linePlotJFree1, javax.swing.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE))
.addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, 383, Short.MAX_VALUE))
.addGap(18, 18, 18)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
.addComponent(buttonStart)
@@ -248,7 +293,7 @@ public class ShottkyScan extends Panel {
private javax.swing.JLabel jLabel4;
private javax.swing.JLabel jLabel5;
private javax.swing.JPanel jPanel1;
private ch.psi.pshell.plot.LinePlotJFree linePlotJFree1;
private ch.psi.pshell.plot.LinePlotJFree plot;
private javax.swing.JSpinner spinnerLatency;
private javax.swing.JSpinner spinnerSamples;
private javax.swing.JSpinner spinnerStart;