Merge remote-tracking branch 'refs/remotes/origin/gh-pages' into dev

lautr3k · 0e790b172e81302a09285d2e7420e26266e3794a · lautr3k committed Aug 6, 2016 · Aug 6, 2016 · 0e790b1
2 parents 503f8d4 + b735d12
commit 0e790b172e81302a09285d2e7420e26266e3794a
Unified Split

Showing with 253 additions and 34 deletions.

+3 −8 README.md

+1 −0 css/main.css

+32 −1 index.html

+194 −23 js/main.js

+23 −2 viewer2d.html
diff --git a/README.md b/README.md
@@ -4,21 +4,16 @@
 # Main features
 - Browse or drag/drop STL file.
 - Mesh information: size, volume, cost, etc...
-- Mesh transformation: scale, rotate.
+- Mesh transformation: scale, rotate, mirror.
 - Live slicing in 2D/3D viewer.
 - Speed mode (slicing only, no delay).
 - Open 2D viewer in new window (popup).
 - Configure slice height, speed, delays.
-- Export slices as PNG (zipped folder).
+- Export slices as PNG or SVG.
+- Export project settings as JSON.
 - Configure build volume size (in or mm).
 - Configure output images size and resolution.
 - Configure resin price and density for cost calculation.
 - Configure mesh and slice colors in 3D viewer.
 - Persistent settings between session (local storage).
 - Move and collapse sidebar panels.
-
-# To do soon
-- Network communication (SmoothieBoard).
-- Serial communication (Chrome only).
-- Export slices as SVG, DXF (zipped folder).
-- Refactoring.
diff --git a/css/main.css b/css/main.css
@@ -3,6 +3,7 @@
     margin: 0;
 }
 
+
 /* Sidebar */
 #sidebar {
     position: fixed;
diff --git a/index.html b/index.html
@@ -148,24 +148,55 @@ <h3 class="panel-title">Mesh</h3>
                         <h3 class="panel-title">Slicer</h3>
                     </div>
                     <div id="slicer-body" class="panel-body collapse in">
+
                         <div class="info">
                             <span class="info-label">Layers <small>(current / total)</small></span>
                             <span class="info-value">
                                 <span id="slicer-layer-value">0</span> / <span id="slicer-layers-value">0</span>
                             </span>
                         </div>
+
+                        <hr />
+
                         <div class="form-group">
                             <label for="slicer-layers-height">Layers height <small>(μm)</small></label>
                             <input type="number" id="slicer-layers-height" class="form-control input-sm" placeholder="100" min="1" />
                         </div>
                         <div class="form-group">
-                            <label for="slicer-light-on">Light on delay <small>(ms)</small></label>
+                            <label for="slicer-light-on">Exposure time <small>(ms)</small></label>
                             <input type="number" id="slicer-light-on" class="form-control input-sm" placeholder="1000" min="1" />
                         </div>
+
+                        <div class="form-group clearfix">
+                            <label for="slicer-lifting-height">Lifting height <small>(mm)</small></label>
+                            <input type="number" id="slicer-lifting-height" class="form-control input-sm" placeholder="3" min="1" />
+                        </div>
+                        <div class="form-group clearfix">
+                            <label for="slicer-lifting-speed">Lifting speed <small>(mm/min)</small></label>
+                            <input type="number" id="slicer-lifting-speed" class="form-control input-sm" placeholder="50" min="1" />
+                        </div>
+
+                        <hr />
+
                         <div class="form-group">
+                            <label for="slicer-mirror">Mirror output</label>
+                            <input type="radio" name="slicer-mirror" id="slicer-mirror-yes" value="yes" /> yes
+                            <input type="radio" name="slicer-mirror" id="slicer-mirror-no" value="no" checked="checked" /> no
+                        </div>
+
+                        <div class="form-group">
+                            <label for="slicer-image-extension">Output type</label>
+                            <input type="radio" name="slicer-image-extension" id="slicer-image-extension-png" value="png" checked="checked" /> png
+                            <input type="radio" name="slicer-image-extension" id="slicer-image-extension-svg" value="svg" /> svg
+                        </div>
+
+                        <hr />
+
+                        <div class="form-group hidden">
                             <label for="slicer-light-off">Light off delay <small>(ms)</small></label>
                             <input type="number" id="slicer-light-off" class="form-control input-sm" placeholder="500" min="1" />
                         </div>
+
                         <div class="form-group">
                             <label for="slicer-make-zip">Make ZIP file</label>
                             <input type="radio" name="slicer-make-zip" id="slicer-make-zip-yes" value="yes" /> yes