From 3155661b020bbe6151302295757be0df6656f749 Mon Sep 17 00:00:00 2001 From: Andrea Gottsponer <ago@attr.ch> Date: Tue, 28 Jan 2020 16:51:29 +0100 Subject: [PATCH] - 1.0.19 final --- src/app/index.ts | 19 ++++++++++--------- .../elements/collections/LegendCollection.ts | 6 +++--- src/lib/elements/primitives/TextPrimitive.ts | 8 ++++---- src/lib/generators/TextPrimitiveGenerator.ts | 4 ++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/app/index.ts b/src/app/index.ts index ab90274a..400c34b4 100644 --- a/src/app/index.ts +++ b/src/app/index.ts @@ -305,7 +305,8 @@ PIXI.Renderer.registerPlugin('bla', bla); 20 / imageWidth ), strokeWidth: 5 / imageWidth, - dash: 2, + dashFill: 2, + dashEmpty: 2, options: { hasLine: true, lineColor: 0x00FF00, @@ -416,7 +417,7 @@ PIXI.Renderer.registerPlugin('bla', bla); fontSize: 22 / imageWidth, fontFamily: "proxima_nova_altsemibold", align: 'left', - wordWrap: false, + breakWords: false, } }, imageWidth); point5.addChild(text); @@ -847,7 +848,7 @@ PIXI.Renderer.registerPlugin('bla', bla); fontSize: 22 / imageWidth, fontFamily: 'proxima_nova_altsemibold', align: 'left', - wordWrap: true, + breakWords: false, }, col: legendColumn1 }; @@ -861,7 +862,7 @@ PIXI.Renderer.registerPlugin('bla', bla); fontSize: 22 / imageWidth, fontFamily: 'proxima_nova_altsemibold', align: 'left', - wordWrap: true, + breakWords: false, }, col: legendColumn1 }; @@ -875,7 +876,7 @@ PIXI.Renderer.registerPlugin('bla', bla); fontSize: 22 / imageWidth, fontFamily: 'proxima_nova_altsemibold', align: 'left', - wordWrap: true, + breakWords: false, }, col: legendColumn1 }; @@ -896,7 +897,7 @@ PIXI.Renderer.registerPlugin('bla', bla); fontSize: 22 / imageWidth, fontFamily: 'proxima_nova_altsemibold', align: 'left', - wordWrap: true, + breakWords: false, }, col: legendColumn2 }; @@ -910,7 +911,7 @@ PIXI.Renderer.registerPlugin('bla', bla); fontSize: 22 / imageWidth, fontFamily: 'proxima_nova_altsemibold', align: 'left', - wordWrap: true, + breakWords: false, }, col: legendColumn2 }; @@ -931,7 +932,7 @@ PIXI.Renderer.registerPlugin('bla', bla); fontSize: 22 / imageWidth, fontFamily: 'proxima_nova_altsemibold', align: 'left', - wordWrap: true, + breakWords: false, }, col: legendColumn3 }; @@ -945,7 +946,7 @@ PIXI.Renderer.registerPlugin('bla', bla); fontSize: 22 / imageWidth, fontFamily: 'proxima_nova_altsemibold', align: 'left', - wordWrap: true, + breakWords: false, }, col: legendColumn3 }; diff --git a/src/lib/elements/collections/LegendCollection.ts b/src/lib/elements/collections/LegendCollection.ts index 865ebbe8..41dd2427 100644 --- a/src/lib/elements/collections/LegendCollection.ts +++ b/src/lib/elements/collections/LegendCollection.ts @@ -68,7 +68,7 @@ export class LegendCollection extends BaseElementContainer<Models.LegendCollecti protected readonly _fontSizeDefault: number = 12; protected readonly _fontFamilyDefault: string = "proxima_nova_altsemibold"; protected readonly _alignDefault: string = "left"; - protected readonly _wordWrapDefault: boolean = false; + protected readonly _breakWordsDefault: boolean = false; // TODO rowDistance std -> 14 // TODO colDistance std -> 14 // TODO indexWidth std -> 14 @@ -330,7 +330,7 @@ export class LegendCollection extends BaseElementContainer<Models.LegendCollecti fontSize: this._fontSizeDefault, fontFamily: this._fontFamilyDefault, align: this._alignDefault, - wordWrap: this._wordWrapDefault, + breakWords: this._breakWordsDefault, }, col: legendColumn, }; @@ -409,7 +409,7 @@ export class LegendCollection extends BaseElementContainer<Models.LegendCollecti fontSize: this._fontSizeDefault, fontFamily: this._fontFamilyDefault, align: this._alignDefault, - wordWrap: this._wordWrapDefault, + breakWords: this._breakWordsDefault, }, col: this.model.cols[col] }, this.imageWidth); diff --git a/src/lib/elements/primitives/TextPrimitive.ts b/src/lib/elements/primitives/TextPrimitive.ts index 132fafc5..dd0c7a53 100644 --- a/src/lib/elements/primitives/TextPrimitive.ts +++ b/src/lib/elements/primitives/TextPrimitive.ts @@ -91,7 +91,7 @@ export class TextPrimitive extends BaseElementContainer<Models.TextPrimitive> { protected readonly _fontSizeDefault: number = 12; protected readonly _fontFamilyDefault: string = "proxima_nova_altsemibold"; protected readonly _alignDefault: string = "left"; - protected readonly _wordWrapDefault: boolean = false; + protected readonly _breakWordsDefault: boolean = false; /** * Constructor @@ -111,7 +111,7 @@ export class TextPrimitive extends BaseElementContainer<Models.TextPrimitive> { fontSize: this._fontSizeDefault, fontFamily: this._fontFamilyDefault, align: this._alignDefault, - wordWrap: this._wordWrapDefault, + breakWords: this._breakWordsDefault, }; } if (!this.model.style.fill) { @@ -126,8 +126,8 @@ export class TextPrimitive extends BaseElementContainer<Models.TextPrimitive> { if (!this.model.style.align) { this.model.style.align = this._alignDefault; } - if (!this.model.style.wordWrap) { - this.model.style.wordWrap = this._wordWrapDefault; + if (!this.model.style.breakWords) { + this.model.style.breakWords = this._breakWordsDefault; } // Setup diff --git a/src/lib/generators/TextPrimitiveGenerator.ts b/src/lib/generators/TextPrimitiveGenerator.ts index ed5ef213..31c2240a 100644 --- a/src/lib/generators/TextPrimitiveGenerator.ts +++ b/src/lib/generators/TextPrimitiveGenerator.ts @@ -22,7 +22,7 @@ export class TextPrimitiveGenerator extends BaseDrawGenerator { protected readonly _fontSizeDefault: number = 22; protected readonly _fontFamilyDefault: string = "proxima_nova_altsemibold"; protected readonly _alignDefault: string = "left"; - protected readonly _wordWrapDefault: boolean = false; + protected readonly _breakWordsDefault: boolean = false; protected readonly _rectangleDefault: Rectangle = {x: 0, y: 0, width: 0, height: 0}; /** @@ -64,7 +64,7 @@ export class TextPrimitiveGenerator extends BaseDrawGenerator { fontSize: this._fontSizeDefault / this.imageWidth, fontFamily: this._fontFamilyDefault, align: this._alignDefault, - wordWrap: this._wordWrapDefault, + breakWords: this._breakWordsDefault }, }, this.imageWidth); this._textElement.modeInteraction.defaultMode = "author"; -- GitLab