Skip to content

Commit 661e496

Browse files
author
kuivenhoven1
committed
Finished d3 nested tree diagram
1 parent 03374c4 commit 661e496

File tree

4 files changed

+56
-68
lines changed

4 files changed

+56
-68
lines changed

statsPage/static/jsondata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"key": "usage", "values": [{"key": "cdms2", "value": 1}, {"key": "pcmdi_metrics_driver", "value": 1}, {"key": "vcs", "value": 1}, {"key": "genutil", "value": 16}, {"key": "cdutil", "value": 31}]}]
1+
[{"key": "usage", "values": [{"key": "pcmdi_metrics_driver", "value": 1}, {"key": "cdutil", "value": 31}, {"key": "genutil", "value": 16}, {"key": "cdms2", "value": 1}, {"key": "vcs", "value": 1}, {"key": "Error", "value": 20}]}]

statsPage/static/testing.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"key": "cdms2", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1, "main_function": "no function"}, {"key": "cdutil", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1, "main_function": "no function"}, {"key": "cdutil", "main_function": "generateLandSeaMask", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "departures"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "departures"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "get"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "get"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "get"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "get"}, {"key": "genutil", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1, "main_function": "no function"}, {"key": "genutil", "main_function": "area_weights", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "genutil", "main_function": "averager", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "genutil", "main_function": "minmax", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "genutil", "main_function": "picker", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "genutil", "main_function": "StringConstructor", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "pcmdi_metrics_driver", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1, "main_function": "no function"}, {"key": "vcs", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1, "main_function": "no function"}]
1+
[{"key": "cdms2", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "cdutil", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "cdutil", "main_function": "generateLandSeaMask", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 20, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "climatology"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 2, "super_sub": "departures"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "departures"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 4, "super_sub": "get"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "get"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "get"}, {"key": "cdutil", "main_function": "times", "subfunction": "Seasons", "value": 1, "super_sub": "get"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 19, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "Error", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "genutil", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "genutil", "main_function": "area_weights", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "genutil", "main_function": "averager", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "genutil", "main_function": "minmax", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "genutil", "main_function": "picker", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "genutil", "main_function": "StringConstructor", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 1}, {"key": "pcmdi_metrics_driver", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}, {"key": "vcs", "super_sub": "no super_sub", "subfunction": "no subfunction", "value": 0, "main_function": "no function"}]

statsPage/templates/testing/nested_d3.html

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
format: ",d",
3333
title: "",
3434
width: 960,
35-
height: 500
35+
height: 960
3636
};
3737

3838
function main(o, data) {
@@ -154,20 +154,20 @@
154154
.text(name(d));
155155

156156
console.log("here's keys for d: " + Object.keys(d));
157-
console.log("here's values for d: " + Object.values(d));
157+
//console.log("here's values for d: " + Object.values(d));
158158
//console.log("here's depth for d: " + Object.keys(depth));
159-
console.log("here's depth value for d: " + Object.values(d)[6]);
159+
//console.log("here's depth value for d: " + Object.values(d)[6]);
160160
var g1 = svg.insert("g", ".grandparent")
161161
.datum(d)
162162
.attr("class", "depth");
163163

164164
var g = g1.selectAll("g")
165165
.data(d._children)
166166
.enter().append("g");
167-
//console.log("here's g: " + g[0]);
167+
//console.log("here's g: " + g);
168168

169-
g.filter(function(d) { return d._children; })
170169
//g.filter(function(d) { console.log((d._children).length); return d._children; })
170+
g.filter(function(d) { return d._children; })
171171
.classed("children", true)
172172
.on("click", transition);
173173

@@ -193,6 +193,8 @@
193193
.attr("class", "ptext")
194194
.attr("dy", ".75em")
195195

196+
console.log(t);
197+
196198
t.append("tspan")
197199
.text(function(d) { return d.key; });
198200
t.append("tspan")
@@ -203,9 +205,23 @@
203205
g.selectAll("rect")
204206
.style("fill", function(d) { return color(d.key); });
205207

208+
//noTransitionList = ["get", "climatology", "departure"];
209+
var noTransitionList = ["get", "climatology", "departures", "no super_sub", "no function"]
210+
211+
//if d.key is in noTransitionList; return from function without doing anything
206212
//var que = 0;
207213
//if(que < 3){
208214
function transition(d) {
215+
console.log("fire transition")
216+
console.log("d.:", d )
217+
218+
for(var i=0; i < noTransitionList.length; i++){
219+
if(d.key == noTransitionList[i]){
220+
return;
221+
}
222+
}
223+
224+
209225
if (transitioning || !d) return;
210226
transitioning = true;
211227
que += 1;
@@ -220,6 +236,7 @@
220236
//t1 = g1.transition().duration(750),
221237
//t2 = g2.transition().duration(750);
222238

239+
console.log(g2);
223240
// Update the domain only after entering new elements.
224241
x.domain([d.x, d.x + d.dx]);
225242
y.domain([d.y, d.y + d.dy]);
@@ -233,7 +250,7 @@
233250
count += 1;
234251
//console.log("here's your count: " + count);
235252
//var c = a.depth - b.depth;
236-
//console.log("a.depth: " + a.depth);
253+
console.log("a.depth: " + a.depth);
237254
//console.log("b.depth: " + b.depth);
238255
//console.log("a.depth-b.depth: " + c);
239256
return a.depth - b.depth;
@@ -307,6 +324,7 @@
307324
.key(function(d) { return d.super_sub; })
308325
.entries(res);
309326
main({title: "<h4>Actions Of UV-CDAT</h4>"}, {key: "Usage", values: data});
327+
console.log("data in callback:", data)
310328
}
311329
});
312330
}

0 commit comments

Comments
 (0)