From 673edd1d77db0640e1e3a67fa99356b29f8d7725 Mon Sep 17 00:00:00 2001 From: Angelos Chatzimparmpas Date: Fri, 31 Jul 2020 13:23:28 +0200 Subject: [PATCH] new --- __pycache__/run.cpython-37.pyc | Bin 13044 -> 13061 bytes frontend/src/components/FeatureSpace1.vue | 540 ++++++++++++++++++--- frontend/src/components/FeatureSpace2.vue | 21 +- frontend/src/components/FeatureSpace3.vue | 542 +++++++++++++++++++--- frontend/src/components/FeatureSpace4.vue | 542 +++++++++++++++++++--- frontend/src/components/Main.vue | 7 +- 6 files changed, 1449 insertions(+), 203 deletions(-) diff --git a/__pycache__/run.cpython-37.pyc b/__pycache__/run.cpython-37.pyc index 3e9e870320dcf21712efe21b91d4e847dd0c17cc..f38a6eeb0ea8d47d88e76ee459808db229ca89cf 100644 GIT binary patch delta 1724 zcmZA2J8#=o6bEo#QbrX~w4N44y&OrFEZM51$blb8>?X1ebSN?u$YKd>MHGBhsGE(JPv$_MDsr5Ouk$&?}Jxu-X@XanXw|8qt1{0KsN zaqq#gF))mnf`9+KsvrIEvtg9kyJyAn5xeQmgE3)D0mF|^6)y!T-=H-%O4w2R(nIFO zKo4pi;z1n;W0c@eD!0Z-KLzP2^K!1JGFX{ZWwFXrwSbl7rXf9HUIEt(u0>q4xR!8T zz_sjVAU9!l;-kp7s`Jv#+DSWw_pdPMxVMl0m=^7Y zhpJbTx69EeFWk!z!_ic)4t2kZk7wy5G8D(G7yxq>*AlL^p)&B6@MKduH0N31Xn;u$ zu_qiRG|*w<@C|Y_uxb*+zAPBU5Tk_*T{0Lk7&1)BU?B#RjJBLaFf`|HWav1V>aD;E zF;Z=s=zrVoxyg&_PBXhwl)hgVmeFxLp;DQi#z-MqDyf zVyMW-ONJU^sFKl>lL$t{`4bs&oJ{quz!hTjiO~-jUCHPPMjubMBxBC`EnuvJMGUbg z7#6G}!@}X$iLs8=Rbp(_1fv{cY#_ss42>8XGAzl^LJUnZHsvIOG3Pu%hJll*-WF^T zW1AS;0b@flHiydC+oqw!OMi_j@!DLcN<8@+REgnt#K`!zUK^@*+Ros+yh|M&t_PjB zs1t`9LFXoQ4A==ew_umP5C$;7F9d#6zdAO33quW`78^3W)c|j5!QM<~k2?D^oqg&Y z%ybTh%H6tK_oMET8yhW-8p1xo>oJA85x?m!PlF8eeru|T-Lcq)#Op{Y8A_>8s)kZ4 zl)9m`5lVwl+6&TH+o7bl0p`Q(&~7jo%BE}v(p&0Y=Kq15wR@BIH5$h|qc zNjF+LzYyis3%MW8{Jq9c{HvzUlg(59ym_C$Y#y={zq9-eTjtM}PuVU%YMrn~}rKbi)LlSqIn^@5P-p;6H`3l56V zvLH2@l?6@(2t@+s56GGW5>XFSsW|jfP8@sei9eyIiYpRt9@C9Ck?eWjH`&?uS*_%U zd;i?md%B)b;P1WN%I;5(b-hI1KP#4Y$r{sxx3GBbjl+{=!rZ?JMO%?voP>={9xmE%y(dPd*m-^{iKSymVl zO|g}SbdOq!U-2xK2nr)*NWNF#zlz@~d&JJ!+ELt_`A+GV?5qWQ+wg%@wx^G&UzN8r zaFmzcEK9&>)SqYb!5loEg@c$QzH?##$Q4+NuvQ(V=P$s;dFfEyze7ij<#OLxahvf0n%OUy)u*b@wsEdj%X;g^uH1l60!_^=`vGZ97`7)i;X$e_S5 zC4)v7R5Chp62XYMe*z;3lTrUFyNZl1GP)t7Eg2ob=)%R8WK6ifhm2)rAw%p5hQ*eF zVZrdr$XJHz8ZvHH1)~&UtN=ro3>6tFFf7SXBMenCR^=puG2xy9Lx;(zzsA;(v5t)O zkg*~etBzv(>o}Bn>91oYUYiZ9#FM{)l^A|gj0|t{MP*Kff1Oj7gXSp5Qo5dJviB9TVtIq>}-#9wz0D_*4c5CdsVL*#Jzbh(J%KG z1aJuF5e2)kpyt&_VP>hIF;c|tKy0)0>xgMGk}{E0iKJ#EwIgXIl6sM}6{dl>{dO2d z+8IwCOwJ1DlVdJk$TJsm={&RQ_-U*aNu8i^>;K1q?$z;4ywSq>L6{dWDs9 zee&snGk1Ic-h)~ZUd7`e+guk_BozA{J1DgUK?hy2R_ZMV~Zh|6Q*=Vc;J v-A8<*b7-AFdM5h#v!lk;1dWpvaZk>kcb*XK6t>+*;_HMTcfV9WDqQ*xSh3vx diff --git a/frontend/src/components/FeatureSpace1.vue b/frontend/src/components/FeatureSpace1.vue index 38998f0..1c59e08 100644 --- a/frontend/src/components/FeatureSpace1.vue +++ b/frontend/src/components/FeatureSpace1.vue @@ -1,30 +1,12 @@ + + \ No newline at end of file diff --git a/frontend/src/components/FeatureSpace2.vue b/frontend/src/components/FeatureSpace2.vue index 391fe9a..0fc643d 100644 --- a/frontend/src/components/FeatureSpace2.vue +++ b/frontend/src/components/FeatureSpace2.vue @@ -1,7 +1,6 @@ @@ -52,6 +51,7 @@ export default { }, graphVizualization () { + var listofNodes = this.dataFS2[0] var uniqueTarget = JSON.parse(this.dataFS2[15]) var corrTarget = JSON.parse(this.dataFS2[7]) var corrGlob = JSON.parse(this.dataFS2[11]) @@ -216,10 +216,10 @@ export default { var innerRadius = arcSize * 2; var svgLoc = node.append('svg').attr('width', widthLoc).attr('height', widthLoc) - .attr("id", function(d, i) { return "svg" + (i); }) + .attr("id", function(d, i) { return "svg" + (i+listofNodes.length); }) graph.nodes.forEach(function(itemVal, indexNode) { - console.log(indexNode) + // var data = [[ // {value: 70, label: "", color: '#ff0000', lcolor: ''}, // {value: 33, label: "", color: '#00ff00', lcolor: ''}, @@ -235,7 +235,6 @@ export default { data.push({value: 100, label: corrGlobFormatted[indexNode], color: '#000000', lcolor: colorsScaleNodes(MIVar[indexNode])}) var border = VIFVarFormatted[indexNode] - var arcs = data.map(function (obj, i) { if (i == length) { return d3.arc().innerRadius(i * arcSize + innerRadius).outerRadius((i + 1) * arcSize - (widthLoc / 100) + innerRadius + border); @@ -258,16 +257,15 @@ export default { var pie = d3.pie().sort(null).value(function (d) { return d.value; }); - - var g = d3.select('#svg'+indexNode).selectAll('g').data(pieData).enter() + var id = indexNode+listofNodes.length + var g = d3.select('#svg'+id).selectAll('g').data(pieData).enter() .append('g') .attr('transform', 'translate(' + widthLoc / 2 + ',' + widthLoc / 2 + ') rotate(180)'); - var gText = d3.select('#svg'+indexNode).selectAll('g.textClass').data([{}]).enter() + var gText = d3.select('#svg'+id).selectAll('g.textClass').data([{}]).enter() .append('g') .classed('textClass', true) .attr('transform', 'translate(' + widthLoc / 2 + ',' + widthLoc / 2 + ') rotate(180)'); - g.selectAll('path').data(function (d) { return pie(d); }).enter().append('path') @@ -283,7 +281,6 @@ export default { }); g.each(function (d, index) { - console.log(d) var el = d3.select(this); var path = el.selectAll('path').each(function (r, i) { @@ -384,7 +381,7 @@ export default { .attr('y2', function (d) { return d.target.y; }); node - .attr("id", function(d, i) { return "g" + (i); }) + .attr("id", function(d, i) { return "g" + (i+listofNodes.length); }) .attr("transform", function(d, i) { d.x = d.x - 50 d.y = d.y - 50 @@ -468,8 +465,8 @@ export default { }, }, mounted () { - EventBus.$on('quad', data => { this.dataFS2 = data }) - EventBus.$on('quad', this.initializeNetwork) + EventBus.$on('quad2', data => { this.dataFS2 = data }) + EventBus.$on('quad2', this.initializeNetwork) } } diff --git a/frontend/src/components/FeatureSpace3.vue b/frontend/src/components/FeatureSpace3.vue index 16c02a1..9d18f5d 100644 --- a/frontend/src/components/FeatureSpace3.vue +++ b/frontend/src/components/FeatureSpace3.vue @@ -1,30 +1,12 @@ + + \ No newline at end of file diff --git a/frontend/src/components/FeatureSpace4.vue b/frontend/src/components/FeatureSpace4.vue index e816ed5..f046b72 100644 --- a/frontend/src/components/FeatureSpace4.vue +++ b/frontend/src/components/FeatureSpace4.vue @@ -1,30 +1,12 @@ + + \ No newline at end of file diff --git a/frontend/src/components/Main.vue b/frontend/src/components/Main.vue index f883198..05e4435 100755 --- a/frontend/src/components/Main.vue +++ b/frontend/src/components/Main.vue @@ -495,7 +495,10 @@ export default Vue.extend({ .then(response => { console.log('Server successfully send the correlation matrices!') this.correlResul = response.data.correlResul - EventBus.$emit('quad', this.correlResul) + EventBus.$emit('quad1', this.correlResul) + EventBus.$emit('quad2', this.correlResul) + EventBus.$emit('quad3', this.correlResul) + EventBus.$emit('quad4', this.correlResul) }) .catch(error => { console.log(error) @@ -617,7 +620,7 @@ body { top: 0px; bottom: 0px; margin-top: -4px !important; - overflow: hidden !important; + //overflow: hidden !important; } .modal-backdrop {