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