update chart

Author: Quant Lab

packages/calendar-extension/package.json

@@ -29,7 +29,10 @@
     "watch": "tsc -w"
   },
   "quantlab": {
-    "extension": true
+    "extension": true,
+    "schemas": [
+      "schema/jupyter.services.calendar.json"
+    ]
   },
   "repository": {
     "type": "git",

packages/docregistry/src/registry.ts

@@ -1169,7 +1169,7 @@ namespace DocumentRegistry {
     },
     {
       name: 'hc',
-      extensions: ['.hc', '.hs', '.hm'],
+      extensions: ['.hc'],
       iconClass: 'jp-MaterialIcon jp-ChartIcon'
     },
     {

packages/highcharts-extension/src/index.ts

@@ -55,6 +55,9 @@ const FACTORY = 'HighCharts';
  */
 const CHART_ICON_CLASS = 'jp-ChartIcon';
 
+/**
+ * The chart tools extension.
+ */
 const chartToolsPlugin: QuantLabPlugin<IChartTools> = {
   activate: activateChartTools,
   provides: IChartTools,
@@ -64,9 +67,9 @@ const chartToolsPlugin: QuantLabPlugin<IChartTools> = {
 };
 
 /**
- * The default chart extension.
+ * The chart widget tracker provider.
  */
-const chartPlugin: QuantLabPlugin<IChartTracker> = {
+const trackerPlugin: QuantLabPlugin<IChartTracker> = {
   activate: activateCharts,
   id: 'jupyter.extensions.highcharts',
   provides: IChartTracker,
@@ -81,13 +84,13 @@ const chartPlugin: QuantLabPlugin<IChartTracker> = {
 /**
  * Export the plugin as default.
  */
-const plugins: QuantLabPlugin<any>[] = [chartPlugin, chartToolsPlugin];
+const plugins: QuantLabPlugin<any>[] = [trackerPlugin, chartToolsPlugin];
 export default plugins;
 
 function activateChartTools(app: QuantLab, tracker: IChartTracker, editorServices: IEditorServices, state: IStateDB): Promise<IChartTools> {
   const id = 'chart-tools';
   const charttools = new ChartTools({tracker});
-  const slideShow = ChartTools.createSlideShowSelector();
+  const category = ChartTools.createCategorySelector();
   const nbConvert = ChartTools.createNBConvertSelector();
   const editorFactory = editorServices.factoryService.newInlineEditor
     .bind(editorServices.factoryService);
@@ -109,11 +112,11 @@ function activateChartTools(app: QuantLab, tracker: IChartTracker, editorService
     return true;
   };
 
-  charttools.title.label = 'Chart Tools';
+  charttools.title.label = 'Highcharts';
   charttools.id = id;
-  charttools.addItem({ tool: slideShow, rank: 2 });
-  charttools.addItem({ tool: nbConvert, rank: 3 });
-  charttools.addItem({ tool: metadataEditor, rank: 4 });
+  charttools.addItem({ tool: category, rank: 1 });
+  charttools.addItem({ tool: nbConvert, rank: 2 });
+  charttools.addItem({ tool: metadataEditor, rank: 3 });
   MessageLoop.installMessageHook(charttools, hook);
 
   // Wait until the application has finished restoring before rendering.

packages/highcharts/src/tools.ts

@@ -370,17 +370,14 @@ namespace ChartTools {
    * Create a slideshow selector.
    */
   export
-  function createSlideShowSelector(): KeySelector {
+  function createCategorySelector(): KeySelector {
     let options: KeySelector.IOptions = {
-      key: 'slideshow',
-      title: 'Slide Type',
+      key: 'category',
+      title: 'Category',
       optionsMap: {
-        '-': '-',
-        'Slide': 'slide',
-        'Sub-Slide': 'subslide',
-        'Fragment': 'fragment',
-        'Skip': 'skip',
-        'Notes': 'notes'
+        'Chart': 'chart',
+        'Stock': 'stock',
+        'Map': 'map'
       }
     };
     return new KeySelector(options);
@@ -393,9 +390,9 @@ namespace ChartTools {
   function createNBConvertSelector(): KeySelector {
     return new KeySelector({
       key: 'raw_mimetype',
-      title: 'Raw NBConvert Format',
+      title: 'Type',
       optionsMap: {
-        'None': '-',
+        '-': '-',
         'LaTeX': 'text/latex',
         'reST': 'text/restructuredtext',
         'HTML': 'text/html',

packages/highcharts/src/typings.d.ts

@@ -4,3 +4,8 @@
 /// <reference path="../typings/highcharts/highcharts.d.ts"/>
 /// <reference path="../typings/highstock/highstock.d.ts"/>
 /// <reference path="../typings/highmaps/highmaps.d.ts"/>
+
+declare module "*.json" {
+    const value: any;
+    export default value;
+}

packages/highcharts/src/widget.ts

@@ -26,11 +26,15 @@ import {
 } from '@quantlab/docregistry';
 
 import * as Highcharts from 'highcharts';
-
+import Highmore = require('highcharts/highcharts-more');
+import High3D = require('highcharts/highcharts-3d');
+import HighDrag3D = require('highcharts/modules/draggable-3d');
+import HighGauge = require('highcharts/modules/solid-gauge');
+//import HighData = require('highcharts/modules/data');
+//import HighExport = require('highcharts/modules/exporting');
 import * as Highstock from 'highcharts/highstock';
-
 import * as Highmaps from 'highcharts/highmaps';
-import 'highcharts/modules/data';
+
 
 const HIGHCHARTS_CLASS = 'jp-HighCharts';
 
@@ -51,6 +55,7 @@ class HighCharts extends Widget implements DocumentRegistry.IReadyWidget {
     context.pathChanged.connect(this._onPathChanged, this);
     context.ready.then(() => { this._onContextReady(); });
     this._onPathChanged();
+
   }
 
   get context(): DocumentRegistry.Context {
@@ -86,7 +91,9 @@ class HighCharts extends Widget implements DocumentRegistry.IReadyWidget {
     if (monitor) {
       monitor.dispose();
     }
+    //while(this._chart.series.length > 0) this._chart.series[0].remove(true);
     this._chart.destroy();
+    this._chart = null;
     super.dispose();
   }
 
@@ -119,15 +126,18 @@ class HighCharts extends Widget implements DocumentRegistry.IReadyWidget {
     };
     content.reflow = false;
 
-    const path = this._context.path;
-    let ext = PathExt.basename(path.split(':').pop()!);
-    ext = ext.split('.').pop();
+    if(this._chart != null){
+      this._chart.destroy();
+    }
 
-    if(ext == 'hc')
+    if(content.category == 'chart'){
       this._chart = Highcharts.chart(this.id, content);
-    else if(ext == 'hs')
+    }
+    if(content.category == 'stock'){
       this._chart = new Highstock.StockChart(this.id, content);
-    else if(ext == 'hm'){
+    }
+    if(content.category == 'map'){
+      //content.mapData = worldGeo;
       this._chart = Highmaps.mapChart(this.id, content);
     }
 
@@ -153,6 +163,16 @@ namespace HighCharts {
 
 export
 class HighChartsFactory extends ABCWidgetFactory<HighCharts, DocumentRegistry.IModel> {
+  constructor(options:DocumentRegistry.IWidgetFactoryOptions){
+    super(options);
+    Highmore(Highcharts);
+    High3D(Highcharts);
+    HighDrag3D(Highcharts);
+    HighGauge(Highcharts);
+    //HighData(Highcharts);
+    //HighExport(Highcharts);
+  }
+
   /**
    * Create a new widget given a context.
    */

packages/highcharts/style/index.css

@@ -3,4 +3,4 @@
 | Distributed under the terms of the Modified BSD License.
 |----------------------------------------------------------------------------*/
 
-@import url('~highcharts/css/highcharts.css');
+/*@import url('~highcharts/css/highcharts.css');*/

packages/spreadsheet-extension/src/index.ts

@@ -63,7 +63,9 @@ const SPREADSHEET_ICON_CLASS = 'jp-SpreadsheetIcon';
  */
 const DIRTY_CLASS = 'jp-mod-dirty';
 
-
+/**
+ * The sheet tools extension.
+ */
 const sheetToolsPlugin: QuantLabPlugin<ISheetTools> = {
   activate: activateSheetTools,
   provides: ISheetTools,
@@ -73,9 +75,9 @@ const sheetToolsPlugin: QuantLabPlugin<ISheetTools> = {
 };
 
 /**
- * The default sheet extension.
+ * The spreadsheet widget tracker provider.
  */
-const sheetPlugin: QuantLabPlugin<ISpreadsheetTracker> = {
+const trackerPlugin: QuantLabPlugin<ISpreadsheetTracker> = {
   activate: activateSpreadsheet,
   id: 'jupyter.extensions.spreadsheet',
   provides: ISpreadsheetTracker,
@@ -90,7 +92,7 @@ const sheetPlugin: QuantLabPlugin<ISpreadsheetTracker> = {
 /**
  * Export the plugin as default.
  */
- const plugins: QuantLabPlugin<any>[] = [sheetPlugin, sheetToolsPlugin];
+const plugins: QuantLabPlugin<any>[] = [trackerPlugin, sheetToolsPlugin];
 export default plugins;
 
 function activateSheetTools(app: QuantLab, tracker: ISpreadsheetTracker, editorServices: IEditorServices, state: IStateDB): Promise<ISheetTools> {
@@ -119,7 +121,7 @@ function activateSheetTools(app: QuantLab, tracker: ISpreadsheetTracker, editorS
     return true;
   };
 
-  sheettools.title.label = 'Sheet Tools';
+  sheettools.title.label = 'Spreadsheet';
   sheettools.id = id;
   sheettools.addItem({ tool: activeCellTool, rank: 1 });
   sheettools.addItem({ tool: slideShow, rank: 2 });