3D Scatter (#107)

* 3D Scatter

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Author: martinRenou

gluepyter/glue_session.py

@@ -267,6 +267,19 @@ def _viewer_factory(
                         pass
             except Exception as e:
                 widget = ErrorWidget(e, __file__)
+        elif (
+            view_type == "glue_vispy_viewers.scatter.scatter_viewer.VispyScatterViewer"
+        ):
+            try:
+                widget = self.app.scatter3d(data=viewer_data)
+                for key, value in viewer_state.items():
+                    try:
+                        setattr(widget.state, key, value)
+                    except Exception:
+                        pass
+            except Exception as e:
+                widget = ErrorWidget(e, __file__)
+
         return widget
 
     def _read_view_state(

src/commands.ts

@@ -10,6 +10,8 @@ export namespace CommandIDs {
 
   export const new2DScatter = 'glue-control:new-2d-scatter-viewer';
 
+  export const new3DScatter = 'glue-control:new-3d-scatter-viewer';
+
   export const newTable = 'glue-control:new-table-viewer';
 
   export const openControlPanel = 'glue-control:open-control-panel';

src/leftPanel/data/datasetsWidget.tsx

@@ -32,6 +32,7 @@ export class DatasetsWidget extends ReactWidget {
     viewerSubmenu.title.iconClass = 'fa fa-caret-right';
     viewerSubmenu.addItem({ command: CommandIDs.new1DHistogram });
     viewerSubmenu.addItem({ command: CommandIDs.new2DScatter });
+    viewerSubmenu.addItem({ command: CommandIDs.new3DScatter });
     viewerSubmenu.addItem({ command: CommandIDs.new2DImage });
     viewerSubmenu.addItem({ command: CommandIDs.newTable });
     this._menu.addItem({ type: 'submenu', submenu: viewerSubmenu });

src/leftPanel/plugin.ts

@@ -53,7 +53,7 @@ function addCommands(
 
   commands.addCommand(CommandIDs.new2DScatter, {
     label: '2D Scatter',
-    iconClass: 'fa fa-circle',
+    iconClass: 'fa fa-chart-line',
     execute: (args?: INewViewerArgs) => {
       if (!controlModel.sharedModel) {
         return;
@@ -81,6 +81,36 @@ function addCommands(
     }
   });
 
+  commands.addCommand(CommandIDs.new3DScatter, {
+    label: '3D Scatter',
+    iconClass: 'fa fa-chart-line',
+    execute: (args?: INewViewerArgs) => {
+      if (!controlModel.sharedModel) {
+        return;
+      }
+
+      const tabs = Object.keys(controlModel.sharedModel.tabs);
+      const focusedTab = controlModel.sharedModel.getSelectedTab() || 1;
+      const layer = args?.dataset || controlModel.selectedDataset;
+
+      if (focusedTab === 0) {
+        return;
+      }
+
+      controlModel.sharedModel.setTabItem(tabs[focusedTab - 1], UUID.uuid4(), {
+        _type: 'glue_vispy_viewers.scatter.scatter_viewer.VispyScatterViewer',
+        pos: args?.position || [0, 0],
+        session: 'Session',
+        size: args?.size || [600, 400],
+        state: {
+          values: {
+            layer
+          }
+        }
+      });
+    }
+  });
+
   commands.addCommand(CommandIDs.new2DImage, {
     label: '2D Image',
     iconClass: 'fa fa-image',

src/schemas/glue.schema.json

@@ -57,7 +57,10 @@
           "items": {
             "anyOf": [
               {
-                "$ref": "./viewers/scatter.schema.json"
+                "$ref": "./viewers/3dscatter.schema.json"
+              },
+              {
+                "$ref": "./viewers/2dscatter.schema.json"
               },
               {
                 "$ref": "./viewers/histogram.schema.json"

src/schemas/viewers/scatter.schema.json renamed to src/schemas/viewers/2dscatter.schema.json

@@ -0,0 +1,42 @@
+{
+  "type": "object",
+  "description": "Viewer::Scatter",
+  "title": "IGlueScatterViewer",
+  "required": ["_type", "layers", "pos", "session", "size", "state"],
+  "additionalProperties": false,
+  "properties": {
+    "_type": {
+      "const": "glue_vispy_viewers.scatter.scatter_viewer.VispyScatterViewer"
+    },
+    "layers": {
+      "type": "array",
+      "items": {
+        "type": "object"
+      }
+    },
+    "pos": {
+      "type": "array",
+      "items": {
+        "type": "number"
+      }
+    },
+    "session": {
+      "type": "string"
+    },
+    "size": {
+      "type": "array",
+      "items": {
+        "type": "number"
+      }
+    },
+    "state": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "values": {
+          "type": "object"
+        }
+      }
+    }
+  }
+}

src/schemas/viewers/3dscatter.schema.json

@@ -101,6 +101,7 @@ export class SessionWidget extends BoxPanel {
     const items: IDict<string> = {
       Histogram: CommandIDs.new1DHistogram,
       '2D Scatter': CommandIDs.new2DScatter,
+      '3D Scatter': CommandIDs.new3DScatter,
       '2D Image': CommandIDs.new2DImage,
       Table: CommandIDs.newTable
     };