From eac4067c6120b9feeb0e03fbfd4a4f87d0ffc3fd Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Mon, 25 Sep 2023 17:41:35 +0200
Subject: [PATCH] fix: add layer order
---
docs/releases/v2.13.2.md | 5 +++++
mkdocs.yml | 1 +
package.json | 2 +-
src/index.html | 2 +-
.../nehuba/layerCtrl.service/layerCtrl.effects.ts | 3 ++-
.../nehuba/nehubaViewer/nehubaViewer.component.ts | 3 ++-
src/viewerModule/nehuba/userLayers/service.ts | 4 +++-
7 files changed, 15 insertions(+), 5 deletions(-)
create mode 100644 docs/releases/v2.13.2.md
diff --git a/docs/releases/v2.13.2.md b/docs/releases/v2.13.2.md
new file mode 100644
index 000000000..684b679ca
--- /dev/null
+++ b/docs/releases/v2.13.2.md
@@ -0,0 +1,5 @@
+# v2.13.2
+
+## Behind the scene
+
+- user added layer now sits on index 1
diff --git a/mkdocs.yml b/mkdocs.yml
index da0c7cd79..af8c5c51f 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -33,6 +33,7 @@ nav:
- Fetching datasets: 'advanced/datasets.md'
- Display non-atlas volumes: 'advanced/otherVolumes.md'
- Release notes:
+ - v2.13.2: 'releases/v2.13.2.md'
- v2.13.1: 'releases/v2.13.1.md'
- v2.13.0: 'releases/v2.13.0.md'
- v2.12.5: 'releases/v2.12.5.md'
diff --git a/package.json b/package.json
index 4a5fc8a31..8ad925aa3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "siibra-explorer",
- "version": "2.13.1",
+ "version": "2.13.2",
"description": "siibra-explorer - explore brain atlases. Based on humanbrainproject/nehuba & google/neuroglancer. Built with angular",
"scripts": {
"lint": "eslint src --ext .ts",
diff --git a/src/index.html b/src/index.html
index c26d5c215..4be80ba95 100644
--- a/src/index.html
+++ b/src/index.html
@@ -14,7 +14,7 @@
<link rel="icon" type="image/png" href="assets/favicons/favicon-128-light.png"/>
<script src="extra_js.js"></script>
<script src="https://unpkg.com/three-surfer@0.0.13/dist/bundle.js" defer></script>
- <script type="module" src="https://unpkg.com/ng-layer-tune@0.0.21/dist/ng-layer-tune/ng-layer-tune.esm.js"></script>
+ <script type="module" src="https://unpkg.com/ng-layer-tune@0.0.22/dist/ng-layer-tune/ng-layer-tune.esm.js"></script>
<script type="module" src="https://unpkg.com/hbp-connectivity-component@0.6.6/dist/connectivity-component/connectivity-component.js" ></script>
<script defer src="https://unpkg.com/mathjax@3.1.2/es5/tex-svg.js"></script>
<script defer src="https://unpkg.com/d3@6.2.0/dist/d3.min.js"></script>
diff --git a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts
index 5947f3b6c..d0f4bd4c9 100644
--- a/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts
+++ b/src/viewerModule/nehuba/layerCtrl.service/layerCtrl.effects.ts
@@ -76,7 +76,8 @@ export class LayerCtrlEffects {
lowThreshold: meta.min,
removeBg: true,
}),
- type: 'image'
+ type: 'image',
+ opacity: 0.5
}
})
)
diff --git a/src/viewerModule/nehuba/nehubaViewer/nehubaViewer.component.ts b/src/viewerModule/nehuba/nehubaViewer/nehubaViewer.component.ts
index 2a06e3f2d..32159cf9a 100644
--- a/src/viewerModule/nehuba/nehubaViewer/nehubaViewer.component.ts
+++ b/src/viewerModule/nehuba/nehubaViewer/nehubaViewer.component.ts
@@ -583,11 +583,12 @@ export class NehubaViewerUnit implements OnDestroy {
const combined = {
type: 'image',
+ opacity: 1,
...rest,
...(transform ? { transform } : {})
}
viewer.layerManager.addManagedLayer(
- viewer.layerSpecification.getLayer(key, combined))
+ viewer.layerSpecification.getLayer(key, combined), 1)
return layerObj[key]
})
diff --git a/src/viewerModule/nehuba/userLayers/service.ts b/src/viewerModule/nehuba/userLayers/service.ts
index 41d16e71b..65bbcebb2 100644
--- a/src/viewerModule/nehuba/userLayers/service.ts
+++ b/src/viewerModule/nehuba/userLayers/service.ts
@@ -169,7 +169,9 @@ export class UserLayerService implements OnDestroy {
panelClass: ["no-padding-dialog", "w-100"],
})
.afterClosed()
- .subscribe(() => this.removeUserLayer(url))
+ .subscribe(() => {
+ this.routerSvc.setCustomRoute(OVERLAY_LAYER_KEY, null)
+ })
}
removeUserLayer(url: string) {
--
GitLab