diff --git a/src/components/panel/panel.component.ts b/src/components/panel/panel.component.ts index 6b2c5095c1f04c39d1a85123e0f793163290d845..9b7c3491a30eef1c28adf23befe289fc733119cf 100644 --- a/src/components/panel/panel.component.ts +++ b/src/components/panel/panel.component.ts @@ -1,5 +1,4 @@ -import { Component, Input, ViewChild, ElementRef, AfterContentChecked, ChangeDetectionStrategy, ChangeDetectorRef, OnChanges, SimpleChanges, HostBinding, ApplicationRef } from "@angular/core"; -import { panelAnimations } from "./panel.animation"; +import { Component, Input, ViewChild, ElementRef, ChangeDetectionStrategy } from "@angular/core"; import { ParseAttributeDirective } from "../parseAttribute.directive"; @Component({ diff --git a/src/ui/databrowserModule/databrowser.module.ts b/src/ui/databrowserModule/databrowser.module.ts index d272cf211d8f2b0648453c12ddccd88d7f094ce1..42dcfc4305c466b61730dbe75a49b2bc5dddddab 100644 --- a/src/ui/databrowserModule/databrowser.module.ts +++ b/src/ui/databrowserModule/databrowser.module.ts @@ -25,6 +25,7 @@ import { KgSingleDatasetService } from "./kgSingleDatasetService.service" import { SingleDatasetView } from './singleDataset/singleDataset.component' import { AngularMaterialModule } from 'src/ui/sharedModules/angularMaterial.module' import { DoiParserPipe } from "src/util/pipes/doiPipe.pipe"; +import { RegionBackgroundToRgbPipe } from "./util/regionBackgroundToRgb.pipe"; @NgModule({ imports:[ @@ -56,7 +57,8 @@ import { DoiParserPipe } from "src/util/pipes/doiPipe.pipe"; FilterDataEntriesbyMethods, FilterDataEntriesByRegion, AggregateArrayIntoRootPipe, - DoiParserPipe + DoiParserPipe, + RegionBackgroundToRgbPipe ], exports:[ DataBrowser, diff --git a/src/ui/databrowserModule/databrowser.service.ts b/src/ui/databrowserModule/databrowser.service.ts index 5baa496dc446a07906ffb41a99358a134d98a357..9fdf8104f124b18b8549a3ffb34f31378ee91055 100644 --- a/src/ui/databrowserModule/databrowser.service.ts +++ b/src/ui/databrowserModule/databrowser.service.ts @@ -306,12 +306,6 @@ export class DatabrowserService implements OnDestroy{ } public getModalityFromDE = getModalityFromDE - - public getBackgroundColorStyleFromRegion(region:any = null){ - return region && region.rgb - ? `rgb(${region.rgb.join(',')})` - : `white` - } } diff --git a/src/ui/databrowserModule/databrowser/databrowser.component.ts b/src/ui/databrowserModule/databrowser/databrowser.component.ts index b3568e039e3be5c046e2571e2d014ed1cac1877d..9a4f538541b7f4301fa6e7ff3d6e4932f9d5dd2c 100644 --- a/src/ui/databrowserModule/databrowser/databrowser.component.ts +++ b/src/ui/databrowserModule/databrowser/databrowser.component.ts @@ -155,10 +155,6 @@ export class DataBrowser implements OnDestroy,OnInit{ resetFilters(event?:MouseEvent){ this.clearAll() } - - getBackgroundColorStyleFromRegion(region:any) { - return this.dbService.getBackgroundColorStyleFromRegion(region) - } } export interface DataEntryFilter{ diff --git a/src/ui/databrowserModule/databrowser/databrowser.template.html b/src/ui/databrowserModule/databrowser/databrowser.template.html index 515a94d8331c6235c7ef253d927c7d159ba597ea..f852c03d933f8f7740a696510c058a0e622c9962 100644 --- a/src/ui/databrowserModule/databrowser/databrowser.template.html +++ b/src/ui/databrowserModule/databrowser/databrowser.template.html @@ -16,7 +16,7 @@ <span *ngFor="let region of regions" class="badge badge-secondary mr-1 mw-100"> - <span [ngStyle]="{backgroundColor:getBackgroundColorStyleFromRegion(region)}" class="dot"> + <span [ngStyle]="{backgroundColor: (region | regionBackgroundToRgbPipe)}" class="dot"> </span> <span class="d-inline-block mw-100 overflow-hidden text-truncate"> @@ -122,7 +122,7 @@ <span *ngFor="let region of dataset.parcellationRegion" class="badge badge-secondary mr-1 mw-100"> - <span [ngStyle]="{backgroundColor:getBackgroundColorStyleFromRegion(region)}" class="dot"> + <span [ngStyle]="{backgroundColor:(region | regionBackgroundToRgbPipe)}" class="dot"> </span> <span class="d-inline-block mw-100 overflow-hidden text-truncate"> diff --git a/src/ui/databrowserModule/util/regionBackgroundToRgb.pipe.ts b/src/ui/databrowserModule/util/regionBackgroundToRgb.pipe.ts new file mode 100644 index 0000000000000000000000000000000000000000..4a03cd9dc7230bfbab69b5a4f19866e249914c80 --- /dev/null +++ b/src/ui/databrowserModule/util/regionBackgroundToRgb.pipe.ts @@ -0,0 +1,13 @@ +import { Pipe, PipeTransform } from "@angular/core"; + +@Pipe({ + name: 'regionBackgroundToRgbPipe' +}) + +export class RegionBackgroundToRgbPipe implements PipeTransform{ + public transform(region = null): string{ + return region && region.rgb + ? `rgb(${region.rgb.join(',')})` + : 'white' + } +} \ No newline at end of file