@wcardinal/wcardinal-ui 0.419.0 → 0.421.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/types/wcardinal/ui/d-chart-coordinate-base.d.ts +2 -0
- package/dist/wcardinal/ui/d-chart-coordinate-base.js +8 -2
- package/dist/wcardinal/ui/d-chart-coordinate-base.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-plot-area-twofold-axis-container.js +4 -3
- package/dist/wcardinal/ui/d-chart-plot-area-twofold-axis-container.js.map +1 -1
- package/dist/wcardinal/ui/d-chart-plot-area-twofold-coordinate-container-sub.js +5 -4
- package/dist/wcardinal/ui/d-chart-plot-area-twofold-coordinate-container-sub.js.map +1 -1
- package/dist/wcardinal-ui-theme-dark-en-us.js +1 -1
- package/dist/wcardinal-ui-theme-dark-en-us.min.js +1 -1
- package/dist/wcardinal-ui-theme-dark-ja-jp.js +1 -1
- package/dist/wcardinal-ui-theme-dark-ja-jp.min.js +1 -1
- package/dist/wcardinal-ui-theme-dark.js +1 -1
- package/dist/wcardinal-ui-theme-dark.min.js +1 -1
- package/dist/wcardinal-ui-theme-white-en-us.js +1 -1
- package/dist/wcardinal-ui-theme-white-en-us.min.js +1 -1
- package/dist/wcardinal-ui-theme-white-ja-jp.js +1 -1
- package/dist/wcardinal-ui-theme-white-ja-jp.min.js +1 -1
- package/dist/wcardinal-ui-theme-white.js +1 -1
- package/dist/wcardinal-ui-theme-white.min.js +1 -1
- package/dist/wcardinal-ui.cjs.js +18 -10
- package/dist/wcardinal-ui.js +18 -10
- package/dist/wcardinal-ui.min.js +2 -2
- package/dist/wcardinal-ui.min.js.map +1 -1
- package/package.json +1 -1
|
@@ -36,6 +36,8 @@ export declare abstract class DChartCoordinateBase<CHART extends DBase = DBase>
|
|
|
36
36
|
mark(from?: number, to?: number): void;
|
|
37
37
|
blend(ratio: number): void;
|
|
38
38
|
protected doFit(from: number | undefined, to: number | undefined, result: DChartCoordinateTransformMark | DChartCoordinateTransform<CHART>): void;
|
|
39
|
+
protected getPixelDomain(plotArea: DChartPlotArea<CHART> | DChartPlotAreaLike<CHART>, result: DChartRegion): DChartRegion;
|
|
40
|
+
protected getPixelRange(plotArea: DChartPlotArea<CHART> | DChartPlotAreaLike<CHART>, result: DChartRegion): DChartRegion;
|
|
39
41
|
protected toFitDomain(from: number | undefined, to: number | undefined, plotArea: DChartPlotArea<CHART> | DChartPlotAreaLike<CHART>, result: DChartRegion): DChartRegion;
|
|
40
42
|
protected toFitRange(from: number | undefined, to: number | undefined, plotArea: DChartPlotArea<CHART> | DChartPlotAreaLike<CHART>, result: DChartRegion): DChartRegion;
|
|
41
43
|
protected doFit_(pixelFrom: number, pixelTo: number, region: DChartRegion, result: DChartCoordinateTransformMark | DChartCoordinateTransform<CHART>): void;
|
|
@@ -78,16 +78,22 @@ var DChartCoordinateBase = /** @class */ (function () {
|
|
|
78
78
|
var work = this._work;
|
|
79
79
|
switch (this._direction) {
|
|
80
80
|
case DChartCoordinateDirection.X:
|
|
81
|
-
|
|
81
|
+
this.getPixelDomain(plotArea, work);
|
|
82
82
|
this.doFit_(work.from, work.to, this.toFitDomain(from, to, plotArea, work), result);
|
|
83
83
|
break;
|
|
84
84
|
case DChartCoordinateDirection.Y:
|
|
85
|
-
|
|
85
|
+
this.getPixelRange(plotArea, work);
|
|
86
86
|
this.doFit_(work.from, work.to, this.toFitRange(from, to, plotArea, work), result);
|
|
87
87
|
break;
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
};
|
|
91
|
+
DChartCoordinateBase.prototype.getPixelDomain = function (plotArea, result) {
|
|
92
|
+
return plotArea.getPixelDomain(result);
|
|
93
|
+
};
|
|
94
|
+
DChartCoordinateBase.prototype.getPixelRange = function (plotArea, result) {
|
|
95
|
+
return plotArea.getPixelRange(result);
|
|
96
|
+
};
|
|
91
97
|
DChartCoordinateBase.prototype.toFitDomain = function (from, to, plotArea, result) {
|
|
92
98
|
if (from == null) {
|
|
93
99
|
from = this._from;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"d-chart-coordinate-base.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-coordinate-base.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { DBase } from \"./d-base\";\nimport {\n\tDChartCoordinate,\n\tDChartCoordinateOptions,\n\tDThemeChartCoordinate\n} from \"./d-chart-coordinate\";\nimport { DChartCoordinateContainerSub } from \"./d-chart-coordinate-container-sub\";\nimport { DChartCoordinateDirection } from \"./d-chart-coordinate-direction\";\nimport { DChartCoordinateTick, DChartCoordinateTickOptions } from \"./d-chart-coordinate-tick\";\nimport { DChartCoordinateTickMajorStepFunction } from \"./d-chart-coordinate-tick-major-step-function\";\nimport { DChartCoordinateTickMinorStepFunction } from \"./d-chart-coordinate-tick-minor-step-function\";\nimport {\n\tDChartCoordinateTransform,\n\tDChartCoordinateTransformOptions\n} from \"./d-chart-coordinate-transform\";\nimport { DChartCoordinateTransformImpl } from \"./d-chart-coordinate-transform-impl\";\nimport {\n\tDChartCoordinateTransformMark,\n\tDChartCoordinateTransformMarkImpl\n} from \"./d-chart-coordinate-transform-mark\";\nimport { DChartPlotArea, DChartPlotAreaLike } from \"./d-chart-plot-area\";\nimport { DChartRegion } from \"./d-chart-region\";\nimport { DChartRegionImpl } from \"./d-chart-region-impl\";\nimport { DThemes } from \"./theme/d-themes\";\nimport { isNaN } from \"./util/is-nan\";\n\nexport abstract class DChartCoordinateBase<CHART extends DBase = DBase>\n\timplements DChartCoordinate<CHART>\n{\n\tprotected _id: number;\n\tprotected _transform: DChartCoordinateTransform<CHART>;\n\tprotected _container?: DChartCoordinateContainerSub<CHART>;\n\tprotected _direction: DChartCoordinateDirection;\n\tprotected _theme: DThemeChartCoordinate;\n\tprotected _work: DChartRegionImpl;\n\tprotected _tick: DChartCoordinateTick<CHART>;\n\tprotected _mark: DChartCoordinateTransformMark;\n\tprotected _from?: number;\n\tprotected _to?: number;\n\n\tconstructor(options?: DChartCoordinateOptions) {\n\t\tthis._id = 0;\n\t\tthis._direction = DChartCoordinateDirection.X;\n\t\tthis._theme = this.toTheme(options);\n\t\tthis._transform = this.newTransform(options?.transform);\n\t\tthis._tick = this.newTick(options?.tick);\n\t\tthis._work = this.newRegion();\n\t\tthis._mark = this.newMark();\n\t\tthis._from = options?.from;\n\t\tthis._to = options?.to;\n\t}\n\n\tprotected newTransform(\n\t\toptions?: DChartCoordinateTransformOptions\n\t): DChartCoordinateTransform<CHART> {\n\t\treturn new DChartCoordinateTransformImpl(options);\n\t}\n\n\tprotected abstract newTick(options?: DChartCoordinateTickOptions): DChartCoordinateTick<CHART>;\n\n\tprotected newRegion(): DChartRegion {\n\t\treturn new DChartRegionImpl(NaN, NaN);\n\t}\n\n\tprotected newMark(): DChartCoordinateTransformMark {\n\t\treturn new DChartCoordinateTransformMarkImpl();\n\t}\n\n\tget from(): number | undefined {\n\t\treturn this._from;\n\t}\n\n\tset from(from: number | undefined) {\n\t\tthis._from = from;\n\t}\n\n\tget to(): number | undefined {\n\t\treturn this._to;\n\t}\n\n\tset to(to: number | undefined) {\n\t\tthis._to = to;\n\t}\n\n\tbind(\n\t\tcontainer: DChartCoordinateContainerSub<CHART>,\n\t\tdirection: DChartCoordinateDirection\n\t): void {\n\t\tthis._container = container;\n\t\tthis._direction = direction;\n\t\tthis._transform.bind(container, direction);\n\t}\n\n\tunbind(): void {\n\t\tthis._container = undefined;\n\t\tthis._transform.unbind();\n\t}\n\n\tfit(from?: number, to?: number): void {\n\t\tthis.doFit(from, to, this._transform);\n\t}\n\n\tmark(from?: number, to?: number): void {\n\t\tconst mark = this._mark;\n\t\tconst transform = this._transform;\n\t\tmark.oldTranslate = transform.translate;\n\t\tmark.oldScale = transform.scale;\n\t\tthis.doFit(from, to, mark);\n\t}\n\n\tblend(ratio: number): void {\n\t\tthis._transform.blend(ratio, this._mark);\n\t}\n\n\tprotected doFit(\n\t\tfrom: number | undefined,\n\t\tto: number | undefined,\n\t\tresult: DChartCoordinateTransformMark | DChartCoordinateTransform<CHART>\n\t): void {\n\t\tconst container = this._container;\n\t\tif (container) {\n\t\t\tconst plotArea = container.container.plotArea;\n\t\t\tconst work = this._work;\n\t\t\tswitch (this._direction) {\n\t\t\t\tcase DChartCoordinateDirection.X:\n\t\t\t\t\tplotArea.getPixelDomain(work);\n\t\t\t\t\tthis.doFit_(\n\t\t\t\t\t\twork.from,\n\t\t\t\t\t\twork.to,\n\t\t\t\t\t\tthis.toFitDomain(from, to, plotArea, work),\n\t\t\t\t\t\tresult\n\t\t\t\t\t);\n\t\t\t\t\tbreak;\n\t\t\t\tcase DChartCoordinateDirection.Y:\n\t\t\t\t\tplotArea.getPixelRange(work);\n\t\t\t\t\tthis.doFit_(\n\t\t\t\t\t\twork.from,\n\t\t\t\t\t\twork.to,\n\t\t\t\t\t\tthis.toFitRange(from, to, plotArea, work),\n\t\t\t\t\t\tresult\n\t\t\t\t\t);\n\t\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t}\n\n\tprotected toFitDomain(\n\t\tfrom: number | undefined,\n\t\tto: number | undefined,\n\t\tplotArea: DChartPlotArea<CHART> | DChartPlotAreaLike<CHART>,\n\t\tresult: DChartRegion\n\t): DChartRegion {\n\t\tif (from == null) {\n\t\t\tfrom = this._from;\n\t\t}\n\t\tif (to == null) {\n\t\t\tto = this._to;\n\t\t}\n\t\tif (from != null && to != null) {\n\t\t\tresult.set(from, to);\n\t\t} else {\n\t\t\tplotArea.series.getDomain(this, result);\n\t\t\tresult.set(from, to);\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected toFitRange(\n\t\tfrom: number | undefined,\n\t\tto: number | undefined,\n\t\tplotArea: DChartPlotArea<CHART> | DChartPlotAreaLike<CHART>,\n\t\tresult: DChartRegion\n\t): DChartRegion {\n\t\tif (from == null) {\n\t\t\tfrom = this._from;\n\t\t}\n\t\tif (to == null) {\n\t\t\tto = this._to;\n\t\t}\n\t\tif (from != null && to != null) {\n\t\t\tresult.set(from, to);\n\t\t} else {\n\t\t\tplotArea.series.getRange(this, result);\n\t\t\tresult.set(from, to);\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected doFit_(\n\t\tpixelFrom: number,\n\t\tpixelTo: number,\n\t\tregion: DChartRegion,\n\t\tresult: DChartCoordinateTransformMark | DChartCoordinateTransform<CHART>\n\t): void {\n\t\tconst regionFrom = region.from;\n\t\tconst regionTo = region.to;\n\t\tif (!(isNaN(regionFrom) || isNaN(regionTo))) {\n\t\t\t// Scale\n\t\t\tlet newScale = 1;\n\t\t\tconst regionFromMapped = this.map(regionFrom);\n\t\t\tconst regionToMapped = this.map(regionTo);\n\t\t\tconst regionSizeMapped = regionToMapped - regionFromMapped;\n\t\t\tif (!this._theme.isZero(regionSizeMapped)) {\n\t\t\t\tconst pixelSize = pixelTo - pixelFrom;\n\t\t\t\tnewScale = pixelSize / regionSizeMapped;\n\t\t\t} else {\n\t\t\t\tnewScale = pixelTo < pixelFrom ? -1 : 1;\n\t\t\t}\n\n\t\t\t// Translation\n\t\t\tconst newTranslation = pixelFrom - regionFromMapped * newScale;\n\n\t\t\t// Done\n\t\t\tresult.set(newTranslation, newScale);\n\t\t}\n\t}\n\n\tget id(): number {\n\t\treturn this._id;\n\t}\n\n\tget transform(): DChartCoordinateTransform<CHART> {\n\t\treturn this._transform;\n\t}\n\n\tmap(value: number): number {\n\t\treturn value;\n\t}\n\n\tmapAll(values: number[], ifrom: number, iend: number, stride: number, offset: number): void {\n\t\t// DO NOTHING\n\t}\n\n\tunmap(value: number): number {\n\t\treturn value;\n\t}\n\n\tunmapAll(values: number[], ifrom: number, iend: number, stride: number, offset: number): void {\n\t\t// DO NOTHING\n\t}\n\n\tticks(\n\t\tdomainFrom: number,\n\t\tdomainTo: number,\n\t\tdomainVisibleFrom: number,\n\t\tdomainVisibleTo: number,\n\t\tmajorCount: number,\n\t\tmajorCapacity: number,\n\t\tmajorStep: number | DChartCoordinateTickMajorStepFunction | undefined,\n\t\tminorCountPerMajor: number,\n\t\tminorCount: number,\n\t\tminorStep: number | DChartCoordinateTickMinorStepFunction | undefined,\n\t\tmajorResult: number[],\n\t\tminorResult: number[]\n\t): void {\n\t\tthis._tick.calculate(\n\t\t\tdomainFrom,\n\t\t\tdomainTo,\n\t\t\tdomainVisibleFrom,\n\t\t\tdomainVisibleTo,\n\t\t\tmajorCount,\n\t\t\tmajorCapacity,\n\t\t\tmajorStep,\n\t\t\tminorCountPerMajor,\n\t\t\tminorCount,\n\t\t\tminorStep,\n\t\t\tmajorResult,\n\t\t\tminorResult,\n\t\t\tthis\n\t\t);\n\t}\n\n\tprotected toTheme(options?: DChartCoordinateOptions): DThemeChartCoordinate {\n\t\treturn options?.theme ?? this.getThemeDefault();\n\t}\n\n\tprotected getThemeDefault(): DThemeChartCoordinate {\n\t\treturn DThemes.getInstance().get(this.getType());\n\t}\n\n\tprotected getType(): string {\n\t\treturn \"DChartCoordinate\";\n\t}\n}\n"]}
|
|
1
|
+
{"version":3,"file":"d-chart-coordinate-base.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-coordinate-base.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { DBase } from \"./d-base\";\nimport {\n\tDChartCoordinate,\n\tDChartCoordinateOptions,\n\tDThemeChartCoordinate\n} from \"./d-chart-coordinate\";\nimport { DChartCoordinateContainerSub } from \"./d-chart-coordinate-container-sub\";\nimport { DChartCoordinateDirection } from \"./d-chart-coordinate-direction\";\nimport { DChartCoordinateTick, DChartCoordinateTickOptions } from \"./d-chart-coordinate-tick\";\nimport { DChartCoordinateTickMajorStepFunction } from \"./d-chart-coordinate-tick-major-step-function\";\nimport { DChartCoordinateTickMinorStepFunction } from \"./d-chart-coordinate-tick-minor-step-function\";\nimport {\n\tDChartCoordinateTransform,\n\tDChartCoordinateTransformOptions\n} from \"./d-chart-coordinate-transform\";\nimport { DChartCoordinateTransformImpl } from \"./d-chart-coordinate-transform-impl\";\nimport {\n\tDChartCoordinateTransformMark,\n\tDChartCoordinateTransformMarkImpl\n} from \"./d-chart-coordinate-transform-mark\";\nimport { DChartPlotArea, DChartPlotAreaLike } from \"./d-chart-plot-area\";\nimport { DChartRegion } from \"./d-chart-region\";\nimport { DChartRegionImpl } from \"./d-chart-region-impl\";\nimport { DThemes } from \"./theme/d-themes\";\nimport { isNaN } from \"./util/is-nan\";\n\nexport abstract class DChartCoordinateBase<CHART extends DBase = DBase>\n\timplements DChartCoordinate<CHART>\n{\n\tprotected _id: number;\n\tprotected _transform: DChartCoordinateTransform<CHART>;\n\tprotected _container?: DChartCoordinateContainerSub<CHART>;\n\tprotected _direction: DChartCoordinateDirection;\n\tprotected _theme: DThemeChartCoordinate;\n\tprotected _work: DChartRegionImpl;\n\tprotected _tick: DChartCoordinateTick<CHART>;\n\tprotected _mark: DChartCoordinateTransformMark;\n\tprotected _from?: number;\n\tprotected _to?: number;\n\n\tconstructor(options?: DChartCoordinateOptions) {\n\t\tthis._id = 0;\n\t\tthis._direction = DChartCoordinateDirection.X;\n\t\tthis._theme = this.toTheme(options);\n\t\tthis._transform = this.newTransform(options?.transform);\n\t\tthis._tick = this.newTick(options?.tick);\n\t\tthis._work = this.newRegion();\n\t\tthis._mark = this.newMark();\n\t\tthis._from = options?.from;\n\t\tthis._to = options?.to;\n\t}\n\n\tprotected newTransform(\n\t\toptions?: DChartCoordinateTransformOptions\n\t): DChartCoordinateTransform<CHART> {\n\t\treturn new DChartCoordinateTransformImpl(options);\n\t}\n\n\tprotected abstract newTick(options?: DChartCoordinateTickOptions): DChartCoordinateTick<CHART>;\n\n\tprotected newRegion(): DChartRegion {\n\t\treturn new DChartRegionImpl(NaN, NaN);\n\t}\n\n\tprotected newMark(): DChartCoordinateTransformMark {\n\t\treturn new DChartCoordinateTransformMarkImpl();\n\t}\n\n\tget from(): number | undefined {\n\t\treturn this._from;\n\t}\n\n\tset from(from: number | undefined) {\n\t\tthis._from = from;\n\t}\n\n\tget to(): number | undefined {\n\t\treturn this._to;\n\t}\n\n\tset to(to: number | undefined) {\n\t\tthis._to = to;\n\t}\n\n\tbind(\n\t\tcontainer: DChartCoordinateContainerSub<CHART>,\n\t\tdirection: DChartCoordinateDirection\n\t): void {\n\t\tthis._container = container;\n\t\tthis._direction = direction;\n\t\tthis._transform.bind(container, direction);\n\t}\n\n\tunbind(): void {\n\t\tthis._container = undefined;\n\t\tthis._transform.unbind();\n\t}\n\n\tfit(from?: number, to?: number): void {\n\t\tthis.doFit(from, to, this._transform);\n\t}\n\n\tmark(from?: number, to?: number): void {\n\t\tconst mark = this._mark;\n\t\tconst transform = this._transform;\n\t\tmark.oldTranslate = transform.translate;\n\t\tmark.oldScale = transform.scale;\n\t\tthis.doFit(from, to, mark);\n\t}\n\n\tblend(ratio: number): void {\n\t\tthis._transform.blend(ratio, this._mark);\n\t}\n\n\tprotected doFit(\n\t\tfrom: number | undefined,\n\t\tto: number | undefined,\n\t\tresult: DChartCoordinateTransformMark | DChartCoordinateTransform<CHART>\n\t): void {\n\t\tconst container = this._container;\n\t\tif (container) {\n\t\t\tconst plotArea = container.container.plotArea;\n\t\t\tconst work = this._work;\n\t\t\tswitch (this._direction) {\n\t\t\t\tcase DChartCoordinateDirection.X:\n\t\t\t\t\tthis.getPixelDomain(plotArea, work);\n\t\t\t\t\tthis.doFit_(\n\t\t\t\t\t\twork.from,\n\t\t\t\t\t\twork.to,\n\t\t\t\t\t\tthis.toFitDomain(from, to, plotArea, work),\n\t\t\t\t\t\tresult\n\t\t\t\t\t);\n\t\t\t\t\tbreak;\n\t\t\t\tcase DChartCoordinateDirection.Y:\n\t\t\t\t\tthis.getPixelRange(plotArea, work);\n\t\t\t\t\tthis.doFit_(\n\t\t\t\t\t\twork.from,\n\t\t\t\t\t\twork.to,\n\t\t\t\t\t\tthis.toFitRange(from, to, plotArea, work),\n\t\t\t\t\t\tresult\n\t\t\t\t\t);\n\t\t\t\t\tbreak;\n\t\t\t}\n\t\t}\n\t}\n\n\tprotected getPixelDomain(\n\t\tplotArea: DChartPlotArea<CHART> | DChartPlotAreaLike<CHART>,\n\t\tresult: DChartRegion\n\t): DChartRegion {\n\t\treturn plotArea.getPixelDomain(result);\n\t}\n\n\tprotected getPixelRange(\n\t\tplotArea: DChartPlotArea<CHART> | DChartPlotAreaLike<CHART>,\n\t\tresult: DChartRegion\n\t): DChartRegion {\n\t\treturn plotArea.getPixelRange(result);\n\t}\n\n\tprotected toFitDomain(\n\t\tfrom: number | undefined,\n\t\tto: number | undefined,\n\t\tplotArea: DChartPlotArea<CHART> | DChartPlotAreaLike<CHART>,\n\t\tresult: DChartRegion\n\t): DChartRegion {\n\t\tif (from == null) {\n\t\t\tfrom = this._from;\n\t\t}\n\t\tif (to == null) {\n\t\t\tto = this._to;\n\t\t}\n\t\tif (from != null && to != null) {\n\t\t\tresult.set(from, to);\n\t\t} else {\n\t\t\tplotArea.series.getDomain(this, result);\n\t\t\tresult.set(from, to);\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected toFitRange(\n\t\tfrom: number | undefined,\n\t\tto: number | undefined,\n\t\tplotArea: DChartPlotArea<CHART> | DChartPlotAreaLike<CHART>,\n\t\tresult: DChartRegion\n\t): DChartRegion {\n\t\tif (from == null) {\n\t\t\tfrom = this._from;\n\t\t}\n\t\tif (to == null) {\n\t\t\tto = this._to;\n\t\t}\n\t\tif (from != null && to != null) {\n\t\t\tresult.set(from, to);\n\t\t} else {\n\t\t\tplotArea.series.getRange(this, result);\n\t\t\tresult.set(from, to);\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected doFit_(\n\t\tpixelFrom: number,\n\t\tpixelTo: number,\n\t\tregion: DChartRegion,\n\t\tresult: DChartCoordinateTransformMark | DChartCoordinateTransform<CHART>\n\t): void {\n\t\tconst regionFrom = region.from;\n\t\tconst regionTo = region.to;\n\t\tif (!(isNaN(regionFrom) || isNaN(regionTo))) {\n\t\t\t// Scale\n\t\t\tlet newScale = 1;\n\t\t\tconst regionFromMapped = this.map(regionFrom);\n\t\t\tconst regionToMapped = this.map(regionTo);\n\t\t\tconst regionSizeMapped = regionToMapped - regionFromMapped;\n\t\t\tif (!this._theme.isZero(regionSizeMapped)) {\n\t\t\t\tconst pixelSize = pixelTo - pixelFrom;\n\t\t\t\tnewScale = pixelSize / regionSizeMapped;\n\t\t\t} else {\n\t\t\t\tnewScale = pixelTo < pixelFrom ? -1 : 1;\n\t\t\t}\n\n\t\t\t// Translation\n\t\t\tconst newTranslation = pixelFrom - regionFromMapped * newScale;\n\n\t\t\t// Done\n\t\t\tresult.set(newTranslation, newScale);\n\t\t}\n\t}\n\n\tget id(): number {\n\t\treturn this._id;\n\t}\n\n\tget transform(): DChartCoordinateTransform<CHART> {\n\t\treturn this._transform;\n\t}\n\n\tmap(value: number): number {\n\t\treturn value;\n\t}\n\n\tmapAll(values: number[], ifrom: number, iend: number, stride: number, offset: number): void {\n\t\t// DO NOTHING\n\t}\n\n\tunmap(value: number): number {\n\t\treturn value;\n\t}\n\n\tunmapAll(values: number[], ifrom: number, iend: number, stride: number, offset: number): void {\n\t\t// DO NOTHING\n\t}\n\n\tticks(\n\t\tdomainFrom: number,\n\t\tdomainTo: number,\n\t\tdomainVisibleFrom: number,\n\t\tdomainVisibleTo: number,\n\t\tmajorCount: number,\n\t\tmajorCapacity: number,\n\t\tmajorStep: number | DChartCoordinateTickMajorStepFunction | undefined,\n\t\tminorCountPerMajor: number,\n\t\tminorCount: number,\n\t\tminorStep: number | DChartCoordinateTickMinorStepFunction | undefined,\n\t\tmajorResult: number[],\n\t\tminorResult: number[]\n\t): void {\n\t\tthis._tick.calculate(\n\t\t\tdomainFrom,\n\t\t\tdomainTo,\n\t\t\tdomainVisibleFrom,\n\t\t\tdomainVisibleTo,\n\t\t\tmajorCount,\n\t\t\tmajorCapacity,\n\t\t\tmajorStep,\n\t\t\tminorCountPerMajor,\n\t\t\tminorCount,\n\t\t\tminorStep,\n\t\t\tmajorResult,\n\t\t\tminorResult,\n\t\t\tthis\n\t\t);\n\t}\n\n\tprotected toTheme(options?: DChartCoordinateOptions): DThemeChartCoordinate {\n\t\treturn options?.theme ?? this.getThemeDefault();\n\t}\n\n\tprotected getThemeDefault(): DThemeChartCoordinate {\n\t\treturn DThemes.getInstance().get(this.getType());\n\t}\n\n\tprotected getType(): string {\n\t\treturn \"DChartCoordinate\";\n\t}\n}\n"]}
|
|
@@ -45,7 +45,7 @@ var DChartPlotAreaTwofoldAxisContainer = /** @class */ (function () {
|
|
|
45
45
|
var secondary = this._secondary;
|
|
46
46
|
var secondarySize = secondary.size(position);
|
|
47
47
|
if (primarySize <= index && index < primarySize + secondarySize) {
|
|
48
|
-
return secondary.get(position, index);
|
|
48
|
+
return secondary.get(position, index - primarySize);
|
|
49
49
|
}
|
|
50
50
|
var list = this._list;
|
|
51
51
|
var axes = list.get(toEnum(position, DChartAxisPosition));
|
|
@@ -63,14 +63,15 @@ var DChartPlotAreaTwofoldAxisContainer = /** @class */ (function () {
|
|
|
63
63
|
if (0 <= result) {
|
|
64
64
|
return result;
|
|
65
65
|
}
|
|
66
|
-
|
|
66
|
+
var secondary = this._secondary;
|
|
67
|
+
result = secondary.indexOf(axis);
|
|
67
68
|
if (0 <= result) {
|
|
68
69
|
return primary.size(axis.position) + result;
|
|
69
70
|
}
|
|
70
71
|
var list = this._list;
|
|
71
72
|
var axes = list.get(axis.position);
|
|
72
73
|
if (axes) {
|
|
73
|
-
return axes.indexOf(axis);
|
|
74
|
+
return primary.size(axis.position) + secondary.size(axis.position) + axes.indexOf(axis);
|
|
74
75
|
}
|
|
75
76
|
return -1;
|
|
76
77
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"d-chart-plot-area-twofold-axis-container.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-plot-area-twofold-axis-container.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAG7D,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAExC;IAUC,4CACC,QAA+B,EAC/B,SAA0B,EAC1B,OAAmC,EACnC,SAAqC;QAErC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAA2C,CAAC;QAChE,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,sBAAI,yDAAS;aAAb;YACC,OAAO,IAAI,CAAC,UAAU,CAAC;QACxB,CAAC;;;OAAA;IAED,sBAAI,wDAAQ;aAAZ;YACC,OAAO,IAAI,CAAC,SAAS,CAAC;QACvB,CAAC;;;OAAA;IAED,gDAAG,GAAH,UAAI,IAAuB;QAC1B,IAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAI,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnC,IAAI,IAAI,IAAI,IAAI,EAAE;YACjB,IAAI,GAAG,EAAE,CAAC;YACV,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;SAC9B;QACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAClC,CAAC;IAED,gDAAG,GAAH,UACC,QAA8D,EAC9D,KAAa;QAEb,IAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,KAAK,IAAI,KAAK,GAAG,WAAW,EAAE;YACtC,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;SACpC;QACD,IAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC/C,IAAI,WAAW,IAAI,KAAK,IAAI,KAAK,GAAG,WAAW,GAAG,aAAa,EAAE;YAChE,OAAO,SAAS,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"d-chart-plot-area-twofold-axis-container.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-plot-area-twofold-axis-container.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { DBase } from \"./d-base\";\nimport { DChartAxis } from \"./d-chart-axis\";\nimport { DChartAxisContainer } from \"./d-chart-axis-container\";\nimport { DChartAxisPosition } from \"./d-chart-axis-position\";\nimport { DChartPlotArea } from \"./d-chart-plot-area\";\nimport { EShapeContainer } from \"./shape/e-shape-container\";\nimport { toEnum } from \"./util/to-enum\";\n\nexport class DChartPlotAreaTwofoldAxisContainer<CHART extends DBase = DBase>\n\timplements DChartAxisContainer<CHART>\n{\n\tprotected _plotArea: DChartPlotArea<CHART>;\n\tprotected _container: EShapeContainer;\n\tprotected _list: Map<DChartAxisPosition, DChartAxis<CHART>[]>;\n\n\tprotected _primary: DChartAxisContainer<CHART>;\n\tprotected _secondary: DChartAxisContainer<CHART>;\n\n\tconstructor(\n\t\tplotArea: DChartPlotArea<CHART>,\n\t\tcontainer: EShapeContainer,\n\t\tprimary: DChartAxisContainer<CHART>,\n\t\tsecondary: DChartAxisContainer<CHART>\n\t) {\n\t\tthis._plotArea = plotArea;\n\t\tthis._container = container;\n\t\tthis._list = new Map<DChartAxisPosition, DChartAxis<CHART>[]>();\n\t\tthis._primary = primary;\n\t\tthis._secondary = secondary;\n\t}\n\n\tget container(): EShapeContainer {\n\t\treturn this._container;\n\t}\n\n\tget plotArea(): DChartPlotArea<CHART> {\n\t\treturn this._plotArea;\n\t}\n\n\tadd(axis: DChartAxis<CHART>): void {\n\t\tconst list = this._list;\n\t\tlet axes = list.get(axis.position);\n\t\tif (axes == null) {\n\t\t\taxes = [];\n\t\t\tlist.set(axis.position, axes);\n\t\t}\n\t\taxes.push(axis);\n\t\taxis.bind(this, axes.length - 1);\n\t}\n\n\tget(\n\t\tposition: DChartAxisPosition | keyof typeof DChartAxisPosition,\n\t\tindex: number\n\t): DChartAxis<CHART> | null {\n\t\tconst primary = this._primary;\n\t\tconst primarySize = primary.size(position);\n\t\tif (0 <= index && index < primarySize) {\n\t\t\treturn primary.get(position, index);\n\t\t}\n\t\tconst secondary = this._secondary;\n\t\tconst secondarySize = secondary.size(position);\n\t\tif (primarySize <= index && index < primarySize + secondarySize) {\n\t\t\treturn secondary.get(position, index - primarySize);\n\t\t}\n\t\tconst list = this._list;\n\t\tconst axes = list.get(toEnum(position, DChartAxisPosition));\n\t\tif (axes) {\n\t\t\tif (\n\t\t\t\tprimarySize + secondarySize <= index &&\n\t\t\t\tindex < primarySize + secondarySize + axes.length\n\t\t\t) {\n\t\t\t\treturn axes[index - primarySize - secondarySize];\n\t\t\t}\n\t\t}\n\t\treturn null;\n\t}\n\n\tindexOf(axis: DChartAxis<CHART>): number {\n\t\tconst primary = this._primary;\n\t\tlet result = primary.indexOf(axis);\n\t\tif (0 <= result) {\n\t\t\treturn result;\n\t\t}\n\t\tconst secondary = this._secondary;\n\t\tresult = secondary.indexOf(axis);\n\t\tif (0 <= result) {\n\t\t\treturn primary.size(axis.position) + result;\n\t\t}\n\t\tconst list = this._list;\n\t\tconst axes = list.get(axis.position);\n\t\tif (axes) {\n\t\t\treturn primary.size(axis.position) + secondary.size(axis.position) + axes.indexOf(axis);\n\t\t}\n\t\treturn -1;\n\t}\n\n\tclear(position: DChartAxisPosition | keyof typeof DChartAxisPosition): this {\n\t\tthis._primary.clear(position);\n\t\tthis._secondary.clear(position);\n\t\tconst list = this._list;\n\t\tconst axes = list.get(toEnum(position, DChartAxisPosition));\n\t\tif (axes) {\n\t\t\tfor (let i = 0, imax = axes.length; i < imax; ++i) {\n\t\t\t\taxes[i].destroy();\n\t\t\t}\n\t\t\taxes.length = 0;\n\t\t}\n\t\treturn this;\n\t}\n\n\tsize(position: DChartAxisPosition | keyof typeof DChartAxisPosition): number {\n\t\tconst list = this._list;\n\t\tconst axes = list.get(toEnum(position, DChartAxisPosition));\n\t\treturn (\n\t\t\tthis._primary.size(position) +\n\t\t\tthis._secondary.size(position) +\n\t\t\t(axes != null ? axes.length : 0)\n\t\t);\n\t}\n\n\tupdate(): void {\n\t\tthis._primary.update();\n\t\tthis._secondary.update();\n\t\tthis._list.forEach((axes: DChartAxis<CHART>[]): void => {\n\t\t\tfor (let i = 0, imax = axes.length; i < imax; ++i) {\n\t\t\t\taxes[i].update();\n\t\t\t}\n\t\t});\n\t}\n\n\tonRender(): void {\n\t\tthis._primary.onRender();\n\t\tthis._secondary.onRender();\n\t\tthis._list.forEach((axes: DChartAxis<CHART>[]): void => {\n\t\t\tfor (let i = 0, imax = axes.length; i < imax; ++i) {\n\t\t\t\taxes[i].onRender();\n\t\t\t}\n\t\t});\n\t}\n\n\tdestroy(): void {\n\t\tthis._primary.destroy();\n\t\tthis._secondary.destroy();\n\t\tthis._list.forEach((axes: DChartAxis<CHART>[]): void => {\n\t\t\tfor (let i = 0, imax = axes.length; i < imax; ++i) {\n\t\t\t\taxes[i].destroy();\n\t\t\t}\n\t\t\taxes.length = 0;\n\t\t});\n\t}\n}\n"]}
|
|
@@ -44,18 +44,19 @@ var DChartPlotAreaTwofoldCoorinateContainerSub = /** @class */ (function () {
|
|
|
44
44
|
var secondary = this._secondary;
|
|
45
45
|
var secondarySize = secondary.size();
|
|
46
46
|
if (primarySize <= index && index < primarySize + secondarySize) {
|
|
47
|
-
secondary.get(index - primarySize);
|
|
47
|
+
return secondary.get(index - primarySize);
|
|
48
48
|
}
|
|
49
49
|
return null;
|
|
50
50
|
};
|
|
51
51
|
DChartPlotAreaTwofoldCoorinateContainerSub.prototype.indexOf = function (coordinate) {
|
|
52
|
-
var
|
|
52
|
+
var primary = this._primary;
|
|
53
|
+
var result = primary.indexOf(coordinate);
|
|
53
54
|
if (0 <= result) {
|
|
54
55
|
return result;
|
|
55
56
|
}
|
|
56
57
|
result = this._secondary.indexOf(coordinate);
|
|
57
58
|
if (0 <= result) {
|
|
58
|
-
return
|
|
59
|
+
return primary.size() + result;
|
|
59
60
|
}
|
|
60
61
|
return -1;
|
|
61
62
|
};
|
|
@@ -70,7 +71,7 @@ var DChartPlotAreaTwofoldCoorinateContainerSub = /** @class */ (function () {
|
|
|
70
71
|
var secondary = this._secondary;
|
|
71
72
|
var secondarySize = secondary.size();
|
|
72
73
|
if (primarySize <= index && index < primarySize + secondarySize) {
|
|
73
|
-
secondary.remove(index - primarySize);
|
|
74
|
+
return secondary.remove(index - primarySize);
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
77
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"d-chart-plot-area-twofold-coordinate-container-sub.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-plot-area-twofold-coordinate-container-sub.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C;IAOC,oDACC,SAA2C,EAC3C,OAA4C,EAC5C,SAA8C;QAE9C,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,sBAAI,iEAAS;aAAb;YACC,OAAO,IAAI,CAAC,UAAU,CAAC;QACxB,CAAC;;;OAAA;IAED,wDAAG,GAAH,UAAI,UAAmC,EAAE,KAAc;QACtD,IAAI,KAAK,IAAI,IAAI,EAAE;YAClB,IAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;YAC9B,IAAM,WAAW,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;YACnC,IAAI,KAAK,GAAG,WAAW,EAAE;gBACxB,IAAI,CAAC,IAAI,KAAK,EAAE;oBACf,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;iBAC/B;aACD;iBAAM;gBACN,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,KAAK,GAAG,WAAW,CAAC,CAAC;aACrD;YACD,OAAO,IAAI,CAAC;SACZ;aAAM;YACN,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;SAChC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,wDAAG,GAAH,UAAI,KAAa;QAChB,IAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAM,WAAW,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,IAAI,KAAK,IAAI,KAAK,GAAG,WAAW,EAAE;YACtC,OAAO,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC1B;QACD,IAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAM,aAAa,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;QACvC,IAAI,WAAW,IAAI,KAAK,IAAI,KAAK,GAAG,WAAW,GAAG,aAAa,EAAE;YAChE,SAAS,CAAC,GAAG,CAAC,KAAK,GAAG,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"d-chart-plot-area-twofold-coordinate-container-sub.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-plot-area-twofold-coordinate-container-sub.ts"],"names":[],"mappings":"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","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { DBase } from \"./d-base\";\nimport { DChartCoordinate } from \"./d-chart-coordinate\";\nimport { DChartCoordinateContainer } from \"./d-chart-coordinate-container\";\nimport { DChartCoordinateContainerSub } from \"./d-chart-coordinate-container-sub\";\nimport { isNumber } from \"./util/is-number\";\n\nexport class DChartPlotAreaTwofoldCoorinateContainerSub<CHART extends DBase = DBase>\n\timplements DChartCoordinateContainerSub<CHART>\n{\n\tprotected _container: DChartCoordinateContainer<CHART>;\n\tprotected _primary: DChartCoordinateContainerSub<CHART>;\n\tprotected _secondary: DChartCoordinateContainerSub<CHART>;\n\n\tconstructor(\n\t\tcontainer: DChartCoordinateContainer<CHART>,\n\t\tprimary: DChartCoordinateContainerSub<CHART>,\n\t\tsecondary: DChartCoordinateContainerSub<CHART>\n\t) {\n\t\tthis._container = container;\n\t\tthis._primary = primary;\n\t\tthis._secondary = secondary;\n\t}\n\n\tget container(): DChartCoordinateContainer<CHART> {\n\t\treturn this._container;\n\t}\n\n\tadd(coordinate: DChartCoordinate<CHART>, index?: number): this {\n\t\tif (index != null) {\n\t\t\tconst primary = this._primary;\n\t\t\tconst primarySize = primary.size();\n\t\t\tif (index < primarySize) {\n\t\t\t\tif (0 <= index) {\n\t\t\t\t\tprimary.add(coordinate, index);\n\t\t\t\t}\n\t\t\t} else {\n\t\t\t\tthis._secondary.add(coordinate, index - primarySize);\n\t\t\t}\n\t\t\treturn this;\n\t\t} else {\n\t\t\tthis._secondary.add(coordinate);\n\t\t}\n\t\treturn this;\n\t}\n\n\tget(index: number): DChartCoordinate<CHART> | null {\n\t\tconst primary = this._primary;\n\t\tconst primarySize = primary.size();\n\t\tif (0 <= index && index < primarySize) {\n\t\t\treturn primary.get(index);\n\t\t}\n\t\tconst secondary = this._secondary;\n\t\tconst secondarySize = secondary.size();\n\t\tif (primarySize <= index && index < primarySize + secondarySize) {\n\t\t\treturn secondary.get(index - primarySize);\n\t\t}\n\t\treturn null;\n\t}\n\n\tindexOf(coordinate: DChartCoordinate<CHART>): number {\n\t\tconst primary = this._primary;\n\t\tlet result = primary.indexOf(coordinate);\n\t\tif (0 <= result) {\n\t\t\treturn result;\n\t\t}\n\t\tresult = this._secondary.indexOf(coordinate);\n\t\tif (0 <= result) {\n\t\t\treturn primary.size() + result;\n\t\t}\n\t\treturn -1;\n\t}\n\n\tremove(coordinate: DChartCoordinate<CHART>): DChartCoordinate<CHART> | null;\n\tremove(index: number): DChartCoordinate<CHART> | null;\n\tremove(coordinateOrIndex: DChartCoordinate<CHART> | number): DChartCoordinate<CHART> | null {\n\t\tif (isNumber(coordinateOrIndex)) {\n\t\t\tconst index = coordinateOrIndex;\n\t\t\tconst primary = this._primary;\n\t\t\tconst primarySize = primary.size();\n\t\t\tif (0 <= index && index < primarySize) {\n\t\t\t\treturn primary.remove(index);\n\t\t\t}\n\t\t\tconst secondary = this._secondary;\n\t\t\tconst secondarySize = secondary.size();\n\t\t\tif (primarySize <= index && index < primarySize + secondarySize) {\n\t\t\t\treturn secondary.remove(index - primarySize);\n\t\t\t}\n\t\t} else {\n\t\t\tconst coordinate = coordinateOrIndex;\n\t\t\tlet result = this._primary.remove(coordinate);\n\t\t\tif (result != null) {\n\t\t\t\treturn result;\n\t\t\t}\n\t\t\tresult = this._secondary.remove(coordinate);\n\t\t\tif (result != null) {\n\t\t\t\treturn result;\n\t\t\t}\n\t\t}\n\t\treturn null;\n\t}\n\n\tclear(): this {\n\t\tthis._primary.clear();\n\t\tthis._secondary.clear();\n\t\treturn this;\n\t}\n\n\tdestroy(): this {\n\t\treturn this.clear();\n\t}\n\n\tsize(): number {\n\t\treturn this._primary.size() + this._secondary.size();\n\t}\n\n\tfit(from?: number, to?: number): this {\n\t\tthis._primary.fit(from, to);\n\t\tthis._secondary.fit(from, to);\n\t\treturn this;\n\t}\n\n\tmark(from?: number, to?: number): this {\n\t\tthis._primary.mark(from, to);\n\t\tthis._secondary.mark(from, to);\n\t\treturn this;\n\t}\n\n\tblend(ratio: number): this {\n\t\tthis._primary.blend(ratio);\n\t\tthis._secondary.blend(ratio);\n\t\treturn this;\n\t}\n}\n"]}
|
package/dist/wcardinal-ui.cjs.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
Winter Cardinal UI v0.
|
|
2
|
+
Winter Cardinal UI v0.421.0
|
|
3
3
|
Copyright (C) 2019 Toshiba Corporation
|
|
4
4
|
SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
|
|
@@ -80894,16 +80894,22 @@ var DChartCoordinateBase = /** @class */ (function () {
|
|
|
80894
80894
|
var work = this._work;
|
|
80895
80895
|
switch (this._direction) {
|
|
80896
80896
|
case DChartCoordinateDirection.X:
|
|
80897
|
-
|
|
80897
|
+
this.getPixelDomain(plotArea, work);
|
|
80898
80898
|
this.doFit_(work.from, work.to, this.toFitDomain(from, to, plotArea, work), result);
|
|
80899
80899
|
break;
|
|
80900
80900
|
case DChartCoordinateDirection.Y:
|
|
80901
|
-
|
|
80901
|
+
this.getPixelRange(plotArea, work);
|
|
80902
80902
|
this.doFit_(work.from, work.to, this.toFitRange(from, to, plotArea, work), result);
|
|
80903
80903
|
break;
|
|
80904
80904
|
}
|
|
80905
80905
|
}
|
|
80906
80906
|
};
|
|
80907
|
+
DChartCoordinateBase.prototype.getPixelDomain = function (plotArea, result) {
|
|
80908
|
+
return plotArea.getPixelDomain(result);
|
|
80909
|
+
};
|
|
80910
|
+
DChartCoordinateBase.prototype.getPixelRange = function (plotArea, result) {
|
|
80911
|
+
return plotArea.getPixelRange(result);
|
|
80912
|
+
};
|
|
80907
80913
|
DChartCoordinateBase.prototype.toFitDomain = function (from, to, plotArea, result) {
|
|
80908
80914
|
if (from == null) {
|
|
80909
80915
|
from = this._from;
|
|
@@ -82308,7 +82314,7 @@ var DChartPlotAreaTwofoldAxisContainer = /** @class */ (function () {
|
|
|
82308
82314
|
var secondary = this._secondary;
|
|
82309
82315
|
var secondarySize = secondary.size(position);
|
|
82310
82316
|
if (primarySize <= index && index < primarySize + secondarySize) {
|
|
82311
|
-
return secondary.get(position, index);
|
|
82317
|
+
return secondary.get(position, index - primarySize);
|
|
82312
82318
|
}
|
|
82313
82319
|
var list = this._list;
|
|
82314
82320
|
var axes = list.get(toEnum(position, DChartAxisPosition));
|
|
@@ -82326,14 +82332,15 @@ var DChartPlotAreaTwofoldAxisContainer = /** @class */ (function () {
|
|
|
82326
82332
|
if (0 <= result) {
|
|
82327
82333
|
return result;
|
|
82328
82334
|
}
|
|
82329
|
-
|
|
82335
|
+
var secondary = this._secondary;
|
|
82336
|
+
result = secondary.indexOf(axis);
|
|
82330
82337
|
if (0 <= result) {
|
|
82331
82338
|
return primary.size(axis.position) + result;
|
|
82332
82339
|
}
|
|
82333
82340
|
var list = this._list;
|
|
82334
82341
|
var axes = list.get(axis.position);
|
|
82335
82342
|
if (axes) {
|
|
82336
|
-
return axes.indexOf(axis);
|
|
82343
|
+
return primary.size(axis.position) + secondary.size(axis.position) + axes.indexOf(axis);
|
|
82337
82344
|
}
|
|
82338
82345
|
return -1;
|
|
82339
82346
|
};
|
|
@@ -82433,18 +82440,19 @@ var DChartPlotAreaTwofoldCoorinateContainerSub = /** @class */ (function () {
|
|
|
82433
82440
|
var secondary = this._secondary;
|
|
82434
82441
|
var secondarySize = secondary.size();
|
|
82435
82442
|
if (primarySize <= index && index < primarySize + secondarySize) {
|
|
82436
|
-
secondary.get(index - primarySize);
|
|
82443
|
+
return secondary.get(index - primarySize);
|
|
82437
82444
|
}
|
|
82438
82445
|
return null;
|
|
82439
82446
|
};
|
|
82440
82447
|
DChartPlotAreaTwofoldCoorinateContainerSub.prototype.indexOf = function (coordinate) {
|
|
82441
|
-
var
|
|
82448
|
+
var primary = this._primary;
|
|
82449
|
+
var result = primary.indexOf(coordinate);
|
|
82442
82450
|
if (0 <= result) {
|
|
82443
82451
|
return result;
|
|
82444
82452
|
}
|
|
82445
82453
|
result = this._secondary.indexOf(coordinate);
|
|
82446
82454
|
if (0 <= result) {
|
|
82447
|
-
return
|
|
82455
|
+
return primary.size() + result;
|
|
82448
82456
|
}
|
|
82449
82457
|
return -1;
|
|
82450
82458
|
};
|
|
@@ -82459,7 +82467,7 @@ var DChartPlotAreaTwofoldCoorinateContainerSub = /** @class */ (function () {
|
|
|
82459
82467
|
var secondary = this._secondary;
|
|
82460
82468
|
var secondarySize = secondary.size();
|
|
82461
82469
|
if (primarySize <= index && index < primarySize + secondarySize) {
|
|
82462
|
-
secondary.remove(index - primarySize);
|
|
82470
|
+
return secondary.remove(index - primarySize);
|
|
82463
82471
|
}
|
|
82464
82472
|
}
|
|
82465
82473
|
else {
|
package/dist/wcardinal-ui.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/*
|
|
2
|
-
Winter Cardinal UI v0.
|
|
2
|
+
Winter Cardinal UI v0.421.0
|
|
3
3
|
Copyright (C) 2019 Toshiba Corporation
|
|
4
4
|
SPDX-License-Identifier: Apache-2.0
|
|
5
5
|
|
|
@@ -59733,16 +59733,22 @@
|
|
|
59733
59733
|
var work = this._work;
|
|
59734
59734
|
switch (this._direction) {
|
|
59735
59735
|
case DChartCoordinateDirection.X:
|
|
59736
|
-
|
|
59736
|
+
this.getPixelDomain(plotArea, work);
|
|
59737
59737
|
this.doFit_(work.from, work.to, this.toFitDomain(from, to, plotArea, work), result);
|
|
59738
59738
|
break;
|
|
59739
59739
|
case DChartCoordinateDirection.Y:
|
|
59740
|
-
|
|
59740
|
+
this.getPixelRange(plotArea, work);
|
|
59741
59741
|
this.doFit_(work.from, work.to, this.toFitRange(from, to, plotArea, work), result);
|
|
59742
59742
|
break;
|
|
59743
59743
|
}
|
|
59744
59744
|
}
|
|
59745
59745
|
};
|
|
59746
|
+
DChartCoordinateBase.prototype.getPixelDomain = function (plotArea, result) {
|
|
59747
|
+
return plotArea.getPixelDomain(result);
|
|
59748
|
+
};
|
|
59749
|
+
DChartCoordinateBase.prototype.getPixelRange = function (plotArea, result) {
|
|
59750
|
+
return plotArea.getPixelRange(result);
|
|
59751
|
+
};
|
|
59746
59752
|
DChartCoordinateBase.prototype.toFitDomain = function (from, to, plotArea, result) {
|
|
59747
59753
|
if (from == null) {
|
|
59748
59754
|
from = this._from;
|
|
@@ -61147,7 +61153,7 @@
|
|
|
61147
61153
|
var secondary = this._secondary;
|
|
61148
61154
|
var secondarySize = secondary.size(position);
|
|
61149
61155
|
if (primarySize <= index && index < primarySize + secondarySize) {
|
|
61150
|
-
return secondary.get(position, index);
|
|
61156
|
+
return secondary.get(position, index - primarySize);
|
|
61151
61157
|
}
|
|
61152
61158
|
var list = this._list;
|
|
61153
61159
|
var axes = list.get(toEnum(position, DChartAxisPosition));
|
|
@@ -61165,14 +61171,15 @@
|
|
|
61165
61171
|
if (0 <= result) {
|
|
61166
61172
|
return result;
|
|
61167
61173
|
}
|
|
61168
|
-
|
|
61174
|
+
var secondary = this._secondary;
|
|
61175
|
+
result = secondary.indexOf(axis);
|
|
61169
61176
|
if (0 <= result) {
|
|
61170
61177
|
return primary.size(axis.position) + result;
|
|
61171
61178
|
}
|
|
61172
61179
|
var list = this._list;
|
|
61173
61180
|
var axes = list.get(axis.position);
|
|
61174
61181
|
if (axes) {
|
|
61175
|
-
return axes.indexOf(axis);
|
|
61182
|
+
return primary.size(axis.position) + secondary.size(axis.position) + axes.indexOf(axis);
|
|
61176
61183
|
}
|
|
61177
61184
|
return -1;
|
|
61178
61185
|
};
|
|
@@ -61272,18 +61279,19 @@
|
|
|
61272
61279
|
var secondary = this._secondary;
|
|
61273
61280
|
var secondarySize = secondary.size();
|
|
61274
61281
|
if (primarySize <= index && index < primarySize + secondarySize) {
|
|
61275
|
-
secondary.get(index - primarySize);
|
|
61282
|
+
return secondary.get(index - primarySize);
|
|
61276
61283
|
}
|
|
61277
61284
|
return null;
|
|
61278
61285
|
};
|
|
61279
61286
|
DChartPlotAreaTwofoldCoorinateContainerSub.prototype.indexOf = function (coordinate) {
|
|
61280
|
-
var
|
|
61287
|
+
var primary = this._primary;
|
|
61288
|
+
var result = primary.indexOf(coordinate);
|
|
61281
61289
|
if (0 <= result) {
|
|
61282
61290
|
return result;
|
|
61283
61291
|
}
|
|
61284
61292
|
result = this._secondary.indexOf(coordinate);
|
|
61285
61293
|
if (0 <= result) {
|
|
61286
|
-
return
|
|
61294
|
+
return primary.size() + result;
|
|
61287
61295
|
}
|
|
61288
61296
|
return -1;
|
|
61289
61297
|
};
|
|
@@ -61298,7 +61306,7 @@
|
|
|
61298
61306
|
var secondary = this._secondary;
|
|
61299
61307
|
var secondarySize = secondary.size();
|
|
61300
61308
|
if (primarySize <= index && index < primarySize + secondarySize) {
|
|
61301
|
-
secondary.remove(index - primarySize);
|
|
61309
|
+
return secondary.remove(index - primarySize);
|
|
61302
61310
|
}
|
|
61303
61311
|
}
|
|
61304
61312
|
else {
|