@wcardinal/wcardinal-ui 0.457.0 → 0.457.1

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.
@@ -145,8 +145,12 @@ var EShapePointsMarkerBase = /** @class */ (function () {
145
145
  this.onFillChange();
146
146
  };
147
147
  EShapePointsMarkerBase.prototype.copy = function (source) {
148
+ this.lock();
149
+ this.type = source.type;
148
150
  var size = source.size;
149
- this.set(source.type, size.x, size.y);
151
+ this.size.set(size.x, size.y);
152
+ this.fill.copy(source.fill);
153
+ this.unlock();
150
154
  return this;
151
155
  };
152
156
  EShapePointsMarkerBase.prototype.set = function (type, sizeX, sizeY) {
@@ -1 +1 @@
1
- {"version":3,"file":"e-shape-points-marker-base.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/shape/e-shape-points-marker-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 { IPoint, Matrix, ObservablePoint } from \"pixi.js\";\nimport { EShapeDefaults } from \"./e-shape-defaults\";\nimport { EShapeFill } from \"./e-shape-fill\";\nimport { EShapePointsFormatted } from \"./e-shape-points-formatted\";\nimport { EShapePointsMarker, EShapePointsMarkerSerizlized } from \"./e-shape-points-marker\";\nimport { EShapePointsMarkerType } from \"./e-shape-points-marker-type\";\nimport { EShapeResourceManagerDeserialization } from \"./e-shape-resource-manager-deserialization\";\nimport { EShapeResourceManagerSerialization } from \"./e-shape-resource-manager-serialization\";\nimport { EShapeFillImpl } from \"./variant/e-shape-fill-impl\";\n\nexport interface EShapePointsMarkerBaseParentParent {\n\treadonly id: number;\n\treadonly formatted: EShapePointsFormatted;\n}\n\nexport interface EShapePointsMarkerBaseParent {\n\treadonly parent: EShapePointsMarkerBaseParentParent;\n\tonTypeChange(): void;\n\tonSizeChange(): void;\n\tonFillChange(): void;\n}\n\nexport abstract class EShapePointsMarkerBase implements EShapePointsMarker {\n\tprotected _parent: EShapePointsMarkerBaseParent;\n\tprotected _lockCount: number;\n\tprotected _isTypeChanged: boolean;\n\tprotected _isSizeChanged: boolean;\n\tprotected _isFillChanged: boolean;\n\tprotected _type: EShapePointsMarkerType;\n\tprotected _size: IPoint;\n\tprotected _transform?: Matrix;\n\tprotected _transformId: number;\n\tprotected _fill: EShapeFill;\n\n\tconstructor(parent: EShapePointsMarkerBaseParent) {\n\t\tthis._parent = parent;\n\t\tthis._lockCount = 0;\n\t\tthis._isTypeChanged = false;\n\t\tthis._isSizeChanged = false;\n\t\tthis._isFillChanged = false;\n\t\tthis._type = EShapePointsMarkerType.NONE;\n\t\tthis._size = new ObservablePoint(\n\t\t\t(): void => {\n\t\t\t\tthis.onSizeChange();\n\t\t\t},\n\t\t\tundefined,\n\t\t\tEShapeDefaults.SIZE_X * 0.15,\n\t\t\tEShapeDefaults.SIZE_Y * 0.15\n\t\t);\n\t\tthis._fill = this.newFill();\n\t\tthis._transformId = 0;\n\t}\n\n\tprotected newFill(): EShapeFill {\n\t\treturn new EShapeFillImpl(this, true, EShapeDefaults.FILL_COLOR, 1);\n\t}\n\n\tlock(): this {\n\t\tthis._lockCount += 1;\n\t\tif (this._lockCount === 1) {\n\t\t\tthis._isTypeChanged = false;\n\t\t\tthis._isSizeChanged = false;\n\t\t\tthis._isFillChanged = false;\n\t\t}\n\t\treturn this;\n\t}\n\n\tunlock(): this {\n\t\tthis._lockCount -= 1;\n\t\tif (this._lockCount === 0) {\n\t\t\tif (this._isTypeChanged) {\n\t\t\t\tthis.onTypeChange();\n\t\t\t} else if (this._isSizeChanged) {\n\t\t\t\tthis.onSizeChange();\n\t\t\t} else if (this._isFillChanged) {\n\t\t\t\tthis.onFillChange();\n\t\t\t}\n\t\t\tthis._isTypeChanged = false;\n\t\t\tthis._isSizeChanged = false;\n\t\t\tthis._isFillChanged = false;\n\t\t}\n\t\treturn this;\n\t}\n\n\tget type(): EShapePointsMarkerType {\n\t\treturn this._type;\n\t}\n\n\tset type(type: EShapePointsMarkerType) {\n\t\tif (this._type !== type) {\n\t\t\tthis._type = type;\n\t\t\tthis.onTypeChange();\n\t\t}\n\t}\n\n\tprotected onTypeChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isTypeChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onTypeChange();\n\t}\n\n\tget size(): IPoint {\n\t\treturn this._size;\n\t}\n\n\tprotected onSizeChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isSizeChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onSizeChange();\n\t}\n\n\tget transform(): Matrix {\n\t\treturn this.updateTransform();\n\t}\n\n\tprotected updateTransform(): Matrix {\n\t\tlet result = this._transform;\n\t\tif (result == null) {\n\t\t\tresult = new Matrix();\n\t\t\tthis._transform = result;\n\t\t}\n\t\tconst parentParent = this._parent.parent;\n\t\tconst id = parentParent.id;\n\t\tif (this._transformId !== id) {\n\t\t\tthis._transformId = id;\n\t\t\tconst formatted = parentParent.formatted;\n\t\t\tif (2 <= formatted.length) {\n\t\t\t\tthis.toTransform(formatted.values, result);\n\t\t\t} else {\n\t\t\t\tresult.identity();\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected abstract toTransform(values: number[], result: Matrix): Matrix;\n\n\tprotected toTransformMatrix(\n\t\tx0: number,\n\t\ty0: number,\n\t\tx1: number,\n\t\ty1: number,\n\t\tresult: Matrix\n\t): Matrix {\n\t\tconst dx = x0 - x1;\n\t\tconst dy = y0 - y1;\n\t\tconst n = dx * dx + dy * dy;\n\t\tif (0.00001 < n) {\n\t\t\tconst f = 1 / Math.sqrt(n);\n\t\t\tconst nx = dx * f;\n\t\t\tconst ny = dy * f;\n\t\t\tresult.set(ny, -nx, -nx, -ny, x0, y0);\n\t\t} else {\n\t\t\tresult.set(1, 0, 0, 1, x0, y0);\n\t\t}\n\t\treturn result;\n\t}\n\n\tget fill(): EShapeFill {\n\t\treturn this._fill;\n\t}\n\n\tprotected onFillChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isFillChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onFillChange();\n\t}\n\n\tupdateUploaded(): void {\n\t\tthis.onFillChange();\n\t}\n\n\tcopy(source: EShapePointsMarker): this {\n\t\tconst size = source.size;\n\t\tthis.set(source.type, size.x, size.y);\n\t\treturn this;\n\t}\n\n\tset(type?: EShapePointsMarkerType, sizeX?: number, sizeY?: number): this {\n\t\tthis.lock();\n\n\t\tif (type != null) {\n\t\t\tthis.type = type;\n\t\t}\n\n\t\tthis.size.set(sizeX, sizeY);\n\n\t\tthis.unlock();\n\t\treturn this;\n\t}\n\n\tserialize(manager: EShapeResourceManagerSerialization): number {\n\t\tconst size = this._size;\n\t\tconst fillId = this._fill.serialize(manager);\n\t\treturn manager.addResource(`[${this._type},${size.x},${size.y},${fillId}]`);\n\t}\n\n\tdeserialize(resourceId: number, manager: EShapeResourceManagerDeserialization): void {\n\t\tconst resources = manager.resources;\n\t\tif (0 <= resourceId && resourceId < resources.length) {\n\t\t\tlet parsed = manager.getExtension<EShapePointsMarkerSerizlized>(resourceId);\n\t\t\tif (parsed == null) {\n\t\t\t\tparsed = JSON.parse(resources[resourceId]) as EShapePointsMarkerSerizlized;\n\t\t\t\tmanager.setExtension(resourceId, parsed);\n\t\t\t}\n\t\t\tthis.lock();\n\t\t\tthis.type = parsed[0];\n\t\t\tthis._size.set(parsed[1], parsed[2]);\n\t\t\tthis._fill.deserialize(parsed[3], manager);\n\t\t\tthis.unlock();\n\t\t}\n\t}\n}\n"]}
1
+ {"version":3,"file":"e-shape-points-marker-base.js","sourceRoot":"","sources":["../../../../src/main/typescript/wcardinal/ui/shape/e-shape-points-marker-base.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAU,MAAM,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAGtE,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAc7D;IAYC,gCAAY,MAAoC;QAAhD,iBAiBC;QAhBA,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACpB,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC5B,IAAI,CAAC,KAAK,GAAG,sBAAsB,CAAC,IAAI,CAAC;QACzC,IAAI,CAAC,KAAK,GAAG,IAAI,eAAe,CAC/B;YACC,KAAI,CAAC,YAAY,EAAE,CAAC;QACrB,CAAC,EACD,SAAS,EACT,cAAc,CAAC,MAAM,GAAG,IAAI,EAC5B,cAAc,CAAC,MAAM,GAAG,IAAI,CAC5B,CAAC;QACF,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,YAAY,GAAG,CAAC,CAAC;IACvB,CAAC;IAES,wCAAO,GAAjB;QACC,OAAO,IAAI,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;IAED,qCAAI,GAAJ;QACC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;QACrB,IAAI,IAAI,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC7B,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,uCAAM,GAAN;QACC,IAAI,CAAC,UAAU,IAAI,CAAC,CAAC;QACrB,IAAI,IAAI,CAAC,UAAU,KAAK,CAAC,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACzB,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC;iBAAM,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBAChC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC;iBAAM,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBAChC,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC;YACD,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;YAC5B,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;QAC7B,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IAED,sBAAI,wCAAI;aAAR;YACC,OAAO,IAAI,CAAC,KAAK,CAAC;QACnB,CAAC;aAED,UAAS,IAA4B;YACpC,IAAI,IAAI,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;gBAClB,IAAI,CAAC,YAAY,EAAE,CAAC;YACrB,CAAC;QACF,CAAC;;;OAPA;IASS,6CAAY,GAAtB;QACC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,OAAO;QACR,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;IAED,sBAAI,wCAAI;aAAR;YACC,OAAO,IAAI,CAAC,KAAK,CAAC;QACnB,CAAC;;;OAAA;IAES,6CAAY,GAAtB;QACC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,OAAO;QACR,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;IAED,sBAAI,6CAAS;aAAb;YACC,OAAO,IAAI,CAAC,eAAe,EAAE,CAAC;QAC/B,CAAC;;;OAAA;IAES,gDAAe,GAAzB;QACC,IAAI,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC;QAC7B,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;YACpB,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC;YACtB,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;QAC1B,CAAC;QACD,IAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;QACzC,IAAM,EAAE,GAAG,YAAY,CAAC,EAAE,CAAC;QAC3B,IAAI,IAAI,CAAC,YAAY,KAAK,EAAE,EAAE,CAAC;YAC9B,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;YACvB,IAAM,SAAS,GAAG,YAAY,CAAC,SAAS,CAAC;YACzC,IAAI,CAAC,IAAI,SAAS,CAAC,MAAM,EAAE,CAAC;gBAC3B,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC5C,CAAC;iBAAM,CAAC;gBACP,MAAM,CAAC,QAAQ,EAAE,CAAC;YACnB,CAAC;QACF,CAAC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAIS,kDAAiB,GAA3B,UACC,EAAU,EACV,EAAU,EACV,EAAU,EACV,EAAU,EACV,MAAc;QAEd,IAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QACnB,IAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QACnB,IAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QAC5B,IAAI,OAAO,GAAG,CAAC,EAAE,CAAC;YACjB,IAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3B,IAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YAClB,IAAM,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YAClB,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACvC,CAAC;aAAM,CAAC;YACP,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,MAAM,CAAC;IACf,CAAC;IAED,sBAAI,wCAAI;aAAR;YACC,OAAO,IAAI,CAAC,KAAK,CAAC;QACnB,CAAC;;;OAAA;IAES,6CAAY,GAAtB;QACC,IAAI,CAAC,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACzB,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,OAAO;QACR,CAAC;QACD,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;IAC7B,CAAC;IAED,+CAAc,GAAd;QACC,IAAI,CAAC,YAAY,EAAE,CAAC;IACrB,CAAC;IAED,qCAAI,GAAJ,UAAK,MAA0B;QAC9B,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACxB,IAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC5B,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACb,CAAC;IAED,oCAAG,GAAH,UAAI,IAA6B,EAAE,KAAc,EAAE,KAAc;QAChE,IAAI,CAAC,IAAI,EAAE,CAAC;QAEZ,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YAClB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAClB,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAE5B,IAAI,CAAC,MAAM,EAAE,CAAC;QACd,OAAO,IAAI,CAAC;IACb,CAAC;IAED,0CAAS,GAAT,UAAU,OAA2C;QACpD,IAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;QACxB,IAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAC7C,OAAO,OAAO,CAAC,WAAW,CAAC,WAAI,IAAI,CAAC,KAAK,cAAI,IAAI,CAAC,CAAC,cAAI,IAAI,CAAC,CAAC,cAAI,MAAM,MAAG,CAAC,CAAC;IAC7E,CAAC;IAED,4CAAW,GAAX,UAAY,UAAkB,EAAE,OAA6C;QAC5E,IAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;QACpC,IAAI,CAAC,IAAI,UAAU,IAAI,UAAU,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC;YACtD,IAAI,MAAM,GAAG,OAAO,CAAC,YAAY,CAA+B,UAAU,CAAC,CAAC;YAC5E,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;gBACpB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CAAC,CAAiC,CAAC;gBAC3E,OAAO,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC1C,CAAC;YACD,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,IAAI,CAAC,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACtB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YACrC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;YAC3C,IAAI,CAAC,MAAM,EAAE,CAAC;QACf,CAAC;IACF,CAAC;IACF,6BAAC;AAAD,CAAC,AAxMD,IAwMC","sourcesContent":["/*\n * Copyright (C) 2019 Toshiba Corporation\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport { IPoint, Matrix, ObservablePoint } from \"pixi.js\";\nimport { EShapeDefaults } from \"./e-shape-defaults\";\nimport { EShapeFill } from \"./e-shape-fill\";\nimport { EShapePointsFormatted } from \"./e-shape-points-formatted\";\nimport { EShapePointsMarker, EShapePointsMarkerSerizlized } from \"./e-shape-points-marker\";\nimport { EShapePointsMarkerType } from \"./e-shape-points-marker-type\";\nimport { EShapeResourceManagerDeserialization } from \"./e-shape-resource-manager-deserialization\";\nimport { EShapeResourceManagerSerialization } from \"./e-shape-resource-manager-serialization\";\nimport { EShapeFillImpl } from \"./variant/e-shape-fill-impl\";\n\nexport interface EShapePointsMarkerBaseParentParent {\n\treadonly id: number;\n\treadonly formatted: EShapePointsFormatted;\n}\n\nexport interface EShapePointsMarkerBaseParent {\n\treadonly parent: EShapePointsMarkerBaseParentParent;\n\tonTypeChange(): void;\n\tonSizeChange(): void;\n\tonFillChange(): void;\n}\n\nexport abstract class EShapePointsMarkerBase implements EShapePointsMarker {\n\tprotected _parent: EShapePointsMarkerBaseParent;\n\tprotected _lockCount: number;\n\tprotected _isTypeChanged: boolean;\n\tprotected _isSizeChanged: boolean;\n\tprotected _isFillChanged: boolean;\n\tprotected _type: EShapePointsMarkerType;\n\tprotected _size: IPoint;\n\tprotected _transform?: Matrix;\n\tprotected _transformId: number;\n\tprotected _fill: EShapeFill;\n\n\tconstructor(parent: EShapePointsMarkerBaseParent) {\n\t\tthis._parent = parent;\n\t\tthis._lockCount = 0;\n\t\tthis._isTypeChanged = false;\n\t\tthis._isSizeChanged = false;\n\t\tthis._isFillChanged = false;\n\t\tthis._type = EShapePointsMarkerType.NONE;\n\t\tthis._size = new ObservablePoint(\n\t\t\t(): void => {\n\t\t\t\tthis.onSizeChange();\n\t\t\t},\n\t\t\tundefined,\n\t\t\tEShapeDefaults.SIZE_X * 0.15,\n\t\t\tEShapeDefaults.SIZE_Y * 0.15\n\t\t);\n\t\tthis._fill = this.newFill();\n\t\tthis._transformId = 0;\n\t}\n\n\tprotected newFill(): EShapeFill {\n\t\treturn new EShapeFillImpl(this, true, EShapeDefaults.FILL_COLOR, 1);\n\t}\n\n\tlock(): this {\n\t\tthis._lockCount += 1;\n\t\tif (this._lockCount === 1) {\n\t\t\tthis._isTypeChanged = false;\n\t\t\tthis._isSizeChanged = false;\n\t\t\tthis._isFillChanged = false;\n\t\t}\n\t\treturn this;\n\t}\n\n\tunlock(): this {\n\t\tthis._lockCount -= 1;\n\t\tif (this._lockCount === 0) {\n\t\t\tif (this._isTypeChanged) {\n\t\t\t\tthis.onTypeChange();\n\t\t\t} else if (this._isSizeChanged) {\n\t\t\t\tthis.onSizeChange();\n\t\t\t} else if (this._isFillChanged) {\n\t\t\t\tthis.onFillChange();\n\t\t\t}\n\t\t\tthis._isTypeChanged = false;\n\t\t\tthis._isSizeChanged = false;\n\t\t\tthis._isFillChanged = false;\n\t\t}\n\t\treturn this;\n\t}\n\n\tget type(): EShapePointsMarkerType {\n\t\treturn this._type;\n\t}\n\n\tset type(type: EShapePointsMarkerType) {\n\t\tif (this._type !== type) {\n\t\t\tthis._type = type;\n\t\t\tthis.onTypeChange();\n\t\t}\n\t}\n\n\tprotected onTypeChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isTypeChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onTypeChange();\n\t}\n\n\tget size(): IPoint {\n\t\treturn this._size;\n\t}\n\n\tprotected onSizeChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isSizeChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onSizeChange();\n\t}\n\n\tget transform(): Matrix {\n\t\treturn this.updateTransform();\n\t}\n\n\tprotected updateTransform(): Matrix {\n\t\tlet result = this._transform;\n\t\tif (result == null) {\n\t\t\tresult = new Matrix();\n\t\t\tthis._transform = result;\n\t\t}\n\t\tconst parentParent = this._parent.parent;\n\t\tconst id = parentParent.id;\n\t\tif (this._transformId !== id) {\n\t\t\tthis._transformId = id;\n\t\t\tconst formatted = parentParent.formatted;\n\t\t\tif (2 <= formatted.length) {\n\t\t\t\tthis.toTransform(formatted.values, result);\n\t\t\t} else {\n\t\t\t\tresult.identity();\n\t\t\t}\n\t\t}\n\t\treturn result;\n\t}\n\n\tprotected abstract toTransform(values: number[], result: Matrix): Matrix;\n\n\tprotected toTransformMatrix(\n\t\tx0: number,\n\t\ty0: number,\n\t\tx1: number,\n\t\ty1: number,\n\t\tresult: Matrix\n\t): Matrix {\n\t\tconst dx = x0 - x1;\n\t\tconst dy = y0 - y1;\n\t\tconst n = dx * dx + dy * dy;\n\t\tif (0.00001 < n) {\n\t\t\tconst f = 1 / Math.sqrt(n);\n\t\t\tconst nx = dx * f;\n\t\t\tconst ny = dy * f;\n\t\t\tresult.set(ny, -nx, -nx, -ny, x0, y0);\n\t\t} else {\n\t\t\tresult.set(1, 0, 0, 1, x0, y0);\n\t\t}\n\t\treturn result;\n\t}\n\n\tget fill(): EShapeFill {\n\t\treturn this._fill;\n\t}\n\n\tprotected onFillChange(): void {\n\t\tif (0 < this._lockCount) {\n\t\t\tthis._isFillChanged = true;\n\t\t\treturn;\n\t\t}\n\t\tthis._parent.onFillChange();\n\t}\n\n\tupdateUploaded(): void {\n\t\tthis.onFillChange();\n\t}\n\n\tcopy(source: EShapePointsMarker): this {\n\t\tthis.lock();\n\t\tthis.type = source.type;\n\t\tconst size = source.size;\n\t\tthis.size.set(size.x, size.y);\n\t\tthis.fill.copy(source.fill);\n\t\tthis.unlock();\n\t\treturn this;\n\t}\n\n\tset(type?: EShapePointsMarkerType, sizeX?: number, sizeY?: number): this {\n\t\tthis.lock();\n\n\t\tif (type != null) {\n\t\t\tthis.type = type;\n\t\t}\n\n\t\tthis.size.set(sizeX, sizeY);\n\n\t\tthis.unlock();\n\t\treturn this;\n\t}\n\n\tserialize(manager: EShapeResourceManagerSerialization): number {\n\t\tconst size = this._size;\n\t\tconst fillId = this._fill.serialize(manager);\n\t\treturn manager.addResource(`[${this._type},${size.x},${size.y},${fillId}]`);\n\t}\n\n\tdeserialize(resourceId: number, manager: EShapeResourceManagerDeserialization): void {\n\t\tconst resources = manager.resources;\n\t\tif (0 <= resourceId && resourceId < resources.length) {\n\t\t\tlet parsed = manager.getExtension<EShapePointsMarkerSerizlized>(resourceId);\n\t\t\tif (parsed == null) {\n\t\t\t\tparsed = JSON.parse(resources[resourceId]) as EShapePointsMarkerSerizlized;\n\t\t\t\tmanager.setExtension(resourceId, parsed);\n\t\t\t}\n\t\t\tthis.lock();\n\t\t\tthis.type = parsed[0];\n\t\t\tthis._size.set(parsed[1], parsed[2]);\n\t\t\tthis._fill.deserialize(parsed[3], manager);\n\t\t\tthis.unlock();\n\t\t}\n\t}\n}\n"]}
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -13413,8 +13413,12 @@ var EShapePointsMarkerBase = /** @class */ (function () {
13413
13413
  this.onFillChange();
13414
13414
  };
13415
13415
  EShapePointsMarkerBase.prototype.copy = function (source) {
13416
+ this.lock();
13417
+ this.type = source.type;
13416
13418
  var size = source.size;
13417
- this.set(source.type, size.x, size.y);
13419
+ this.size.set(size.x, size.y);
13420
+ this.fill.copy(source.fill);
13421
+ this.unlock();
13418
13422
  return this;
13419
13423
  };
13420
13424
  EShapePointsMarkerBase.prototype.set = function (type, sizeX, sizeY) {
@@ -1,5 +1,5 @@
1
1
  /*
2
- Winter Cardinal UI v0.457.0
2
+ Winter Cardinal UI v0.457.1
3
3
  Copyright (C) 2019 Toshiba Corporation
4
4
  SPDX-License-Identifier: Apache-2.0
5
5
 
@@ -13410,8 +13410,12 @@
13410
13410
  this.onFillChange();
13411
13411
  };
13412
13412
  EShapePointsMarkerBase.prototype.copy = function (source) {
13413
+ this.lock();
13414
+ this.type = source.type;
13413
13415
  var size = source.size;
13414
- this.set(source.type, size.x, size.y);
13416
+ this.size.set(size.x, size.y);
13417
+ this.fill.copy(source.fill);
13418
+ this.unlock();
13415
13419
  return this;
13416
13420
  };
13417
13421
  EShapePointsMarkerBase.prototype.set = function (type, sizeX, sizeY) {