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

analysis parameter layout

parent 32766f41
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/app/app.module.ts
+ 2
− 2
View file @ 770d9281
...@@ -34,7 +34,7 @@ import { ...@@ -34,7 +34,7 @@ import {
faRulerVertical, faDna, faMicroscope, faBook, faPause, faTrash, faSpinner, faExclamationTriangle, faPlus, faRulerVertical, faDna, faMicroscope, faBook, faPause, faTrash, faSpinner, faExclamationTriangle, faPlus,
faExpand, faInfo, faRocket, faAngleDown, faSearch, faFastForward, faExternalLinkAlt, faTasks, faFilter, faExpand, faInfo, faRocket, faAngleDown, faSearch, faFastForward, faExternalLinkAlt, faTasks, faFilter,
faMinus, faUpload, faAngleDoubleDown, faSync, faBroom, faAngleDoubleUp, faChild, faHeadSideMask, faBiohazard, faMinus, faUpload, faAngleDoubleDown, faSync, faBroom, faAngleDoubleUp, faChild, faHeadSideMask, faBiohazard,
faBullseye, faSeedling, faSyncAlt, faCompress, faKey, faInfoCircle faBullseye, faSeedling, faSyncAlt, faCompress, faKey, faInfoCircle, faWrench
} from '@fortawesome/free-solid-svg-icons'; } from '@fortawesome/free-solid-svg-icons';
import { TooltipModule } from 'primeng/tooltip'; import { TooltipModule } from 'primeng/tooltip';
import { NetworkMenuComponent } from './components/network/network-menu/network-menu.component'; import { NetworkMenuComponent } from './components/network/network-menu/network-menu.component';
...@@ -100,7 +100,7 @@ export class AppModule { ...@@ -100,7 +100,7 @@ export class AppModule {
faSpinner, faExclamationTriangle, faPlus, faExpand, faInfo, faRocket, faAngleDown, faSearch, faSpinner, faExclamationTriangle, faPlus, faExpand, faInfo, faRocket, faAngleDown, faSearch,
faFastForward, faExternalLinkAlt, faTasks, faFilter, faMinus, faUpload, faAngleDoubleDown, faFastForward, faExternalLinkAlt, faTasks, faFilter, faMinus, faUpload, faAngleDoubleDown,
faSync, faBroom, faAngleDoubleUp, faChild, faHeadSideMask, faBiohazard, faBullseye, faSeedling, faSync, faBroom, faAngleDoubleUp, faChild, faHeadSideMask, faBiohazard, faBullseye, faSeedling,
faSyncAlt, faExpand, faCompress, faKey, faInfoCircle); faSyncAlt, faExpand, faCompress, faKey, faInfoCircle,faWrench);
const NetworkExpander = createCustomElement(ExplorerPageComponent, { injector }); const NetworkExpander = createCustomElement(ExplorerPageComponent, { injector });
// Register the custom element with the browser. // Register the custom element with the browser.
customElements.define('drugst-one', NetworkExpander); customElements.define('drugst-one', NetworkExpander);
......
src/app/components/analysis-panel/analysis-panel.component.html
+ 122
− 106
View file @ 770d9281
...@@ -47,103 +47,116 @@ ...@@ -47,103 +47,116 @@
[class.is-visible]="tab === 'meta'" [class.is-visible]="tab === 'meta'"
> >
<div *ngIf="task"> <div *ngIf="task">
<p <div class="columns m-1">
*ngIf=" <div class="column content">
task.info.algorithm !== 'quick' && task.info.algorithm !== 'super' <h4
" class="is-4 has-text-weight-bold"
> *ngIf="
Algorithm: task.info.algorithm !== 'quick' &&
<strong class="has-text-normal">{{ task.info.algorithm !== 'super'
algorithmNames[task.info.algorithm] "
}}</strong> >
</p> <span class="icon">
<div> <i class="fas fa-wrench" aria-hidden="true"></i>
<table class="table is-narrow"> </span>
<tbody> Algorithm:
<tr {{ algorithmNames[task.info.algorithm] }}
*ngIf="result && result.geneInteractionDataset !== undefined" </h4>
> </div>
<td>Protein-Protein Interaction Dataset</td> </div>
<td> <div class="columns m-1">
{{ result.geneInteractionDataset.name }} (Version <div class="column">
{{ result.geneInteractionDataset.version }}) <table class="table is-narrow">
</td> <tbody>
</tr> <tr
<tr *ngIf="
*ngIf="result && result.drugInteractionDataset !== undefined" result && result.geneInteractionDataset !== undefined
> "
<td>Protein-Drug Interaction Dataset</td> >
<td> <td>Protein-Protein Interaction Dataset</td>
{{ result.drugInteractionDataset.name }} (Version <td>
{{ result.drugInteractionDataset.version }}) {{ result.geneInteractionDataset.name }} (Version
</td> {{ result.geneInteractionDataset.version }})
</tr> </td>
<tr *ngIf="task.info.parameters.resultSize !== undefined"> </tr>
<td>Result Size</td> <tr
<td>{{ task.info.parameters.resultSize }}</td> *ngIf="
</tr> result && result.drugInteractionDataset !== undefined
<tr *ngIf="task.info.parameters.k !== undefined"> "
<td>K</td> >
<td>{{ task.info.parameters.k }}</td> <td>Protein-Drug Interaction Dataset</td>
</tr> <td>
<tr *ngIf="task.info.parameters.numTrees !== undefined"> {{ result.drugInteractionDataset.name }} (Version
<td>Number of trees</td> {{ result.drugInteractionDataset.version }})
<td>{{ task.info.parameters.numTrees }}</td> </td>
</tr> </tr>
<tr *ngIf="task.info.parameters.tolerance !== undefined"> <tr *ngIf="task.info.parameters.resultSize !== undefined">
<td>Tolerance</td> <td>Result Size</td>
<td>{{ task.info.parameters.tolerance }}</td> <td>{{ task.info.parameters.resultSize }}</td>
</tr> </tr>
<tr *ngIf="task.info.parameters.dampingFactor !== undefined"> <tr *ngIf="task.info.parameters.k !== undefined">
<td>Damping Factor</td> <td>K</td>
<td>{{ task.info.parameters.dampingFactor }}</td> <td>{{ task.info.parameters.k }}</td>
</tr> </tr>
<tr *ngIf="task.info.parameters.maxDeg !== undefined"> <tr *ngIf="task.info.parameters.numTrees !== undefined">
<td>Maximum Degree</td> <td>Number of trees</td>
<td>{{ task.info.parameters.maxDeg }}</td> <td>{{ task.info.parameters.numTrees }}</td>
</tr> </tr>
<tr *ngIf="task.info.parameters.hubPenalty !== undefined"> <tr *ngIf="task.info.parameters.tolerance !== undefined">
<td>Hub Penality</td> <td>Tolerance</td>
<td>{{ task.info.parameters.hubPenalty }}</td> <td>{{ task.info.parameters.tolerance }}</td>
</tr> </tr>
<tr <tr *ngIf="task.info.parameters.dampingFactor !== undefined">
*ngIf=" <td>Damping Factor</td>
task.info.parameters.includeIndirectDrugs !== undefined && <td>{{ task.info.parameters.dampingFactor }}</td>
task.info.target === 'drug' </tr>
" <tr *ngIf="task.info.parameters.maxDeg !== undefined">
> <td>Maximum Degree</td>
<td>Include indirect drugs</td> <td>{{ task.info.parameters.maxDeg }}</td>
<td> </tr>
<i <tr *ngIf="task.info.parameters.hubPenalty !== undefined">
*ngIf="task.info.parameters.includeIndirectDrugs" <td>Hub Penality</td>
class="fa fa-check" <td>{{ task.info.parameters.hubPenalty }}</td>
></i> </tr>
<i <tr
*ngIf="!task.info.parameters.includeIndirectDrugs" *ngIf="
class="fa fa-times" task.info.parameters.includeIndirectDrugs !== undefined &&
></i> task.info.target === 'drug'
</td> "
</tr> >
<tr <td>Include indirect drugs</td>
*ngIf=" <td>
task.info.parameters.includeNonApprovedDrugs !== <i
undefined && task.info.target === 'drug' *ngIf="task.info.parameters.includeIndirectDrugs"
" class="fa fa-check"
> ></i>
<td>Include non-approved drugs</td> <i
<td> *ngIf="!task.info.parameters.includeIndirectDrugs"
<i class="fa fa-times"
*ngIf="task.info.parameters.includeNonApprovedDrugs" ></i>
class="fa fa-check" </td>
></i> </tr>
<i <tr
*ngIf="!task.info.parameters.includeNonApprovedDrugs" *ngIf="
class="fa fa-times" task.info.parameters.includeNonApprovedDrugs !==
></i> undefined && task.info.target === 'drug'
</td> "
</tr> >
</tbody> <td>Include non-approved drugs</td>
</table> <td>
<i
*ngIf="task.info.parameters.includeNonApprovedDrugs"
class="fa fa-check"
></i>
<i
*ngIf="!task.info.parameters.includeNonApprovedDrugs"
class="fa fa-times"
></i>
</td>
</tr>
</tbody>
</table>
</div>
</div> </div>
<div <div
*ngIf=" *ngIf="
...@@ -241,7 +254,9 @@ ...@@ -241,7 +254,9 @@
<button <button
class="button is-rounded has-tooltip is-small" class="button is-rounded has-tooltip is-small"
pTooltip="Normalize the scores" pTooltip="Normalize the scores"
[tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" [tooltipStyleClass]="
'drgstn drgstn-tooltip drgstn-tooltip-top'
"
tooltipPosition="top" tooltipPosition="top"
[class.is-primary]="tableNormalize" [class.is-primary]="tableNormalize"
(click)="toggleNormalization(true)" (click)="toggleNormalization(true)"
...@@ -257,7 +272,9 @@ ...@@ -257,7 +272,9 @@
<button <button
class="button is-rounded has-tooltip is-small" class="button is-rounded has-tooltip is-small"
pTooltip="Disable normalization of the scores." pTooltip="Disable normalization of the scores."
[tooltipStyleClass]="'drgstn drgstn-tooltip drgstn-tooltip-top'" [tooltipStyleClass]="
'drgstn drgstn-tooltip drgstn-tooltip-top'
"
tooltipPosition="top" tooltipPosition="top"
[class.is-primary]="!tableNormalize" [class.is-primary]="!tableNormalize"
(click)="toggleNormalization(false)" (click)="toggleNormalization(false)"
...@@ -311,15 +328,14 @@ ...@@ -311,15 +328,14 @@
<div class="columns m-1"> <div class="columns m-1">
<div class="column"> <div class="column">
<app-prot-table <app-prot-table
[tableHasScores]="tableHasScores" [tableHasScores]="tableHasScores"
[tableProteins]="tableProteins" [tableProteins]="tableProteins"
[tableProteinScoreTooltip]="tableDrugScoreTooltip" [tableProteinScoreTooltip]="tableDrugScoreTooltip"
[tableProteinSelection]="tableProteinSelection" [tableProteinSelection]="tableProteinSelection"
[tableSelectedProteins]="tableSelectedProteins" [tableSelectedProteins]="tableSelectedProteins"
></app-prot-table> ></app-prot-table>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
......
src/app/components/analysis-panel/analysis-panel.component.ts
+ 1
− 0
View file @ 770d9281
...@@ -175,6 +175,7 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit ...@@ -175,6 +175,7 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit
if (this.task && this.task.info.done) { if (this.task && this.task.info.done) {
this.result = await this.netex.getTaskResult(this.token); this.result = await this.netex.getTaskResult(this.token);
console.log(this.result)
const nodeAttributes = this.result.nodeAttributes || {}; const nodeAttributes = this.result.nodeAttributes || {};
this.networkHandler.activeNetwork.seedMap = nodeAttributes.isSeed || {}; this.networkHandler.activeNetwork.seedMap = nodeAttributes.isSeed || {};
......
src/app/main-network.ts
+ 0
− 1
View file @ 770d9281
...@@ -57,7 +57,6 @@ export class ProteinNetwork { ...@@ -57,7 +57,6 @@ export class ProteinNetwork {
} }
for (const edge of this.edges) { for (const edge of this.edges) {
console.log(edge)
edges.push(mapCustomEdge(edge, config)); edges.push(mapCustomEdge(edge, config));
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment