pshell/pshell-apps
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update psss_panel

Browse Source
This commit is contained in:
gobbo_a
2026-01-08 14:39:10 +01:00
parent f664694d1d
commit 9b38ae3db7
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
psss-panel/src/main/pkg/plugins/PSSS.form
+1 -1
View File
@@ -187,7 +187,7 @@
</DimensionLayout> </DimensionLayout>
</Layout> </Layout>
<SubComponents> <SubComponents>
<Component class="ch.psi.pshell.imaging.Renderer" name="renderer"> <Component class="ch.psi.pshell.imaging.DeviceRenderer" name="renderer">
</Component> </Component>
<Container class="javax.swing.JPanel" name="jPanel7"> <Container class="javax.swing.JPanel" name="jPanel7">
psss-panel/src/main/pkg/plugins/PSSS.java
+3 -3
View File
@@ -7,7 +7,7 @@ import ch.psi.pshell.device.Register;
import ch.psi.pshell.epics.ChannelDouble; import ch.psi.pshell.epics.ChannelDouble;
import ch.psi.pshell.framework.App; import ch.psi.pshell.framework.App;
import ch.psi.pshell.framework.Setup; 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.Plot;
import ch.psi.pshell.plot.LinePlotJFree; import ch.psi.pshell.plot.LinePlotJFree;
import ch.psi.pshell.utils.Convert; import ch.psi.pshell.utils.Convert;
@@ -263,7 +263,7 @@ public class PSSS extends Panel {
spinnerEnergy = new javax.swing.JSpinner(); spinnerEnergy = new javax.swing.JSpinner();
jLabel18 = new javax.swing.JLabel(); jLabel18 = new javax.swing.JLabel();
jPanel4 = new javax.swing.JPanel(); jPanel4 = new javax.swing.JPanel();
renderer = new ch.psi.pshell.imaging.Renderer(); renderer = new ch.psi.pshell.imaging.DeviceRenderer();
jPanel7 = new javax.swing.JPanel(); jPanel7 = new javax.swing.JPanel();
registerPanel3 = new ch.psi.pshell.swing.RegisterPanel(); registerPanel3 = new ch.psi.pshell.swing.RegisterPanel();
jLabel17 = new javax.swing.JLabel(); 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 registerPanel1;
private ch.psi.pshell.swing.RegisterPanel registerPanel2; private ch.psi.pshell.swing.RegisterPanel registerPanel2;
private ch.psi.pshell.swing.RegisterPanel registerPanel3; 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 spFromCam;
private javax.swing.JSpinner spFromCr; private javax.swing.JSpinner spFromCr;
private javax.swing.JSpinner spFromEn; private javax.swing.JSpinner spFromEn;
psss-panel/src/main/pkg/script/psss/Correlation.py
-1
View File
@@ -3,7 +3,6 @@ import sys, traceback
from mathutils import fit_polynomial, PolynomialFunction from mathutils import fit_polynomial, PolynomialFunction
from plotutils import plot_line, plot_function from plotutils import plot_line, plot_function
import org.apache.commons.math3.stat.correlation.PearsonsCorrelation as PearsonsCorrelation import org.apache.commons.math3.stat.correlation.PearsonsCorrelation as PearsonsCorrelation
import ch.psi.pshell.bs.PipelineServer as PipelineServer
TYPE_CHANNEL = 0 TYPE_CHANNEL = 0