Skip to content

Commit e4e4d1e

Browse files
Updates to New Visualization components
1 parent 9997904 commit e4e4d1e

4 files changed

Lines changed: 25 additions & 20 deletions

File tree

‎BarChart/program/BarChart.html‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,15 @@
9393
padding: 5px;
9494
}
9595

96-
.allOptions td {}
96+
.advancedOptions {
97+
position: absolute;
98+
background: white;
99+
}
97100

98101
.advancedOptions,
99102
.advancedOptions input {
100103
font-size: 0.8em;
101104
}
102-
103-
.allOptions {
104-
min-height:
105-
}
106105
</style>
107106
</head>
108107

@@ -129,7 +128,7 @@
129128
</div>
130129
</div>
131130
</td>
132-
<td>
131+
<td style="display:inline">
133132
<a id="toggleAdvOpt" href="#">Show Advanced Options</a>
134133
<div class="advancedOptions" style="display:none"></div>
135134
</div>
@@ -280,7 +279,7 @@
280279
.attr('class', 'd3-tip')
281280
.offset([-10, 0])
282281
.html(function(d) {
283-
return "<strong>Value:</strong> <span style='color:red'>" + d.string + "</span><br/>" +
282+
return "<strong>" + variable + ": </strong> <span style='color:red'>" + d.string + "</span><br/>" +
284283
"<strong>Count:</strong> <span style='color:red'>" + d.count + "</span>";
285284
})
286285
svg.call(tip);
@@ -551,6 +550,7 @@
551550
}
552551

553552
function wrap(text, width) {
553+
width = parseInt(width*0.2);
554554
text.each(function() {
555555

556556
var text = d3.select(this),

‎Histogram/program/Histogram.html‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,15 +104,15 @@
104104
padding: 5px;
105105
}
106106

107-
.allOptions td {}
108107

109108
.advancedOptions,
110109
.advancedOptions input {
111110
font-size: 0.8em;
112111
}
113112

114-
.allOptions {
115-
min-height:
113+
.advancedOptions {
114+
position: absolute;
115+
background: white;
116116
}
117117
</style>
118118
</head>
@@ -135,7 +135,7 @@
135135
</div>
136136
</div>
137137
</td>
138-
<td>
138+
<td style="display:inline">
139139
<a id="toggleAdvOpt" href="#">Show Advanced Options</a>
140140
<div class="advancedOptions" style="display:none"></div>
141141
</div>
@@ -630,9 +630,10 @@
630630
}
631631

632632
function zoomed() {
633+
console.log(d3.event);
633634
d3.select("#svgContainer g").attr("transform",
634-
"translate(" + margin.left + "," + margin.top + ")" +
635-
"scale(" + d3.event.transform.k + ",1)");
635+
"translate(" + (margin.left + d3.event.transform.x) + "," + (margin.top + d3.event.transform.y) + ")" +
636+
"scale(" + d3.event.transform.k + "," + d3.event.transform.k + ")");
636637
}
637638

638639
function addMessage(message) {

‎LineGraph/program/LineGraph.html‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@
4949
padding: 5px;
5050
}
5151

52+
.advancedOptions {
53+
position: absolute;
54+
background: white;
55+
}
56+
5257
.advancedOptions,
5358
.advancedOptions input {
5459
font-size: 0.8em;
@@ -73,7 +78,7 @@
7378
</div>
7479
</div>
7580
</td>
76-
<td>
81+
<td style="display:inline">
7782
<a id="toggleAdvOpt" href="#">Show Advanced Options</a>
7883
<div class="advancedOptions" style="display:none"></div>
7984
</td>

‎ScatterPlot/program/ScatterPlot.html‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,15 @@
7070
padding: 5px;
7171
}
7272

73-
.allOptions td {}
73+
.advancedOptions {
74+
position: absolute;
75+
background: white;
76+
}
7477

7578
.advancedOptions,
7679
.advancedOptions input {
7780
font-size: 0.8em;
7881
}
79-
80-
.allOptions {
81-
min-height:
82-
}
8382
</style>
8483
</head>
8584

@@ -104,7 +103,7 @@
104103
</div>
105104
</div>
106105
</td>
107-
<td>
106+
<td style="display:inline">
108107
<a id="toggleAdvOpt" href="#">Show Advanced Options</a>
109108
<div class="advancedOptions" style="display:none"></div>
110109
</td>

0 commit comments

Comments
 (0)