diff --git a/src/app/analysis.service.ts b/src/app/analysis.service.ts index ded252adbf7920ed5431fc801259b1010a1c87ce..0866109ccdd828eb4d6bb1bd979040868ff54276 100644 --- a/src/app/analysis.service.ts +++ b/src/app/analysis.service.ts @@ -186,8 +186,8 @@ export class AnalysisService { algorithm: isSuper ? 'super' : 'quick', target: 'drug', parameters: { - strain: dataset.backendId, - datasets: dataset.data, + strain_or_drugs: dataset.backendId, + bait_datasets: dataset.data, seeds: isSuper ? [] : this.getSelection().map((i) => i.backendId), }, }).toPromise(); diff --git a/src/app/components/analysis-window/analysis-window.component.ts b/src/app/components/analysis-window/analysis-window.component.ts index 6af1dcde33a84ee4a400a8dabfcde1d5dabc44c7..78d759ba908bee20903e8d75b1e14664f4ba996d 100644 --- a/src/app/components/analysis-window/analysis-window.component.ts +++ b/src/app/components/analysis-window/analysis-window.component.ts @@ -220,7 +220,7 @@ export class AnalysisWindowComponent implements OnInit, OnChanges { this.nodeData.nodes.forEach((node) => { const nodeSelected = this.analysis.idInSelection(node.id); if (selected !== nodeSelected) { - Object.assign(node, NetworkSettings.getNodeStyle(node.wrapper.type, true, selected)); + Object.assign(node, NetworkSettings.getNodeStyle(node.wrapper.type, node.isSeed, selected)); updatedNodes.push(node); } }); diff --git a/src/app/components/launch-analysis/launch-analysis.component.ts b/src/app/components/launch-analysis/launch-analysis.component.ts index 63dc23feddde45d4ac106d7b84a54e1947b04def..3e6ccaeb898fd90011d5d4c48761ea932749396e 100644 --- a/src/app/components/launch-analysis/launch-analysis.component.ts +++ b/src/app/components/launch-analysis/launch-analysis.component.ts @@ -104,7 +104,7 @@ export class LaunchAnalysisComponent implements OnInit, OnChanges { } else if (this.algorithm === 'keypathwayminer') { parameters.k = this.keypathwayminerK; } else if (this.algorithm === 'multisteiner') { - parameters.strain = this.dataset; + parameters.strain_or_drugs = this.dataset; parameters.num_trees = this.multisteinerNumTrees; } diff --git a/src/app/network-settings.ts b/src/app/network-settings.ts index a336062ffd732f07cbfb430c75ade18bde9cb030..2cf133157bcff80a9eca1cb914b06fca22de3e59 100644 --- a/src/app/network-settings.ts +++ b/src/app/network-settings.ts @@ -12,8 +12,6 @@ export class NetworkSettings { private static selectedBorderColor = '#F8981D'; private static selectBorderHighlightColor = '#F8981D'; - private static selectedBorderWidth = 3; - private static selectedBorderWidthSelected = 3.2; // Edge color private static edgeHostVirusColor = '#686868'; @@ -21,6 +19,13 @@ export class NetworkSettings { private static edgeHostDrugColor = '#686868'; private static edgeHostDrugHighlightColor = '#686868'; + // Border width + private static selectedBorderWidth = 3; + private static selectedBorderWidthSelected = 3; + + private static borderWidth = 1; + private static borderWidthSelected = 3; + // Node Font private static hostFontSize = 20; private static virusFontSize = 50; @@ -195,6 +200,9 @@ export class NetworkSettings { node.borderWidthSelected = this.selectedBorderWidthSelected; } else { node.color = nodeColor; + + node.borderWidth = this.borderWidth; + node.borderWidthSelected = this.borderWidthSelected; } return node;