Add arrow renderer, fix some problems from #1290

finos · Jan 17, 2021 · 7f25bbe · 7f25bbe
1 parent 83b551e
commit 7f25bbe
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 2 deletions.
diff --git a/cpp/perspective/CMakeLists.txt b/cpp/perspective/CMakeLists.txt
@@ -634,6 +634,10 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
 
 			# .dll not importable
 			set_property(TARGET binding PROPERTY SUFFIX .pyd)
+		elseif (MACOS OR NOT MANYLINUX)
+			target_compile_options(binding PRIVATE -Wdeprecated-declarations)
+			set_property(TARGET psp PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${module_origin_path})
+			set_property(TARGET binding PROPERTY INSTALL_RPATH ${CMAKE_INSTALL_RPATH} ${module_origin_path})
 		else()
 			target_compile_options(binding PRIVATE -Wdeprecated-declarations)
 		endif()

diff --git a/packages/perspective-jupyterlab/src/ts/renderer.ts b/packages/perspective-jupyterlab/src/ts/renderer.ts
@@ -18,10 +18,11 @@ import {PerspectiveWidget} from "./psp_widget";
  */
 const FACTORY_CSV = "CSVPerspective";
 const FACTORY_JSON = "JSONPerspective";
+const FACTORY_ARROW = "ArrowPerspective";
 
 const RENDER_TIMEOUT = 1000;
 
-type IPerspectiveDocumentType = "csv" | "json";
+type IPerspectiveDocumentType = "csv" | "json" | "arrow";
 
 // create here to reuse for exception handling
 const baddialog = (): void => {
@@ -53,7 +54,7 @@ export class PerspectiveDocumentWidget extends DocumentWidget<PerspectiveWidget>
 
     private _update(): void {
         try {
-            if (this._type === "csv") {
+            if (this._type === "csv" || this._type === "arrow") {
                 // load csv directly
                 const data: string = this._context.model.toString();
                 this._psp._update(data);
@@ -117,6 +118,15 @@ export class PerspectiveJSONFactory extends ABCWidgetFactory<IDocumentWidget<Per
     }
 }
 
+/**
+ * A widget factory for arrow widgets.
+ */
+export class PerspectiveArrowFactory extends ABCWidgetFactory<IDocumentWidget<PerspectiveWidget>> {
+    protected createNewWidget(context: DocumentRegistry.Context): IDocumentWidget<PerspectiveWidget> {
+        return new PerspectiveDocumentWidget({context}, "arrow");
+    }
+}
+
 /**
  * Activate cssviewer extension for CSV files
  */
@@ -135,6 +145,13 @@ function activate(app: JupyterFrontEnd, restorer: ILayoutRestorer | null, themeM
         readOnly: true
     });
 
+    const factoryarrow = new PerspectiveArrowFactory({
+        name: FACTORY_ARROW,
+        fileTypes: ["arrow"],
+        defaultFor: ["arrow"],
+        readOnly: true
+    });
+
     const trackercsv = new WidgetTracker<IDocumentWidget<PerspectiveWidget>>({
         namespace: "csvperspective"
     });
@@ -143,6 +160,10 @@ function activate(app: JupyterFrontEnd, restorer: ILayoutRestorer | null, themeM
         namespace: "jsonperspective"
     });
 
+    const trackerarrow = new WidgetTracker<IDocumentWidget<PerspectiveWidget>>({
+        namespace: "arrowperspective"
+    });
+
     if (restorer) {
         // Handle state restoration.
         void restorer.restore(trackercsv, {
@@ -156,17 +177,26 @@ function activate(app: JupyterFrontEnd, restorer: ILayoutRestorer | null, themeM
             args: widget => ({path: widget.context.path, factory: FACTORY_JSON}),
             name: widget => widget.context.path
         });
+
+        void restorer.restore(trackerarrow, {
+            command: "docmanager:open",
+            args: widget => ({path: widget.context.path, factory: FACTORY_ARROW}),
+            name: widget => widget.context.path
+        });
     }
 
     app.docRegistry.addWidgetFactory(factorycsv);
     app.docRegistry.addWidgetFactory(factoryjson);
+    app.docRegistry.addWidgetFactory(factoryarrow);
 
     const ftcsv = app.docRegistry.getFileType("csv");
     const ftjson = app.docRegistry.getFileType("json");
+    const ftarrow = app.docRegistry.getFileType("arrow");
 
     factorycsv.widgetCreated.connect((sender, widget) => {
         // Track the widget.
         void trackercsv.add(widget);
+
         // Notify the widget tracker if restore data needs to update.
         widget.context.pathChanged.connect(() => {
             void trackercsv.save(widget);
@@ -181,6 +211,7 @@ function activate(app: JupyterFrontEnd, restorer: ILayoutRestorer | null, themeM
     factoryjson.widgetCreated.connect((sender, widget) => {
         // Track the widget.
         void trackerjson.add(widget);
+
         // Notify the widget tracker if restore data needs to update.
         widget.context.pathChanged.connect(() => {
             void trackerjson.save(widget);
@@ -192,6 +223,21 @@ function activate(app: JupyterFrontEnd, restorer: ILayoutRestorer | null, themeM
         }
     });
 
+    factoryarrow.widgetCreated.connect((sender, widget) => {
+        // Track the widget.
+        void trackerarrow.add(widget);
+
+        // Notify the widget tracker if restore data needs to update.
+        widget.context.pathChanged.connect(() => {
+            void trackerarrow.save(widget);
+        });
+
+        if (ftarrow) {
+            widget.title.iconClass = ftarrow.iconClass || "";
+            widget.title.iconLabel = ftarrow.iconLabel || "";
+        }
+    });
+
     // Keep the themes up-to-date.
     const updateThemes = (): void => {
         const isLight = themeManager && themeManager.theme ? themeManager.isLight(themeManager.theme) : true;
@@ -201,6 +247,9 @@ function activate(app: JupyterFrontEnd, restorer: ILayoutRestorer | null, themeM
         trackerjson.forEach((pspDocWidget: PerspectiveDocumentWidget) => {
             pspDocWidget.psp.dark = !isLight;
         });
+        trackerarrow.forEach((pspDocWidget: PerspectiveDocumentWidget) => {
+            pspDocWidget.psp.dark = !isLight;
+        });
     };
 
     if (themeManager) {