adicionando visualização circle packege

LABVIS-UFPA · Sep 16, 2019 · 204383f · 204383f
1 parent 4ce0e9f
commit 204383f
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 16 deletions.
diff --git a/pages/controllers/controlles-UI-Logical/uiLogic.js b/pages/controllers/controlles-UI-Logical/uiLogic.js
@@ -71,6 +71,7 @@ ipc.on('file-data', function (event, data) {
 
 ipc.on('change-datasample', function (event, data) {
   _data_ = data
+  console.log(data)
   clean_menus()
   updatevis()
 })
@@ -198,7 +199,8 @@ $(document).ready(function () {
         'Treemap': {name: 'Treemap'},
         'Histogram': {name: 'Histogram'},
         'Sunburst': {name: 'Sunburst'},
-        'BarChart': {name: 'Bar Chart'}
+        'BarChart': {name: 'Bar Chart'},
+        'CirclePacking': {name: 'Circle Packing'}
       }
     })
 
@@ -225,6 +227,7 @@ $(document).ready(function () {
             width: '800px',
             height: '600px'
           })
+          console.log(_data_)
           pc.data(_data_)
           pc.redraw()
           let file = new Blob([element.innerHTML], {type: 'image/svg+xml'})

diff --git a/pages/controllers/controlles-Visualization/visUpdate.js b/pages/controllers/controlles-Visualization/visUpdate.js
@@ -142,6 +142,8 @@ function filterCategoricalValues(attr,item_name, item_value) {
                     }else if(!d.data && d[item_name] != item_value) {
                         return "grey";
                     }else{
+                        console.log("deu certo")
+                        console.log(d)
                         return old_Color;
                     }
                 });
@@ -161,9 +163,11 @@ function filterColorContinues(item,min,max,min_select,max_select){
         if ($(index).children("svg").length){
             this.__vis__.setColor(function (d, i) {
                 if(d.data && d.data[item]>=min_select && d.data[item]<=max_select) {
+                    console.log("deu certo")
                     return old_Color;
                 }
                 else if(!d.data && d[item]>=min_select && d[item]<=max_select){
+                    console.log("deu certo")
                     return old_Color;
                 }
                 else{
@@ -181,8 +185,8 @@ function details_on_demand(element,items) {
     let parentElement = element.parentElement;
     element.on("datamouseover",function(d,i){
         parentElement.__vis__.detail(d,i,items);
-          
-    
+
+
       });
 }
 

diff --git a/pages/models/Interaction_Chosen.js b/pages/models/Interaction_Chosen.js
@@ -145,15 +145,15 @@ class ZoomOnStrategy extends Strategy{
     .scaleExtent([1, 5])
     .on("zoom", zoomed));
 
-    function zoomed() {
-        g.attr("transform", d3.event.transform);
-        g.translate(d3.event.transform.x, d3.event.transform.y);
-        //g.scale(zoom.transform, d3.zoomIdentity);
-        //g.save();
-
-
-    //    g.restore();
-      }
+    // function zoomed() {
+    //     g.attr("transform", d3.event.transform);
+    //     g.translate(d3.event.transform.x, d3.event.transform.y);
+    //     //g.scale(zoom.transform, d3.zoomIdentity);
+    //     //g.save();
+    //
+    //
+    // //    g.restore();
+    //   }
   }
 
     console.log(' DetaionsOnStrategy created');

diff --git a/pages/public/css/main.css b/pages/public/css/main.css
@@ -2,16 +2,14 @@ svg, text {
     font: 12px MONOSPACE;
     fill: black;
 }
-
-
 .axis text {
     text-shadow: 0 2px 0 #fff, 2px 0 0 #fff, 0 -2px 0 #fff, -2px 0 0 #fff;
 }
+
 path.data {
     fill: none;
 }
 
-.axis,
 .frame {
     shape-rendering: crispEdges;
 }
@@ -79,7 +77,7 @@ div.menu-acordion{
     padding-bottom: 10px;
 }
 
-/*!*menus retrateis*!*/
+/*/*menus retrateis*/
 
 #sortable {
     padding: 0px;