-
Notifications
You must be signed in to change notification settings - Fork 298
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into gsoc/ml_assistant
- Loading branch information
Showing
30 changed files
with
818 additions
and
4,747 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Submodule Caracal
deleted from
945e44
Submodule Distro
deleted from
4f107a
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,33 @@ | ||
| let params = getUrlVars(); | ||
| let isPathdb = false; | ||
| document.addEventListener('DOMContentLoaded', async function() { | ||
| let params = getUrlVars(); | ||
| let isPathdb = false; | ||
|
|
||
| if (params.hasOwnProperty('mode') && params.mode == 'pathdb') { | ||
| PathDbMods(); | ||
| isPathdb = true; | ||
| } | ||
| if (params.hasOwnProperty('mode') && params.mode == 'pathdb') { | ||
| await PathDbMods(); | ||
| isPathdb = true; | ||
| } | ||
|
|
||
| const store = new Store('../data/'); | ||
| const store = new Store('../data/'); | ||
|
|
||
| if (params.hasOwnProperty('slide')) { | ||
| store.findSlide(params.slide, params.specimen, params.study, 0, 0, params.collection).then((x)=>{ | ||
| console.info(x); | ||
| if (x.length <=0) { | ||
| throw new Error('No Matches found'); | ||
| } | ||
| if (isPathdb) { | ||
| // get the pathdb url | ||
| window.location = './viewer/viewer.html?slideId=' + x[0]['_id']['$oid'] + '&mode=pathdb'; | ||
| } else { | ||
| // get the normal url | ||
| window.location = './viewer/viewer.html?slideId=' + x[0]['_id']['$oid']; | ||
| } | ||
| }).catch((e)=>{ | ||
| console.error(e); | ||
| if (params.hasOwnProperty('slide')) { | ||
| store.findSlide(params.slide, params.specimen, params.study, 0, 0, params.collection).then((x)=>{ | ||
| console.info(x); | ||
| if (x.length <=0) { | ||
| throw new Error('No Matches found'); | ||
| } | ||
| if (isPathdb) { | ||
| // get the pathdb url | ||
| window.location = './viewer/viewer.html?slideId=' + x[0]['_id']['$oid'] + '&mode=pathdb'; | ||
| } else { | ||
| // get the normal url | ||
| window.location = './viewer/viewer.html?slideId=' + x[0]['_id']['$oid']; | ||
| } | ||
| }).catch((e)=>{ | ||
| console.error(e); | ||
| alert('ERROR!'); | ||
| }); | ||
| } else { | ||
| console.error('no slide passed?'); | ||
| alert('ERROR!'); | ||
| }); | ||
| } else { | ||
| console.error('no slide passed?'); | ||
| alert('ERROR!'); | ||
| } | ||
| } | ||
| }); |
Oops, something went wrong.