Skip to content

Commit 0fb1ace

Browse files
committed
Fixed relationship issue, merge code for updating
1 parent 6bfd40c commit 0fb1ace

File tree

7 files changed

+315
-527
lines changed

7 files changed

+315
-527
lines changed

.idea/workspace.xml

Lines changed: 128 additions & 107 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<link href="styles/jquery-ui.css" rel="stylesheet" type="text/css"/>
4848

4949
<!--✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ Slider ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿ ✿-->
50-
<svg width="360px" height="375px" class="cp" id="cp">
50+
<svg width="360px" height="377px" class="cp" id="cp">
5151
<text y="15px" font-weight="600">Control Panel</text>
5252
</svg>
5353
<div id="menu" class="holderCP" style="display: inline-block">
@@ -82,7 +82,7 @@
8282
<img class="flow" style="left: 68px; width: 33px; height: 23px" src="images/flow.png">
8383
<label class="switch flow" style="left: 105px;">
8484
<input type="checkbox" id="flow"
85-
onclick="submitInput(updateData)">
85+
onclick="submitInput(draw)">
8686

8787
<span class="toggle round"></span>
8888
</label>
@@ -91,7 +91,7 @@
9191
<img class="angleVariance" style="top: 302px;left: 278px;width: 32px; height: 35px" src="images/av.png">
9292
<label class="switch angleVariance" style="left: 315px">
9393
<input type="checkbox" id="av"
94-
onclick="submitInput(updateData)">
94+
onclick="submitInput(draw)">
9595
<span class="toggle round"></span>
9696
</label>
9797

@@ -100,7 +100,7 @@
100100
<input type="checkbox" id="rel" onclick="showRelationship()">
101101
<span class="toggle round"></span>
102102
</label>
103-
<input class="submit" onclick="submitInput(updateData)" type="button" value="Submit"><br>
103+
<input class="submit" onclick="submitInput(draw)" type="button" value="Submit"><br>
104104
<input class="computeMetric" onclick="computeMetric()" type="button" value="Compute measurements"><br>
105105
</div>
106106
<script src="./javascripts/init.js"></script>

javascripts/init.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
const initWidth = 1500,
2-
initHeight = 550,
3-
initMinFont = 14,
4-
initMaxFont = 36,
1+
const initWidth = 1400,
2+
initHeight = 660,
3+
initMinFont = 15,
4+
initMaxFont = 35,
55
initFlag = "none";// none / fa/ f / a
66

77
var initTop = 15;
@@ -12,11 +12,11 @@ var globalWidth = initWidth,
1212
globalMaxFont = initMaxFont,
1313
globalFlag = initFlag,
1414
globalTop = initTop,
15-
globalData;
15+
globalData,
16+
isRel = document.getElementById("rel").checked;
1617

1718
var allW;
1819

19-
var mainGroup, axisGroup, xGridlinesGroup, opacScale, legendGroup, opacity, layerPath, maxFreq;
2020

2121
const color = d3.scale.category10();
2222
const axis = d3.svg.axis().ticks(4);

0 commit comments

Comments
 (0)