pshell_config/x03da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
This commit is contained in:
x03daop
2016-12-22 15:52:41 +01:00
parent b05ae21305
commit 1c18b78ebb
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/ManipulatorScan.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class ManipulatorScan extends Panel {
runAsync("ManipulatorScan", args);
/*
getController().setExecutingContext("manip_scan");
getContext().setExecutingContext("manip_scan");
String scan ="lscan(" + comboMotor.getSelectedItem().toString() + ", ( " ;
for (Component c : panelSensors.getComponents()) {
if ((c instanceof JCheckBox) && ((JCheckBox)c).isSelected())
plugins/PhotonEnergy.java
+2 -2
View File
@@ -40,13 +40,13 @@ public class PhotonEnergy extends Panel {
@Override
public void onStart() {
super.onStart();
getController().addScanListener(scanListener);
getContext().addScanListener(scanListener);
}
@Override
public void onStop() {
super.onStop();
getController().removeScanListener(scanListener);
getContext().removeScanListener(scanListener);
}
@Override
plugins/XPSSpectrum.java
+4 -4
View File
@@ -2,7 +2,7 @@
* Copyright (c) 2014 Paul Scherrer Institute. All rights reserved.
*/
import ch.psi.pshell.core.Controller;
import ch.psi.pshell.core.Context;
import ch.psi.pshell.device.Device;
import ch.psi.pshell.device.DeviceAdapter;
import ch.psi.pshell.device.DeviceListener;
@@ -220,7 +220,7 @@ public class XPSSpectrum extends Panel {
}
}
void start() throws Controller.ControllerStateException{
void start() throws Context.ContextStateException{
HashMap<String, Object> args = new HashMap<>();
args.put("ranges", scanRanges);
args.put("pass_energy", Integer.valueOf(comboPass.getSelectedItem().toString()));
@@ -600,7 +600,7 @@ public class XPSSpectrum extends Panel {
private void btSaveActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btSaveActionPerformed
try {
JFileChooser chooser = new JFileChooser(getController().getSetup().getContextPath());
JFileChooser chooser = new JFileChooser(getContext().getSetup().getContextPath());
FileNameExtensionFilter filter = new FileNameExtensionFilter("XPS Spectrum scan definition file", "xps");
chooser.setFileFilter(filter);
int rVal = chooser.showSaveDialog(this);
@@ -623,7 +623,7 @@ public class XPSSpectrum extends Panel {
private void btLoadActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btLoadActionPerformed
try {
JFileChooser chooser = new JFileChooser(getController().getSetup().getContextPath());
JFileChooser chooser = new JFileChooser(getContext().getSetup().getContextPath());
FileNameExtensionFilter filter = new FileNameExtensionFilter("XPS Spectrum scan definition file", "xps");
chooser.setFileFilter(filter);
int rVal = chooser.showOpenDialog(this);