Merge pull request #241 from jpmorganchase/y-scatter

Added `y_scatter` chart type
finos · Sep 17, 2018 · c8db1bd · c8db1bd
2 parents 7059726 + c09b0d9
commit c8db1bd
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/jpmorganchase/perspective.svg?branch=master)](https://travis-ci.org/jpmorganchase/perspective)
 [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg)](https://gitter.im/jpmorganchase/perspective)
+[![npm](https://img.shields.io/npm/v/@jpmorganchase/perspective.svg?style=flat-square)](https://www.npmjs.com/package/@jpmorganchase/perspective)
 
 A streaming data visualization engine for Javascript, Perspective makes it 
 simple to build real-time & user configurable analytics entirely in the browser.

diff --git a/packages/perspective-viewer-highcharts/src/js/config.js b/packages/perspective-viewer-highcharts/src/js/config.js
@@ -92,6 +92,8 @@ export function default_config(aggregates, mode) {
         type = 'line';
     } else if (mode === 'y_area') {
         type = 'area';
+    } else if (mode === 'y_scatter') {
+        type = 'scatter';
     } else if (mode.indexOf('bar') > -1) {
         type = 'column';
     } else if (mode == 'treemap') {

diff --git a/packages/perspective-viewer-highcharts/src/js/highcharts.js b/packages/perspective-viewer-highcharts/src/js/highcharts.js
@@ -34,9 +34,9 @@ function delete_chart() {
     }
 }
 
-global.registerPlugin("y_bar", {
-    name: "Y Bar Chart", 
-    create: draw("vertical_bar"), 
+global.registerPlugin("x_bar", {
+    name: "X Bar Chart", 
+    create: draw("horizontal_bar"), 
     resize: resize, 
     initial: {
         "type": "number",    
@@ -46,9 +46,9 @@ global.registerPlugin("y_bar", {
     delete: delete_chart
 });
 
-global.registerPlugin("x_bar", {
-    name: "X Bar Chart", 
-    create: draw("horizontal_bar"), 
+global.registerPlugin("y_bar", {
+    name: "Y Bar Chart", 
+    create: draw("vertical_bar"), 
     resize: resize, 
     initial: {
         "type": "number",    
@@ -70,6 +70,18 @@ global.registerPlugin("y_line", {
     delete: delete_chart
 });
 
+global.registerPlugin("y_scatter", {
+    name: "Y Scatter Chart", 
+    create: draw("y_scatter"), 
+    resize: resize, 
+    initial: {
+        "type": "number",    
+        "count": 1
+    },
+    selectMode: "select",
+    delete: delete_chart
+});
+
 global.registerPlugin("y_area", {
     name: "Y Area Chart", 
     create: draw("y_area"), 

diff --git a/packages/perspective/src/js/perspective.js b/packages/perspective/src/js/perspective.js
@@ -1738,7 +1738,7 @@ class WorkerHost extends Host {
                 __MODULE__ = __MODULE__(module);
             } else {
                 let wasmXHR = new XMLHttpRequest();
-                wasmXHR.open('GET', msg.path + '/psp.async.wasm', true);
+                wasmXHR.open('GET', msg.path + 'psp.async.wasm', true);
                 wasmXHR.responseType = 'arraybuffer';
                 wasmXHR.onload = function() {
                     module = {};

diff --git a/packages/perspective/src/js/perspective.parallel.js b/packages/perspective/src/js/perspective.parallel.js
@@ -104,7 +104,7 @@ class WebWorker extends worker {
 
     _start_cross_origin() {
         var dir = (typeof WebAssembly === "undefined" ? 'asmjs' : 'wasm');
-        XHRWorker(__SCRIPT_PATH__.path() + '/perspective.worker.' + dir + '.js', function(worker) {
+        XHRWorker(__SCRIPT_PATH__.path() + 'perspective.worker.' + dir + '.js', function(worker) {
             for (var key in this._worker) {
                 worker[key] = this._worker[key];
             }
@@ -130,7 +130,7 @@ class WebWorker extends worker {
 
     _start_cross_origin_wasm() {
         var wasmXHR = new XMLHttpRequest();
-        wasmXHR.open('GET', __SCRIPT_PATH__.path() + '/psp.async.wasm', true);
+        wasmXHR.open('GET', __SCRIPT_PATH__.path() + 'psp.async.wasm', true);
         wasmXHR.responseType = 'arraybuffer';
         wasmXHR.onload = () => {
             let msg = {
@@ -149,7 +149,7 @@ class WebWorker extends worker {
 
     _start_same_origin() {
         var dir = (typeof WebAssembly === "undefined" || detect_iphone() ? 'asmjs' : 'async');
-        var w =  new Worker(__SCRIPT_PATH__.path() + '/perspective.worker.' + dir + '.js');
+        var w =  new Worker(__SCRIPT_PATH__.path() + 'perspective.worker.' + dir + '.js');
         for (var key in this._worker) {
             w[key] = this._worker[key];
         }