igniteui-webcomponents-charts 6.3.1 → 7.0.0

package/esm5/lib/ScatterBase_combined.js

@@ -65,87 +65,87 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ScatterBase, _super);
     function ScatterBase() {
         var _this = _super.call(this) || this;
-        _this.zh = null;
-        _this.z0 = null;
+        _this.zi = null;
         _this.z1 = null;
-        _this.ac6 = null;
+        _this.z2 = null;
         _this.ac7 = null;
-        _this.zq = 1;
-        _this.y7 = null;
+        _this.ac8 = null;
+        _this.zr = 1;
         _this.y8 = null;
-        _this.zn = null;
-        _this.zp = null;
-        _this.zl = null;
+        _this.y9 = null;
+        _this.zo = null;
+        _this.zq = null;
+        _this.zm = null;
+        _this.z7 = false;
         _this.z6 = false;
-        _this.z5 = false;
-        _this.zy = null;
         _this.zz = null;
+        _this.z0 = null;
         _this.assigningScatterStyle = null;
         _this.assigningScatterMarkerStyle = null;
-        _this.zu = null;
-        _this.zo = null;
-        _this.zk = null;
-        _this.z4 = true;
-        _this.aaj = 0;
+        _this.zv = null;
+        _this.zp = null;
+        _this.zl = null;
+        _this.z5 = true;
         _this.aak = 0;
         _this.aal = 0;
         _this.aam = 0;
-        _this.zr = _this.zs();
-        _this.zu = new ScatterSeriesRenderManager();
-        _this.zo = new ScatterFrame();
+        _this.aan = 0;
+        _this.zs = _this.zt();
+        _this.zv = new ScatterSeriesRenderManager();
+        _this.zp = new ScatterFrame();
+        _this.ac8 = Rect.empty;
         _this.ac7 = Rect.empty;
-        _this.ac6 = Rect.empty;
         return _this;
     }
     ScatterBase.prototype.ct = function () {
         return new ScatterBaseView(this);
     };
