diff --git a/__pycache__/run.cpython-37.pyc b/__pycache__/run.cpython-37.pyc index 3e9e870..f38a6ee 100644 Binary files a/__pycache__/run.cpython-37.pyc and b/__pycache__/run.cpython-37.pyc differ 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 {