igniteui-webcomponents-charts 4.7.2 → 4.8.1-alpha.0

package/esm5/lib/ScatterBase_combined.js

@@ -63,84 +63,106 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
     __extends(ScatterBase, _super);
     function ScatterBase() {
         var _this = _super.call(this) || this;
-        _this.vr = null;
-        _this.wa = null;
-        _this.wb = null;
-        _this.ze = null;
-        _this.zf = null;
-        _this.v0 = 1;
-        _this.vh = null;
-        _this.vi = null;
-        _this.vx = null;
-        _this.vz = null;
-        _this.vv = null;
-        _this.wg = false;
-        _this.wf = false;
-        _this.v8 = null;
-        _this.v9 = null;
+        _this.w5 = null;
+        _this.xo = null;
+        _this.xp = null;
+        _this.aas = null;
+        _this.aat = null;
+        _this.xe = 1;
+        _this.wv = null;
+        _this.ww = null;
+        _this.xb = null;
+        _this.xd = null;
+        _this.w9 = null;
+        _this.xu = false;
+        _this.xt = false;
+        _this.xm = null;
+        _this.xn = null;
         _this.assigningScatterStyle = null;
         _this.assigningScatterMarkerStyle = null;
-        _this.v4 = null;
-        _this.vy = null;
-        _this.vu = null;
-        _this.we = true;
-        _this.wt = 0;
-        _this.wu = 0;
-        _this.wv = 0;
-        _this.ww = 0;
-        _this.v1 = _this.v2();
-        _this.v4 = new ScatterSeriesRenderManager();
-        _this.vy = new ScatterFrame();
-        _this.zf = Rect.empty;
-        _this.ze = Rect.empty;
+        _this.xi = null;
+        _this.xc = null;
+        _this.w8 = null;
+        _this.xs = true;
+        _this.x7 = 0;
+        _this.x8 = 0;
+        _this.x9 = 0;
+        _this.ya = 0;
+        _this.xf = _this.xg();
+        _this.xi = new ScatterSeriesRenderManager();
+        _this.xc = new ScatterFrame();
+        _this.aat = Rect.empty;
+        _this.aas = Rect.empty;
         return _this;
     }