-    ScatterBase.prototype.pf = function () {
-        _super.prototype.pf.call(this);
+    ScatterBase.prototype.pg = function () {
+        _super.prototype.pg.call(this);
         this.xAxis = null;
         this.yAxis = null;
     };
-    ScatterBase.prototype.rh = function (a) {
-        _super.prototype.rh.call(this, a);
-        this.zi = a;
+    ScatterBase.prototype.ri = function (a) {
+        _super.prototype.ri.call(this, a);
+        this.zj = a;
     };
-    ScatterBase.prototype.get_fz = function () {
+    ScatterBase.prototype.get_f0 = function () {
         return true;
     };
     ScatterBase.prototype.ai = function () {
         return [this.xAxis, this.yAxis];
     };
-    ScatterBase.prototype.kz = function (a, b) {
-        var c = this.no(b);
+    ScatterBase.prototype.k0 = function (a, b) {
+        var c = this.np(b);
         if (c == ScatterBase.$$p[12]) {
-            return this.k0(a, b, this.abe);
+            return this.k1(a, b, this.abf);
         }
         if (c == ScatterBase.$$p[16]) {
-            return this.k0(a, b, this.abm);
+            return this.k1(a, b, this.abn);
         }
         if (c == ScatterBase.$$p[1]) {
-            return this.k0(a, b, this.aay);
+            return this.k1(a, b, this.aaz);
         }
         if (c == ScatterBase.$$p[2]) {
-            return this.k0(a, b, this.aa0);
+            return this.k1(a, b, this.aa1);
         }
         return null;
     };
-    ScatterBase.prototype.mo = function (a) {
-        var b = this.no(a);
+    ScatterBase.prototype.mp = function (a) {
+        var b = this.np(a);
         if (b == ScatterBase.$$p[12]) {
-            return this.abe;
+            return this.abf;
         }
         if (b == ScatterBase.$$p[16]) {
-            return this.abm;
+            return this.abn;
         }
         if (b == ScatterBase.$$p[1]) {
-            return this.aay;
+            return this.aaz;
         }
         if (b == ScatterBase.$$p[2]) {
-            return this.aa0;
+            return this.aa1;
         }
-        return _super.prototype.mo.call(this, a);
+        return _super.prototype.mp.call(this, a);
     };
     ScatterBase.prototype.ed = function (a, b, c, d, e) {
         var _this = this;
@@ -153,27 +153,27 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return false;
         }
         var f = this.xAxis;
-        var g = new ScalerParams(1, this.dc.yr, this.xd, f.dn);
+        var g = new ScalerParams(1, this.dc.yr, this.xe, f.dn);
         g.c = this.getEffectiveViewport1(this.cw);
         var h = this.yAxis;
-        var i = new ScalerParams(1, this.dc.yr, this.xd, h.dn);
+        var i = new ScalerParams(1, this.dc.yr, this.xe, h.dn);
         i.c = this.getEffectiveViewport1(this.cw);
         a.clear();
-        this.xr.cw(function (j) {
+        this.xs.cw(function (j) {
             if (j._visibility == 0) {
                 var k = new SeriesPointOfInterest();
                 var l = j.n;
                 var m = j.o;
-                if (!e && (l < _this.xd.left || l > _this.xd.right || m < _this.xd.top || m > _this.xd.bottom)) {
+                if (!e && (l < _this.xe.left || l > _this.xe.right || m < _this.xe.top || m > _this.xe.bottom)) {
                     return;
                 }
-                k.d = f.f9(l, g);
-                k.e = h.f9(m, i);
+                k.d = f.ga(l, g);
+                k.e = h.ga(m, i);
                 k.b = j.content;
-                k.g = _this.v0;
+                k.g = _this.v1;
                 k.c = j.ak;
-                if (_this.hf) {
-                    k.g = _this.v7(j.ak);
+                if (_this.hg) {
+                    k.g = _this.v8(j.ak);
                 }
                 a.add(k);
             }
@@ -190,58 +190,58 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return _super.prototype.b3.call(this);
         }
     };
-    ScatterBase.prototype.xa = function (a) {
-        if (!this.hasMarkers || !this.x1()) {
+    ScatterBase.prototype.xb = function (a) {
+        if (!this.hasMarkers || !this.x2()) {
             return Rect.empty;
         }
-        var b = this.xr.ce(this.wr(a));
+        var b = this.xs.ce(this.ws(a));
         if (b != null) {
-            return this.xr.c7(b);
+            return this.xs.c7(b);
         }
         return Rect.empty;
     };
-    ScatterBase.prototype.g2 = function (a, b) {
-        if (this.x2(a, b)) {
+    ScatterBase.prototype.g3 = function (a, b) {
+        if (this.x3(a, b)) {
             return true;
         }
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "z2", {
+    Object.defineProperty(ScatterBase.prototype, "z3", {
         get: function () {
-            return this.z0;
+            return this.z1;
         },
         set: function (a) {
-            if (this.z0 != a) {
-                var b = this.z2;
-                this.z0 = a;
-                this.raisePropertyChanged("XColumn", b, this.z2);
+            if (this.z1 != a) {
+                var b = this.z3;
+                this.z1 = a;
+                this.raisePropertyChanged("XColumn", b, this.z3);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ScatterBase.prototype, "z3", {
+    Object.defineProperty(ScatterBase.prototype, "z4", {
         get: function () {
-            return this.z1;
+            return this.z2;
         },
         set: function (a) {
-            if (this.z1 != a) {
-                var b = this.z3;
-                this.z1 = a;
-                this.raisePropertyChanged("YColumn", b, this.z3);
+            if (this.z2 != a) {
+                var b = this.z4;
+                this.z2 = a;
+                this.raisePropertyChanged("YColumn", b, this.z4);
             }
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.gh = function () {
-        return this.highlightedItemsSource != null || (this.aay != null && this.aa0 != null);
+    ScatterBase.prototype.gi = function () {
+        return this.highlightedItemsSource != null || (this.aaz != null && this.aa1 != null);
     };
-    ScatterBase.prototype.aah = function () {
+    ScatterBase.prototype.aai = function () {
         return false;
     };
-    ScatterBase.prototype.hz = function () {
-        var a = _super.prototype.hz.call(this);
+    ScatterBase.prototype.h0 = function () {
+        var a = _super.prototype.h0.call(this);
         {
             var b = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
@@ -251,7 +251,7 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.abu));
+            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.abv));
             a.add(b);
         }
         {
@@ -263,10 +263,10 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.abt));
+            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.abu));
             a.add(c);
         }
-        if (this.aah()) {
+        if (this.aai()) {
             var d = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -283,7 +283,7 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             })());
             a.add(d);
         }
-        if (!this.aah()) {
+        if (!this.aai()) {
             var e = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -293,10 +293,10 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.si));
+            e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.sj));
             a.add(e);
         }
-        if (!this.aah()) {
+        if (!this.aai()) {
             var f = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -306,31 +306,31 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.si));
+            f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.sj));
             a.add(f);
         }
         return a;
     };
-    ScatterBase.prototype.abt = function (a, b) {
-        if (this.aay != null) {
-            b.value = this.aay;
+    ScatterBase.prototype.abu = function (a, b) {
+        if (this.aaz != null) {
+            b.value = this.aaz;
             return;
         }
-        b.value = this.abe;
+        b.value = this.abf;
     };
-    ScatterBase.prototype.abu = function (a, b) {
-        if (this.aa0 != null) {
-            b.value = this.aa0;
+    ScatterBase.prototype.abv = function (a, b) {
+        if (this.aa1 != null) {
+            b.value = this.aa1;
             return;
         }
-        b.value = this.abm;
+        b.value = this.abn;
     };
-    Object.defineProperty(ScatterBase.prototype, "ac3", {
+    Object.defineProperty(ScatterBase.prototype, "ac4", {
         get: function () {
-            return this.c(ScatterBase.ace);
+            return this.c(ScatterBase.acf);
         },
         set: function (a) {
-            this.h(ScatterBase.ace, a);
+            this.h(ScatterBase.acf, a);
         },
         enumerable: false,
         configurable: true
@@ -349,41 +349,41 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.qp = function () {
-        _super.prototype.qp.call(this);
+    ScatterBase.prototype.qq = function () {
+        _super.prototype.qq.call(this);
         if (this.xAxis != null) {
-            this.xAxis.ly(false);
+            this.xAxis.l0(false);
         }
         if (this.yAxis != null) {
-            this.yAxis.ly(false);
+            this.yAxis.l0(false);
         }
     };
-    ScatterBase.prototype.rq = function (a, b, c, d) {
-        _super.prototype.rq.call(this, a, b, c, d);
-        if (this.zi.df.g$e(a, b, c, d)) {
-            this.r8(false);
-            this.q0();
+    ScatterBase.prototype.rr = function (a, b, c, d) {
+        _super.prototype.rr.call(this, a, b, c, d);
+        if (this.zj.df.g$e(a, b, c, d)) {
+            this.r9(false);
+            this.q1();
         }
         switch (b) {
             case ScatterBase.$$p[10]:
             case ScatterBase.$$p[14]:
             case ScatterBase.$$p[11]:
             case ScatterBase.$$p[15]:
-                this.qu();
+                this.qv();
                 break;
             case "FastItemsSource":
                 if (typeCast(IFastItemsSource_$type, c) != null) {
-                    c.deregisterColumn(this.z2);
                     c.deregisterColumn(this.z3);
-                    this.z2 = null;
+                    c.deregisterColumn(this.z4);
                     this.z3 = null;
+                    this.z4 = null;
                 }
                 if (typeCast(IFastItemsSource_$type, d) != null) {
-                    this.z2 = this.dl(this.abe);
-                    this.z3 = this.dl(this.abm);
+                    this.z3 = this.dl(this.abf);
+                    this.z4 = this.dl(this.abn);
                 }
-                if ((this.yAxis != null && !this.yAxis.ed()) || (this.xAxis != null && !this.xAxis.ed())) {
-                    this.r8(this.gm && c != null);
+                if ((this.yAxis != null && !this.yAxis.ee()) || (this.xAxis != null && !this.xAxis.ee())) {
+                    this.r9(this.gn && c != null);
                 }
                 break;
             case ScatterBase.$$p[9]:
@@ -391,153 +391,153 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     c.cx(this);
                 }
                 if (d != null) {
-                    d.d3(this);
+                    d.d4(this);
                 }
-                if ((this.xAxis != null && !this.xAxis.ed()) || (d == null && c != null)) {
-                    this.r8(false);
+                if ((this.xAxis != null && !this.xAxis.ee()) || (d == null && c != null)) {
+                    this.r9(false);
                 }
-                this.q0();
+                this.q1();
                 break;
             case ScatterBase.$$p[13]:
                 if (c != null) {
                     c.cx(this);
                 }
                 if (d != null) {
-                    d.d3(this);
+                    d.d4(this);
                 }
-                if ((this.yAxis != null && !this.yAxis.ed()) || (d == null && c != null)) {
-                    this.r8(false);
+                if ((this.yAxis != null && !this.yAxis.ee()) || (d == null && c != null)) {
+                    this.r9(false);
                 }
-                this.q0();
+                this.q1();
                 break;
             case ScatterBase.$$p[12]:
                 if (this.dp != null) {
-                    this.dp.deregisterColumn(this.z2);
-                    this.z2 = this.dl(this.abe);
+                    this.dp.deregisterColumn(this.z3);
+                    this.z3 = this.dl(this.abf);
                 }
                 break;
             case "XColumn":
-                this.zi.df.g$m();
-                if (this.xAxis != null && !this.xAxis.ed()) {
-                    this.r8(this.gm && this.d9);
+                this.zj.df.g$m();
+                if (this.xAxis != null && !this.xAxis.ee()) {
+                    this.r9(this.gn && this.d9);
                 }
                 break;
             case ScatterBase.$$p[16]:
                 if (this.dp != null) {
-                    this.dp.deregisterColumn(this.z3);
-                    this.z3 = this.dl(this.abm);
+                    this.dp.deregisterColumn(this.z4);
+                    this.z4 = this.dl(this.abn);
                 }
                 break;
             case "YColumn":
-                this.zi.df.g$m();
-                if (this.yAxis != null && !this.yAxis.ed()) {
-                    this.r8(this.gm && this.d9);
+                this.zj.df.g$m();
+                if (this.yAxis != null && !this.yAxis.ee()) {
+                    this.r9(this.gn && this.d9);
                 }
                 break;
             case ScatterBase.$$p[7]:
-                this.r8(false);
-                this.q0();
+                this.r9(false);
+                this.q1();
                 break;
             case ScatterBase.$$p[8]:
-                this.r8(false);
-                this.q0();
+                this.r9(false);
+                this.q1();
                 break;
             case "TransitionProgress":
-                this.zp.d(this.jz, this.zn, this.zl);
-                this.abo();
+                this.zq.d(this.j0, this.zo, this.zm);
+                this.abp();
                 try {
                     if (this.d7(this.cw)) {
                         return;
                     }
-                    if ((Math.round(this.jz * 100000) / 100000) == 1) {
-                        this.acb(this.zl, this.zi);
+                    if ((Math.round(this.j0 * 100000) / 100000) == 1) {
+                        this.acc(this.zm, this.zj);
                     }
                     else {
-                        this.acb(this.zp, this.zi);
+                        this.acc(this.zq, this.zj);
                     }
                     if (this.dc != null) {
                         this.dc.st(this);
                     }
                 }
                 finally {
-                    this.acc();
+                    this.acd();
                 }
                 break;
             case "TrendLineBrush":
-                this.rw(b);
+                this.rx(b);
                 break;
             case ScatterBase.$$p[0]:
-                if (this.zj != null) {
-                    this.zj.r = this;
+                if (this.zk != null) {
+                    this.zk.r = this;
                 }
-                this.r8(false);
-                this.q0();
+                this.r9(false);
+                this.q1();
                 break;
             case "TrendLineType":
-                this.q0();
+                this.q1();
                 break;
             case ScatterBase.$$p[4]:
-                this.z6 = this.aae();
-                this.r8(false);
+                this.z7 = this.aaf();
+                this.r9(false);
                 break;
             case ScatterBase.$$p[3]:
-                this.z5 = this.aad();
-                this.r8(false);
+                this.z6 = this.aae();
+                this.r9(false);
                 break;
             case ScatterBase.$$p[5]:
-                this.zr = this.zs();
+                this.zs = this.zt();
                 break;
         }
     };
+    ScatterBase.prototype.aaf = function () {
+        return this.aab;
+    };
     ScatterBase.prototype.aae = function () {
         return this.aaa;
     };
-    ScatterBase.prototype.aad = function () {
-        return this.z9;
-    };
-    ScatterBase.prototype.z8 = function (a) {
+    ScatterBase.prototype.z9 = function (a) {
         if (typeCast(NumericYAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.z7 = function (a) {
+    ScatterBase.prototype.z8 = function (a) {
         if (typeCast(NumericXAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.acc = function () {
-        this.ac6 = Rect.empty;
+    ScatterBase.prototype.acd = function () {
         this.ac7 = Rect.empty;
+        this.ac8 = Rect.empty;
     };
-    ScatterBase.prototype.abo = function () {
-        var a = this.getViewInfo(this.ac6, this.ac7);
-        this.ac6 = a.p0;
-        this.ac7 = a.p1;
+    ScatterBase.prototype.abp = function () {
+        var a = this.getViewInfo(this.ac7, this.ac8);
+        this.ac7 = a.p0;
+        this.ac8 = a.p1;
     };
-    ScatterBase.prototype.aac = function (a, b) {
+    ScatterBase.prototype.aad = function (a, b) {
         if (b != 3) {
             return true;
         }
         if (a == null) {
             return true;
         }
-        if (this.abe == a || this.abm == a) {
+        if (this.abf == a || this.abn == a) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.po = function (a, b, c, d) {
+    ScatterBase.prototype.pp = function (a, b, c, d) {
         var e_1, _a;
         var e = false;
-        if (!this.aac(d, a)) {
+        if (!this.aad(d, a)) {
             return;
         }
-        this.zi.df.g$i(a, b, c, d);
-        if (this.zi.aa.count > 0) {
+        this.zj.df.g$i(a, b, c, d);
+        if (this.zj.aa.count > 0) {
             try {
-                for (var _b = __values(fromEnum(this.zi.aa)), _c = _b.next(); !_c.done; _c = _b.next()) {
+                for (var _b = __values(fromEnum(this.zj.aa)), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var f = _c.value;
                     f.g$i(a, b, c, d);
                 }
@@ -556,36 +556,36 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
             }
         }
-        if (this.xAxis != null && !this.xAxis.ed()) {
+        if (this.xAxis != null && !this.xAxis.ee()) {
             e = true;
         }
-        if (this.yAxis != null && !this.yAxis.ed()) {
+        if (this.yAxis != null && !this.yAxis.ee()) {
             e = true;
         }
         if (a == 0 || a == 2 || a == 3 || a == 4) {
-            this.z4 = true;
+            this.z5 = true;
         }
         else if (a == 1) {
             for (var g = b; g < b + c; g++) {
-                this.aaj += this.z2.item(g);
                 this.aak += this.z3.item(g);
+                this.aal += this.z4.item(g);
             }
-            this.aal = this.aaj / this.z2.count;
             this.aam = this.aak / this.z3.count;
+            this.aan = this.aal / this.z4.count;
         }
         if (e) {
-            this.r8(true);
+            this.r9(true);
         }
     };
-    ScatterBase.prototype.ab3 = function (a) {
-        this.ab4(a, null);
+    ScatterBase.prototype.ab4 = function (a) {
+        this.ab5(a, null);
     };
-    ScatterBase.prototype.ab4 = function (a, b) {
+    ScatterBase.prototype.ab5 = function (a, b) {
         var e_2, _a, e_3, _b;
-        var c = this.z2 != null ? this.z2.count : 0;
-        var d = this.z3 != null ? this.z3.count : 0;
+        var c = this.z3 != null ? this.z3.count : 0;
+        var d = this.z4 != null ? this.z4.count : 0;
         var e = Math.min(c, d);
-        if (e <= this.aau) {
+        if (e <= this.aav) {
             a.q.clear();
             var f = new List$1(OwnedPoint.$, 0);
             try {
@@ -651,77 +651,77 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     ScatterBase.prototype.ay = function (a) {
-        if (a != null && a == this.xAxis && this.z2 != null) {
-            return new AxisRange(this.z2.minimum, this.z2.maximum);
-        }
-        if (a != null && a == this.yAxis && this.z3 != null) {
+        if (a != null && a == this.xAxis && this.z3 != null) {
             return new AxisRange(this.z3.minimum, this.z3.maximum);
         }
+        if (a != null && a == this.yAxis && this.z4 != null) {
+            return new AxisRange(this.z4.minimum, this.z4.maximum);
+        }
         return null;
     };
-    ScatterBase.prototype.kw = function (a) {
-        var b = this.kc(a);
+    ScatterBase.prototype.kx = function (a) {
+        var b = this.kd(a);
         if (this.dp != null && b >= 0 && b < this.dp.count) {
             return this.dp.item(b);
         }
         return null;
     };
-    Object.defineProperty(ScatterBase.prototype, "zr", {
+    Object.defineProperty(ScatterBase.prototype, "zs", {
         get: function () {
-            return this.zq;
+            return this.zr;
         },
         set: function (a) {
-            var b = this.zq;
-            this.zq = a;
-            if (b != this.zq) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.zq));
+            var b = this.zr;
+            this.zr = a;
+            if (b != this.zr) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.zr));
             }
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.zs = function () {
-        if (this.zt != 0) {
-            return this.zt;
+    ScatterBase.prototype.zt = function () {
+        if (this.zu != 0) {
+            return this.zu;
         }
-        return this.aab ? 4 : 1;
+        return this.aac ? 4 : 1;
     };
-    ScatterBase.prototype.kc = function (a) {
-        var b = truncate(Math.round(this.iy(a)));
+    ScatterBase.prototype.kd = function (a) {
+        var b = truncate(Math.round(this.iz(a)));
         return b;
     };
-    ScatterBase.prototype.iy = function (a) {
-        switch (this.zr) {
-            case 1: return this.aaq(a);
-            case 3: return this.aar(a);
-            case 2: return this.aao(a);
-            case 4: return this.aap(a);
-            case 5: return this.aan(a);
+    ScatterBase.prototype.iz = function (a) {
+        switch (this.zs) {
+            case 1: return this.aar(a);
+            case 3: return this.aas(a);
+            case 2: return this.aap(a);
+            case 4: return this.aaq(a);
+            case 5: return this.aao(a);
         }
         return -1;
     };
-    ScatterBase.prototype.aap = function (a) {
-        return this.aas(a, false);
+    ScatterBase.prototype.aaq = function (a) {
+        return this.aat(a, false);
     };
-    ScatterBase.prototype.aao = function (a) {
-        var b = this.wr(a);
+    ScatterBase.prototype.aap = function (a) {
+        var b = this.ws(a);
         var c = b.x;
         var d = b.y;
-        if (this.dp == null || this.xAxis == null || this.yAxis == null || this.z2 == null || this.z3 == null) {
+        if (this.dp == null || this.xAxis == null || this.yAxis == null || this.z3 == null || this.z4 == null) {
             return -1;
         }
-        if (this.dp.count > this.aat) {
+        if (this.dp.count > this.aau) {
             return -1;
         }
-        this.abr();
-        var e = this.y7;
-        var f = this.y8;
+        this.abs();
+        var e = this.y8;
+        var f = this.y9;
         if (e == null || f == null) {
             return -1;
         }
         var g = 1.7976931348623157E+308;
         var h = -1;
-        for (var i = 0; i < this.z2.count; i++) {
+        for (var i = 0; i < this.z3.count; i++) {
             var j = e[i];
             var k = f[i];
             var l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -732,66 +732,66 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h;
     };
-    ScatterBase.prototype.abr = function () {
+    ScatterBase.prototype.abs = function () {
         var _this = this;
         var a = this.cw.ca;
         var b = this.cw.b9;
         var c = this.getEffectiveViewport();
-        if (this.zh == null) {
+        if (this.zi == null) {
             return;
         }
-        var d = new ScalerParams(0, a, b, this.zh.d, c);
+        var d = new ScalerParams(0, a, b, this.zi.d, c);
         var e = ((function () {
-            var $ret = new ScalerParams(0, a, b, _this.zh.e, c);
-            $ret.b = _this.i5();
+            var $ret = new ScalerParams(0, a, b, _this.zi.e, c);
+            $ret.b = _this.i6();
             return $ret;
         })());
-        if (this.y7 == null || this.y8 == null) {
-            var f = arrayShallowClone(this.z2.asArray());
-            var g = arrayShallowClone(this.z3.asArray());
-            this.xAxis.k1(boxArray$1(f), 0, f.length, d);
-            this.yAxis.k1(boxArray$1(g), 0, g.length, e);
-            this.y7 = f;
-            this.y8 = g;
+        if (this.y8 == null || this.y9 == null) {
+            var f = arrayShallowClone(this.z3.asArray());
+            var g = arrayShallowClone(this.z4.asArray());
+            this.xAxis.k3(boxArray$1(f), 0, f.length, d);
+            this.yAxis.k3(boxArray$1(g), 0, g.length, e);
+            this.y8 = f;
+            this.y9 = g;
         }
     };
-    ScatterBase.prototype.get_aab = function () {
+    ScatterBase.prototype.get_aac = function () {
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "aab", {
+    Object.defineProperty(ScatterBase.prototype, "aac", {
         get: function () {
-            return this.get_aab();
+            return this.get_aac();
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.aas = function (a, b) {
-        if (!this.aab) {
+    ScatterBase.prototype.aat = function (a, b) {
+        if (!this.aac) {
             return -1;
         }
         var c = { $type: Point_$type, x: 0, y: 0 };
         var d = true;
-        var e = this.zm();
+        var e = this.zn();
         if (e == null) {
             return -1;
         }
         if (e.q == null) {
             return -1;
         }
-        if (this.dp == null || this.dp.count > this.aat) {
+        if (this.dp == null || this.dp.count > this.aau) {
             return -1;
         }
-        this.abr();
-        var f = this.y7;
-        var g = this.y8;
+        this.abs();
+        var f = this.y8;
+        var g = this.y9;
         if (f == null || g == null) {
             return -1;
         }
-        var h = this.wr(a);
+        var h = this.ws(a);
         var i = 1.7976931348623157E+308;
         var j = -1;
-        for (var k = 0; k < this.y7.length; k++) {
-            var l = { $type: Point_$type, x: this.y7[k], y: this.y8[k] };
+        for (var k = 0; k < this.y8.length; k++) {
+            var l = { $type: Point_$type, x: this.y8[k], y: this.y9[k] };
             if (k > 0) {
                 if (!b || e.m.containsKey(this.dp.item(k)) || e.m.containsKey(this.dp.item(k - 1))) {
                     var m = CoreGeometryUtil.q(h, c, l);
@@ -804,8 +804,8 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             c = l;
         }
         if (j >= 0) {
-            var n = { $type: Point_$type, x: this.y7[j], y: this.y8[j] };
-            var o = { $type: Point_$type, x: this.y7[j - 1], y: this.y8[j - 1] };
+            var n = { $type: Point_$type, x: this.y8[j], y: this.y9[j] };
+            var o = { $type: Point_$type, x: this.y8[j - 1], y: this.y9[j - 1] };
             if (!b || (e.m.containsKey(this.dp.item(j)) && e.m.containsKey(this.dp.item(j - 1)))) {
                 var p = GeometryUtil.j(h, o, n);
                 return (j - 1) + p;
@@ -819,25 +819,25 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.aar = function (a) {
-        return this.aas(a, true);
+    ScatterBase.prototype.aas = function (a) {
+        return this.aat(a, true);
     };
-    ScatterBase.prototype.aan = function (a) {
+    ScatterBase.prototype.aao = function (a) {
         var _this = this;
-        var b = this.wr(a);
+        var b = this.ws(a);
         var c = b.x;
         var d = b.y;
-        if (this.zi.dg.e > this.aat) {
+        if (this.zj.dg.e > this.aau) {
             return -1;
         }
         var e = -1;
-        this.xr.cx(function (f) {
-            var g = _this.zi.c7(f);
+        this.xs.cx(function (f) {
+            var g = _this.zj.c7(f);
             var h = g.left;
             var i = g.top;
             var j = g.width;
             var k = g.height;
-            if (_this.xy) {
+            if (_this.xz) {
                 var l = h + j / 2;
                 var m = i + k / 2;
                 var n = (j / 2) * (j / 2);
@@ -858,19 +858,19 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         });
         return e;
     };
-    ScatterBase.prototype.aaq = function (a) {
+    ScatterBase.prototype.aar = function (a) {
         var _this = this;
         var b = null;
         var c = 1.7976931348623157E+308;
-        var d = this.wr(a);
+        var d = this.ws(a);
         var e = d.x;
         var f = d.y;
-        if (this.zi.dg.e > this.aat) {
+        if (this.zj.dg.e > this.aau) {
             return -1;
         }
-        this.zi.dn(function (g) {
+        this.zj.dn(function (g) {
             if (g._visibility == 0) {
-                var h = _this.zi.c7(g);
+                var h = _this.zj.c7(g);
                 var i = h.left + h.width / 2;
                 var j = h.top + h.height / 2;
                 var k = (e - i) * (e - i) + (f - j) * (f - j);
@@ -885,9 +885,9 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.ww = function (a, b, c) {
+    ScatterBase.prototype.wx = function (a, b, c) {
         var _this = this;
-        if (this.xAxis == null || this.yAxis == null || this.z2 == null || this.z3 == null) {
+        if (this.xAxis == null || this.yAxis == null || this.z3 == null || this.z4 == null) {
             return { $type: Point_$type, x: NaN, y: NaN };
         }
         var d = this.cw.ca;
@@ -896,11 +896,11 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var g = new ScalerParams(0, d, e, this.xAxis.dn, f);
         var h = ((function () {
             var $ret = new ScalerParams(0, d, e, _this.yAxis.dn, f);
-            $ret.b = _this.i5();
+            $ret.b = _this.i6();
             return $ret;
         })());
         if (b) {
-            var i = this.iy(a);
+            var i = this.iz(a);
             if (i == -1) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
@@ -919,45 +919,45 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 j = this.dp.count - 1;
             }
             if (k == j) {
-                var l = this.xAxis.f6(this.z2.item(j), g);
-                var m = this.yAxis.f6(this.z3.item(j), h);
+                var l = this.xAxis.f7(this.z3.item(j), g);
+                var m = this.yAxis.f7(this.z4.item(j), h);
                 return { $type: Point_$type, x: l, y: m };
             }
             var n = i - Math.floor(i);
-            var o = this.xAxis.f6(this.z2.item(j), g);
-            var p = this.yAxis.f6(this.z3.item(j), h);
-            var q = this.xAxis.f6(this.z2.item(k), g);
-            var r = this.yAxis.f6(this.z3.item(k), h);
+            var o = this.xAxis.f7(this.z3.item(j), g);
+            var p = this.yAxis.f7(this.z4.item(j), h);
+            var q = this.xAxis.f7(this.z3.item(k), g);
+            var r = this.yAxis.f7(this.z4.item(k), h);
             var s = q - o;
             var t = r - p;
             return { $type: Point_$type, x: o + s * n, y: p + t * n };
         }
         else {
-            var u = this.kc(a);
+            var u = this.kd(a);
             if (u == -1) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            var v = this.xAxis.f6(this.z2.item(u), g);
-            var w = this.yAxis.f6(this.z3.item(u), h);
+            var v = this.xAxis.f7(this.z3.item(u), g);
+            var w = this.yAxis.f7(this.z4.item(u), h);
             return { $type: Point_$type, x: v, y: w };
         }
     };
-    ScatterBase.prototype.gj = function (a) {
+    ScatterBase.prototype.gk = function (a) {
         var _this = this;
         var b = this.dc != null ? this.dc.yr : Rect.empty;
         b = b.copy();
         var c = this.dc != null ? this.dc.y9 : Rect.empty;
         var d = new Rect(0, 0, 0, 1, 1);
-        var e = this.w6(this.cw);
+        var e = this.w7(this.cw);
         var f = new ScalerParams(0, d, d, this.xAxis.dn, e);
         var g = ((function () {
             var $ret = new ScalerParams(0, d, d, _this.yAxis.dn, e);
-            $ret.b = _this.i5();
+            $ret.b = _this.i6();
             return $ret;
         })());
         var h = !b.isEmpty && !c.isEmpty && this.dp != null ? this.dp.indexOf(a) : -1;
-        var i = this.xAxis != null && this.z2 != null && h < this.z2.count ? this.xAxis.f6(this.z2.item(h), f) : NaN;
-        var j = this.yAxis != null && this.z3 != null && h < this.z3.count ? this.yAxis.f6(this.z3.item(h), g) : NaN;
+        var i = this.xAxis != null && this.z3 != null && h < this.z3.count ? this.xAxis.f7(this.z3.item(h), f) : NaN;
+        var j = this.yAxis != null && this.z4 != null && h < this.z4.count ? this.yAxis.f7(this.z4.item(h), g) : NaN;
         if (!isNaN_(i)) {
             if (i < b.left + 0.1 * b.width) {
                 i = i + 0.4 * b.width;
@@ -983,23 +983,23 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h >= 0;
     };
-    ScatterBase.prototype.s8 = function (a, b) {
-        this.r8(false);
-    };
     ScatterBase.prototype.s9 = function (a, b) {
-        this.r8(false);
+        this.r9(false);
+    };
+    ScatterBase.prototype.ta = function (a, b) {
+        this.r9(false);
     };
-    ScatterBase.prototype.zm = function () {
-        var a = this.zl;
+    ScatterBase.prototype.zn = function () {
+        var a = this.zm;
         if (this.d4()) {
             if (this.dd.g) {
                 this.dd.t();
             }
-            a = this.zp;
+            a = this.zq;
         }
         return a;
     };
-    ScatterBase.prototype.abp = function (a, b, c, d, e) {
+    ScatterBase.prototype.abq = function (a, b, c, d, e) {
         var _this = this;
         b.j = new Dictionary$2(Base.$, OwnedPoint.$, 1, c);
         var f = this.getEffectiveViewport1(a);
@@ -1007,14 +1007,14 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var h;
         var i;
         var j = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.zh.d, f);
+            var $ret = new ScalerParams(0, d, e, _this.zi.d, f);
             $ret.c = _this.getEffectiveViewport1(a);
             return $ret;
         })());
         var k = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.zh.e, f);
+            var $ret = new ScalerParams(0, d, e, _this.zi.e, f);
             $ret.c = _this.getEffectiveViewport1(a);
-            $ret.b = _this.i5();
+            $ret.b = _this.i6();
             return $ret;
         })());
         var l = false;
@@ -1027,9 +1027,9 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         var _loop_1 = function (o) {
-            h = this_1.z2.item(o);
-            i = this_1.z3.item(o);
-            var p = { $type: Point_$type, x: this_1.zh.a.f6(h, j), y: this_1.zh.b.f6(i, k) };
+            h = this_1.z3.item(o);
+            i = this_1.z4.item(o);
+            var p = { $type: Point_$type, x: this_1.zi.a.f7(h, j), y: this_1.zi.b.f7(i, k) };
             if (l) {
                 if (p.x < e.left || p.x > e.right) {
                     if (p.x + m >= e.left && p.x + m <= e.right) {
@@ -1057,17 +1057,17 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             _loop_1(o);
         }
     };
-    ScatterBase.prototype.ab0 = function (a, b) {
+    ScatterBase.prototype.ab1 = function (a, b) {
         var _this = this;
-        this.y7 = null;
         this.y8 = null;
+        this.y9 = null;
         a.m.clear();
         a.r.clear();
         a.k.clear();
         a.o.clear();
         a.l.clear();
         a.n.clear();
-        var c = Math.min(this.z2 != null ? this.z2.count : 0, this.z3 != null ? this.z3.count : 0);
+        var c = Math.min(this.z3 != null ? this.z3.count : 0, this.z4 != null ? this.z4.count : 0);
         var d = b.ca;
         var e = b.b9;
         var f = this.getEffectiveViewport1(b);
@@ -1075,14 +1075,14 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         g.c = this.getEffectiveViewport1(b);
         var h = ((function () {
             var $ret = new ScalerParams(0, d, e, _this.yAxis.dn, f);
-            $ret.b = _this.i5();
+            $ret.b = _this.i6();
             return $ret;
         })());
         h.c = this.getEffectiveViewport1(b);
         if (c < 1) {
             return;
         }
-        this.zh = ((function () {
+        this.zi = ((function () {
             var $ret = new ScatterAxisInfoCache();
             $ret.a = _this.xAxis;
             $ret.b = _this.yAxis;
@@ -1092,23 +1092,23 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return $ret;
         })());
         var i = b;
-        if (c <= this.aau) {
-            this.abp(i, a, c, d, e);
+        if (c <= this.aav) {
+            this.abq(i, a, c, d, e);
         }
-        if (this.x1()) {
-            b.dd.l(a.m, this.aau, d, e, this.ik);
+        if (this.x2()) {
+            b.dd.l(a.m, this.aav, d, e, this.il);
         }
         var j = ((function () {
             var $ret = new Clipper(0, e, false);
             $ret.i = a.r;
             return $ret;
         })());
-        var k = this.w4(b);
-        var l = this.xAxis.f9(k.left, g);
-        var m = this.xAxis.f9(k.right, g);
-        b.df.j(a.r, this.trendLineType, this.z2, this.z3, this.trendLinePeriod, function (n) { return _this.xAxis.f6(n, g); }, function (n) { return _this.yAxis.f6(n, h); }, ((function () {
+        var k = this.w5(b);
+        var l = this.xAxis.ga(k.left, g);
+        var m = this.xAxis.ga(k.right, g);
+        b.df.j(a.r, this.trendLineType, this.z3, this.z4, this.trendLinePeriod, function (n) { return _this.xAxis.f7(n, g); }, function (n) { return _this.yAxis.f7(n, h); }, ((function () {
             var $ret = new TrendResolutionParams();
-            $ret.d = _this.ik;
+            $ret.d = _this.il;
             $ret.i = e;
             $ret.h = f;
             $ret.j = d;
@@ -1119,9 +1119,9 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             for (var n = 0; n < b.aa.count; n++) {
                 a.p.add(new List$1(Point_$type, 0));
                 var o = b.aa._inner[n];
-                o.j(a.p._inner[n], o.g$b, this.z2, this.z3, o.g$f, function (p) { return _this.xAxis.f6(p, g); }, function (p) { return _this.yAxis.f6(p, h); }, ((function () {
+                o.j(a.p._inner[n], o.g$b, this.z3, this.z4, o.g$f, function (p) { return _this.xAxis.f7(p, g); }, function (p) { return _this.yAxis.f7(p, h); }, ((function () {
                     var $ret = new TrendResolutionParams();
-                    $ret.d = _this.ik;
+                    $ret.d = _this.il;
                     $ret.i = e;
                     $ret.h = f;
                     $ret.j = d;
@@ -1129,25 +1129,25 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 })()), j, l, m);
             }
         }
-        this.aby(a, b);
+        this.abz(a, b);
     };
-    ScatterBase.prototype.pi = function (a, b) {
-        _super.prototype.pi.call(this, a, b);
+    ScatterBase.prototype.pj = function (a, b) {
+        _super.prototype.pj.call(this, a, b);
         var c = b;
         c.dm(a);
     };
     ScatterBase.prototype.get_fh = function () {
         return true;
     };
-    ScatterBase.prototype.zw = function (a, b, c) {
+    ScatterBase.prototype.zx = function (a, b, c) {
         return null;
     };
-    ScatterBase.prototype.zx = function (a, b, c) {
+    ScatterBase.prototype.zy = function (a, b, c) {
         if (this.dp == null) {
             return null;
         }
-        var d = this.zm();
-        var e = this.zi.ce(this.wr(b));
+        var d = this.zn();
+        var e = this.zj.ce(this.ws(b));
         var f = -1;
         if (e == null) {
             if (a != null) {
@@ -1174,11 +1174,11 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return g;
     };
-    ScatterBase.prototype.xg = function (a, b) {
-        if (this.xt != 1 && this.xt != 13) {
-            var c = this.xr.c8();
-            var d = (c.width / 2) + (this.x4 / 2);
-            var e = (c.height / 2) + (this.x4 / 2);
+    ScatterBase.prototype.xh = function (a, b) {
+        if (this.xu != 1 && this.xu != 13) {
+            var c = this.xs.c8();
+            var d = (c.width / 2) + (this.x5 / 2);
+            var e = (c.height / 2) + (this.x5 / 2);
             var f = d;
             var g = d;
             var h = e;
@@ -1199,7 +1199,7 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Thickness(1, 0, 0, 0, 0);
     };
-    ScatterBase.prototype.zv = function (a, b, c) {
+    ScatterBase.prototype.zw = function (a, b, c) {
         var d = new HighlightingInfo();
         d.i = this;
         d.g = 0;
@@ -1211,41 +1211,41 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         return d;
     };
     ScatterBase.prototype.dh = function (a, b, c) {
-        if (this.ef && this.f2(this.by) && !c) {
-            var d = this.zw(a, b, this.zy);
-            this.zy = d;
+        if (this.ef && this.f3(this.by) && !c) {
+            var d = this.zx(a, b, this.zz);
+            this.zz = d;
             return d;
         }
         else {
-            var e = this.zv(a, b, this.zy);
-            this.zy = e;
+            var e = this.zw(a, b, this.zz);
+            this.zz = e;
             return e;
         }
     };
     ScatterBase.prototype.di = function (a, b, c) {
-        if (this.f2(this.by) && !c) {
-            var d = this.zx(a, b, this.zz);
-            this.zz = d;
+        if (this.f3(this.by) && !c) {
+            var d = this.zy(a, b, this.z0);
+            this.z0 = d;
             return d;
         }
         else {
-            var e = this.zv(a, b, this.zz);
+            var e = this.zw(a, b, this.z0);
             e.d = true;
-            this.zz = e;
+            this.z0 = e;
             return e;
         }
     };
-    ScatterBase.prototype.aag = function () {
-        return (this.assigningScatterStyle != null && this.z6) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
+    ScatterBase.prototype.aah = function () {
+        return (this.assigningScatterStyle != null && this.z7) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
     };
-    ScatterBase.prototype.aaf = function () {
-        return (this.assigningScatterMarkerStyle != null && this.z5) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
+    ScatterBase.prototype.aag = function () {
+        return (this.assigningScatterMarkerStyle != null && this.z6) || this.d3 || (this.by != 1) || (this.cq != 1) || (this.cp != 1);
     };
-    ScatterBase.prototype.acb = function (a, b) {
+    ScatterBase.prototype.acc = function (a, b) {
         var _this = this;
-        this.rd();
+        this.re();
         var c = b.b9;
-        this.zh = ((function () {
+        this.zi = ((function () {
             var $ret = new ScatterAxisInfoCache();
             $ret.a = _this.xAxis;
             $ret.b = _this.yAxis;
@@ -1253,10 +1253,10 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.e = _this.yAxis.dn;
             return $ret;
         })());
-        if (this.x1()) {
-            b.dd.j(a.m, this.x3);
-            if (this.aaf()) {
-                this.abq(b, a);
+        if (this.x2()) {
+            b.dd.j(a.m, this.x4);
+            if (this.aag()) {
+                this.abr(b, a);
             }
         }
         b.c4();
@@ -1272,29 +1272,29 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 f.g$l(a.p._inner[e], d);
             }
         }
-        this.ab8(a, b);
+        this.ab9(a, b);
     };
     ScatterBase.prototype.ak = function (a, b) {
         var c = new List$1(ChartSelection.$, 0);
-        this.qi(a, c, b);
+        this.qj(a, c, b);
         return c.toArray();
     };
-    ScatterBase.prototype.qi = function (a, b, c) {
-        this.abs(a, b, c, 0, null);
+    ScatterBase.prototype.qj = function (a, b, c) {
+        this.abt(a, b, c, 0, null);
     };
-    ScatterBase.prototype.abs = function (a, b, c, d, e) {
+    ScatterBase.prototype.abt = function (a, b, c, d, e) {
         var _this = this;
         var f = this.dc.y6(this.dc.yw(a));
         var g = this.dp.count;
-        var h = this.zh.a;
-        var i = this.zh.b;
-        var j = this.dc.yz(this.xd, this.getEffectiveViewport(), f);
+        var h = this.zi.a;
+        var i = this.zi.b;
+        var j = this.dc.yz(this.xe, this.getEffectiveViewport(), f);
         var k = new ScalerParams(0, f, this.dc.y9, h.dn, this.getEffectiveViewport());
         var l = new ScalerParams(0, f, this.dc.y9, i.dn, this.getEffectiveViewport());
         if (d == 0) {
             var _loop_2 = function (m) {
-                var n = h.f6(this_2.z2.item(m), k);
-                var o = i.f6(this_2.z3.item(m), l);
+                var n = h.f7(this_2.z3.item(m), k);
+                var o = i.f7(this_2.z4.item(m), l);
                 if (n < j.width && n > 0 && o < j.height && o > 0) {
                     if (c == 7 || c == 6) {
                         b.add(((function () {
@@ -1330,8 +1330,8 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         else {
             var _loop_3 = function (p) {
-                var q = h.f6(this_3.z2.item(p), k);
-                var r = i.f6(this_3.z3.item(p), l);
+                var q = h.f7(this_3.z3.item(p), k);
+                var r = i.f7(this_3.z4.item(p), l);
                 var s = e.item(p) / f.height;
                 var t = e.item(p) / f.width;
                 var u = new Rect(0, q - t / 2, r - s / 2, t, s);
@@ -1369,11 +1369,11 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.za = function (a, b) {
-        return this.zb(a, b);
-    };
     ScatterBase.prototype.zb = function (a, b) {
-        if (b < a || a < 0 || a > this.z2.count || b < 0 || b > this.z2.count) {
+        return this.zc(a, b);
+    };
+    ScatterBase.prototype.zc = function (a, b) {
+        if (b < a || a < 0 || a > this.z3.count || b < 0 || b > this.z3.count) {
             return null;
         }
         var c = new Array((b - a) + 1);
@@ -1383,15 +1383,15 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ScatterBase.prototype.abq = function (a, b) {
+    ScatterBase.prototype.abr = function (a, b) {
         var _this = this;
         a.ck = true;
-        this.zu.ay(this, this.aaf(), runOn(this, this.za));
-        var c = this.zu.d;
+        this.zv.ay(this, this.aag(), runOn(this, this.zb));
+        var c = this.zv.d;
         var d = c != null;
         var e = this.getEffectiveViewport1(a);
         var f = this.dp == null ? 0 : this.dp.count;
-        this.zi.cw(function (g) {
+        this.zj.cw(function (g) {
             if (g._visibility == 0) {
                 var h = g.ak;
                 var i = g.content;
@@ -1400,19 +1400,19 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     g.content = i;
                 }
                 if (d) {
-                    _this.abv(h, f, a.t);
+                    _this.abw(h, f, a.t);
                 }
-                _this.zu.ac(g, i);
+                _this.zv.ac(g, i);
             }
         });
     };
-    ScatterBase.prototype.abw = function (a, b, c) {
+    ScatterBase.prototype.abx = function (a, b, c) {
         var d = this.by != 1;
         var e = this.cq != 1;
         var f = this.cp != 1;
-        this.zu.a0(this.zu.b, a, b, false);
-        this.zu.ab(this.ii);
-        var g = this.zu.ax;
+        this.zv.a0(this.zv.b, a, b, false);
+        this.zv.ab(this.ij);
+        var g = this.zv.ax;
         var h = null;
         var i = null;
         var j = null;
@@ -1430,16 +1430,16 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             g.b = h;
         }
         g.h = c;
-        this.ab6(g);
-        this.zu.z(this, h, i, j, c, d, e, f, a < 0);
+        this.ab7(g);
+        this.zv.z(this, h, i, j, c, d, e, f, a < 0);
     };
-    ScatterBase.prototype.abv = function (a, b, c) {
+    ScatterBase.prototype.abw = function (a, b, c) {
         var d = this.by != 1;
         var e = this.cq != 1;
         var f = this.cp != 1;
-        this.zu.a0(this.zu.d, a, b, true);
-        this.zu.aa(this.ii);
-        var g = this.zu.aw;
+        this.zv.a0(this.zv.d, a, b, true);
+        this.zv.aa(this.ij);
+        var g = this.zv.aw;
         var h = null;
         var i = null;
         var j = null;
@@ -1475,27 +1475,27 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             g.d = i;
         }
         g.h = c;
-        this.ab5(g);
-        this.zu.y(this, h, i, j, c, d, e, f, g.v, this.dc.d7.totalHighWaterMark, g.x, this.dc.d8.totalHighWaterMark, g.t, this.dc.d6.totalHighWaterMark);
+        this.ab6(g);
+        this.zv.y(this, h, i, j, c, d, e, f, g.v, this.dc.d7.totalHighWaterMark, g.x, this.dc.d8.totalHighWaterMark, g.t, this.dc.d6.totalHighWaterMark);
     };
-    ScatterBase.prototype.ab6 = function (a) {
-        if (this.assigningScatterStyle != null && this.z6) {
+    ScatterBase.prototype.ab7 = function (a) {
+        if (this.assigningScatterStyle != null && this.z7) {
             this.assigningScatterStyle(this, a);
         }
     };
-    ScatterBase.prototype.ab5 = function (a) {
-        if (this.assigningScatterMarkerStyle != null && this.z5) {
+    ScatterBase.prototype.ab6 = function (a) {
+        if (this.assigningScatterMarkerStyle != null && this.z6) {
             this.assigningScatterMarkerStyle(this, a);
         }
     };
-    ScatterBase.prototype.aby = function (a, b) {
+    ScatterBase.prototype.abz = function (a, b) {
         var e_4, _a;
         var c = new ErrorBarsHelper(this, b);
-        if (this.zj == null) {
+        if (this.zk == null) {
             return;
         }
-        var d = this.zj.u;
-        var e = this.zj.v;
+        var d = this.zk.u;
+        var e = this.zk.v;
         var f = 0;
         var g = 0;
         var h = 0;
@@ -1507,35 +1507,35 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            var l = this.ab1(k, c, d, h, i, true);
+                            var l = this.ab2(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            var m = this.abz(k, c, d, h, i, true);
+                            var m = this.ab0(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            var n = this.abx(k, c, d, j, h, i, true);
+                            var n = this.aby(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            var o = this.ab2(c, d, f, h, i, true);
+                            var o = this.ab3(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            var p = this.abz(k, c, d, h, i, true);
+                            var p = this.ab0(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     var q = new OwnedPoint();
-                    q.c = c.l(d, this.zh.a, k.c, f);
+                    q.c = c.l(d, this.zi.a, k.c, f);
                     q.a = k.a;
                     a.k.addItem(j, q);
                     a.l.addItem(j, [h, i]);
@@ -1543,35 +1543,35 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            var r = this.ab1(k, c, e, h, i, false);
+                            var r = this.ab2(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            var s = this.abz(k, c, e, h, i, false);
+                            var s = this.ab0(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            var t = this.abx(k, c, e, j, h, i, false);
+                            var t = this.aby(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            var u = this.ab2(c, e, g, h, i, false);
+                            var u = this.ab3(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            var v = this.abz(k, c, e, h, i, false);
+                            var v = this.ab0(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     var w = new OwnedPoint();
-                    w.c = c.m(e, this.zh.b, k.c, g);
+                    w.c = c.m(e, this.zi.b, k.c, g);
                     w.a = k.a;
                     a.o.addItem(j, w);
                     a.n.addItem(j, [h, i]);
@@ -1592,18 +1592,18 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.ab1 = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.ab2 = function (a, b, c, d, e, f) {
         if (f) {
             var g = void 0;
             var h = void 0, i = void 0;
-            i = this.zh.a;
-            if (this.zj.s == 0) {
+            i = this.zi.a;
+            if (this.zk.s == 0) {
                 g = a.c.x;
-                h = this.zh.a;
+                h = this.zi.a;
             }
             else {
                 g = a.c.y;
-                h = this.zh.b;
+                h = this.zi.b;
             }
             var j = b.f(g, c, h, i, d, e);
             d = j.p4;
@@ -1612,14 +1612,14 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         else {
             var k = void 0;
             var l = void 0, m = void 0;
-            m = this.zh.b;
-            if (this.zj.t == 0) {
+            m = this.zi.b;
+            if (this.zk.t == 0) {
                 k = a.c.x;
-                l = this.zh.a;
+                l = this.zi.a;
             }
             else {
                 k = a.c.y;
-                l = this.zh.b;
+                l = this.zi.b;
             }
             var n = b.f(k, c, l, m, d, e);
             d = n.p4;
@@ -1630,14 +1630,14 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.abz = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.ab0 = function (a, b, c, d, e, f) {
         if (f) {
-            var g = b.j(a.c.x, c, this.zh.a, d, e);
+            var g = b.j(a.c.x, c, this.zi.a, d, e);
             d = g.p3;
             e = g.p4;
         }
         else {
-            var h = b.j(a.c.y, c, this.zh.b, d, e);
+            var h = b.j(a.c.y, c, this.zi.b, d, e);
             d = h.p3;
             e = h.p4;
         }
@@ -1646,18 +1646,18 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.abx = function (a, b, c, d, e, f, g) {
+    ScatterBase.prototype.aby = function (a, b, c, d, e, f, g) {
         var h = c.getItemColumn();
         var i = this.dp.indexOf(d);
         if (h != null && i < h.count) {
             var j = h.item(i);
             if (g) {
-                var k = b.h(a.c.x, j, this.zh.a, e, f);
+                var k = b.h(a.c.x, j, this.zi.a, e, f);
                 e = k.p3;
                 f = k.p4;
             }
             else {
-                var l = b.h(a.c.y, j, this.zh.b, e, f);
+                var l = b.h(a.c.y, j, this.zi.b, e, f);
                 e = l.p3;
                 f = l.p4;
             }
@@ -1671,16 +1671,16 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p5: f
         };
     };
-    ScatterBase.prototype.ab2 = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.ab3 = function (a, b, c, d, e, f) {
         var g = a.i(b, c);
         c = g.p1;
         if (f) {
-            var h = a.k(c, b, this.zh.a, d, e);
+            var h = a.k(c, b, this.zi.a, d, e);
             d = h.p3;
             e = h.p4;
         }
         else {
-            var i = a.k(c, b, this.zh.b, d, e);
+            var i = a.k(c, b, this.zi.b, d, e);
             d = i.p3;
             e = i.p4;
         }
@@ -1690,20 +1690,20 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.ab8 = function (a, b) {
-        if (!b.r() || this.zj == null) {
+    ScatterBase.prototype.ab9 = function (a, b) {
+        if (!b.r() || this.zk == null) {
             b.dp();
             return;
         }
-        this.ab9(a, b);
         this.aca(a, b);
+        this.acb(a, b);
     };
-    ScatterBase.prototype.ab9 = function (a, b) {
+    ScatterBase.prototype.aca = function (a, b) {
         var e_5, _a;
         b.dk();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.zj.u;
+        var e = this.zk.u;
         try {
             for (var _b = __values(fromEnum(a.m.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1712,10 +1712,10 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     var h = a.l.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         var i = a.k.item(f).c;
-                        if (this.zj.o == 1 || this.zj.o == 2) {
+                        if (this.zk.o == 1 || this.zk.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.zj.o == 1 || this.zj.o == 3) {
+                        if (this.zk.o == 1 || this.zk.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1737,12 +1737,12 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         b.dq(d);
     };
-    ScatterBase.prototype.aca = function (a, b) {
+    ScatterBase.prototype.acb = function (a, b) {
         var e_6, _a;
         b.dl();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.zj.v;
+        var e = this.zk.v;
         try {
             for (var _b = __values(fromEnum(a.m.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1751,10 +1751,10 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     var h = a.n.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         var i = a.o.item(f).c;
-                        if (this.zj.p == 1 || this.zj.p == 2) {
+                        if (this.zk.p == 1 || this.zk.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.zj.p == 1 || this.zj.p == 3) {
+                        if (this.zk.p == 1 || this.zk.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
@@ -1775,17 +1775,17 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.hk = function (a, b, c) {
+    ScatterBase.prototype.hl = function (a, b, c) {
         var d = true;
-        if (!_super.prototype.hk.call(this, a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.b7 == null || this.yAxis.b7 == null || this.z2 == null || this.z3 == null || this.z2.count == 0 || this.z3.count == 0 || this.dp == null || this.dp.count != this.z2.count || this.dp.count != this.z3.count || this.xAxis.b7 == null || this.yAxis.b7 == null || this.xAxis.qw == this.xAxis.qv || this.yAxis.qw == this.yAxis.qv) {
+        if (!_super.prototype.hl.call(this, a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.b7 == null || this.yAxis.b7 == null || this.z3 == null || this.z4 == null || this.z3.count == 0 || this.z4.count == 0 || this.dp == null || this.dp.count != this.z3.count || this.dp.count != this.z4.count || this.xAxis.b7 == null || this.yAxis.b7 == null || this.xAxis.qy == this.xAxis.qx || this.yAxis.qy == this.yAxis.qx) {
             d = false;
         }
         return d;
     };
     ScatterBase.prototype.getViewInfo = function (a, b) {
-        if (!this.ac6.isEmpty && !this.ac7.isEmpty) {
-            a = this.ac6;
-            b = this.ac7;
+        if (!this.ac7.isEmpty && !this.ac8.isEmpty) {
+            a = this.ac7;
+            b = this.ac8;
             return {
                 p0: a,
                 p1: b
@@ -1798,53 +1798,53 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p1: b
         };
     };
-    ScatterBase.prototype.r9 = function (a) {
-        _super.prototype.r9.call(this, a);
-        this.abo();
+    ScatterBase.prototype.sa = function (a) {
+        _super.prototype.sa.call(this, a);
+        this.abp();
         try {
             if (this.d7(this.cw)) {
                 return;
             }
-            if (this.dp != null && this.dp.count > this.aau) {
+            if (this.dp != null && this.dp.count > this.aav) {
                 a = false;
             }
-            if (this.gl(a) && !this.gx) {
-                var b = this.zn;
+            if (this.gm(a) && !this.gy) {
+                var b = this.zo;
                 if (this.d4()) {
                     if (this.dd.g) {
                         this.dd.t();
                     }
-                    this.zn = this.zp;
-                    this.zp = b;
+                    this.zo = this.zq;
+                    this.zq = b;
                 }
                 else {
-                    this.zn = this.zl;
-                    this.zl = b;
+                    this.zo = this.zm;
+                    this.zm = b;
                 }
-                this.ab0(this.zl, this.zi);
-                this.sp();
+                this.ab1(this.zm, this.zj);
+                this.sq();
             }
             else {
-                if (!this.gx) {
-                    this.ab0(this.zl, this.zi);
+                if (!this.gy) {
+                    this.ab1(this.zm, this.zj);
                 }
-                this.acb(this.zl, this.zi);
+                this.acc(this.zm, this.zj);
             }
         }
         finally {
-            this.acc();
+            this.acd();
         }
     };
-    ScatterBase.prototype.sz = function () {
-        _super.prototype.sz.call(this);
+    ScatterBase.prototype.s0 = function () {
+        _super.prototype.s0.call(this);
         if (this.index < 0) {
             return;
         }
-        this.zi.dt();
+        this.zj.dt();
     };
-    ScatterBase.prototype.sa = function (a, b) {
-        _super.prototype.sa.call(this, a, b);
-        if (!this.g6) {
+    ScatterBase.prototype.sb = function (a, b) {
+        _super.prototype.sb.call(this, a, b);
+        if (!this.g7) {
             this.cw.be(b);
             return;
         }
@@ -1853,34 +1853,34 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return;
         }
         var c = typeCast(ScatterBaseView.$, this.cv);
-        this.sb();
-        this.g6 = false;
+        this.sc();
+        this.g7 = false;
     };
-    ScatterBase.prototype.sb = function () {
-        _super.prototype.sb.call(this);
+    ScatterBase.prototype.sc = function () {
+        _super.prototype.sc.call(this);
         var a = typeCast(ScatterBaseView.$, this.cv);
-        if (!this.gy) {
-            this.zo = new ScatterFrame();
-            this.ab0(this.zo, a);
+        if (!this.gz) {
+            this.zp = new ScatterFrame();
+            this.ab1(this.zp, a);
         }
-        this.gy = false;
-        this.acb(this.zo, a);
+        this.gz = false;
+        this.acc(this.zp, a);
     };
-    ScatterBase.prototype.r7 = function (a, b, c, d, e) {
-        _super.prototype.r7.call(this, a, b, c, d, e);
+    ScatterBase.prototype.r8 = function (a, b, c, d, e) {
+        _super.prototype.r8.call(this, a, b, c, d, e);
         var f = this.ba.a$k.item(d);
         var g = f;
         f.bd(c);
         if (this.d7(g)) {
             return;
         }
-        if (this.zk == null) {
-            this.zk = new ScatterFrame();
+        if (this.zl == null) {
+            this.zl = new ScatterFrame();
         }
-        this.ab0(this.zk, g);
-        this.acb(this.zk, g);
+        this.ab1(this.zl, g);
+        this.acc(this.zl, g);
     };
-    ScatterBase.prototype.ab7 = function (a, b) {
+    ScatterBase.prototype.ab8 = function (a, b) {
         var e_7, _a, e_8, _b;
         var c = new List$1(Base.$, 0);
         try {
@@ -1924,11 +1924,11 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.y9 = function (a, b, c, d, e) {
+    ScatterBase.prototype.za = function (a, b, c, d, e) {
         var _this = this;
-        if (c == null || c.length != this.zh.c.count) {
-            c = new Array(this.zh.c.count);
-            for (var f = 0; f < this.zh.c.count; f++) {
+        if (c == null || c.length != this.zi.c.count) {
+            c = new Array(this.zi.c.count);
+            for (var f = 0; f < this.zi.c.count; f++) {
                 c[f] = PointUtil.create();
             }
         }
@@ -1941,31 +1941,31 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var i = ((function () {
             var $ret = new ScalerParams(0, d, e, _this.yAxis.dn, g);
             $ret.c = _this.getEffectiveViewport1(a);
-            $ret.b = _this.i5();
+            $ret.b = _this.i6();
             return $ret;
         })());
-        var j = this.w4(a);
-        var k = this.zh.a.f9(j.left, h);
-        var l = this.zh.a.f9(j.right, h);
-        var m = this.zh.b.f9(j.bottom, i);
-        var n = this.zh.b.f9(j.top, i);
-        if (this.zh.d) {
+        var j = this.w5(a);
+        var k = this.zi.a.ga(j.left, h);
+        var l = this.zi.a.ga(j.right, h);
+        var m = this.zi.b.ga(j.bottom, i);
+        var n = this.zi.b.ga(j.top, i);
+        if (this.zi.d) {
             var o = k;
             k = l;
             l = o;
         }
-        if (this.zh.e) {
+        if (this.zi.e) {
             var p = m;
             m = n;
             n = p;
         }
-        var q = this.zh;
+        var q = this.zi;
         var r = q.a;
         var s = q.b;
         var t;
         var u;
-        var v = this.z2;
-        var w = this.z3;
+        var v = this.z3;
+        var w = this.z4;
         var x = false;
         var y = 0;
         var z = 0;
@@ -1974,24 +1974,24 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 var aa = this.dc.oj(d, h);
                 x = aa.c;
                 y = aa.d;
-                z = r.f9(0 + y, h);
-                var ab = r.f9(0, h);
+                z = r.ga(0 + y, h);
+                var ab = r.ga(0, h);
                 z -= ab;
             }
         }
-        for (var ac = 0; ac < this.zh.c.count; ac++) {
+        for (var ac = 0; ac < this.zi.c.count; ac++) {
             t = v.item(ac);
             u = w.item(ac);
             var ad = 1E-10;
             if (x) {
                 if (t >= k - ad && t <= l + ad && u >= m - ad && u <= n + ad) {
-                    c[ac].x = r.f6(t, h);
-                    c[ac].y = s.f6(u, i);
+                    c[ac].x = r.f7(t, h);
+                    c[ac].y = s.f7(u, i);
                 }
                 else {
                     if ((t + z) >= k && (t + z) <= l && u >= m && u <= n) {
-                        c[ac].x = r.f6(t, h) + y;
-                        c[ac].y = s.f6(u, i);
+                        c[ac].x = r.f7(t, h) + y;
+                        c[ac].y = s.f7(u, i);
                     }
                     else {
                         c[ac].x = NaN;
@@ -2001,8 +2001,8 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             else {
                 if (t >= k - ad && t <= l + ad && u >= m - ad && u <= n + ad) {
-                    c[ac].x = r.f6(t, h);
-                    c[ac].y = s.f6(u, i);
+                    c[ac].x = r.f7(t, h);
+                    c[ac].y = s.f7(u, i);
                 }
                 else {
                     c[ac].x = NaN;
@@ -2012,7 +2012,7 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ScatterBase.prototype.aai = function (a, b) {
+    ScatterBase.prototype.aaj = function (a, b) {
         var e_9, _a;
         if (b == null) {
             b = new List$1(Number_$type, 2, a.e);
@@ -2043,32 +2043,32 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    ScatterBase.prototype.qd = function (a) {
-        _super.prototype.qd.call(this, a);
-        this.bc.exportTrendlineData(this, a, this.zi.df.g$n);
+    ScatterBase.prototype.qe = function (a) {
+        _super.prototype.qe.call(this, a);
+        this.bc.exportTrendlineData(this, a, this.zj.df.g$n);
     };
-    ScatterBase.prototype.i5 = function () {
-        return Series.i6(this.z3, null);
+    ScatterBase.prototype.i6 = function () {
+        return Series.i7(this.z4, null);
     };
     ScatterBase.prototype.getDataLegendSeriesContextAt = function (a, b) {
         var c = { $type: Point_$type, x: a, y: b };
-        var d = this.kw(c);
-        var e = d == null ? NaN : this.i4(d, "XMemberPath");
-        var f = d == null ? NaN : this.i4(d, "YMemberPath");
+        var d = this.kx(c);
+        var e = d == null ? NaN : this.i5(d, "XMemberPath");
+        var f = d == null ? NaN : this.i5(d, "YMemberPath");
         var g = new DataLegendSeriesValueInfo();
         g.l = e;
         g.a = 13;
         g.q = "X";
-        g.r = this.abe != null ? this.abe : "X";
-        g.s = this.aba != null ? this.aba : "X:";
-        g.t = this.abc != null ? this.abc : "";
+        g.r = this.abf != null ? this.abf : "X";
+        g.s = this.abb != null ? this.abb : "X:";
+        g.t = this.abd != null ? this.abd : "";
         var h = new DataLegendSeriesValueInfo();
         h.l = f;
         h.a = 14;
         h.q = "Y";
-        h.r = this.abm != null ? this.abm : "Y";
-        h.s = this.abi != null ? this.abi : "Y:";
-        h.t = this.abk != null ? this.abk : "";
+        h.r = this.abn != null ? this.abn : "Y";
+        h.s = this.abj != null ? this.abj : "Y:";
+        h.t = this.abl != null ? this.abl : "";
         var i = new DataLegendSeriesContext();
         i.e = ((function () {
             var $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -2076,23 +2076,23 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.add(h);
             return $ret;
         })());
-        i.h = this.mn();
+        i.h = this.mo();
         return i;
     };
-    ScatterBase.prototype.acd = function () {
-        if (this.z4) {
-            this.aaj = 0;
+    ScatterBase.prototype.ace = function () {
+        if (this.z5) {
             this.aak = 0;
-            for (var a = 0; a < this.z2.count; a++) {
-                this.aaj += this.z2.item(a);
+            this.aal = 0;
+            for (var a = 0; a < this.z3.count; a++) {
                 this.aak += this.z3.item(a);
+                this.aal += this.z4.item(a);
             }
-            this.aal = this.aaj / this.z2.count;
             this.aam = this.aak / this.z3.count;
-            this.z4 = false;
+            this.aan = this.aal / this.z4.count;
+            this.z5 = false;
         }
     };
-    ScatterBase.prototype.jg = function (a, b) {
+    ScatterBase.prototype.jh = function (a, b) {
         if (b == null || !b.dq) {
             return NaN;
         }
@@ -2100,7 +2100,7 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return NaN;
         }
         var c = this.aq(a);
-        if (b.dy) {
+        if (b.dz) {
             return c[1];
         }
         else {
@@ -2113,50 +2113,50 @@ export var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         switch (a) {
             case 5:
             case 2:
-                b = this.z2.maximum;
-                c = this.z3.maximum;
+                b = this.z3.maximum;
+                c = this.z4.maximum;
                 break;
             case 4:
             case 1:
-                b = this.z2.minimum;
-                c = this.z3.minimum;
+                b = this.z3.minimum;
+                c = this.z4.minimum;
                 break;
             case 6:
             case 3:
-                if (this.z4) {
-                    this.acd();
+                if (this.z5) {
+                    this.ace();
                 }
-                b = this.aal;
-                c = this.aam;
+                b = this.aam;
+                c = this.aan;
                 break;
         }
         return [b, c];
     };
-    ScatterBase.prototype.w0 = function (a) {
+    ScatterBase.prototype.w1 = function (a) {
         var b = this.getEffectiveViewport1(this.cw);
         var c = new ScalerParams(0, this.cw.ca, this.cw.b9, this.xAxis.dn, b);
         c.c = b;
-        var d = isNaN_(a[0]) ? NaN : this.xAxis.f6(a[0], c);
+        var d = isNaN_(a[0]) ? NaN : this.xAxis.f7(a[0], c);
         c = new ScalerParams(0, this.cw.ca, this.cw.b9, this.yAxis.dn, b);
-        c.b = this.i5();
+        c.b = this.i6();
         c.c = b;
-        var e = isNaN_(a[1]) ? NaN : this.yAxis.f6(a[1], c);
+        var e = isNaN_(a[1]) ? NaN : this.yAxis.f7(a[1], c);
         return { $type: Point_$type, x: d, y: e };
     };
-    ScatterBase.prototype.wz = function (a) {
+    ScatterBase.prototype.w0 = function (a) {
         var b = this.aq(a);
-        return this.w0(b);
+        return this.w1(b);
     };
     ScatterBase.prototype.bd = function () {
         return new ScatterTrendLineManager();
     };
-    ScatterBase.prototype.qr = function () {
-        _super.prototype.qr.call(this);
-        this.zi.df.g$m();
+    ScatterBase.prototype.qs = function () {
+        _super.prototype.qs.call(this);
+        this.zj.df.g$m();
     };
     ScatterBase.$t = markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.ace = DependencyProperty.i("ActualTrendLineBrush", Brush.$, ScatterBase.$, new PropertyMetadata(2, null, function (a, b) { return a.raisePropertyChanged("ActualTrendLineBrush", b.oldValue, b.newValue); }));
-    ScatterBase.$$p = markDep(DependencyProperty, PropertyMetadata, ScatterBase, 'raisePropertyChanged', ['ErrorBarSettings:zj:acf', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aay:acg', [2, null], 'HighlightedYMemberPath:aa0:ach', [2, null], 'IsCustomScatterMarkerStyleAllowed:z9:aci', [0, false], 'IsCustomScatterStyleAllowed:aaa:acj', [0, false], 'ItemSearchMode:zt:ack', [ScatterItemSearchMode_$type, enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:aat:acl', [1, 10000], 'MarkerCollisionAvoidance:ze:acm', [CollisionAvoidanceType_$type, enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:aau:acn', [1, 400], 'XAxis::acv', [NumericXAxis.$, null], 'XMemberAsLegendLabel:aba:acw', [2, null], 'XMemberAsLegendUnit:abc:acx', [2, null], 'XMemberPath:abe:acy', [2, null], 'YAxis::acz', [NumericYAxis.$, null], 'YMemberAsLegendLabel:abi:ac0', [2, null], 'YMemberAsLegendUnit:abk:ac1', [2, null], 'YMemberPath:abm:ac2', [2, null], 'TrendLineType::act', [TrendLineType_$type, enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::acs', [1, 1.5], 'TrendLinePeriod::acr', [1, 7], 'TrendLineBrush::aco', [Brush.$, null], 'TrendLineZIndex:aav:acu', [1, 1001], 'TrendLineDashArray:ac4:acp', [DoubleCollection.$], 'TrendLineDashCap:ac5:acq', [PenLineCap_$type, enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.acf = DependencyProperty.i("ActualTrendLineBrush", Brush.$, ScatterBase.$, new PropertyMetadata(2, null, function (a, b) { return a.raisePropertyChanged("ActualTrendLineBrush", b.oldValue, b.newValue); }));
+    ScatterBase.$$p = markDep(DependencyProperty, PropertyMetadata, ScatterBase, 'raisePropertyChanged', ['ErrorBarSettings:zk:acg', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:aaz:ach', [2, null], 'HighlightedYMemberPath:aa1:aci', [2, null], 'IsCustomScatterMarkerStyleAllowed:aaa:acj', [0, false], 'IsCustomScatterStyleAllowed:aab:ack', [0, false], 'ItemSearchMode:zu:acl', [ScatterItemSearchMode_$type, enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:aau:acm', [1, 10000], 'MarkerCollisionAvoidance:zf:acn', [CollisionAvoidanceType_$type, enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:aav:aco', [1, 400], 'XAxis::acw', [NumericXAxis.$, null], 'XMemberAsLegendLabel:abb:acx', [2, null], 'XMemberAsLegendUnit:abd:acy', [2, null], 'XMemberPath:abf:acz', [2, null], 'YAxis::ac0', [NumericYAxis.$, null], 'YMemberAsLegendLabel:abj:ac1', [2, null], 'YMemberAsLegendUnit:abl:ac2', [2, null], 'YMemberPath:abn:ac3', [2, null], 'TrendLineType::acu', [TrendLineType_$type, enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::act', [1, 1.5], 'TrendLinePeriod::acs', [1, 7], 'TrendLineBrush::acp', [Brush.$, null], 'TrendLineZIndex:aaw:acv', [1, 1001], 'TrendLineDashArray:ac5:acq', [DoubleCollection.$], 'TrendLineDashCap:ac6:acr', [PenLineCap_$type, enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 }(MarkerSeries));
 /**
@@ -2233,7 +2233,7 @@ export var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.dv = new Path();
         this.dw = new Path();
         if (!this.t) {
-            this.de.aau = 2000;
+            this.de.aav = 2000;
         }
     };
     ScatterBaseView.prototype.dx = function (a) {
@@ -2252,12 +2252,12 @@ export var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBaseView.prototype.dc = function () {
         var _this = this;
-        var a = new NumericMarkerManager(1, function (b) { return _this.dg.item(b); }, function (b) { return _this.de.zh.c.item(b); }, runOn(this, this.ds), runOn(this, this.c9), runOn(this, this.dh), function () { return _this.de.ze; });
+        var a = new NumericMarkerManager(1, function (b) { return _this.dg.item(b); }, function (b) { return _this.de.zi.c.item(b); }, runOn(this, this.ds), runOn(this, this.c9), runOn(this, this.dh), function () { return _this.de.zf; });
         a.q = runOn(this, this.dx);
         return a;
     };
     ScatterBaseView.prototype.ds = function (a) {
-        this.de.ab7(a, this.dg);
+        this.de.ab8(a, this.dg);
     };
     ScatterBaseView.prototype.di = function () {
         return this.cl;
@@ -2266,11 +2266,11 @@ export var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         return this.db;
     };
     ScatterBaseView.prototype.c9 = function () {
-        this.db = this.de.y9(this, this.dg, this.db, this.ca, this.b9);
+        this.db = this.de.za(this, this.dg, this.db, this.ca, this.b9);
         return this.db;
     };
     ScatterBaseView.prototype.dh = function () {
-        this.dj = this.de.aai(this.dg, this.dj);
+        this.dj = this.de.aaj(this.dg, this.dj);
         return this.dj;
     };
     ScatterBaseView.prototype.dk = function () {
@@ -2283,10 +2283,10 @@ export var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBaseView.prototype.dt = function () {
         if (this.de.trendLineBrush != null) {
-            this.de.ac3 = this.de.trendLineBrush;
+            this.de.ac4 = this.de.trendLineBrush;
         }
         else {
-            this.de.ac3 = this.de.vt;
+            this.de.ac4 = this.de.vu;
         }
     };
     ScatterBaseView.prototype.cw = function (a) {
@@ -2303,9 +2303,9 @@ export var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
             if (this.de.trendLineType != 0 && !b) {
                 var c = this.df.g$n;
                 c.ad = this.de.trendLineThickness;
-                c._stroke = this.de.ac3;
-                c.ai = this.de.ac4;
-                c.aj = this.de.ac5;
+                c._stroke = this.de.ac4;
+                c.ai = this.de.ac5;
+                c.aj = this.de.ac6;
                 a.v(c);
             }
         }
@@ -2324,7 +2324,7 @@ export var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         if (!stringIsNullOrEmpty(b)) {
             a += " style='color:" + b + "'";
         }
-        a += ">" + this.de.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.de.abe + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.de.abm + "}</span></div>";
+        a += ">" + this.de.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.de.abf + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.de.abn + "}</span></div>";
         return a;
     };
     ScatterBaseView.$t = markType(ScatterBaseView, 'ScatterBaseView', MarkerSeriesView.$);