diff --git a/src/atlasViewer/atlasViewer.component.ts b/src/atlasViewer/atlasViewer.component.ts index 1b3f2ecd0c1556567ed3e6d45463783365506277..5f20e45fe2d871ead31a721009423a5e6f0b3b36 100644 --- a/src/atlasViewer/atlasViewer.component.ts +++ b/src/atlasViewer/atlasViewer.component.ts @@ -1,4 +1,4 @@ -import { Component, HostBinding, ViewChild, ViewContainerRef, ComponentFactoryResolver, ComponentFactory, OnDestroy, ElementRef, Injector, ComponentRef, AfterViewInit, OnInit, TemplateRef, HostListener, Renderer2 } from "@angular/core"; +import { Component, HostBinding, ViewChild, ViewContainerRef, ComponentFactoryResolver, ComponentFactory, OnDestroy, ElementRef, ComponentRef, AfterViewInit, OnInit, HostListener, Renderer2 } from "@angular/core"; import { Store, select } from "@ngrx/store"; import { ViewerStateInterface, OPEN_SIDE_PANEL, CLOSE_SIDE_PANEL, isDefined,UNLOAD_DEDICATED_LAYER, FETCHED_SPATIAL_DATA, UPDATE_SPATIAL_DATA, TOGGLE_SIDE_PANEL, NgViewerStateInterface, safeFilter } from "../services/stateStore.service"; import { Observable, Subscription, combineLatest } from "rxjs"; diff --git a/src/main.module.ts b/src/main.module.ts index 8887dbc3e6f1257c08073a14605d639faa2c210a..f122c7d48a38e97d62ac2b7593636100e1f46bbc 100644 --- a/src/main.module.ts +++ b/src/main.module.ts @@ -75,7 +75,6 @@ import { AtlasWorkerService } from "./atlasViewer/atlasViewer.workerService.serv PluginUnit, ], providers : [ - AtlasViewerDataService, AtlasViewerDataService, WidgetServices, AtlasViewerURLService, diff --git a/src/res/css/extra_styles.css b/src/res/css/extra_styles.css index 40591e08542d7c8db84ee29f35b8d4cb8e5d8690..dec754ca211e5cba31b93b7ae89189566d67ab59 100644 --- a/src/res/css/extra_styles.css +++ b/src/res/css/extra_styles.css @@ -110,7 +110,7 @@ label.perspective-panel-show-slice-views:hover label.perspective-panel-show-slice-views:before { margin-left: .2em; - content: "show / hide frontal octant"; + content: "toggle frontal octant"; visibility: visible; pointer-events: all; color: #337ab7; diff --git a/src/res/ext/infantNehubaConfig.json b/src/res/ext/infantNehubaConfig.json index 0ceddac6af0fd6b0567dda6bc89ae687c0ba76e5..aecced0b70c434356b8fb169707b1faf37876e96 100644 --- a/src/res/ext/infantNehubaConfig.json +++ b/src/res/ext/infantNehubaConfig.json @@ -1,129 +1 @@ -{ - "globals": { - "hideNullImageValues": true, - "useNehubaLayout": true, - "useCustomSegmentColors": true, - "useNehubaMeshLayer": true - }, - "zoomWithoutCtrl": true, - "hideNeuroglancerUI": true, - "rightClickWithCtrl": true, - "rotateAtViewCentre": true, - "zoomAtViewCentre": true, - "restrictUserNavigation": true, - "enableMeshLoadingControl": true, - "dataset": { - "imageBackground": [ - 0, - 0, - 0, - 1 - ], - "initialNgState": { - "showDefaultAnnotations":false, - "layers": { - "infant template": { - "type": "image", - "source": "precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/Infant/t2_masked_uint8", - "transform": [ - [ - 1, - 0, - 0, - -62091243.743896484 - ], - [ - 0, - 1, - 0, - -75278762.81738281 - ], - [ - 0, - 0, - 1, - -63800006.86645508 - ], - [ - 0, - 0, - 0, - 1 - ] - ] - }, - "infant atlas": { - "type": "segmentation", - "source": "precomputed://https://www.jubrain.fz-juelich.de/apps/hbp/preview/infant2/data/dummyseg", - "transform": [ - [ - -1, - 0, - 0, - 62699913.0249023 - ], - [ - 0, - -1, - 0, - 75827774.0478516 - ], - [ - 0, - 0, - -1, - 64288764.9536133 - ], - [ - 0, - 0, - 0, - 1 - ] - ] - } - }, - "navigation": { - "pose": { - "position": { - "voxelSize": [ - 1098960.875, - 1098953.25, - 1099998.5 - ], - "voxelCoordinates": [ - -0.5184690952301025, - 3.893488645553589, - 1.6981953382492065 - ] - } - }, - "zoomFactor": 450227.18138248235 - }, - "perspectiveOrientation": [ - 0.5, - 0.5, - -0.5, - -0.5 - ], - "perspectiveZoom": 1895248.9337559766 - } - }, - "layout": { - "useNehubaPerspective": { - "removePerspectiveSlicesBackground": { - "mode": "==" - }, - "fixedZoomPerspectiveSlices": { - "sliceViewportWidth": 400, - "sliceViewportHeight": 400, - "sliceZoom": 450227.18138248235, - "sliceViewportSizeMultiplier": 2 - }, - "centerToOrigin": true, - "mesh": { - "surfaceParcellation": true - } - } - } -} \ No newline at end of file +{"globals":{"hideNullImageValues":true,"useNehubaLayout":true,"useCustomSegmentColors":true,"useNehubaMeshLayer":true},"zoomWithoutCtrl":true,"hideNeuroglancerUI":true,"rightClickWithCtrl":true,"rotateAtViewCentre":true,"zoomAtViewCentre":true,"restrictUserNavigation":true,"enableMeshLoadingControl":true,"dataset":{"imageBackground":[0,0,0,1],"initialNgState":{"showDefaultAnnotations":false,"layers":{"infant template":{"type":"image","source":"precomputed://https://neuroglancer-dev.humanbrainproject.org/precomputed/Infant/t2_masked_uint8","transform":[[1,0,0,-62091243.743896484],[0,1,0,-75278762.81738281],[0,0,1,-63800006.86645508],[0,0,0,1]]},"infant atlas":{"type":"segmentation","source":"precomputed://https://www.jubrain.fz-juelich.de/apps/hbp/preview/infant2/data/dummyseg","transform":[[-1,0,0,62699913.0249023],[0,-1,0,75827774.0478516],[0,0,-1,64288764.9536133],[0,0,0,1]]}},"navigation":{"pose":{"position":{"voxelSize":[1098960.875,1098953.25,1099998.5],"voxelCoordinates":[-0.5184690952301025,3.893488645553589,1.6981953382492065]}},"zoomFactor":450227.18138248235},"perspectiveOrientation":[0.5,0.5,-0.5,-0.5],"perspectiveZoom":1895248.9337559766}},"layout":{"useNehubaPerspective":{"removePerspectiveSlicesBackground":{"mode":"=="},"fixedZoomPerspectiveSlices":{"sliceViewportWidth":400,"sliceViewportHeight":400,"sliceZoom":450227.18138248235,"sliceViewportSizeMultiplier":2},"centerToOrigin":true,"mesh":{"surfaceParcellation":true}}}} \ No newline at end of file diff --git a/webpack.staticassets.js b/webpack.staticassets.js index 6b65ef86e2240b4c5f53af53c1281e3849e07dce..906f22c262d85be996e4834478453e01627c0cb5 100644 --- a/webpack.staticassets.js +++ b/webpack.staticassets.js @@ -41,7 +41,9 @@ module.exports = { }, plugins : [ new webpack.DefinePlugin({ - PLUGINDEV : JSON.stringify(process.env.PLUGINDEV), + PLUGINDEV : process.env.PLUGINDEV + ? JSON.stringify(process.env.PLUGINDEV) + : false, BUNDLEDPLUGINS : process.env.BUNDLEDPLUGINS ? JSON.stringify(process.env.BUNDLEDPLUGINS.split(',')) : JSON.stringify([]),