diff --git a/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.component.ts b/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.component.ts index 242bb2ff598c509f3eb6d552eb43ff63e6854b98..d2ba51f51e67d9d123835f04816a5b2ec8c560a9 100644 --- a/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.component.ts +++ b/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.component.ts @@ -103,7 +103,8 @@ export class SapiViewsCoreRegionRegionRich extends SapiViewsCoreRegionRegionBase shareReplay(1), ) - public selectATPR(region: SxplrRegion, parcellation: SxplrParcellation){ + public selectATPR(regParc: {region?: SxplrRegion, parcellation: SxplrParcellation}){ + const { region, parcellation } = regParc this.relatedRegion.next({ region, parcellation 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 c3587d8ecdec3a253a7f32c551a57a9e91036d48..5be2c5d7c37c1350cb91d4c057f7fbaaebb9225c 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 @@ -106,9 +106,11 @@ <th mat-header-cell *matHeaderCellDef> Related Region </th> <td mat-cell *matCellDef="let related"> <button tabindex="-1" mat-stroked-button - (click)="selectATPR(related.region, related.parcellation)" + (click)="selectATPR({ region: related.region, parcellation: related.parcellation})" class="sxplr-w-100" - [disabled]="!related.mapped"> + [disabled]="!related.mapped" + mat-dialog-close + [matTooltip]="('Explorer ' + related.region.name + ' in ' + related.parcellation.name)"> {{ related.region.name }} </button> </td> @@ -117,7 +119,13 @@ <ng-container matColumnDef="relatedRegionParc"> <th mat-header-cell *matHeaderCellDef> Related Region Parcellation </th> <td mat-cell *matCellDef="let related"> - {{ related.parcellation.name }} + <button tabindex="-1" mat-stroked-button + (click)="selectATPR({ parcellation: related.parcellation })" + class="sxplr-w-100" + mat-dialog-close + [matTooltip]="('Explore ' + related.parcellation.name)"> + {{ related.parcellation.name }} + </button> </td> </ng-container> diff --git a/src/state/atlasSelection/effects.ts b/src/state/atlasSelection/effects.ts index 7cf228c211e8cd089a721a88dcbb1d3049c0de60..c4920067aa280523eccdda4fb67e1d2857f8dd5e 100644 --- a/src/state/atlasSelection/effects.ts +++ b/src/state/atlasSelection/effects.ts @@ -303,11 +303,11 @@ export class Effect { } } + state.selectedRegions = [] if (!!regionId) { const selectedRegions = (state.selectedParcellationAllRegions || []).filter(r => r.name === regionId) state.selectedRegions = selectedRegions } - return actions.setAtlasSelectionState(state) }) @@ -316,7 +316,7 @@ export class Effect { ) }), catchError((err) => { - console.log("error!", err) + console.warn("Selecting ATP Error!", err) return of( mainActions.generalActionError({ message: err.toString() diff --git a/src/viewerModule/viewerCmp/viewerCmp.component.ts b/src/viewerModule/viewerCmp/viewerCmp.component.ts index e6dd65887941ea084344f8f2989009dfa8590e71..6ddd87d449d29782eca4b0efd75b4faf9c0242e2 100644 --- a/src/viewerModule/viewerCmp/viewerCmp.component.ts +++ b/src/viewerModule/viewerCmp/viewerCmp.component.ts @@ -511,11 +511,11 @@ export class ViewerCmp implements OnDestroy { } } - selectATPR(region: SxplrRegion, parcellation: SxplrParcellation){ + selectATPR(regParc: {region: SxplrRegion, parcellation: SxplrParcellation}){ this.store$.dispatch( atlasSelection.actions.selectATPById({ - parcellationId: parcellation.id, - regionId: region.name + parcellationId: regParc?.parcellation.id, + regionId: regParc?.region?.name }) ) } diff --git a/src/viewerModule/viewerCmp/viewerCmp.template.html b/src/viewerModule/viewerCmp/viewerCmp.template.html index 486717925468cf4af766558b4a76d3a26e6aa435..1a247aafb066ec36489c855445c5fe2e6952a57e 100644 --- a/src/viewerModule/viewerCmp/viewerCmp.template.html +++ b/src/viewerModule/viewerCmp/viewerCmp.template.html @@ -729,7 +729,7 @@ [sxplr-sapiviews-core-region-parcellation]="view.selectedParcellation" [sxplr-sapiviews-core-region-region]="view.selectedRegions[0]" (sxplr-sapiviews-core-region-region-rich-feature-clicked)="showDataset($event)" - (sxplr-sapiviews-core-region-region-rich-related-region-clicked)="selectATPR($event.region, $event.parcellation)" + (sxplr-sapiviews-core-region-region-rich-related-region-clicked)="selectATPR($event)" (sxplr-sapiviews-core-region-navigate-to)="navigateTo($event)" #regionDirective="sapiViewsCoreRegionRich" >