Update to V2

This commit is contained in:
gac-x07mb
2026-03-02 13:49:55 +01:00
parent 67cee074cb
commit 405e5daf9f
27 changed files with 144 additions and 142 deletions

View File

@@ -11,11 +11,12 @@ import java.util.HashMap;
import java.util.logging.Level;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JLabel;
import ch.psi.utils.State;
import ch.psi.utils.swing.DsvEditor;
import ch.psi.utils.swing.Editor.EditorDialog;
import ch.psi.pshell.framework.Setup;
import ch.psi.pshell.utils.State;
import ch.psi.pshell.swing.DsvEditor;
import ch.psi.pshell.swing.Editor.EditorDialog;
import ch.psi.pshell.data.PlotDescriptor;
import ch.psi.pshell.ui.Panel;
import ch.psi.pshell.framework.Panel;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.io.File;
@@ -59,7 +60,7 @@ public class EnergyScan extends Panel {
}
Path getConfigFile() {
return Paths.get(getContext().getSetup().getConfigPath(), "energy_scan.properties");
return Paths.get(Setup.getConfigPath(), "energy_scan.properties");
}
enum Mode {
@@ -123,7 +124,7 @@ public class EnergyScan extends Panel {
} else {
mode = "lin_" + String.format("%1.0f", (Double) spinnerAlpha.getValue());
}
path = getContext().getSetup().expandPath(path);
path = Setup.expandPath(path);
path = path.replaceAll("\\{el\\}", String.valueOf(comboSetup.getSelectedItem()));
path = path.replaceAll("\\{mode\\}", mode);
return path;