diff --git a/src/app/components/analysis-panel/analysis-panel.component.ts b/src/app/components/analysis-panel/analysis-panel.component.ts index 19dacd1caa90fe0128631c7a75a878249fff4c92..df8243113127278989591fb221774f0371bf7ac2 100644 --- a/src/app/components/analysis-panel/analysis-panel.component.ts +++ b/src/app/components/analysis-panel/analysis-panel.component.ts @@ -223,7 +223,6 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit this.drugstoneConfig.config.physicsOn = !isBig; } this.networkHandler.activeNetwork.networkInternal = new vis.Network(container, this.nodeData, options); - if (isBig) { resolve(nodes); } @@ -320,6 +319,7 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit if (!node) { continue; } + const pos = this.networkHandler.activeNetwork.networkInternal.getPositions([item.id]); node.x = pos[item.id].x; node.y = pos[item.id].y; @@ -468,7 +468,6 @@ export class AnalysisPanelComponent implements OnInit, OnChanges, AfterViewInit }) if ('score' in data[0]) { - console.log('sorting') data = data.sort((a, b) => b['score'] - a['score']); } diff --git a/src/app/components/network/network.component.ts b/src/app/components/network/network.component.ts index 4c96283505977c1c71221f6843444db40fffcc37..6e02d409943fd62588b135c2f1e16f66d16799cd 100644 --- a/src/app/components/network/network.component.ts +++ b/src/app/components/network/network.component.ts @@ -642,7 +642,7 @@ export class NetworkComponent implements OnInit { if (!node) { continue; } - const pos = this.networkHandler.activeNetwork.networkInternal.getPositions([node.id]); + const pos = this.networkInternal.getPositions([node.id]); node.x = pos[node.id].x; node.y = pos[node.id].y; const isSeed = this.highlightSeeds ? this.seedMap[node.id] : false; diff --git a/src/app/pages/explorer-page/explorer-page.component.ts b/src/app/pages/explorer-page/explorer-page.component.ts index e28cb8eb90c29ba6a07291d0c6e0e61f583a07c9..c6fa80a3d5d2872629dc5595c686a1af93ef2282 100644 --- a/src/app/pages/explorer-page/explorer-page.component.ts +++ b/src/app/pages/explorer-page/explorer-page.component.ts @@ -202,6 +202,9 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { } public activateConfig(updateNetworkFlag = false) { + // remove analysis panel when loading config + this.selectedAnalysisToken = null; + let configObj = {}; let groupsObj = {}; try { @@ -375,7 +378,6 @@ export class ExplorerPageComponent implements OnInit, AfterViewInit { // // skip network options for selecting nodes when there are no options to use it // return; // } - this.networkHandler.activeNetwork.networkInternal.on('doubleClick', (properties) => { const nodeIds: Array<string> = properties.nodes; if (nodeIds != null && nodeIds.length > 0) { diff --git a/src/index.html b/src/index.html index f0c3b54ed7c8dc2a84fd6ec1ff8df02982d87a6e..d4703eb1f552a30d22b7693fed985adeb37ec51c 100644 --- a/src/index.html +++ b/src/index.html @@ -112,6 +112,7 @@ menu<br> <div style="max-width: 80vw; width: 1276px; height: 500px"> + <!-- task-id="ks38WxeCSdbXk2cajKACinnUnCHWbf4I" --> <drugst-one id="netexp1" config='{"activateNetworkMenuButtonAdjacentDisorders":false,"activateNetworkMenuButtonAdjacentDrugs":false, "activateNetworkMenuButtonAdjacentDisordersDrugs": false, "licensedDatasets":true}' groups='{"nodeGroups":{"protein":{"type":"protein","color":"#4da300","font":{"color":"#f0f0f0"},"groupName":"Protein","shape":"circle"},"foundDrug":{"type":"drug","color":"#F12590","font":{"color":"#000000"},"groupName":"Drug","shape":"diamond"}},"edgeGroups":{"default":{"color":"#000000","groupName":"default edge"}}}'