Skip to content

Commit aa68288

Browse files
hudbroghudbrog
committed
Refactoring, layer info moved to control from tooltip.
1 parent 360426d commit aa68288

15 files changed

+322
-365
lines changed

‎bootstrap.html

+31-17
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<link rel="stylesheet" type="text/css" href="css/cupertino/jquery-ui-1.9.0.custom.css" media="screen" />
66
<link rel="stylesheet" type="text/css" href="css/bootstrap.css" media="screen" />
77
<link rel="stylesheet" type="text/css" href="css/style.css" media="screen" />
8-
<script type="text/javascript" src="js/jquery-1.8.2.js"></script>
9-
<script type="text/javascript" src="js/jquery-ui-1.9.0.custom.js"></script>
8+
<script type="text/javascript" src="lib/jquery-1.8.2.js"></script>
9+
<script type="text/javascript" src="lib/jquery-ui-1.9.0.custom.js"></script>
1010

11-
<script type="text/javascript" src="js/three.js"></script>
12-
<script type="text/javascript" src="js/bootstrap.js"></script>
13-
<script type="text/javascript" src="js/modernizr.custom.09684.js"></script>
14-
<script type="text/javascript" src="js/TrackballControls.js"></script>
15-
<script type="text/javascript" src="js/misc.js"></script>
11+
<script type="text/javascript" src="lib/three.js"></script>
12+
<script type="text/javascript" src="lib/bootstrap.js"></script>
13+
<script type="text/javascript" src="lib/modernizr.custom.09684.js"></script>
14+
<script type="text/javascript" src="lib/TrackballControls.js"></script>
15+
<script type="text/javascript" src="js/ui.js"></script>
1616
<script type="text/javascript" src="js/gCodeReader.js"></script>
1717
<script type="text/javascript" src="js/renderer.js"></script>
1818
<script type="text/javascript" src="js/renderer3d.js"></script>
@@ -27,7 +27,7 @@
2727

2828
<div id="wrap" class="ui-widget ui-widget-content ui-corner-all">
2929
<div id="control">
30-
<center><h3>GCode<br>Visual Analyzer</h3></center>
30+
<center><img src="img/logo.png" /></center>
3131

3232
<div id="accordion2" class="accordion">
3333
<div class="accordion-group">
@@ -73,7 +73,19 @@
7373
</div>
7474
<div id="infoAccordionTab" class="accordion-body collapse">
7575
<div class="accordion-inner">
76-
<output id="list"></output>
76+
<p id="list"></p>
77+
</div>
78+
</div>
79+
</div>
80+
<div class="accordion-group">
81+
<div class="accordion-heading">
82+
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#layerAccordionTab">
83+
Layer Info
84+
</a>
85+
</div>
86+
<div id="layerAccordionTab" class="accordion-body collapse">
87+
<div class="accordion-inner">
88+
<p id="layerInfo"></p>
7789
</div>
7890
</div>
7991
</div>
@@ -85,9 +97,9 @@
8597
</div>
8698
<div id="options2DAccordionTab" class="accordion-body collapse">
8799
<div class="accordion-inner">
88-
<input type="checkbox" id="showMovesCheckbox" value="1" onclick="GCODE.miscObject.processOptions()" checked>Show non-extrusion moves</input><br>
89-
<input type="checkbox" id="showRetractsCheckbox" value="2" onclick="GCODE.miscObject.processOptions()" checked>Show retracts and restarts</input><br>
90-
<input type="checkbox" id="moveModelCheckbox" value="3" onclick="GCODE.miscObject.processOptions()" disabled>Move model to the center of the grid</input><br>
100+
<input type="checkbox" id="showMovesCheckbox" value="1" onclick="GCODE.ui.processOptions()" checked>Show non-extrusion moves</input><br>
101+
<input type="checkbox" id="showRetractsCheckbox" value="2" onclick="GCODE.ui.processOptions()" checked>Show retracts and restarts</input><br>
102+
<input type="checkbox" id="moveModelCheckbox" value="3" onclick="GCODE.ui.processOptions()" disabled>Move model to the center of the grid</input><br>
91103
</div>
92104
</div>
93105
</div>
@@ -101,19 +113,21 @@
101113
<div id="analyzeOptionsAccordioinTab" class="accordion-body collapse">
102114
<div class="accordion-inner">
103115
These require re-analyzing file:<br>
104-
<input type="checkbox" id="sortLayersCheckbox" value="4" onclick="GCODE.miscObject.processOptions()" checked>Sort layers by Z</input><br>
105-
<input type="checkbox" id="purgeEmptyLayersCheckbox" value="5" onclick="GCODE.miscObject.processOptions()" checked>Hide empty layers</input><br>
106-
<input type="checkbox" id="analyzeModelCheckbox" value="6" onclick="GCODE.miscObject.processOptions()" checked>Analyze size and filament usage</input><br>
116+
<input type="checkbox" id="sortLayersCheckbox" value="4" onclick="GCODE.ui.processOptions()" checked>Sort layers by Z</input><br>
117+
<input type="checkbox" id="purgeEmptyLayersCheckbox" value="5" onclick="GCODE.ui.processOptions()" checked>Hide empty layers</input><br>
118+
<input type="checkbox" id="analyzeModelCheckbox" value="6" onclick="GCODE.ui.processOptions()" checked>Analyze size and filament usage</input><br>
107119
</div>
108120
</div>
109121
</div>
110122

