From be74b36409fc20ebe471822edbe9a4528a0daaa4 Mon Sep 17 00:00:00 2001
From: ge54hev <m.oubounyt@tum.de>
Date: Thu, 2 Apr 2020 22:24:50 +0200
Subject: [PATCH] selection by ctrl
---
.../explorer-page.component.html | 2 +-
.../explorer-page/explorer-page.component.ts | 42 ++++++++++++++++++-
2 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/src/app/pages/explorer-page/explorer-page.component.html b/src/app/pages/explorer-page/explorer-page.component.html
index 0a397a99..b083fe5f 100644
--- a/src/app/pages/explorer-page/explorer-page.component.html
+++ b/src/app/pages/explorer-page/explorer-page.component.html
@@ -166,7 +166,7 @@
<!-- </header>-->
<div *ngIf="showDetails" class="card-content">
<div class="content">
- <h2>Summary</h2>
+<!-- <h2>Summary</h2>-->
<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 915709bb..8cfca2be 100644
--- a/src/app/pages/explorer-page/explorer-page.component.ts
+++ b/src/app/pages/explorer-page/explorer-page.component.ts
@@ -1,4 +1,4 @@
-import {AfterViewInit, Component, ElementRef, OnInit, ViewChild, Output, EventEmitter} from '@angular/core';
+import {AfterViewInit, Component, ElementRef, OnInit, ViewChild, Output, EventEmitter, HostListener} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
import {Effect, Protein, ProteinNetwork} from '../protein-network';
import {HttpClient} from '@angular/common/http';
@@ -19,6 +19,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
public geneNames: Array<string> = [];
public proteinNames: Array<string> = [];
public proteinAcs: Array<string> = [];
+ public watcher = 0;
public viralProteinCheckboxes: Array<{ checked: boolean; data: Effect }> = [];
@@ -40,6 +41,32 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
public queryItems = [];
public showAnalysisDialog = false;
+
+ @HostListener('window:keydown', ['$event'])
+ handleKeyboardEvent1(event: KeyboardEvent) {
+
+
+ if (event.keyCode == 17)
+ {
+ this.watcher = 1;
+ console.log(this.watcher);
+
+ }
+ }
+
+ @HostListener('window:keyup', ['$event'])
+ handleKeyboardEvent(event: KeyboardEvent) {
+
+
+ if (event.keyCode == 17)
+ {
+ this.watcher = 0;
+ console.log(this.watcher);
+
+ }
+ }
+
+
@ViewChild('network', {static: false}) networkEl: ElementRef;
constructor(private http: HttpClient,
@@ -189,11 +216,22 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
const id: Array<string> = properties.nodes;
// TODO use groupID
console.log(id);
- if (id.length > 0) {
+ console.log(this.watcher);
+ 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){
+ console.log(this.removeFromSelection(protein.proteinAc));
+ } else{
+ console.log(this.addToSelection(protein.proteinAc));
+ // console.log(this.removeFromSelection(this.currentProteinAc));
+ console.log(this.analysis.getCount());
+ }
+ }
} else {
this.closeSummary();
}
--
GitLab