-    ScatterBase.prototype.cd = function () {
+    ScatterBase.prototype.ci = function () {
         return new ScatterBaseView(this);
     };
-    ScatterBase.prototype.nh = function () {
-        _super.prototype.nh.call(this);
+    ScatterBase.prototype.n4 = function () {
+        _super.prototype.n4.call(this);
         this.xAxis = null;
         this.yAxis = null;
     };
-    ScatterBase.prototype.o2 = function (a) {
-        _super.prototype.o2.call(this, a);
-        this.vs = a;
+    ScatterBase.prototype.px = function (a) {
+        _super.prototype.px.call(this, a);
+        this.w6 = a;
     };
-    ScatterBase.prototype.get_fa = function () {
+    ScatterBase.prototype.get_fh = function () {
         return true;
     };
     ScatterBase.prototype.ag = function () {
         return [this.xAxis, this.yAxis];
     };
-    ScatterBase.prototype.jv = function (a, b) {
-        var c = this.lw(b);
+    ScatterBase.prototype.j5 = function (a, b) {
+        var c = this.mh(b);
         if (c == ScatterBase.$$p[12]) {
-            return this.jw(a, b, this.xn);
+            return this.j6(a, b, this.y1);
         }
         if (c == ScatterBase.$$p[16]) {
-            return this.jw(a, b, this.xv);
+            return this.j6(a, b, this.y9);
+        }
+        if (c == ScatterBase.$$p[1]) {
+            return this.j6(a, b, this.yl);
+        }
+        if (c == ScatterBase.$$p[2]) {
+            return this.j6(a, b, this.yn);
         }
         return null;
     };
-    ScatterBase.prototype.dt = function (a, b, c, d) {
+    ScatterBase.prototype.li = function (a) {
+        var b = this.mh(a);
+        if (b == ScatterBase.$$p[12]) {
+            return this.y1;
+        }
+        if (b == ScatterBase.$$p[16]) {
+            return this.y9;
+        }
+        if (b == ScatterBase.$$p[1]) {
+            return this.yl;
+        }
+        if (b == ScatterBase.$$p[2]) {
+            return this.yn;
+        }
+        return _super.prototype.li.call(this, a);
+    };
+    ScatterBase.prototype.dz = function (a, b, c, d) {
         var _this = this;
         if (!this.hasMarkers) {
             return false;
         }
         var e = this.xAxis;
-        var f = new ScalerParams(1, this.cv.tr, this.ty, e.ch);
-        f.c = this.getEffectiveViewport1(this.cg);
+        var f = new ScalerParams(1, this.c1.vh, this.u9, e.ch);
+        f.c = this.getEffectiveViewport1(this.cl);
         var g = this.yAxis;
-        var h = new ScalerParams(1, this.cv.tr, this.ty, g.ch);
-        h.c = this.getEffectiveViewport1(this.cg);
+        var h = new ScalerParams(1, this.c1.vh, this.u9, g.ch);
+        h.c = this.getEffectiveViewport1(this.cl);
         a.clear();
-        this.ub.ci(function (i) {
+        this.vl.ci(function (i) {
             if (i._visibility == 0) {
                 var j = new SeriesPointOfInterest();
                 var k = i.n;
                 var l = i.o;
-                if (k < _this.ty.left || k > _this.ty.right || l < _this.ty.top || l > _this.ty.bottom) {
+                if (k < _this.u9.left || k > _this.u9.right || l < _this.u9.top || l > _this.u9.bottom) {
                     return;
                 }
                 j.b = e.em(k, f);
@@ -151,71 +173,71 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         });
         return true;
     };
-    ScatterBase.prototype.bu = function () {
-        if (this.bv == 0) {
-            if (this.w3 <= 2000) {
+    ScatterBase.prototype.bt = function () {
+        if (this.bu == 0) {
+            if (this.yh <= 2000) {
                 return 1;
             }
             else {
-                return _super.prototype.bu.call(this);
+                return _super.prototype.bt.call(this);
             }
         }
         else {
-            return _super.prototype.bu.call(this);
+            return _super.prototype.bt.call(this);
         }
     };
-    ScatterBase.prototype.tw = function (a) {
-        if (!this.hasMarkers || !this.ue()) {
+    ScatterBase.prototype.u7 = function (a) {
+        if (!this.hasMarkers || !this.vr()) {
             return Rect.empty;
         }
-        var b = this.ub.b1(this.te(a));
+        var b = this.vl.b1(this.up(a));
         if (b != null) {
-            return this.ub.cs(b);
+            return this.vl.cs(b);
         }
         return Rect.empty;
     };
-    ScatterBase.prototype.f5 = function (a, b) {
-        if (this.uf(a, b)) {
+    ScatterBase.prototype.gf = function (a, b) {
+        if (this.vs(a, b)) {
             return true;
         }
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "wc", {
+    Object.defineProperty(ScatterBase.prototype, "xq", {
         get: function () {
-            return this.wa;
+            return this.xo;
         },
         set: function (a) {
-            if (this.wa != a) {
-                var b = this.wc;
-                this.wa = a;
-                this.raisePropertyChanged("XColumn", b, this.wc);
+            if (this.xo != a) {
+                var b = this.xq;
+                this.xo = a;
+                this.raisePropertyChanged("XColumn", b, this.xq);
             }
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(ScatterBase.prototype, "wd", {
+    Object.defineProperty(ScatterBase.prototype, "xr", {
         get: function () {
-            return this.wb;
+            return this.xp;
         },
         set: function (a) {
-            if (this.wb != a) {
-                var b = this.wd;
-                this.wb = a;
-                this.raisePropertyChanged("YColumn", b, this.wd);
+            if (this.xp != a) {
+                var b = this.xr;
+                this.xp = a;
+                this.raisePropertyChanged("YColumn", b, this.xr);
             }
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.fo = function () {
-        return this.highlightedItemsSource != null || (this.w7 != null && this.w9 != null);
+    ScatterBase.prototype.fv = function () {
+        return this.highlightedItemsSource != null || (this.yl != null && this.yn != null);
     };
-    ScatterBase.prototype.wr = function () {
+    ScatterBase.prototype.x5 = function () {
         return false;
     };
-    ScatterBase.prototype.g1 = function () {
-        var a = _super.prototype.g1.call(this);
+    ScatterBase.prototype.hb = function () {
+        var a = _super.prototype.hb.call(this);
         {
             var b = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
@@ -225,7 +247,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.x2));
+            b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.zg));
             a.add(b);
         }
         {
@@ -237,10 +259,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.x1));
+            c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.zf));
             a.add(c);
         }
-        if (this.wr()) {
+        if (this.x5()) {
             var d = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -257,7 +279,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             })());
             a.add(d);
         }
-        if (!this.wr()) {
+        if (!this.x5()) {
             var e = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -267,10 +289,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.pz));
+            e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.qu));
             a.add(e);
         }
-        if (!this.wr()) {
+        if (!this.x5()) {
             var f = ((function () {
                 var $ret = new SeriesLayerPropertyOverlay();
                 $ret.r = true;
@@ -280,31 +302,31 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 $ret.q = true;
                 return $ret;
             })());
-            f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.pz));
+            f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.qu));
             a.add(f);
         }
         return a;
     };
-    ScatterBase.prototype.x1 = function (a, b) {
-        if (this.w7 != null) {
-            b.value = this.w7;
+    ScatterBase.prototype.zf = function (a, b) {
+        if (this.yl != null) {
+            b.value = this.yl;
             return;
         }
-        b.value = this.xn;
+        b.value = this.y1;
     };
-    ScatterBase.prototype.x2 = function (a, b) {
-        if (this.w9 != null) {
-            b.value = this.w9;
+    ScatterBase.prototype.zg = function (a, b) {
+        if (this.yn != null) {
+            b.value = this.yn;
             return;
         }
-        b.value = this.xv;
+        b.value = this.y9;
     };
-    Object.defineProperty(ScatterBase.prototype, "zb", {
+    Object.defineProperty(ScatterBase.prototype, "aap", {
         get: function () {
-            return this.c(ScatterBase.ym);
+            return this.c(ScatterBase.z0);
         },
         set: function (a) {
-            this.h(ScatterBase.ym, a);
+            this.h(ScatterBase.z0, a);
         },
         enumerable: false,
         configurable: true
@@ -323,8 +345,8 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.oc = function () {
-        _super.prototype.oc.call(this);
+    ScatterBase.prototype.o6 = function () {
+        _super.prototype.o6.call(this);
         if (this.xAxis != null) {
             this.xAxis.h8(false);
         }
@@ -332,26 +354,32 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             this.yAxis.h8(false);
         }
     };
-    ScatterBase.prototype.pa = function (a, b, c, d) {
-        _super.prototype.pa.call(this, a, b, c, d);
-        if (this.vs.c0.g$b(a, b, c, d)) {
-            this.pr(false);
-            this.om();
+    ScatterBase.prototype.p5 = function (a, b, c, d) {
+        _super.prototype.p5.call(this, a, b, c, d);
+        if (this.w6.c0.g$b(a, b, c, d)) {
+            this.qm(false);
+            this.ph();
         }
         switch (b) {
+            case ScatterBase.$$p[10]:
+            case ScatterBase.$$p[14]:
+            case ScatterBase.$$p[11]:
+            case ScatterBase.$$p[15]:
+                this.pb();
+                break;
             case "FastItemsSource":
                 if (typeCast(IFastItemsSource_$type, c) != null) {
-                    c.deregisterColumn(this.wc);
-                    c.deregisterColumn(this.wd);
-                    this.wc = null;
-                    this.wd = null;
+                    c.deregisterColumn(this.xq);
+                    c.deregisterColumn(this.xr);
+                    this.xq = null;
+                    this.xr = null;
                 }
                 if (typeCast(IFastItemsSource_$type, d) != null) {
-                    this.wc = this.c4(this.xn);
-                    this.wd = this.c4(this.xv);
+                    this.xq = this.da(this.y1);
+                    this.xr = this.da(this.y9);
                 }
                 if ((this.yAxis != null && !this.yAxis.c1()) || (this.xAxis != null && !this.xAxis.c1())) {
-                    this.pr(this.fr && c != null);
+                    this.qm(this.f0 && c != null);
                 }
                 break;
             case ScatterBase.$$p[9]:
@@ -362,9 +390,9 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     d.ct(this);
                 }
                 if ((this.xAxis != null && !this.xAxis.c1()) || (d == null && c != null)) {
-                    this.pr(false);
+                    this.qm(false);
                 }
-                this.om();
+                this.ph();
                 break;
             case ScatterBase.$$p[13]:
                 if (c != null) {
@@ -374,134 +402,134 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     d.ct(this);
                 }
                 if ((this.yAxis != null && !this.yAxis.c1()) || (d == null && c != null)) {
-                    this.pr(false);
+                    this.qm(false);
                 }
-                this.om();
+                this.ph();
                 break;
             case ScatterBase.$$p[12]:
-                if (this.c7 != null) {
-                    this.c7.deregisterColumn(this.wc);
-                    this.wc = this.c4(this.xn);
+                if (this.dd != null) {
+                    this.dd.deregisterColumn(this.xq);
+                    this.xq = this.da(this.y1);
                 }
                 break;
             case "XColumn":
-                this.vs.c0.g$i();
+                this.w6.c0.g$i();
                 if (this.xAxis != null && !this.xAxis.c1()) {
-                    this.pr(this.fr && this.dp);
+                    this.qm(this.f0 && this.dv);
                 }
                 break;
             case ScatterBase.$$p[16]:
-                if (this.c7 != null) {
-                    this.c7.deregisterColumn(this.wd);
-                    this.wd = this.c4(this.xv);
+                if (this.dd != null) {
+                    this.dd.deregisterColumn(this.xr);
+                    this.xr = this.da(this.y9);
                 }
                 break;
             case "YColumn":
-                this.vs.c0.g$i();
+                this.w6.c0.g$i();
                 if (this.yAxis != null && !this.yAxis.c1()) {
-                    this.pr(this.fr && this.dp);
+                    this.qm(this.f0 && this.dv);
                 }
                 break;
             case ScatterBase.$$p[7]:
-                this.pr(false);
-                this.om();
+                this.qm(false);
+                this.ph();
                 break;
             case ScatterBase.$$p[8]:
-                this.pr(false);
-                this.om();
+                this.qm(false);
+                this.ph();
                 break;
             case "TransitionProgress":
-                this.vz.c(this.iw, this.vx, this.vv);
-                this.xx();
+                this.xd.c(this.i6, this.xb, this.w9);
+                this.zb();
                 try {
-                    if (this.dm(this.cg)) {
+                    if (this.dt(this.cl)) {
                         return;
                     }
-                    if ((Math.round(this.iw * 100000) / 100000) == 1) {
-                        this.yj(this.vv, this.vs);
+                    if ((Math.round(this.i6 * 100000) / 100000) == 1) {
+                        this.zx(this.w9, this.w6);
                     }
                     else {
-                        this.yj(this.vz, this.vs);
+                        this.zx(this.xd, this.w6);
                     }
-                    if (this.cv != null) {
-                        this.cv.or(this);
+                    if (this.c1 != null) {
+                        this.c1.p6(this);
                     }
                 }
                 finally {
-                    this.yk();
+                    this.zy();
                 }
                 break;
             case "TrendLineBrush":
-                this.pg(b);
+                this.qb(b);
                 break;
             case ScatterBase.$$p[0]:
-                if (this.vt != null) {
-                    this.vt.r = this;
+                if (this.w7 != null) {
+                    this.w7.r = this;
                 }
-                this.pr(false);
-                this.om();
+                this.qm(false);
+                this.ph();
                 break;
             case "TrendLineType":
-                this.om();
+                this.ph();
                 break;
             case ScatterBase.$$p[4]:
-                this.wg = this.wo();
-                this.pr(false);
+                this.xu = this.x2();
+                this.qm(false);
                 break;
             case ScatterBase.$$p[3]:
-                this.wf = this.wn();
-                this.pr(false);
+                this.xt = this.x1();
+                this.qm(false);
                 break;
             case ScatterBase.$$p[5]:
-                this.v1 = this.v2();
+                this.xf = this.xg();
                 break;
         }
     };
-    ScatterBase.prototype.wo = function () {
-        return this.wk;
+    ScatterBase.prototype.x2 = function () {
+        return this.xy;
     };
-    ScatterBase.prototype.wn = function () {
-        return this.wj;
+    ScatterBase.prototype.x1 = function () {
+        return this.xx;
     };
-    ScatterBase.prototype.wi = function (a) {
+    ScatterBase.prototype.xw = function (a) {
         if (typeCast(NumericYAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.wh = function (a) {
+    ScatterBase.prototype.xv = function (a) {
         if (typeCast(NumericXAxis.$, a) !== null) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.yk = function () {
-        this.ze = Rect.empty;
-        this.zf = Rect.empty;
+    ScatterBase.prototype.zy = function () {
+        this.aas = Rect.empty;
+        this.aat = Rect.empty;
     };
-    ScatterBase.prototype.xx = function () {
-        var a = this.getViewInfo(this.ze, this.zf);
-        this.ze = a.p0;
-        this.zf = a.p1;
+    ScatterBase.prototype.zb = function () {
+        var a = this.getViewInfo(this.aas, this.aat);
+        this.aas = a.p0;
+        this.aat = a.p1;
     };
-    ScatterBase.prototype.wm = function (a, b) {
+    ScatterBase.prototype.x0 = function (a, b) {
         if (b != 3) {
             return true;
         }
         if (a == null) {
             return true;
         }
-        if (this.xn == a || this.xv == a) {
+        if (this.y1 == a || this.y9 == a) {
             return true;
         }
         return false;
     };
-    ScatterBase.prototype.np = function (a, b, c, d) {
+    ScatterBase.prototype.oc = function (a, b, c, d) {
         var e = false;
-        if (!this.wm(d, a)) {
+        if (!this.x0(d, a)) {
             return;
         }
-        this.vs.c0.g$e(a, b, c, d);
+        this.w6.c0.g$e(a, b, c, d);
         if (this.xAxis != null && !this.xAxis.c1()) {
             e = true;
         }
@@ -509,29 +537,29 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             e = true;
         }
         if (a == 0 || a == 2 || a == 3 || a == 4) {
-            this.we = true;
+            this.xs = true;
         }
         else if (a == 1) {
             for (var f = b; f < b + c; f++) {
-                this.wt += this.wc.item(f);
-                this.wu += this.wd.item(f);
+                this.x7 += this.xq.item(f);
+                this.x8 += this.xr.item(f);
             }
-            this.wv = this.wt / this.wc.count;
-            this.ww = this.wu / this.wd.count;
+            this.x9 = this.x7 / this.xq.count;
+            this.ya = this.x8 / this.xr.count;
         }
         if (e) {
-            this.pr(true);
+            this.qm(true);
         }
     };
-    ScatterBase.prototype.yb = function (a) {
-        this.yc(a, null);
+    ScatterBase.prototype.zp = function (a) {
+        this.zq(a, null);
     };
-    ScatterBase.prototype.yc = function (a, b) {
+    ScatterBase.prototype.zq = function (a, b) {
         var e_1, _a, e_2, _b;
-        var c = this.wc != null ? this.wc.count : 0;
-        var d = this.wd != null ? this.wd.count : 0;
+        var c = this.xq != null ? this.xq.count : 0;
+        var d = this.xr != null ? this.xr.count : 0;
         var e = Math.min(c, d);
-        if (e <= this.w3) {
+        if (e <= this.yh) {
             a.m.clear();
             var f = new List$1(OwnedPoint.$, 0);
             try {
@@ -553,7 +581,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                         throw e_1.error;
                 }
             }
-            var h_1 = this.c7;
+            var h_1 = this.dd;
             f.aa(function (i, j) {
                 var k = h_1.indexOf(i.a);
                 var l = h_1.indexOf(j.a);
@@ -597,76 +625,76 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
     };
     ScatterBase.prototype.aq = function (a) {
-        if (a != null && a == this.xAxis && this.wc != null) {
-            return new AxisRange(this.wc.minimum, this.wc.maximum);
+        if (a != null && a == this.xAxis && this.xq != null) {
+            return new AxisRange(this.xq.minimum, this.xq.maximum);
         }
-        if (a != null && a == this.yAxis && this.wd != null) {
-            return new AxisRange(this.wd.minimum, this.wd.maximum);
+        if (a != null && a == this.yAxis && this.xr != null) {
+            return new AxisRange(this.xr.minimum, this.xr.maximum);
         }
         return null;
     };
-    ScatterBase.prototype.js = function (a) {
-        var b = this.i9(a);
-        if (this.c7 != null && b >= 0 && b < this.c7.count) {
-            return this.c7.item(b);
+    ScatterBase.prototype.j2 = function (a) {
+        var b = this.jj(a);
+        if (this.dd != null && b >= 0 && b < this.dd.count) {
+            return this.dd.item(b);
         }
         return null;
     };
-    Object.defineProperty(ScatterBase.prototype, "v1", {
+    Object.defineProperty(ScatterBase.prototype, "xf", {
         get: function () {
-            return this.v0;
+            return this.xe;
         },
         set: function (a) {
-            var b = this.v0;
-            this.v0 = a;
-            if (b != this.v0) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.v0));
+            var b = this.xe;
+            this.xe = a;
+            if (b != this.xe) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.xe));
             }
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.v2 = function () {
-        if (this.v3 != 0) {
-            return this.v3;
+    ScatterBase.prototype.xg = function () {
+        if (this.xh != 0) {
+            return this.xh;
         }
-        return this.wl ? 4 : 1;
+        return this.xz ? 4 : 1;
     };
-    ScatterBase.prototype.i9 = function (a) {
-        var b = truncate(Math.round(this.hw(a)));
+    ScatterBase.prototype.jj = function (a) {
+        var b = truncate(Math.round(this.h6(a)));
         return b;
     };
-    ScatterBase.prototype.hw = function (a) {
-        switch (this.v1) {
-            case 1: return this.wz(a);
-            case 3: return this.w0(a);
-            case 2: return this.wx(a);
-            case 4: return this.wy(a);
+    ScatterBase.prototype.h6 = function (a) {
+        switch (this.xf) {
+            case 1: return this.yd(a);
+            case 3: return this.ye(a);
+            case 2: return this.yb(a);
+            case 4: return this.yc(a);
         }
         return -1;
     };
-    ScatterBase.prototype.wy = function (a) {
-        return this.w1(a, false);
+    ScatterBase.prototype.yc = function (a) {
+        return this.yf(a, false);
     };
-    ScatterBase.prototype.wx = function (a) {
-        var b = this.te(a);
+    ScatterBase.prototype.yb = function (a) {
+        var b = this.up(a);
         var c = b.x;
         var d = b.y;
-        if (this.c7 == null || this.xAxis == null || this.yAxis == null || this.wc == null || this.wd == null) {
+        if (this.dd == null || this.xAxis == null || this.yAxis == null || this.xq == null || this.xr == null) {
             return -1;
         }
-        if (this.c7.count > this.w2) {
+        if (this.dd.count > this.yg) {
             return -1;
         }
-        this.x0();
-        var e = this.vh;
-        var f = this.vi;
+        this.ze();
+        var e = this.wv;
+        var f = this.ww;
         if (e == null || f == null) {
             return -1;
         }
         var g = 1.7976931348623157E+308;
         var h = -1;
-        for (var i = 0; i < this.wc.count; i++) {
+        for (var i = 0; i < this.xq.count; i++) {
             var j = e[i];
             var k = f[i];
             var l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -677,68 +705,68 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return h;
     };
-    ScatterBase.prototype.x0 = function () {
+    ScatterBase.prototype.ze = function () {
         var _this = this;
-        var a = this.cg.by;
-        var b = this.cg.bx;
+        var a = this.cl.by;
+        var b = this.cl.bx;
         var c = this.getEffectiveViewport();
-        if (this.vr == null) {
+        if (this.w5 == null) {
             return;
         }
-        var d = new ScalerParams(0, a, b, this.vr.d, c);
+        var d = new ScalerParams(0, a, b, this.w5.d, c);
         var e = ((function () {
-            var $ret = new ScalerParams(0, a, b, _this.vr.e, c);
-            $ret.b = _this.h3();
+            var $ret = new ScalerParams(0, a, b, _this.w5.e, c);
+            $ret.b = _this.id();
             return $ret;
         })());
-        if (this.vh == null || this.vi == null) {
-            var f = arrayShallowClone(this.wc.asArray());
-            var g = arrayShallowClone(this.wd.asArray());
+        if (this.wv == null || this.ww == null) {
+            var f = arrayShallowClone(this.xq.asArray());
+            var g = arrayShallowClone(this.xr.asArray());
             this.xAxis.hn(boxArray$1(f), 0, f.length, d);
             this.yAxis.hn(boxArray$1(g), 0, g.length, e);
-            this.vh = f;
-            this.vi = g;
+            this.wv = f;
+            this.ww = g;
         }
     };
-    ScatterBase.prototype.get_wl = function () {
+    ScatterBase.prototype.get_xz = function () {
         return false;
     };
-    Object.defineProperty(ScatterBase.prototype, "wl", {
+    Object.defineProperty(ScatterBase.prototype, "xz", {
         get: function () {
-            return this.get_wl();
+            return this.get_xz();
         },
         enumerable: false,
         configurable: true
     });
-    ScatterBase.prototype.w1 = function (a, b) {
-        if (!this.wl) {
+    ScatterBase.prototype.yf = function (a, b) {
+        if (!this.xz) {
             return -1;
         }
         var c = { $type: Point_$type, x: 0, y: 0 };
         var d = true;
-        var e = this.vw();
+        var e = this.xa();
         if (e == null) {
             return -1;
         }
         if (e.m == null) {
             return -1;
         }
-        if (this.c7 == null || this.c7.count > this.w2) {
+        if (this.dd == null || this.dd.count > this.yg) {
             return -1;
         }
-        this.x0();
-        var f = this.vh;
-        var g = this.vi;
+        this.ze();
+        var f = this.wv;
+        var g = this.ww;
         if (f == null || g == null) {
             return -1;
         }
-        var h = this.te(a);
+        var h = this.up(a);
         var i = 1.7976931348623157E+308;
         var j = -1;
-        for (var k = 0; k < this.vh.length; k++) {
-            var l = { $type: Point_$type, x: this.vh[k], y: this.vi[k] };
+        for (var k = 0; k < this.wv.length; k++) {
+            var l = { $type: Point_$type, x: this.wv[k], y: this.ww[k] };
             if (k > 0) {
-                if (!b || e.j.containsKey(this.c7.item(k)) || e.j.containsKey(this.c7.item(k - 1))) {
+                if (!b || e.j.containsKey(this.dd.item(k)) || e.j.containsKey(this.dd.item(k - 1))) {
                     var m = GeometryUtil.d(h, c, l);
                     if (m < i) {
                         i = m;
@@ -749,13 +777,13 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             c = l;
         }
         if (j >= 0) {
-            var n = { $type: Point_$type, x: this.vh[j], y: this.vi[j] };
-            var o = { $type: Point_$type, x: this.vh[j - 1], y: this.vi[j - 1] };
-            if (!b || (e.j.containsKey(this.c7.item(j)) && e.j.containsKey(this.c7.item(j - 1)))) {
+            var n = { $type: Point_$type, x: this.wv[j], y: this.ww[j] };
+            var o = { $type: Point_$type, x: this.wv[j - 1], y: this.ww[j - 1] };
+            if (!b || (e.j.containsKey(this.dd.item(j)) && e.j.containsKey(this.dd.item(j - 1)))) {
                 var p = GeometryUtil.i(h, o, n);
                 return (j - 1) + p;
             }
-            else if (e.j.containsKey(this.c7.item(j))) {
+            else if (e.j.containsKey(this.dd.item(j))) {
                 return j;
             }
             else {
@@ -764,22 +792,22 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.w0 = function (a) {
-        return this.w1(a, true);
+    ScatterBase.prototype.ye = function (a) {
+        return this.yf(a, true);
     };
-    ScatterBase.prototype.wz = function (a) {
+    ScatterBase.prototype.yd = function (a) {
         var _this = this;
         var b = null;
         var c = 1.7976931348623157E+308;
-        var d = this.te(a);
+        var d = this.up(a);
         var e = d.x;
         var f = d.y;
-        if (this.vs.c1.e > this.w2) {
+        if (this.w6.c1.e > this.yg) {
             return -1;
         }
-        this.vs.c8(function (g) {
+        this.w6.c8(function (g) {
             if (g._visibility == 0) {
-                var h = _this.vs.cs(g);
+                var h = _this.w6.cs(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);
@@ -794,22 +822,22 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return -1;
     };
-    ScatterBase.prototype.tj = function (a, b, c) {
+    ScatterBase.prototype.uu = function (a, b, c) {
         var _this = this;
-        if (this.xAxis == null || this.yAxis == null || this.wc == null || this.wd == null) {
+        if (this.xAxis == null || this.yAxis == null || this.xq == null || this.xr == null) {
             return { $type: Point_$type, x: NaN, y: NaN };
         }
-        var d = this.cg.by;
-        var e = this.cg.bx;
+        var d = this.cl.by;
+        var e = this.cl.bx;
         var f = this.getEffectiveViewport();
         var g = new ScalerParams(0, d, e, this.xAxis.ch, f);
         var h = ((function () {
             var $ret = new ScalerParams(0, d, e, _this.yAxis.ch, f);
-            $ret.b = _this.h3();
+            $ret.b = _this.id();
             return $ret;
         })());
         if (b) {
-            var i = this.hw(a);
+            var i = this.h6(a);
             if (i == -1) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
@@ -821,52 +849,52 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             if (k < 0) {
                 k = 0;
             }
-            if (k > this.c7.count - 1) {
-                k = this.c7.count - 1;
+            if (k > this.dd.count - 1) {
+                k = this.dd.count - 1;
             }
-            if (j > this.c7.count - 1) {
-                j = this.c7.count - 1;
+            if (j > this.dd.count - 1) {
+                j = this.dd.count - 1;
             }
             if (k == j) {
-                var l = this.xAxis.ej(this.wc.item(j), g);
-                var m = this.yAxis.ej(this.wd.item(j), h);
+                var l = this.xAxis.ej(this.xq.item(j), g);
+                var m = this.yAxis.ej(this.xr.item(j), h);
                 return { $type: Point_$type, x: l, y: m };
             }
             var n = i - Math.floor(i);
-            var o = this.xAxis.ej(this.wc.item(j), g);
-            var p = this.yAxis.ej(this.wd.item(j), h);
-            var q = this.xAxis.ej(this.wc.item(k), g);
-            var r = this.yAxis.ej(this.wd.item(k), h);
+            var o = this.xAxis.ej(this.xq.item(j), g);
+            var p = this.yAxis.ej(this.xr.item(j), h);
+            var q = this.xAxis.ej(this.xq.item(k), g);
+            var r = this.yAxis.ej(this.xr.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.i9(a);
+            var u = this.jj(a);
             if (u == -1) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            var v = this.xAxis.ej(this.wc.item(u), g);
-            var w = this.yAxis.ej(this.wd.item(u), h);
+            var v = this.xAxis.ej(this.xq.item(u), g);
+            var w = this.yAxis.ej(this.xr.item(u), h);
             return { $type: Point_$type, x: v, y: w };
         }
     };
-    ScatterBase.prototype.fp = function (a) {
+    ScatterBase.prototype.fx = function (a) {
         var _this = this;
-        var b = this.cv != null ? this.cv.tr : Rect.empty;
+        var b = this.c1 != null ? this.c1.vh : Rect.empty;
         b = b.copy();
-        var c = this.cv != null ? this.cv.t6 : Rect.empty;
+        var c = this.c1 != null ? this.c1.vw : Rect.empty;
         var d = new Rect(0, 0, 0, 1, 1);
-        var e = this.ts(this.cg);
+        var e = this.u3(this.cl);
         var f = new ScalerParams(0, d, d, this.xAxis.ch, e);
         var g = ((function () {
             var $ret = new ScalerParams(0, d, d, _this.yAxis.ch, e);
-            $ret.b = _this.h3();
+            $ret.b = _this.id();
             return $ret;
         })());
-        var h = !b.isEmpty && !c.isEmpty && this.c7 != null ? this.c7.indexOf(a) : -1;
-        var i = this.xAxis != null && this.wc != null && h < this.wc.count ? this.xAxis.ej(this.wc.item(h), f) : NaN;
-        var j = this.yAxis != null && this.wd != null && h < this.wd.count ? this.yAxis.ej(this.wd.item(h), g) : NaN;
+        var h = !b.isEmpty && !c.isEmpty && this.dd != null ? this.dd.indexOf(a) : -1;
+        var i = this.xAxis != null && this.xq != null && h < this.xq.count ? this.xAxis.ej(this.xq.item(h), f) : NaN;
+        var j = this.yAxis != null && this.xr != null && h < this.xr.count ? this.yAxis.ej(this.xr.item(h), g) : NaN;
         if (!isNaN_(i)) {
             if (i < b.left + 0.1 * b.width) {
                 i = i + 0.4 * b.width;
@@ -887,58 +915,58 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 b.y = j - 0.5 * b.height;
             }
         }
-        if (this.co != null) {
-            this.co.au(this.cv, b, true);
+        if (this.ct != null) {
+            this.ct.au(this.c1, b, true);
         }
         return h >= 0;
     };
-    ScatterBase.prototype.qo = function (a, b) {
-        this.pr(false);
+    ScatterBase.prototype.rj = function (a, b) {
+        this.qm(false);
     };
-    ScatterBase.prototype.qp = function (a, b) {
-        this.pr(false);
+    ScatterBase.prototype.rk = function (a, b) {
+        this.qm(false);
     };
-    ScatterBase.prototype.vw = function () {
-        var a = this.vv;
-        if (this.dk()) {
-            if (this.cw.g) {
-                this.cw.t();
+    ScatterBase.prototype.xa = function () {
+        var a = this.w9;
+        if (this.dr()) {
+            if (this.c2.g) {
+                this.c2.t();
             }
-            a = this.vz;
+            a = this.xd;
         }
         return a;
     };
-    ScatterBase.prototype.xy = function (a, b, c, d, e) {
+    ScatterBase.prototype.zc = function (a, b, c, d, e) {
         var _this = this;
         b.g = new Dictionary$2(Base.$, OwnedPoint.$, 1, c);
         var f = this.getEffectiveViewport1(a);
-        var g = this.c7;
+        var g = this.dd;
         var h;
         var i;
         var j = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.vr.d, f);
+            var $ret = new ScalerParams(0, d, e, _this.w5.d, f);
             $ret.c = _this.getEffectiveViewport1(a);
             return $ret;
         })());
         var k = ((function () {
-            var $ret = new ScalerParams(0, d, e, _this.vr.e, f);
+            var $ret = new ScalerParams(0, d, e, _this.w5.e, f);
             $ret.c = _this.getEffectiveViewport1(a);
-            $ret.b = _this.h3();
+            $ret.b = _this.id();
             return $ret;
         })());
         var l = false;
         var m = 0;
-        if (this.cv != null) {
-            if (this.cv.fc()) {
-                var n = this.cv.lp(d, j);
+        if (this.c1 != null) {
+            if (this.c1.fx()) {
+                var n = this.c1.mp(d, j);
                 l = n.c;
                 m = n.d;
             }
         }
         var _loop_1 = function (o) {
-            h = this_1.wc.item(o);
-            i = this_1.wd.item(o);
-            var p = { $type: Point_$type, x: this_1.vr.a.ej(h, j), y: this_1.vr.b.ej(i, k) };
+            h = this_1.xq.item(o);
+            i = this_1.xr.item(o);
+            var p = { $type: Point_$type, x: this_1.w5.a.ej(h, j), y: this_1.w5.b.ej(i, k) };
             if (l) {
                 if (p.x < e.left || p.x > e.right) {
                     if (p.x + m >= e.left && p.x + m <= e.right) {
@@ -966,17 +994,17 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             _loop_1(o);
         }
     };
-    ScatterBase.prototype.x8 = function (a, b) {
+    ScatterBase.prototype.zm = function (a, b) {
         var _this = this;
-        this.vh = null;
-        this.vi = null;
+        this.wv = null;
+        this.ww = null;
         a.j.clear();
         a.n.clear();
         a.h.clear();
         a.l.clear();
         a.i.clear();
         a.k.clear();
-        var c = Math.min(this.wc != null ? this.wc.count : 0, this.wd != null ? this.wd.count : 0);
+        var c = Math.min(this.xq != null ? this.xq.count : 0, this.xr != null ? this.xr.count : 0);
         var d = b.by;
         var e = b.bx;
         var f = this.getEffectiveViewport1(b);
@@ -984,64 +1012,64 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         g.c = this.getEffectiveViewport1(b);
         var h = ((function () {
             var $ret = new ScalerParams(0, d, e, _this.yAxis.ch, f);
-            $ret.b = _this.h3();
+            $ret.b = _this.id();
             return $ret;
         })());
         h.c = this.getEffectiveViewport1(b);
         if (c < 1) {
             return;
         }
-        this.vr = ((function () {
+        this.w5 = ((function () {
             var $ret = new ScatterAxisInfoCache();
             $ret.a = _this.xAxis;
             $ret.b = _this.yAxis;
             $ret.d = _this.xAxis.ch;
             $ret.e = _this.yAxis.ch;
-            $ret.c = _this.c7;
+            $ret.c = _this.dd;
             return $ret;
         })());
         var i = b;
-        if (c <= this.w3) {
-            this.xy(i, a, c, d, e);
+        if (c <= this.yh) {
+            this.zc(i, a, c, d, e);
         }
-        if (this.ue()) {
-            b.cy.l(a.j, this.w3, d, e, this.hk);
+        if (this.vr()) {
+            b.cy.l(a.j, this.yh, d, e, this.hu);
         }
         var j = ((function () {
             var $ret = new Clipper(0, e, false);
             $ret.i = a.n;
             return $ret;
         })());
-        var k = this.tq(b);
+        var k = this.u1(b);
         var l = this.xAxis.em(k.left, g);
         var m = this.xAxis.em(k.right, g);
-        b.c0.h(a.n, this.trendLineType, this.wc, this.wd, this.trendLinePeriod, function (n) { return _this.xAxis.ej(n, g); }, function (n) { return _this.yAxis.ej(n, h); }, ((function () {
+        b.c0.h(a.n, this.trendLineType, this.xq, this.xr, this.trendLinePeriod, function (n) { return _this.xAxis.ej(n, g); }, function (n) { return _this.yAxis.ej(n, h); }, ((function () {
             var $ret = new TrendResolutionParams();
-            $ret.d = _this.hk;
+            $ret.d = _this.hu;
             $ret.h = e;
             $ret.i = d;
             return $ret;
         })()), j, l, m);
-        this.x6(a, b);
+        this.zk(a, b);
     };
-    ScatterBase.prototype.nk = function (a, b) {
-        _super.prototype.nk.call(this, a, b);
+    ScatterBase.prototype.n7 = function (a, b) {
+        _super.prototype.n7.call(this, a, b);
         var c = b;
         c.c7(a);
     };
-    ScatterBase.prototype.get_et = function () {
+    ScatterBase.prototype.get_ez = function () {
         return true;
     };
-    ScatterBase.prototype.v6 = function (a, b, c) {
+    ScatterBase.prototype.xk = function (a, b, c) {
         return null;
     };
-    ScatterBase.prototype.v7 = function (a, b, c) {
-        var d = this.vw();
-        var e = this.vs.b1(this.te(b));
+    ScatterBase.prototype.xl = function (a, b, c) {
+        var d = this.xa();
+        var e = this.w6.b1(this.up(b));
         var f = -1;
         if (e == null) {
             if (a != null) {
-                f = this.c7.indexOf(a);
+                f = this.dd.indexOf(a);
             }
             else {
                 return null;
@@ -1064,11 +1092,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return g;
     };
-    ScatterBase.prototype.t0 = function (a, b) {
-        if (this.uc != 1 && this.uc != 13) {
-            var c = this.ub.ct();
-            var d = (c.width / 2) + (this.uh / 2);
-            var e = (c.height / 2) + (this.uh / 2);
+    ScatterBase.prototype.vb = function (a, b) {
+        if (this.vn != 1 && this.vn != 13) {
+            var c = this.vl.ct();
+            var d = (c.width / 2) + (this.vu / 2);
+            var e = (c.height / 2) + (this.vu / 2);
             var f = d;
             var g = d;
             var h = e;
@@ -1089,53 +1117,53 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return new Thickness(1, 0, 0, 0, 0);
     };
-    ScatterBase.prototype.v5 = function (a, b, c) {
+    ScatterBase.prototype.xj = function (a, b, c) {
         var d = new HighlightingInfo();
         d.i = this;
         d.g = 0;
-        d.f = this.c7.count - 1;
+        d.f = this.dd.count - 1;
         d.c = true;
         if (c != null && c.g == d.g && c.f == d.f) {
             return c;
         }
         return d;
     };
-    ScatterBase.prototype.c0 = function (a, b, c) {
-        if (this.dv && this.fd(this.bp) && !c) {
-            var d = this.v6(a, b, this.v8);
-            this.v8 = d;
+    ScatterBase.prototype.c6 = function (a, b, c) {
+        if (this.d1 && this.fk(this.bo) && !c) {
+            var d = this.xk(a, b, this.xm);
+            this.xm = d;
             return d;
         }
         else {
-            var e = this.v5(a, b, this.v8);
-            this.v8 = e;
+            var e = this.xj(a, b, this.xm);
+            this.xm = e;
             return e;
         }
     };
-    ScatterBase.prototype.c1 = function (a, b, c) {
-        if (this.fd(this.bp) && !c) {
-            var d = this.v7(a, b, this.v9);
-            this.v9 = d;
+    ScatterBase.prototype.c7 = function (a, b, c) {
+        if (this.fk(this.bo) && !c) {
+            var d = this.xl(a, b, this.xn);
+            this.xn = d;
             return d;
         }
         else {
-            var e = this.v5(a, b, this.v9);
+            var e = this.xj(a, b, this.xn);
             e.d = true;
-            this.v9 = e;
+            this.xn = e;
             return e;
         }
     };
-    ScatterBase.prototype.wq = function () {
-        return (this.assigningScatterStyle != null && this.wg) || (this.bp != 1);
+    ScatterBase.prototype.x4 = function () {
+        return (this.assigningScatterStyle != null && this.xu) || (this.bo != 1) || (this.cf != 1) || (this.ce != 1);
     };
-    ScatterBase.prototype.wp = function () {
-        return (this.assigningScatterMarkerStyle != null && this.wf) || (this.bp != 1);
+    ScatterBase.prototype.x3 = function () {
+        return (this.assigningScatterMarkerStyle != null && this.xt) || (this.bo != 1) || (this.cf != 1) || (this.ce != 1);
     };
-    ScatterBase.prototype.yj = function (a, b) {
+    ScatterBase.prototype.zx = function (a, b) {
         var _this = this;
-        this.oy();
+        this.pt();
         var c = b.bx;
-        this.vr = ((function () {
+        this.w5 = ((function () {
             var $ret = new ScatterAxisInfoCache();
             $ret.a = _this.xAxis;
             $ret.b = _this.yAxis;
@@ -1143,10 +1171,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             $ret.e = _this.yAxis.ch;
             return $ret;
         })());
-        if (this.ue()) {
-            b.cy.j(a.j, this.ug);
-            if (this.wp()) {
-                this.xz(b, a);
+        if (this.vr()) {
+            b.cy.j(a.j, this.vt);
+            if (this.x3()) {
+                this.zd(b, a);
             }
         }
         b.cp();
@@ -1156,31 +1184,31 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             return $ret;
         })());
         b.c0.g$h(a.n, d);
-        this.yg(a, b);
+        this.zu(a, b);
     };
-    ScatterBase.prototype.vk = function (a, b) {
-        return this.vl(a, b);
+    ScatterBase.prototype.wy = function (a, b) {
+        return this.wz(a, b);
     };
-    ScatterBase.prototype.vl = function (a, b) {
-        if (b < a || a < 0 || a > this.wc.count || b < 0 || b > this.wc.count) {
+    ScatterBase.prototype.wz = function (a, b) {
+        if (b < a || a < 0 || a > this.xq.count || b < 0 || b > this.xq.count) {
             return null;
         }
         var c = new Array((b - a) + 1);
         for (var d = a; d <= b; d++) {
             var e = d;
-            c[d - a] = this.c7.item(d);
+            c[d - a] = this.dd.item(d);
         }
         return c;
     };
-    ScatterBase.prototype.xz = function (a, b) {
+    ScatterBase.prototype.zd = function (a, b) {
         var _this = this;
         a.b6 = true;
-        this.v4.ay(this, this.wp(), runOn(this, this.vk));
-        var c = this.v4.d;
+        this.xi.ay(this, this.x3(), runOn(this, this.wy));
+        var c = this.xi.d;
         var d = c != null;
         var e = this.getEffectiveViewport1(a);
-        var f = this.c7 == null ? 0 : this.c7.count;
-        this.vs.ci(function (g) {
+        var f = this.dd == null ? 0 : this.dd.count;
+        this.w6.ci(function (g) {
             if (g._visibility == 0) {
                 var h = g.ak;
                 var i = g.content;
@@ -1189,64 +1217,99 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     g.content = i;
                 }
                 if (d) {
-                    _this.x3(h, f, a.q);
+                    _this.zh(h, f, a.q);
                 }
-                _this.v4.ac(g, i);
+                _this.xi.ac(g, i);
             }
         });
     };
-    ScatterBase.prototype.x4 = function (a, b, c) {
-        var d = this.bp != 1;
-        this.v4.a0(this.v4.b, a, b, false);
-        this.v4.ab(this.hi);
-        var e = this.v4.ax;
-        var f = null;
-        var g = this.c7;
-        if (d && this.cv != null) {
-            f = this.cv.c2.getHighlightingInfo(this, g, e.o, e.n, false);
-            e.b = f;
-        }
-        e.f = c;
-        this.ye(e);
-        this.v4.z(this, f, c, d, a < 0);
-    };
-    ScatterBase.prototype.x3 = function (a, b, c) {
-        var d = this.bp != 1;
-        this.v4.a0(this.v4.d, a, b, true);
-        this.v4.aa(this.hi);
-        var e = this.v4.aw;
-        var f = null;
-        var g = this.c7;
+    ScatterBase.prototype.zi = function (a, b, c) {
+        var d = this.bo != 1;
+        var e = this.cf != 1;
+        var f = this.ce != 1;
+        this.xi.a0(this.xi.b, a, b, false);
+        this.xi.ab(this.hs);
+        var g = this.xi.ax;
         var h = null;
-        if (d && this.cv != null) {
-            f = this.cv.c2.getHighlightingInfo(this, g, e.o, e.n, true);
-            if (this.cv.c2.isCrossContextHighlight(this)) {
-                h = this.cv.c2.getHighlightingInfo(this, g, e.o, e.n, true);
-            }
-            e.b = f;
-        }
-        e.f = c;
-        this.yd(e);
-        this.v4.y(this, f, c, d, e.m, this.cv.c2.totalHighlightingProgress);
-    };
-    ScatterBase.prototype.ye = function (a) {
-        if (this.assigningScatterStyle != null && this.wg) {
+        var i = null;
+        var j = null;
+        var k = this.dd;
+        if (d && this.c1 != null) {
+            h = this.c1.dj.getHighlightingInfo(this, k, g.z, g.y, false);
+            g.c = h;
+        }
+        if (e && this.c1 != null) {
+            h = this.c1.dk.getHighlightingInfo(this, k, g.z, g.y, false);
+            g.d = h;
+        }
+        if (f && this.c1 != null) {
+            h = this.c1.di.getHighlightingInfo(this, k, g.z, g.y, false);
+            g.b = h;
+        }
+        g.h = c;
+        this.zs(g);
+        this.xi.z(this, h, i, j, c, d, e, f, a < 0);
+    };
+    ScatterBase.prototype.zh = function (a, b, c) {
+        var d = this.bo != 1;
+        var e = this.cf != 1;
+        var f = this.ce != 1;
+        this.xi.a0(this.xi.d, a, b, true);
+        this.xi.aa(this.hs);
+        var g = this.xi.aw;
+        var h = null;
+        var i = null;
+        var j = null;
+        var k = this.dd;
+        var l = null;
+        var m = null;
+        var n = null;
+        if (d && this.c1 != null) {
+            h = this.c1.dj.getHighlightingInfo(this, k, g.z, g.y, true);
+            if (this.c1.dj.isCrossContextHighlight(this)) {
+                l = this.c1.dj.getHighlightingInfo(this, k, g.z, g.y, true);
+            }
+            g.c = h;
+        }
+        if (e && this.c1 != null) {
+            i = this.c1.dk.getHighlightingInfo(this, k, g.z, g.y, true);
+            if (i == null && this.be != null) {
+                i = this.c1.dk.getHighlightingInfo(this.be, this.be.dd, g.z, g.y, true);
+            }
+            if (this.c1.dk.isCrossContextHighlight(this)) {
+                m = this.c1.dk.getHighlightingInfo(this, k, g.z, g.y, true);
+            }
+            g.d = i;
+        }
+        if (f && this.c1 != null) {
+            j = this.c1.di.getHighlightingInfo(this, k, g.z, g.y, true);
+            if (this.c1.di.isCrossContextHighlight(this)) {
+                n = this.c1.di.getHighlightingInfo(this, k, g.z, g.y, true);
+            }
+            g.d = i;
+        }
+        g.h = c;
+        this.zr(g);
+        this.xi.y(this, h, i, j, c, d, e, f, g.v, this.c1.dj.totalHighWaterMark, g.x, this.c1.dk.totalHighWaterMark, g.t, this.c1.di.totalHighWaterMark);
+    };
+    ScatterBase.prototype.zs = function (a) {
+        if (this.assigningScatterStyle != null && this.xu) {
             this.assigningScatterStyle(this, a);
         }
     };
-    ScatterBase.prototype.yd = function (a) {
-        if (this.assigningScatterMarkerStyle != null && this.wf) {
+    ScatterBase.prototype.zr = function (a) {
+        if (this.assigningScatterMarkerStyle != null && this.xt) {
             this.assigningScatterMarkerStyle(this, a);
         }
     };
-    ScatterBase.prototype.x6 = function (a, b) {
+    ScatterBase.prototype.zk = function (a, b) {
         var e_3, _a;
         var c = new ErrorBarsHelper(this, b);
-        if (this.vt == null) {
+        if (this.w7 == null) {
             return;
         }
-        var d = this.vt.u;
-        var e = this.vt.v;
+        var d = this.w7.u;
+        var e = this.w7.v;
         var f = 0;
         var g = 0;
         var h = 0;
@@ -1258,35 +1321,35 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            var l = this.x9(k, c, d, h, i, true);
+                            var l = this.zn(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            var m = this.x7(k, c, d, h, i, true);
+                            var m = this.zl(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            var n = this.x5(k, c, d, j, h, i, true);
+                            var n = this.zj(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            var o = this.ya(c, d, f, h, i, true);
+                            var o = this.zo(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            var p = this.x7(k, c, d, h, i, true);
+                            var p = this.zl(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     var q = new OwnedPoint();
-                    q.c = c.l(d, this.vr.a, k.c, f);
+                    q.c = c.l(d, this.w5.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1294,35 +1357,35 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            var r = this.x9(k, c, e, h, i, false);
+                            var r = this.zn(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            var s = this.x7(k, c, e, h, i, false);
+                            var s = this.zl(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            var t = this.x5(k, c, e, j, h, i, false);
+                            var t = this.zj(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            var u = this.ya(c, e, g, h, i, false);
+                            var u = this.zo(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            var v = this.x7(k, c, e, h, i, false);
+                            var v = this.zl(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     var w = new OwnedPoint();
-                    w.c = c.m(e, this.vr.b, k.c, g);
+                    w.c = c.m(e, this.w5.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
@@ -1343,18 +1406,18 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.x9 = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.zn = function (a, b, c, d, e, f) {
         if (f) {
             var g = void 0;
             var h = void 0, i = void 0;
-            i = this.vr.a;
-            if (this.vt.s == 0) {
+            i = this.w5.a;
+            if (this.w7.s == 0) {
                 g = a.c.x;
-                h = this.vr.a;
+                h = this.w5.a;
             }
             else {
                 g = a.c.y;
-                h = this.vr.b;
+                h = this.w5.b;
             }
             var j = b.f(g, c, h, i, d, e);
             d = j.p4;
@@ -1363,14 +1426,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         else {
             var k = void 0;
             var l = void 0, m = void 0;
-            m = this.vr.b;
-            if (this.vt.t == 0) {
+            m = this.w5.b;
+            if (this.w7.t == 0) {
                 k = a.c.x;
-                l = this.vr.a;
+                l = this.w5.a;
             }
             else {
                 k = a.c.y;
-                l = this.vr.b;
+                l = this.w5.b;
             }
             var n = b.f(k, c, l, m, d, e);
             d = n.p4;
@@ -1381,14 +1444,14 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.x7 = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.zl = function (a, b, c, d, e, f) {
         if (f) {
-            var g = b.j(a.c.x, c, this.vr.a, d, e);
+            var g = b.j(a.c.x, c, this.w5.a, d, e);
             d = g.p3;
             e = g.p4;
         }
         else {
-            var h = b.j(a.c.y, c, this.vr.b, d, e);
+            var h = b.j(a.c.y, c, this.w5.b, d, e);
             d = h.p3;
             e = h.p4;
         }
@@ -1397,18 +1460,18 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.x5 = function (a, b, c, d, e, f, g) {
+    ScatterBase.prototype.zj = function (a, b, c, d, e, f, g) {
         var h = c.getItemColumn();
-        var i = this.c7.indexOf(d);
+        var i = this.dd.indexOf(d);
         if (h != null && i < h.count) {
             var j = h.item(i);
             if (g) {
-                var k = b.h(a.c.x, j, this.vr.a, e, f);
+                var k = b.h(a.c.x, j, this.w5.a, e, f);
                 e = k.p3;
                 f = k.p4;
             }
             else {
-                var l = b.h(a.c.y, j, this.vr.b, e, f);
+                var l = b.h(a.c.y, j, this.w5.b, e, f);
                 e = l.p3;
                 f = l.p4;
             }
@@ -1422,16 +1485,16 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p5: f
         };
     };
-    ScatterBase.prototype.ya = function (a, b, c, d, e, f) {
+    ScatterBase.prototype.zo = 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.vr.a, d, e);
+            var h = a.k(c, b, this.w5.a, d, e);
             d = h.p3;
             e = h.p4;
         }
         else {
-            var i = a.k(c, b, this.vr.b, d, e);
+            var i = a.k(c, b, this.w5.b, d, e);
             d = i.p3;
             e = i.p4;
         }
@@ -1441,20 +1504,20 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             p4: e
         };
     };
-    ScatterBase.prototype.yg = function (a, b) {
-        if (!b.o() || this.vt == null) {
+    ScatterBase.prototype.zu = function (a, b) {
+        if (!b.o() || this.w7 == null) {
             b.c9();
             return;
         }
-        this.yh(a, b);
-        this.yi(a, b);
+        this.zv(a, b);
+        this.zw(a, b);
     };
-    ScatterBase.prototype.yh = function (a, b) {
+    ScatterBase.prototype.zv = function (a, b) {
         var e_4, _a;
         b.c5();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.vt.u;
+        var e = this.w7.u;
         try {
             for (var _b = __values(fromEnum(a.j.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1463,10 +1526,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     var h = a.i.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         var i = a.h.item(f).c;
-                        if (this.vt.o == 1 || this.vt.o == 2) {
+                        if (this.w7.o == 1 || this.w7.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.vt.o == 1 || this.vt.o == 3) {
+                        if (this.w7.o == 1 || this.w7.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1488,12 +1551,12 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         b.da(d);
     };
-    ScatterBase.prototype.yi = function (a, b) {
+    ScatterBase.prototype.zw = function (a, b) {
         var e_5, _a;
         b.c6();
         var c = new ErrorBarsHelper(this, b);
         var d = new PathGeometry();
-        var e = this.vt.v;
+        var e = this.w7.v;
         try {
             for (var _b = __values(fromEnum(a.j.keys)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var f = _c.value;
@@ -1502,10 +1565,10 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                     var h = a.k.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         var i = a.l.item(f).c;
-                        if (this.vt.p == 1 || this.vt.p == 2) {
+                        if (this.w7.p == 1 || this.w7.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.vt.p == 1 || this.vt.p == 3) {
+                        if (this.w7.p == 1 || this.w7.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
@@ -1526,107 +1589,107 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.gm = function (a, b, c) {
+    ScatterBase.prototype.gw = function (a, b, c) {
         var d = true;
-        if (!_super.prototype.gm.call(this, a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.wc == null || this.wd == null || this.wc.count == 0 || this.wd.count == 0 || this.c7 == null || this.c7.count != this.wc.count || this.c7.count != this.wd.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.lx == this.xAxis.lw || this.yAxis.lx == this.yAxis.lw) {
+        if (!_super.prototype.gw.call(this, a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.xq == null || this.xr == null || this.xq.count == 0 || this.xr.count == 0 || this.dd == null || this.dd.count != this.xq.count || this.dd.count != this.xr.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.lx == this.xAxis.lw || this.yAxis.lx == this.yAxis.lw) {
             d = false;
         }
         return d;
     };
     ScatterBase.prototype.getViewInfo = function (a, b) {
-        if (!this.ze.isEmpty && !this.zf.isEmpty) {
-            a = this.ze;
-            b = this.zf;
+        if (!this.aas.isEmpty && !this.aat.isEmpty) {
+            a = this.aas;
+            b = this.aat;
             return {
                 p0: a,
                 p1: b
             };
         }
-        a = this.cg.bx;
-        b = this.cg.by;
+        a = this.cl.bx;
+        b = this.cl.by;
         return {
             p0: a,
             p1: b
         };
     };
-    ScatterBase.prototype.ps = function (a) {
-        _super.prototype.ps.call(this, a);
-        this.xx();
+    ScatterBase.prototype.qn = function (a) {
+        _super.prototype.qn.call(this, a);
+        this.zb();
         try {
-            if (this.dm(this.cg)) {
+            if (this.dt(this.cl)) {
                 return;
             }
-            if (this.c7 != null && this.c7.count > this.w3) {
+            if (this.dd != null && this.dd.count > this.yh) {
                 a = false;
             }
-            if (this.fq(a) && !this.f1) {
-                var b = this.vx;
-                if (this.dk()) {
-                    if (this.cw.g) {
-                        this.cw.t();
+            if (this.fz(a) && !this.gb) {
+                var b = this.xb;
+                if (this.dr()) {
+                    if (this.c2.g) {
+                        this.c2.t();
                     }
-                    this.vx = this.vz;
-                    this.vz = b;
+                    this.xb = this.xd;
+                    this.xd = b;
                 }
                 else {
-                    this.vx = this.vv;
-                    this.vv = b;
+                    this.xb = this.w9;
+                    this.w9 = b;
                 }
-                this.x8(this.vv, this.vs);
-                this.p5();
+                this.zm(this.w9, this.w6);
+                this.q0();
             }
             else {
-                if (!this.f1) {
-                    this.x8(this.vv, this.vs);
+                if (!this.gb) {
+                    this.zm(this.w9, this.w6);
                 }
-                this.yj(this.vv, this.vs);
+                this.zx(this.w9, this.w6);
             }
         }
         finally {
-            this.yk();
+            this.zy();
         }
     };
-    ScatterBase.prototype.qf = function () {
-        _super.prototype.qf.call(this);
+    ScatterBase.prototype.ra = function () {
+        _super.prototype.ra.call(this);
         if (this.index < 0) {
             return;
         }
-        this.vs.dd();
+        this.w6.dd();
     };
-    ScatterBase.prototype.pt = function (a, b) {
-        _super.prototype.pt.call(this, a, b);
-        if (!this.f9) {
-            this.cg.a4(b);
+    ScatterBase.prototype.qo = function (a, b) {
+        _super.prototype.qo.call(this, a, b);
+        if (!this.gj) {
+            this.cl.a4(b);
             return;
         }
-        this.cg.a4(b);
-        if (this.dm(this.cf)) {
+        this.cl.a4(b);
+        if (this.dt(this.ck)) {
             return;
         }
-        var c = typeCast(ScatterBaseView.$, this.cf);
-        if (!this.f2) {
-            this.vy = new ScatterFrame();
-            this.x8(this.vy, c);
+        var c = typeCast(ScatterBaseView.$, this.ck);
+        if (!this.gc) {
+            this.xc = new ScatterFrame();
+            this.zm(this.xc, c);
         }
-        this.f2 = false;
-        this.yj(this.vy, c);
-        this.f9 = false;
+        this.gc = false;
+        this.zx(this.xc, c);
+        this.gj = false;
     };
-    ScatterBase.prototype.pq = function (a, b, c, d, e) {
-        _super.prototype.pq.call(this, a, b, c, d, e);
-        var f = this.a3.a$h.item(d);
+    ScatterBase.prototype.ql = function (a, b, c, d, e) {
+        _super.prototype.ql.call(this, a, b, c, d, e);
+        var f = this.a2.a$i.item(d);
         var g = f;
         f.a3(c);
-        if (this.dm(g)) {
+        if (this.dt(g)) {
             return;
         }
-        if (this.vu == null) {
-            this.vu = new ScatterFrame();
+        if (this.w8 == null) {
+            this.w8 = new ScatterFrame();
         }
-        this.x8(this.vu, g);
-        this.yj(this.vu, g);
+        this.zm(this.w8, g);
+        this.zx(this.w8, g);
     };
-    ScatterBase.prototype.yf = function (a, b) {
+    ScatterBase.prototype.zt = function (a, b) {
         var e_6, _a, e_7, _b;
         var c = new List$1(Base.$, 0);
         try {
@@ -1670,11 +1733,11 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
     };
-    ScatterBase.prototype.vj = function (a, b, c, d, e) {
+    ScatterBase.prototype.wx = function (a, b, c, d, e) {
         var _this = this;
-        if (c == null || c.length != this.vr.c.count) {
-            c = new Array(this.vr.c.count);
-            for (var f = 0; f < this.vr.c.count; f++) {
+        if (c == null || c.length != this.w5.c.count) {
+            c = new Array(this.w5.c.count);
+            for (var f = 0; f < this.w5.c.count; f++) {
                 c[f] = PointUtil.create();
             }
         }
@@ -1687,37 +1750,37 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         var i = ((function () {
             var $ret = new ScalerParams(0, d, e, _this.yAxis.ch, g);
             $ret.c = _this.getEffectiveViewport1(a);
-            $ret.b = _this.h3();
+            $ret.b = _this.id();
             return $ret;
         })());
-        var j = this.tq(a);
-        var k = this.vr.a.em(j.left, h);
-        var l = this.vr.a.em(j.right, h);
-        var m = this.vr.b.em(j.bottom, i);
-        var n = this.vr.b.em(j.top, i);
-        if (this.vr.d) {
+        var j = this.u1(a);
+        var k = this.w5.a.em(j.left, h);
+        var l = this.w5.a.em(j.right, h);
+        var m = this.w5.b.em(j.bottom, i);
+        var n = this.w5.b.em(j.top, i);
+        if (this.w5.d) {
             var o = k;
             k = l;
             l = o;
         }
-        if (this.vr.e) {
+        if (this.w5.e) {
             var p = m;
             m = n;
             n = p;
         }
-        var q = this.vr;
+        var q = this.w5;
         var r = q.a;
         var s = q.b;
         var t;
         var u;
-        var v = this.wc;
-        var w = this.wd;
+        var v = this.xq;
+        var w = this.xr;
         var x = false;
         var y = 0;
         var z = 0;
-        if (this.cv != null) {
-            if (this.cv.fc()) {
-                var aa = this.cv.lp(d, h);
+        if (this.c1 != null) {
+            if (this.c1.fx()) {
+                var aa = this.c1.mp(d, h);
                 x = aa.c;
                 y = aa.d;
                 z = r.em(0 + y, h);
@@ -1725,7 +1788,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
                 z -= ab;
             }
         }
-        for (var ac = 0; ac < this.vr.c.count; ac++) {
+        for (var ac = 0; ac < this.w5.c.count; ac++) {
             t = v.item(ac);
             u = w.item(ac);
             if (x) {
@@ -1757,7 +1820,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return c;
     };
-    ScatterBase.prototype.ws = function (a, b) {
+    ScatterBase.prototype.x6 = function (a, b) {
         var e_8, _a;
         if (b == null) {
             b = new List$1(Number_$type, 2, a.e);
@@ -1766,7 +1829,7 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
             b.clear();
         }
         var c = 0;
-        var d = this.c7;
+        var d = this.dd;
         try {
             for (var _b = __values(fromEnum(a.c)), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var e = _c.value;
@@ -1788,56 +1851,56 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         return b;
     };
-    ScatterBase.prototype.n2 = function (a) {
-        _super.prototype.n2.call(this, a);
-        this.a5.exportTrendlineData(this, a, this.vs.c0.g$j);
+    ScatterBase.prototype.ow = function (a) {
+        _super.prototype.ow.call(this, a);
+        this.a4.exportTrendlineData(this, a, this.w6.c0.g$j);
     };
-    ScatterBase.prototype.h3 = function () {
-        return Series.h4(this.wd, null);
+    ScatterBase.prototype.id = function () {
+        return Series.ie(this.xr, null);
     };
     ScatterBase.prototype.getDataLegendSeriesContextAt = function (a, b) {
         var c = { $type: Point_$type, x: a, y: b };
-        var d = this.js(c);
-        var e = d == null ? NaN : this.h2(d, "XMemberPath");
-        var f = d == null ? NaN : this.h2(d, "YMemberPath");
+        var d = this.j2(c);
+        var e = d == null ? NaN : this.ic(d, "XMemberPath");
+        var f = d == null ? NaN : this.ic(d, "YMemberPath");
         var g = new DataLegendSeriesValueInfo();
         g.l = e;
         g.a = 13;
-        g.p = "X";
-        g.q = this.xn != null ? this.xn : "X";
-        g.r = this.xj != null ? this.xj : "X:";
-        g.s = this.xl != null ? this.xl : "";
+        g.q = "X";
+        g.r = this.y1 != null ? this.y1 : "X";
+        g.s = this.yx != null ? this.yx : "X:";
+        g.t = this.yz != null ? this.yz : "";
         var h = new DataLegendSeriesValueInfo();
         h.l = f;
         h.a = 14;
-        h.p = "Y";
-        h.q = this.xv != null ? this.xv : "Y";
-        h.r = this.xr != null ? this.xr : "Y:";
-        h.s = this.xt != null ? this.xt : "";
+        h.q = "Y";
+        h.r = this.y9 != null ? this.y9 : "Y";
+        h.s = this.y5 != null ? this.y5 : "Y:";
+        h.t = this.y7 != null ? this.y7 : "";
         var i = new DataLegendSeriesContext();
-        i.f = ((function () {
+        i.e = ((function () {
             var $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
             $ret.add(g);
             $ret.add(h);
             return $ret;
         })());
-        i.b = this.aw();
+        i.h = this.lh();
         return i;
     };
-    ScatterBase.prototype.yl = function () {
-        if (this.we) {
-            this.wt = 0;
-            this.wu = 0;
-            for (var a = 0; a < this.wc.count; a++) {
-                this.wt += this.wc.item(a);
-                this.wu += this.wd.item(a);
+    ScatterBase.prototype.zz = function () {
+        if (this.xs) {
+            this.x7 = 0;
+            this.x8 = 0;
+            for (var a = 0; a < this.xq.count; a++) {
+                this.x7 += this.xq.item(a);
+                this.x8 += this.xr.item(a);
             }
-            this.wv = this.wt / this.wc.count;
-            this.ww = this.wu / this.wd.count;
-            this.we = false;
+            this.x9 = this.x7 / this.xq.count;
+            this.ya = this.x8 / this.xr.count;
+            this.xs = false;
         }
     };
-    ScatterBase.prototype.id = function (a, b) {
+    ScatterBase.prototype.ip = function (a, b) {
         if (b == null || !b.cj) {
             return NaN;
         }
@@ -1858,43 +1921,43 @@ var ScatterBase = /** @class */ /*@__PURE__*/ (function (_super) {
         switch (a) {
             case 5:
             case 2:
-                b = this.wc.maximum;
-                c = this.wd.maximum;
+                b = this.xq.maximum;
+                c = this.xr.maximum;
                 break;
             case 4:
             case 1:
-                b = this.wc.minimum;
-                c = this.wd.minimum;
+                b = this.xq.minimum;
+                c = this.xr.minimum;
                 break;
             case 6:
             case 3:
-                if (this.we) {
-                    this.yl();
+                if (this.xs) {
+                    this.zz();
                 }
-                b = this.wv;
-                c = this.ww;
+                b = this.x9;
+                c = this.ya;
                 break;
         }
         return [b, c];
     };
-    ScatterBase.prototype.tn = function (a) {
-        var b = this.getEffectiveViewport1(this.cg);
-        var c = new ScalerParams(0, this.cg.by, this.cg.bx, this.xAxis.ch, b);
+    ScatterBase.prototype.uy = function (a) {
+        var b = this.getEffectiveViewport1(this.cl);
+        var c = new ScalerParams(0, this.cl.by, this.cl.bx, this.xAxis.ch, b);
         c.c = b;
         var d = isNaN_(a[0]) ? NaN : this.xAxis.ej(a[0], c);
-        c = new ScalerParams(0, this.cg.by, this.cg.bx, this.yAxis.ch, b);
-        c.b = this.h3();
+        c = new ScalerParams(0, this.cl.by, this.cl.bx, this.yAxis.ch, b);
+        c.b = this.id();
         c.c = b;
         var e = isNaN_(a[1]) ? NaN : this.yAxis.ej(a[1], c);
         return { $type: Point_$type, x: d, y: e };
     };
-    ScatterBase.prototype.tm = function (a) {
+    ScatterBase.prototype.ux = function (a) {
         var b = this.am(a);
-        return this.tn(b);
+        return this.uy(b);
     };
     ScatterBase.$t = markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.ym = 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:vt:yn', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:w7:yo', [2, null], 'HighlightedYMemberPath:w9:yp', [2, null], 'IsCustomScatterMarkerStyleAllowed:wj:yq', [0, false], 'IsCustomScatterStyleAllowed:wk:yr', [0, false], 'ItemSearchMode:v3:ys', [ScatterItemSearchMode_$type, enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:w2:yt', [1, 10000], 'MarkerCollisionAvoidance:vo:yu', [CollisionAvoidanceType_$type, enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:w3:yv', [1, 400], 'XAxis::y3', [NumericXAxis.$, null], 'XMemberAsLegendLabel:xj:y4', [2, null], 'XMemberAsLegendUnit:xl:y5', [2, null], 'XMemberPath:xn:y6', [2, null], 'YAxis::y7', [NumericYAxis.$, null], 'YMemberAsLegendLabel:xr:y8', [2, null], 'YMemberAsLegendUnit:xt:y9', [2, null], 'YMemberPath:xv:za', [2, null], 'TrendLineType::y1', [TrendLineType_$type, enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::y0', [1, 1.5], 'TrendLinePeriod::yz', [1, 7], 'TrendLineBrush::yw', [Brush.$, null], 'TrendLineZIndex:w4:y2', [1, 1001], 'TrendLineDashArray:zc:yx', [DoubleCollection.$], 'TrendLineDashCap:zd:yy', [PenLineCap_$type, enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.z0 = 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:w7:z1', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:yl:z2', [2, null], 'HighlightedYMemberPath:yn:z3', [2, null], 'IsCustomScatterMarkerStyleAllowed:xx:z4', [0, false], 'IsCustomScatterStyleAllowed:xy:z5', [0, false], 'ItemSearchMode:xh:z6', [ScatterItemSearchMode_$type, enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:yg:z7', [1, 10000], 'MarkerCollisionAvoidance:w2:z8', [CollisionAvoidanceType_$type, enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:yh:z9', [1, 400], 'XAxis::aah', [NumericXAxis.$, null], 'XMemberAsLegendLabel:yx:aai', [2, null], 'XMemberAsLegendUnit:yz:aaj', [2, null], 'XMemberPath:y1:aak', [2, null], 'YAxis::aal', [NumericYAxis.$, null], 'YMemberAsLegendLabel:y5:aam', [2, null], 'YMemberAsLegendUnit:y7:aan', [2, null], 'YMemberPath:y9:aao', [2, null], 'TrendLineType::aaf', [TrendLineType_$type, enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::aae', [1, 1.5], 'TrendLinePeriod::aad', [1, 7], 'TrendLineBrush::aaa', [Brush.$, null], 'TrendLineZIndex:yi:aag', [1, 1001], 'TrendLineDashArray:aaq:aab', [DoubleCollection.$], 'TrendLineDashCap:aar:aac', [PenLineCap_$type, enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 }(MarkerSeries));
 export { ScatterBase };
@@ -1925,19 +1988,19 @@ var ScatterSeriesRenderManager = /** @class */ /*@__PURE__*/ (function (_super)
     };
     ScatterSeriesRenderManager.prototype.a0 = function (a, b, c, d) {
         if (b == -1) {
-            a.c = false;
-            a.o = 0;
-            a.n = c - 1;
+            a.e = false;
+            a.z = 0;
+            a.y = c - 1;
         }
         else {
             if (d) {
-                a.o = b;
-                a.n = b;
+                a.z = b;
+                a.y = b;
             }
             else {
-                a.c = false;
-                a.o = b;
-                a.n = b;
+                a.e = false;
+                a.z = b;
+                a.y = b;
             }
         }
     };
@@ -1973,7 +2036,7 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         this.df = new Path();
         this.dg = new Path();
         if (!this.q) {
-            this.cz.w3 = 2000;
+            this.cz.yh = 2000;
         }
     };
     ScatterBaseView.prototype.dh = function (a) {
@@ -1992,12 +2055,12 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBaseView.prototype.cx = function () {
         var _this = this;
-        var a = new NumericMarkerManager(1, function (b) { return _this.c1.item(b); }, function (b) { return _this.cz.vr.c.item(b); }, runOn(this, this.dc), runOn(this, this.cu), runOn(this, this.c2), function () { return _this.cz.vo; });
+        var a = new NumericMarkerManager(1, function (b) { return _this.c1.item(b); }, function (b) { return _this.cz.w5.c.item(b); }, runOn(this, this.dc), runOn(this, this.cu), runOn(this, this.c2), function () { return _this.cz.w2; });
         a.q = runOn(this, this.dh);
         return a;
     };
     ScatterBaseView.prototype.dc = function (a) {
-        this.cz.yf(a, this.c1);
+        this.cz.zt(a, this.c1);
     };
     ScatterBaseView.prototype.c3 = function () {
         return this.b7;
@@ -2006,11 +2069,11 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
         return this.cw;
     };
     ScatterBaseView.prototype.cu = function () {
-        this.cw = this.cz.vj(this, this.c1, this.cw, this.by, this.bx);
+        this.cw = this.cz.wx(this, this.c1, this.cw, this.by, this.bx);
         return this.cw;
     };
     ScatterBaseView.prototype.c2 = function () {
-        this.c4 = this.cz.ws(this.c1, this.c4);
+        this.c4 = this.cz.x6(this.c1, this.c4);
         return this.c4;
     };
     ScatterBaseView.prototype.c5 = function () {
@@ -2023,10 +2086,10 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBaseView.prototype.dd = function () {
         if (this.cz.trendLineBrush != null) {
-            this.cz.zb = this.cz.trendLineBrush;
+            this.cz.aap = this.cz.trendLineBrush;
         }
         else {
-            this.cz.zb = this.cz.su;
+            this.cz.aap = this.cz.tw;
         }
     };
     ScatterBaseView.prototype.ci = function (a) {
@@ -2043,9 +2106,9 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
             if (this.cz.trendLineType != 0 && !b) {
                 var c = this.c0.g$j;
                 c.ad = this.cz.trendLineThickness;
-                c._stroke = this.cz.zb;
-                c.ai = this.cz.zc;
-                c.aj = this.cz.zd;
+                c._stroke = this.cz.aap;
+                c.ai = this.cz.aaq;
+                c.aj = this.cz.aar;
                 a.v(c);
             }
         }
@@ -2060,11 +2123,11 @@ var ScatterBaseView = /** @class */ /*@__PURE__*/ (function (_super) {
     };
     ScatterBaseView.prototype.getDefaultTooltipTemplate = function () {
         var a = "<div class='ui-chart-default-tooltip-content'><span";
-        var b = this.e.a3.a$r(this.e);
+        var b = this.e.a2.a$t(this.e);
         if (!stringIsNullOrEmpty(b)) {
             a += " style='color:" + b + "'";
         }
-        a += ">" + this.cz.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.cz.xn + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.cz.xv + "}</span></div>";
+        a += ">" + this.cz.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.cz.y1 + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.cz.y9 + "}</span></div>";
         return a;
     };
     ScatterBaseView.$t = markType(ScatterBaseView, 'ScatterBaseView', MarkerSeriesView.$);