From 9b38ae3db7fe2d5a952956fadf1ea4148acb9789 Mon Sep 17 00:00:00 2001 From: gobbo_a Date: Thu, 8 Jan 2026 14:39:10 +0100 Subject: [PATCH] Update psss_panel --- psss-panel/src/main/pkg/plugins/PSSS.form | 2 +- psss-panel/src/main/pkg/plugins/PSSS.java | 6 +++--- psss-panel/src/main/pkg/script/psss/Correlation.py | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/psss-panel/src/main/pkg/plugins/PSSS.form b/psss-panel/src/main/pkg/plugins/PSSS.form index 429b604..70f8ebc 100755 --- a/psss-panel/src/main/pkg/plugins/PSSS.form +++ b/psss-panel/src/main/pkg/plugins/PSSS.form @@ -187,7 +187,7 @@ - + diff --git a/psss-panel/src/main/pkg/plugins/PSSS.java b/psss-panel/src/main/pkg/plugins/PSSS.java index 03ac8d1..32ebf45 100755 --- a/psss-panel/src/main/pkg/plugins/PSSS.java +++ b/psss-panel/src/main/pkg/plugins/PSSS.java @@ -7,7 +7,7 @@ import ch.psi.pshell.device.Register; import ch.psi.pshell.epics.ChannelDouble; import ch.psi.pshell.framework.App; import ch.psi.pshell.framework.Setup; -import ch.psi.pshell.imaging.RendererMode; +import ch.psi.pshell.imaging.DeviceRendererMode; import ch.psi.pshell.plot.Plot; import ch.psi.pshell.plot.LinePlotJFree; import ch.psi.pshell.utils.Convert; @@ -263,7 +263,7 @@ public class PSSS extends Panel { spinnerEnergy = new javax.swing.JSpinner(); jLabel18 = new javax.swing.JLabel(); jPanel4 = new javax.swing.JPanel(); - renderer = new ch.psi.pshell.imaging.Renderer(); + renderer = new ch.psi.pshell.imaging.DeviceRenderer(); jPanel7 = new javax.swing.JPanel(); registerPanel3 = new ch.psi.pshell.swing.RegisterPanel(); jLabel17 = new javax.swing.JLabel(); @@ -1240,7 +1240,7 @@ public class PSSS extends Panel { private ch.psi.pshell.swing.RegisterPanel registerPanel1; private ch.psi.pshell.swing.RegisterPanel registerPanel2; private ch.psi.pshell.swing.RegisterPanel registerPanel3; - private ch.psi.pshell.imaging.Renderer renderer; + private ch.psi.pshell.imaging.DeviceRenderer renderer; private javax.swing.JSpinner spFromCam; private javax.swing.JSpinner spFromCr; private javax.swing.JSpinner spFromEn; diff --git a/psss-panel/src/main/pkg/script/psss/Correlation.py b/psss-panel/src/main/pkg/script/psss/Correlation.py index b2d4b6d..f9707c3 100644 --- a/psss-panel/src/main/pkg/script/psss/Correlation.py +++ b/psss-panel/src/main/pkg/script/psss/Correlation.py @@ -3,7 +3,6 @@ import sys, traceback from mathutils import fit_polynomial, PolynomialFunction from plotutils import plot_line, plot_function import org.apache.commons.math3.stat.correlation.PearsonsCorrelation as PearsonsCorrelation -import ch.psi.pshell.bs.PipelineServer as PipelineServer TYPE_CHANNEL = 0