diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html index b083fe5f74e5d16891405173a39d40b54cc9bedc..ae186f154578ac8dc16b6dce2ca68dad827f59da 100644 --- a/src/app/pages/explorer-page/explorer-page.component.html +++ b/src/app/pages/explorer-page/explorer-page.component.html @@ -167,6 +167,7 @@ <div *ngIf="showDetails" class="card-content"> <div class="content"> <!-- <h2>Summary</h2>--> + <p>Hold down the CTRL button to select multiple proteins.</p> <figure class="image"> <!-- <img src="assets/boxplot.png" alt="Boxplots">--> </figure> diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts index 8cfca2be6ead9ac38221e2a81244052d53630256..fed34450d297fb91d65da74b9fe115e68c0c9843 100644 --- a/src/app/pages/explorer-page/explorer-page.component.ts +++ b/src/app/pages/explorer-page/explorer-page.component.ts @@ -7,6 +7,8 @@ import {AnalysisService} from '../../analysis.service'; declare var vis: any; + + @Component({ selector: 'app-explorer-page', templateUrl: './explorer-page.component.html', @@ -42,12 +44,16 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { public showAnalysisDialog = false; - @HostListener('window:keydown', ['$event']) + + + + @ViewChild('network', {static: false}) networkEl: ElementRef; + + @HostListener('window:keydown', ['$event']) handleKeyboardEvent1(event: KeyboardEvent) { - if (event.keyCode == 17) - { + if (event.ctrlKey) { this.watcher = 1; console.log(this.watcher); @@ -58,17 +64,13 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { handleKeyboardEvent(event: KeyboardEvent) { - if (event.keyCode == 17) - { + if (event.ctrlKey) { this.watcher = 0; console.log(this.watcher); } } - - @ViewChild('network', {static: false}) networkEl: ElementRef; - constructor(private http: HttpClient, private route: ActivatedRoute, private router: Router, @@ -217,16 +219,16 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { // TODO use groupID console.log(id); console.log(this.watcher); - if (id.length > 0) { + if (id.length > 0) { console.log('clicked node:', id); if (id[0].startsWith('pg_')) { const protein = this.proteinData.getProtein(id[0].substr(3)); this.openSummary(protein, false); console.log(this.currentProteinAc); - if (this.watcher==1){ - if(this.inSelection(protein.proteinAc) == true){ + if (this.watcher === 1 ) { + if (this.inSelection(protein.proteinAc) === true) { console.log(this.removeFromSelection(protein.proteinAc)); - } else{ + } else { console.log(this.addToSelection(protein.proteinAc)); // console.log(this.removeFromSelection(this.currentProteinAc)); console.log(this.analysis.getCount());