ad7a620617626a6d3605976f0e9ef431fa24e03e to d9c47ca437f95269eda64b1e8cbea38d14b27f44 · IML Open Source / medsurf-draw

src/app/index.ts

+3
−2

Original line number
Diff line number
Diff line

@@ -1154,6 +1154,7 @@ async function setupImageObjects() {

    image.sortChildren();

    app.stage.emit("setDefaultMode", "default");

    app.stage.interactive = true;

    return Promise.resolve();

}

src/lib/config/design.ts

+2
−2

Original line number
Diff line number
Diff line

@@ -326,7 +326,7 @@ export const Design = {

        fillColorHover: 0x4BDEE3

    },

    selectElement: {

        zIndex: 9000,

        zIndex: 150,

        scaleAspect: 0.4,

        radiusAspect: 5,

        groupPadAspect: 6,

@@ -340,7 +340,7 @@ export const Design = {

        fillAlpha: 0.5,

    },

    selectImageObjectElement: {

        zIndex: 9000,

        zIndex: 151,

        scaleAspect: 0.4,

        pad: 5,

        displayObjectDepth: 5,

src/lib/elements/connections/Line.ts

+2
−2

Original line number
Diff line number
Diff line

@@ -1544,10 +1544,10 @@ export class Line extends BaseElementContainer<Models.Line, BaseElementContainer

            // Check if position points has/contains in any other elements

            if (this.start) {

                this.start.emit("debounceDeleteItem");

                this.start.emit("debounceDeleteItem", image);

            }

            if (this.end) {

                this.end.emit("debounceDeleteItem");

                this.end.emit("debounceDeleteItem", image);

            }

            // Emits

src/lib/elements/controls/SelectGroupElement.ts

+30
−11

Original line number
Diff line number
Diff line

@@ -27,19 +27,20 @@ export class SelectGroupElement extends BaseContainer<SelectGroupModel> {

    /**

     * Members

     */

    private _image: MedsurfDraw.Image;

    private _type: SelectGroupType;

    private _layerGroup: Models.LayerGroup;

    private _grouping: Models.Grouping;

    private _displayObjects: MedsurfDraw.ImageObject[];

    private _imageObjectMenu: MedsurfDraw.MenuEntryModel[];

    private _groupingMenu: MedsurfDraw.MenuEntryModel[];

    protected _image: MedsurfDraw.Image;

    protected _type: SelectGroupType;

    protected _layerGroup: Models.LayerGroup;

    protected _grouping: Models.Grouping;

    protected _displayObjects: MedsurfDraw.ImageObject[];

    protected _imageObjectMenu: MedsurfDraw.MenuEntryModel[];

    protected _groupingMenu: MedsurfDraw.MenuEntryModel[];

    private _menuShown: boolean = false;

    /**

     * Interactions

     */

    private _contextInteraction: MedsurfDraw.ContextInteraction<SelectGroupElement>;

    private _moveInteraction: MedsurfDraw.MoveInteraction<SelectGroupElement>;

    protected _contextInteraction: MedsurfDraw.ContextInteraction<SelectGroupElement>;

    protected _moveInteraction: MedsurfDraw.MoveInteraction<SelectGroupElement>;

    /**

     * Methods

@@ -167,6 +168,7 @@ export class SelectGroupElement extends BaseContainer<SelectGroupModel> {

            options: {hasLine: true, lineColor: Design.selectElement.lineColor, lineAlpha: Design.selectElement.lineAlpha, hasFill: true, fillColor: Design.selectElement.fillColor, fillAlpha: Design.selectElement.fillAlpha},

            lineWidth: Design.selectElement.lineWidth

        });

        this._selectElement.zIndex = Design.selectElement.zIndex + 1;

        this.addChild(this._selectElement);

        // -- Image object menu element

        this._imageObjectMenuElement = new MedsurfDraw.MenuElement({

@@ -562,6 +564,9 @@ export class SelectGroupElement extends BaseContainer<SelectGroupModel> {

            // Setup

            this.interactive = true;

            // Sort children

            this.getImage().sortChildren();

            // Set display objects

            this.displayObjects = displayObjects as MedsurfDraw.ImageObject[];

        } else {

@@ -709,7 +714,7 @@ export class SelectGroupElement extends BaseContainer<SelectGroupModel> {

        //<editor-fold desc="Events">

        // -- Context

        this.image.on("rightup", this.contextInteraction.endRight, this.contextInteraction);

        this.image.parent.on("rightup", this.contextInteraction.endRight, this.contextInteraction);

        //</editor-fold>

    }

@@ -734,6 +739,9 @@ export class SelectGroupElement extends BaseContainer<SelectGroupModel> {

    public displayMenu(): void {

        const point = this.getImage().getMousePosition();

        // Setup

        this._menuShown = true;

        // Elements

        if (MedsurfDraw.Keyboard.isKeyDown("KeyG")) {

            // -- Grouping menu element

@@ -746,13 +754,17 @@ export class SelectGroupElement extends BaseContainer<SelectGroupModel> {

        }

        // Hide menu

        this.getImage().moveInteraction.once("endMove", () => {

        this.getImage().moveInteraction.once("startMove", () => {

            // Elements

            // -- Menu element

            this._imageObjectMenuElement.hideItem();

            // -- Grouping menu element

            this._groupingMenuElement.hideItem();

        });

        this.getImage().moveInteraction.once("endMove", () => {

            // Setup

            this._menuShown = false;

        });

        /* TODO remove

        // Image -> remove unselect behaviour and reset it after one click on the image

        const image = this.getImage();

@@ -1177,5 +1189,12 @@ export class SelectGroupElement extends BaseContainer<SelectGroupModel> {

    public set moveInteraction(value: MedsurfDraw.MoveInteraction<SelectGroupElement>) {

        this._moveInteraction = value;

    }

    /**

     * Get menu shown

     */

    public get menuShown(): boolean {

        return this._menuShown;

    }

    //</editor-fold>

}

 No newline at end of file

src/lib/elements/controls/SelectItemElement.ts

+19
−4

Original line number
Diff line number
Diff line

@@ -20,8 +20,9 @@ export class SelectItemElement extends BaseContainer<SelectImageObjectElementMod

    /**

     * Members

     */

    private _image: MedsurfDraw.Image;

    private _displayObject: BaseElementContainer<Models.ImageObject, BaseElementContainerModel<Models.ImageObject>> | MedsurfDraw.Text | MedsurfDraw.Image | undefined;

    protected _image: MedsurfDraw.Image;

    protected _displayObject: BaseElementContainer<Models.ImageObject, BaseElementContainerModel<Models.ImageObject>> | MedsurfDraw.Text | MedsurfDraw.Image | undefined;

    protected _menuShown: boolean = false;

    /**

     * Methods

@@ -521,6 +522,9 @@ export class SelectItemElement extends BaseContainer<SelectImageObjectElementMod

    public displayMenu(event: MouseEvent): void {

        event.stopPropagation();

        // Setup

        this._menuShown = true;

        // Elements

        // -- Menu element

        const point = this.getImage().getMousePosition();

@@ -528,11 +532,15 @@ export class SelectItemElement extends BaseContainer<SelectImageObjectElementMod

        this._menuElement.showItem();

        // Hide menu

        this.getImage().moveInteraction.once("endMove", () => {

        this.getImage().moveInteraction.once("startMove", () => {

            // Elements

            // -- Menu element

            this._menuElement.hideItem();

        });

        this.getImage().moveInteraction.once("endMove", () => {

            // Setup

            this._menuShown = false;

        });

        /* TODO remove

        // Image -> remove unselect behaviour and reset it after one click on the image

        const image = this.getImage();

@@ -811,7 +819,7 @@ export class SelectItemElement extends BaseContainer<SelectImageObjectElementMod

                // -- Menu element

                if (!(this.displayObject instanceof MedsurfDraw.Text)) {

                    this._menuElement.menuElements = this.displayObject.imageObjectMenu;

                    this.image.on('rightup', this.displayMenu, this);

                    this.image.parent.on('rightup', this.displayMenu, this);

                } else {

                    this._menuElement.hideItem();

                }

@@ -933,5 +941,12 @@ export class SelectItemElement extends BaseContainer<SelectImageObjectElementMod

        // Add display object events

        this._setEventsForDisplayObjects(this.displayObject);

    }

    /**

     * Get menu shown

     */

    public get menuShown(): boolean {

        return this._menuShown;

    }

    //</editor-fold>

}

 No newline at end of file

src/lib/elements/images/Image.ts

+20
−21

Original line number
Diff line number
Diff line

@@ -206,7 +206,6 @@ export class Image extends BaseContainer<ImageModel> {

            // -- Resize

            parent.on("resize", this.onResize, this);

            // -- Move

            parent.interactive = true;

            parent.on("mousedown", this.moveInteraction.startMove, this.moveInteraction);

            parent.on("pointermove", this.moveInteraction.onMove, this.moveInteraction);

            parent.on("mouseup", this.moveInteraction.endMove, this.moveInteraction);

@@ -222,7 +221,6 @@ export class Image extends BaseContainer<ImageModel> {

            // -- Resize

            parent.off("resize", this.onResize, this);

            // -- Move

            parent.interactive = false;

            parent.off("mousedown", this.moveInteraction.startMove, this.moveInteraction);

            parent.off("pointermove", this.moveInteraction.onMove, this.moveInteraction);

            parent.off("mouseup", this.moveInteraction.endMove, this.moveInteraction);

@@ -963,7 +961,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _modeDefault(): void {

        // Setup

        this.interactive = true;

        // TODO remove this.interactive = true;

    }

    /**

@@ -972,7 +970,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _removeModeDefault(): void {

        // Setup

        this.interactive = false;

        // TODO remove this.interactive = false;

    }

    /**

@@ -981,7 +979,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _modeMarker(): void {

        // Setup

        this.interactive = true;

        // TODO remove this.interactive = true;

    }

    /**

@@ -990,7 +988,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _removeModeMarker(): void {

        // Setup

        this.interactive = false;

        // TODO remove this.interactive = false;

    }

    /**

@@ -999,7 +997,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _modeSelftest(): void {

        // Setup

        this.interactive = true;

        // TODO remove this.interactive = true;

    }

    /**

@@ -1008,7 +1006,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _removeModeSelftest(): void {

        // Setup

        this.interactive = false;

        // TODO remove this.interactive = false;

    }

    /**

@@ -1017,11 +1015,11 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _modeAuthor(): void {

        // Setup

        this.interactive = true;

        // TODO remove this.interactive = true;

        //<editor-fold desc="Events">

        // -- Context

        this.on("rightup", this.contextInteraction.endRight, this.contextInteraction);

        this.parent.on("rightup", this.contextInteraction.endRight, this.contextInteraction);

        //</editor-fold>

    }

@@ -1031,11 +1029,11 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _removeModeAuthor(): void {

        // Setup

        this.interactive = false;

        // TODO remove this.interactive = false;

        //<editor-fold desc="Events">

        // -- Context

        this.off("rightup", this.contextInteraction.endRight, this.contextInteraction);

        this.parent.off("rightup", this.contextInteraction.endRight, this.contextInteraction);

        //</editor-fold>

    }

@@ -1045,7 +1043,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _modeDrawing(): void {

        // Setup

        this.interactive = true;

        // TODO remove this.interactive = true;

    }

    /**

@@ -1054,7 +1052,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _removeModeDrawing(): void {

        // Setup

        this.interactive = false;

        // TODO remove this.interactive = false;

    }

    /**

@@ -1063,7 +1061,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _modeChoosing(): void {

        // Setup

        this.interactive = true;

        // TODO remove this.interactive = true; // TODO not working on image why??? when uncommend, the drawing is not working

    }

    /**

@@ -1072,7 +1070,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _removeModeChoosing(): void {

        // Setup

        this.interactive = false;

        // TODO remove this.interactive = false; // TODO not working on image why???

    }

    /**

@@ -1081,7 +1079,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _modeCloning(): void {

        // Setup

        this.interactive = true;

        // TODO remove this.interactive = true;

    }

    /**

@@ -1090,7 +1088,7 @@ export class Image extends BaseContainer<ImageModel> {

     */

    protected _removeModeCloning(): void {

        // Setup

        this.interactive = false;

        // TODO remove this.interactive = false;

    }

    //</editor-fold>

@@ -2334,11 +2332,12 @@ export class Image extends BaseContainer<ImageModel> {

        };

        this.renderer.plugins.interaction.setCursorMode("default");

        // TODO movelock no needed ???

        if (['drawing', 'choosing', 'cloning'].indexOf(this.modeInteraction.lastMode) === -1 && !this._moveLock) {

        if (!this._selectGroupElement.menuShown && !this._selectItemElement.menuShown) {

            // Reset selection

            if (['drawing', 'choosing', 'cloning'].indexOf(this.modeInteraction.lastMode) === -1 && !this._moveLock) {

                this.controlSetDefaultMode(event);

            }

        }

        this._moveLock = false;

    }

    //</editor-fold>

Compare revisions

Source

Target

Commits on Source 2

Files

src/app/index.ts

src/lib/config/design.ts

src/lib/elements/connections/Line.ts

src/lib/elements/controls/SelectGroupElement.ts

src/lib/elements/controls/SelectItemElement.ts

src/lib/elements/images/Image.ts