Bugfix for loading xml #513

dtcenter · Feb 15, 2024 · 70d593a · 70d593a
1 parent 324580d
commit 70d593a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git a/java/edu/ucar/metviewer/MVPlotJob.java b/java/edu/ucar/metviewer/MVPlotJob.java
@@ -1822,6 +1822,16 @@ public void setConSeries(String conSeries) {
   }
 
   public String getShowLegend() {
+    if (showLegend == null){
+      String templ = getPch();
+      int size = templ.split(",").length;
+      String result = "c(";
+      for (int i = 0; i < size; i++) {
+        result =  result + "1,";
+      }
+      showLegend = result.substring(0, result.length() - 1) + ")";
+    }
+
     return showLegend;
   }
 

diff --git a/java/edu/ucar/metviewer/jobManager/JobManager.java b/java/edu/ucar/metviewer/jobManager/JobManager.java
@@ -304,9 +304,7 @@ protected Map<String, Object> createInfoMap(MVPlotJob job, int intNumDepSeries)
     info.put("con_series", job.getConSeries().isEmpty() ? MVUtil.printRCol(
             MVUtil.rep(0, intNumDepSeries)) : job.getConSeries());
 
-    if(job.getShowLegend() != null){
-      info.put("show_legend",MVUtil.printRCol(MVUtil.rep(0, intNumDepSeries)));
-    }
+    info.put("show_legend",job.getShowLegend().isEmpty() ? "c()" : job.getShowLegend());
     info.put("legend", job.getLegend().isEmpty() ? "c()" : job.getLegend());
     info.put("y1_lim", job.getY1Lim().isEmpty() ? "c()" : job.getY1Lim());
     info.put("x1_lim", job.getX1Lim().isEmpty() ? "c()" : job.getX1LimR());
@@ -641,7 +639,7 @@ protected Map<String, Object> addPlotConfigs(Map<String, Object> yamlInfo, MVPlo
     info.put("show_signif", rListToList(job.getShowSignif()));
 
     info.put("con_series", rListToListNumeric(job.getConSeries()));
-    info.put("show_legend", rListToListNumeric(job.getShowLegend()));
+    info.put("show_legend", rListToList(job.getShowLegend()));
     info.put("plot_ci", rListToList(job.getPlotCI()));
 
 

diff --git a/webapp/metviewer/js/metviewer_common.js b/webapp/metviewer/js/metviewer_common.js
@@ -7636,7 +7636,7 @@ function initPage() {
                 editable: true,
                 edittype: "select",
                 formatter: 'select',
-                editoptions: {value: "0:No;1:Yes"},
+                editoptions: {value: "1:Yes;0:No"},
                 sortable: false,
             },
             {

diff --git a/webapp/metviewer/js/metviewer_common.min.js b/webapp/metviewer/js/metviewer_common.min.js
diff --git a/webapp/metviewer/plotJSP/eclv.jsp b/webapp/metviewer/plotJSP/eclv.jsp
@@ -257,6 +257,7 @@
       addFixedVar();
     });
     getForecastVariablesHist();
+    series_var_y1_indexes = [];
 
     if (initXML != null) {
       if(initXML.find("error").length > 0 ){
@@ -277,7 +278,6 @@
       }
       initXML = null;
     } else {
-      series_var_y1_indexes = [];
       updateSeriesVarValHist(1, []);
       updateSeriesHist();
     }

diff --git a/webapp/metviewer/plotJSP/hist.jsp b/webapp/metviewer/plotJSP/hist.jsp
@@ -220,6 +220,8 @@
                 updateSeriesHist();
             });
             fixed_var_indexes.push(1);
+            series_var_y1_indexes = [];
+
             if (initXML != null) {
                 if(initXML.find("error").length > 0 ){
                     alert(initXML.find("error").text())
@@ -239,7 +241,6 @@
                 }
                 initXML = null;
             } else {
-                series_var_y1_indexes = [];
                 updateSeriesVarValHist(1, []);
                 changeFixedVarHist('rhist');
                 updateFixedVarValHist(1, []);