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

Winter shutdown

Browse Source
This commit is contained in:
x07maop
2017-01-18 15:40:12 +01:00
parent 46944955fb
commit 15b1f51023
16 changed files with 204 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/EnergyScan.java
View File

@@ -19,6 +19,7 @@ import ch.psi.pshell.ui.Panel;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
import java.util.logging.Logger;
/**
*
@@ -58,7 +59,7 @@ public class EnergyScan extends Panel {
}
Path getConfigFile() {
return Paths.get(getController().getSetup().getConfigPath(), "energy_scan.properties");
return Paths.get(getContext().getSetup().getConfigPath(), "energy_scan.properties");
}
enum Mode {
@@ -122,7 +123,7 @@ public class EnergyScan extends Panel {
} else {
mode = "lin_" + String.format("%1.0f", (Double) spinnerAlpha.getValue());
}
path = getController().getSetup().expandPath(path);
path = getContext().getSetup().expandPath(path);
path = path.replaceAll("\\{el\\}", String.valueOf(comboSetup.getSelectedItem()));
path = path.replaceAll("\\{mode\\}", mode);
return path;
@@ -611,7 +612,10 @@ public class EnergyScan extends Panel {
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
batch = null;
abort();
try {
abort();
} catch (InterruptedException ex) {
}
}//GEN-LAST:event_buttonAbortActionPerformed
private void comboSetupActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_comboSetupActionPerformed