diff --git a/deploy/datasets/query.js b/deploy/datasets/query.js index 7023dbc2650c3aed04cc1f50d1ab4639b4c0b1fd..2cb5682ed8ebf37ab2c6301976fc52043e01241d 100644 --- a/deploy/datasets/query.js +++ b/deploy/datasets/query.js @@ -130,23 +130,15 @@ let juBrainSet = new Set(), allen2015Set = new Set(), allen2017Set = new Set() -readConfigFile('colin.json') - .then(data => JSON.parse(data)) - .then(json => { - const juBrain = flattenArray(json.parcellations[0].regions) - juBrainSet = populateSet(juBrain) - - }) - .catch(console.error) - readConfigFile('MNI152.json') .then(data => JSON.parse(data)) .then(json => { const longBundle = flattenArray(json.parcellations.find(({ name }) => name === 'Fibre Bundle Atlas - Long Bundle').regions) const shortBundle = flattenArray(json.parcellations.find(({ name }) => name === 'Fibre Bundle Atlas - Short Bundle').regions) - + const jubrain = flattenArray(json.parcellations.find(({ name }) => 'JuBrain Cytoarchitectonic Atlas' === name).regions) longBundleSet = populateSet(longBundle) shortBundleSet = populateSet(shortBundle) + juBrainSet = populateSet(jubrain) }) .catch(console.error) diff --git a/deploy/datasets/supplements/data/pmapJuBrainExtraPreview.json b/deploy/datasets/supplements/data/pmapJuBrainExtraPreview.json new file mode 100644 index 0000000000000000000000000000000000000000..636b30eac795f47d30830431cb4b0e775b4eed14 --- /dev/null +++ b/deploy/datasets/supplements/data/pmapJuBrainExtraPreview.json @@ -0,0 +1,212 @@ +[ + [ + "Probabilistic cytoarchitectonic map of Area TE 2.1 (STG) (v5.1)", + [ + { + "filename": "Area TE 2.1 (STG) [v5.1, Colin 27, right hemisphere]", + "templateSpace": "MNI Colin 27", + "name": "Area TE 2.1 (STG) [v5.1, Colin 27, right hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TE-2.1_r_N10_nlin2Stdcolin27_5.1_publicDOI_efa4e9b9415b25e5f15f62cae3f85dc7.nii.gz", + "position": [ + 57687872, + -10579427, + 2794828 + ] + }, + { + "filename": "Area TE 2.1 (STG) [v5.1, Colin 27, left hemisphere]", + "templateSpace": "MNI Colin 27", + "name": "Area TE 2.1 (STG) [v5.1, Colin 27, left hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TE-2.1_l_N10_nlin2Stdcolin27_5.1_publicDOI_b7611bb31d7954fbd78da2466dbd0f20.nii.gz", + "position": [ + -54752402, + -14155814, + 4981183 + ] + }, + { + "filename": "Area TE 2.1 (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]", + "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric", + "name": "Area TE 2.1 (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TE-2.1_l_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_13aac2e4455a8ce628917a9c9fc0b626.nii.gz", + "position": [ + -55002111, + -15505517, + 5163420 + ] + }, + { + "filename": "Area TE 2.1 (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]", + "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric", + "name": "Area TE 2.1 (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TE-2.1_r_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_7e1aaa3048cfff77868cca1c2ee572ae.nii.gz", + "position": [ + 56763205, + -9981199, + 3148015 + ] + } + ] + ], + [ + "Probabilistic cytoarchitectonic map of Area TE 2.2 (STG) (v5.1)", + [ + { + "filename": "Area TE 2.2 (STG) [v5.1, Colin 27, left hemisphere]", + "templateSpace": "MNI Colin 27", + "name": "Area TE 2.2 (STG) [v5.1, Colin 27, left hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TE-2.2_l_N10_nlin2Stdcolin27_5.1_publicDOI_2622704e8adfe45a66563e39a483e708.nii.gz", + "position": [ + -53471942, + -28134287, + 10852650 + ] + }, + { + "filename": "Area TE 2.2 (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]", + "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric", + "name": "Area TE 2.2 (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TE-2.2_l_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_312d40100d5ad5a083758514d85ba48e.nii.gz", + "position": [ + -54521424, + -29405149, + 11189029 + ] + }, + { + "filename": "Area TE 2.2 (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]", + "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric", + "name": "Area TE 2.2 (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TE-2.2_r_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_33f079dbd0e96f222ac27c5ed4d0bf33.nii.gz", + "position": [ + 55039649, + -22056652, + 11496780 + ] + }, + { + "filename": "Area TE 2.2 (STG) [v5.1, Colin 27, right hemisphere]", + "templateSpace": "MNI Colin 27", + "name": "Area TE 2.2 (STG) [v5.1, Colin 27, right hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TE-2.2_r_N10_nlin2Stdcolin27_5.1_publicDOI_b2c5dd9c628afe1e50234b32ef557806.nii.gz", + "position": [ + 55434400, + -23123733, + 10370400 + ] + } + ] + ],[ + "Probabilistic cytoarchitectonic map of Area TeI (STG) (v5.1)", + [ + { + "filename": "Area TeI (STG) [v5.1, Colin 27, right hemisphere]", + "templateSpace": "MNI Colin 27", + "name": "Area TeI (STG) [v5.1, Colin 27, right hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TI1_r_N10_nlin2Stdcolin27_5.1_publicDOI_390febadfb960f019db219f2017726de.nii.gz", + "position": [ + 50527679, + -642644, + -5612912 + ] + }, + { + "filename": "Area TeI (STG) [v5.1, Colin 27, left hemisphere]", + "templateSpace": "MNI Colin 27", + "name": "Area TeI (STG) [v5.1, Colin 27, left hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TI1_l_N10_nlin2Stdcolin27_5.1_publicDOI_cd40b4fa9fd491879a4f6eddfcd5ecc3.nii.gz", + "position": [ + -48914649, + -3808370, + -3908357 + ] + }, + { + "filename": "Area TeI (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]", + "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric", + "name": "Area TeI (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TI1_l_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_d0163a91613b36333d2f7113762b49ef.nii.gz", + "position": [ + -48886190, + -5123482, + -3930952 + ] + }, + { + "filename": "Area TeI (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]", + "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric", + "name": "Area TeI (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TI1_r_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_84d7716eb0afee93bf8ff8625361c4d8.nii.gz", + "position": [ + 48374985, + -829541, + -5684517 + ] + } + ] + ],[ + "Probabilistic cytoarchitectonic map of Area TI (STG) (v5.1)", + [ + { + "filename": "Area TI (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]", + "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric", + "name": "Area TI (STG) [v5.1, ICBM 2009c Asymmetric, left hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TI2_l_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_0d90b238155bc15ca0ec39ca312475a7.nii.gz", + "position": [ + -46764789, + -2393771, + -10637798 + ] + }, + { + "filename": "Area TI (STG) [v5.1, Colin 27, left hemisphere]", + "templateSpace": "MNI Colin 27", + "name": "Area TI (STG) [v5.1, Colin 27, left hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TI2_l_N10_nlin2Stdcolin27_5.1_publicDOI_45fbfa8808ec4de620328650b134bdc3.nii.gz", + "position": [ + -46437396, + -730832, + -10300790 + ] + }, + { + "filename": "Area TI (STG) [v5.1, Colin 27, right hemisphere]", + "templateSpace": "MNI Colin 27", + "name": "Area TI (STG) [v5.1, Colin 27, right hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/colin27/pmaps/Area-TI2_r_N10_nlin2Stdcolin27_5.1_publicDOI_42dd664fb5c8690e7c149fcb0d821a0e.nii.gz", + "position": [ + 47248486, + 920283, + -12354141 + ] + }, + { + "filename": "Area TI (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]", + "templateSpace": "MNI 152 ICBM 2009c Nonlinear Asymmetric", + "name": "Area TI (STG) [v5.1, ICBM 2009c Asymmetric, right hemisphere]", + "mimetype": "application/nifti", + "url": "https://neuroglancer.humanbrainproject.eu/precomputed/JuBrain/17/icbm152casym/pmaps/Area-TI2_r_N10_nlin2MNI152ASYM2009C_5.1_publicDOI_6d04657cb03e80a480d2332fd88ce368.nii.gz", + "position": [ + 45506411, + 637737, + -12972330 + ] + } + ] + ] +] \ No newline at end of file diff --git a/deploy/datasets/supplements/previewFile.js b/deploy/datasets/supplements/previewFile.js index 7c3edcaab9e8f965b97b6ab94b74a45f6a3a9741..7134a9286f324969802a549ffb012fc67a2ff104 100644 --- a/deploy/datasets/supplements/previewFile.js +++ b/deploy/datasets/supplements/previewFile.js @@ -4,6 +4,7 @@ const path = require('path') const DISABLE_RECEPTOR_PREVIEW = process.env.DISABLE_RECEPTOR_PREVIEW const DISABLE_JUBRAIN_PMAP = process.env.DISABLE_JUBRAIN_PMAP const DISABLE_JUBRAIN_PMAP_V17 = process.env.DISABLE_JUBRAIN_PMAP_V17 +const DISABLE_JUBRAIN_PMAP_EXTRA = process.env.DISABLE_JUBRAIN_PMAP_EXTRA const DISABLE_DWM_PMAP = process.env.DISABLE_DWM_PMAP const HOSTNAME = process.env.HOSTNAME || 'http://localhost:3000' const HOST_PATHNAME = process.env.HOST_PATHNAME || '' @@ -25,7 +26,8 @@ Promise.all([ DISABLE_RECEPTOR_PREVIEW ? Promise.resolve([]) : readFile('receptorPreview.json'), DISABLE_JUBRAIN_PMAP ? Promise.resolve([]) : readFile('pmapJubrainPreview.json'), DISABLE_DWM_PMAP ? Promise.resolve([]) : readFile('pmapDWMPreview.json'), - DISABLE_JUBRAIN_PMAP_V17 ? Promise.resolve([]) : readFile('pmapJuBrainV17Preview.json') + DISABLE_JUBRAIN_PMAP_V17 ? Promise.resolve([]) : readFile('pmapJuBrainV17Preview.json'), + DISABLE_JUBRAIN_PMAP_EXTRA ? Promise.resolve([]) : readFile('pmapJuBrainExtraPreview.json') ]) .then(arrOfA => arrOfA.reduce((acc, item) => acc.concat(item), [])) .then(iterable => { diff --git a/src/atlasViewer/atlasViewer.template.html b/src/atlasViewer/atlasViewer.template.html index 8561b2b623c34bdfeb299aaf9d345c431870758e..7e12fad60e5fbd3171ac3e7d3d986221f9fc32e0 100644 --- a/src/atlasViewer/atlasViewer.template.html +++ b/src/atlasViewer/atlasViewer.template.html @@ -7,9 +7,11 @@ <!-- kg tos --> <ng-template #kgToS> <h2 mat-dialog-title>Knowledge Graph ToS</h2> - <mat-dialog-content class="w-50vw"> - <kgtos-component> - </kgtos-component> + <mat-dialog-content> + <small> + <kgtos-component> + </kgtos-component> + </small> </mat-dialog-content> <mat-dialog-actions class="justify-content-end"> @@ -22,9 +24,11 @@ <!-- cookie --> <ng-template #cookieAgreementComponent> <h2 mat-dialog-title>Cookie Disclaimer</h2> - <mat-dialog-content class="w-50vw"> - <cookie-agreement> - </cookie-agreement> + <mat-dialog-content> + <small> + <cookie-agreement> + </cookie-agreement> + </small> </mat-dialog-content> <mat-dialog-actions class="justify-content-end"> @@ -149,7 +153,11 @@ <div floatingMouseContextualContainerDirective> - <div class="d-inline-block" iav-mouse-hover #iavMouseHoverConetxtualBlock="iavMouseHover" contextualBlock> + <div *ngIf="!ismobile" + class="d-inline-block" + iav-mouse-hover + #iavMouseHoverConetxtualBlock="iavMouseHover" + contextualBlock> <ng-container *ngFor="let labelText of iavMouseHoverConetxtualBlock.currentOnHoverObs$ | async | mouseOverTextPipe : selectedParcellation"> diff --git a/src/components/flatTree/flatTree.style.css b/src/components/flatTree/flatTree.style.css index 2141fb09a515b4b00818afd5f45306edcbeed0c5..f501aada1d1758cdc2bcc57c1d9c12889282bb64 100644 --- a/src/components/flatTree/flatTree.style.css +++ b/src/components/flatTree/flatTree.style.css @@ -54,9 +54,14 @@ span[renderText] border-left:rgba(128,128,128,0.6) 1px dashed; } +.render-node-text +{ + opacity: 0.8; +} + .render-node-text:hover { - color:rgba(219, 181, 86,1); + opacity: 1.0; } .render-node-level-1 diff --git a/src/res/css/extra_styles.css b/src/res/css/extra_styles.css index 2781c6cad4bac7c850d42f3e07cecb7d374d9f66..e00d002f62450536e46a4e67e2163dfe50814c90 100644 --- a/src/res/css/extra_styles.css +++ b/src/res/css/extra_styles.css @@ -147,7 +147,7 @@ label.perspective-panel-show-slice-views:before span.regionSelected { - color : #dbb556 + color : rgba(219, 181, 86,1); } span.regionNotSelected, @@ -158,7 +158,7 @@ span.regionSelected .cursor-default { - cursor: default; + cursor: default!important; } markdown-dom pre code diff --git a/src/res/ext/colin.json b/src/res/ext/colin.json index cc450f3455422e968b837474909fbce47be8decc..6c71c879011f52a8a68b78ef6c1065058fec1fda 100644 --- a/src/res/ext/colin.json +++ b/src/res/ext/colin.json @@ -9,11 +9,15 @@ { "name": "JuBrain Cytoarchitectonic Atlas", "ngId": "jubrain colin v18 left", - "auxillaryMeshIndices": [ 65535 ], - "originDatasets":[{ - "kgSchema": "minds/core/dataset/v1.0.0", - "kgId": "4ac9f0bc-560d-47e0-8916-7b24da9bb0ce" - }], + "auxillaryMeshIndices": [ + 65535 + ], + "originDatasets": [ + { + "kgSchema": "minds/core/dataset/v1.0.0", + "kgId": "4ac9f0bc-560d-47e0-8916-7b24da9bb0ce" + } + ], "properties": { "version": "1.0", "description": "This dataset contains the whole-brain parcellation of the JuBrain Cytoarchitectonic Atlas (Amunts and Zilles, 2015) in the MNI Colin 27 as well as the MNI ICBM 152 2009c nonlinear asymmetric reference space. The parcellation is derived from the individual probability maps (PMs) of the cytoarchitectonic regions released in the JuBrain Atlas, that are further combined into a Maximum Probability Map (MPM). The MPM is calculated by considering for each voxel the probability of all cytoarchitectonic areas released in the atlas, and determining the most probable assignment (Eickhoff 2005). Note that methodological improvements and integration of new brain structures may lead to small deviations in earlier released datasets.", @@ -996,9 +1000,6 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/C3HS-8R7", "synonyms": [], - "relatedAreas":[ - "Area 7A" - ], "rgb": [ 52, 20, @@ -1137,6 +1138,9 @@ 62944473 ] } + ], + "relatedAreas": [ + "Area 7A" ] } ] @@ -1510,9 +1514,6 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/C5QQ-EFB", "synonyms": [], - "relatedAreas":[ - "Area PFm" - ], "rgb": [ 187, 133, @@ -1571,8 +1572,8 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/F1TJ-54W", "synonyms": [], - "relatedAreas":[ - "Area PFop" + "relatedAreas": [ + "Area PF" ], "rgb": [ 226, @@ -1623,8 +1624,8 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/8DP8-8HE", "synonyms": [], - "relatedAreas":[ - "Area PGp" + "relatedAreas": [ + "Area PFcm" ], "rgb": [ 98, @@ -1675,7 +1676,7 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/V5HY-XTS", "synonyms": [], - "relatedAreas":[ + "relatedAreas": [ "Area PGa" ], "rgb": [ @@ -1727,7 +1728,7 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/JGM9-ZET", "synonyms": [], - "relatedAreas":[ + "relatedAreas": [ "Area PFt" ], "rgb": [ @@ -1779,8 +1780,8 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/TB94-HRK", "synonyms": [], - "relatedAreas":[ - "Area PFcm" + "relatedAreas": [ + "Area PFm" ], "rgb": [ 53, @@ -1871,6 +1872,9 @@ 30721440 ] } + ], + "relatedAreas": [ + "Area PGp" ] }, { @@ -1920,6 +1924,9 @@ 24917260 ] } + ], + "relatedAreas": [ + "Area PFop" ] } ] @@ -2758,6 +2765,9 @@ 1637838 ] } + ], + "relatedAreas": [ + "Area hOc1" ] } ] @@ -2941,7 +2951,7 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/F9P8-ZVW", "synonyms": [], - "relatedAreas":[ + "relatedAreas": [ "Area 44v", "Area 44d" ], @@ -3385,7 +3395,7 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/5HSF-81J", "synonyms": [], - "relatedAreas":[ + "relatedAreas": [ "Area 4p" ], "rgb": [ @@ -4877,7 +4887,7 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/MV3G-RET", "synonyms": [], - "relatedAreas":[ + "relatedAreas": [ "Area Te1" ], "rgb": [ @@ -4938,8 +4948,8 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/F2JH-KVV", "synonyms": [], - "relatedAreas":[ - "Area FG1" + "relatedAreas": [ + "Area FG2" ], "rgb": [ 67, @@ -5079,6 +5089,9 @@ -12612536 ] } + ], + "relatedAreas": [ + "Area FG1" ] }, { @@ -5088,7 +5101,7 @@ "labelIndex": null, "doi": "https://doi.org/10.25493/13RG-FYV", "synonyms": [], - "relatedAreas":[ + "relatedAreas": [ "Area FG2" ], "rgb": [ @@ -6071,4 +6084,4 @@ "name": "MNI Colin 27", "description": "A stereotaxic average of 27 T1-weighted MRI scans of the same individual. (Holmes et al., 1998), mapped to fit the MNI305 space. Although not capturing brain variability, it is well established in neuroscience due to its high definition. HBP provides the JuBrain probabilistic cytoarchitectonic atlas (Amunts et al.) in this space." } -} +} \ No newline at end of file diff --git a/src/theme.scss b/src/theme.scss index e85cfdce26366235f96280ccae6f742f46218b35..2603ff81c7c0cd003777a057e40f570cc59ae9f6 100644 --- a/src/theme.scss +++ b/src/theme.scss @@ -19,3 +19,29 @@ $iv-dark-theme: mat-dark-theme($iv-dark-theme-primary, $iv-dark-theme-accent, { @include angular-material-theme($iv-dark-theme); } + +.iav-dialog-class +{ + + @media (min-width: 576px) { + + } + + // Medium devices (tablets, 768px and up) + @media (min-width: 768px) { + + max-width: 50vw!important; + } + + // Large devices (desktops, 992px and up) + @media (min-width: 992px) { + + max-width: 50vw!important; + } + + // Extra large devices (large desktops, 1200px and up) + @media (min-width: 1200px) { + + max-width: 50vw!important; + } +} diff --git a/src/ui/nehubaContainer/nehubaContainer.template.html b/src/ui/nehubaContainer/nehubaContainer.template.html index 3e827ac7dd6143fd7506c7decea0b2c7092d9292..57f43e43fd0445365348ff101f4753cb8080634e 100644 --- a/src/ui/nehubaContainer/nehubaContainer.template.html +++ b/src/ui/nehubaContainer/nehubaContainer.template.html @@ -1,7 +1,7 @@ <ng-template #container> </ng-template> -<ui-splashscreen iav-stop="mousedown mouseup touchstart touchmove touchend" (contextmenu)="$event.stopPropagation();" *ngIf="!viewerLoaded"> +<ui-splashscreen iav-stop="mousedown mouseup touchstart touchmove touchend" *ngIf="!viewerLoaded"> </ui-splashscreen> <!-- spatial landmarks overlay --> diff --git a/src/ui/nehubaContainer/splashScreen/splashScreen.template.html b/src/ui/nehubaContainer/splashScreen/splashScreen.template.html index 71a731611707b5b9139c20bdad4a511e46259065..90dfb6b6cba80c3c4979146bd7cef5826d7af42d 100644 --- a/src/ui/nehubaContainer/splashScreen/splashScreen.template.html +++ b/src/ui/nehubaContainer/splashScreen/splashScreen.template.html @@ -29,8 +29,8 @@ Parcellations available </mat-card-subtitle> <button - (mousedown)="$event.stopPropagation()" - (click)="$event.stopPropagation(); selectTemplateParcellation(template, parcellation)" + iav-stop="mousedown touchstart click" + (click)="selectTemplateParcellation(template, parcellation)" *ngFor="let parcellation of template.parcellations" mat-button color="primary"> diff --git a/src/ui/sharedModules/angularMaterial.module.ts b/src/ui/sharedModules/angularMaterial.module.ts index 3d2399feb928cbb29784c61219766f66e0fe4d89..0b02dfe49874d8b0f80575e4b418db810b5fb09c 100644 --- a/src/ui/sharedModules/angularMaterial.module.ts +++ b/src/ui/sharedModules/angularMaterial.module.ts @@ -21,14 +21,18 @@ import { MatExpansionModule, MatGridListModule, MatIconModule, - MatMenuModule - + MatMenuModule, + MAT_DIALOG_DEFAULT_OPTIONS, + MatDialogConfig } from '@angular/material'; import { ScrollingModule as ExperimentalScrollingModule } from '@angular/cdk-experimental/scrolling' import { NgModule } from '@angular/core'; import {DragDropModule} from "@angular/cdk/drag-drop"; + +const defaultDialogOption: MatDialogConfig = new MatDialogConfig() + @NgModule({ imports: [ MatButtonModule, @@ -84,5 +88,12 @@ import {DragDropModule} from "@angular/cdk/drag-drop"; MatMenuModule, ExperimentalScrollingModule ], + providers: [{ + provide: MAT_DIALOG_DEFAULT_OPTIONS, + useValue: { + ...defaultDialogOption, + panelClass: 'iav-dialog-class' + } + }] }) export class AngularMaterialModule { }