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

9
plugins/HystScan.java
View File

@@ -66,7 +66,7 @@ public class HystScan extends Panel {
}
Path getConfigFile() {
return Paths.get(getController().getSetup().getConfigPath(), "energy_scan.properties");
return Paths.get(getContext().getSetup().getConfigPath(), "energy_scan.properties");
}
void loadConfig() {
@@ -93,7 +93,7 @@ public class HystScan extends Panel {
} else { //if (comboMode.getSelectedIndex() == 1) {
mode = "minus";
}
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;
@@ -593,7 +593,10 @@ public class HystScan extends Panel {
}//GEN-LAST:event_buttonExecuteActionPerformed
private void buttonAbortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonAbortActionPerformed
abort();
try {
abort();
} catch (InterruptedException ex) {
}
}//GEN-LAST:event_buttonAbortActionPerformed
private void buttonDefaultsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonDefaultsActionPerformed