Skip to content
Snippets Groups Projects
Commit 93ae0f3e authored by Hartung, Michael's avatar Hartung, Michael
Browse files

analysis fullscreen

parent ef18b4d3
No related branches found
No related tags found
No related merge requests found
<div *ngIf="token"> <div *ngIf="token">
<div class="card analysis"> <div class="card analysis" [ngClass]="{'fullscreen': fullscreen}">
<header class="card-header"> <header class="card-header">
<p class="card-header-title"> <p class="card-header-title">
<span class="icon"> <span class="icon">
...@@ -12,17 +12,50 @@ ...@@ -12,17 +12,50 @@
(click)="analysis.removeTask(token); close()" (click)="analysis.removeTask(token); close()"
class="card-header-icon" class="card-header-icon"
aria-label="delete" aria-label="delete"
pTooltip="Delete analysis"
[tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-left'"
tooltipPosition="left"
> >
<span class="icon has-text-danger" title="Delete analysis"> <span class="icon has-text-danger" title="Delete analysis">
<i class="fas fa-trash" aria-hidden="true"></i> <i class="fas fa-trash" aria-hidden="true"></i>
</span> </span>
</a> </a>
<a (click)="close()" class="card-header-icon" aria-label="close"> <a
(click)="close()"
class="card-header-icon"
aria-label="close"
pTooltip="Close analysis"
[tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-left'"
tooltipPosition="left"
>
<span class="icon" title="Close analysis"> <span class="icon" title="Close analysis">
<i class="fas fa-times color-danger" aria-hidden="true"></i> <i class="fas fa-times color-danger" aria-hidden="true"></i>
</span> </span>
</a> </a>
<a
pTooltip="Open in fullscreen"
[tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-left'"
tooltipPosition="left"
*ngIf="!fullscreen"
(click)="toggleFullscreen()"
class="card-header-icon"
>
<span class="icon is-small">
<i class="fas fa-expand"></i>
</span>
</a>
<a
title="close fullscreen"
*ngIf="fullscreen"
(click)="toggleFullscreen()"
class="card-header-icon"
>
<span class="icon is-small">
<i class="fas fa-compress"></i>
</span>
</a>
</header> </header>
<div <div
class="card-content tab-header-small" class="card-content tab-header-small"
...@@ -49,13 +82,17 @@ ...@@ -49,13 +82,17 @@
<div *ngIf="task"> <div *ngIf="task">
<div class="columns m-1"> <div class="columns m-1">
<div class="column content"> <div class="column content">
<h4 <h4 class="is-4 has-text-weight-bold">
class="is-4 has-text-weight-bold"
>
<span class="icon"> <span class="icon">
<i class="fas fa-wrench" aria-hidden="true"></i> <i class="fas fa-wrench" aria-hidden="true"></i>
</span> </span>
{{(['quick', 'super', 'connect', 'connectSelected'].indexOf(task.info.algorithm) === -1) ? 'Algorithm:' : 'Method:' }} {{
["quick", "super", "connect", "connectSelected"].indexOf(
task.info.algorithm
) === -1
? "Algorithm:"
: "Method:"
}}
{{ algorithmNames[task.info.algorithm] }} {{ algorithmNames[task.info.algorithm] }}
</h4> </h4>
</div> </div>
...@@ -167,8 +204,13 @@ ...@@ -167,8 +204,13 @@
</table> </table>
</div> </div>
</div> </div>
<div class="columns m-1" <div
*ngIf="['quick','super','connect','connectSelected'].indexOf(task.info.algorithm) > -1" class="columns m-1"
*ngIf="
['quick', 'super', 'connect', 'connectSelected'].indexOf(
task.info.algorithm
) > -1
"
> >
<div class="column"> <div class="column">
<h4 class="is-4 has-text-weight-bold"> <h4 class="is-4 has-text-weight-bold">
...@@ -196,7 +238,10 @@ ...@@ -196,7 +238,10 @@
</table> </table>
</div> </div>
</div> </div>
<div class="columns m-1" *ngIf="['quick','super'].indexOf(task.info.algorithm) > -1"> <div
class="columns m-1"
*ngIf="['quick', 'super'].indexOf(task.info.algorithm) > -1"
>
<div class="column"> <div class="column">
<h4 class="is-4 has-text-weight-bold"> <h4 class="is-4 has-text-weight-bold">
<span class="icon"> <span class="icon">
...@@ -236,10 +281,7 @@ ...@@ -236,10 +281,7 @@
<div class="tab-content" [class.is-visible]="tab === 'network'"> <div class="tab-content" [class.is-visible]="tab === 'network'">
<!-- network start --> <!-- network start -->
<app-network <app-network networkType="analysis" [nodeData]="nodeData"></app-network>
networkType="analysis"
[nodeData]="nodeData"
></app-network>
<!-- network end --> <!-- network end -->
</div> </div>
<div <div
......
...@@ -6,6 +6,15 @@ ...@@ -6,6 +6,15 @@
width: 100% !important; width: 100% !important;
} }
.fullscreen{
position: fixed !important;
height: 100vh !important;
width: 100vw !important;
top: 0 !important;
left: 0 !important;
z-index: $fullscreen-z;
}
.tab-header-small { .tab-header-small {
padding: 0 !important; padding: 0 !important;
} }
......
...@@ -80,6 +80,8 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit ...@@ -80,6 +80,8 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit
public result: any = null; public result: any = null;
public myConfig: IConfig = JSON.parse(JSON.stringify(defaultConfig)); public myConfig: IConfig = JSON.parse(JSON.stringify(defaultConfig));
public fullscreen = false;
public network: any; public network: any;
public nodeData: { nodes: any, edges: any } = {nodes: null, edges: null}; public nodeData: { nodes: any, edges: any } = {nodes: null, edges: null};
// private drugNodes: any[] = []; // private drugNodes: any[] = [];
...@@ -505,4 +507,9 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit ...@@ -505,4 +507,9 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit
this.analysis.addItems(addItems); this.analysis.addItems(addItems);
this.analysis.removeItems(removeItems); this.analysis.removeItems(removeItems);
} }
public toggleFullscreen() {
this.fullscreen = !this.fullscreen;
console.log('this.fullscreen', this.fullscreen)
}
} }
...@@ -163,7 +163,7 @@ export const defaultConfig: IConfig = { ...@@ -163,7 +163,7 @@ export const defaultConfig: IConfig = {
networkMenuButtonAnimationLabel: 'Animation', networkMenuButtonAnimationLabel: 'Animation',
identifier: 'symbol', identifier: 'symbol',
selfReferences: false, selfReferences: false,
customEdges: {default: true, selectable: false}, customEdges: {default: true, selectable: true},
interactionDrugProtein: 'NeDRex', interactionDrugProtein: 'NeDRex',
interactionProteinProtein: 'NeDRex', interactionProteinProtein: 'NeDRex',
indicationDrugDisorder: 'NeDRex', indicationDrugDisorder: 'NeDRex',
......
...@@ -466,7 +466,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -466,7 +466,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
* @param key * @param key
* @param values * @param values
*/ */
public setConfigNodeGroup(key: string, nodeGroups: { [key: string]: NodeGroup }) { public setConfigNodeGroup(key: string, nodeGroups: { [key: string]: NodeGroup } | {}) {
// make sure that return-groups (seeds, drugs, found nodes) are set // make sure that return-groups (seeds, drugs, found nodes) are set
const defaultNodeGroups = JSON.parse(JSON.stringify(defaultConfig.nodeGroups)); const defaultNodeGroups = JSON.parse(JSON.stringify(defaultConfig.nodeGroups));
// user merge function to do deep merge // user merge function to do deep merge
......
...@@ -255,3 +255,5 @@ ...@@ -255,3 +255,5 @@
padding: 0.5rem 1rem; padding: 0.5rem 1rem;
line-height: 24px; line-height: 24px;
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment