Skip to content

Commit df98246

Browse files
committed
update
1 parent a4b8f05 commit df98246

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

BioRadar/src/script/main.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -865,11 +865,21 @@ $( document ).ready(function() {
865865
exit_warp();
866866
const choice = this.value;
867867
const choicetext = d3.select(d3.select('#datacom').node().selectedOptions[0]).attr('data-split')==="none";
868-
let loadclusterInfo = false;
869-
eval(d3.select(d3.select('#datacom').node().selectedOptions[0]).attr('ven'))().then((setfilter)=> {
870-
globalFilter = setfilter;
871-
readFilecsv(choice, choicetext)
872-
})
868+
(choice === 'RKO PKO RPKO'? getNet_cancer(): async function(){
869+
d3.select('#bubble').selectAll('*').remove();
870+
d3.select('#protein').selectAll('*').remove();
871+
return {globalProtein: {}, netdata:{}, proteinarr:[]};
872+
}())
873+
.then(d=>{
874+
globalProtein = d.globalProtein;
875+
netdata=d.netdata;
876+
proteinarr=d.proteinarr;
877+
eval(d3.select(d3.select('#datacom').node().selectedOptions[0]).attr('ven'))().then((setfilter)=> {
878+
globalFilter = setfilter;
879+
readFilecsv(choice, choicetext)
880+
})
881+
882+
});
873883

874884
});
875885
$('#description_input_file').on('input',(evt)=>{

BioRadar/src/script/timeSpaceModel.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,10 @@ d3.TimeSpace = function () {
370370
updateTableInput();
371371
path = {};
372372
// BubbleChart();
373-
// ProteinForceDirectedGraph({onChoose:master.filter,onHighLight:(name)=>{searchHandler({target:{value:name}})}});
374-
373+
if (Object.keys(netdata).length){
374+
BubbleChart();
375+
ProteinForceDirectedGraph({onChoose:master.filter,onHighLight:(name)=>{searchHandler({target:{value:name}})}});
376+
}
375377
// make path object and compute euclideandistance
376378
let euclideandistance_range = [+Infinity,0];
377379
datain.forEach(function (target, i) {

0 commit comments

Comments
 (0)