diff --git a/docs/releases/v2.3.3.md b/docs/releases/v2.3.3.md index ad662197a8d1e091372f5a9bcd8ca48fab717f0e..daf21d1b8a1090df33fa4ff89351285bf271ea1e 100644 --- a/docs/releases/v2.3.3.md +++ b/docs/releases/v2.3.3.md @@ -1,4 +1,4 @@ -# v2.3.2 +# v2.3.3 ## Bugfixes diff --git a/docs/releases/v2.3.4.md b/docs/releases/v2.3.4.md new file mode 100644 index 0000000000000000000000000000000000000000..7874ad49313a9e874ae5b80787a9e25c10ef0a35 --- /dev/null +++ b/docs/releases/v2.3.4.md @@ -0,0 +1,5 @@ +# v2.3.4 + +## Bugfixes + +- fix connectivity dataset external link diff --git a/mkdocs.yml b/mkdocs.yml index 7afc5fcad58f0eb98bcaf8114adbc1a9979135ba..f510448ed99da52e0253813054cfcb4f61c0c4e7 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -40,6 +40,7 @@ pages: - Fetching datasets: 'advanced/datasets.md' - Display non-atlas volumes: 'advanced/otherVolumes.md' - Release notes: + - v2.3.4: 'releases/v2.3.4.md' - v2.3.3: 'releases/v2.3.3.md' - v2.3.2: 'releases/v2.3.2.md' - v2.3.1: 'releases/v2.3.1.md' diff --git a/src/ui/connectivityBrowser/connectivityBrowser.component.ts b/src/ui/connectivityBrowser/connectivityBrowser.component.ts index 32c9bac5847785fbb54f840d93e1e739760decf3..12d4fd22e19569780da445b0d73afb9b7001890a 100644 --- a/src/ui/connectivityBrowser/connectivityBrowser.component.ts +++ b/src/ui/connectivityBrowser/connectivityBrowser.component.ts @@ -112,6 +112,8 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe public datasetList: any[] = [] public selectedDataset: any public selectedDatasetDescription: string = '' + public selectedDatasetKgId: string = '' + public selectedDatasetKgSchema: string = '' public connectedAreas = [] private selectedParcellationFlatRegions$ = this.store$.pipe( @@ -151,7 +153,8 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe this.datasetList = res.filter(dl => dl['parcellation id'] === this.parcellationId) this.selectedDataset = this.datasetList[0].name this.selectedDatasetDescription = this.datasetList[0].description - + this.selectedDatasetKgId = this.datasetList[0].kgId + this.selectedDatasetKgSchema = this.datasetList[0].kgschema this.changeDataset() }) } @@ -166,9 +169,9 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe } }) ) - - /** - * Listen to of clear view entries + + /** + * Listen to of clear view entries * can come from within the component (when connectivity is not available for the dataset) * --> do not collapse * or outside (user clicks x in chip) @@ -186,7 +189,7 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe } }) ) - + this.subscriptions.push(this.overwrittenColorMap$.subscribe(ocm => { if (this.accordionIsExpanded && !ocm) { @@ -278,7 +281,7 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe this.restoreDefaultColormap() this.subscriptions.forEach(s => s.unsubscribe()) } - + clearViewer() { this.store$.dispatch( ngViewerActionClearView({ @@ -298,6 +301,8 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe if (event) { this.selectedDataset = event.value this.selectedDatasetDescription = this.datasetList.find(d => d.name === this.selectedDataset).description + this.selectedDatasetKgId = this.datasetList.find(d => d.name === this.selectedDataset).kgId || null + this.selectedDatasetKgSchema = this.datasetList.find(d => d.name === this.selectedDataset).kgschema || null } if (this.datasetList.length && this.selectedDataset) { const selectedDatasetId = this.datasetList.find(d => d.name === this.selectedDataset).id @@ -355,7 +360,7 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe const existingMap: Map<string, Map<number, { red: number, green: number, blue: number }>> = (getWindow().interactiveViewer.viewerHandle.getLayersSegmentColourMap()) const colorMap = new Map(existingMap) - + this.allRegions.forEach(r => { if (r.ngId) { colorMap.get(r.ngId).set(r.labelIndex, {red: 255, green: 255, blue: 255}) @@ -365,7 +370,7 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe this.connectedAreas.forEach(area => { const areaAsRegion = this.allRegions .filter(r => { - + if (this.regionHemisphere) { let regionName = area.name let regionStatus = null @@ -378,7 +383,7 @@ export class ConnectivityBrowserComponent implements OnInit, AfterViewInit, OnDe } return r.name === regionName && r.status === regionStatus } - + return r.name === area.name }) .map(r => r) diff --git a/src/ui/connectivityBrowser/connectivityBrowser.template.html b/src/ui/connectivityBrowser/connectivityBrowser.template.html index 3f69aa9c292f8d61a236f30bad6f9f963938b84e..eafa8d10c31ff86138e9d45cff13cea3201aaf43 100644 --- a/src/ui/connectivityBrowser/connectivityBrowser.template.html +++ b/src/ui/connectivityBrowser/connectivityBrowser.template.html @@ -38,7 +38,10 @@ <button class="flex-grow-0 flex-shrink-0" mat-icon-button iav-dataset-show-dataset-dialog [iav-dataset-show-dataset-dialog-name]="selectedDataset" - [iav-dataset-show-dataset-dialog-description]="selectedDatasetDescription"> + [iav-dataset-show-dataset-dialog-description]="selectedDatasetDescription" + [iav-dataset-show-dataset-dialog-kgid]="selectedDatasetKgId? selectedDatasetKgId : null" + [iav-dataset-show-dataset-dialog-kgschema]="selectedDatasetKgSchema? selectedDatasetKgSchema : null" + > <i class="fas fa-info"></i> </button> <button class="flex-grow-0 flex-shrink-0"