From 83ebfd55d5dd545b460aa78b82f71f0ef2f5a085 Mon Sep 17 00:00:00 2001 From: Xiao Gui <xgui3783@gmail.com> Date: Tue, 18 May 2021 10:11:16 +0200 Subject: [PATCH] fix lint --- .../kgRegDetail/kgRegDetail.component.ts | 2 +- .../kgRegionalFeature/kgRegList/kgRegList.component.ts | 2 +- .../bsFeatures/kgRegionalFeature/module.ts | 8 ++++---- .../nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts | 8 ++++---- .../nehubaViewerInterface/nehubaViewerTouch.directive.ts | 4 ++-- .../nehuba/statusCard/statusCard.component.ts | 2 -- src/viewerModule/nehuba/util.ts | 6 +++--- src/viewerModule/viewerCmp/viewerCmp.component.ts | 6 +++--- 8 files changed, 18 insertions(+), 20 deletions(-) diff --git a/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/kgRegDetail/kgRegDetail.component.ts b/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/kgRegDetail/kgRegDetail.component.ts index 476eb5be5..54fcf016d 100644 --- a/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/kgRegDetail/kgRegDetail.component.ts +++ b/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/kgRegDetail/kgRegDetail.component.ts @@ -10,7 +10,7 @@ import { TBSDetail } from "../type"; ] }) -export class kgRegDetailCmp extends BsRegionInputBase { +export class KgRegDetailCmp extends BsRegionInputBase { @Input() public detail: TBSDetail diff --git a/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/kgRegList/kgRegList.component.ts b/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/kgRegList/kgRegList.component.ts index e5d4626fa..dff9eda00 100644 --- a/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/kgRegList/kgRegList.component.ts +++ b/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/kgRegList/kgRegList.component.ts @@ -52,7 +52,7 @@ export class KgRegionalFeaturesList extends BsRegionInputBase implements OnDestr } public detailDict: { - [key:string]: TBSDetail + [key: string]: TBSDetail } = {} public handlePopulatedDetailEv(detail: TBSDetail){ diff --git a/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/module.ts b/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/module.ts index d540d0e2c..79ecb08fd 100644 --- a/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/module.ts +++ b/src/atlasComponents/regionalFeatures/bsFeatures/kgRegionalFeature/module.ts @@ -4,7 +4,7 @@ import { AngularMaterialModule } from "src/ui/sharedModules/angularMaterial.modu import { KgRegSummaryCmp } from "./kgRegSummary/kgRegSummary.component"; import { KgRegionalFeaturesList } from "./kgRegList/kgRegList.component"; import { KgRegionalFeaturesListDirective } from "./kgRegList/kgReglist.directive"; -import { kgRegDetailCmp } from "./kgRegDetail/kgRegDetail.component"; +import { KgRegDetailCmp } from "./kgRegDetail/kgRegDetail.component"; import { KgDatasetModule } from "../kgDataset"; import { IAV_DATASET_SHOW_DATASET_DIALOG_CMP } from "../kgDataset/showDataset/showDataset.directive"; import { UtilModule } from "src/util"; @@ -20,18 +20,18 @@ import { UtilModule } from "src/util"; KgRegSummaryCmp, KgRegionalFeaturesList, KgRegionalFeaturesListDirective, - kgRegDetailCmp, + KgRegDetailCmp, ], exports:[ KgRegSummaryCmp, KgRegionalFeaturesList, KgRegionalFeaturesListDirective, - kgRegDetailCmp, + KgRegDetailCmp, ], providers: [ { provide: IAV_DATASET_SHOW_DATASET_DIALOG_CMP, - useValue: kgRegDetailCmp + useValue: KgRegDetailCmp } ] }) diff --git a/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts b/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts index 0d8466e55..f5af226da 100644 --- a/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts +++ b/src/viewerModule/nehuba/nehubaViewerGlue/nehubaViewerGlue.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, EventEmitter, Inject, Input, OnChanges, OnDestroy, Optional, Output, SimpleChanges, TemplateRef, ViewChild } from "@angular/core"; +import { Component, ElementRef, EventEmitter, Inject, Input, OnChanges, OnDestroy, Optional, Output, SimpleChanges, ViewChild } from "@angular/core"; import { select, Store } from "@ngrx/store"; import { asyncScheduler, combineLatest, fromEvent, merge, Observable, of, Subject } from "rxjs"; import { ngViewerActionAddNgLayer, ngViewerActionRemoveNgLayer, ngViewerActionToggleMax } from "src/services/state/ngViewerState/actions"; @@ -486,7 +486,7 @@ export class NehubaGlueCmp implements IViewer, OnChanges, OnDestroy{ /** * TODO dig into event detail to see if the exact mesh loaded */ - const { meshesLoaded, meshFragmentsLoaded, lastLoadedMeshId } = (event as any).detail + const { meshesLoaded, meshFragmentsLoaded: _meshFragmentsLoaded, lastLoadedMeshId: _lastLoadedMeshId } = (event as any).detail return meshesLoaded >= this.nehubaContainerDirective.nehubaViewerInstance.numMeshesToBeLoaded ? null : 'Loading meshes ...' @@ -555,7 +555,7 @@ export class NehubaGlueCmp implements IViewer, OnChanges, OnDestroy{ positionReal : typeof realSpace !== 'undefined' ? realSpace : true, }), /* TODO introduce animation */ - moveToNavigationLoc : (coord, realSpace?) => { + moveToNavigationLoc : (coord, _realSpace?) => { this.store$.dispatch( viewerStateChangeNavigation({ navigation: { @@ -797,7 +797,7 @@ export class NehubaGlueCmp implements IViewer, OnChanges, OnDestroy{ ) } - public handleMouseLeaveCustomLandmark(lm) { + public handleMouseLeaveCustomLandmark() { this.store$.dispatch( viewerStateMouseOverCustomLandmark({ payload: { userLandmark: null } diff --git a/src/viewerModule/nehuba/nehubaViewerInterface/nehubaViewerTouch.directive.ts b/src/viewerModule/nehuba/nehubaViewerInterface/nehubaViewerTouch.directive.ts index 99841bfc0..28eeda243 100644 --- a/src/viewerModule/nehuba/nehubaViewerInterface/nehubaViewerTouch.directive.ts +++ b/src/viewerModule/nehuba/nehubaViewerInterface/nehubaViewerTouch.directive.ts @@ -1,6 +1,6 @@ -import { Directive, ElementRef, Input, HostListener, Output, OnDestroy } from "@angular/core"; +import { Directive, ElementRef, Input, OnDestroy } from "@angular/core"; import { Observable, fromEvent, merge, Subscription } from "rxjs"; -import { map, filter, shareReplay, switchMap, pairwise, takeUntil, tap, switchMapTo } from "rxjs/operators"; +import { map, filter, shareReplay, switchMap, pairwise, takeUntil, switchMapTo } from "rxjs/operators"; import { getExportNehuba } from 'src/util/fn' import { computeDistance } from "../nehubaViewer/nehubaViewer.component"; diff --git a/src/viewerModule/nehuba/statusCard/statusCard.component.ts b/src/viewerModule/nehuba/statusCard/statusCard.component.ts index c0cc7d57e..a6daa233d 100644 --- a/src/viewerModule/nehuba/statusCard/statusCard.component.ts +++ b/src/viewerModule/nehuba/statusCard/statusCard.component.ts @@ -179,8 +179,6 @@ export class StatusCardComponent implements OnInit, OnChanges{ public resetNavigation({rotation: rotationFlag = false, position: positionFlag = false, zoom : zoomFlag = false}: {rotation?: boolean, position?: boolean, zoom?: boolean}) { const { orientation, - perspectiveOrientation, - perspectiveZoom, position, zoom } = getNavigationStateFromConfig(this.selectedTemplatePure.nehubaConfig) diff --git a/src/viewerModule/nehuba/util.ts b/src/viewerModule/nehuba/util.ts index 3da17749f..398ad2d82 100644 --- a/src/viewerModule/nehuba/util.ts +++ b/src/viewerModule/nehuba/util.ts @@ -304,9 +304,9 @@ export function cvtNavigationObjToNehubaConfig(navigationObj, nehubaConfigObj){ const { navigation = {} } = nehubaConfigObj || {} - const { pose = {}, zoomFactor = 1e6 } = navigation - const { position = {}, orientation = [0, 0, 0, 1] } = pose - const { voxelSize = [1, 1, 1], voxelCoordinates = [0, 0, 0] } = position + const { pose = {} } = navigation + const { position = {} } = pose + const { voxelSize = [1, 1, 1] } = position return voxelSize })() diff --git a/src/viewerModule/viewerCmp/viewerCmp.component.ts b/src/viewerModule/viewerCmp/viewerCmp.component.ts index c3d998231..32ac98510 100644 --- a/src/viewerModule/viewerCmp/viewerCmp.component.ts +++ b/src/viewerModule/viewerCmp/viewerCmp.component.ts @@ -1,7 +1,7 @@ -import {Component, ElementRef, Inject, Input, OnDestroy, OnInit, Optional, ViewChild} from "@angular/core"; +import {Component, ElementRef, Inject, Input, OnDestroy, Optional, ViewChild} from "@angular/core"; import { select, Store } from "@ngrx/store"; -import {combineLatest, Observable, of, Subject, Subscription} from "rxjs"; -import {distinctUntilChanged, filter, map, startWith, switchMap} from "rxjs/operators"; +import {combineLatest, Observable, Subject, Subscription} from "rxjs"; +import {distinctUntilChanged, filter, map, startWith } from "rxjs/operators"; import { viewerStateHelperSelectParcellationWithId, viewerStateRemoveAdditionalLayer, viewerStateSetSelectedRegions } from "src/services/state/viewerState/actions"; import { viewerStateContextedSelectedRegionsSelector, viewerStateGetOverlayingAdditionalParcellations, viewerStateParcVersionSelector, viewerStateSelectedParcellationSelector, viewerStateSelectedTemplateSelector, viewerStateStandAloneVolumes } from "src/services/state/viewerState/selectors" import { CONST, ARIA_LABELS, QUICKTOUR_DESC } from 'common/constants' -- GitLab