Skip to content

Commit 72bf06d

Browse files
committed
Merged line and rectangle rendering methods; made necessary adjustments to get them working together
2 parents 936dfc9 + 1aed15e commit 72bf06d

File tree

10 files changed

+1294
-762
lines changed

10 files changed

+1294
-762
lines changed

app/index.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
3131
<![endif]-->
3232

33-
<div id="scatter" style="width:100%;height:60%;position: relative;"></div>
33+
<div id="scatter" style="width:100%;height:100%;position: relative;"></div>
3434
<div id="histograms" style="width:100%;height:38%;position: relative;margin-left: -30px;"></div>
3535

3636
<div style="position:absolute; left:50%; top:0px;">
@@ -53,6 +53,7 @@
5353
<script src="bower_components/sass-bootstrap/dist/js/bootstrap.min.js"></script>
5454
<script src="bower_components/d3/d3.min.js"></script>
5555
<script src="bower_components/underscore/underscore-min.js"></script>
56+
<script src="bower_components/plotty/dist/plotty.min.js"></script>
5657

5758
<!-- Dependencies to get saveAs functionality kind of working in Safari-->
5859
<script src="bower_components/Blob.js/Blob.js"></script>

app/scripts/main.js

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

0 commit comments

Comments
 (0)