Fixed arithmetic column axis bug in Bokeh

esg-epfl-apc · Sep 27, 2024 · 5231e8c · 5231e8c
1 parent a5ccf3d
commit 5231e8c
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 19 deletions.
diff --git a/prototypes/jsvis/components/inputs/ArithmeticColumnInput.js b/prototypes/jsvis/components/inputs/ArithmeticColumnInput.js
@@ -26,21 +26,6 @@ export class ArithmeticColumnInput extends HTMLElement {
         "<button class='btn btn-secondary'>/</button>" +
         "</div>" +
         "<div class='button-grid'>" +
-        "<button class='btn btn-secondary'>(</button>" +
-        "<button class='btn btn-secondary'>)</button>" +
-        "<button class='btn btn-secondary'>pow2()</button>" +
-        "<button class='btn btn-secondary'>pow3()</button>" +
-        "</div>" +
-        "<div class='button-grid'>" +
-        "<button class='btn btn-secondary'>sqrt()</button>" +
-        "<button class='btn btn-secondary'>min()</button>" +
-        "<button class='btn btn-secondary'>max()</button>" +
-        "<button class='btn btn-secondary'>mean()</button>" +
-        "</div>" +
-        "<div class='button-grid'>" +
-        "<button class='btn btn-secondary'>log()</button>" +
-        "<button class='btn btn-secondary'><--</button>" +
-        "<button class='btn btn-secondary'>--></button>" +
         "<button class='btn btn-danger'>C</button>" +
         "<button class='btn btn-success'>V</button>" +
         "</div>" +

diff --git a/prototypes/jsvis/dist/astrovis/astrovis.js b/prototypes/jsvis/dist/astrovis/astrovis.js
diff --git a/prototypes/jsvis/package.json b/prototypes/jsvis/package.json
@@ -1,6 +1,6 @@
 {
   "name": "astrovisjs",
-  "version": "0.9.2",
+  "version": "0.9.5",
   "main": "dist/astrovis.js",
   "scripts": {
     "build": "npx webpack --config webpack.dev.js",

diff --git a/prototypes/jsvis/wrappers/BokehWrapper.js b/prototypes/jsvis/wrappers/BokehWrapper.js
@@ -86,8 +86,19 @@ export class BokehWrapper {
             let axis_settings = [];
 
             for(let axis_column in axis) {
-                let axis_column_object = this._getColumnSettings(axis[axis_column]);
-                axis_column_object = {...axis_column_object, ...{axis: axis_column}}
+                let axis_column_object;
+
+                if(columns[axis_column].column_type === 'standard') {
+                    axis_column_object = this._getColumnSettings(axis[axis_column]);
+                    axis_column_object = {...axis_column_object, ...columns[axis_column], ...{axis: axis_column}}
+                } else if(columns[axis_column].column_type === 'processed') {
+                    axis_column_object = this._getCustomColumnSettings(axis[axis_column]);
+                    axis_column_object = {...axis_column_object, ...columns[axis_column], ...{axis: axis_column}, ...{column_name: axis+'_processed'}}
+                } else {
+                    axis_column_object = this._getColumnSettings(axis[axis_column]);
+                    axis_column_object = {...axis_column_object, ...columns[axis_column], ...{axis: axis_column}}
+                }
+
 
                 axis_settings.push(axis_column_object);
             }