diff --git a/src/atlasViewer/atlasViewer.component.ts b/src/atlasViewer/atlasViewer.component.ts index 30e65d3a3c7a20b641eae9c7bddf3d993d8337e6..eb71bfd07cc1754ed2be6b759e6a63fa87b44be4 100644 --- a/src/atlasViewer/atlasViewer.component.ts +++ b/src/atlasViewer/atlasViewer.component.ts @@ -116,7 +116,6 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit { public sidePanelIsOpen$: Observable<boolean> public onhoverSegmentsForFixed$: Observable<string[]> - public regionToolsMenuVisible = false constructor( private store: Store<IavRootStoreInterface>, @@ -414,13 +413,11 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit { } public mouseDownNehuba(_event) { - this.regionToolsMenuVisible = false this.rClContextualMenu.hide() } public mouseUpNehuba(event) { // if (this.mouseUpLeftPosition === event.pageX && this.mouseUpTopPosition === event.pageY) {} - this.regionToolsMenuVisible = true if (!this.rClContextualMenu) { return } this.rClContextualMenu.mousePos = [ event.clientX, diff --git a/src/atlasViewer/atlasViewer.template.html b/src/atlasViewer/atlasViewer.template.html index 7c483ae0ea6237611503867dd3cc00f04f9e52a9..e10c82d4cb40aba6e2d08355fe4b161421587f37 100644 --- a/src/atlasViewer/atlasViewer.template.html +++ b/src/atlasViewer/atlasViewer.template.html @@ -142,14 +142,17 @@ <ng-container *ngFor="let onHoverRegion of onHoverSegments; let first = first"> <!-- ToDo it should change - we should get information about connectivity existence from API--> - <region-menu - class="pe-all" - [region]="onHoverRegion" - [isSelected]="selectedRegions$ | async | includes : onHoverRegion : compareFn" - [hasConnectivity]="selectedParcellation && selectedParcellation.hasAdditionalViewMode && selectedParcellation.hasAdditionalViewMode.includes('connectivity')" - > - </region-menu> - + <div class="d-flex flex-column"> + <region-menu + class="pe-all" + [region]="onHoverRegion" + [isSelected]="selectedRegions$ | async | includes : onHoverRegion : compareFn" + [hasConnectivity]="selectedParcellation + && selectedParcellation.hasAdditionalViewMode + && selectedParcellation.hasAdditionalViewMode.includes('connectivity')" + (closeRegionMenu)="rClContextualMenu.hide()"> + </region-menu> + </div> </ng-container> </ng-container> </div> diff --git a/src/ui/parcellationRegion/region.base.ts b/src/ui/parcellationRegion/region.base.ts index 2632b9d0e3d6dd7882ee9533d47c78f5ad5cc927..9f382991a4d07440f9141bda6ce12055b7a6ed7c 100644 --- a/src/ui/parcellationRegion/region.base.ts +++ b/src/ui/parcellationRegion/region.base.ts @@ -17,7 +17,8 @@ export class RegionBase { public isSelected: boolean = false @Input() public hasConnectivity: boolean - @Output() public exploreConnectivity: EventEmitter<string> = new EventEmitter() + + @Output() public closeRegionMenu: EventEmitter<boolean> = new EventEmitter() constructor( private store$: Store<IavRootStoreInterface>, @@ -26,6 +27,7 @@ export class RegionBase { } public navigateToRegion() { + this.closeRegionMenu.emit() const { region } = this this.store$.dispatch({ type: VIEWERSTATE_CONTROLLER_ACTION_TYPES.NAVIGATETO_REGION, @@ -34,6 +36,7 @@ export class RegionBase { } public toggleRegionSelected() { + this.closeRegionMenu.emit() const { region } = this this.store$.dispatch({ type: VIEWERSTATE_CONTROLLER_ACTION_TYPES.TOGGLE_REGION_SELECT, @@ -42,6 +45,7 @@ export class RegionBase { } public showConnectivity(regionName) { + this.closeRegionMenu.emit() // ToDo trigger side panel opening with effect this.store$.dispatch({type: OPEN_SIDE_PANEL}) this.store$.dispatch({type: EXPAND_SIDE_PANEL_CURRENT_VIEW}) diff --git a/src/ui/parcellationRegion/regionMenu/regionMenu.template.html b/src/ui/parcellationRegion/regionMenu/regionMenu.template.html index 965a0af09638ac098a63e39109c4e90d801406d3..1d7e78a1ad5484f51b35145ac258fcc73f278e04 100644 --- a/src/ui/parcellationRegion/regionMenu/regionMenu.template.html +++ b/src/ui/parcellationRegion/regionMenu/regionMenu.template.html @@ -11,7 +11,7 @@ [color]="isSelected ? 'primary': 'basic'"> <i class="far" [ngClass]="{'fa-check-square': isSelected, 'fa-square': !isSelected}"></i> <span> - Selected + {{isSelected? 'Deselect' : 'Select'}} </span> </button> <button mat-button (click)="navigateToRegion()">