Skip to content
Snippets Groups Projects
Commit 7c6c0f68 authored by AndiMajore's avatar AndiMajore
Browse files

fixed merging of default into custom config; support for groups definition in... 

fixed merging of default into custom config; support for groups definition in config object might be limited now
parent 7bc03862
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/app/pages/explorer-page/explorer-page.component.ts
+ 4
− 2
View file @ 7c6c0f68
......@@ -180,6 +180,7 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
this.nodeData.nodes.update(updatedNodes);
}
});
}
@HostListener('window:resize', ['$event'])
......@@ -231,9 +232,10 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit {
}
configObj = merge(configObj, groupsObj);
if (this.drugstoneConfig.analysisConfig) {
this.drugstoneConfig.set_analysisConfig(merge(this.drugstoneConfig.analysisConfig, configObj));
this.drugstoneConfig.set_analysisConfig({...this.drugstoneConfig.analysisConfig, configObj});
// this.drugstoneConfig.set_analysisConfig(merge(this.drugstoneConfig.analysisConfig, configObj));
} else {
this.drugstoneConfig.config = merge(this.drugstoneConfig.config, configObj);
this.drugstoneConfig.config = {...this.drugstoneConfig.config, ...configObj};
}
// update Drugst.One according to the settings
// check if config updates affect network
......
src/index.html
+ 11
− 11
View file @ 7c6c0f68
......@@ -112,11 +112,11 @@ menu<br>
<div style="max-width: 80vw; width: 1276px; height: 500px">
<!-- <drugst-one id="netexp1"-->
<!-- config="{'activateNetworkMenuButtonAdjacentDisorders':false,'activateNetworkMenuButtonAdjacentDrugs':false, 'activateNetworkMenuButtonAdjacentDisordersDrugs': false, 'licensedDatasets':true}"-->
<!-- groups='{"nodeGroups":{"important":{"type":"gene","color":"#ff881f","font":{"color":"#000000"},"groupName":"Important Gene","shape":"star"},"gene":{"type":"gene","color":"#4da300","font":{"color":"#f0f0f0"},"groupName":"Gene","shape":"circle"},"foundDrug":{"type":"drug","color":"#F12590","font":{"color":"#000000"},"groupName":"Drug","shape":"diamond"}},"edgeGroups":{"default":{"color":"#000000","groupName":"default edge"}}}'-->
<!-- network='{"nodes":[{"id":"CFTr","group":"important","label":"CFTR"},{"id":"TGFB1","group":"gene","label":"TGFB1"},{"id":"TNFRSF1A","group":"gene","label":"TNFRSF1A"},{"id":"FCGR2A","group":"gene","label":"FCGR2A"},{"id":"ENG","group":"gene","label":"ENG"},{"id":"DCTN4","group":"gene","label":"DCTN4"},{"id":"CLCA4","group":"gene","label":"CLCA4"},{"id":"STX1A","group":"gene","label":"STX1A"},{"id":"SCNN1G","group":"gene","label":"SCNN1G"},{"id":"SCNN1A","group":"gene","label":"SCNN1A"},{"id":"SCNN1B","group":"gene","label":"SCNN1B"}],"edges":[{"from":"DCTN4","to":"CFTR", "weight": "5"},{"from":"STX1A","to":"SCNN1B","group":"default"},{"from":"SCNN1A","to":"SCNN1G","group":"default"},{"from":"SCNN1B","to":"SCNN1G","group":"default"}]}'>-->
<!-- ></drugst-one>-->
<drugst-one id="netexp1"
config="{'activateNetworkMenuButtonAdjacentDisorders':false,'activateNetworkMenuButtonAdjacentDrugs':false, 'activateNetworkMenuButtonAdjacentDisordersDrugs': false, 'licensedDatasets':true}"
groups='{"nodeGroups":{"important":{"type":"gene","color":"#ff881f","font":{"color":"#000000"},"groupName":"Important Gene","shape":"star"},"gene":{"type":"gene","color":"#4da300","font":{"color":"#f0f0f0"},"groupName":"Gene","shape":"circle"},"foundDrug":{"type":"drug","color":"#F12590","font":{"color":"#000000"},"groupName":"Drug","shape":"diamond"}},"edgeGroups":{"default":{"color":"#000000","groupName":"default edge"}}}'
network='{"nodes":[{"id":"CFTr","group":"important","label":"CFTR"},{"id":"TGFB1","group":"gene","label":"TGFB1"},{"id":"TNFRSF1A","group":"gene","label":"TNFRSF1A"},{"id":"FCGR2A","group":"gene","label":"FCGR2A"},{"id":"ENG","group":"gene","label":"ENG"},{"id":"DCTN4","group":"gene","label":"DCTN4"},{"id":"CLCA4","group":"gene","label":"CLCA4"},{"id":"STX1A","group":"gene","label":"STX1A"},{"id":"SCNN1G","group":"gene","label":"SCNN1G"},{"id":"SCNN1A","group":"gene","label":"SCNN1A"},{"id":"SCNN1B","group":"gene","label":"SCNN1B"}],"edges":[{"from":"DCTN4","to":"CFTR", "weight": "5"},{"from":"STX1A","to":"SCNN1B","group":"default"},{"from":"SCNN1A","to":"SCNN1G","group":"default"},{"from":"SCNN1B","to":"SCNN1G","group":"default"}]}'>
></drugst-one>
<!-- <drugst-one id="netexp1"-->
<!-- pluginId="2"-->
......@@ -133,12 +133,12 @@ menu<br>
<!-- config='{"showSimpleAnalysis": true, "selfReferences": false, "licensedDatasets": false,"physicsOn":false,"identifier":"ensembl","title":"Breast cancer example network","nodeShadow":true,"edgeShadow":false,"autofillEdges":true,"showLegend":true}'-->
<!-- network='{"nodes":[{"id":"ENSG00000049768", "group": "gene", "label":"ENSG00000049768"},{"id":"ENSG00000185379","group":"gene","label":"ENSG00000185379"},{"id":"ENSG00000108384","group":"gene","label":"ENSG00000108384"},{"id":"ENSG00000138376","group":"gene","label":"ENSG00000138376"},{"id":"ENSG00000284792","group":"gene","label":"ENSG00000284792"},{"id":"ENSG00000171862","group":"gene","label":"ENSG00000171862"},{"id":"ENSG00000141510","group":"gene","label":"ENSG00000141510"}],"edges":[]}'>-->
<!-- </drugst-one>-->
<drugst-one id="netexp1"
pluginId="2"
groups='{"nodeGroups":{"node":{"type":"Gene","color":"#0000FF","font":{"color":"#ffffff"},"groupName":"Node","shape":"ellipse"}, "protein":{"type":"Gene","color":"#CD5C5C","font":{"color":"#000000"},"groupName":"Gene","shape":"ellipse"}}}'
config='{"showSimpleAnalysis": true, "selfReferences": false, "licensedDatasets": false,"physicsOn":false,"identifier":"uniprot","title":"Breast cancer example network","nodeShadow":true,"edgeShadow":false,"autofillEdges":true,"showLegend":true, "activateNetworkMenuButtonAdjacentDrugs":true,"activateNetworkMenuButtonAdjacentDisorderDrugs":true}'
network='{"nodes":[{"id":"P01137","group":"protein","label":"P01137"},{"id":"A0A499FJK2","group":"protein","label":"A0A499FJK2"},{"id":"Q9Y6G5","group":"protein","label":"Q9Y6G5"},{"id":"Q13873","group":"protein","label":"Q13873"},{"id":"P37023","group":"protein","label":"P37023"},{"id":"B7Z6Y5","group":"protein","label":"B7Z6Y5"},{"id":"J9PH39","group":"protein","label":"J9PH39"},{"id":"P51168","group":"protein","label":"P51168"},{"id":"P27037","group":"protein","label":"P27037"},{"id":"P17813","group":"protein","label":"P17813"},{"id":"Q9NSJ5","group":"protein","label":"Q9NSJ5"},{"id":"Q9UK05","group":"protein","label":"Q9UK05"},{"id":"B2R812","group":"protein","label":"B2R812"},{"id":"Q14CN2","group":"protein","label":"Q14CN2"},{"id":"B2RC63","group":"protein","label":"B2RC63"},{"id":"Q13705","group":"protein","label":"Q13705"},{"id":"D3DPA4","group":"protein","label":"D3DPA4"},{"id":"F5GX88","group":"protein","label":"F5GX88"},{"id":"Q9UJW0","group":"protein","label":"Q9UJW0"},{"id":"P12318","group":"protein","label":"P12318"},{"id":"P12643","group":"protein","label":"P12643"},{"id":"Q5T9B9","group":"protein","label":"Q5T9B9"},{"id":"P37088","group":"protein","label":"P37088"},{"id":"A0A0S2Z5D4","group":"protein","label":"A0A0S2Z5D4"},{"id":"A0A024R730","group":"protein","label":"A0A024R730"},{"id":"P13569","group":"protein","label":"P13569"},{"id":"Q75ME0","group":"protein","label":"Q75ME0"},{"id":"P51170","group":"protein","label":"P51170"},{"id":"Q04771","group":"protein","label":"Q04771"},{"id":"P19438","group":"protein","label":"P19438"},{"id":"A0A024R878","group":"protein","label":"A0A024R878"},{"id":"A5X2V1","group":"protein","label":"A5X2V1"},{"id":"Q96CG0","group":"protein","label":"Q96CG0"},{"id":"Q16623","group":"protein","label":"Q16623"}],"edges":[{"from":"DCTN4","to":"CFTR"},{"from":"STX1A","to":"SCNN1B","group":"default"},{"from":"SCNN1A","to":"SCNN1G","group":"default"},{"from":"SCNN1B","to":"SCNN1G","group":"default"}]}'>
</drugst-one>
<!-- <drugst-one id="netexp1"-->
<!-- pluginId="2"-->
<!-- groups='{"nodeGroups":{"protein":{"type":"Gene","color":"#CD5C5C","font":{"color":"#ffffff"},"groupName":"Gene","shape":"ellipse"}}}'-->
<!-- config='{"showSimpleAnalysis": true,"algorithms": {"drug": ["trustrank"]}, "selfReferences": false, "licensedDatasets": false,"physicsOn":false,"identifier":"uniprot","title":"Breast cancer example network","nodeShadow":true, "showAdvAnalysisContent":["drug-search","enrichment-gprofiler", "enrichment-digest"], "edgeShadow":false,"autofillEdges":true,"showLegend":true, "activateNetworkMenuButtonAdjacentDrugs":true,"activateNetworkMenuButtonAdjacentDisorderDrugs":true}'-->
<!-- network='{"nodes":[{"id":"P01137","group":"protein","label":"P01137"},{"id":"A0A499FJK2","group":"protein","label":"A0A499FJK2"},{"id":"Q9Y6G5","group":"protein","label":"Q9Y6G5"},{"id":"Q13873","group":"protein","label":"Q13873"},{"id":"P37023","group":"protein","label":"P37023"},{"id":"B7Z6Y5","group":"protein","label":"B7Z6Y5"},{"id":"J9PH39","group":"protein","label":"J9PH39"},{"id":"P51168","group":"protein","label":"P51168"},{"id":"P27037","group":"protein","label":"P27037"},{"id":"P17813","group":"protein","label":"P17813"},{"id":"Q9NSJ5","group":"protein","label":"Q9NSJ5"},{"id":"Q9UK05","group":"protein","label":"Q9UK05"},{"id":"B2R812","group":"protein","label":"B2R812"},{"id":"Q14CN2","group":"protein","label":"Q14CN2"},{"id":"B2RC63","group":"protein","label":"B2RC63"},{"id":"Q13705","group":"protein","label":"Q13705"},{"id":"D3DPA4","group":"protein","label":"D3DPA4"},{"id":"F5GX88","group":"protein","label":"F5GX88"},{"id":"Q9UJW0","group":"protein","label":"Q9UJW0"},{"id":"P12318","group":"protein","label":"P12318"},{"id":"P12643","group":"protein","label":"P12643"},{"id":"Q5T9B9","group":"protein","label":"Q5T9B9"},{"id":"P37088","group":"protein","label":"P37088"},{"id":"A0A0S2Z5D4","group":"protein","label":"A0A0S2Z5D4"},{"id":"A0A024R730","group":"protein","label":"A0A024R730"},{"id":"P13569","group":"protein","label":"P13569"},{"id":"Q75ME0","group":"protein","label":"Q75ME0"},{"id":"P51170","group":"protein","label":"P51170"},{"id":"Q04771","group":"protein","label":"Q04771"},{"id":"P19438","group":"protein","label":"P19438"},{"id":"A0A024R878","group":"protein","label":"A0A024R878"},{"id":"A5X2V1","group":"protein","label":"A5X2V1"},{"id":"Q96CG0","group":"protein","label":"Q96CG0"},{"id":"Q16623","group":"protein","label":"Q16623"}],"edges":[{"from":"DCTN4","to":"CFTR"},{"from":"STX1A","to":"SCNN1B","group":"default"},{"from":"SCNN1A","to":"SCNN1G","group":"default"},{"from":"SCNN1B","to":"SCNN1G","group":"default"}]}'>-->
<!-- </drugst-one>-->
</div>
<br>
<br>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment