From 7e302859f14b60835590bef5b4d088e60a19be31 Mon Sep 17 00:00:00 2001 From: Ryan Birmingham Date: Thu, 18 Nov 2021 13:01:34 -0500 Subject: [PATCH 1/6] handle pathdb list elem conversion --- common/PathdbMods.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/PathdbMods.js b/common/PathdbMods.js index 2e8a6a48..a22d250d 100644 --- a/common/PathdbMods.js +++ b/common/PathdbMods.js @@ -22,6 +22,9 @@ function PathDbMods() { function convertPathDbSlide(data){ let x={} + if (data.length > 0){ + data = data[0] + } x["_raw"] = data x.mpp = 1e9 x.source="pathdb" @@ -103,7 +106,7 @@ function PathDbMods() { text: response.statusText, url: response.url }; - return response.json().then(convertPathDbSlide).then(x => [x]); + return response.json().then(x=>convertPathDbSlide(x[0])).then(x => [x]); }) } Store.prototype.default_getSlide = Store.prototype.getSlide From 992610e2de86f7d0dc7c8b67cbe63ca599928e07 Mon Sep 17 00:00:00 2001 From: Ryan Birmingham Date: Thu, 18 Nov 2021 13:02:57 -0500 Subject: [PATCH 2/6] rm broken collection param call --- apps/viewer/init.js | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/viewer/init.js b/apps/viewer/init.js index f225b8cd..a840554f 100644 --- a/apps/viewer/init.js +++ b/apps/viewer/init.js @@ -150,7 +150,6 @@ function initCore() { slideQuery.id = $D.params.slideId; slideQuery.name = $D.params.slide; slideQuery.location = $D.params.location; - slideQuery.collection = $D.params.collection; opt.addRulerCallback = onAddRuler; opt.deleteRulerCallback = onDeleteRuler; $CAMIC = new CaMic('main_viewer', slideQuery, opt); From f194ff349a122ff01546de90adbed3aea2f15988 Mon Sep 17 00:00:00 2001 From: Ryan Birmingham Date: Thu, 9 Dec 2021 15:30:41 -0500 Subject: [PATCH 3/6] better array check --- common/PathdbMods.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/PathdbMods.js b/common/PathdbMods.js index f49aef72..54f244ea 100644 --- a/common/PathdbMods.js +++ b/common/PathdbMods.js @@ -22,7 +22,7 @@ function PathDbMods() { function convertPathDbSlide(data){ let x={} - if (data.length > 0){ + if (Array.isArray(data) && data.length > 0){ data = data[0] } x["_raw"] = data From 2a987a6fd2908ed974dc52284be35fb1f45cf0c7 Mon Sep 17 00:00:00 2001 From: Ryan Birmingham Date: Tue, 18 Jan 2022 15:33:14 -0500 Subject: [PATCH 4/6] go to pathdb urls as needed for err --- apps/viewer/viewer.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/viewer/viewer.html b/apps/viewer/viewer.html index c94cf1cc..0222618e 100644 --- a/apps/viewer/viewer.html +++ b/apps/viewer/viewer.html @@ -405,6 +405,11 @@ // get slide id from url $D.params = getUrlVars(); + if ($D.params.mode == 'pathdb') { + $D.pages.home = '../../../'; + $D.pages.table = '../../../'; + } + // load if we have at least one slide query element if ($D.params && $D.params.slideId) { // normal initialization starts From 801e58ed490e86d680191f2c860b4f758b625cb5 Mon Sep 17 00:00:00 2001 From: Ryan Birmingham Date: Tue, 18 Jan 2022 15:38:10 -0500 Subject: [PATCH 5/6] Swap study and specimen --- apps/viewer/viewer.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/viewer/viewer.html b/apps/viewer/viewer.html index 0222618e..9046410d 100644 --- a/apps/viewer/viewer.html +++ b/apps/viewer/viewer.html @@ -409,7 +409,7 @@ $D.pages.home = '../../../'; $D.pages.table = '../../../'; } - + // load if we have at least one slide query element if ($D.params && $D.params.slideId) { // normal initialization starts @@ -426,8 +426,8 @@ let STORE = new Store('../../data/'); STORE.findSlide( $D.params.slide, - $D.params.study, $D.params.specimen, + $D.params.study, $D.params.location, null, $D.params.collection From d10445555cbb77dba817d3d1aa61334627a433fa Mon Sep 17 00:00:00 2001 From: Ryan Birmingham Date: Thu, 20 Jan 2022 10:09:28 -0500 Subject: [PATCH 6/6] history 3.9.10 entry --- HISTORY.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/HISTORY.md b/HISTORY.md index d2f06362..ef31c1f0 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -24,10 +24,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * **Version 1** * [1.0.x](#camicroscope-10) -### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.9.8...camicroscope:develop) +### caMicroscope [Unreleased](https://github.com/camicroscope/camicroscope/compare/v3.9.10...camicroscope:develop) ###### TBD +### caMicroscope [3.9.10](https://github.com/camicroscope/camicroscope/compare/v3.9.8...camicroscope:v3.9.10) +###### 2021-01-20 +* Human Readable Urls for pathdb + ### caMicroscope [3.9.8](https://github.com/camicroscope/camicroscope/compare/v3.9.6...camicroscope:v3.9.8) ###### 2021-10-21 * Add Segmentation -> Annotation Functionality [#542](https://github.com/camicroscope/caMicroscope/pull/542)