npm - @wcardinal/wcardinal-ui - Versions diffs - 0.150.2 → 0.154.0 - Mend

@wcardinal/wcardinal-ui 0.150.2 → 0.154.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.

Files changed (330) hide show

package/dist/wcardinal/ui/d-chart-coordinate-linear-tick.js CHANGED Viewed

@@ -2,26 +2,48 @@
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
+import { DThemes } from "./theme/d-themes";
+import { isNumber } from "./util/is-number";
 var DChartCoordinateLinearTick = /** @class */ (function () {
-    function DChartCoordinateLinearTick(theme) {
-        this._theme = theme;
+    function DChartCoordinateLinearTick(options) {
+        this._theme = this.toTheme(options);
     }
-    DChartCoordinateLinearTick.prototype.calcStepMajor = function (domainMin, domainMax, count) {
-        if (0 < count) {
-            var span = Math.abs(domainMax - domainMin) / count;
-            var power = Math.floor(Math.log(span) / Math.LN10);
-            var base = Math.pow(10, power);
-            return this._theme.toStepScale(span / base) * base;
+    DChartCoordinateLinearTick.prototype.toMajorStep = function (domainMin, domainMax, majorCount, majorStep) {
+        if (majorStep == null) {
+            if (0 < majorCount) {
+                return this.calcStepMajor(domainMin, domainMax, majorCount);
+            }
+            return -1;
         }
-        return -1;
-    };
-    DChartCoordinateLinearTick.prototype.calcStepMinor = function (step, minorCount) {
-        if (0 <= step) {
-            return step / (minorCount + 1);
+        else if (isNumber(majorStep)) {
+            return majorStep;
         }
         else {
+            return majorStep(domainMin, domainMax, majorCount);
+        }
+    };
+    DChartCoordinateLinearTick.prototype.calcStepMajor = function (domainMin, domainMax, majorCount) {
+        var span = Math.abs(domainMax - domainMin) / majorCount;
+        var power = Math.floor(Math.log(span) / Math.LN10);
+        var base = Math.pow(10, power);
+        return this._theme.toStepScale(span / base) * base;
+    };
+    DChartCoordinateLinearTick.prototype.toMinorStep = function (majorStep, minorCount, minorStep) {
+        if (minorStep == null) {
+            if (0 <= majorStep) {
+                return this.calcStepMinor(majorStep, minorCount);
+            }
             return -1;
         }
+        else if (isNumber(minorStep)) {
+            return minorStep;
+        }
+        else {
+            return minorStep(majorStep, minorCount);
+        }
+    };
+    DChartCoordinateLinearTick.prototype.calcStepMinor = function (majorStep, minorCount) {
+        return majorStep / (minorCount + 1);
     };
     DChartCoordinateLinearTick.prototype.calcTickMinorPositions = function (step, count, majorPosition, rangeMin, rangeMax, iresult, result) {
         for (var i = 0; i < count; i += 1) {
@@ -31,15 +53,15 @@ var DChartCoordinateLinearTick = /** @class */ (function () {
             }
         }
     };
-    DChartCoordinateLinearTick.prototype.calculate = function (domainFrom, domainTo, majorCount, minorCountPerMajor, minorCount, majorResult, minorResult, coordinate) {
+    DChartCoordinateLinearTick.prototype.calculate = function (domainFrom, domainTo, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, coordinate) {
         if (majorCount <= 0) {
             return;
         }
         var transform = coordinate.transform;
         var domainMin = Math.min(domainFrom, domainTo);
         var domainMax = Math.max(domainFrom, domainTo);
-        var majorStep = this.calcStepMajor(domainMin, domainMax, majorCount);
-        if (majorStep <= 0) {
+        var majorStepMapped = this.toMajorStep(domainMin, domainMax, majorCount, majorStep);
+        if (majorStepMapped <= 0) {
             majorResult[0] = domainMin;
             majorResult[1] = transform.map(coordinate.map(domainMin));
             majorResult[2] = 0;
@@ -58,33 +80,37 @@ var DChartCoordinateLinearTick = /** @class */ (function () {
             return;
         }
         // Major tick start position
-        var idomainStart = Math.floor(domainMin / majorStep) - 1;
-        var idomainEnd = Math.ceil(domainMax / majorStep) + 1;
+        var idomainStart = Math.floor(domainMin / majorStepMapped) - 1;
+        var idomainEnd = Math.ceil(domainMax / majorStepMapped) + 1;
+        var domainMinMapped = transform.map(coordinate.map(domainMin));
+        var domainMaxMapped = transform.map(coordinate.map(domainMax));
+        var from = Math.min(domainMinMapped, domainMaxMapped) - 0.5;
+        var to = Math.max(domainMinMapped, domainMaxMapped) + 0.5;
         // Major / minor tick positions
-        var minorStep = this.calcStepMinor(majorStep, minorCountPerMajor);
+        var minorStepMapped = this.toMinorStep(majorStepMapped, minorCountPerMajor, minorStep);
         var imajor = 0;
         var iminor = 0;
         for (var i = idomainStart; i <= idomainEnd; ++i) {
-            var majorPosition = i * majorStep;
+            var majorPosition = i * majorStepMapped;
             if (imajor < majorCount) {
-                if (domainMin <= majorPosition && majorPosition <= domainMax) {
-                    var majorProjectedPosition = transform.map(coordinate.map(majorPosition));
+                var majorPositionMapped = transform.map(coordinate.map(majorPosition));
+                if (from <= majorPositionMapped && majorPositionMapped <= to) {
                     var imajorResult = imajor * 3;
                     majorResult[imajorResult + 0] = majorPosition;
-                    majorResult[imajorResult + 1] = majorProjectedPosition;
-                    majorResult[imajorResult + 2] = majorStep;
+                    majorResult[imajorResult + 1] = majorPositionMapped;
+                    majorResult[imajorResult + 2] = majorStepMapped;
                     imajor += 1;
                 }
             }
             for (var j = 0; j < minorCountPerMajor; j += 1) {
                 if (iminor < minorCount) {
-                    var minorPosition = majorPosition + (j + 1) * minorStep;
-                    if (domainMin <= minorPosition && minorPosition <= domainMax) {
-                        var minorProjectedPosition = transform.map(coordinate.map(minorPosition));
+                    var minorPosition = majorPosition + (j + 1) * minorStepMapped;
+                    var minorPositionMapped = transform.map(coordinate.map(minorPosition));
+                    if (from <= minorPositionMapped && minorPositionMapped <= to) {
                         var iminorResult = iminor * 3;
                         minorResult[iminorResult + 0] = minorPosition;
-                        minorResult[iminorResult + 1] = minorProjectedPosition;
-                        minorResult[iminorResult + 2] = minorStep;
+                        minorResult[iminorResult + 1] = minorPositionMapped;
+                        minorResult[iminorResult + 2] = minorStepMapped;
                         iminor += 1;
                     }
                 }
@@ -103,6 +129,15 @@ var DChartCoordinateLinearTick = /** @class */ (function () {
             minorResult[iminorResult + 2] = NaN;
         }
     };
+    DChartCoordinateLinearTick.prototype.toTheme = function (options) {
+        return (options && options.theme) || this.getThemeDefault();
+    };
+    DChartCoordinateLinearTick.prototype.getThemeDefault = function () {
+        return DThemes.getInstance().get(this.getType());
+    };
+    DChartCoordinateLinearTick.prototype.getType = function () {
+        return "DChartCoordinateTick";
+    };
     return DChartCoordinateLinearTick;
 }());
 export { DChartCoordinateLinearTick };

package/dist/wcardinal/ui/d-chart-coordinate-linear-tick.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"d-chart-coordinate-linear-tick.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-coordinate-linear-tick.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\";\n\nexport interface DThemeChartCoordinateLinearTick {\n\ttoStepScale(scale: number): number;\n}\n\nexport class DChartCoordinateLinearTick<CHART extends DBase = DBase> {\n\tprotected _theme: DThemeChartCoordinateLinearTick;\n\n\tconstructor(theme: DThemeChartCoordinateLinearTick) {\n\t\tthis._theme = theme;\n\t}\n\n\tprotected calcStepMajor(domainMin: number, domainMax: number, count: number): number {\n\t\tif (0 < count) {\n\t\t\tconst span = Math.abs(domainMax - domainMin) / count;\n\t\t\tconst power = Math.floor(Math.log(span) / Math.LN10);\n\t\t\tconst base = Math.pow(10, power);\n\t\t\treturn this._theme.toStepScale(span / base) base;\n\t\t}\n\t\treturn -1;\n\t}\n\n\tprotected calcStepMinor(step: number, minorCount: number): number {\n\t\tif (0 <= step) {\n\t\t\treturn step / (minorCount + 1);\n\t\t} else {\n\t\t\treturn -1;\n\t\t}\n\t}\n\n\tprotected calcTickMinorPositions(\n\t\tstep: number,\n\t\tcount: number,\n\t\tmajorPosition: number,\n\t\trangeMin: number,\n\t\trangeMax: number,\n\t\tiresult: number,\n\t\tresult: Float64Array\n\t): void {\n\t\tfor (let i = 0; i < count; i += 1) {\n\t\t\tconst minorPosition = majorPosition + (i + 1) * step;\n\t\t\tif (rangeMin <= minorPosition && minorPosition <= rangeMax) {\n\t\t\t\tresult[iresult++] = minorPosition;\n\t\t\t}\n\t\t}\n\t}\n\n\tcalculate(\n\t\tdomainFrom: number,\n\t\tdomainTo: number,\n\t\tmajorCount: number,\n\t\tminorCountPerMajor: number,\n\t\tminorCount: number,\n\t\tmajorResult: Float64Array,\n\t\tminorResult: Float64Array,\n\t\tcoordinate: DChartCoordinate<CHART>\n\t): void {\n\t\tif (majorCount <= 0) {\n\t\t\treturn;\n\t\t}\n\n\t\tconst transform = coordinate.transform;\n\n\t\tconst domainMin = Math.min(domainFrom, domainTo);\n\t\tconst domainMax = Math.max(domainFrom, domainTo);\n\n\t\tconst majorStep = this.calcStepMajor(domainMin, domainMax, majorCount);\n\t\tif (majorStep <= 0) {\n\t\t\tmajorResult[0] = domainMin;\n\t\t\tmajorResult[1] = transform.map(coordinate.map(domainMin));\n\t\t\tmajorResult[2] = 0;\n\t\t\tfor (let i = 1; i < majorCount; ++i) {\n\t\t\t\tconst imajorResult = i * 3;\n\t\t\t\tmajorResult[imajorResult + 0] = NaN;\n\t\t\t\tmajorResult[imajorResult + 1] = NaN;\n\t\t\t\tmajorResult[imajorResult + 2] = NaN;\n\t\t\t}\n\t\t\tfor (let i = 0; i < minorCount; ++i) {\n\t\t\t\tconst iminorResult = i * 3;\n\t\t\t\tminorResult[iminorResult + 0] = NaN;\n\t\t\t\tminorResult[iminorResult + 1] = NaN;\n\t\t\t\tminorResult[iminorResult + 2] = NaN;\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\n\t\t// Major tick start position\n\t\tconst idomainStart = Math.floor(domainMin / majorStep) - 1;\n\t\tconst idomainEnd = Math.ceil(domainMax / majorStep) + 1;\n\n\t\t// Major / minor tick positions\n\t\tconst minorStep = this.calcStepMinor(majorStep, minorCountPerMajor);\n\t\tlet imajor = 0;\n\t\tlet iminor = 0;\n\t\tfor (let i = idomainStart; i <= idomainEnd; ++i) {\n\t\t\tconst majorPosition = i * majorStep;\n\t\t\tif (imajor < majorCount) {\n\t\t\t\tif (domainMin <= majorPosition && majorPosition <= domainMax) {\n\t\t\t\t\tconst majorProjectedPosition = transform.map(coordinate.map(majorPosition));\n\t\t\t\t\tconst imajorResult = imajor * 3;\n\t\t\t\t\tmajorResult[imajorResult + 0] = majorPosition;\n\t\t\t\t\tmajorResult[imajorResult + 1] = majorProjectedPosition;\n\t\t\t\t\tmajorResult[imajorResult + 2] = majorStep;\n\t\t\t\t\timajor += 1;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tfor (let j = 0; j < minorCountPerMajor; j += 1) {\n\t\t\t\tif (iminor < minorCount) {\n\t\t\t\t\tconst minorPosition = majorPosition + (j + 1) * minorStep;\n\t\t\t\t\tif (domainMin <= minorPosition && minorPosition <= domainMax) {\n\t\t\t\t\t\tconst minorProjectedPosition = transform.map(coordinate.map(minorPosition));\n\t\t\t\t\t\tconst iminorResult = iminor * 3;\n\t\t\t\t\t\tminorResult[iminorResult + 0] = minorPosition;\n\t\t\t\t\t\tminorResult[iminorResult + 1] = minorProjectedPosition;\n\t\t\t\t\t\tminorResult[iminorResult + 2] = minorStep;\n\t\t\t\t\t\timinor += 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tfor (let i = imajor; i < majorCount; ++i) {\n\t\t\tconst imajorResult = i * 3;\n\t\t\tmajorResult[imajorResult + 0] = NaN;\n\t\t\tmajorResult[imajorResult + 1] = NaN;\n\t\t\tmajorResult[imajorResult + 2] = NaN;\n\t\t}\n\t\tfor (let i = iminor; i < minorCount; ++i) {\n\t\t\tconst iminorResult = i * 3;\n\t\t\tminorResult[iminorResult + 0] = NaN;\n\t\t\tminorResult[iminorResult + 1] = NaN;\n\t\t\tminorResult[iminorResult + 2] = NaN;\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"d-chart-coordinate-linear-tick.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-coordinate-linear-tick.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 { DChartCoordinateTickOptions, DThemeChartCoordinateTick } 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 { DThemes } from \"./theme/d-themes\";\nimport { isNumber } from \"./util/is-number\";\n\nexport class DChartCoordinateLinearTick<CHART extends DBase = DBase> {\n\tprotected _theme: DThemeChartCoordinateTick;\n\n\tconstructor(options?: DChartCoordinateTickOptions) {\n\t\tthis._theme = this.toTheme(options);\n\t}\n\n\tprotected toMajorStep(\n\t\tdomainMin: number,\n\t\tdomainMax: number,\n\t\tmajorCount: number,\n\t\tmajorStep?: number \| DChartCoordinateTickMajorStepFunction\n\t): number {\n\t\tif (majorStep == null) {\n\t\t\tif (0 < majorCount) {\n\t\t\t\treturn this.calcStepMajor(domainMin, domainMax, majorCount);\n\t\t\t}\n\t\t\treturn -1;\n\t\t} else if (isNumber(majorStep)) {\n\t\t\treturn majorStep;\n\t\t} else {\n\t\t\treturn majorStep(domainMin, domainMax, majorCount);\n\t\t}\n\t}\n\n\tprotected calcStepMajor(domainMin: number, domainMax: number, majorCount: number): number {\n\t\tconst span = Math.abs(domainMax - domainMin) / majorCount;\n\t\tconst power = Math.floor(Math.log(span) / Math.LN10);\n\t\tconst base = Math.pow(10, power);\n\t\treturn this._theme.toStepScale(span / base) base;\n\t}\n\n\tprotected toMinorStep(\n\t\tmajorStep: number,\n\t\tminorCount: number,\n\t\tminorStep?: number \| DChartCoordinateTickMinorStepFunction\n\t): number {\n\t\tif (minorStep == null) {\n\t\t\tif (0 <= majorStep) {\n\t\t\t\treturn this.calcStepMinor(majorStep, minorCount);\n\t\t\t}\n\t\t\treturn -1;\n\t\t} else if (isNumber(minorStep)) {\n\t\t\treturn minorStep;\n\t\t} else {\n\t\t\treturn minorStep(majorStep, minorCount);\n\t\t}\n\t}\n\n\tprotected calcStepMinor(majorStep: number, minorCount: number): number {\n\t\treturn majorStep / (minorCount + 1);\n\t}\n\n\tprotected calcTickMinorPositions(\n\t\tstep: number,\n\t\tcount: number,\n\t\tmajorPosition: number,\n\t\trangeMin: number,\n\t\trangeMax: number,\n\t\tiresult: number,\n\t\tresult: Float64Array\n\t): void {\n\t\tfor (let i = 0; i < count; i += 1) {\n\t\t\tconst minorPosition = majorPosition + (i + 1) * step;\n\t\t\tif (rangeMin <= minorPosition && minorPosition <= rangeMax) {\n\t\t\t\tresult[iresult++] = minorPosition;\n\t\t\t}\n\t\t}\n\t}\n\n\tcalculate(\n\t\tdomainFrom: number,\n\t\tdomainTo: number,\n\t\tmajorCount: number,\n\t\tmajorStep: number \| DChartCoordinateTickMajorStepFunction \| undefined,\n\t\tminorCountPerMajor: number,\n\t\tminorCount: number,\n\t\tminorStep: number \| DChartCoordinateTickMinorStepFunction \| undefined,\n\t\tmajorResult: Float64Array,\n\t\tminorResult: Float64Array,\n\t\tcoordinate: DChartCoordinate<CHART>\n\t): void {\n\t\tif (majorCount <= 0) {\n\t\t\treturn;\n\t\t}\n\n\t\tconst transform = coordinate.transform;\n\n\t\tconst domainMin = Math.min(domainFrom, domainTo);\n\t\tconst domainMax = Math.max(domainFrom, domainTo);\n\n\t\tconst majorStepMapped = this.toMajorStep(domainMin, domainMax, majorCount, majorStep);\n\t\tif (majorStepMapped <= 0) {\n\t\t\tmajorResult[0] = domainMin;\n\t\t\tmajorResult[1] = transform.map(coordinate.map(domainMin));\n\t\t\tmajorResult[2] = 0;\n\t\t\tfor (let i = 1; i < majorCount; ++i) {\n\t\t\t\tconst imajorResult = i * 3;\n\t\t\t\tmajorResult[imajorResult + 0] = NaN;\n\t\t\t\tmajorResult[imajorResult + 1] = NaN;\n\t\t\t\tmajorResult[imajorResult + 2] = NaN;\n\t\t\t}\n\t\t\tfor (let i = 0; i < minorCount; ++i) {\n\t\t\t\tconst iminorResult = i * 3;\n\t\t\t\tminorResult[iminorResult + 0] = NaN;\n\t\t\t\tminorResult[iminorResult + 1] = NaN;\n\t\t\t\tminorResult[iminorResult + 2] = NaN;\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\n\t\t// Major tick start position\n\t\tconst idomainStart = Math.floor(domainMin / majorStepMapped) - 1;\n\t\tconst idomainEnd = Math.ceil(domainMax / majorStepMapped) + 1;\n\t\tconst domainMinMapped = transform.map(coordinate.map(domainMin));\n\t\tconst domainMaxMapped = transform.map(coordinate.map(domainMax));\n\t\tconst from = Math.min(domainMinMapped, domainMaxMapped) - 0.5;\n\t\tconst to = Math.max(domainMinMapped, domainMaxMapped) + 0.5;\n\n\t\t// Major / minor tick positions\n\t\tconst minorStepMapped = this.toMinorStep(majorStepMapped, minorCountPerMajor, minorStep);\n\t\tlet imajor = 0;\n\t\tlet iminor = 0;\n\t\tfor (let i = idomainStart; i <= idomainEnd; ++i) {\n\t\t\tconst majorPosition = i * majorStepMapped;\n\t\t\tif (imajor < majorCount) {\n\t\t\t\tconst majorPositionMapped = transform.map(coordinate.map(majorPosition));\n\t\t\t\tif (from <= majorPositionMapped && majorPositionMapped <= to) {\n\t\t\t\t\tconst imajorResult = imajor * 3;\n\t\t\t\t\tmajorResult[imajorResult + 0] = majorPosition;\n\t\t\t\t\tmajorResult[imajorResult + 1] = majorPositionMapped;\n\t\t\t\t\tmajorResult[imajorResult + 2] = majorStepMapped;\n\t\t\t\t\timajor += 1;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tfor (let j = 0; j < minorCountPerMajor; j += 1) {\n\t\t\t\tif (iminor < minorCount) {\n\t\t\t\t\tconst minorPosition = majorPosition + (j + 1) * minorStepMapped;\n\t\t\t\t\tconst minorPositionMapped = transform.map(coordinate.map(minorPosition));\n\t\t\t\t\tif (from <= minorPositionMapped && minorPositionMapped <= to) {\n\t\t\t\t\t\tconst iminorResult = iminor * 3;\n\t\t\t\t\t\tminorResult[iminorResult + 0] = minorPosition;\n\t\t\t\t\t\tminorResult[iminorResult + 1] = minorPositionMapped;\n\t\t\t\t\t\tminorResult[iminorResult + 2] = minorStepMapped;\n\t\t\t\t\t\timinor += 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tfor (let i = imajor; i < majorCount; ++i) {\n\t\t\tconst imajorResult = i * 3;\n\t\t\tmajorResult[imajorResult + 0] = NaN;\n\t\t\tmajorResult[imajorResult + 1] = NaN;\n\t\t\tmajorResult[imajorResult + 2] = NaN;\n\t\t}\n\t\tfor (let i = iminor; i < minorCount; ++i) {\n\t\t\tconst iminorResult = i * 3;\n\t\t\tminorResult[iminorResult + 0] = NaN;\n\t\t\tminorResult[iminorResult + 1] = NaN;\n\t\t\tminorResult[iminorResult + 2] = NaN;\n\t\t}\n\t}\n\n\tprotected toTheme(options?: DChartCoordinateTickOptions): DThemeChartCoordinateTick {\n\t\treturn (options && options.theme) \|\| this.getThemeDefault();\n\t}\n\n\tprotected getThemeDefault(): DThemeChartCoordinateTick {\n\t\treturn DThemes.getInstance().get(this.getType());\n\t}\n\n\tprotected getType(): string {\n\t\treturn \"DChartCoordinateTick\";\n\t}\n}\n"]}

package/dist/wcardinal/ui/d-chart-coordinate-linear.js CHANGED Viewed

@@ -2,7 +2,7 @@
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
-import { DChartCoordinateDirection } from "./d-chart-coordinate";
+import { DChartCoordinateDirection } from "./d-chart-coordinate-direction";
 import { DChartCoordinateLinearTick } from "./d-chart-coordinate-linear-tick";
 import { DChartCoordinateTransformImpl } from "./d-chart-coordinate-transform-impl";
 import { DChartCoordinateTransformMarkImpl } from "./d-chart-coordinate-transform-mark";
@@ -13,13 +13,34 @@ var DChartCoordinateLinear = /** @class */ (function () {
     function DChartCoordinateLinear(options) {
         this._id = 0;
         this._direction = DChartCoordinateDirection.X;
-        var theme = this.toTheme(options);
-        this._theme = theme;
-        this._transform = new DChartCoordinateTransformImpl(theme);
-        this._tick = new DChartCoordinateLinearTick(theme);
+        this._theme = this.toTheme(options);
+        this._transform = new DChartCoordinateTransformImpl(options === null || options === void 0 ? void 0 : options.transform);
+        this._tick = new DChartCoordinateLinearTick(options === null || options === void 0 ? void 0 : options.tick);
         this._work = new DChartRegionImpl(NaN, NaN);
         this._mark = new DChartCoordinateTransformMarkImpl();
+        this._from = options === null || options === void 0 ? void 0 : options.from;
+        this._to = options === null || options === void 0 ? void 0 : options.to;
     }
+    Object.defineProperty(DChartCoordinateLinear.prototype, "from", {
+        get: function () {
+            return this._from;
+        },
+        set: function (from) {
+            this._from = from;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(DChartCoordinateLinear.prototype, "to", {
+        get: function () {
+            return this._to;
+        },
+        set: function (to) {
+            this._to = to;
+        },
+        enumerable: false,
+        configurable: true
+    });
     DChartCoordinateLinear.prototype.bind = function (container, direction) {
         this._container = container;
         this._direction = direction;
@@ -59,6 +80,12 @@ var DChartCoordinateLinear = /** @class */ (function () {
         }
     };
     DChartCoordinateLinear.prototype.toFitDomain = function (from, to, plotArea, result) {
+        if (from == null) {
+            from = this._from;
+        }
+        if (to == null) {
+            to = this._to;
+        }
         if (from != null && to != null) {
             result.set(from, to);
         }
@@ -69,6 +96,12 @@ var DChartCoordinateLinear = /** @class */ (function () {
         return result;
     };
     DChartCoordinateLinear.prototype.toFitRange = function (from, to, plotArea, result) {
+        if (from == null) {
+            from = this._from;
+        }
+        if (to == null) {
+            to = this._to;
+        }
         if (from != null && to != null) {
             result.set(from, to);
         }
@@ -124,8 +157,8 @@ var DChartCoordinateLinear = /** @class */ (function () {
     DChartCoordinateLinear.prototype.unmapAll = function (values, ifrom, iend, stride, offset) {
         // DO NOTHING
     };
-    DChartCoordinateLinear.prototype.ticks = function (domainFrom, domainTo, majorCount, minorCountPerMajor, minorCount, majorResult, minorResult) {
-        this._tick.calculate(domainFrom, domainTo, majorCount, minorCountPerMajor, minorCount, majorResult, minorResult, this);
+    DChartCoordinateLinear.prototype.ticks = function (domainFrom, domainTo, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult) {
+        this._tick.calculate(domainFrom, domainTo, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, this);
     };
     DChartCoordinateLinear.prototype.toTheme = function (options) {
         return (options && options.theme) || this.getThemeDefault();
@@ -134,7 +167,7 @@ var DChartCoordinateLinear = /** @class */ (function () {
         return DThemes.getInstance().get(this.getType());
     };
     DChartCoordinateLinear.prototype.getType = function () {
-        return "DChartCoordinateLinear";
+        return "DChartCoordinate";
     };
     return DChartCoordinateLinear;
 }());

package/dist/wcardinal/ui/d-chart-coordinate-linear.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"d-chart-coordinate-linear.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-coordinate-linear.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, DChartCoordinateDirection } from \"./d-chart-coordinate\";\nimport { DChartCoordinateContainerSub } from \"./d-chart-coordinate-container-sub\";\nimport {\n\tDChartCoordinateLinearTick,\n\tDThemeChartCoordinateLinearTick\n} from \"./d-chart-coordinate-linear-tick\";\nimport {\n\tDChartCoordinateTransform,\n\tDThemeChartCoordinateTransform\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 } 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 interface DThemeChartCoordinateLinear\n\textends DThemeChartCoordinateTransform,\n\t\tDThemeChartCoordinateLinearTick {}\n\nexport interface DChartCoordinateLinearOptions {\n\ttheme?: DThemeChartCoordinateLinear;\n}\n\nexport class DChartCoordinateLinear<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: DThemeChartCoordinateLinear;\n\tprotected _work: DChartRegionImpl;\n\tprotected _tick: DChartCoordinateLinearTick<CHART>;\n\tprotected _mark: DChartCoordinateTransformMarkImpl;\n\n\tconstructor(options?: DChartCoordinateLinearOptions) {\n\t\tthis._id = 0;\n\t\tthis._direction = DChartCoordinateDirection.X;\n\t\tconst theme = this.toTheme(options);\n\t\tthis._theme = theme;\n\t\tthis._transform = new DChartCoordinateTransformImpl(theme);\n\t\tthis._tick = new DChartCoordinateLinearTick(theme);\n\t\tthis._work = new DChartRegionImpl(NaN, NaN);\n\t\tthis._mark = new DChartCoordinateTransformMarkImpl();\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 padding = plotArea.padding;\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.doFit_(\n\t\t\t\t\t\tpadding.getLeft(),\n\t\t\t\t\t\tplotArea.width - padding.getRight(),\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.doFit_(\n\t\t\t\t\t\tplotArea.height - padding.getBottom(),\n\t\t\t\t\t\tpadding.getTop(),\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>,\n\t\tresult: DChartRegion\n\t): DChartRegion {\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>,\n\t\tresult: DChartRegion\n\t): DChartRegion {\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 regionSize = regionTo - regionFrom;\n\t\t\tif (!this._theme.isZero(regionSize)) {\n\t\t\t\tconst pixelSize = pixelTo - pixelFrom;\n\t\t\t\tnewScale = pixelSize / regionSize;\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 - regionFrom 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\tmajorCount: number,\n\t\tminorCountPerMajor: number,\n\t\tminorCount: number,\n\t\tmajorResult: Float64Array,\n\t\tminorResult: Float64Array\n\t): void {\n\t\tthis._tick.calculate(\n\t\t\tdomainFrom,\n\t\t\tdomainTo,\n\t\t\tmajorCount,\n\t\t\tminorCountPerMajor,\n\t\t\tminorCount,\n\t\t\tmajorResult,\n\t\t\tminorResult,\n\t\t\tthis\n\t\t);\n\t}\n\n\tprotected toTheme(options?: DChartCoordinateLinearOptions): DThemeChartCoordinateLinear {\n\t\treturn (options && options.theme) \|\| this.getThemeDefault();\n\t}\n\n\tprotected getThemeDefault(): DThemeChartCoordinateLinear {\n\t\treturn DThemes.getInstance().get(this.getType());\n\t}\n\n\tprotected getType(): string {\n\t\treturn \"DChartCoordinateLinear\";\n\t}\n}\n"]}
1	+ {"version":3,"file":"d-chart-coordinate-linear.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-coordinate-linear.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 { DChartCoordinateLinearTick } from \"./d-chart-coordinate-linear-tick\";\nimport { DChartCoordinateTick } 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 { DChartCoordinateTransform } 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 } 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 class DChartCoordinateLinear<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: DChartCoordinateTransformMarkImpl;\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 = new DChartCoordinateTransformImpl(options?.transform);\n\t\tthis._tick = new DChartCoordinateLinearTick<CHART>(options?.tick);\n\t\tthis._work = new DChartRegionImpl(NaN, NaN);\n\t\tthis._mark = new DChartCoordinateTransformMarkImpl();\n\t\tthis._from = options?.from;\n\t\tthis._to = options?.to;\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 padding = plotArea.padding;\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.doFit_(\n\t\t\t\t\t\tpadding.getLeft(),\n\t\t\t\t\t\tplotArea.width - padding.getRight(),\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.doFit_(\n\t\t\t\t\t\tplotArea.height - padding.getBottom(),\n\t\t\t\t\t\tpadding.getTop(),\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>,\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>,\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 regionSize = regionTo - regionFrom;\n\t\t\tif (!this._theme.isZero(regionSize)) {\n\t\t\t\tconst pixelSize = pixelTo - pixelFrom;\n\t\t\t\tnewScale = pixelSize / regionSize;\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 - regionFrom 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\tmajorCount: number,\n\t\tmajorStep: number \| DChartCoordinateTickMajorStepFunction \| undefined,\n\t\tminorCountPerMajor: number,\n\t\tminorCount: number,\n\t\tminorStep: number \| DChartCoordinateTickMinorStepFunction \| undefined,\n\t\tmajorResult: Float64Array,\n\t\tminorResult: Float64Array\n\t): void {\n\t\tthis._tick.calculate(\n\t\t\tdomainFrom,\n\t\t\tdomainTo,\n\t\t\tmajorCount,\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 && 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"]}

package/dist/wcardinal/ui/d-chart-coordinate-log-tick.js CHANGED Viewed

@@ -2,26 +2,48 @@
  * Copyright (C) 2019 Toshiba Corporation
  * SPDX-License-Identifier: Apache-2.0
  */
+import { DThemes } from "./theme/d-themes";
+import { isNumber } from "./util/is-number";
 var DChartCoordinateLogTick = /** @class */ (function () {
-    function DChartCoordinateLogTick(theme) {
-        this._theme = theme;
+    function DChartCoordinateLogTick(options) {
+        this._theme = this.toTheme(options);
     }
-    DChartCoordinateLogTick.prototype.calcStepMajor = function (domainMin, domainMax, count) {
-        if (0 < count) {
-            var span = Math.abs(domainMax - domainMin) / count;
-            var power = Math.floor(Math.log(span) / Math.LN10);
-            var base = Math.pow(10, power);
-            return this._theme.toStepScale(span / base) * base;
+    DChartCoordinateLogTick.prototype.toMajorStep = function (domainMin, domainMax, majorCount, majorStep) {
+        if (majorStep == null) {
+            if (0 < majorCount) {
+                return this.calcStepMajor(domainMin, domainMax, majorCount);
+            }
+            return -1;
         }
-        return -1;
-    };
-    DChartCoordinateLogTick.prototype.calcStepMinor = function (step, minorCount) {
-        if (0 <= step) {
-            return step / (minorCount + 1);
+        else if (isNumber(majorStep)) {
+            return majorStep;
         }
         else {
+            return majorStep(domainMin, domainMax, majorCount);
+        }
+    };
+    DChartCoordinateLogTick.prototype.calcStepMajor = function (domainMin, domainMax, majorCount) {
+        var span = Math.abs(domainMax - domainMin) / majorCount;
+        var power = Math.floor(Math.log(span) / Math.LN10);
+        var base = Math.pow(10, power);
+        return this._theme.toStepScale(span / base) * base;
+    };
+    DChartCoordinateLogTick.prototype.toMinorStep = function (majorStep, minorCount, minorStep) {
+        if (minorStep == null) {
+            if (0 <= majorStep) {
+                return this.calcStepMinor(majorStep, minorCount);
+            }
             return -1;
         }
+        else if (isNumber(minorStep)) {
+            return minorStep;
+        }
+        else {
+            return minorStep(majorStep, minorCount);
+        }
+    };
+    DChartCoordinateLogTick.prototype.calcStepMinor = function (majorStep, minorCount) {
+        return majorStep / (minorCount + 1);
     };
     DChartCoordinateLogTick.prototype.calcTickMinorPositions = function (step, count, majorPosition, rangeMin, rangeMax, iresult, result) {
         for (var i = 0; i < count; i += 1) {
@@ -31,7 +53,7 @@ var DChartCoordinateLogTick = /** @class */ (function () {
             }
         }
     };
-    DChartCoordinateLogTick.prototype.calculate = function (domainFrom, domainTo, majorCount, minorCountPerMajor, minorCount, majorResult, minorResult, coordinate) {
+    DChartCoordinateLogTick.prototype.calculate = function (domainFrom, domainTo, majorCount, majorStep, minorCountPerMajor, minorCount, minorStep, majorResult, minorResult, coordinate) {
         if (majorCount <= 0) {
             return;
         }
@@ -40,7 +62,7 @@ var DChartCoordinateLogTick = /** @class */ (function () {
         var domainToMapped = coordinate.map(domainTo);
         var domainMinMapped = Math.min(domainFromMapped, domainToMapped);
         var domainMaxMapped = Math.max(domainFromMapped, domainToMapped);
-        var majorStepMapped = this.calcStepMajor(domainMinMapped, domainMaxMapped, majorCount);
+        var majorStepMapped = this.toMajorStep(domainMinMapped, domainMaxMapped, majorCount, majorStep);
         if (majorStepMapped <= 0) {
             var domainMin = Math.min(domainFrom, domainTo);
             majorResult[0] = domainMin;
@@ -64,7 +86,7 @@ var DChartCoordinateLogTick = /** @class */ (function () {
         var idomainStartMapped = Math.floor(domainMinMapped / majorStepMapped) - 1;
         var idomainEndMapped = Math.ceil(domainMaxMapped / majorStepMapped) + 1;
         // Major / minor tick positions
-        var minorStepMapped = this.calcStepMinor(majorStepMapped, minorCountPerMajor);
+        var minorStepMapped = this.toMinorStep(majorStepMapped, minorCountPerMajor, minorStep);
         var imajor = 0;
         var iminor = 0;
         for (var i = idomainStartMapped; i <= idomainEndMapped; ++i) {
@@ -72,13 +94,10 @@ var DChartCoordinateLogTick = /** @class */ (function () {
             if (imajor < majorCount) {
                 if (domainMinMapped <= majorPositionMapped &&
                     majorPositionMapped <= domainMaxMapped) {
-                    var majorPosition = coordinate.unmap(majorPositionMapped);
-                    var majorProjectedPosition = transform.map(majorPositionMapped);
-                    var majorStep = coordinate.unmap(majorPositionMapped - 1);
                     var imajorResult = imajor * 3;
-                    majorResult[imajorResult + 0] = majorPosition;
-                    majorResult[imajorResult + 1] = majorProjectedPosition;
-                    majorResult[imajorResult + 2] = majorStep;
+                    majorResult[imajorResult + 0] = coordinate.unmap(majorPositionMapped);
+                    majorResult[imajorResult + 1] = transform.map(majorPositionMapped);
+                    majorResult[imajorResult + 2] = coordinate.unmap(majorPositionMapped - 1);
                     imajor += 1;
                 }
             }
@@ -87,13 +106,10 @@ var DChartCoordinateLogTick = /** @class */ (function () {
                     var minorPositionMapped = majorPositionMapped + (j + 1) * minorStepMapped;
                     if (domainMinMapped <= minorPositionMapped &&
                         minorPositionMapped <= domainMaxMapped) {
-                        var minorPosition = coordinate.unmap(minorPositionMapped);
-                        var minorProjectedPosition = transform.map(minorPositionMapped);
-                        var minorStep = coordinate.unmap(minorPositionMapped - 1);
                         var iminorResult = iminor * 3;
-                        minorResult[iminorResult + 0] = minorPosition;
-                        minorResult[iminorResult + 1] = minorProjectedPosition;
-                        minorResult[iminorResult + 2] = minorStep;
+                        minorResult[iminorResult + 0] = coordinate.unmap(minorPositionMapped);
+                        minorResult[iminorResult + 1] = transform.map(minorPositionMapped);
+                        minorResult[iminorResult + 2] = coordinate.unmap(minorPositionMapped - 1);
                         iminor += 1;
                     }
                 }
@@ -112,6 +128,15 @@ var DChartCoordinateLogTick = /** @class */ (function () {
             minorResult[iminorResult + 2] = NaN;
         }
     };
+    DChartCoordinateLogTick.prototype.toTheme = function (options) {
+        return (options && options.theme) || this.getThemeDefault();
+    };
+    DChartCoordinateLogTick.prototype.getThemeDefault = function () {
+        return DThemes.getInstance().get(this.getType());
+    };
+    DChartCoordinateLogTick.prototype.getType = function () {
+        return "DChartCoordinateTick";
+    };
     return DChartCoordinateLogTick;
 }());
 export { DChartCoordinateLogTick };

package/dist/wcardinal/ui/d-chart-coordinate-log-tick.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"d-chart-coordinate-log-tick.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-coordinate-log-tick.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\";\n\nexport interface DThemeChartCoordinateLogTick {\n\ttoStepScale(scale: number): number;\n}\n\nexport class DChartCoordinateLogTick<CHART extends DBase = DBase> {\n\tprotected _theme: DThemeChartCoordinateLogTick;\n\n\tconstructor(theme: DThemeChartCoordinateLogTick) {\n\t\tthis._theme = theme;\n\t}\n\n\tprotected calcStepMajor(domainMin: number, domainMax: number, count: number): number {\n\t\tif (0 < count) {\n\t\t\tconst span = Math.abs(domainMax - domainMin) / count;\n\t\t\tconst power = Math.floor(Math.log(span) / Math.LN10);\n\t\t\tconst base = Math.pow(10, power);\n\t\t\treturn this._theme.toStepScale(span / base) base;\n\t\t}\n\t\treturn -1;\n\t}\n\n\tprotected calcStepMinor(step: number, minorCount: number): number {\n\t\tif (0 <= step) {\n\t\t\treturn step / (minorCount + 1);\n\t\t} else {\n\t\t\treturn -1;\n\t\t}\n\t}\n\n\tprotected calcTickMinorPositions(\n\t\tstep: number,\n\t\tcount: number,\n\t\tmajorPosition: number,\n\t\trangeMin: number,\n\t\trangeMax: number,\n\t\tiresult: number,\n\t\tresult: Float64Array\n\t): void {\n\t\tfor (let i = 0; i < count; i += 1) {\n\t\t\tconst minorPosition = majorPosition + (i + 1) * step;\n\t\t\tif (rangeMin <= minorPosition && minorPosition <= rangeMax) {\n\t\t\t\tresult[iresult++] = minorPosition;\n\t\t\t}\n\t\t}\n\t}\n\n\tcalculate(\n\t\tdomainFrom: number,\n\t\tdomainTo: number,\n\t\tmajorCount: number,\n\t\tminorCountPerMajor: number,\n\t\tminorCount: number,\n\t\tmajorResult: Float64Array,\n\t\tminorResult: Float64Array,\n\t\tcoordinate: DChartCoordinate<CHART>\n\t): void {\n\t\tif (majorCount <= 0) {\n\t\t\treturn;\n\t\t}\n\n\t\tconst transform = coordinate.transform;\n\n\t\tconst domainFromMapped = coordinate.map(domainFrom);\n\t\tconst domainToMapped = coordinate.map(domainTo);\n\n\t\tconst domainMinMapped = Math.min(domainFromMapped, domainToMapped);\n\t\tconst domainMaxMapped = Math.max(domainFromMapped, domainToMapped);\n\n\t\tconst majorStepMapped = this.calcStepMajor(domainMinMapped, domainMaxMapped, majorCount);\n\t\tif (majorStepMapped <= 0) {\n\t\t\tconst domainMin = Math.min(domainFrom, domainTo);\n\t\t\tmajorResult[0] = domainMin;\n\t\t\tmajorResult[1] = transform.map(coordinate.map(domainMin));\n\t\t\tmajorResult[2] = 0;\n\t\t\tfor (let i = 1; i < majorCount; ++i) {\n\t\t\t\tconst imajorResult = i * 3;\n\t\t\t\tmajorResult[imajorResult + 0] = NaN;\n\t\t\t\tmajorResult[imajorResult + 1] = NaN;\n\t\t\t\tmajorResult[imajorResult + 2] = NaN;\n\t\t\t}\n\t\t\tfor (let i = 0; i < minorCount; ++i) {\n\t\t\t\tconst iminorResult = i * 3;\n\t\t\t\tminorResult[iminorResult + 0] = NaN;\n\t\t\t\tminorResult[iminorResult + 1] = NaN;\n\t\t\t\tminorResult[iminorResult + 2] = NaN;\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\n\t\t// Major tick start position\n\t\tconst idomainStartMapped = Math.floor(domainMinMapped / majorStepMapped) - 1;\n\t\tconst idomainEndMapped = Math.ceil(domainMaxMapped / majorStepMapped) + 1;\n\n\t\t// Major / minor tick positions\n\t\tconst minorStepMapped = this.calcStepMinor(majorStepMapped, minorCountPerMajor);\n\t\tlet imajor = 0;\n\t\tlet iminor = 0;\n\t\tfor (let i = idomainStartMapped; i <= idomainEndMapped; ++i) {\n\t\t\tconst majorPositionMapped = i * majorStepMapped;\n\t\t\tif (imajor < majorCount) {\n\t\t\t\tif (\n\t\t\t\t\tdomainMinMapped <= majorPositionMapped &&\n\t\t\t\t\tmajorPositionMapped <= domainMaxMapped\n\t\t\t\t) {\n\t\t\t\t\tconst majorPosition = coordinate.unmap(majorPositionMapped);\n\t\t\t\t\tconst majorProjectedPosition = transform.map(majorPositionMapped);\n\t\t\t\t\tconst majorStep = coordinate.unmap(majorPositionMapped - 1);\n\t\t\t\t\tconst imajorResult = imajor * 3;\n\t\t\t\t\tmajorResult[imajorResult + 0] = majorPosition;\n\t\t\t\t\tmajorResult[imajorResult + 1] = majorProjectedPosition;\n\t\t\t\t\tmajorResult[imajorResult + 2] = majorStep;\n\t\t\t\t\timajor += 1;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tfor (let j = 0; j < minorCountPerMajor; j += 1) {\n\t\t\t\tif (iminor < minorCount) {\n\t\t\t\t\tconst minorPositionMapped = majorPositionMapped + (j + 1) * minorStepMapped;\n\t\t\t\t\tif (\n\t\t\t\t\t\tdomainMinMapped <= minorPositionMapped &&\n\t\t\t\t\t\tminorPositionMapped <= domainMaxMapped\n\t\t\t\t\t) {\n\t\t\t\t\t\tconst minorPosition = coordinate.unmap(minorPositionMapped);\n\t\t\t\t\t\tconst minorProjectedPosition = transform.map(minorPositionMapped);\n\t\t\t\t\t\tconst minorStep = coordinate.unmap(minorPositionMapped - 1);\n\t\t\t\t\t\tconst iminorResult = iminor * 3;\n\t\t\t\t\t\tminorResult[iminorResult + 0] = minorPosition;\n\t\t\t\t\t\tminorResult[iminorResult + 1] = minorProjectedPosition;\n\t\t\t\t\t\tminorResult[iminorResult + 2] = minorStep;\n\t\t\t\t\t\timinor += 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tfor (let i = imajor; i < majorCount; ++i) {\n\t\t\tconst imajorResult = i * 3;\n\t\t\tmajorResult[imajorResult + 0] = NaN;\n\t\t\tmajorResult[imajorResult + 1] = NaN;\n\t\t\tmajorResult[imajorResult + 2] = NaN;\n\t\t}\n\t\tfor (let i = iminor; i < minorCount; ++i) {\n\t\t\tconst iminorResult = i * 3;\n\t\t\tminorResult[iminorResult + 0] = NaN;\n\t\t\tminorResult[iminorResult + 1] = NaN;\n\t\t\tminorResult[iminorResult + 2] = NaN;\n\t\t}\n\t}\n}\n"]}
1	+ {"version":3,"file":"d-chart-coordinate-log-tick.js","sourceRoot":"","sources":["../../../src/main/typescript/wcardinal/ui/d-chart-coordinate-log-tick.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 { DChartCoordinateTickOptions, DThemeChartCoordinateTick } 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 { DThemes } from \"./theme/d-themes\";\nimport { isNumber } from \"./util/is-number\";\n\nexport interface DThemeChartCoordinateLogTick extends DThemeChartCoordinateTick {}\n\nexport class DChartCoordinateLogTick<CHART extends DBase = DBase> {\n\tprotected _theme: DThemeChartCoordinateTick;\n\n\tconstructor(options?: DChartCoordinateTickOptions) {\n\t\tthis._theme = this.toTheme(options);\n\t}\n\n\tprotected toMajorStep(\n\t\tdomainMin: number,\n\t\tdomainMax: number,\n\t\tmajorCount: number,\n\t\tmajorStep?: number \| DChartCoordinateTickMajorStepFunction\n\t): number {\n\t\tif (majorStep == null) {\n\t\t\tif (0 < majorCount) {\n\t\t\t\treturn this.calcStepMajor(domainMin, domainMax, majorCount);\n\t\t\t}\n\t\t\treturn -1;\n\t\t} else if (isNumber(majorStep)) {\n\t\t\treturn majorStep;\n\t\t} else {\n\t\t\treturn majorStep(domainMin, domainMax, majorCount);\n\t\t}\n\t}\n\n\tprotected calcStepMajor(domainMin: number, domainMax: number, majorCount: number): number {\n\t\tconst span = Math.abs(domainMax - domainMin) / majorCount;\n\t\tconst power = Math.floor(Math.log(span) / Math.LN10);\n\t\tconst base = Math.pow(10, power);\n\t\treturn this._theme.toStepScale(span / base) base;\n\t}\n\n\tprotected toMinorStep(\n\t\tmajorStep: number,\n\t\tminorCount: number,\n\t\tminorStep?: number \| DChartCoordinateTickMinorStepFunction\n\t): number {\n\t\tif (minorStep == null) {\n\t\t\tif (0 <= majorStep) {\n\t\t\t\treturn this.calcStepMinor(majorStep, minorCount);\n\t\t\t}\n\t\t\treturn -1;\n\t\t} else if (isNumber(minorStep)) {\n\t\t\treturn minorStep;\n\t\t} else {\n\t\t\treturn minorStep(majorStep, minorCount);\n\t\t}\n\t}\n\n\tprotected calcStepMinor(majorStep: number, minorCount: number): number {\n\t\treturn majorStep / (minorCount + 1);\n\t}\n\n\tprotected calcTickMinorPositions(\n\t\tstep: number,\n\t\tcount: number,\n\t\tmajorPosition: number,\n\t\trangeMin: number,\n\t\trangeMax: number,\n\t\tiresult: number,\n\t\tresult: Float64Array\n\t): void {\n\t\tfor (let i = 0; i < count; i += 1) {\n\t\t\tconst minorPosition = majorPosition + (i + 1) * step;\n\t\t\tif (rangeMin <= minorPosition && minorPosition <= rangeMax) {\n\t\t\t\tresult[iresult++] = minorPosition;\n\t\t\t}\n\t\t}\n\t}\n\n\tcalculate(\n\t\tdomainFrom: number,\n\t\tdomainTo: number,\n\t\tmajorCount: number,\n\t\tmajorStep: number \| DChartCoordinateTickMajorStepFunction \| undefined,\n\t\tminorCountPerMajor: number,\n\t\tminorCount: number,\n\t\tminorStep: number \| DChartCoordinateTickMinorStepFunction \| undefined,\n\t\tmajorResult: Float64Array,\n\t\tminorResult: Float64Array,\n\t\tcoordinate: DChartCoordinate<CHART>\n\t): void {\n\t\tif (majorCount <= 0) {\n\t\t\treturn;\n\t\t}\n\n\t\tconst transform = coordinate.transform;\n\n\t\tconst domainFromMapped = coordinate.map(domainFrom);\n\t\tconst domainToMapped = coordinate.map(domainTo);\n\n\t\tconst domainMinMapped = Math.min(domainFromMapped, domainToMapped);\n\t\tconst domainMaxMapped = Math.max(domainFromMapped, domainToMapped);\n\n\t\tconst majorStepMapped = this.toMajorStep(\n\t\t\tdomainMinMapped,\n\t\t\tdomainMaxMapped,\n\t\t\tmajorCount,\n\t\t\tmajorStep\n\t\t);\n\t\tif (majorStepMapped <= 0) {\n\t\t\tconst domainMin = Math.min(domainFrom, domainTo);\n\t\t\tmajorResult[0] = domainMin;\n\t\t\tmajorResult[1] = transform.map(coordinate.map(domainMin));\n\t\t\tmajorResult[2] = 0;\n\t\t\tfor (let i = 1; i < majorCount; ++i) {\n\t\t\t\tconst imajorResult = i * 3;\n\t\t\t\tmajorResult[imajorResult + 0] = NaN;\n\t\t\t\tmajorResult[imajorResult + 1] = NaN;\n\t\t\t\tmajorResult[imajorResult + 2] = NaN;\n\t\t\t}\n\t\t\tfor (let i = 0; i < minorCount; ++i) {\n\t\t\t\tconst iminorResult = i * 3;\n\t\t\t\tminorResult[iminorResult + 0] = NaN;\n\t\t\t\tminorResult[iminorResult + 1] = NaN;\n\t\t\t\tminorResult[iminorResult + 2] = NaN;\n\t\t\t}\n\t\t\treturn;\n\t\t}\n\n\t\t// Major tick start position\n\t\tconst idomainStartMapped = Math.floor(domainMinMapped / majorStepMapped) - 1;\n\t\tconst idomainEndMapped = Math.ceil(domainMaxMapped / majorStepMapped) + 1;\n\n\t\t// Major / minor tick positions\n\t\tconst minorStepMapped = this.toMinorStep(majorStepMapped, minorCountPerMajor, minorStep);\n\t\tlet imajor = 0;\n\t\tlet iminor = 0;\n\t\tfor (let i = idomainStartMapped; i <= idomainEndMapped; ++i) {\n\t\t\tconst majorPositionMapped = i * majorStepMapped;\n\t\t\tif (imajor < majorCount) {\n\t\t\t\tif (\n\t\t\t\t\tdomainMinMapped <= majorPositionMapped &&\n\t\t\t\t\tmajorPositionMapped <= domainMaxMapped\n\t\t\t\t) {\n\t\t\t\t\tconst imajorResult = imajor * 3;\n\t\t\t\t\tmajorResult[imajorResult + 0] = coordinate.unmap(majorPositionMapped);\n\t\t\t\t\tmajorResult[imajorResult + 1] = transform.map(majorPositionMapped);\n\t\t\t\t\tmajorResult[imajorResult + 2] = coordinate.unmap(majorPositionMapped - 1);\n\t\t\t\t\timajor += 1;\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tfor (let j = 0; j < minorCountPerMajor; j += 1) {\n\t\t\t\tif (iminor < minorCount) {\n\t\t\t\t\tconst minorPositionMapped = majorPositionMapped + (j + 1) * minorStepMapped;\n\t\t\t\t\tif (\n\t\t\t\t\t\tdomainMinMapped <= minorPositionMapped &&\n\t\t\t\t\t\tminorPositionMapped <= domainMaxMapped\n\t\t\t\t\t) {\n\t\t\t\t\t\tconst iminorResult = iminor * 3;\n\t\t\t\t\t\tminorResult[iminorResult + 0] = coordinate.unmap(minorPositionMapped);\n\t\t\t\t\t\tminorResult[iminorResult + 1] = transform.map(minorPositionMapped);\n\t\t\t\t\t\tminorResult[iminorResult + 2] = coordinate.unmap(minorPositionMapped - 1);\n\t\t\t\t\t\timinor += 1;\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tfor (let i = imajor; i < majorCount; ++i) {\n\t\t\tconst imajorResult = i * 3;\n\t\t\tmajorResult[imajorResult + 0] = NaN;\n\t\t\tmajorResult[imajorResult + 1] = NaN;\n\t\t\tmajorResult[imajorResult + 2] = NaN;\n\t\t}\n\t\tfor (let i = iminor; i < minorCount; ++i) {\n\t\t\tconst iminorResult = i * 3;\n\t\t\tminorResult[iminorResult + 0] = NaN;\n\t\t\tminorResult[iminorResult + 1] = NaN;\n\t\t\tminorResult[iminorResult + 2] = NaN;\n\t\t}\n\t}\n\n\tprotected toTheme(options?: DChartCoordinateTickOptions): DThemeChartCoordinateTick {\n\t\treturn (options && options.theme) \|\| this.getThemeDefault();\n\t}\n\n\tprotected getThemeDefault(): DThemeChartCoordinateTick {\n\t\treturn DThemes.getInstance().get(this.getType());\n\t}\n\n\tprotected getType(): string {\n\t\treturn \"DChartCoordinateTick\";\n\t}\n}\n"]}