From 5e752ba3023d8bbfe09f3cf12832cf6aed465f7d Mon Sep 17 00:00:00 2001 From: gobbo_a Date: Tue, 9 Sep 2025 18:32:30 +0200 Subject: [PATCH] Ranaming --- .../src/main/java/ch/psi/athos/AthosScreens.java | 10 +++++----- .../src/main/pkg/plugins/Correlation.java | 16 ++++++++-------- screenpanel-sf/src/main/java/ScreenPanelSF.java | 4 ++-- .../src/main/java/ScreenPanelSLS.java | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/athos-screens/src/main/java/ch/psi/athos/AthosScreens.java b/athos-screens/src/main/java/ch/psi/athos/AthosScreens.java index bafcb1a..e11dcb4 100644 --- a/athos-screens/src/main/java/ch/psi/athos/AthosScreens.java +++ b/athos-screens/src/main/java/ch/psi/athos/AthosScreens.java @@ -358,15 +358,15 @@ public class AthosScreens extends Panel { void startRecording() throws Exception { stopRecording(); - Context.getInterpreter().startExecution(CommandSource.plugin, null, cameraName, null, false); - Context.getInterpreter().setExecutionPar("name", cameraName); - Context.getInterpreter().setExecutionPar("open", true); + Context.getSequencer().startExecution(CommandSource.plugin, null, cameraName, null, false); + Context.getSequencer().setExecutionPar("name", cameraName); + Context.getSequencer().setExecutionPar("open", true); recordingScan = new MonitorScan(dataPipeline.getStream(), getReadables(), -1, -1); Threading.getFuture(() -> recordingScan.start()).handle((ret, t) -> { recordingScan = null; return ret; }); - String fileName = Context.getInterpreter().getExecutionPars().getPath(); + String fileName = Context.getSequencer().getExecutionPars().getPath(); logger.info("Start recording: " + fileName); fileHistory.add(fileName); listFile.setModel(new javax.swing.AbstractListModel() { @@ -387,7 +387,7 @@ public class AthosScreens extends Panel { if (recordingScan != null) { logger.info("Stop recording"); recordingScan.abort(); - Context.getInterpreter().endExecution(); + Context.getSequencer().endExecution(); recordingScan = null; } } diff --git a/correlation/src/main/pkg/plugins/Correlation.java b/correlation/src/main/pkg/plugins/Correlation.java index a248699..9aba112 100644 --- a/correlation/src/main/pkg/plugins/Correlation.java +++ b/correlation/src/main/pkg/plugins/Correlation.java @@ -111,14 +111,14 @@ public class Correlation extends Panel { //DecimalFormat formatter = new DecimalFormat("0.##E0"); void updateResults(){ try{ - textCorrelation.setText(String.format("%1.4f", Double.valueOf((Double)Context.getInterpreter().getInterpreterVariable("corr")))); + textCorrelation.setText(String.format("%1.4f", Double.valueOf((Double)Context.getSequencer().getInterpreterVariable("corr")))); } catch (Exception ex){ textCorrelation.setText(""); } if (checkLinear.isSelected()){ try{ - List pars = (List)Context.getInterpreter().getInterpreterVariable("pars_lin"); + List pars = (List)Context.getSequencer().getInterpreterVariable("pars_lin"); //textLinear.setText(String.format("%1.3fx%+1.3f", (Double)(pars.get(1)), (Double)(pars.get(0)))); textLinear.setText(String.format("%1.6gx%+1.6g",pars.get(1), pars.get(0))); } catch (Exception ex){ @@ -128,7 +128,7 @@ public class Correlation extends Panel { if (checkQuadratic.isSelected()){ try{ - List pars = (List)Context.getInterpreter().getInterpreterVariable("pars_quad"); + List pars = (List)Context.getSequencer().getInterpreterVariable("pars_quad"); //textQuadratic.setText(String.format("%1.2fx\u00B2 %+1.2fx%+1.2f", (Double)(pars.get(0)), (Double)(pars.get(1)), (Double)(pars.get(0)))); textQuadratic.setText(String.format("%1.3gx\u00B2%+1.3gx%+1.3g", pars.get(0), pars.get(1), pars.get(0))); //textQuadratic.setText(formatter.format(pars.get(2))+ formatter.format(pars.get(1)) + formatter.format(pars.get(0))); @@ -137,11 +137,11 @@ public class Correlation extends Panel { textQuadratic.setText(""); } try{ - String peak = (String)Context.getInterpreter().getInterpreterVariable("pos_peak"); + String peak = (String)Context.getSequencer().getInterpreterVariable("pos_peak"); if (peak!=null){ textPeak.setText(peak + " (max)"); } else { - peak = (String)Context.getInterpreter().getInterpreterVariable("neg_peak"); + peak = (String)Context.getSequencer().getInterpreterVariable("neg_peak"); if (peak!=null){ textPeak.setText(peak + " (min)"); } else { @@ -485,15 +485,15 @@ public class Correlation extends Panel { if (isRunning()){ //abort(); //Stooping smootly so displayed variables get updated. - Context.getInterpreter().setInterpreterVariable("stop_exec", true); + Context.getSequencer().setInterpreterVariable("stop_exec", true); Chrono chrono = new Chrono(); while (!chrono.isTimeout(500)){ - if (!Boolean.TRUE.equals(Context.getInterpreter().getInterpreterVariable("stop_exec"))){ + if (!Boolean.TRUE.equals(Context.getSequencer().getInterpreterVariable("stop_exec"))){ break; } Thread.sleep(1); } - if (Boolean.TRUE.equals(Context.getInterpreter().getInterpreterVariable("stop_exec"))){ + if (Boolean.TRUE.equals(Context.getSequencer().getInterpreterVariable("stop_exec"))){ System.out.println("Timeout stopping script - aborting..."); abort(); } diff --git a/screenpanel-sf/src/main/java/ScreenPanelSF.java b/screenpanel-sf/src/main/java/ScreenPanelSF.java index 5d295e2..5d0b529 100755 --- a/screenpanel-sf/src/main/java/ScreenPanelSF.java +++ b/screenpanel-sf/src/main/java/ScreenPanelSF.java @@ -267,14 +267,14 @@ public class ScreenPanelSF extends Panel implements CamServerViewer.CamServerVie c.gridy = 1; panel.add(comboLogbook, c); c.gridy = 0; - panel.add(new JLabel(Context.getInterpreter().getExecutionPars().getPath()), c); + panel.add(new JLabel(Context.getSequencer().getExecutionPars().getPath()), c); if (SwingUtils.showOption(getTopLevel(), "Success", panel, OptionType.OkCancel) == OptionResult.Yes) { StringBuilder message = new StringBuilder(); message.append("Camera: ").append(name).append("\n"); message.append("Screen: ").append(String.valueOf(valueScreen.getLabel().getText())).append("\n"); message.append("Filter: ").append(String.valueOf(valueFilter.getLabel().getText())).append("\n"); - message.append("Data file: ").append(Context.getInterpreter().getExecutionPars().getPath()).append("\n"); + message.append("Data file: ").append(Context.getSequencer().getExecutionPars().getPath()).append("\n"); message.append("Comment: ").append(textComment.getText()).append("\n"); //Add slicing message Overlay[] fitOv = camServerViewer.getFitOverlays(); diff --git a/screenpanel-sls/src/main/java/ScreenPanelSLS.java b/screenpanel-sls/src/main/java/ScreenPanelSLS.java index 0bdaa83..93d74d5 100755 --- a/screenpanel-sls/src/main/java/ScreenPanelSLS.java +++ b/screenpanel-sls/src/main/java/ScreenPanelSLS.java @@ -329,13 +329,13 @@ public class ScreenPanelSLS extends Panel implements CamServerViewer.CamServerVi c.gridy = 1; panel.add(comboLogbook, c); c.gridy = 0; - panel.add(new JLabel(Context.getInterpreter().getExecutionPars().getPath()), c); + panel.add(new JLabel(Context.getSequencer().getExecutionPars().getPath()), c); if (SwingUtils.showOption(getTopLevel(), "Success", panel, OptionType.OkCancel) == OptionResult.Yes) { StringBuilder message = new StringBuilder(); message.append("Camera: ").append(name).append("\n"); message.append("Screen: ").append(String.valueOf(valueScreen.getLabel().getText())).append("\n"); - message.append("Data file: ").append(Context.getInterpreter().getExecutionPars().getPath()).append("\n"); + message.append("Data file: ").append(Context.getSequencer().getExecutionPars().getPath()).append("\n"); message.append("Comment: ").append(textComment.getText()).append("\n"); //Add slicing message Overlay[] fitOv = camServerViewer.getFitOverlays();