From 35baadb10d9ddbbd67b8ea95ad68f1edd3d44351 Mon Sep 17 00:00:00 2001
From: Andrea Gottsponer <ago@attr.ch>
Date: Mon, 16 Dec 2019 13:44:23 +0100
Subject: [PATCH] 1.0.10
---
package-lock.json | 2 +-
package.json | 2 +-
src/app/index.ts | 4 ++--
src/lib/elements/interactions/ImageNavigatorElement.ts | 4 ++++
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index dfad0c58..d75ac38e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "medsurf-draw",
- "version": "1.0.9",
+ "version": "1.0.10",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index 905c5de8..8366bd72 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "medsurf-draw",
- "version": "1.0.9",
+ "version": "1.0.10",
"description": "Draw annotations on jpg/zoomify images, based on PIXI.js",
"keywords": [
"draw",
diff --git a/src/app/index.ts b/src/app/index.ts
index e036782a..c23a5158 100644
--- a/src/app/index.ts
+++ b/src/app/index.ts
@@ -233,9 +233,9 @@ PIXI.Renderer.registerPlugin('bla', bla);
// IMAGES
// 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("http://localhost:3000/v1/file/slide/2701,2701/image/1800x1800_80.jpeg"));
+ // const image = new MedsurfSprite(app.renderer, canvas, PIXI.Texture.from("http://localhost:3000/v1/file/slide/2701,2701/image/1800x1800_80.jpeg"));
// 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
// const image = new MedsurfSprite(app.renderer, canvas, PIXI.Texture.from("./assets/juldem.mp4"));
diff --git a/src/lib/elements/interactions/ImageNavigatorElement.ts b/src/lib/elements/interactions/ImageNavigatorElement.ts
index 52c09349..f4b43c5c 100644
--- a/src/lib/elements/interactions/ImageNavigatorElement.ts
+++ b/src/lib/elements/interactions/ImageNavigatorElement.ts
@@ -338,6 +338,10 @@ export class ImageNavigatorElement extends BaseContainer {
* @private
*/
protected _onImage(): void {
+ if (!this._rectangle) {
+ return;
+ }
+
if (this._image instanceof MedsurfTileSprite) {
this._rectangle.x = -1 * this._spriteElement.width / this._canvas.width * this._image.position.x / this._image.scale.x;
this._rectangle.y = -1 * this._spriteElement.height / this._canvas.height * this._image.position.y / this._image.scale.y;
--
GitLab