igniteui-webcomponents-charts 4.7.0 → 4.7.1

package/esm2015/lib/ScatterBase_combined.js

@@ -60,51 +60,51 @@ import { stringIsNullOrEmpty } from "igniteui-webcomponents-core";
  */
 export let ScatterBase = /*@__PURE__*/ (() => {
     class ScatterBase extends MarkerSeries {
-        cg() {
+        ch() {
             return new ScatterBaseView(this);
         }
-        ng() {
-            super.ng();
+        nh() {
+            super.nh();
             this.xAxis = null;
             this.yAxis = null;
         }
-        o0(a) {
-            super.o0(a);
-            this.vv = a;
+        o1(a) {
+            super.o1(a);
+            this.vw = a;
         }
-        get_e9() {
+        get_fa() {
             return true;
         }
         ag() {
             return [this.xAxis, this.yAxis];
         }
-        ju(a, b) {
-            let c = this.lv(b);
+        jv(a, b) {
+            let c = this.lw(b);
             if (c == ScatterBase.$$p[12]) {
-                return this.jv(a, b, this.xl);
+                return this.jw(a, b, this.xm);
             }
             if (c == ScatterBase.$$p[16]) {
-                return this.jv(a, b, this.xt);
+                return this.jw(a, b, this.xu);
             }
             return null;
         }
-        ds(a, b, c, d) {
+        dt(a, b, c, d) {
             if (!this.hasMarkers) {
                 return false;
             }
             let e = this.xAxis;
-            let f = new ScalerParams(1, this.cy.tn, this.tw, e.ch);
-            f.c = this.getEffectiveViewport1(this.cj);
+            let f = new ScalerParams(1, this.cz.tn, this.tx, e.ch);
+            f.c = this.getEffectiveViewport1(this.ck);
             let g = this.yAxis;
-            let h = new ScalerParams(1, this.cy.tn, this.tw, g.ch);
-            h.c = this.getEffectiveViewport1(this.cj);
+            let h = new ScalerParams(1, this.cz.tn, this.tx, g.ch);
+            h.c = this.getEffectiveViewport1(this.ck);
             a.clear();
-            this.t9.ci((i) => {
+            this.ua.ci((i) => {
                 if (i._visibility == 0) {
                     let j = new SeriesPointOfInterest();
                     let k = i.n;
                     let l = i.o;
-                    if (k < this.tw.left || k > this.tw.right || l < this.tw.top || l > this.tw.bottom) {
+                    if (k < this.tx.left || k > this.tx.right || l < this.tx.top || l > this.tx.bottom) {
                         return;
                     }
                     j.b = e.em(k, f);
@@ -115,77 +115,67 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             });
             return true;
         }
-        bx() {
-            if (this.by == 0) {
-                if (this.w1 <= 2000) {
+        by() {
+            if (this.bz == 0) {
+                if (this.w2 <= 2000) {
                     return 1;
                 }
                 else {
-                    return super.bx();
+                    return super.by();
                 }
             }
             else {
-                return super.bx();
+                return super.by();
             }
         }
-        tu(a) {
-            if (!this.hasMarkers || !this.uc()) {
+        tv(a) {
+            if (!this.hasMarkers || !this.ud()) {
                 return Rect.empty;
             }
-            let b = this.t9.b1(this.tc(a));
+            let b = this.ua.b1(this.td(a));
             if (b != null) {
-                return this.t9.cs(b);
+                return this.ua.cs(b);
             }
             return Rect.empty;
         }
-        f4(a, b) {
-            if (this.ud(a, b)) {
+        f5(a, b) {
+            if (this.ue(a, b)) {
                 return true;
             }
             return false;
         }
         constructor() {
             super();
-            this.vu = null;
-            this.v8 = null;
+            this.vv = null;
             this.v9 = null;
-            this.zc = null;
+            this.wa = null;
             this.zd = null;
-            this.v3 = 1;
-            this.vf = null;
+            this.ze = null;
+            this.v4 = 1;
             this.vg = null;
-            this.v0 = null;
-            this.v2 = null;
-            this.vy = null;
+            this.vh = null;
+            this.v1 = null;
+            this.v3 = null;
+            this.vz = null;
+            this.wf = false;
             this.we = false;
-            this.wd = false;
-            this.vq = null;
             this.vr = null;
+            this.vs = null;
             this.assigningScatterStyle = null;
             this.assigningScatterMarkerStyle = null;
-            this.v7 = null;
-            this.v1 = null;
-            this.vx = null;
-            this.wc = true;
-            this.wr = 0;
+            this.v8 = null;
+            this.v2 = null;
+            this.vy = null;
+            this.wd = true;
             this.ws = 0;
             this.wt = 0;
             this.wu = 0;
-            this.v4 = this.v5();
-            this.v7 = new ScatterSeriesRenderManager();
-            this.v1 = new ScatterFrame();
+            this.wv = 0;
+            this.v5 = this.v6();
+            this.v8 = new ScatterSeriesRenderManager();
+            this.v2 = new ScatterFrame();
+            this.ze = Rect.empty;
             this.zd = Rect.empty;
-            this.zc = Rect.empty;
-        }
-        get wa() {
-            return this.v8;
-        }
-        set wa(a) {
-            if (this.v8 != a) {
-                let b = this.wa;
-                this.v8 = a;
-                this.raisePropertyChanged("XColumn", b, this.wa);
-            }
         }
         get wb() {
             return this.v9;
@@ -194,17 +184,27 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             if (this.v9 != a) {
                 let b = this.wb;
                 this.v9 = a;
-                this.raisePropertyChanged("YColumn", b, this.wb);
+                this.raisePropertyChanged("XColumn", b, this.wb);
             }
         }
-        fn() {
-            return this.highlightedItemsSource != null || (this.w5 != null && this.w7 != null);
+        get wc() {
+            return this.wa;
         }
-        wp() {
+        set wc(a) {
+            if (this.wa != a) {
+                let b = this.wc;
+                this.wa = a;
+                this.raisePropertyChanged("YColumn", b, this.wc);
+            }
+        }
+        fo() {
+            return this.highlightedItemsSource != null || (this.w6 != null && this.w8 != null);
+        }
+        wq() {
             return false;
         }
-        g0() {
-            let a = super.g0();
+        g1() {
+            let a = super.g1();
             {
                 let b = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
@@ -214,7 +214,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.x0));
+                b.valueResolving = delegateCombine(b.valueResolving, runOn(this, this.x1));
                 a.add(b);
             }
             {
@@ -226,10 +226,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.xz));
+                c.valueResolving = delegateCombine(c.valueResolving, runOn(this, this.x0));
                 a.add(c);
             }
-            if (this.wp()) {
+            if (this.wq()) {
                 let d = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -246,7 +246,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 })());
                 a.add(d);
             }
-            if (!this.wp()) {
+            if (!this.wq()) {
                 let e = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -256,10 +256,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.px));
+                e.valueResolving = delegateCombine(e.valueResolving, runOn(this, this.py));
                 a.add(e);
             }
-            if (!this.wp()) {
+            if (!this.wq()) {
                 let f = ((() => {
                     let $ret = new SeriesLayerPropertyOverlay();
                     $ret.r = true;
@@ -269,30 +269,30 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     $ret.q = true;
                     return $ret;
                 })());
-                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.px));
+                f.valueResolving = delegateCombine(f.valueResolving, runOn(this, this.py));
                 a.add(f);
             }
             return a;
         }
-        xz(a, b) {
-            if (this.w5 != null) {
-                b.value = this.w5;
+        x0(a, b) {
+            if (this.w6 != null) {
+                b.value = this.w6;
                 return;
             }
-            b.value = this.xl;
+            b.value = this.xm;
         }
-        x0(a, b) {
-            if (this.w7 != null) {
-                b.value = this.w7;
+        x1(a, b) {
+            if (this.w8 != null) {
+                b.value = this.w8;
                 return;
             }
-            b.value = this.xt;
+            b.value = this.xu;
         }
-        get y9() {
-            return this.c(ScatterBase.yk);
+        get za() {
+            return this.c(ScatterBase.yl);
         }
-        set y9(a) {
-            this.h(ScatterBase.yk, a);
+        set za(a) {
+            this.h(ScatterBase.yl, a);
         }
         get GetErrorBarsXAxis() {
             return this.xAxis;
@@ -300,8 +300,8 @@ export let ScatterBase = /*@__PURE__*/ (() => {
         get GetErrorBarsYAxis() {
             return this.yAxis;
         }
-        ob() {
-            super.ob();
+        oc() {
+            super.oc();
             if (this.xAxis != null) {
                 this.xAxis.h8(false);
             }
@@ -309,26 +309,26 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 this.yAxis.h8(false);
             }
         }
-        o8(a, b, c, d) {
-            super.o8(a, b, c, d);
-            if (this.vv.c0.g$b(a, b, c, d)) {
-                this.pp(false);
-                this.ol();
+        o9(a, b, c, d) {
+            super.o9(a, b, c, d);
+            if (this.vw.c0.g$b(a, b, c, d)) {
+                this.pq(false);
+                this.om();
             }
             switch (b) {
                 case "FastItemsSource":
                     if (typeCast(IFastItemsSource_$type, c) != null) {
-                        c.deregisterColumn(this.wa);
                         c.deregisterColumn(this.wb);
-                        this.wa = null;
+                        c.deregisterColumn(this.wc);
                         this.wb = null;
+                        this.wc = null;
                     }
                     if (typeCast(IFastItemsSource_$type, d) != null) {
-                        this.wa = this.c3(this.xl);
-                        this.wb = this.c3(this.xt);
+                        this.wb = this.c4(this.xm);
+                        this.wc = this.c4(this.xu);
                     }
                     if ((this.yAxis != null && !this.yAxis.c1()) || (this.xAxis != null && !this.xAxis.c1())) {
-                        this.pp(this.fq && c != null);
+                        this.pq(this.fr && c != null);
                     }
                     break;
                 case ScatterBase.$$p[9]:
@@ -339,9 +339,9 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.ct(this);
                     }
                     if ((this.xAxis != null && !this.xAxis.c1()) || (d == null && c != null)) {
-                        this.pp(false);
+                        this.pq(false);
                     }
-                    this.ol();
+                    this.om();
                     break;
                 case ScatterBase.$$p[13]:
                     if (c != null) {
@@ -351,134 +351,134 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         d.ct(this);
                     }
                     if ((this.yAxis != null && !this.yAxis.c1()) || (d == null && c != null)) {
-                        this.pp(false);
+                        this.pq(false);
                     }
-                    this.ol();
+                    this.om();
                     break;
                 case ScatterBase.$$p[12]:
-                    if (this.c6 != null) {
-                        this.c6.deregisterColumn(this.wa);
-                        this.wa = this.c3(this.xl);
+                    if (this.c7 != null) {
+                        this.c7.deregisterColumn(this.wb);
+                        this.wb = this.c4(this.xm);
                     }
                     break;
                 case "XColumn":
-                    this.vv.c0.g$i();
+                    this.vw.c0.g$i();
                     if (this.xAxis != null && !this.xAxis.c1()) {
-                        this.pp(this.fq && this.dn);
+                        this.pq(this.fr && this.dp);
                     }
                     break;
                 case ScatterBase.$$p[16]:
-                    if (this.c6 != null) {
-                        this.c6.deregisterColumn(this.wb);
-                        this.wb = this.c3(this.xt);
+                    if (this.c7 != null) {
+                        this.c7.deregisterColumn(this.wc);
+                        this.wc = this.c4(this.xu);
                     }
                     break;
                 case "YColumn":
-                    this.vv.c0.g$i();
+                    this.vw.c0.g$i();
                     if (this.yAxis != null && !this.yAxis.c1()) {
-                        this.pp(this.fq && this.dn);
+                        this.pq(this.fr && this.dp);
                     }
                     break;
                 case ScatterBase.$$p[7]:
-                    this.pp(false);
-                    this.ol();
+                    this.pq(false);
+                    this.om();
                     break;
                 case ScatterBase.$$p[8]:
-                    this.pp(false);
-                    this.ol();
+                    this.pq(false);
+                    this.om();
                     break;
                 case "TransitionProgress":
-                    this.v2.c(this.iv, this.v0, this.vy);
-                    this.xv();
+                    this.v3.c(this.iw, this.v1, this.vz);
+                    this.xw();
                     try {
-                        if (this.dl(this.cj)) {
+                        if (this.dm(this.ck)) {
                             return;
                         }
-                        if ((Math.round(this.iv * 100000) / 100000) == 1) {
-                            this.yh(this.vy, this.vv);
+                        if ((Math.round(this.iw * 100000) / 100000) == 1) {
+                            this.yi(this.vz, this.vw);
                         }
                         else {
-                            this.yh(this.v2, this.vv);
+                            this.yi(this.v3, this.vw);
                         }
-                        if (this.cy != null) {
-                            this.cy.on(this);
+                        if (this.cz != null) {
+                            this.cz.on(this);
                         }
                     }
                     finally {
-                        this.yi();
+                        this.yj();
                     }
                     break;
                 case "TrendLineBrush":
-                    this.pe(b);
+                    this.pf(b);
                     break;
                 case ScatterBase.$$p[0]:
-                    if (this.vw != null) {
-                        this.vw.r = this;
+                    if (this.vx != null) {
+                        this.vx.r = this;
                     }
-                    this.pp(false);
-                    this.ol();
+                    this.pq(false);
+                    this.om();
                     break;
                 case "TrendLineType":
-                    this.ol();
+                    this.om();
                     break;
                 case ScatterBase.$$p[4]:
-                    this.we = this.wm();
-                    this.pp(false);
+                    this.wf = this.wn();
+                    this.pq(false);
                     break;
                 case ScatterBase.$$p[3]:
-                    this.wd = this.wl();
-                    this.pp(false);
+                    this.we = this.wm();
+                    this.pq(false);
                     break;
                 case ScatterBase.$$p[5]:
-                    this.v4 = this.v5();
+                    this.v5 = this.v6();
                     break;
             }
         }
+        wn() {
+            return this.wj;
+        }
         wm() {
             return this.wi;
         }
-        wl() {
-            return this.wh;
-        }
-        wg(a) {
+        wh(a) {
             if (typeCast(NumericYAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        wf(a) {
+        wg(a) {
             if (typeCast(NumericXAxis.$, a) !== null) {
                 return true;
             }
             return false;
         }
-        yi() {
-            this.zc = Rect.empty;
+        yj() {
             this.zd = Rect.empty;
+            this.ze = Rect.empty;
         }
-        xv() {
-            let a = this.getViewInfo(this.zc, this.zd);
-            this.zc = a.p0;
-            this.zd = a.p1;
+        xw() {
+            let a = this.getViewInfo(this.zd, this.ze);
+            this.zd = a.p0;
+            this.ze = a.p1;
         }
-        wk(a, b) {
+        wl(a, b) {
             if (b != 3) {
                 return true;
             }
             if (a == null) {
                 return true;
             }
-            if (this.xl == a || this.xt == a) {
+            if (this.xm == a || this.xu == a) {
                 return true;
             }
             return false;
         }
-        no(a, b, c, d) {
+        np(a, b, c, d) {
             let e = false;
-            if (!this.wk(d, a)) {
+            if (!this.wl(d, a)) {
                 return;
             }
-            this.vv.c0.g$e(a, b, c, d);
+            this.vw.c0.g$e(a, b, c, d);
             if (this.xAxis != null && !this.xAxis.c1()) {
                 e = true;
             }
@@ -486,34 +486,34 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 e = true;
             }
             if (a == 0 || a == 2 || a == 3 || a == 4) {
-                this.wc = true;
+                this.wd = true;
             }
             else if (a == 1) {
                 for (let f = b; f < b + c; f++) {
-                    this.wr += this.wa.item(f);
                     this.ws += this.wb.item(f);
+                    this.wt += this.wc.item(f);
                 }
-                this.wt = this.wr / this.wa.count;
                 this.wu = this.ws / this.wb.count;
+                this.wv = this.wt / this.wc.count;
             }
             if (e) {
-                this.pp(true);
+                this.pq(true);
             }
         }
-        x9(a) {
-            this.ya(a, null);
+        ya(a) {
+            this.yb(a, null);
         }
-        ya(a, b) {
-            let c = this.wa != null ? this.wa.count : 0;
-            let d = this.wb != null ? this.wb.count : 0;
+        yb(a, b) {
+            let c = this.wb != null ? this.wb.count : 0;
+            let d = this.wc != null ? this.wc.count : 0;
             let e = Math.min(c, d);
-            if (e <= this.w1) {
+            if (e <= this.w2) {
                 a.m.clear();
                 let f = new List$1(OwnedPoint.$, 0);
                 for (let g of fromEnum(a.u.values)) {
                     f.add(g);
                 }
-                let h = this.c6;
+                let h = this.c7;
                 f.aa((i, j) => {
                     let k = h.indexOf(i.a);
                     let l = h.indexOf(j.a);
@@ -541,72 +541,72 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
         }
         aq(a) {
-            if (a != null && a == this.xAxis && this.wa != null) {
-                return new AxisRange(this.wa.minimum, this.wa.maximum);
-            }
-            if (a != null && a == this.yAxis && this.wb != null) {
+            if (a != null && a == this.xAxis && this.wb != null) {
                 return new AxisRange(this.wb.minimum, this.wb.maximum);
             }
+            if (a != null && a == this.yAxis && this.wc != null) {
+                return new AxisRange(this.wc.minimum, this.wc.maximum);
+            }
             return null;
         }
-        jr(a) {
-            let b = this.i8(a);
-            if (this.c6 != null && b >= 0 && b < this.c6.count) {
-                return this.c6.item(b);
+        js(a) {
+            let b = this.i9(a);
+            if (this.c7 != null && b >= 0 && b < this.c7.count) {
+                return this.c7.item(b);
             }
             return null;
         }
-        get v4() {
-            return this.v3;
+        get v5() {
+            return this.v4;
         }
-        set v4(a) {
-            let b = this.v3;
-            this.v3 = a;
-            if (b != this.v3) {
-                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.v3));
+        set v5(a) {
+            let b = this.v4;
+            this.v4 = a;
+            if (b != this.v4) {
+                this.raisePropertyChanged("ActualItemSearchMode", enumGetBox(ScatterItemSearchMode_$type, b), enumGetBox(ScatterItemSearchMode_$type, this.v4));
             }
         }
-        v5() {
-            if (this.v6 != 0) {
-                return this.v6;
+        v6() {
+            if (this.v7 != 0) {
+                return this.v7;
             }
-            return this.wj ? 4 : 1;
+            return this.wk ? 4 : 1;
         }
-        i8(a) {
-            let b = truncate(Math.round(this.hv(a)));
+        i9(a) {
+            let b = truncate(Math.round(this.hw(a)));
             return b;
         }
-        hv(a) {
-            switch (this.v4) {
-                case 1: return this.wx(a);
-                case 3: return this.wy(a);
-                case 2: return this.wv(a);
-                case 4: return this.ww(a);
+        hw(a) {
+            switch (this.v5) {
+                case 1: return this.wy(a);
+                case 3: return this.wz(a);
+                case 2: return this.ww(a);
+                case 4: return this.wx(a);
             }
             return -1;
         }
-        ww(a) {
-            return this.wz(a, false);
+        wx(a) {
+            return this.w0(a, false);
         }
-        wv(a) {
-            let b = this.tc(a);
+        ww(a) {
+            let b = this.td(a);
             let c = b.x;
             let d = b.y;
-            if (this.c6 == null || this.xAxis == null || this.yAxis == null || this.wa == null || this.wb == null) {
+            if (this.c7 == null || this.xAxis == null || this.yAxis == null || this.wb == null || this.wc == null) {
                 return -1;
             }
-            if (this.c6.count > this.w0) {
+            if (this.c7.count > this.w1) {
                 return -1;
             }
-            this.xy();
-            let e = this.vf;
-            let f = this.vg;
+            this.xz();
+            let e = this.vg;
+            let f = this.vh;
             if (e == null || f == null) {
                 return -1;
             }
             let g = 1.7976931348623157E+308;
             let h = -1;
-            for (let i = 0; i < this.wa.count; i++) {
+            for (let i = 0; i < this.wb.count; i++) {
                 let j = e[i];
                 let k = f[i];
                 let l = (c - j) * (c - j) + (d - k) * (d - k);
@@ -617,63 +617,63 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return h;
         }
-        xy() {
-            let a = this.cj.by;
-            let b = this.cj.bx;
+        xz() {
+            let a = this.ck.by;
+            let b = this.ck.bx;
             let c = this.getEffectiveViewport();
-            if (this.vu == null) {
+            if (this.vv == null) {
                 return;
             }
-            let d = new ScalerParams(0, a, b, this.vu.d, c);
+            let d = new ScalerParams(0, a, b, this.vv.d, c);
             let e = ((() => {
-                let $ret = new ScalerParams(0, a, b, this.vu.e, c);
-                $ret.b = this.h2();
+                let $ret = new ScalerParams(0, a, b, this.vv.e, c);
+                $ret.b = this.h3();
                 return $ret;
             })());
-            if (this.vf == null || this.vg == null) {
-                let f = arrayShallowClone(this.wa.asArray());
-                let g = arrayShallowClone(this.wb.asArray());
+            if (this.vg == null || this.vh == null) {
+                let f = arrayShallowClone(this.wb.asArray());
+                let g = arrayShallowClone(this.wc.asArray());
                 this.xAxis.hn(boxArray$1(f), 0, f.length, d);
                 this.yAxis.hn(boxArray$1(g), 0, g.length, e);
-                this.vf = f;
-                this.vg = g;
+                this.vg = f;
+                this.vh = g;
             }
         }
-        get_wj() {
+        get_wk() {
             return false;
         }
-        get wj() {
-            return this.get_wj();
+        get wk() {
+            return this.get_wk();
         }
-        wz(a, b) {
-            if (!this.wj) {
+        w0(a, b) {
+            if (!this.wk) {
                 return -1;
             }
             let c = { $type: Point_$type, x: 0, y: 0 };
             let d = true;
-            let e = this.vz();
+            let e = this.v0();
             if (e == null) {
                 return -1;
             }
             if (e.m == null) {
                 return -1;
             }
-            if (this.c6 == null || this.c6.count > this.w0) {
+            if (this.c7 == null || this.c7.count > this.w1) {
                 return -1;
             }
-            this.xy();
-            let f = this.vf;
-            let g = this.vg;
+            this.xz();
+            let f = this.vg;
+            let g = this.vh;
             if (f == null || g == null) {
                 return -1;
             }
-            let h = this.tc(a);
+            let h = this.td(a);
             let i = 1.7976931348623157E+308;
             let j = -1;
-            for (let k = 0; k < this.vf.length; k++) {
-                let l = { $type: Point_$type, x: this.vf[k], y: this.vg[k] };
+            for (let k = 0; k < this.vg.length; k++) {
+                let l = { $type: Point_$type, x: this.vg[k], y: this.vh[k] };
                 if (k > 0) {
-                    if (!b || e.j.containsKey(this.c6.item(k)) || e.j.containsKey(this.c6.item(k - 1))) {
+                    if (!b || e.j.containsKey(this.c7.item(k)) || e.j.containsKey(this.c7.item(k - 1))) {
                         let m = GeometryUtil.d(h, c, l);
                         if (m < i) {
                             i = m;
@@ -684,13 +684,13 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 c = l;
             }
             if (j >= 0) {
-                let n = { $type: Point_$type, x: this.vf[j], y: this.vg[j] };
-                let o = { $type: Point_$type, x: this.vf[j - 1], y: this.vg[j - 1] };
-                if (!b || (e.j.containsKey(this.c6.item(j)) && e.j.containsKey(this.c6.item(j - 1)))) {
+                let n = { $type: Point_$type, x: this.vg[j], y: this.vh[j] };
+                let o = { $type: Point_$type, x: this.vg[j - 1], y: this.vh[j - 1] };
+                if (!b || (e.j.containsKey(this.c7.item(j)) && e.j.containsKey(this.c7.item(j - 1)))) {
                     let p = GeometryUtil.h(h, o, n);
                     return (j - 1) + p;
                 }
-                else if (e.j.containsKey(this.c6.item(j))) {
+                else if (e.j.containsKey(this.c7.item(j))) {
                     return j;
                 }
                 else {
@@ -699,21 +699,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        wy(a) {
-            return this.wz(a, true);
+        wz(a) {
+            return this.w0(a, true);
         }
-        wx(a) {
+        wy(a) {
             let b = null;
             let c = 1.7976931348623157E+308;
-            let d = this.tc(a);
+            let d = this.td(a);
             let e = d.x;
             let f = d.y;
-            if (this.vv.c1.e > this.w0) {
+            if (this.vw.c1.e > this.w1) {
                 return -1;
             }
-            this.vv.c8((g) => {
+            this.vw.c8((g) => {
                 if (g._visibility == 0) {
-                    let h = this.vv.cs(g);
+                    let h = this.vw.cs(g);
                     let i = h.left + h.width / 2;
                     let j = h.top + h.height / 2;
                     let k = (e - i) * (e - i) + (f - j) * (f - j);
@@ -728,21 +728,21 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return -1;
         }
-        th(a, b, c) {
-            if (this.xAxis == null || this.yAxis == null || this.wa == null || this.wb == null) {
+        ti(a, b, c) {
+            if (this.xAxis == null || this.yAxis == null || this.wb == null || this.wc == null) {
                 return { $type: Point_$type, x: NaN, y: NaN };
             }
-            let d = this.cj.by;
-            let e = this.cj.bx;
+            let d = this.ck.by;
+            let e = this.ck.bx;
             let f = this.getEffectiveViewport();
             let g = new ScalerParams(0, d, e, this.xAxis.ch, f);
             let h = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.ch, f);
-                $ret.b = this.h2();
+                $ret.b = this.h3();
                 return $ret;
             })());
             if (b) {
-                let i = this.hv(a);
+                let i = this.hw(a);
                 if (i == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
@@ -754,51 +754,51 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (k < 0) {
                     k = 0;
                 }
-                if (k > this.c6.count - 1) {
-                    k = this.c6.count - 1;
+                if (k > this.c7.count - 1) {
+                    k = this.c7.count - 1;
                 }
-                if (j > this.c6.count - 1) {
-                    j = this.c6.count - 1;
+                if (j > this.c7.count - 1) {
+                    j = this.c7.count - 1;
                 }
                 if (k == j) {
-                    let l = this.xAxis.ej(this.wa.item(j), g);
-                    let m = this.yAxis.ej(this.wb.item(j), h);
+                    let l = this.xAxis.ej(this.wb.item(j), g);
+                    let m = this.yAxis.ej(this.wc.item(j), h);
                     return { $type: Point_$type, x: l, y: m };
                 }
                 let n = i - Math.floor(i);
-                let o = this.xAxis.ej(this.wa.item(j), g);
-                let p = this.yAxis.ej(this.wb.item(j), h);
-                let q = this.xAxis.ej(this.wa.item(k), g);
-                let r = this.yAxis.ej(this.wb.item(k), h);
+                let o = this.xAxis.ej(this.wb.item(j), g);
+                let p = this.yAxis.ej(this.wc.item(j), h);
+                let q = this.xAxis.ej(this.wb.item(k), g);
+                let r = this.yAxis.ej(this.wc.item(k), h);
                 let s = q - o;
                 let t = r - p;
                 return { $type: Point_$type, x: o + s * n, y: p + t * n };
             }
             else {
-                let u = this.i8(a);
+                let u = this.i9(a);
                 if (u == -1) {
                     return { $type: Point_$type, x: NaN, y: NaN };
                 }
-                let v = this.xAxis.ej(this.wa.item(u), g);
-                let w = this.yAxis.ej(this.wb.item(u), h);
+                let v = this.xAxis.ej(this.wb.item(u), g);
+                let w = this.yAxis.ej(this.wc.item(u), h);
                 return { $type: Point_$type, x: v, y: w };
             }
         }
-        fo(a) {
-            let b = this.cy != null ? this.cy.tn : Rect.empty;
+        fp(a) {
+            let b = this.cz != null ? this.cz.tn : Rect.empty;
             b = b.copy();
-            let c = this.cy != null ? this.cy.t2 : Rect.empty;
+            let c = this.cz != null ? this.cz.t2 : Rect.empty;
             let d = new Rect(0, 0, 0, 1, 1);
-            let e = this.tq(this.cj);
+            let e = this.tr(this.ck);
             let f = new ScalerParams(0, d, d, this.xAxis.ch, e);
             let g = ((() => {
                 let $ret = new ScalerParams(0, d, d, this.yAxis.ch, e);
-                $ret.b = this.h2();
+                $ret.b = this.h3();
                 return $ret;
             })());
-            let h = !b.isEmpty && !c.isEmpty && this.c6 != null ? this.c6.indexOf(a) : -1;
-            let i = this.xAxis != null && this.wa != null && h < this.wa.count ? this.xAxis.ej(this.wa.item(h), f) : NaN;
-            let j = this.yAxis != null && this.wb != null && h < this.wb.count ? this.yAxis.ej(this.wb.item(h), g) : NaN;
+            let h = !b.isEmpty && !c.isEmpty && this.c7 != null ? this.c7.indexOf(a) : -1;
+            let i = this.xAxis != null && this.wb != null && h < this.wb.count ? this.xAxis.ej(this.wb.item(h), f) : NaN;
+            let j = this.yAxis != null && this.wc != null && h < this.wc.count ? this.yAxis.ej(this.wc.item(h), g) : NaN;
             if (!isNaN_(i)) {
                 if (i < b.left + 0.1 * b.width) {
                     i = i + 0.4 * b.width;
@@ -819,57 +819,57 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     b.y = j - 0.5 * b.height;
                 }
             }
-            if (this.cr != null) {
-                this.cr.au(this.cy, b, true);
+            if (this.cs != null) {
+                this.cs.au(this.cz, b, true);
             }
             return h >= 0;
         }
-        qm(a, b) {
-            this.pp(false);
-        }
         qn(a, b) {
-            this.pp(false);
+            this.pq(false);
         }
-        vz() {
-            let a = this.vy;
-            if (this.dj()) {
-                if (this.cz.g) {
-                    this.cz.t();
+        qo(a, b) {
+            this.pq(false);
+        }
+        v0() {
+            let a = this.vz;
+            if (this.dk()) {
+                if (this.c0.g) {
+                    this.c0.t();
                 }
-                a = this.v2;
+                a = this.v3;
             }
             return a;
         }
-        xw(a, b, c, d, e) {
+        xx(a, b, c, d, e) {
             b.g = new Dictionary$2(Base.$, OwnedPoint.$, 1, c);
             let f = this.getEffectiveViewport1(a);
-            let g = this.c6;
+            let g = this.c7;
             let h;
             let i;
             let j = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.vu.d, f);
+                let $ret = new ScalerParams(0, d, e, this.vv.d, f);
                 $ret.c = this.getEffectiveViewport1(a);
                 return $ret;
             })());
             let k = ((() => {
-                let $ret = new ScalerParams(0, d, e, this.vu.e, f);
+                let $ret = new ScalerParams(0, d, e, this.vv.e, f);
                 $ret.c = this.getEffectiveViewport1(a);
-                $ret.b = this.h2();
+                $ret.b = this.h3();
                 return $ret;
             })());
             let l = false;
             let m = 0;
-            if (this.cy != null) {
-                if (this.cy.fb()) {
-                    let n = this.cy.lo(d, j);
+            if (this.cz != null) {
+                if (this.cz.fb()) {
+                    let n = this.cz.lo(d, j);
                     l = n.c;
                     m = n.d;
                 }
             }
             for (let o = 0; o < c; o++) {
-                h = this.wa.item(o);
-                i = this.wb.item(o);
-                let p = { $type: Point_$type, x: this.vu.a.ej(h, j), y: this.vu.b.ej(i, k) };
+                h = this.wb.item(o);
+                i = this.wc.item(o);
+                let p = { $type: Point_$type, x: this.vv.a.ej(h, j), y: this.vv.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) {
@@ -893,16 +893,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 }
             }
         }
-        x6(a, b) {
-            this.vf = null;
+        x7(a, b) {
             this.vg = null;
+            this.vh = null;
             a.j.clear();
             a.n.clear();
             a.h.clear();
             a.l.clear();
             a.i.clear();
             a.k.clear();
-            let c = Math.min(this.wa != null ? this.wa.count : 0, this.wb != null ? this.wb.count : 0);
+            let c = Math.min(this.wb != null ? this.wb.count : 0, this.wc != null ? this.wc.count : 0);
             let d = b.by;
             let e = b.bx;
             let f = this.getEffectiveViewport1(b);
@@ -910,64 +910,64 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             g.c = this.getEffectiveViewport1(b);
             let h = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.ch, f);
-                $ret.b = this.h2();
+                $ret.b = this.h3();
                 return $ret;
             })());
             h.c = this.getEffectiveViewport1(b);
             if (c < 1) {
                 return;
             }
-            this.vu = ((() => {
+            this.vv = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
                 $ret.d = this.xAxis.ch;
                 $ret.e = this.yAxis.ch;
-                $ret.c = this.c6;
+                $ret.c = this.c7;
                 return $ret;
             })());
             let i = b;
-            if (c <= this.w1) {
-                this.xw(i, a, c, d, e);
+            if (c <= this.w2) {
+                this.xx(i, a, c, d, e);
             }
-            if (this.uc()) {
-                b.cy.l(a.j, this.w1, d, e, this.hj);
+            if (this.ud()) {
+                b.cy.l(a.j, this.w2, d, e, this.hk);
             }
             let j = ((() => {
                 let $ret = new Clipper(0, e, false);
                 $ret.i = a.n;
                 return $ret;
             })());
-            let k = this.to(b);
+            let k = this.tp(b);
             let l = this.xAxis.em(k.left, g);
             let m = this.xAxis.em(k.right, g);
-            b.c0.h(a.n, this.trendLineType, this.wa, this.wb, this.trendLinePeriod, (n) => this.xAxis.ej(n, g), (n) => this.yAxis.ej(n, h), ((() => {
+            b.c0.h(a.n, this.trendLineType, this.wb, this.wc, this.trendLinePeriod, (n) => this.xAxis.ej(n, g), (n) => this.yAxis.ej(n, h), ((() => {
                 let $ret = new TrendResolutionParams();
-                $ret.d = this.hj;
+                $ret.d = this.hk;
                 $ret.h = e;
                 $ret.i = d;
                 return $ret;
             })()), j, l, m);
-            this.x4(a, b);
+            this.x5(a, b);
         }
-        nj(a, b) {
-            super.nj(a, b);
+        nk(a, b) {
+            super.nk(a, b);
             let c = b;
             c.c7(a);
         }
-        get_es() {
+        get_et() {
             return true;
         }
-        vo(a, b, c) {
+        vp(a, b, c) {
             return null;
         }
-        vp(a, b, c) {
-            let d = this.vz();
-            let e = this.vv.b1(this.tc(b));
+        vq(a, b, c) {
+            let d = this.v0();
+            let e = this.vw.b1(this.td(b));
             let f = -1;
             if (e == null) {
                 if (a != null) {
-                    f = this.c6.indexOf(a);
+                    f = this.c7.indexOf(a);
                 }
                 else {
                     return null;
@@ -990,11 +990,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return g;
         }
-        ty(a, b) {
-            if (this.ua != 1 && this.ua != 13) {
-                let c = this.t9.ct();
-                let d = (c.width / 2) + (this.uf / 2);
-                let e = (c.height / 2) + (this.uf / 2);
+        tz(a, b) {
+            if (this.ub != 1 && this.ub != 13) {
+                let c = this.ua.ct();
+                let d = (c.width / 2) + (this.ug / 2);
+                let e = (c.height / 2) + (this.ug / 2);
                 let f = d;
                 let g = d;
                 let h = e;
@@ -1015,11 +1015,11 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return new Thickness(1, 0, 0, 0, 0);
         }
-        vn(a, b, c) {
+        vo(a, b, c) {
             let d = new HighlightingInfo();
             d.b = this;
             d.h = 0;
-            d.g = this.c6.count - 1;
+            d.g = this.c7.count - 1;
             d.d = true;
             if (c != null && c.h == d.h && c.g == d.g) {
                 return c;
@@ -1027,40 +1027,40 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             return d;
         }
         ax(a, b, c) {
-            if (this.du && this.fc(this.bs) && !c) {
-                let d = this.vo(a, b, this.vq);
-                this.vq = d;
+            if (this.dv && this.fd(this.bt) && !c) {
+                let d = this.vp(a, b, this.vr);
+                this.vr = d;
                 return d;
             }
             else {
-                let e = this.vn(a, b, this.vq);
-                this.vq = e;
+                let e = this.vo(a, b, this.vr);
+                this.vr = e;
                 return e;
             }
         }
         ay(a, b, c) {
-            if (this.fc(this.bs) && !c) {
-                let d = this.vp(a, b, this.vr);
-                this.vr = d;
+            if (this.fd(this.bt) && !c) {
+                let d = this.vq(a, b, this.vs);
+                this.vs = d;
                 return d;
             }
             else {
-                let e = this.vn(a, b, this.vr);
+                let e = this.vo(a, b, this.vs);
                 e.e = true;
-                this.vr = e;
+                this.vs = e;
                 return e;
             }
         }
-        wo() {
-            return (this.assigningScatterStyle != null && this.we) || (this.bs != 1);
+        wp() {
+            return (this.assigningScatterStyle != null && this.wf) || (this.bt != 1);
         }
-        wn() {
-            return (this.assigningScatterMarkerStyle != null && this.wd) || (this.bs != 1);
+        wo() {
+            return (this.assigningScatterMarkerStyle != null && this.we) || (this.bt != 1);
         }
-        yh(a, b) {
-            this.ow();
+        yi(a, b) {
+            this.ox();
             let c = b.bx;
-            this.vu = ((() => {
+            this.vv = ((() => {
                 let $ret = new ScatterAxisInfoCache();
                 $ret.a = this.xAxis;
                 $ret.b = this.yAxis;
@@ -1068,10 +1068,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 $ret.e = this.yAxis.ch;
                 return $ret;
             })());
-            if (this.uc()) {
-                b.cy.j(a.j, this.ue);
-                if (this.wn()) {
-                    this.xx(b, a);
+            if (this.ud()) {
+                b.cy.j(a.j, this.uf);
+                if (this.wo()) {
+                    this.xy(b, a);
                 }
             }
             b.cp();
@@ -1081,30 +1081,30 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             b.c0.g$h(a.n, d);
-            this.ye(a, b);
-        }
-        vi(a, b) {
-            return this.vj(a, b);
+            this.yf(a, b);
         }
         vj(a, b) {
-            if (b < a || a < 0 || a > this.wa.count || b < 0 || b > this.wa.count) {
+            return this.vk(a, b);
+        }
+        vk(a, b) {
+            if (b < a || a < 0 || a > this.wb.count || b < 0 || b > this.wb.count) {
                 return null;
             }
             let c = new Array((b - a) + 1);
             for (let d = a; d <= b; d++) {
                 let e = d;
-                c[d - a] = this.c6.item(d);
+                c[d - a] = this.c7.item(d);
             }
             return c;
         }
-        xx(a, b) {
+        xy(a, b) {
             a.b6 = true;
-            this.v7.ay(this, this.wn(), runOn(this, this.vi));
-            let c = this.v7.d;
+            this.v8.ay(this, this.wo(), runOn(this, this.vj));
+            let c = this.v8.d;
             let d = c != null;
             let e = this.getEffectiveViewport1(a);
-            let f = this.c6 == null ? 0 : this.c6.count;
-            this.vv.ci((g) => {
+            let f = this.c7 == null ? 0 : this.c7.count;
+            this.vw.ci((g) => {
                 if (g._visibility == 0) {
                     let h = g.ak;
                     let i = g.content;
@@ -1113,63 +1113,63 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                         g.content = i;
                     }
                     if (d) {
-                        this.x1(h, f, a.q);
+                        this.x2(h, f, a.q);
                     }
-                    this.v7.ac(g, i);
+                    this.v8.ac(g, i);
                 }
             });
         }
-        x2(a, b, c) {
-            let d = this.bs != 1;
-            this.v7.a0(this.v7.b, a, b, false);
-            this.v7.ab(this.hh);
-            let e = this.v7.ax;
+        x3(a, b, c) {
+            let d = this.bt != 1;
+            this.v8.a0(this.v8.b, a, b, false);
+            this.v8.ab(this.hi);
+            let e = this.v8.ax;
             let f = null;
-            let g = this.c6;
-            if (d && this.cy != null) {
-                f = this.cy.a7.getHighlightingInfo(this, g, e.o, e.n, false);
+            let g = this.c7;
+            if (d && this.cz != null) {
+                f = this.cz.a7.getHighlightingInfo(this, g, e.o, e.n, false);
                 e.b = f;
             }
             e.f = c;
-            this.yc(e);
-            this.v7.z(this, f, c, d, a < 0);
+            this.yd(e);
+            this.v8.z(this, f, c, d, a < 0);
         }
-        x1(a, b, c) {
-            let d = this.bs != 1;
-            this.v7.a0(this.v7.d, a, b, true);
-            this.v7.aa(this.hh);
-            let e = this.v7.aw;
+        x2(a, b, c) {
+            let d = this.bt != 1;
+            this.v8.a0(this.v8.d, a, b, true);
+            this.v8.aa(this.hi);
+            let e = this.v8.aw;
             let f = null;
-            let g = this.c6;
+            let g = this.c7;
             let h = null;
-            if (d && this.cy != null) {
-                f = this.cy.a7.getHighlightingInfo(this, g, e.o, e.n, true);
-                if (this.cy.a7.isCrossSeriesHighlight(this)) {
-                    h = this.cy.a7.getHighlightingInfo(this, g, e.o, e.n, true);
+            if (d && this.cz != null) {
+                f = this.cz.a7.getHighlightingInfo(this, g, e.o, e.n, true);
+                if (this.cz.a7.isCrossSeriesHighlight(this)) {
+                    h = this.cz.a7.getHighlightingInfo(this, g, e.o, e.n, true);
                 }
                 e.b = f;
             }
             e.f = c;
-            this.yb(e);
-            this.v7.y(this, f, c, d, e.m, this.cy.a7.totalHighlightingProgress);
+            this.yc(e);
+            this.v8.y(this, f, c, d, e.m, this.cz.a7.totalHighlightingProgress);
         }
-        yc(a) {
-            if (this.assigningScatterStyle != null && this.we) {
+        yd(a) {
+            if (this.assigningScatterStyle != null && this.wf) {
                 this.assigningScatterStyle(this, a);
             }
         }
-        yb(a) {
-            if (this.assigningScatterMarkerStyle != null && this.wd) {
+        yc(a) {
+            if (this.assigningScatterMarkerStyle != null && this.we) {
                 this.assigningScatterMarkerStyle(this, a);
             }
         }
-        x4(a, b) {
+        x5(a, b) {
             let c = new ErrorBarsHelper(this, b);
-            if (this.vw == null) {
+            if (this.vx == null) {
                 return;
             }
-            let d = this.vw.u;
-            let e = this.vw.v;
+            let d = this.vx.u;
+            let e = this.vx.v;
             let f = 0;
             let g = 0;
             let h = 0;
@@ -1179,35 +1179,35 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (d != null) {
                     switch (d.getCalculatorType()) {
                         case 1:
-                            let l = this.x7(k, c, d, h, i, true);
+                            let l = this.x8(k, c, d, h, i, true);
                             h = l.p3;
                             i = l.p4;
                             break;
                         case 0:
-                            let m = this.x5(k, c, d, h, i, true);
+                            let m = this.x6(k, c, d, h, i, true);
                             h = m.p3;
                             i = m.p4;
                             break;
                         case 2:
-                            let n = this.x3(k, c, d, j, h, i, true);
+                            let n = this.x4(k, c, d, j, h, i, true);
                             h = n.p4;
                             i = n.p5;
                             break;
                         case 3:
-                            let o = this.x8(c, d, f, h, i, true);
+                            let o = this.x9(c, d, f, h, i, true);
                             f = o.p2;
                             h = o.p3;
                             i = o.p4;
                             break;
                         case 4:
-                            let p = this.x5(k, c, d, h, i, true);
+                            let p = this.x6(k, c, d, h, i, true);
                             h = p.p3;
                             i = p.p4;
                             break;
                     }
                     ;
                     let q = new OwnedPoint();
-                    q.c = c.l(d, this.vu.a, k.c, f);
+                    q.c = c.l(d, this.vv.a, k.c, f);
                     q.a = k.a;
                     a.h.addItem(j, q);
                     a.i.addItem(j, [h, i]);
@@ -1215,53 +1215,53 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 if (e != null) {
                     switch (e.getCalculatorType()) {
                         case 1:
-                            let r = this.x7(k, c, e, h, i, false);
+                            let r = this.x8(k, c, e, h, i, false);
                             h = r.p3;
                             i = r.p4;
                             break;
                         case 0:
-                            let s = this.x5(k, c, e, h, i, false);
+                            let s = this.x6(k, c, e, h, i, false);
                             h = s.p3;
                             i = s.p4;
                             break;
                         case 2:
-                            let t = this.x3(k, c, e, j, h, i, false);
+                            let t = this.x4(k, c, e, j, h, i, false);
                             h = t.p4;
                             i = t.p5;
                             break;
                         case 3:
-                            let u = this.x8(c, e, g, h, i, false);
+                            let u = this.x9(c, e, g, h, i, false);
                             g = u.p2;
                             h = u.p3;
                             i = u.p4;
                             break;
                         case 4:
-                            let v = this.x5(k, c, e, h, i, false);
+                            let v = this.x6(k, c, e, h, i, false);
                             h = v.p3;
                             i = v.p4;
                             break;
                     }
                     ;
                     let w = new OwnedPoint();
-                    w.c = c.m(e, this.vu.b, k.c, g);
+                    w.c = c.m(e, this.vv.b, k.c, g);
                     w.a = k.a;
                     a.l.addItem(j, w);
                     a.k.addItem(j, [h, i]);
                 }
             }
         }
-        x7(a, b, c, d, e, f) {
+        x8(a, b, c, d, e, f) {
             if (f) {
                 let g;
                 let h, i;
-                i = this.vu.a;
-                if (this.vw.s == 0) {
+                i = this.vv.a;
+                if (this.vx.s == 0) {
                     g = a.c.x;
-                    h = this.vu.a;
+                    h = this.vv.a;
                 }
                 else {
                     g = a.c.y;
-                    h = this.vu.b;
+                    h = this.vv.b;
                 }
                 let j = b.f(g, c, h, i, d, e);
                 d = j.p4;
@@ -1270,14 +1270,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             else {
                 let k;
                 let l, m;
-                m = this.vu.b;
-                if (this.vw.t == 0) {
+                m = this.vv.b;
+                if (this.vx.t == 0) {
                     k = a.c.x;
-                    l = this.vu.a;
+                    l = this.vv.a;
                 }
                 else {
                     k = a.c.y;
-                    l = this.vu.b;
+                    l = this.vv.b;
                 }
                 let n = b.f(k, c, l, m, d, e);
                 d = n.p4;
@@ -1288,14 +1288,14 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        x5(a, b, c, d, e, f) {
+        x6(a, b, c, d, e, f) {
             if (f) {
-                let g = b.j(a.c.x, c, this.vu.a, d, e);
+                let g = b.j(a.c.x, c, this.vv.a, d, e);
                 d = g.p3;
                 e = g.p4;
             }
             else {
-                let h = b.j(a.c.y, c, this.vu.b, d, e);
+                let h = b.j(a.c.y, c, this.vv.b, d, e);
                 d = h.p3;
                 e = h.p4;
             }
@@ -1304,18 +1304,18 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        x3(a, b, c, d, e, f, g) {
+        x4(a, b, c, d, e, f, g) {
             let h = c.getItemColumn();
-            let i = this.c6.indexOf(d);
+            let i = this.c7.indexOf(d);
             if (h != null && i < h.count) {
                 let j = h.item(i);
                 if (g) {
-                    let k = b.h(a.c.x, j, this.vu.a, e, f);
+                    let k = b.h(a.c.x, j, this.vv.a, e, f);
                     e = k.p3;
                     f = k.p4;
                 }
                 else {
-                    let l = b.h(a.c.y, j, this.vu.b, e, f);
+                    let l = b.h(a.c.y, j, this.vv.b, e, f);
                     e = l.p3;
                     f = l.p4;
                 }
@@ -1329,16 +1329,16 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p5: f
             };
         }
-        x8(a, b, c, d, e, f) {
+        x9(a, b, c, d, e, f) {
             let g = a.i(b, c);
             c = g.p1;
             if (f) {
-                let h = a.k(c, b, this.vu.a, d, e);
+                let h = a.k(c, b, this.vv.a, d, e);
                 d = h.p3;
                 e = h.p4;
             }
             else {
-                let i = a.k(c, b, this.vu.b, d, e);
+                let i = a.k(c, b, this.vv.b, d, e);
                 d = i.p3;
                 e = i.p4;
             }
@@ -1348,29 +1348,29 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 p4: e
             };
         }
-        ye(a, b) {
-            if (!b.o() || this.vw == null) {
+        yf(a, b) {
+            if (!b.o() || this.vx == null) {
                 b.c9();
                 return;
             }
-            this.yf(a, b);
             this.yg(a, b);
+            this.yh(a, b);
         }
-        yf(a, b) {
+        yg(a, b) {
             b.c5();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.vw.u;
+            let e = this.vx.u;
             for (let f of fromEnum(a.j.keys)) {
                 if (e != null && a.i.containsKey(f)) {
                     let g = a.i.item(f)[0];
                     let h = a.i.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         let i = a.h.item(f).c;
-                        if (this.vw.o == 1 || this.vw.o == 2) {
+                        if (this.vx.o == 1 || this.vx.o == 2) {
                             c.d(d, i, g, true);
                         }
-                        if (this.vw.o == 1 || this.vw.o == 3) {
+                        if (this.vx.o == 1 || this.vx.o == 3) {
                             c.d(d, i, h, false);
                         }
                     }
@@ -1378,128 +1378,128 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             b.da(d);
         }
-        yg(a, b) {
+        yh(a, b) {
             b.c6();
             let c = new ErrorBarsHelper(this, b);
             let d = new PathGeometry();
-            let e = this.vw.v;
+            let e = this.vx.v;
             for (let f of fromEnum(a.j.keys)) {
                 if (e != null && a.k.containsKey(f)) {
                     let g = a.k.item(f)[0];
                     let h = a.k.item(f)[1];
                     if (!isNaN_(g) && !isNaN_(h)) {
                         let i = a.l.item(f).c;
-                        if (this.vw.p == 1 || this.vw.p == 2) {
+                        if (this.vx.p == 1 || this.vx.p == 2) {
                             c.e(d, i, g, true);
                         }
-                        if (this.vw.p == 1 || this.vw.p == 3) {
+                        if (this.vx.p == 1 || this.vx.p == 3) {
                             c.e(d, i, h, false);
                         }
                     }
                 }
             }
         }
-        gl(a, b, c) {
+        gm(a, b, c) {
             let d = true;
-            if (!super.gl(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.wa == null || this.wb == null || this.wa.count == 0 || this.wb.count == 0 || this.c6 == null || this.c6.count != this.wa.count || this.c6.count != this.wb.count || this.xAxis.bi == null || this.yAxis.bi == null || this.xAxis.lx == this.xAxis.lw || this.yAxis.lx == this.yAxis.lw) {
+            if (!super.gm(a, b, c) || b.isEmpty || a.isEmpty || this.xAxis == null || this.yAxis == null || this.xAxis.bi == null || this.yAxis.bi == null || this.wb == null || this.wc == null || this.wb.count == 0 || this.wc.count == 0 || this.c7 == null || this.c7.count != this.wb.count || this.c7.count != this.wc.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;
         }
         getViewInfo(a, b) {
-            if (!this.zc.isEmpty && !this.zd.isEmpty) {
-                a = this.zc;
-                b = this.zd;
+            if (!this.zd.isEmpty && !this.ze.isEmpty) {
+                a = this.zd;
+                b = this.ze;
                 return {
                     p0: a,
                     p1: b
                 };
             }
-            a = this.cj.bx;
-            b = this.cj.by;
+            a = this.ck.bx;
+            b = this.ck.by;
             return {
                 p0: a,
                 p1: b
             };
         }
-        pq(a) {
-            super.pq(a);
-            this.xv();
+        pr(a) {
+            super.pr(a);
+            this.xw();
             try {
-                if (this.dl(this.cj)) {
+                if (this.dm(this.ck)) {
                     return;
                 }
-                if (this.c6 != null && this.c6.count > this.w1) {
+                if (this.c7 != null && this.c7.count > this.w2) {
                     a = false;
                 }
-                if (this.fp(a) && !this.f0) {
-                    let b = this.v0;
-                    if (this.dj()) {
-                        if (this.cz.g) {
-                            this.cz.t();
+                if (this.fq(a) && !this.f1) {
+                    let b = this.v1;
+                    if (this.dk()) {
+                        if (this.c0.g) {
+                            this.c0.t();
                         }
-                        this.v0 = this.v2;
-                        this.v2 = b;
+                        this.v1 = this.v3;
+                        this.v3 = b;
                     }
                     else {
-                        this.v0 = this.vy;
-                        this.vy = b;
+                        this.v1 = this.vz;
+                        this.vz = b;
                     }
-                    this.x6(this.vy, this.vv);
-                    this.p3();
+                    this.x7(this.vz, this.vw);
+                    this.p4();
                 }
                 else {
-                    if (!this.f0) {
-                        this.x6(this.vy, this.vv);
+                    if (!this.f1) {
+                        this.x7(this.vz, this.vw);
                     }
-                    this.yh(this.vy, this.vv);
+                    this.yi(this.vz, this.vw);
                 }
             }
             finally {
-                this.yi();
+                this.yj();
             }
         }
-        qd() {
-            super.qd();
+        qe() {
+            super.qe();
             if (this.index < 0) {
                 return;
             }
-            this.vv.dd();
+            this.vw.dd();
         }
-        pr(a, b) {
-            super.pr(a, b);
-            if (!this.f8) {
-                this.cj.a4(b);
+        ps(a, b) {
+            super.ps(a, b);
+            if (!this.f9) {
+                this.ck.a4(b);
                 return;
             }
-            this.cj.a4(b);
-            if (this.dl(this.ci)) {
+            this.ck.a4(b);
+            if (this.dm(this.cj)) {
                 return;
             }
-            let c = typeCast(ScatterBaseView.$, this.ci);
-            if (!this.f1) {
-                this.v1 = new ScatterFrame();
-                this.x6(this.v1, c);
+            let c = typeCast(ScatterBaseView.$, this.cj);
+            if (!this.f2) {
+                this.v2 = new ScatterFrame();
+                this.x7(this.v2, c);
             }
-            this.f1 = false;
-            this.yh(this.v1, c);
-            this.f8 = false;
+            this.f2 = false;
+            this.yi(this.v2, c);
+            this.f9 = false;
         }
-        po(a, b, c, d, e) {
-            super.po(a, b, c, d, e);
+        pp(a, b, c, d, e) {
+            super.pp(a, b, c, d, e);
             let f = this.a7.a$h.item(d);
             let g = f;
             f.a3(c);
-            if (this.dl(g)) {
+            if (this.dm(g)) {
                 return;
             }
-            if (this.vx == null) {
-                this.vx = new ScatterFrame();
+            if (this.vy == null) {
+                this.vy = new ScatterFrame();
             }
-            this.x6(this.vx, g);
-            this.yh(this.vx, g);
+            this.x7(this.vy, g);
+            this.yi(this.vy, g);
         }
-        yd(a, b) {
+        ye(a, b) {
             let c = new List$1(Base.$, 0);
             for (let d of fromEnum(b.c)) {
                 if (!a.containsKey(d)) {
@@ -1510,10 +1510,10 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 b.h(e);
             }
         }
-        vh(a, b, c, d, e) {
-            if (c == null || c.length != this.vu.c.count) {
-                c = new Array(this.vu.c.count);
-                for (let f = 0; f < this.vu.c.count; f++) {
+        vi(a, b, c, d, e) {
+            if (c == null || c.length != this.vv.c.count) {
+                c = new Array(this.vv.c.count);
+                for (let f = 0; f < this.vv.c.count; f++) {
                     c[f] = PointUtil.create();
                 }
             }
@@ -1526,37 +1526,37 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             let i = ((() => {
                 let $ret = new ScalerParams(0, d, e, this.yAxis.ch, g);
                 $ret.c = this.getEffectiveViewport1(a);
-                $ret.b = this.h2();
+                $ret.b = this.h3();
                 return $ret;
             })());
-            let j = this.to(a);
-            let k = this.vu.a.em(j.left, h);
-            let l = this.vu.a.em(j.right, h);
-            let m = this.vu.b.em(j.bottom, i);
-            let n = this.vu.b.em(j.top, i);
-            if (this.vu.d) {
+            let j = this.tp(a);
+            let k = this.vv.a.em(j.left, h);
+            let l = this.vv.a.em(j.right, h);
+            let m = this.vv.b.em(j.bottom, i);
+            let n = this.vv.b.em(j.top, i);
+            if (this.vv.d) {
                 let o = k;
                 k = l;
                 l = o;
             }
-            if (this.vu.e) {
+            if (this.vv.e) {
                 let p = m;
                 m = n;
                 n = p;
             }
-            let q = this.vu;
+            let q = this.vv;
             let r = q.a;
             let s = q.b;
             let t;
             let u;
-            let v = this.wa;
-            let w = this.wb;
+            let v = this.wb;
+            let w = this.wc;
             let x = false;
             let y = 0;
             let z = 0;
-            if (this.cy != null) {
-                if (this.cy.fb()) {
-                    let aa = this.cy.lo(d, h);
+            if (this.cz != null) {
+                if (this.cz.fb()) {
+                    let aa = this.cz.lo(d, h);
                     x = aa.c;
                     y = aa.d;
                     z = r.em(0 + y, h);
@@ -1564,7 +1564,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                     z -= ab;
                 }
             }
-            for (let ac = 0; ac < this.vu.c.count; ac++) {
+            for (let ac = 0; ac < this.vv.c.count; ac++) {
                 t = v.item(ac);
                 u = w.item(ac);
                 if (x) {
@@ -1596,7 +1596,7 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             }
             return c;
         }
-        wq(a, b) {
+        wr(a, b) {
             if (b == null) {
                 b = new List$1(Number_$type, 2, a.e);
             }
@@ -1604,38 +1604,38 @@ export let ScatterBase = /*@__PURE__*/ (() => {
                 b.clear();
             }
             let c = 0;
-            let d = this.c6;
+            let d = this.c7;
             for (let e of fromEnum(a.c)) {
                 b.add(d.indexOf(e));
             }
             return b;
         }
-        n1(a) {
-            super.n1(a);
-            this.a9.exportTrendlineData(this, a, this.vv.c0.g$j);
+        n2(a) {
+            super.n2(a);
+            this.a9.exportTrendlineData(this, a, this.vw.c0.g$j);
         }
-        h2() {
-            return Series.h3(this.wb, null);
+        h3() {
+            return Series.h4(this.wc, null);
         }
         getDataLegendSeriesContextAt(a, b) {
             let c = { $type: Point_$type, x: a, y: b };
-            let d = this.jr(c);
-            let e = d == null ? NaN : this.h1(d, "XMemberPath");
-            let f = d == null ? NaN : this.h1(d, "YMemberPath");
+            let d = this.js(c);
+            let e = d == null ? NaN : this.h2(d, "XMemberPath");
+            let f = d == null ? NaN : this.h2(d, "YMemberPath");
             let g = new DataLegendSeriesValueInfo();
             g.l = e;
             g.a = 13;
             g.p = "X";
-            g.q = this.xl != null ? this.xl : "X";
-            g.r = this.xh != null ? this.xh : "X:";
-            g.s = this.xj != null ? this.xj : "";
+            g.q = this.xm != null ? this.xm : "X";
+            g.r = this.xi != null ? this.xi : "X:";
+            g.s = this.xk != null ? this.xk : "";
             let h = new DataLegendSeriesValueInfo();
             h.l = f;
             h.a = 14;
             h.p = "Y";
-            h.q = this.xt != null ? this.xt : "Y";
-            h.r = this.xp != null ? this.xp : "Y:";
-            h.s = this.xr != null ? this.xr : "";
+            h.q = this.xu != null ? this.xu : "Y";
+            h.r = this.xq != null ? this.xq : "Y:";
+            h.s = this.xs != null ? this.xs : "";
             let i = new DataLegendSeriesContext();
             i.f = ((() => {
                 let $ret = new List$1(DataLegendSeriesValueInfo.$, 0);
@@ -1646,20 +1646,20 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             i.b = this.aw();
             return i;
         }
-        yj() {
-            if (this.wc) {
-                this.wr = 0;
+        yk() {
+            if (this.wd) {
                 this.ws = 0;
-                for (let a = 0; a < this.wa.count; a++) {
-                    this.wr += this.wa.item(a);
+                this.wt = 0;
+                for (let a = 0; a < this.wb.count; a++) {
                     this.ws += this.wb.item(a);
+                    this.wt += this.wc.item(a);
                 }
-                this.wt = this.wr / this.wa.count;
                 this.wu = this.ws / this.wb.count;
-                this.wc = false;
+                this.wv = this.wt / this.wc.count;
+                this.wd = false;
             }
         }
-        ic(a, b) {
+        id(a, b) {
             if (b == null || !b.cj) {
                 return NaN;
             }
@@ -1680,44 +1680,44 @@ export let ScatterBase = /*@__PURE__*/ (() => {
             switch (a) {
                 case 5:
                 case 2:
-                    b = this.wa.maximum;
-                    c = this.wb.maximum;
+                    b = this.wb.maximum;
+                    c = this.wc.maximum;
                     break;
                 case 4:
                 case 1:
-                    b = this.wa.minimum;
-                    c = this.wb.minimum;
+                    b = this.wb.minimum;
+                    c = this.wc.minimum;
                     break;
                 case 6:
                 case 3:
-                    if (this.wc) {
-                        this.yj();
+                    if (this.wd) {
+                        this.yk();
                     }
-                    b = this.wt;
-                    c = this.wu;
+                    b = this.wu;
+                    c = this.wv;
                     break;
             }
             return [b, c];
         }
-        tl(a) {
-            let b = this.getEffectiveViewport1(this.cj);
-            let c = new ScalerParams(0, this.cj.by, this.cj.bx, this.xAxis.ch, b);
+        tm(a) {
+            let b = this.getEffectiveViewport1(this.ck);
+            let c = new ScalerParams(0, this.ck.by, this.ck.bx, this.xAxis.ch, b);
             c.c = b;
             let d = isNaN_(a[0]) ? NaN : this.xAxis.ej(a[0], c);
-            c = new ScalerParams(0, this.cj.by, this.cj.bx, this.yAxis.ch, b);
-            c.b = this.h2();
+            c = new ScalerParams(0, this.ck.by, this.ck.bx, this.yAxis.ch, b);
+            c.b = this.h3();
             c.c = b;
             let e = isNaN_(a[1]) ? NaN : this.yAxis.ej(a[1], c);
             return { $type: Point_$type, x: d, y: e };
         }
-        tk(a) {
+        tl(a) {
             let b = this.am(a);
-            return this.tl(b);
+            return this.tm(b);
         }
     }
     ScatterBase.$t = /*@__PURE__*/ markType(ScatterBase, 'ScatterBase', MarkerSeries.$, [ISupportsErrorBars_$type, ITrendLineSeries_$type]);
-    ScatterBase.yk = /*@__PURE__*/ DependencyProperty.i("ActualTrendLineBrush", Brush.$, ScatterBase.$, /*@__PURE__*/ new PropertyMetadata(2, null, (a, b) => a.raisePropertyChanged("ActualTrendLineBrush", b.oldValue, b.newValue)));
-    ScatterBase.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, ScatterBase, 'raisePropertyChanged', ['ErrorBarSettings:vw:yl', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:w5:ym', [2, null], 'HighlightedYMemberPath:w7:yn', [2, null], 'IsCustomScatterMarkerStyleAllowed:wh:yo', [0, false], 'IsCustomScatterStyleAllowed:wi:yp', [0, false], 'ItemSearchMode:v6:yq', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:w0:yr', [1, 10000], 'MarkerCollisionAvoidance:vm:ys', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:w1:yt', [1, 400], 'XAxis::y1', [NumericXAxis.$, null], 'XMemberAsLegendLabel:xh:y2', [2, null], 'XMemberAsLegendUnit:xj:y3', [2, null], 'XMemberPath:xl:y4', [2, null], 'YAxis::y5', [NumericYAxis.$, null], 'YMemberAsLegendLabel:xp:y6', [2, null], 'YMemberAsLegendUnit:xr:y7', [2, null], 'YMemberPath:xt:y8', [2, null], 'TrendLineType::yz', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::yy', [1, 1.5], 'TrendLinePeriod::yx', [1, 7], 'TrendLineBrush::yu', [Brush.$, null], 'TrendLineZIndex:w2:y0', [1, 1001], 'TrendLineDashArray:za:yv', [DoubleCollection.$], 'TrendLineDashCap:zb:yw', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
+    ScatterBase.yl = /*@__PURE__*/ DependencyProperty.i("ActualTrendLineBrush", Brush.$, ScatterBase.$, /*@__PURE__*/ new PropertyMetadata(2, null, (a, b) => a.raisePropertyChanged("ActualTrendLineBrush", b.oldValue, b.newValue)));
+    ScatterBase.$$p = /*@__PURE__*/ markDep(DependencyProperty, PropertyMetadata, ScatterBase, 'raisePropertyChanged', ['ErrorBarSettings:vx:ym', [ScatterErrorBarSettings.$, null], 'HighlightedXMemberPath:w6:yn', [2, null], 'HighlightedYMemberPath:w8:yo', [2, null], 'IsCustomScatterMarkerStyleAllowed:wi:yp', [0, false], 'IsCustomScatterStyleAllowed:wj:yq', [0, false], 'ItemSearchMode:v7:yr', [ScatterItemSearchMode_$type, /*@__PURE__*/ enumGetBox(ScatterItemSearchMode_$type, 0)], 'ItemSearchThreshold:w1:ys', [1, 10000], 'MarkerCollisionAvoidance:vn:yt', [CollisionAvoidanceType_$type, /*@__PURE__*/ enumGetBox(CollisionAvoidanceType_$type, 0)], 'MaximumMarkers:w2:yu', [1, 400], 'XAxis::y2', [NumericXAxis.$, null], 'XMemberAsLegendLabel:xi:y3', [2, null], 'XMemberAsLegendUnit:xk:y4', [2, null], 'XMemberPath:xm:y5', [2, null], 'YAxis::y6', [NumericYAxis.$, null], 'YMemberAsLegendLabel:xq:y7', [2, null], 'YMemberAsLegendUnit:xs:y8', [2, null], 'YMemberPath:xu:y9', [2, null], 'TrendLineType::y0', [TrendLineType_$type, /*@__PURE__*/ enumGetBox(TrendLineType_$type, 0)], 'TrendLineThickness::yz', [1, 1.5], 'TrendLinePeriod::yy', [1, 7], 'TrendLineBrush::yv', [Brush.$, null], 'TrendLineZIndex:w3:y1', [1, 1001], 'TrendLineDashArray:zb:yw', [DoubleCollection.$], 'TrendLineDashCap:zc:yx', [PenLineCap_$type, /*@__PURE__*/ enumGetBox(PenLineCap_$type, 0)]]);
     return ScatterBase;
 })();
 /**
@@ -1793,7 +1793,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             this.df = new Path();
             this.dg = new Path();
             if (!this.q) {
-                this.cz.w1 = 2000;
+                this.cz.w2 = 2000;
             }
         }
         dh(a) {
@@ -1811,12 +1811,12 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return new Size(1, this.de.width, this.de.height);
         }
         cx() {
-            let a = new NumericMarkerManager(1, (b) => this.c1.item(b), (b) => this.cz.vu.c.item(b), runOn(this, this.dc), runOn(this, this.cu), runOn(this, this.c2), () => this.cz.vm);
+            let a = new NumericMarkerManager(1, (b) => this.c1.item(b), (b) => this.cz.vv.c.item(b), runOn(this, this.dc), runOn(this, this.cu), runOn(this, this.c2), () => this.cz.vn);
             a.q = runOn(this, this.dh);
             return a;
         }
         dc(a) {
-            this.cz.yd(a, this.c1);
+            this.cz.ye(a, this.c1);
         }
         c3() {
             return this.b7;
@@ -1825,11 +1825,11 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             return this.cw;
         }
         cu() {
-            this.cw = this.cz.vh(this, this.c1, this.cw, this.by, this.bx);
+            this.cw = this.cz.vi(this, this.c1, this.cw, this.by, this.bx);
             return this.cw;
         }
         c2() {
-            this.c4 = this.cz.wq(this.c1, this.c4);
+            this.c4 = this.cz.wr(this.c1, this.c4);
             return this.c4;
         }
         c5() {
@@ -1842,10 +1842,10 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
         }
         dd() {
             if (this.cz.trendLineBrush != null) {
-                this.cz.y9 = this.cz.trendLineBrush;
+                this.cz.za = this.cz.trendLineBrush;
             }
             else {
-                this.cz.y9 = this.cz.ss;
+                this.cz.za = this.cz.st;
             }
         }
         ci(a) {
@@ -1862,9 +1862,9 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
                 if (this.cz.trendLineType != 0 && !b) {
                     let c = this.c0.g$j;
                     c.ad = this.cz.trendLineThickness;
-                    c._stroke = this.cz.y9;
-                    c.ai = this.cz.za;
-                    c.aj = this.cz.zb;
+                    c._stroke = this.cz.za;
+                    c.ai = this.cz.zb;
+                    c.aj = this.cz.zc;
                     a.v(c);
                 }
             }
@@ -1883,7 +1883,7 @@ export let ScatterBaseView = /*@__PURE__*/ (() => {
             if (!stringIsNullOrEmpty(b)) {
                 a += " style='color:" + b + "'";
             }
-            a += ">" + this.cz.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.cz.xl + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.cz.xt + "}</span></div>";
+            a += ">" + this.cz.title + "</span><br/><span>" + "x: </span><span class='ui-priority-primary'>${item." + this.cz.xm + "}</span><br/><span>" + "y: </span><span class='ui-priority-primary'>${item." + this.cz.xu + "}</span></div>";
             return a;
         }
     }