From ad7a620617626a6d3605976f0e9ef431fa24e03e Mon Sep 17 00:00:00 2001
From: Andrea Gottsponer <ago@attr.ch>
Date: Thu, 8 Sep 2022 18:16:43 +0200
Subject: [PATCH] - version update
---
package.json | 4 ++--
src/lib/elements/primitives/ArrowPrimitive.ts | 3 +--
src/lib/elements/primitives/BackgroundRectanglePrimitive.ts | 3 +--
src/lib/elements/primitives/EllipsePrimitive.ts | 3 +--
src/lib/elements/primitives/RectanglePrimitive.ts | 3 +--
src/lib/elements/primitives/TextPrimitive.ts | 5 ++---
src/lib/generators/combinations/ArrowGenerator.ts | 2 +-
src/lib/generators/combinations/EllipseGenerator.ts | 2 +-
src/lib/generators/combinations/RectangleGenerator.ts | 2 +-
src/lib/generators/primitives/ArrowPrimitiveGenerator.ts | 2 +-
src/lib/generators/primitives/EllipsePrimitiveGenerator.ts | 2 +-
src/lib/generators/primitives/RectanglePrimitiveGenerator.ts | 2 +-
src/lib/generators/primitives/TextPrimitiveGenerator.ts | 2 +-
13 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/package.json b/package.json
index 02854a0e..382364b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "medsurf-draw",
- "version": "1.0.229",
+ "version": "1.0.230",
"description": "Draw annotations on jpg/zoomify images, based on PIXI.js",
"keywords": [
"draw",
@@ -29,7 +29,7 @@
"author": "Gottsponer Andrea Leonardo",
"license": "MIT",
"dependencies": {
- "@ascii-dev-user/medsurf-lib": "^1.18.0-138",
+ "@ascii-dev-user/medsurf-lib": "^1.18.0-139",
"@babel/core": "^7.8.4",
"@pixi-essentials/cull": "^1.0.12",
"debounce": "^1.2.1",
diff --git a/src/lib/elements/primitives/ArrowPrimitive.ts b/src/lib/elements/primitives/ArrowPrimitive.ts
index 335f08d1..f796aaae 100644
--- a/src/lib/elements/primitives/ArrowPrimitive.ts
+++ b/src/lib/elements/primitives/ArrowPrimitive.ts
@@ -453,12 +453,11 @@ export class ArrowPrimitive extends BaseElementContainer<Models.ArrowPrimitive,
//<editor-fold desc="Static functions">
/**
* Get instance
- * @param model
* @param hasWedgePoint
* @param rotateWithLine
* @param imageWidth
*/
- public static getInstance(model: Models.PositionPoint, hasWedgePoint: boolean, rotateWithLine: boolean, imageWidth: number): ArrowPrimitive {
+ public static getInstance(hasWedgePoint: boolean, rotateWithLine: boolean, imageWidth: number): ArrowPrimitive {
// Element
// -- Arrow primitive
return new ArrowPrimitive({
diff --git a/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts b/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts
index 2cf61dce..387cfb80 100644
--- a/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts
+++ b/src/lib/elements/primitives/BackgroundRectanglePrimitive.ts
@@ -421,12 +421,11 @@ export class BackgroundRectanglePrimitive extends BaseElementContainer<Models.Ba
//<editor-fold desc="Static functions">
/**
* Get instance
- * @param model
* @param primitiveId
* @param rotateWithLine
* @param imageWidth
*/
- public static getInstance(model: Models.PositionPoint, primitiveId: string, rotateWithLine: boolean, imageWidth: number): BackgroundRectanglePrimitive {
+ public static getInstance(primitiveId: string, rotateWithLine: boolean, imageWidth: number): BackgroundRectanglePrimitive {
// Element
// -- Background rectangle primitive
return new BackgroundRectanglePrimitive({
diff --git a/src/lib/elements/primitives/EllipsePrimitive.ts b/src/lib/elements/primitives/EllipsePrimitive.ts
index 7106fd3b..32165cec 100644
--- a/src/lib/elements/primitives/EllipsePrimitive.ts
+++ b/src/lib/elements/primitives/EllipsePrimitive.ts
@@ -420,11 +420,10 @@ export class EllipsePrimitive extends BaseElementContainer<Models.EllipsePrimiti
//<editor-fold desc="Static functions">
/**
* Get instance
- * @param model
* @param rotateWithLine
* @param imageWidth
*/
- public static getInstance(model: Models.PositionPoint, rotateWithLine: boolean, imageWidth: number): EllipsePrimitive {
+ public static getInstance(rotateWithLine: boolean, imageWidth: number): EllipsePrimitive {
// Element
// -- Ellipse primitive
return new EllipsePrimitive({
diff --git a/src/lib/elements/primitives/RectanglePrimitive.ts b/src/lib/elements/primitives/RectanglePrimitive.ts
index e6a52c88..4f88e5b7 100644
--- a/src/lib/elements/primitives/RectanglePrimitive.ts
+++ b/src/lib/elements/primitives/RectanglePrimitive.ts
@@ -421,11 +421,10 @@ export class RectanglePrimitive extends BaseElementContainer<Models.RectanglePri
//<editor-fold desc="Static functions">
/**
* Get instance
- * @param model
* @param rotateWithLine
* @param imageWidth
*/
- public static getInstance(model: Models.PositionPoint, rotateWithLine: boolean, imageWidth: number): RectanglePrimitive {
+ public static getInstance(rotateWithLine: boolean, imageWidth: number): RectanglePrimitive {
// Element
// -- Rectangle primitive
return new RectanglePrimitive({
diff --git a/src/lib/elements/primitives/TextPrimitive.ts b/src/lib/elements/primitives/TextPrimitive.ts
index dba0f3e0..4ed27faa 100644
--- a/src/lib/elements/primitives/TextPrimitive.ts
+++ b/src/lib/elements/primitives/TextPrimitive.ts
@@ -445,11 +445,10 @@ export class TextPrimitive extends BaseElementContainer<Models.TextPrimitive, Ba
//<editor-fold desc="Static functions">
/**
* Get instance
- * @param model
* @param rotateWithLine
* @param imageWidth
*/
- public static getInstance(model: Models.PositionPoint, rotateWithLine: boolean, imageWidth: number): TextPrimitive {
+ public static getInstance(rotateWithLine: boolean, imageWidth: number): TextPrimitive {
// Element
// -- Text primitive
return new TextPrimitive({
@@ -1452,7 +1451,7 @@ export class TextPrimitive extends BaseElementContainer<Models.TextPrimitive, Ba
const parent = this.parent as MedsurfDraw.PositionPoint;
// Create new background rectangle
- const backgroundRectangle = MedsurfDraw.BackgroundRectanglePrimitive.getInstance(parent.model, this.model.id as string, this.model.rotateWithLine, imageWidth);
+ const backgroundRectangle = MedsurfDraw.BackgroundRectanglePrimitive.getInstance(this.model.id as string, this.model.rotateWithLine, imageWidth);
parent.addChild(backgroundRectangle);
backgroundRectangle.modeInteraction.setDefaultMode("author");
diff --git a/src/lib/generators/combinations/ArrowGenerator.ts b/src/lib/generators/combinations/ArrowGenerator.ts
index a83afd8f..eaa676a0 100644
--- a/src/lib/generators/combinations/ArrowGenerator.ts
+++ b/src/lib/generators/combinations/ArrowGenerator.ts
@@ -181,7 +181,7 @@ export class ArrowGenerator extends BaseGenerator<MedsurfDraw.Image, ArrowGenera
stickMode: MedsurfDraw.StickMode.NOELEMENTS,
startElement: positionPoint,
rotateWithLine: false,
- triggerImmediateEndDraw: false
+ triggerImmediateEndDraw: true
});
this._textPrimitiveGenerator.once("startGenerator", this.startTextPrimitiveGenerator, this);
this._textPrimitiveGenerator.once("endGenerator", this.endTextPrimitiveGenerator, this);
diff --git a/src/lib/generators/combinations/EllipseGenerator.ts b/src/lib/generators/combinations/EllipseGenerator.ts
index d96e2150..625ddb9a 100644
--- a/src/lib/generators/combinations/EllipseGenerator.ts
+++ b/src/lib/generators/combinations/EllipseGenerator.ts
@@ -179,7 +179,7 @@ export class EllipseGenerator extends BaseGenerator<MedsurfDraw.Image, EllipseGe
stickMode: MedsurfDraw.StickMode.NOELEMENTS,
startElement: positionPoint,
rotateWithLine: false,
- triggerImmediateEndDraw: false
+ triggerImmediateEndDraw: true
});
this._textPrimitiveGenerator.once("startGenerator", this.startTextPrimitiveGenerator, this);
this._textPrimitiveGenerator.once("endGenerator", this.endTextPrimitiveGenerator, this);
diff --git a/src/lib/generators/combinations/RectangleGenerator.ts b/src/lib/generators/combinations/RectangleGenerator.ts
index 99be52da..50a3e4fe 100644
--- a/src/lib/generators/combinations/RectangleGenerator.ts
+++ b/src/lib/generators/combinations/RectangleGenerator.ts
@@ -179,7 +179,7 @@ export class RectangleGenerator extends BaseGenerator<MedsurfDraw.Image, Rectang
stickMode: MedsurfDraw.StickMode.NOELEMENTS,
startElement: positionPoint,
rotateWithLine: false,
- triggerImmediateEndDraw: false
+ triggerImmediateEndDraw: true
});
this._textPrimitiveGenerator.once("startGenerator", this.startTextPrimitiveGenerator, this);
this._textPrimitiveGenerator.once("endGenerator", this.endTextPrimitiveGenerator, this);
diff --git a/src/lib/generators/primitives/ArrowPrimitiveGenerator.ts b/src/lib/generators/primitives/ArrowPrimitiveGenerator.ts
index d9acd624..4ec0a6bb 100644
--- a/src/lib/generators/primitives/ArrowPrimitiveGenerator.ts
+++ b/src/lib/generators/primitives/ArrowPrimitiveGenerator.ts
@@ -189,7 +189,7 @@ export class ArrowPrimitiveGenerator extends BaseGenerator<MedsurfDraw.Image, Ar
public startPositionPointGenerator(): void {
//<editor-fold desc="Elements">
// -- Arrow primitive element
- this._arrowPrimitiveElement = MedsurfDraw.ArrowPrimitive.getInstance(this.positionPointElement.model, this.hasWedgePoint, this.rotateWithLine, this.target.dimensions.width);
+ this._arrowPrimitiveElement = MedsurfDraw.ArrowPrimitive.getInstance(this.hasWedgePoint, this.rotateWithLine, this.target.dimensions.width);
this.positionPointElement.addChild(this.arrowPrimitiveElement);
this.arrowPrimitiveElement.controlDrawItem();
this.arrowPrimitiveElement.showItem();
diff --git a/src/lib/generators/primitives/EllipsePrimitiveGenerator.ts b/src/lib/generators/primitives/EllipsePrimitiveGenerator.ts
index 9800721a..aafa7b1f 100644
--- a/src/lib/generators/primitives/EllipsePrimitiveGenerator.ts
+++ b/src/lib/generators/primitives/EllipsePrimitiveGenerator.ts
@@ -188,7 +188,7 @@ export class EllipsePrimitiveGenerator extends BaseGenerator<MedsurfDraw.Image,
public startPositionPointGenerator(): void {
//<editor-fold desc="Elements">
// -- Ellipse primitive element
- this._ellipsePrimitiveElement = MedsurfDraw.EllipsePrimitive.getInstance(this.positionPointElement.model, this.rotateWithLine, this.target.dimensions.width);
+ this._ellipsePrimitiveElement = MedsurfDraw.EllipsePrimitive.getInstance(this.rotateWithLine, this.target.dimensions.width);
this.positionPointElement.addChild(this.ellipsePrimitiveElement);
this.ellipsePrimitiveElement.controlDrawItem();
this.ellipsePrimitiveElement.showItem();
diff --git a/src/lib/generators/primitives/RectanglePrimitiveGenerator.ts b/src/lib/generators/primitives/RectanglePrimitiveGenerator.ts
index 4312e654..4ffa82b4 100644
--- a/src/lib/generators/primitives/RectanglePrimitiveGenerator.ts
+++ b/src/lib/generators/primitives/RectanglePrimitiveGenerator.ts
@@ -187,7 +187,7 @@ export class RectanglePrimitiveGenerator extends BaseGenerator<MedsurfDraw.Image
public startPositionPointGenerator(): void {
//<editor-fold desc="Elements">
// -- Rectangle primitive element
- this._rectanglePrimitiveElement = MedsurfDraw.RectanglePrimitive.getInstance(this.positionPointElement.model, this.rotateWithLine, this.target.dimensions.width);
+ this._rectanglePrimitiveElement = MedsurfDraw.RectanglePrimitive.getInstance(this.rotateWithLine, this.target.dimensions.width);
this.positionPointElement.addChild(this.rectanglePrimitiveElement);
this.rectanglePrimitiveElement.controlDrawItem();
this.rectanglePrimitiveElement.showItem();
diff --git a/src/lib/generators/primitives/TextPrimitiveGenerator.ts b/src/lib/generators/primitives/TextPrimitiveGenerator.ts
index d1fcfb94..c48ecac6 100644
--- a/src/lib/generators/primitives/TextPrimitiveGenerator.ts
+++ b/src/lib/generators/primitives/TextPrimitiveGenerator.ts
@@ -187,7 +187,7 @@ export class TextPrimitiveGenerator extends BaseGenerator<MedsurfDraw.Image, Tex
public startPositionPointGenerator(): void {
//<editor-fold desc="Elements">
// -- Text primitive element
- this._textPrimitiveElement = MedsurfDraw.TextPrimitive.getInstance(this.positionPointElement.model, this.rotateWithLine, this.target.dimensions.width);
+ this._textPrimitiveElement = MedsurfDraw.TextPrimitive.getInstance(this.rotateWithLine, this.target.dimensions.width);
this.positionPointElement.addChild(this.textPrimitiveElement);
this.textPrimitiveElement.controlDrawItem();
this.textPrimitiveElement.showItem();
--
GitLab