fix output dialogs. add slider min/max shortcuts
This commit is contained in:
Stewart Allen
parent
7fed16a47c
commit
2f0eb9dbf8
11 changed files with 221 additions and 102 deletions
|
|
@ -125,6 +125,9 @@ th, tr, td {
|
|||
.a-end {
|
||||
align-items: flex-end;
|
||||
}
|
||||
.a-stretch {
|
||||
align-items: stretch;
|
||||
}
|
||||
.j-start {
|
||||
justify-content: flex-start;
|
||||
}
|
||||
|
|
@ -486,6 +489,78 @@ th, tr, td {
|
|||
bottom: -20px;
|
||||
right: 5px;
|
||||
}
|
||||
#mod-print {
|
||||
background-color: rgba(255,255,255,0.85);
|
||||
}
|
||||
#mod-print .grow button {
|
||||
margin-left: 5px;
|
||||
}
|
||||
#mod-print .hint {
|
||||
color: #345;
|
||||
font-size: 12px;
|
||||
font-style: italic;
|
||||
text-align: center;
|
||||
font-weight: normal;
|
||||
padding-top: 5px;
|
||||
}
|
||||
#mod-print .box {
|
||||
background-color: rgba(255,255,255,0.5);
|
||||
border: 1px solid #bbb;
|
||||
border-radius: 3px;
|
||||
padding: 20px 10px 10px 10px;
|
||||
}
|
||||
#mod-print .box select {
|
||||
min-width: 10em;
|
||||
}
|
||||
#mod-print .header {
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
transform: translateY(50%);
|
||||
z-index: 10;
|
||||
}
|
||||
#mod-print .header label {
|
||||
background-color: white;
|
||||
padding: 0 10px 0 10px;
|
||||
border-radius: 5px;
|
||||
border-right: 1px solid #bbb;
|
||||
border-left: 1px solid #bbb;
|
||||
}
|
||||
#mod-print a {
|
||||
text-decoration: underline;
|
||||
}
|
||||
#mod-print a:hover {
|
||||
color: #567;
|
||||
background-color: #ddd;
|
||||
}
|
||||
#mod-print label {
|
||||
flex-grow: 1;
|
||||
font-weight: bold;
|
||||
padding-right: 10px;
|
||||
}
|
||||
#mod-print button {
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
min-height: 2em;
|
||||
}
|
||||
#print-canvas {
|
||||
width: 180px;
|
||||
height: 320px;
|
||||
border: 1px solid #ccc;
|
||||
background-color: #f5f5f5;
|
||||
transform: scale(-1, 1);
|
||||
}
|
||||
#print-layer {
|
||||
font-family: 'Russo One', sans-serif;
|
||||
font-size: small;
|
||||
width: 5em;
|
||||
padding: 0 !important;
|
||||
text-align: right;
|
||||
}
|
||||
#print-download {
|
||||
min-height: 4em !important;
|
||||
}
|
||||
.mod-end {
|
||||
height: 10px;
|
||||
border-bottom-left-radius: 10px;
|
||||
|
|
@ -637,6 +712,17 @@ th, tr, td {
|
|||
bottom: 10px;
|
||||
width: 50px;
|
||||
}
|
||||
#slider-hi-val, #slider-lo-val {
|
||||
display: none;
|
||||
position: absolute;
|
||||
font-family: monospace;
|
||||
transform: translateY(-50%);
|
||||
background-color: rgba(255,255,255,0.5);
|
||||
border: 1px solid #ddd;
|
||||
border-radius: 3px;
|
||||
right: 110%;
|
||||
top: 50%;
|
||||
}
|
||||
#slider > div {
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
|
|
@ -651,6 +737,7 @@ th, tr, td {
|
|||
background-image: var(--holdbar);
|
||||
}
|
||||
#slider-zero {
|
||||
z-index: 10;
|
||||
margin-top: 3px;
|
||||
background-color: #ccc;
|
||||
border-bottom-left-radius: 10px;
|
||||
|
|
|
|||
|
|
@ -289,8 +289,8 @@
|
|||
</div>
|
||||
</div>
|
||||
<div id="mod-prefs" class="mdialog col"></div>
|
||||
<div id="mod-local" class="mdialog"></div>
|
||||
<div id="mod-print" class="mdialog"></div>
|
||||
<div id="mod-local" class="mdialog col"></div>
|
||||
<div id="mod-print" class="mdialog col"></div>
|
||||
<!-- hidden file input loader -->
|
||||
<input id="load-file" type="file" name="loadme" style="display:none" accept=".stl,.gcode,.nc"/>
|
||||
<div class="mod-end"></div></div>
|
||||
|
|
@ -306,9 +306,9 @@
|
|||
<div id="slider-max">∞</div>
|
||||
<div id="slider-center" class="grow">
|
||||
<div id="slider-hold" class="col xa-center">
|
||||
<div id="slider-hi" class="handle"></div>
|
||||
<div id="slider-hi" class="handle"><div id="slider-hi-val"></div></div>
|
||||
<div id="slider-mid"> </div>
|
||||
<div id="slider-lo" class="handle"></div>
|
||||
<div id="slider-lo" class="handle"><div id="slider-lo-val"></div></div>
|
||||
</div>
|
||||
</div>
|
||||
<div id="slider-zero">0</div>
|
||||
|
|
|
|||
|
|
@ -1,68 +1,57 @@
|
|||
<button id="print-close" class="modal-x">X</button>
|
||||
|
||||
<span id="print-title">output options</span>
|
||||
|
||||
<div>
|
||||
<table id="print-info">
|
||||
<tr><th>file name</th><td><input id="print-filename" size="30" spellcheck="false" /></td></tr>
|
||||
<tr><th>file size (bytes)</th><td><input id="print-filesize" size="12" disabled="true" /></td></tr>
|
||||
<tr id="mill-info"><th>time estimate (h:m:s)</th><td><input id="mill-time" size="12" disabled="true" /></td></tr>
|
||||
</table>
|
||||
<div class="header"><label>export</label></div>
|
||||
<div id="print-info" class="col box">
|
||||
<div><label>file name</label><input id="print-filename" size="20" spellcheck="false" /></div>
|
||||
<div><label>file size (bytes)</label><input id="print-filesize" size="12" disabled="true" /></div>
|
||||
<div><label>time estimate (h:m:s)</label><input id="output-time" size="12" disabled="true" /></div>
|
||||
</div>
|
||||
|
||||
<div id="print-filament-row">
|
||||
<table>
|
||||
<tr><th>filament used (mm)</th><td><input id="print-filament" size="12" disabled="true" /></td></tr>
|
||||
<tr><th>filament density (g/cm^3)</th><td><input id="print-density" size="12" value="1.25" /></td></tr>
|
||||
<tr><th>printed weight (g)</th><td><input id="print-weight" size="12" disabled="true" /></td></tr>
|
||||
<tr><th>time estimate (h:m:s)</th><td><input id="print-time" size="12" disabled="true" /></td></tr>
|
||||
</table>
|
||||
<div id="print-filament-head" class="header"><label>filament</label></div>
|
||||
<div id="print-filament-info" class="col box">
|
||||
<div><label>filament density (g/cm^3)</label><input id="print-density" size="12" value="1.25" /></div>
|
||||
<div><label>filament used (mm)</label><input id="print-filament" size="12" disabled="true" /></div>
|
||||
<div><label>printed weight (g)</label><input id="print-weight" size="12" disabled="true" /></div>
|
||||
</div>
|
||||
|
||||
<div class="print-sel print-gcode flex frow">
|
||||
<span><label>gcode</label></span>
|
||||
<button id="print-download" class="fgro">download</button>
|
||||
<div class="header"><label>gcode</label></div>
|
||||
<div class="row box">
|
||||
<button id="print-download" class="grow">download</button>
|
||||
</div>
|
||||
|
||||
<div class="print-sel flex frow" id="send-to-octoprint">
|
||||
<span><label>octoprint</label></span>
|
||||
<div>
|
||||
<table>
|
||||
<tr id="ophost"><th>host</th><td><input id="octo-host" size="35" placeholder="http(s)://host:port" /></td></tr>
|
||||
<tr id="opapik"><th>key</th><td><input id="octo-apik" size="35" /></td></tr>
|
||||
<tr id="ophint"><td colspan="2">
|
||||
<span id="octo-hint">
|
||||
<a href="http://docs.octoprint.org/en/master/api/general.html?highlight=cors#cross-origin-requests" target="_help">CORS support</a>
|
||||
must be enabled in API settings
|
||||
</span>
|
||||
</td></tr>
|
||||
</table>
|
||||
<div id="send-to-octohead" class="header"><label>octoprint</label></div>
|
||||
<div id="send-to-octoprint" class="col box">
|
||||
<div class="grow row">
|
||||
<div class="col grow">
|
||||
<div id="ophost"><label>host</label><input id="octo-host" size="20" placeholder="http(s)://host:port" /></div>
|
||||
<div id="opapik"><label>key</label><input id="octo-apik" size="20" /></div>
|
||||
</div>
|
||||
<button id="print-octoprint">send</button>
|
||||
</div>
|
||||
<button id="print-octoprint" class="print-send">send</button>
|
||||
<div id="ophint"><label class="hint"><a href="http://docs.octoprint.org/en/master/api/general.html?highlight=cors#cross-origin-requests" target="_help">CORS support</a> must be enabled in API settings</label></div>
|
||||
</div>
|
||||
|
||||
<div class="print-sel flex frow" id="send-to-gridhost">
|
||||
<span><label>grid:host</label></span>
|
||||
<div>
|
||||
<table>
|
||||
<tr><th>host</th><td><input id="grid-host" size="35" placeholder="http(s)://host:port" /></td></tr>
|
||||
<tr id="gpapik"><th>api key</th><td><input id="grid-apik" size="35" /></td></tr>
|
||||
<tr><th>target</th><td><select id="grid-target"></select></td></tr>
|
||||
<tr><td colspan="2"><span id="grid-hint">setup <a href="https://github.com/GridSpace/grid-host" target="_help">grid:host</a> for your network</span></td></tr>
|
||||
</table>
|
||||
<div class="header"><label>grid:host</label></div>
|
||||
<div id="send-to-gridhost" class="col box">
|
||||
<div class="grow row">
|
||||
<div class="col grow">
|
||||
<div><label>host</label><input id="grid-host" size="20" placeholder="http(s)://host:port" /></div>
|
||||
<div id="gpapik"><label>api key</label><input id="grid-apik" size="20" /></div>
|
||||
<div><label>target</label><select id="grid-target"></select></div>
|
||||
</div>
|
||||
<button id="print-gridhost">send</button>
|
||||
</div>
|
||||
<button id="print-gridhost" class="print-send">send</button>
|
||||
<div><label class="hint">setup <a href="https://github.com/GridSpace/grid-host" target="_help">grid:host</a> for your network</label></div>
|
||||
</div>
|
||||
|
||||
<div class="print-sel flex frow" id="send-to-gridspool">
|
||||
<span><label>grid:local</label></span>
|
||||
<div>
|
||||
<table>
|
||||
<tr><th>target</th><td width="100%"><select id="grid-local"></select></td></tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="flex fcol print-send">
|
||||
<button id="print-gridlocal">send</button>
|
||||
<button id="admin-gridlocal">admin</button>
|
||||
<div id="send-to-gridhead" class="header noshow"><label>grid:local</label></div>
|
||||
<div id="send-to-gridspool" class="row box noshow">
|
||||
<div class="grow row">
|
||||
<div class="grow a-center j-center">
|
||||
<label>target</label>
|
||||
<select id="grid-local"></select>
|
||||
</div>
|
||||
<div class="col">
|
||||
<button id="print-gridlocal">send</button>
|
||||
<button id="admin-gridlocal">admin</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,18 +1,12 @@
|
|||
<button id="print-close" class="modal-x">X</button>
|
||||
|
||||
<span>output options</span>
|
||||
|
||||
<div>
|
||||
<table id="print-info">
|
||||
<tr><th>file name</th><td><input id="print-filename" size="30" spellcheck="false" /></td></tr>
|
||||
<tr><th>segments</th><td><input id="print-lines" size="12" disabled="true" /></td></tr>
|
||||
</table>
|
||||
<div class="header"><label>export</label></div>
|
||||
<div id="print-info" class="col box">
|
||||
<div><label>file name</label><input id="print-filename" size="20" spellcheck="false" /></div>
|
||||
<div><label>segments</label><input id="print-lines" size="12" disabled="true" /></div>
|
||||
</div>
|
||||
|
||||
<div class="print-sel">
|
||||
<table>
|
||||
<tr><th><button id="print-svg">download as svg</button></th></tr>
|
||||
<tr><th><button id="print-dxf">download as dxf</button></th></tr>
|
||||
<tr><th><button id="print-lg">download as gcode</button></th></tr>
|
||||
</table>
|
||||
<div class="header"><label>download</label></div>
|
||||
<div class="row box">
|
||||
<button id="print-svg" class="grow">svg</button>
|
||||
<button id="print-dxf" class="grow">dxf</button>
|
||||
<button id="print-lg" class="grow">gcode</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,22 +1,20 @@
|
|||
<button id="print-close" class="modal-x">X</button>
|
||||
|
||||
<span>output options</span>
|
||||
|
||||
<div>
|
||||
<table id="print-info">
|
||||
<tr><th>file name</th><td><input id="print-filename" size="30" spellcheck="false" /></td></tr>
|
||||
<tr><th>print layers</th><td><input id="print-layers" size="10" spellcheck="false" /></td></tr>
|
||||
<tr><th>print time</th><td><input id="print-time" size="10" spellcheck="false" /></td></tr>
|
||||
</table>
|
||||
<div class="header"><label>export</label></div>
|
||||
<div id="print-info" class="col box">
|
||||
<div><label>file name</label><input id="print-filename" size="20" spellcheck="false" /></div>
|
||||
<div><label>print layers</label><input id="print-layers" size="10" spellcheck="false" /></div>
|
||||
<div><label>print time</label><input id="print-time" size="10" spellcheck="false" /></div>
|
||||
</div>
|
||||
|
||||
<div class="print-sel">
|
||||
<table>
|
||||
<tr><th><button id="print-photon">download</button></th></tr>
|
||||
</table>
|
||||
<div class="header"><label>download</label></div>
|
||||
<div class="row box">
|
||||
<button id="print-photon" class="grow">download</button>
|
||||
</div>
|
||||
|
||||
<div class="print-sel">
|
||||
<input id="print-range" type="range"><label id="print-layer"></label>
|
||||
<div class="header"><label>preview</label></div>
|
||||
<div class="col box a-center j-center">
|
||||
<div class="row a-center j-center">
|
||||
<input id="print-range" type="range" class="grow">
|
||||
<label id="print-layer"></label>
|
||||
</div>
|
||||
<canvas id="print-canvas" width="1440" height="2560"></canvas>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue