Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update simulated data and improve multiflatmap rendering #33

Merged
merged 5 commits into from
May 29, 2020
Merged

Update simulated data and improve multiflatmap rendering #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
764bb2a
Merge branch 'master' of https://github.com/ABI-Software/mapintegrate…
alan-wu May 28, 2020
17195b7
Bump flatmapvuer version.
alan-wu May 28, 2020
f299ee6
Update simulated result.
alan-wu May 28, 2020
246ed61
Bump package version.
alan-wu May 28, 2020
93ab432
Merge branch 'master' of https://github.com/ABI-Software/mapintegrate…
alan-wu May 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@abi-software/mapintegratedvuer",
"version": "0.1.10",
"version": "0.1.11",
"main": "./dist/mapintegratedvuer.common.js",
"files": [
"dist/*",
Expand All @@ -18,7 +18,7 @@
"build-static": "vue-cli-service build --dest test_html"
},
"dependencies": {
"@abi-software/flatmapvuer": "^0.1.14",
"@abi-software/flatmapvuer": "^0.1.16",
"@abi-software/maptooltip": "^0.1.7",
"@abi-software/scaffoldvuer": "^0.1.28",
"@tehsurfer/plotvuer": "^0.2.15",
Expand Down
3 changes: 2 additions & 1 deletion src/components/ContentVuer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
ref="multiflatmap"/>
<FlatmapVuer v-else-if="entry.type === 'Flatmap'" :entry="entry.resource"
@resource-selected="resourceSelected(entry.type, $event)" :name="entry.resource"
style="height:100%;width:100%;" ref="flatmap"/>
style="height:100%;width:100%;" :minZoom="entry.minZoom"
:pathControls="entry.pathControls" ref="flatmap"/>
<ScaffoldVuer v-else-if="entry.type === 'Scaffold'" :url="entry.resource"
@scaffold-selected="resourceSelected(entry.type, $event)" ref="scaffold"
:backgroundToggle=true />
Expand Down
3 changes: 2 additions & 1 deletion src/components/DatasetHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ export default {
}
},
openDatasetUrl: function(){
window.open(this.entry.datasetUrl, '_blank');
if (this.entry.datasetUrl)
window.open(this.entry.datasetUrl, '_blank');
this.cardDisplayed = false;
}
}
Expand Down
28 changes: 24 additions & 4 deletions src/components/SimulatedData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,13 @@ function getGenericMarkerInfo(term ,label, dataset, scaffold, simulations) {
} else {
if (label == "Heart"){
data.actions.push(
{
{
title: "View control diagram",
label: "simulation",
resource: "https://mapcore-bucket1.s3-us-west-2.amazonaws.com/misc/img/hmlacoibfdemmkah.png",
type: "Iframe",
label: "Kember",
resource: "ABI:1000001",
type: "Flatmap",
minZoom: 5,
pathControls: false,
datasetTitle: "Kember control diagram",
datasetUrl: "https://pubmed.ncbi.nlm.nih.gov/28692680/?from_term=Kember+G%5Bau%5D&from_pos=2"
}
Expand Down Expand Up @@ -122,6 +124,24 @@ function getRatData(term, label, dataset, scaffold, simulations) {
},
];
break;
case "UBERON:0002048":
data.title = "Lung";
data.description = "";
data.actions = [
{
title: "View 3D scaffold",
label: "Lung",
resource: "https://mapcore-bucket1.s3-us-west-2.amazonaws.com/lungs/28-may/lung_metadata.json",
type: "Scaffold"
},
{
title: "Search for dataset",
label: "Heart",
resource: "https://sparc.science/data?type=dataset&q=lung",
type: "URL"
},
];
break;
case "ICN":
data.title = "RNA";
data.description = "The distribution of neurons in the intrinsic cardiac nervous system (ICN) were mapped and visualized in a 3D reconstruction of a male rat heart.";
Expand Down