Remove two.js

keller-mark · keller-mark · commit e14760151e49 · 2019-12-28T23:08:06.000-05:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vueplotlib",
-  "version": "1.8.0",
+  "version": "1.9.0",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve --open ./examples-src/index.js",
@@ -18,9 +18,7 @@
     "d3-delaunay": "4.1.3",
     "d3-dispatch-nosplit": "^2.0.1",
     "lodash": "^4.17.11",
-    "save-svg-as-png": "^1.4.6",
-    "simple-statistics": "^6.1.1",
-    "two.js": "^0.7.0-beta.3"
+    "simple-statistics": "^6.1.1"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "^3.0.0-beta.6",
diff --git a/src/components/PlotContainer.vue b/src/components/PlotContainer.vue
@@ -289,8 +289,6 @@ export default {
                     this.$slots.plot[0].componentInstance.drawPlot(plotSvg);
                     this.$slots.plot[0].componentInstance.drawPlot();
 
-                    console.log(plotSvg.node().innerHTML.length)
-
                     const plotG = svg
                         .append("g")
                             .attr("class", `download-g-plot`)
diff --git a/src/components/axes/DendrogramAxis.vue b/src/components/axes/DendrogramAxis.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { select as d3_select } from 'd3-selection';
 import { cluster as d3_cluster, hierarchy as d3_hierarchy } from 'd3-hierarchy';
 import { mouse as d3_mouse } from 'd3';
@@ -326,7 +326,6 @@ export default {
             descendants.forEach((d, i) => {
                 if(i > 0) {
                     const path = pathFunction(d);
-                    path.noFill();
                     path.stroke = "#555";
                     path.opacity = 0.6;
                     path.linewidth = 1.5;
diff --git a/src/components/axes/GenomeAxis.vue b/src/components/axes/GenomeAxis.vue
@@ -40,8 +40,6 @@ import { select as d3_select } from 'd3-selection';
 import { axisTop as d3_axisTop, axisLeft as d3_axisLeft, axisRight as d3_axisRight, axisBottom as d3_axisBottom } from 'd3-axis';
 import { zip as d3_zip } from 'd3-array';
 
-import { svgAsPngUri } from 'save-svg-as-png';
-
 import GenomeScale from './../../scales/GenomeScale.js';
 import HistoryEvent from './../../history/HistoryEvent.js';
 import HistoryStack from './../../history/HistoryStack.js';
@@ -522,14 +520,6 @@ export default {
                 .attr("y", labelY)
                 .attr("transform", "rotate(" + labelRotate + ")");
             
-        },
-        downloadAxis() {
-            const node = d3_select(this.axisSelector).select("svg").node();
-            return new Promise((resolve) => {
-                svgAsPngUri(node, {}, (uri) => {
-                    resolve(uri);
-                });
-            });
         }
     }
 }
diff --git a/src/components/legends/CategoricalLegend.vue b/src/components/legends/CategoricalLegend.vue
@@ -28,9 +28,7 @@
 <script>
 import { scaleBand as d3_scaleBand } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
-import { event as d3_event } from 'd3';
 
-import { saveSvgAsPng } from 'save-svg-as-png';
 
 import CategoricalScale from './../../scales/CategoricalScale.js';
 import HistoryEvent from './../../history/HistoryEvent.js';
@@ -411,15 +409,6 @@ export default {
                 .attr("transform", "scale(0.7 0.7)")
                 .attr("fill", "silver");
             
-
-
-            
-            
-            
-        },
-        downloadLegend() {
-            let node = d3_select(this.legendSelector).select("svg").node();
-            saveSvgAsPng(node, this.legendElemID + ".png");
         }
     }
 }
diff --git a/src/components/legends/ContinuousLegend.vue b/src/components/legends/ContinuousLegend.vue
@@ -40,8 +40,6 @@ import { scaleLinear as d3_scaleLinear } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse } from 'd3';
 
-import { saveSvgAsPng } from 'save-svg-as-png';
-
 import ContinuousScale from './../../scales/ContinuousScale.js';
 import HistoryEvent from './../../history/HistoryEvent.js';
 import HistoryStack from './../../history/HistoryStack.js';
@@ -313,10 +311,6 @@ export default {
             });
             
             
-        },
-        downloadLegend() {
-            let node = d3_select(this.legendSelector).select("svg").node();
-            saveSvgAsPng(node, this.legendElemID + ".png");
         }
     }
 }
