Bux fix - error plots

paulscherrerinstitute · Jan 22, 2025 · 2a07d75 · 2a07d75
1 parent 0084ce0
commit 2a07d75
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
     //id 'org.openjfx.javafxplugin' version '0.0.10'
 }
 
-version = '1.21.0'
+version = '1.21.1'
 group = 'ch.psi'
 ext.timestamp = new Date().format("yyMMddHHmm")
 

diff --git a/src/main/java/ch/psi/pshell/plot/LinePlotErrorSeries.java b/src/main/java/ch/psi/pshell/plot/LinePlotErrorSeries.java
@@ -312,7 +312,13 @@ public void setData(double[] x, double[] y, double[] error) {
 
     public void setData(double[] x, double[] y, double[] error, double[] errorY) {
         if (getPlot() != null) {
-            int length = Math.min(Math.min(Math.min(x.length, y.length), error.length), errorY.length);
+            int length = Math.min(x.length, y.length);
+            if (error!=null){
+                length = Math.min(length, error.length);
+            }
+            if (errorY!=null){
+                length = Math.min(length, errorY.length);
+            }
             switch (getPlot().getStyle()) {
                 case ErrorX:
                     XIntervalSeries sx = (XIntervalSeries) getToken();

diff --git a/src/main/resources/ch/psi/pshell/ui/App.properties b/src/main/resources/ch/psi/pshell/ui/App.properties
@@ -1,6 +1,6 @@
 Application.name = pshell
 Application.title = PShell Workbench
-Application.version = 1.21.0
+Application.version = 1.21.1
 Application.vendor = psi.ch
 Application.feedback = alexandre.gobbo
 Application.homepage = https://github.com/paulscherrerinstitute/pshell