fix: corrected calculation of added/changed/removed counts in toHiera…

…rchy fixes #262
IQTLabs · Mar 19, 2019 · a029c2c · a029c2c
1 parent 53df394
commit a029c2c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CRviz",
-  "version": "0.3.1-alpha2",
+  "version": "0.3.1-alpha3",
   "private": true,
   "dependencies": {
     "@fortawesome/fontawesome": "^1.1.3",

diff --git a/src/features/visualization/d3-viz/setup-annotations.js b/src/features/visualization/d3-viz/setup-annotations.js
@@ -44,13 +44,13 @@ const setupAnnotations = ({packedData, annotationRoot, colorMap}) =>{
       .classed(className("total-container"), true);;
   const newCircles = newTotalContainer
     .append('g')
-      .classed(className("leafNode"), true)
+      .classed(className("node"), true)
     .append('circle')
       .attr('r', offsetIncrement)
 
   annotations
   .select(`g.${className("total-container")}`)
-  .select(`g.${className("leafNode")}`)
+  .select(`g.${className("node")}`)
   .select('circle')
   .merge(newCircles)
     .attr('cx', (d) => ((d.r + 2*offsetIncrement) * Math.cos(baseAngle + totalAngleOffset*getAngleOfLeafNodeDiameter(d.r, offsetIncrement))))

diff --git a/src/features/visualization/d3-viz/to-hierarchy.js b/src/features/visualization/d3-viz/to-hierarchy.js
@@ -88,7 +88,7 @@ const countChanged = (children) => {
     result += (children[c].CRVIZ._changedCount || 0) + (children[c].CRVIZ._isChanged || 0) +
               (
                 !isNil(children[c].values)
-                  ? countAdded(children[c].values) : 0
+                  ? countChanged(children[c].values) : 0
               );
   }
 
@@ -109,7 +109,7 @@ const countRemoved = (children) => {
     result += (children[c].CRVIZ._removedCount || 0) + (children[c].CRVIZ._isRemoved || 0) +
               (
                 !isNil(children[c].values)
-                  ? countAdded(children[c].values) : 0
+                  ? countRemoved(children[c].values) : 0
               );
   }