From 4146fe1f1176ab432a05f0fa7012cd8f7826ba13 Mon Sep 17 00:00:00 2001 From: Daviti Gogshelidze <daviti1@mail.com> Date: Mon, 19 Dec 2022 20:14:17 +0100 Subject: [PATCH] Set default connectivity profile --- .../region/region/rich/region.rich.template.html | 2 +- .../connectivityBrowser.component.ts | 14 ++++++++++++-- .../connectivityBrowser.template.html | 9 +++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.template.html b/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.template.html index 547567b42..18f77fc1b 100644 --- a/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.template.html +++ b/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.template.html @@ -115,10 +115,10 @@ <sxplr-sapiviews-features-connectivity-browser class="pe-all flex-shrink-1" [region]="region" - [types]="hasConnectivityDirective.availableModalities" [sxplr-sapiviews-features-connectivity-browser-atlas]="atlas" [sxplr-sapiviews-features-connectivity-browser-parcellation]="parcellation" [accordionExpanded]="expandedPanel === CONST.CONNECTIVITY" + [types]="hasConnectivityDirective.availableModalities" > </sxplr-sapiviews-features-connectivity-browser> </ng-template> diff --git a/src/atlasComponents/sapiViews/features/connectivity/connectivityBrowser/connectivityBrowser.component.ts b/src/atlasComponents/sapiViews/features/connectivity/connectivityBrowser/connectivityBrowser.component.ts index 850d763b8..9feb4e36d 100644 --- a/src/atlasComponents/sapiViews/features/connectivity/connectivityBrowser/connectivityBrowser.component.ts +++ b/src/atlasComponents/sapiViews/features/connectivity/connectivityBrowser/connectivityBrowser.component.ts @@ -57,8 +57,6 @@ export class ConnectivityBrowserComponent implements AfterViewInit, OnDestroy { } - @Input() types: SapiModalityModel[] = [] - public selectedType: string public selectedTypeId: string public selectedCohort: string @@ -66,6 +64,7 @@ export class ConnectivityBrowserComponent implements AfterViewInit, OnDestroy { public selectedSubjectIndex: number public selectedSubjectsDatasets: string[] public selectedSubjectDatasetIndex: number + public infoExpanded: boolean public fetchedItems: SapiParcellationFeatureModel[] = [] public cohorts: string[] public selectedView: 'subject' | 'average' | null @@ -105,6 +104,16 @@ export class ConnectivityBrowserComponent implements AfterViewInit, OnDestroy { public logDisabled: boolean = true public logChecked: boolean = true + private _types: SapiModalityModel[] = [] + @Input() + set types(val) { + this._types = val + if (val && val.length) this.selectType(val[0].name) + } + get types() { + return this._types + } + @ViewChild('connectivityComponent', {read: ElementRef}) public connectivityComponentElement: ElementRef<any> @ViewChild('fullConnectivityGrid') public fullConnectivityGridElement: ElementRef<any> @@ -214,6 +223,7 @@ export class ConnectivityBrowserComponent implements AfterViewInit, OnDestroy { this.cohorts = [...new Set(this.fetchedItems.map(item => item.cohort))] this.fetching = false this.changeDetectionRef.detectChanges() + this.selectCohort(this.cohorts[0]) } }) } diff --git a/src/atlasComponents/sapiViews/features/connectivity/connectivityBrowser/connectivityBrowser.template.html b/src/atlasComponents/sapiViews/features/connectivity/connectivityBrowser/connectivityBrowser.template.html index b59216a94..7d34eba4f 100644 --- a/src/atlasComponents/sapiViews/features/connectivity/connectivityBrowser/connectivityBrowser.template.html +++ b/src/atlasComponents/sapiViews/features/connectivity/connectivityBrowser/connectivityBrowser.template.html @@ -96,6 +96,15 @@ <i class="fas fa-download mb-2 mr-2"></i> <label>Export</label> </button> + <button mat-button (click)="infoExpanded = !infoExpanded"> + <i class="fas fa-info mb-2 mr-2"></i> + <i class="fas mb-2 ml-2" [ngClass]="infoExpanded? 'fa-chevron-up' : 'fa-chevron-down'"></i> + </button> + </div> + + <div *ngIf="infoExpanded"> + <p>{{selectedDataset.description}}</p> + <p>{{selectedDataset.authors.join()}}</p> </div> <hbp-connectivity-matrix-row -- GitLab