Skip to content
Snippets Groups Projects
Commit 067e7e53 authored by AndiMajore's avatar AndiMajore
Browse files

remove necessity of adding edges

parent f9c3f165
No related branches found
No related tags found
No related merge requests found
...@@ -61,6 +61,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -61,6 +61,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
setTimeout(() => { setTimeout(() => {
this.config = config; this.config = config;
}, 200); }, 200);
console.log(config)
// add settings to config // add settings to config
const configObj = typeof config === 'object' ? config : JSON.parse(config); const configObj = typeof config === 'object' ? config : JSON.parse(config);
this.myConfig = merge(this.myConfig, configObj); this.myConfig = merge(this.myConfig, configObj);
...@@ -109,6 +110,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -109,6 +110,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
@Input() @Input()
public set network(network: string | undefined | object) { public set network(network: string | undefined | object) {
console.log(network)
if (network == null) { if (network == null) {
return; return;
} }
...@@ -289,12 +291,12 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -289,12 +291,12 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
private async getNetwork() { private async getNetwork() {
const network = JSON.parse(this.networkJSON); const network = JSON.parse(this.networkJSON);
if (this.myConfig.identifier === 'ensg') { if (this.myConfig.identifier === 'ensg') {
// @ts-ignore // @ts-ignore
network.nodes.forEach(node => { network.nodes.forEach(node => {
node.id = this.removeEnsemblVersion(node.id); node.id = this.removeEnsemblVersion(node.id);
}); });
if (network.edges != null)
// @ts-ignore // @ts-ignore
network.edges.forEach(edge => { network.edges.forEach(edge => {
edge.from = this.removeEnsemblVersion(edge.from); edge.from = this.removeEnsemblVersion(edge.from);
...@@ -315,7 +317,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -315,7 +317,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
// at this point, we have nodes synched with the backend // at this point, we have nodes synched with the backend
// use netexIds where posssible, but use original id as node name if no label given // use netexIds where posssible, but use original id as node name if no label given
const nodeIdMap = {}; const nodeIdMap = {};
network.nodes.forEach((node) => { network.nodes.forEach((node) => {
// set node label to original id before node id will be set to netex id // set node label to original id before node id will be set to netex id
node.label = node.label ? node.label : node.id; node.label = node.label ? node.label : node.id;
...@@ -326,6 +327,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { ...@@ -326,6 +327,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
// adjust edge labels accordingly and filter // adjust edge labels accordingly and filter
const edges = new Array(); const edges = new Array();
if (network.edges != null)
network.edges.forEach(edge => { network.edges.forEach(edge => {
edge.from = nodeIdMap[edge.from]; edge.from = nodeIdMap[edge.from];
edge.to = nodeIdMap[edge.to]; edge.to = nodeIdMap[edge.to];
......
...@@ -44,9 +44,7 @@ ...@@ -44,9 +44,7 @@
<network-expander id="netexp1" <network-expander id="netexp1"
pluginId="2" pluginId="2"
config='{"showSimpleAnalysis":true, "nodeGroups":{"patient":{"type":"patient","color":"black","font":{"color":"#ffffff"},"groupName":"Patient","shape":"image","image":"https://static.thenounproject.com/png/22780-200.png"},"condition":{"type":"condition","color":"black","font":{"color":"black"},"groupName":"Condition","shape":"text"},"important":{"type":"gene","color":"#ff881f","font":{"color":"#000000"},"groupName":"Important Gene","shape":"star"},"gene":{"type":"gene","color":"#4da300","font":{"color":"#000000"},"groupName":"Gene","shape":"circle"},"foundDrug":{"type":"drug","color":{"border":"#F12590","background":"#F12590","highlight":{"border":"#F12590","background":"#F12590"}},"font":{"color":"#f0f0f0"},"groupName":"Drug","shape":"diamond"}},"edgeGroups":{"genotype":{"color":"black","groupName":"Relevant Gene"},"has-condition":{"color":"#000000","groupName":"Has Condition","dashes":[2,2]},"default":{"color":"#000000","groupName":"default edge"},"ggi":{"color":"#000000","groupName":"Interaction","dashes":[3,2]}},"identifier":"symbol","title":"Breast cancer example network","nodeShadow":true,"edgeShadow":false,"autofillEdges":false,"showLegend":true}' network='{"nodes":[{"id": "PTEN"}]}'></network-expander>
network='{"nodes":[{"id":"patient-1","group":"patient","x":592,"y":446},{"id":"patient-2","group":"patient","x":235,"y":87},{"id":"patient-3","group":"patient","x":105,"y":369},{"id":"ATM","label":"ATM","group":"gene","x":289,"y":242},{"id":"BARD1","label":"BARD1","group":"gene","x":44,"y":250},{"id":"BRCA1","label":"BRCA1","group":"gene","x":466,"y":576},{"id":"BRCA2","label":"BRCA2","group":"gene","x":507,"y":285},{"id":"BRIP1","label":"BRIP1","group":"gene","x":54,"y":474},{"id":"CHEK2","label":"CHEK2","group":"gene","x":216,"y":590},{"id":"CDH1","label":"CDH1","group":"gene","x":320,"y":-57},{"id":"NF1","label":"NF1","group":"gene","x":481,"y":111},{"id":"NBN","label":"NBN","group":"gene","x":-57,"y":314},{"id":"PALB2","label":"PALB2","group":"gene","x":450,"y":190},{"id":"PTEN","label":"PTEN","group":"important","x":305,"y":494},{"id":"RAD51C","label":"RAD51C","group":"gene","x":182,"y":-90},{"id":"RAD51D","label":"RAD51D","group":"gene","x":368,"y":73},{"id":"STK11","label":"STK11","group":"gene","x":686,"y":330},{"id":"TP53","label":"TP53","group":"important","x":333,"y":316},{"id":"subtype-1","label":"Subtype 1","group":"condition","x":556,"y":171},{"id":"subtype-2","label":"Subtype 2","group":"condition","x":-87,"y":221}],"edges":[{"from":"BRCA1","to":"BRCA2","group":"ggi"},{"from":"ATM","to":"BARD1","group":"ggi"},{"from":"BRCA1","to":"CHEK2","group":"ggi"},{"from":"RAD51C","to":"RAD51D","group":"ggi"},{"from":"STK11","to":"TP53","group":"ggi"},{"from":"TP53","to":"PALB2","group":"ggi"},{"from":"TP53","to":"RAD51D","group":"ggi"},{"from":"TP53","to":"NF1","group":"ggi"},{"from":"TP53","to":"BRCA1","group":"ggi"},{"from":"TP53","to":"BRCA2","group":"ggi"},{"from":"PTEN","to":"BRCA1","group":"ggi"},{"from":"PTEN","to":"BRCA2","group":"ggi"},{"from":"TP53","to":"PTEN","group":"ggi"},{"from":"ATM","to":"PTEN","group":"ggi"},{"from":"CDH1","to":"RAD51D","group":"ggi"},{"from":"CDH1","to":"PALB2","group":"ggi"},{"from":"NBN","to":"BRIP1","group":"ggi"},{"from":"BRIP1","to":"PTEN","group":"ggi"},{"from":"patient-1","to":"BRCA1","group":"genotype"},{"from":"patient-1","to":"TP53","group":"genotype"},{"from":"patient-1","to":"BRCA2","group":"genotype"},{"from":"patient-1","to":"PTEN","group":"genotype"},{"from":"patient-2","to":"TP53","group":"genotype"},{"from":"patient-2","to":"NF1","group":"genotype"},{"from":"patient-2","to":"BARD1","group":"genotype"},{"from":"patient-3","to":"TP53","group":"genotype"},{"from":"patient-3","to":"PTEN","group":"genotype"},{"from":"patient-3","to":"NBN","group":"genotype"},{"from":"patient-1","to":"subtype-1","group":"has-condition"},{"from":"patient-2","to":"subtype-1","group":"has-condition"},{"from":"patient-3","to":"subtype-2","group":"has-condition"}]}'>
}'></network-expander>
</div> </div>
<!--<div >--> <!--<div >-->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment