#5560 rewrite the plot domain mapping, range and axis (#7707)

* #5560 rewrite calcMapping and calcRange

* #5560 rewrite PlotAxis

* #5560 refactor PlotAxis

* #5560 split Axis to TimeAxis and DefaultAxis

* Update DefaultAxis.ts

* Update TimeAxis.ts

js/notebook/src/plot/auxes/plotAuxBox.js

@@ -56,8 +56,8 @@ define([
     var focus = scope.plotFocus.getFocus();
     var eles = this.elements,
       eleprops = this.elementProps;
-    var mapX = scope.data2scrXi,
-      mapY = scope.data2scrYi;
+    var mapX = scope.plotRange.data2scrXi,
+      mapY = scope.plotRange.data2scrYi;
     var skipped = false;
 
     eleprops.length = 0;

js/notebook/src/plot/auxes/plotAuxRiver.js

@@ -52,8 +52,8 @@ define([
     var focus = scope.plotFocus.getFocus();
     var eles = this.elements,
       eleprops = this.elementProps;
-    var mapX = scope.data2scrXi,
-      mapY = scope.data2scrYi;
+    var mapX = scope.plotRange.data2scrXi,
+      mapY = scope.plotRange.data2scrYi;
     var pstr = "";
 
     eleprops.length = 0;

js/notebook/src/plot/auxes/plotAuxStem.js

@@ -50,8 +50,8 @@ define([
     var focus = scope.plotFocus.getFocus();
     var eles = this.elements,
       eleprops = this.elementProps;
-    var mapX = scope.data2scrXi,
-      mapY = scope.data2scrYi;
+    var mapX = scope.plotRange.data2scrXi,
+      mapY = scope.plotRange.data2scrYi;
     var skipped = false;
 
     eleprops.length = 0;

js/notebook/src/plot/lod/plotLodBox.js

@@ -71,8 +71,8 @@ define([
     var focus = scope.plotFocus.getFocus();
     var eles = this.elements,
       eleprops = this.elementProps;
-    var mapX = scope.data2scrXi,
-      mapY = scope.data2scrYi;
+    var mapX = scope.plotRange.data2scrXi,
+      mapY = scope.plotRange.data2scrYi;
     var fixed = scope.renderFixed;
 
     eleprops.length = 0;

js/notebook/src/plot/lod/plotLodLine.js

@@ -64,8 +64,8 @@ define([
   PlotLodLine.prototype.prepare = function(scope, gid) {
     var focus = scope.plotFocus.getFocus();
     var eleprops = this.elementProps;
-    var mapX = scope.data2scrXi,
-      mapY = scope.data2scrYi;
+    var mapX = scope.plotRange.data2scrXi,
+      mapY = scope.plotRange.data2scrYi;
     var pstr = "", skipped = false;
 
     eleprops.length = 0;

js/notebook/src/plot/lod/plotLodPoint.js

@@ -70,8 +70,8 @@ define([
     var focus = scope.plotFocus.getFocus();
     var eles = this.elementSamples,
       eleprops = this.elementProps;
-    var mapX = scope.data2scrXi,
-      mapY = scope.data2scrYi;
+    var mapX = scope.plotRange.data2scrXi,
+      mapY = scope.plotRange.data2scrYi;
     var fixed = scope.renderFixed;
 
     eleprops.length = 0;
@@ -154,7 +154,7 @@ define([
           .transition()
           .duration(plotUtils.getHighlightDuration())
           .attr("points", function(d) {
-            var mapX = scope.data2scrXi, mapY = scope.data2scrYi;
+            var mapX = scope.plotRange.data2scrXi, mapY = scope.plotRange.data2scrYi;
             var ele = d.ele, x = mapX(ele.x), y = mapY(ele.y),
               s = plotUtils.getHighlightedSize(ele.size, highlighted);
             var pstr = "";

js/notebook/src/plot/lod/plotLodRiver.js

@@ -68,8 +68,8 @@ define([
     var focus = scope.plotFocus.getFocus();
     var eles = this.elements,
       eleprops = this.elementProps;
-    var mapX = scope.data2scrXi,
-      mapY = scope.data2scrYi;
+    var mapX = scope.plotRange.data2scrXi,
+      mapY = scope.plotRange.data2scrYi;
     var pstr = "", pd = "";
 
     eleprops.length = 0;

js/notebook/src/plot/lod/plotLodStem.js

@@ -71,8 +71,8 @@ define([
     var focus = scope.plotFocus.getFocus();
     var eles = this.elements,
       eleprops = this.elementProps;
-    var mapX = scope.plotFocus.data2scrXi,
-      mapY = scope.data2scrYi;
+    var mapX = scope.plotFocus.plotRange.data2scrXi,
+      mapY = scope.plotRange.data2scrYi;
     var fixed = scope.renderFixed;
 
     eleprops.length = 0;

js/notebook/src/plot/plotFactory.js

@@ -17,7 +17,6 @@
 define([
   './std/plotline',
   './std/plotarea',
-  './std/plotaxis',
   './std/plotconstband',
   './std/plotconstline',
   './std/plottext',
@@ -36,7 +35,6 @@ define([
 ], function(
   PlotLine,
   PlotArea,
-  PlotAxis,
   PlotConstband,
   PlotConstline,
   PlotText,
@@ -53,6 +51,8 @@ define([
   PlotAreaLodLoader,
   PlotPointLodLoader
 ) {
+  var TimeAxis = require('./std/axis/TimeAxis').default;
+
   var plotFactory = {
     createPlotItem : function(item, lodthresh) {
       if (!lodthresh){
@@ -162,7 +162,7 @@ define([
           item.__proto__ = PlotText.prototype;
           break;
         case "axis":
-          item.__proto__ = PlotAxis.prototype;
+          item.__proto__ = TimeAxis.prototype;
           break;
         case "treemapnode":
           item.__proto__ = PlotTreeMapNode.prototype;

js/notebook/src/plot/plotFormatter.js

@@ -19,17 +19,15 @@ define([
   './plotConverter',
   './plotUtils',
   './plotFactory',
-  './std/plotaxis',
   './heatmapconverter'
 ],function(
   _,
   plotConverter,
   plotUtils,
   plotFactory,
-  PlotAxis,
   heatmapConverter
 ) {
-
+  var PlotAxisFactory = require('./std/axis/PlotAxisFactory').default;
   var createNewModel = function (model) {
 
     var newmodel;
@@ -593,7 +591,7 @@ define([
       var vrange = model.vrange;
       var xAxisLabel = model.xAxis.label;
 
-      var xAxis = new PlotAxis(model.xAxis.type);
+      var xAxis = PlotAxisFactory.getPlotAxis(model.xAxis.type);
 
       if (xAxis.axisType === "category") {
         xAxis.setRange(vrange.xl, vrange.xr, model.xAxis.base);
@@ -614,7 +612,7 @@ define([
 
         var label = modelAxis.label;
 
-        var axis = new PlotAxis(modelAxis.type);
+        var axis = PlotAxisFactory.getPlotAxis(modelAxis.type);
 
         if (axis.axisType === "category") {
           axis.setRange(vrange.xl, vrange.xr, model.xAxis.base);