Skip to content

Commit

Permalink
views implemented
Browse files Browse the repository at this point in the history
  • Loading branch information
@brappop
brappop committed Aug 7, 2018
1 parent 02c8343 commit 7a59903
Showing 1 changed file with 11 additions and 103 deletions.
114 changes: 11 additions & 103 deletions app/enpi_tool.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1595,36 +1595,13 @@ function loadGraphListeners(combinations, displayJsons){
.y(function (d) {
return y(d.rSquare);
});
/*
function showHideElements(d, i){
if(document.getElementById("line"+i) && document.getElementById("line"+i).style.strokeWidth !== "0px") {
d3.select("#line" + i)
.style("stroke-width", "0px");

d3.select("#savingsLine" + i)
var showHideElements = function(i){
if((document.getElementById("line"+i) && document.getElementById("line"+i).style.strokeWidth !== "0px") ||
(document.getElementsByClassName("line"+i) && document.getElementsByClassName("line"+i)[0].style.opacity !== "0")) {
d3.select("#line" + i)
.style("stroke-width", "0px");

d3.select("#clickableTile"+i)
.style("fill", "gray");
activeModels[Math.floor(i / combinations.length)][combinations[i % combinations.length]] = false;
changeModelInfoTableModels(Math.floor(i / combinations.length), combinations);
for(var z = 0; z < tables.length; z++){
var dataJsons = [];
for(var k = 0; k < displayJsons[z].length; k++) {
dataJsons[k]= [{}];
for (var j = 0; j < displayJsons[z][k].length; j++) {
dataJsons[k][j] = {modelCombo: k, modelYear: j, dependentNumber: z, rSquare: displayJsons[z][k][j].rSquare, savingsPercent: savingsLines[z][k][j], fittedModel: displayJsons[z][k][j].fittedModel};
}
}
makeSavingsGraph(displayJsons[z], z, combinations, dataJsons);
makeGuideLine(displayJsons[z], z, combinations, dataJsons);
}
}
else if (document.getElementsByClassName("line"+i) && document.getElementsByClassName("line"+i)[0].style.opacity !== "0") {
d3.selectAll(".line" + i)
.style("opacity", "0");

Expand Down Expand Up @@ -1680,41 +1657,18 @@ function loadGraphListeners(combinations, displayJsons){
makeGuideLine(displayJsons[z], z, combinations, dataJsons);
}
}
} */
}

d3.selectAll(".clickableBox")
.each( function(d, i){
var i = i;
d3.select(this)
.on("click", () => {
if(document.getElementById("line"+i) && document.getElementById("line"+i).style.strokeWidth !== "0px") {
if((document.getElementById("line"+i) && document.getElementById("line"+i).style.strokeWidth !== "0px") ||
(document.getElementsByClassName("line"+i) && document.getElementsByClassName("line"+i)[0].style.opacity !== "0")) {
d3.select("#line" + i)
.style("stroke-width", "0px");

d3.select("#savingsLine" + i)
.style("stroke-width", "0px");

d3.select("#clickableTile"+i)
.style("fill", "gray");


activeModels[Math.floor(i / combinations.length)][combinations[i % combinations.length]] = false;
changeModelInfoTableModels(Math.floor(i / combinations.length), combinations);

for(var z = 0; z < tables.length; z++){

var dataJsons = [];
for(var k = 0; k < displayJsons[z].length; k++) {
dataJsons[k]= [{}];
for (var j = 0; j < displayJsons[z][k].length; j++) {
dataJsons[k][j] = {modelCombo: k, modelYear: j, dependentNumber: z, rSquare: displayJsons[z][k][j].rSquare, savingsPercent: savingsLines[z][k][j], fittedModel: displayJsons[z][k][j].fittedModel};
}
}
makeSavingsGraph(displayJsons[z], z, combinations, dataJsons);
makeGuideLine(displayJsons[z], z, combinations, dataJsons);
}
}
else if (document.getElementsByClassName("line"+i) && document.getElementsByClassName("line"+i)[0].style.opacity !== "0") {
d3.selectAll(".line" + i)
.style("opacity", "0");

Expand Down Expand Up @@ -1778,34 +1732,11 @@ function loadGraphListeners(combinations, displayJsons){
var i = i;
d3.select(this)
.on("click", () => {
if(document.getElementById("line"+i) && document.getElementById("line"+i).style.strokeWidth !== "0px") {
if((document.getElementById("line"+i) && document.getElementById("line"+i).style.strokeWidth !== "0px") ||
(document.getElementsByClassName("line"+i) && document.getElementsByClassName("line"+i)[0].style.opacity !== "0")) {
d3.select("#line" + i)
.style("stroke-width", "0px");

d3.select("#savingsLine" + i)
.style("stroke-width", "0px");

d3.select("#clickableTile"+i)
.style("fill", "gray");


activeModels[Math.floor(i / combinations.length)][combinations[i % combinations.length]] = false;
changeModelInfoTableModels(Math.floor(i / combinations.length), combinations);

for(var z = 0; z < tables.length; z++){

var dataJsons = [];
for(var k = 0; k < displayJsons[z].length; k++) {
dataJsons[k]= [{}];
for (var j = 0; j < displayJsons[z][k].length; j++) {
dataJsons[k][j] = {modelCombo: k, modelYear: j, dependentNumber: z, rSquare: displayJsons[z][k][j].rSquare, savingsPercent: savingsLines[z][k][j], fittedModel: displayJsons[z][k][j].fittedModel};
}
}
makeSavingsGraph(displayJsons[z], z, combinations, dataJsons);
makeGuideLine(displayJsons[z], z, combinations, dataJsons);
}
}
else if (document.getElementsByClassName("line"+i) && document.getElementsByClassName("line"+i)[0].style.opacity !== "0") {
d3.selectAll(".line" + i)
.style("opacity", "0");

Expand Down Expand Up @@ -1869,34 +1800,11 @@ function loadGraphListeners(combinations, displayJsons){
var i = i;
d3.select(this)
.on("click", () => {
if(document.getElementById("line"+i) && document.getElementById("line"+i).style.strokeWidth !== "0px") {
if((document.getElementById("line"+i) && document.getElementById("line"+i).style.strokeWidth !== "0px") ||
(document.getElementsByClassName("line"+i) && document.getElementsByClassName("line"+i)[0].style.opacity !== "0")) {
d3.select("#line" + i)
.style("stroke-width", "0px");

d3.select("#savingsLine" + i)
.style("stroke-width", "0px");

d3.select("#clickableTile"+i)
.style("fill", "gray");


activeModels[Math.floor(i / combinations.length)][combinations[i % combinations.length]] = false;
changeModelInfoTableModels(Math.floor(i / combinations.length), combinations);

for(var z = 0; z < tables.length; z++){

var dataJsons = [];
for(var k = 0; k < displayJsons[z].length; k++) {
dataJsons[k]= [{}];
for (var j = 0; j < displayJsons[z][k].length; j++) {
dataJsons[k][j] = {modelCombo: k, modelYear: j, dependentNumber: z, rSquare: displayJsons[z][k][j].rSquare, savingsPercent: savingsLines[z][k][j], fittedModel: displayJsons[z][k][j].fittedModel};
}
}
makeSavingsGraph(displayJsons[z], z, combinations, dataJsons);
makeGuideLine(displayJsons[z], z, combinations, dataJsons);
}
}
else if (document.getElementsByClassName("line"+i) && document.getElementsByClassName("line"+i)[0].style.opacity !== "0") {
d3.selectAll(".line" + i)
.style("opacity", "0");

Expand Down

0 comments on commit 7a59903

Please sign in to comment.