Skip to content
Snippets Groups Projects
Commit 31f7c3b2 authored by Andrea Gottsponer's avatar Andrea Gottsponer
Browse files

- fix unchoose

parent 40b4b084
Branches
Tags
No related merge requests found
...@@ -10,6 +10,7 @@ import {Line} from "../lib/elements/connections/Line"; ...@@ -10,6 +10,7 @@ import {Line} from "../lib/elements/connections/Line";
import {ImageNavigatorElement} from "../lib/elements/interactions/ImageNavigatorElement"; import {ImageNavigatorElement} from "../lib/elements/interactions/ImageNavigatorElement";
import {FillCollection} from "../lib/elements/collections/FillCollection"; import {FillCollection} from "../lib/elements/collections/FillCollection";
import {LegendCollection, LegendItem} from "../lib/elements/collections/LegendCollection"; import {LegendCollection, LegendItem} from "../lib/elements/collections/LegendCollection";
import {MedsurfSprite} from "../lib";
const canvas = document.getElementById("medsurf_canvas") as HTMLCanvasElement; const canvas = document.getElementById("medsurf_canvas") as HTMLCanvasElement;
const width = canvas.width; const width = canvas.width;
...@@ -232,8 +233,9 @@ PIXI.Renderer.registerPlugin('bla', bla); ...@@ -232,8 +233,9 @@ PIXI.Renderer.registerPlugin('bla', bla);
// IMAGES // IMAGES
// BaseSprite // BaseSprite
// const image = new MedsurfSprite(app.renderer, canvas, PIXI.Texture.from("https://api.medsurf.stage.iml.unibe.ch/v1/file/slides/3893/image/1500x1514_80_eaaa24fd-e69e-491e-b576-fccab29c85a2.jpg")); // const image = new MedsurfSprite(app.renderer, canvas, PIXI.Texture.from("https://api.medsurf.stage.iml.unibe.ch/v1/file/slides/3893/image/1500x1514_80_eaaa24fd-e69e-491e-b576-fccab29c85a2.jpg"));
const image = new MedsurfSprite(app.renderer, canvas, PIXI.Texture.from("http://localhost:3000/v1/file/slide/2701,2701/image/1800x1800_80.jpeg"));
// Tile BaseSprite // Tile BaseSprite
const image = new MedsurfTileSprite(app.renderer, canvas, 5800, "https://api.medsurf.stage.iml.unibe.ch:443/v1/file/slide/5800/image/", 29512, 20512); // const image = new MedsurfTileSprite(app.renderer, canvas, 5800, "https://api.medsurf.stage.iml.unibe.ch:443/v1/file/slide/5800/image/", 29512, 20512);
// Video // Video
// const image = new MedsurfSprite(app.renderer, canvas, PIXI.Texture.from("./assets/juldem.mp4")); // const image = new MedsurfSprite(app.renderer, canvas, PIXI.Texture.from("./assets/juldem.mp4"));
......
...@@ -266,7 +266,8 @@ export class MedsurfSprite extends BaseSprite { ...@@ -266,7 +266,8 @@ export class MedsurfSprite extends BaseSprite {
} }
protected _onLoaded(): void { protected _onLoaded(): void {
this._fitToScreen(this._canvas.width, this._canvas.height); // TODO this not working
// this._fitToScreen(this._canvas.width, this._canvas.height);
} }
protected setVisibleElements(): void { protected setVisibleElements(): void {
......
...@@ -52,9 +52,12 @@ export class InteractiveGenerator extends BaseGenerator { ...@@ -52,9 +52,12 @@ export class InteractiveGenerator extends BaseGenerator {
protected _chooseElement(event: PIXI.interaction.InteractionEvent, element: ImageObject): void { protected _chooseElement(event: PIXI.interaction.InteractionEvent, element: ImageObject): void {
event.stopPropagation(); event.stopPropagation();
const index = this._targetFill.interactiveItems.findIndex((item: ImageObject) => item === element);
if (index > -1) {
this._targetFill.interactiveItems.splice(index, 1);
} else {
this._targetFill.interactiveItems.push(element); this._targetFill.interactiveItems.push(element);
}
// TODO check for lines
element.modeInteraction.changeMode("interactive_choosing", this._targetFill); element.modeInteraction.changeMode("interactive_choosing", this._targetFill);
} }
......
...@@ -48,9 +48,12 @@ export class SelftestGenerator extends BaseGenerator { ...@@ -48,9 +48,12 @@ export class SelftestGenerator extends BaseGenerator {
protected _chooseElement(event: PIXI.interaction.InteractionEvent, element: ImageObject): void { protected _chooseElement(event: PIXI.interaction.InteractionEvent, element: ImageObject): void {
event.stopPropagation(); event.stopPropagation();
const index = this.targetPositionPoint.selftestItems.findIndex((item: ImageObject) => item === element);
if (index > -1) {
this.targetPositionPoint.selftestItems.splice(index, 1);
} else {
this.targetPositionPoint.selftestItems.push(element); this.targetPositionPoint.selftestItems.push(element);
}
// TODO check for lines
element.modeInteraction.changeMode("selftest_choosing", this.targetPositionPoint); element.modeInteraction.changeMode("selftest_choosing", this.targetPositionPoint);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment