Skip to content

Commit 1130f37

Browse files
committed
table
1 parent 669cdeb commit 1130f37

5 files changed

Lines changed: 48 additions & 7 deletions

File tree

assets/css/main.css

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ filter: invert(1);
584584
width: 100%;
585585
border: solid #555 1px;
586586
border-radius: 14px;
587-
height: 100%;
587+
height: 75%;
588588
}
589589

590590
.fakeGrammarRow {
@@ -1012,4 +1012,11 @@ p, h3, h4, h5, img {
10121012
#composition circle, .markAnchorSvg circle {
10131013
stroke: #000;
10141014
stroke-width: 2px;
1015+
}
1016+
1017+
#datasetContainer {
1018+
border-radius: 15px;
1019+
1020+
background-color: #FFF;
1021+
border: solid 1px #424242;
10151022
}

assets/js/datasetStuff.js

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,36 @@ function fillSidePanel() {
3434

3535
}
3636

37-
const elements = document.querySelectorAll(".dataRow")
37+
const elements = document.querySelectorAll(".dataRow")
3838

39-
for (let i = 0; i <elements.length; i++) {
39+
for (let i = 0; i < elements.length; i++) {
4040

4141

4242
dragElement2(elements[i])
4343
}
4444

4545

46+
}
47+
48+
49+
function fillTable() {
50+
let table = document.getElementById("newDataTable")
51+
let tkeys = Object.keys(chartDataset.data[0])
52+
let row = document.createElement("tr")
53+
for (let i = 0; i < tkeys.length; i++) {
54+
row.innerHTML += `<th>${tkeys[i]}</th>`
55+
56+
57+
}
58+
table.appendChild(row)
59+
for (let i = 0; i < chartDataset.data.length; i++) {
60+
let row = document.createElement("tr")
61+
for (let j = 0; j < tkeys.length; j++) {
62+
row.innerHTML += `<td>${chartDataset.data[i][tkeys[j]]}</td>`
63+
}
64+
table.appendChild(row)
65+
66+
}
67+
4668

4769
}

assets/js/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ async function init() {
172172
// drawSvg()
173173
// tdrawRefactor()
174174
fillSidePanel()
175-
175+
fillTable()
176176
collageColScale = d3.scaleOrdinal(d3.schemeAccent)
177177
// document.getElementById("jsonLoader").addEventListener("change", importFromJson);
178178
document.getElementById("imgLoader").addEventListener("change", importImg);

assets/js/newCollage.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ function addPaletteInfoToCollage(palette, name) {
6868
drawnMarks[name] = placeMark()
6969
setMarker()
7070

71-
svg.append("image")
71+
svg.append("g")
72+
.attr("id","g-"+name)
73+
.append("image")
7274
.attr("class", "collageElement")
7375
.style("outline", `${collageColScale(name)} solid 3px`)
7476
.attr("xlink:href", show.toDataURL("image/png"))

index.html

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,22 @@ <h5>Data Columns</h5>
253253
</div>
254254

255255
<!-- <div id="fakePreview">-->
256-
<div>
256+
<!-- <div>
257257
<button style="border: darkred solid 1px" onclick="switchForce()"> Force Layout</button>
258258
<button onclick="switchGrid()"> Grid Layout</button>
259259
260-
</div>
260+
</div>-->
261261
<svg style="background-color:#fff;" id="fakePreviewSvg"></svg>
262+
263+
<div id="datasetContainer" style="width: 100%">
264+
<div id="sandboxControls" style="width: 100%"><h4>Dataset </h4></div>
265+
266+
<table id="newDataTable">
267+
<!-- <tr> <th>Id</th><th>Category</th><th>x</th><th>y</th></tr>-->
268+
</table>
269+
270+
</div>
271+
262272
<!-- </div>-->
263273
</div>
264274
</div>

0 commit comments

Comments
 (0)