diff --git a/src/components/plots/BarPlot.vue b/src/components/plots/BarPlot.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleBand as d3_scaleBand, scaleLinear as d3_scaleLinear, scaleLog as d3_scaleLog } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/BoxPlot.vue b/src/components/plots/BoxPlot.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear, scaleQuantile as d3_scaleQuantile } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/CountBarPlot.vue b/src/components/plots/CountBarPlot.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleBand as d3_scaleBand, scaleLinear as d3_scaleLinear, scaleLog as d3_scaleLog } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/DoubleStratifiedBoxPlot.vue b/src/components/plots/DoubleStratifiedBoxPlot.vue
@@ -102,7 +102,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear, scaleQuantile as d3_scaleQuantile, scaleBand as d3_scaleBand } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/DoubleStratifiedScatterPlot.vue b/src/components/plots/DoubleStratifiedScatterPlot.vue
@@ -63,7 +63,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/DoubleStratifiedSinaPlot.vue b/src/components/plots/DoubleStratifiedSinaPlot.vue
@@ -112,7 +112,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear, scaleQuantile as d3_scaleQuantile, scaleBand as d3_scaleBand } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/GenomeMultiTrackPlot.vue b/src/components/plots/GenomeMultiTrackPlot.vue
@@ -61,7 +61,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear, scaleBand as d3_scaleBand } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/GenomeScatterPlot.vue b/src/components/plots/GenomeScatterPlot.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear, scaleLog as d3_scaleLog } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/GenomeStackedBarPlot.vue b/src/components/plots/GenomeStackedBarPlot.vue
@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear } from 'd3-scale';
 import { stack as d3_stack, stackOrderNone as d3_stackOrderNone, stackOffsetNone as d3_stackOffsetNone } from 'd3-shape';
 import { select as d3_select } from 'd3-selection';
diff --git a/src/components/plots/GenomeTrackPlot.vue b/src/components/plots/GenomeTrackPlot.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/HierarchicalMultiTrackPlot.vue b/src/components/plots/HierarchicalMultiTrackPlot.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { hierarchy as d3_hierarchy } from 'd3-hierarchy';
 import { scaleBand as d3_scaleBand } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
diff --git a/src/components/plots/MultiBoxPlot.vue b/src/components/plots/MultiBoxPlot.vue
@@ -75,7 +75,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleBand as d3_scaleBand, scaleLinear as d3_scaleLinear, scaleQuantile as d3_scaleQuantile } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/MultiDataTrackPlot.vue b/src/components/plots/MultiDataTrackPlot.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleBand as d3_scaleBand } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/MultiTrackPlot.vue b/src/components/plots/MultiTrackPlot.vue
@@ -76,7 +76,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleBand as d3_scaleBand } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/RectPlot.vue b/src/components/plots/RectPlot.vue
@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { select as d3_select } from 'd3-selection';
 import { event as d3_event } from 'd3';
 
diff --git a/src/components/plots/ScatterPlot.vue b/src/components/plots/ScatterPlot.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear, scaleLog as d3_scaleLog } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/StackedBarPlot.vue b/src/components/plots/StackedBarPlot.vue
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleBand as d3_scaleBand, scaleLinear as d3_scaleLinear } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { stack as d3_stack, stackOrderNone as d3_stackOrderNone, stackOffsetNone as d3_stackOffsetNone } from 'd3-shape';
diff --git a/src/components/plots/StratifiedBoxPlot.vue b/src/components/plots/StratifiedBoxPlot.vue
@@ -79,7 +79,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear, scaleQuantile as d3_scaleQuantile, scaleBand as d3_scaleBand } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/StratifiedKaplanMeierPlot.vue b/src/components/plots/StratifiedKaplanMeierPlot.vue
@@ -53,7 +53,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/StratifiedScatterPlot.vue b/src/components/plots/StratifiedScatterPlot.vue
@@ -50,7 +50,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/StratifiedSinaPlot.vue b/src/components/plots/StratifiedSinaPlot.vue
@@ -89,7 +89,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleLinear as d3_scaleLinear, scaleQuantile as d3_scaleQuantile, scaleBand as d3_scaleBand } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/components/plots/TrackPlot.vue b/src/components/plots/TrackPlot.vue
@@ -54,7 +54,7 @@
 </template>
 
 <script>
-import Two from 'two.js';
+import Two from '../../two.js';
 import { scaleBand as d3_scaleBand } from 'd3-scale';
 import { select as d3_select } from 'd3-selection';
 import { mouse as d3_mouse, event as d3_event } from 'd3';
diff --git a/src/two.js b/src/two.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,6 @@ import { scaleLinear as d3_scaleLinear } from 'd3-scale';`
`40`	`40`	`import { select as d3_select } from 'd3-selection';`
`41`	`41`	`import { mouse as d3_mouse } from 'd3';`
`42`	`42`
`43`		`-import { saveSvgAsPng } from 'save-svg-as-png';`
`44`		`-`
`45`	`43`	`import ContinuousScale from './../../scales/ContinuousScale.js';`
`46`	`44`	`import HistoryEvent from './../../history/HistoryEvent.js';`
`47`	`45`	`import HistoryStack from './../../history/HistoryStack.js';`
`@@ -313,10 +311,6 @@ export default {`
`313`	`311`	`});`
`314`	`312`
`315`	`313`
`316`		`- },`
`317`		`- downloadLegend() {`
`318`		`- let node = d3_select(this.legendSelector).select("svg").node();`
`319`		`- saveSvgAsPng(node, this.legendElemID + ".png");`
`320`	`314`	`}`
`321`	`315`	`}`
`322`	`316`	`}`