linny-r 2.0.8 → 2.0.10

package/static/scripts/linny-r-gui-chart-manager.js

@@ -123,9 +123,7 @@ class GUIChartManager extends ChartManager {
     document.getElementById('chart-copy-table-btn').addEventListener(
         'click', () => CHART_MANAGER.copyTable());
     document.getElementById('chart-save-btn').addEventListener(
-        'click', () => CHART_MANAGER.downloadChart());
-    document.getElementById('chart-render-btn').addEventListener(
-        'click', () => CHART_MANAGER.renderChartAsPNG());
+        'click', () => CHART_MANAGER.downloadChart(event.shiftKey));
     document.getElementById('chart-widen-btn').addEventListener(
         'click', () => CHART_MANAGER.stretchChart(1));
     document.getElementById('chart-narrow-btn').addEventListener(
@@ -333,7 +331,7 @@ class GUIChartManager extends ChartManager {
   }
   
   updateSelector() {
-    // Adds one option to the selector for each chart defined for the model.
+    // Add one option to the selector for each chart defined for the model.
     // NOTE: Add the "new chart" option if it is not in the list.
     MODEL.addChart(this.new_chart_title);
     if(this.chart_index < 0) this.chart_index = 0;
@@ -356,7 +354,7 @@ class GUIChartManager extends ChartManager {
   }
   
   updateDialog() {
-    // Refreshes all dialog fields to display actual MODEL chart properties
+    // Refreshe all dialog fields to display actual MODEL chart properties.
     this.updateSelector();
     let c = null;
     if(this.chart_index >= 0) {
@@ -370,8 +368,8 @@ class GUIChartManager extends ChartManager {
       }
       UI.setBox('chart-title', c.show_title);
       const ol = [];
-      for(let i = 0; i < this.legend_options.length; i++) {
-        const opt = this.legend_options[i], val = opt.toLowerCase();
+      for(const opt of this.legend_options) {
+        const val = opt.toLowerCase();
         ol.push(['<option value="', val,
           (c.legend_position === val ? '" selected="selected' : ''),
           '">', opt, '</option>'].join(''));
@@ -427,14 +425,16 @@ class GUIChartManager extends ChartManager {
       } else {
         UI.disableButtons(d_btn);
       }
-      // If the Edit variable dialog is showing, update its header
+      // If the Edit variable dialog is showing, update its header.
       if(this.variable_index >= 0 && !UI.hidden('variable-dlg')) {
         document.getElementById('variable-dlg-name').innerHTML =
               c.variables[this.variable_index].displayName;
       }
     }
+    // Finder dialog may need to update its "add variables to chart" button
+    if(FINDER.visible) FINDER.updateDialog();
     this.add_variable_modal.element('obj').value = 0;
-    // Update variable dropdown list of the "add variable" modal
+    // Update variable dropdown list of the "add variable" modal.
     X_EDIT.updateVariableBar('add-');
     this.stretchChart(0);
   }
@@ -507,9 +507,7 @@ class GUIChartManager extends ChartManager {
       let n = '';
       if(c.histogram) {
         let vv = [];
-        for(let i = 0; i < c.variables.length; i++) {
-          if(c.variables[i].visible) vv.push(c.variables[i]);
-        }
+        for(const v of c.variables) if(v.visible) vv.push(v);
         const
             l = vv.length,
             bars = c.bins * l,
@@ -547,16 +545,16 @@ class GUIChartManager extends ChartManager {
   }
 
   selectChart() {
-    // Sets the selected chart to be the "active" chart
+    // Set the selected chart to be the "active" chart.
     const ci = parseInt(this.chart_selector.value);
-    // Deselect variable only if different chart is selected
+    // Deselect variable only if different chart is selected.
     if(ci !== this.chart_index) this.variable_index = -1;
     this.chart_index = ci;
     this.updateDialog();
   }
 
   promptForTitle() {
-    // Prompts modeler for a new title for the current chart
+    // Prompt modeler for a new title for the current chart.
     if(this.chart_index >= 0) {
       this.rename_chart_modal.show();
       const nct = document.getElementById('new-chart-title');
@@ -566,29 +564,29 @@ class GUIChartManager extends ChartManager {
   }
 
   renameChart() {
-    // Renames the current chart
+    // Rename the current chart.
     if(this.chart_index >= 0) {
-      const t = document.getElementById('new-chart-title').value.trim();
-      // Check if a chart with this title already exists
+      const t = UI.cleanName(document.getElementById('new-chart-title').value);
+      // Check if a chart with this title already exists.
       const ci = MODEL.indexOfChart(t);
       if(ci >= 0 && ci != this.chart_index) {
         UI.warn(`A chart with title "${t}" already exists`);
       } else {
         const c = MODEL.charts[this.chart_index];
-        // Remember the old title of the chart-to-be-renamed
+        // Remember the old title of the chart-to-be-renamed.
         const ot = c.title;
         c.title = t;
-        // If the default '(new chart)' has been renamed, create a new one
+        // If the default '(new chart)' has been renamed, create a new one.
         if(ot === this.new_chart_title) {
           MODEL.addChart(ot);
         }
-        // Update the chart index so that it points to the renamed chart
+        // Update the chart index so that it points to the renamed chart.
         this.chart_index = MODEL.indexOfChart(t);
         this.updateSelector();
-        // Redraw the chart if title is shown
+        // Redraw the chart if title is shown.
         if(c.show_title) this.drawChart();
       }
-      // Update experiment viewer in case its current experiment uses this chart
+      // Update dialogs that may refer to this chart.
       UI.updateControllerDialogs('CFX');
     }
     this.rename_chart_modal.hide();
@@ -608,10 +606,8 @@ class GUIChartManager extends ChartManager {
       nc.bins = c.bins;
       nc.show_title = c.show_title;
       nc.legend_position = c.legend_position;
-      for(let i = 0; i < c.variables.length; i++) {
-        const
-            cv = c.variables[i],
-            nv = new ChartVariable(nc);
+      for(const cv of c.variables) {
+        const nv = new ChartVariable(nc);
         nv.setProperties(cv.object, cv.attribute, cv.stacked,
             cv.color, cv.scale_factor, cv.line_width, cv.sorted);
         nc.variables.push(nv);
@@ -743,7 +739,17 @@ class GUIChartManager extends ChartManager {
     // First hide the "Add variable" modal.
     this.add_variable_modal.hide();
     // Do not prompt for selection if there is only 1 match.
-    if(indices.length < 2) chart.addWildcardVariables(dsm, indices);
+    if(indices.length < 2) {
+      if(indices.length) {
+        chart.addWildcardVariables(dsm, indices);
+      } else if(dsm.selector.startsWith(':')) {
+        UI.notify('Plotting methods is work-in-progress!');
+        console.log('HERE dsm', dsm, 'expr', dsm.expression.text, 'indices', indices);
+      } else {
+        UI.notify(`Variable "${dsm.displayName}" cannot be plotted`);
+      }
+      return;
+    }
     md.chart = chart;
     md.modifier = dsm;
     md.indices = indices;
@@ -751,10 +757,10 @@ class GUIChartManager extends ChartManager {
         tr = [],
         dn = dsm.displayName,
         tbl = md.element('table');
-    for(let i = 0; i < indices.length; i++) {
-      tr.push('<tr><td class="v-box"><div id="wcv-box-', indices[i],
+    for(const index of indices) {
+      tr.push('<tr><td class="v-box"><div id="wcv-box-', index,
           '" class="box clear" onclick="UI.toggleBox(event);"></td>',
-          '<td class="vname">', dn.replace('??', indices[i]),
+          '<td class="vname">', dn.replace('??', index),
           '</td></tr>');
       tbl.innerHTML = tr.join('');
     }
@@ -769,11 +775,10 @@ class GUIChartManager extends ChartManager {
         md = this.add_wildcard_modal,
         c = md.chart,
         dsm = md.modifier,
-        il = md.indices,
         indices = [];
-    if(c && dsm && il) {
-      for(let i = 0; i < il.length; i++) {
-        if(UI.boxChecked('wcv-box-'+ il[i])) indices.push(il[i]);
+    if(c && dsm) {
+      for(const index of md.indices) {
+        if(UI.boxChecked('wcv-box-'+ index)) indices.push(index);
       }
     }
     if(indices.length) c.addWildcardVariables(dsm, indices);
@@ -947,28 +952,27 @@ class GUIChartManager extends ChartManager {
       this.variable_index = -1;
       this.updateDialog();
       // Also update the experiment viewer (charts define the output variables)
-      // and finder dialog
+      // and finder dialog.
       if(EXPERIMENT_MANAGER.selected_experiment) UI.updateControllerDialogs('FX');
     }
     this.variable_modal.hide();
   }
   
   showChartImage(c) {
-    // Displays the SVG image for chart `c` (computed by this Chart object)
+    // Display the SVG image for chart `c` (computed by this Chart object).
     if(c) document.getElementById('chart-svg').innerHTML = c.svg;
   }
 
   drawTable() {
-    // Shows the statistics on the chart variables.
+    // Show the statistics on the chart variables.
     const html = [];
     let vbl = [];
     if(this.chart_index >= 0) vbl = MODEL.charts[this.chart_index].variables;
     // First get the (potentially floating point) numbers so that their format
-    // can be made uniform per column
+    // can be made uniform per column.
     const data = [];
     let nr = 0;
-    for(let i = 0; i < vbl.length; i++) {
-      const v = vbl[i];
+    for(const v of vbl) {
       if(v.visible) {
         data.push([VM.sig4Dig(v.minimum), VM.sig4Dig(v.maximum),
             VM.sig4Dig(v.mean), VM.sig4Dig(Math.sqrt(v.variance)),
@@ -980,7 +984,7 @@ class GUIChartManager extends ChartManager {
       this.table_panel.innerHTML = '<div id="no-chart-data">No data</div>';
       return;
     }
-    // Process each of 5 columns separately
+    // Process each of 5 columns separately.
     for(let c = 0; c < 5; c++) {
       const col = [];
       for(let r = 0; r < data.length; r++) {
@@ -998,10 +1002,9 @@ class GUIChartManager extends ChartManager {
         '<th>&mu;</th><th>&sigma;</th><th>&Sigma;</th>',
         '<th>&ne;0</th><th>&#x26A0;</th></tr>');
     nr = 0;
-    for(let i = 0; i < vbl.length; i++) {
-      const v = vbl[i];
+    for(const v of vbl) {
       if(v.visible) {
-        // NOTE: while still solving, display t-1 as N
+        // NOTE: While still solving, display t-1 as N.
         const n = Math.max(0, v.N);
         html.push('<tr><td class="v-name">', v.displayName, '</td><td>', n,
             '</td><td title="', v.minimum.toPrecision(8), '">', data[nr][0],
@@ -1086,17 +1089,17 @@ class GUIChartManager extends ChartManager {
     }
   }
   
-  downloadChart() {
-    // Pushes the SVG of the selected chart as file to the browser
+  downloadChart(shift) {
+    // Pushes the SVG of the selected chart as file to the browser.
     if(this.chart_index >= 0) {
-      FILE_MANAGER.pushOutSVG(MODEL.charts[this.chart_index].svg);
+      const svg = MODEL.charts[this.chart_index].svg;
+      if(shift) {
+        FILE_MANAGER.pushOutSVG(svg);
+      } else {
+        FILE_MANAGER.pushOutPNG(svg);
+      }
     }
   }
-  
-  renderChartAsPNG() {
-    window.localStorage.removeItem('png-url');
-    FILE_MANAGER.renderSVGAsPNG(MODEL.charts[this.chart_index].svg);
-  }
 
   drawChart() {
     // Displays the selected chart unless an experiment is running, or

package/static/scripts/linny-r-gui-constraint-editor.js

@@ -984,11 +984,10 @@ class ConstraintEditor {
       '</defs>'].join('');
     // Draw the grid
     this.drawGrid();
-    // Use c as shorthand for this.constraint
+    // Use `c` as shorthand for this.constraint.
     const c = this.constraint;
     // Add the SVG for lower and upper bounds
-    for(let i = 0; i < c.bound_lines.length; i++) {
-      const bl = c.bound_lines[i];
+    for(const bl of c.bound_lines) {
       this.drawContour(bl);
       this.drawLine(bl);
     }
@@ -1057,10 +1056,7 @@ class ConstraintEditor {
     } else {
       const base_y = (l.type === VM.GE ? 0 : 100);
       cp = 'M' + this.point(0, base_y);
-      for(let i = 0; i < l.points.length; i++) {
-        const p = l.points[i];
-        cp += `L${this.point(p[0], p[1])}`;
-      }
+      for(const p of l.points) cp += `L${this.point(p[0], p[1])}`;
       cp += 'L' + this.point(100, base_y) + 'z';
       // Save the contour for rapid display of thumbnails.
       l.contour_path = cp;
@@ -1089,10 +1085,10 @@ class ConstraintEditor {
     const
         cfs = `fill="${color}" stroke="${color}" stroke-width="${width}"`,
         icfs = 'fill="white" stroke="white" stroke-width="1"';
-    for(let i = 0; i < l.points.length; i++) {
+    for(const p of l.points) {
       const
-          px = l.points[i][0],
-          py = l.points[i][1];
+          px = p[0],
+          py = p[1];
       pp.push(this.point(px, py));
       dots += `<circle ${this.circleCenter(px, py)} r="3" ${cfs}></circle>`;
       // Draw "custom points" with a white inner circle.
@@ -1118,13 +1114,13 @@ class ConstraintEditor {
   }
   
   showDialog(group=[]) {
-    this.from_node = MODEL.objectByName(this.from_name.innerHTML);
-    this.to_node = MODEL.objectByName(this.to_name.innerHTML);
-    // Double-check that these nodes exist
+    this.from_node = MODEL.objectByName(this.from_name.innerText);
+    this.to_node = MODEL.objectByName(this.to_name.innerText);
+    // Double-check that these nodes exist.
     if(!(this.from_node && this.to_node)) {
       throw 'ERROR: Unknown constraint node(s)';
     }
-    // See if existing constraint is edited
+    // See if existing constraint is edited.
     this.edited_constraint = this.from_node.doesConstrain(this.to_node);
     if(this.edited_constraint) {
       // Make a working copy, as the constraint must be changed only when