From 733a2356738181c682c11db8cf604884900bb5cf Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Tue, 20 Apr 2021 10:36:43 +0200
Subject: [PATCH] chore: minor fixes
---
.../editAnnotation.component.ts | 34 +++++++------
.../userAnnotationsCmp.components.ts | 49 ++++++++++---------
2 files changed, 46 insertions(+), 37 deletions(-)
diff --git a/src/atlasComponents/userAnnotations/editAnnotation/editAnnotation.component.ts b/src/atlasComponents/userAnnotations/editAnnotation/editAnnotation.component.ts
index 66ef2c4d5..67f1bdf8d 100644
--- a/src/atlasComponents/userAnnotations/editAnnotation/editAnnotation.component.ts
+++ b/src/atlasComponents/userAnnotations/editAnnotation/editAnnotation.component.ts
@@ -10,19 +10,20 @@ import {
Optional,
Output
} from "@angular/core";
-import {FormBuilder, FormGroup, Validators} from "@angular/forms";
-import {animate, style, transition, trigger} from "@angular/animations";
-import {VIEWER_INJECTION_TOKEN} from "src/ui/layerbrowser/layerDetail/layerDetail.component";
-import {Subscription} from "rxjs";
-import {filter, map} from "rxjs/operators";
-import {select, Store} from "@ngrx/store";
-import {viewerStateSelectedTemplateSelector} from "src/services/state/viewerState/selectors";
+import { FormBuilder, FormGroup, Validators } from "@angular/forms";
+import { animate, style, transition, trigger } from "@angular/animations";
+import { Observable, Subscription } from "rxjs";
+import { filter } from "rxjs/operators";
+import { select, Store } from "@ngrx/store";
+import { viewerStateSelectedTemplateSelector } from "src/services/state/viewerState/selectors";
+import { NEHUBA_INSTANCE_INJTKN } from "src/viewerModule/nehuba/util";
@Component({
selector: 'edit-annotation',
templateUrl: './editAnnotation.template.html',
styleUrls: ['./editAnnotation.style.css'],
animations: [
+ // doesn't do anything?
trigger(
'enterAnimation', [
transition(':enter', [
@@ -75,14 +76,15 @@ export class EditAnnotationComponent implements OnInit, OnDestroy {
get interactiveViewer() {
return (window as any).interactiveViewer
}
- private get viewer(){
- return this.injectedViewer || (window as any).viewer
- }
- constructor(private formBuilder: FormBuilder,
- private changeDetectionRef: ChangeDetectorRef,
- private store: Store<any>,
- @Optional() @Inject(VIEWER_INJECTION_TOKEN) private injectedViewer) {
+ private viewer: any
+
+ constructor(
+ private formBuilder: FormBuilder,
+ private changeDetectionRef: ChangeDetectorRef,
+ private store: Store<any>,
+ @Optional() @Inject(NEHUBA_INSTANCE_INJTKN) nehuba$: Observable<any>
+ ) {
this.annotationForm = this.formBuilder.group({
id: [{value: null, disabled: true}],
position1: [{value: '', disabled: this.loading}],
@@ -97,6 +99,10 @@ export class EditAnnotationComponent implements OnInit, OnDestroy {
type: [{value: 'point'}],
annotationVisible: [true]
})
+
+ this.subscriptions.push(
+ nehuba$.subscribe(v => this.viewer = v)
+ )
}
ngOnInit() {
diff --git a/src/atlasComponents/userAnnotations/userAnnotationsCmp/userAnnotationsCmp.components.ts b/src/atlasComponents/userAnnotations/userAnnotationsCmp/userAnnotationsCmp.components.ts
index 9ac378ece..3960a64d5 100644
--- a/src/atlasComponents/userAnnotations/userAnnotationsCmp/userAnnotationsCmp.components.ts
+++ b/src/atlasComponents/userAnnotations/userAnnotationsCmp/userAnnotationsCmp.components.ts
@@ -1,6 +1,10 @@
-import {AfterViewInit, Component, EventEmitter, Inject, OnDestroy, OnInit, Optional, Output} from "@angular/core";
-import {VIEWER_INJECTION_TOKEN} from "src/ui/layerbrowser/layerDetail/layerDetail.component";
-import {Store} from "@ngrx/store";
+import { Component, EventEmitter, Inject, OnDestroy, OnInit, Optional, Output} from "@angular/core";
+import { Observable, Subscription } from "rxjs";
+import { NEHUBA_INSTANCE_INJTKN } from "src/viewerModule/nehuba/util";
+import { getUuid } from 'src/util/fn'
+
+const USER_ANNOTATION_LAYER_NAME = 'USER_ANNOTATION_LAYER_NAME'
+const USER_ANNOTATION_STORE_KEY = `user_landmarks_demo_1`
@Component({
selector: 'user-annotations',
@@ -9,13 +13,11 @@ import {Store} from "@ngrx/store";
})
export class UserAnnotationsComponent implements OnInit, OnDestroy {
- public userAnnotationLayerName = 'user_annotations'
public landmarkFilter: 'all' | 'current' = 'all'
public cursorOut = false
public selecting: string
public editingMode = false
public minimized = false
- public nameInLocalStorage = 'user_landmarks_demo_1'
public hovering = -1
public expanded = -1
@@ -24,27 +26,32 @@ export class UserAnnotationsComponent implements OnInit, OnDestroy {
@Output() close: EventEmitter<any> = new EventEmitter()
- constructor(@Optional() @Inject(VIEWER_INJECTION_TOKEN) private injectedViewer,
- private store: Store<any>) {
+ private subscription: Subscription[] = []
+ constructor(
+ @Optional() @Inject(NEHUBA_INSTANCE_INJTKN) nehuba$: Observable<any>
+ ) {
+ if (nehuba$) {
+ this.subscription.push(
+ nehuba$.subscribe(v => this.viewer = v)
+ )
+ }
}
- private get viewer(){
- return this.injectedViewer || (window as any).viewer
- }
+ private viewer: any
ngOnDestroy(): void {
- const annotationLayer = this.viewer.layerManager.getLayerByName('user_annotations')
+ const annotationLayer = this.viewer.layerManager.getLayerByName(USER_ANNOTATION_LAYER_NAME)
if (annotationLayer) {
this.viewer?.layerManager.removeManagedLayer(
- this.viewer.layerManager.getLayerByName('user_annotations'))
+ this.viewer.layerManager.getLayerByName(USER_ANNOTATION_LAYER_NAME))
}
}
ngOnInit(): void {
this.loadAnnotationLayer()
- if (window.localStorage.getItem(this.nameInLocalStorage) && window.localStorage.getItem(this.nameInLocalStorage).length) {
- const annotationsString = window.localStorage.getItem(this.nameInLocalStorage)
+ if (window.localStorage.getItem(USER_ANNOTATION_STORE_KEY) && window.localStorage.getItem(USER_ANNOTATION_STORE_KEY).length) {
+ const annotationsString = window.localStorage.getItem(USER_ANNOTATION_STORE_KEY)
this.annotations = JSON.parse(annotationsString)
this.annotations.filter(a => a.annotationVisible).forEach(a => this.addAnnotationOnViewer(a))
}
@@ -64,7 +71,7 @@ export class UserAnnotationsComponent implements OnInit, OnDestroy {
saveAnnotation(annotation) {
if (!annotation.id) {
- annotation.id = this.randomId
+ annotation.id = getUuid()
}
const foundIndex = this.annotations.findIndex(x => x.id === annotation.id)
@@ -81,7 +88,7 @@ export class UserAnnotationsComponent implements OnInit, OnDestroy {
}
addAnnotationOnViewer(annotation) {
- const annotationLayer = this.viewer.layerManager.getLayerByName('user_annotations').layer
+ const annotationLayer = this.viewer.layerManager.getLayerByName(USER_ANNOTATION_LAYER_NAME).layer
const annotations = annotationLayer.localAnnotations.toJSON()
// ToDo Still some error with the logic
@@ -141,11 +148,11 @@ export class UserAnnotationsComponent implements OnInit, OnDestroy {
}
storeToLocalStorage() {
- window.localStorage.setItem(this.nameInLocalStorage, JSON.stringify(this.annotations))
+ window.localStorage.setItem(USER_ANNOTATION_STORE_KEY, JSON.stringify(this.annotations))
}
removeAnnotationFromViewer(id) {
- const annotationLayer = this.viewer.layerManager.getLayerByName('user_annotations')?.layer
+ const annotationLayer = this.viewer.layerManager.getLayerByName(USER_ANNOTATION_LAYER_NAME)?.layer
if (annotationLayer) {
let annotations = annotationLayer.localAnnotations.toJSON()
annotations = annotations.filter(a => a.id !== id)
@@ -167,12 +174,8 @@ export class UserAnnotationsComponent implements OnInit, OnDestroy {
public annotationLayerObj = {"user_annotations": {
"type": "annotation",
"tool": "annotateBoundingBox",
- "name": this.userAnnotationLayerName,
+ "name": USER_ANNOTATION_LAYER_NAME,
"annotationColor": "#ffee00",
"annotations": [],
}}
-
- get randomId() {
- return Math.random().toString(36).substr(2, 9)
- }
}
--
GitLab