111123
</div>
124+
<output id="errorList"></output>
125+
112126

113127
</div>
114128
<div id="gcode">
115129
<div id="tabs-min" class="tabbable">
116-
<ul class="nav nav-tabs">
130+
<ul id="myTab" class="nav nav-tabs">
117131
<li class="active"><a href="#tab2d" data-toggle="tab">2D</a></li>
118132
<li class=""><a href="#tab3d" data-toggle="tab">3D</a></li>
119133
</ul>
@@ -131,7 +145,7 @@
131145
</div>
132146
</div>
133147
<script>
134-
window.onload = GCODE.miscObject.initHandlers;
148+
window.onload = GCODE.ui.initHandlers;
135149
</script>
136150

137151
</body>

‎img/logo.png

43.2 KB
Loading

‎index.html

+13-13
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<title></title>
55
<link rel="stylesheet" type="text/css" href="css/cupertino/jquery-ui-1.9.0.custom.css" media="screen" />
66
<link rel="stylesheet" type="text/css" href="css/style.css" media="screen" />
7-
<script type="text/javascript" src="js/jquery-1.8.2.js"></script>
8-
<script type="text/javascript" src="js/jquery-ui-1.9.0.custom.js"></script>
9-
<script type="text/javascript" src="js/three.js"></script>
10-
<script type="text/javascript" src="js/modernizr.custom.09684.js"></script>
11-
<script type="text/javascript" src="js/TrackballControls.js"></script>
12-
<script type="text/javascript" src="js/misc.js"></script>
7+
<script type="text/javascript" src="lib/jquery-1.8.2.js"></script>
8+
<script type="text/javascript" src="lib/jquery-ui-1.9.0.custom.js"></script>
9+
<script type="text/javascript" src="lib/three.js"></script>
10+
<script type="text/javascript" src="lib/modernizr.custom.09684.js"></script>
11+
<script type="text/javascript" src="lib/TrackballControls.js"></script>
12+
<script type="text/javascript" src="js/ui.js"></script>
1313
<script type="text/javascript" src="js/gCodeReader.js"></script>
1414
<script type="text/javascript" src="js/renderer.js"></script>
1515
<script type="text/javascript" src="js/renderer3d.js"></script>
@@ -69,16 +69,16 @@ <h3>Model info</h3>
6969
<!--<div id="accordion">-->
7070
<h3>2D Render options</h3>
7171
<div>
72-
<input type="checkbox" id="showMovesCheckbox" value="1" onclick="GCODE.miscObject.processOptions()" checked>Show non-extrusion moves</input><br>
73-
<input type="checkbox" id="showRetractsCheckbox" value="2" onclick="GCODE.miscObject.processOptions()" checked>Show retracts and restarts</input><br>
74-
<input type="checkbox" id="moveModelCheckbox" value="3" onclick="GCODE.miscObject.processOptions()" disabled>Move model to the center of the grid</input><br>
72+
<input type="checkbox" id="showMovesCheckbox" value="1" onclick="GCODE.ui.processOptions()" checked>Show non-extrusion moves</input><br>
73+
<input type="checkbox" id="showRetractsCheckbox" value="2" onclick="GCODE.ui.processOptions()" checked>Show retracts and restarts</input><br>
74+
<input type="checkbox" id="moveModelCheckbox" value="3" onclick="GCODE.ui.processOptions()" disabled>Move model to the center of the grid</input><br>
7575
</div>
7676
<h3>GCode analyzer options</h3>
7777
<div>
7878
These require re-analyzing file:<br>
79-
<input type="checkbox" id="sortLayersCheckbox" value="4" onclick="GCODE.miscObject.processOptions()" checked>Sort layers by Z</input><br>
80-
<input type="checkbox" id="purgeEmptyLayersCheckbox" value="5" onclick="GCODE.miscObject.processOptions()" checked>Hide empty layers</input><br>
81-
<input type="checkbox" id="analyzeModelCheckbox" value="6" onclick="GCODE.miscObject.processOptions()" checked>Analyze size and filament usage</input><br>
79+
<input type="checkbox" id="sortLayersCheckbox" value="4" onclick="GCODE.ui.processOptions()" checked>Sort layers by Z</input><br>
80+
<input type="checkbox" id="purgeEmptyLayersCheckbox" value="5" onclick="GCODE.ui.processOptions()" checked>Hide empty layers</input><br>
81+
<input type="checkbox" id="analyzeModelCheckbox" value="6" onclick="GCODE.ui.processOptions()" checked>Analyze size and filament usage</input><br>
8282
</div>
8383
<!--</div>-->
8484
<!--<div id="options">-->
@@ -108,7 +108,7 @@ <h3>GCode analyzer options</h3>
108108
</div>
109109

110110
<script>
111-
window.onload = GCODE.miscObject.initHandlers;
111+
window.onload = GCODE.ui.initHandlers;
112112
</script>
113113
</body>
114114
</html>

0 commit comments

Comments
 (0)