From 507cdf97a561a0696ec3c115e091ae35770f6a45 Mon Sep 17 00:00:00 2001
From: xgui3783 <xgui3783@gmail.com>
Date: Sat, 3 Oct 2020 20:17:07 +0200
Subject: [PATCH] bugfix: fix gapmap id (#660)
bugfix: preview now uses schema as well as id
---
src/glue.ts | 3 +-
src/res/ext/MNI152.json | 92 ++++++++++++++-----
src/res/ext/colin.json | 92 ++++++++++++++-----
.../regionMenu/regionMenu.template.html | 1 +
4 files changed, 145 insertions(+), 43 deletions(-)
diff --git a/src/glue.ts b/src/glue.ts
index ca2ce2b87..c107f92a9 100644
--- a/src/glue.ts
+++ b/src/glue.ts
@@ -371,9 +371,10 @@ export class DatasetPreviewGlue implements IDatasetPreviewGlue, OnDestroy{
public displayDatasetPreview(previewFile: DatasetPreview, dataset: IKgDataEntry){
const { filename, datasetId } = previewFile
const { fullId } = dataset
- const { kgId } = getIdObj(fullId)
+ const { kgId, kgSchema } = getIdObj(fullId)
const datasetPreviewFile = {
+ datasetSchema: kgSchema,
datasetId: datasetId || kgId,
filename
}
diff --git a/src/res/ext/MNI152.json b/src/res/ext/MNI152.json
index 2ee0837e0..215554104 100644
--- a/src/res/ext/MNI152.json
+++ b/src/res/ext/MNI152.json
@@ -12304,11 +12304,16 @@
"status": "left hemisphere",
"labelIndex": 13,
"ngId": "ICBM152_V24_LEFT_NG",
+ "rgb": [
+ 186,
+ 255,
+ 25
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-I (GapMap) [v9.2, ICBM 2009c Asymmetric, left hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "d7f53ed36c5c546be47deb6891edc20d"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "6b1ebd25-d1bf-477a-9f6f-d458b24bc6b7"
}
],
"_": {
@@ -12328,11 +12333,16 @@
"status": "left hemisphere",
"labelIndex": 32,
"ngId": "ICBM152_V24_LEFT_NG",
+ "rgb": [
+ 104,
+ 161,
+ 93
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-to-Occipital (GapMap) [v9.2, ICBM 2009c Asymmetric, left hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "b7d5d816297321efec0fd9364de8809a"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "f3ae17b7-f994-4161-ba60-46a971610167"
}
],
"_": {
@@ -12352,11 +12362,16 @@
"status": "left hemisphere",
"labelIndex": 60,
"ngId": "ICBM152_V24_LEFT_NG",
+ "rgb": [
+ 76,
+ 90,
+ 161
+ ],
"originDatasets": [
{
"filename": "GapMap Temporal-to-Parietal (GapMap) [v9.2, ICBM 2009c Asymmetric, left hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "90596a422d2c94b8f7acf1d79f0d463e"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "19838359-3e95-4334-aaa0-3c64e3a65c18"
}
],
"_": {
@@ -12376,11 +12391,16 @@
"status": "left hemisphere",
"labelIndex": 90,
"ngId": "ICBM152_V24_LEFT_NG",
+ "rgb": [
+ 255,
+ 135,
+ 15
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-II (GapMap) [v9.2, ICBM 2009c Asymmetric, left hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "35d1a2a10e3c524ac9ef09e859a7952d"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "1db74846-624c-4be3-b4cc-71c18e94b119"
}
],
"_": {
@@ -12400,11 +12420,16 @@
"status": "left hemisphere",
"labelIndex": 97,
"ngId": "ICBM152_V24_LEFT_NG",
+ "rgb": [
+ 161,
+ 24,
+ 74
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-to-Temporal (GapMap) [v9.2, ICBM 2009c Asymmetric, left hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "18ed63d8f6accb3042cbd0e63e5c6565"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "6e0c6897-7ecf-451e-a9ad-d3e96bcc7b45"
}
],
"_": {
@@ -12424,11 +12449,16 @@
"status": "right hemisphere",
"labelIndex": 13,
"ngId": "ICBM152_V24_RIGHT_NG",
+ "rgb": [
+ 186,
+ 255,
+ 25
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-I (GapMap) [v9.2, ICBM 2009c Asymmetric, right hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "d7f53ed36c5c546be47deb6891edc20d"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "6b1ebd25-d1bf-477a-9f6f-d458b24bc6b7"
}
],
"_": {
@@ -12448,11 +12478,16 @@
"status": "right hemisphere",
"labelIndex": 32,
"ngId": "ICBM152_V24_RIGHT_NG",
+ "rgb": [
+ 104,
+ 161,
+ 93
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-to-Occipital (GapMap) [v9.2, ICBM 2009c Asymmetric, right hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "b7d5d816297321efec0fd9364de8809a"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "f3ae17b7-f994-4161-ba60-46a971610167"
}
],
"_": {
@@ -12472,11 +12507,16 @@
"status": "right hemisphere",
"labelIndex": 60,
"ngId": "ICBM152_V24_RIGHT_NG",
+ "rgb": [
+ 76,
+ 90,
+ 161
+ ],
"originDatasets": [
{
"filename": "GapMap Temporal-to-Parietal (GapMap) [v9.2, ICBM 2009c Asymmetric, right hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "90596a422d2c94b8f7acf1d79f0d463e"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "19838359-3e95-4334-aaa0-3c64e3a65c18"
}
],
"_": {
@@ -12496,11 +12536,16 @@
"status": "right hemisphere",
"labelIndex": 90,
"ngId": "ICBM152_V24_RIGHT_NG",
+ "rgb": [
+ 255,
+ 135,
+ 15
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-II (GapMap) [v9.2, ICBM 2009c Asymmetric, right hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "35d1a2a10e3c524ac9ef09e859a7952d"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "1db74846-624c-4be3-b4cc-71c18e94b119"
}
],
"_": {
@@ -12520,11 +12565,16 @@
"status": "right hemisphere",
"labelIndex": 96,
"ngId": "ICBM152_V24_RIGHT_NG",
+ "rgb": [
+ 161,
+ 24,
+ 74
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-to-Temporal (GapMap) [v9.2, ICBM 2009c Asymmetric, right hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "18ed63d8f6accb3042cbd0e63e5c6565"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "6e0c6897-7ecf-451e-a9ad-d3e96bcc7b45"
}
],
"_": {
@@ -12543,7 +12593,7 @@
}
],
"_": {
- "@src": "https://gin.g-node.org/FZJ-INM1-BDA/20201002_JulichBrain-V2_4-ICBM152_ontology/src/1cccaf9ed445a88e6c9309dd7a99b041225309bf/output/nehuba-ui/julich-brain-v2_4-icbm152.json"
+ "@src": "https://gin.g-node.org/FZJ-INM1-BDA/20201002_JulichBrain-V2_4-ICBM152_ontology/src/5206d759e7ed4adc4a35336519030de5605ca304/output/nehuba-ui/julich-brain-v2_4-icbm152.json"
}
},
{
diff --git a/src/res/ext/colin.json b/src/res/ext/colin.json
index 5d151d6c5..d31a7e979 100644
--- a/src/res/ext/colin.json
+++ b/src/res/ext/colin.json
@@ -12298,11 +12298,16 @@
"status": "left hemisphere",
"labelIndex": 13,
"ngId": "COLIN_V24_LEFT_NG",
+ "rgb": [
+ 186,
+ 255,
+ 25
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-I (GapMap) [v9.2, Colin 27, left hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "d7f53ed36c5c546be47deb6891edc20d"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "6b1ebd25-d1bf-477a-9f6f-d458b24bc6b7"
}
],
"_": {
@@ -12322,11 +12327,16 @@
"status": "left hemisphere",
"labelIndex": 32,
"ngId": "COLIN_V24_LEFT_NG",
+ "rgb": [
+ 104,
+ 161,
+ 93
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-to-Occipital (GapMap) [v9.2, Colin 27, left hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "b7d5d816297321efec0fd9364de8809a"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "f3ae17b7-f994-4161-ba60-46a971610167"
}
],
"_": {
@@ -12346,11 +12356,16 @@
"status": "left hemisphere",
"labelIndex": 60,
"ngId": "COLIN_V24_LEFT_NG",
+ "rgb": [
+ 76,
+ 90,
+ 161
+ ],
"originDatasets": [
{
"filename": "GapMap Temporal-to-Parietal (GapMap) [v9.2, Colin 27, left hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "90596a422d2c94b8f7acf1d79f0d463e"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "19838359-3e95-4334-aaa0-3c64e3a65c18"
}
],
"_": {
@@ -12370,11 +12385,16 @@
"status": "left hemisphere",
"labelIndex": 90,
"ngId": "COLIN_V24_LEFT_NG",
+ "rgb": [
+ 255,
+ 135,
+ 15
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-II (GapMap) [v9.2, Colin 27, left hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "35d1a2a10e3c524ac9ef09e859a7952d"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "1db74846-624c-4be3-b4cc-71c18e94b119"
}
],
"_": {
@@ -12394,11 +12414,16 @@
"status": "left hemisphere",
"labelIndex": 97,
"ngId": "COLIN_V24_LEFT_NG",
+ "rgb": [
+ 161,
+ 24,
+ 74
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-to-Temporal (GapMap) [v9.2, Colin 27, left hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "18ed63d8f6accb3042cbd0e63e5c6565"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "6e0c6897-7ecf-451e-a9ad-d3e96bcc7b45"
}
],
"_": {
@@ -12418,11 +12443,16 @@
"status": "right hemisphere",
"labelIndex": 13,
"ngId": "COLIN_V24_RIGHT_NG",
+ "rgb": [
+ 186,
+ 255,
+ 25
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-I (GapMap) [v9.2, Colin 27, right hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "d7f53ed36c5c546be47deb6891edc20d"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "6b1ebd25-d1bf-477a-9f6f-d458b24bc6b7"
}
],
"_": {
@@ -12442,11 +12472,16 @@
"status": "right hemisphere",
"labelIndex": 32,
"ngId": "COLIN_V24_RIGHT_NG",
+ "rgb": [
+ 104,
+ 161,
+ 93
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-to-Occipital (GapMap) [v9.2, Colin 27, right hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "b7d5d816297321efec0fd9364de8809a"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "f3ae17b7-f994-4161-ba60-46a971610167"
}
],
"_": {
@@ -12466,11 +12501,16 @@
"status": "right hemisphere",
"labelIndex": 60,
"ngId": "COLIN_V24_RIGHT_NG",
+ "rgb": [
+ 76,
+ 90,
+ 161
+ ],
"originDatasets": [
{
"filename": "GapMap Temporal-to-Parietal (GapMap) [v9.2, Colin 27, right hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "90596a422d2c94b8f7acf1d79f0d463e"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "19838359-3e95-4334-aaa0-3c64e3a65c18"
}
],
"_": {
@@ -12490,11 +12530,16 @@
"status": "right hemisphere",
"labelIndex": 90,
"ngId": "COLIN_V24_RIGHT_NG",
+ "rgb": [
+ 255,
+ 135,
+ 15
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-II (GapMap) [v9.2, Colin 27, right hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "35d1a2a10e3c524ac9ef09e859a7952d"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "1db74846-624c-4be3-b4cc-71c18e94b119"
}
],
"_": {
@@ -12514,11 +12559,16 @@
"status": "right hemisphere",
"labelIndex": 96,
"ngId": "COLIN_V24_RIGHT_NG",
+ "rgb": [
+ 161,
+ 24,
+ 74
+ ],
"originDatasets": [
{
"filename": "GapMap Frontal-to-Temporal (GapMap) [v9.2, Colin 27, right hemisphere]",
- "kgSchema": "julich/tmp/dataset/v1.0.0",
- "kgId": "18ed63d8f6accb3042cbd0e63e5c6565"
+ "kgSchema": "minds/core/dataset/v1.0.0",
+ "kgId": "6e0c6897-7ecf-451e-a9ad-d3e96bcc7b45"
}
],
"_": {
@@ -12537,7 +12587,7 @@
}
],
"_": {
- "@src": "https://gin.g-node.org/FZJ-INM1-BDA/20200926_JulichBrain-V2_4-Colin_ontology/raw/4f3d0130d38e205aefcf4e515d5429a34cd4a35e/output/nehuba-ui/julich-brain-v2_4-colin.json"
+ "@src": "https://gin.g-node.org/FZJ-INM1-BDA/20200926_JulichBrain-V2_4-Colin_ontology/raw/62115276a0287a3fea9ba5246469e40a259e26ec/output/nehuba-ui/julich-brain-v2_4-colin.json"
}
}
],
diff --git a/src/ui/parcellationRegion/regionMenu/regionMenu.template.html b/src/ui/parcellationRegion/regionMenu/regionMenu.template.html
index 714b6e70a..56f05d9b1 100644
--- a/src/ui/parcellationRegion/regionMenu/regionMenu.template.html
+++ b/src/ui/parcellationRegion/regionMenu/regionMenu.template.html
@@ -52,6 +52,7 @@
iav-dataset-preview-dataset-file
[iav-dataset-preview-dataset-file-kgid]="originDataset.kgId"
[iav-dataset-preview-dataset-file-filename]="originDataset.filename"
+ [iav-dataset-preview-dataset-file-kgschema]="originDataset.kgSchema"
#previewDirective="iavDatasetPreviewDatasetFile"
iv-custom-comp
[attr.primary]="previewDirective.active || null"
--
GitLab