checkpoint device settings work

This commit is contained in:
Stewart Allen 2020-06-06 23:21:42 -04:00
commit 10bd1c94d2
4 changed files with 186 additions and 152 deletions

View file

@ -2,9 +2,8 @@
--fg-gray: #495057;
--bg-gray: rgba(0,0,0,0.25);
}
setpopsetpopa, a:hover, a:visited {
a:hover, a:visited {
border: none;
outline: none;
color: inherit;
text-decoration: none;
}
@ -30,7 +29,6 @@ div {
}
button {
display: flex;
outline: none;
border: 1px solid #ccc;
border-radius: 3px;
background-color: #eee;
@ -57,7 +55,6 @@ input {
}
input:focus {
background-color: #fec;
outline: none;
}
input[disabled] {
background-color: #ccc;
@ -71,15 +68,20 @@ input[type="range"] {
input[type=range]::-moz-focus-outer {
border: 0;
}
select {
select, textarea, button, input, a {
outline: none;
}
select {
border: 1px solid #bbb;
background-color: #eee;
margin-bottom: 1px !important;
background-color: white;
border-radius: 3px;
}
select option[local="1"] {
color: #55d;
}
select option[favorite="1"] {
font-weight: bold;
}
th, tr, td, span, div, label, button {
user-select: none;
}
@ -412,6 +414,54 @@ th, tr, td {
background-color: #bbb;
}
.t-head {
text-align: center;
font-weight: bold;
padding-bottom: 5px;
}
.t-33 {
width: 33%;
}
.t-group {
background-image: linear-gradient(to right, #ddd, #666, #ddd);
white-space: nowrap;
text-align: center;
border-radius: 2px;
padding: 1px 0 2px 0;
margin: 5px 0 5px 0;
color: white;
}
.t-body {
background-color: white;
border: 1px solid #bbb;
border-radius: 3px;
}
.t-inset {
padding: 3px;
}
.t-pad {
width: 5px;
}
.t-pad2 {
width: 10px;
}
#devices {
width: 150px;
}
#device {
width: 225px;
}
#gcode-edit {
width: 225px;
}
#device-action, #tool-action {
margin-top: 5px;
}
#device-action button, #tool-action button {
flex-direction: column;
justify-content: center;
}
#slider {
display: none;
position: absolute;
@ -531,7 +581,14 @@ th, tr, td {
margin-right: 5px;
padding: 5px;
}
.var-row {
white-space: nowrap;
}
.var-row label {
padding: 2px 4px 2px 0;
flex-grow: 1;
}
.table-row {
flex-direction: row;
align-items: stretch;
}

View file

@ -159,49 +159,70 @@
<button id="mode-laser" class="dev-type"><label>LASER</label></button>
</div>
<div class="row">
<div id="devices" class="col"><select id="device-list" size="15"></select></div>
<div id="device" class="col"></div>
<div id="devices" class="t-33 col"><select id="device-list" size="15" class="grow"></select></div>
<div class="t-pad"></div>
<div id="device" class="col t-body t-inset"></div>
<div class="t-pad"></div>
<div id="gcode-edit" class="t-body t-inset col">
<div class="t-group col">gcode editor</div>
<div id="dev-gcode" class="grow"></div>
</div>
</div>
<div id="device-action" class="flow-row">
<div class="grow"></div>
<button id="device-add"><i class="fas fa-plus"></i></button>
<button id="device-del"><i class="fas fa-minus"></i></button>
<div class="t-pad2"></div>
<button id="device-favorites">favorites</button>
<button id="device-all">all</button>
<div class="t-pad2"></div>
<button id="device-save">save</button>
<div class="grow"></div>
</div>
</div>
<div id="mod-files" class="mdialog"></div>
<div id="mod-tools" class="mdialog">
<div class="col">
<div class="row">
<label>tool</label>
<label>detail</label>
<label>view</label>
<div class="row t-head">
<label class="t-33">tool</label>
<div class="t-pad"></div>
<label class="t-33">detail</label>
<div class="t-pad"></div>
<label class="t-33">view</label>
</div>
<div class="row">
<div class="col">
<select id="tool-select" size="15"></select>
<div class="col t-33">
<select id="tool-select" size="10" class="grow"></select>
</div>
<div class="col">
<div class="row"><label>type</label>
<div class="t-pad"></div>
<div class="col t-33 t-body t-inset">
<div class="row var-row"><label>name</label><input id="tool-name" size="15"></input></div>
<div class="row var-row"><label>type</label>
<select id="tool-type">
<option value="endmill" selected>end</option>
<option value="ballmill">ball</option>
<option value="tapermill">taper</option>
</select>
</div>
<div class="row"><label>name</label><input id="tool-name" size="15"></input></div>
<div class="row" title="tool number to use&#010;in gcode commands"><label>tool #</label><input id="tool-num" size="7"></input></div>
<div class="row"><label>metric</label><input id="tool-metric" type="checkbox"></input></div>
<div class="grouphead">shaft</div>
<div class="row" title="shaft diameter in inches&#010;unless metric is checked&#010;then in millimeters"><label>diameter</label><input id="tool-sdiam" size="7"></input></div>
<div class="row" title="shaft length in inches&#010;unless metric is checked&#010;then in millimeters"><label>length</label><input id="tool-slen" size="7"></input></div>
<div class="grouphead">flute</div>
<div class="row" title="flute diameter in inches&#010;unless metric is checked&#010;then in millimeters"><label>diameter</label><input id="tool-fdiam" size="7"></input></div>
<div class="row" title="flute length in inches&#010;unless metric is checked&#010;then in millimeters"><label>length</label><input id="tool-flen" size="7"></input></div>
<div class="grouphead">taper</div>
<div class="row var-row" title="tool number to use&#010;in gcode commands"><label>tool #</label><input id="tool-num" size="7"></input></div>
<div class="row var-row"><label>metric</label><input id="tool-metric" type="checkbox"></input></div>
<div class="t-group col">shaft</div>
<div class="row var-row" title="shaft diameter in inches&#010;unless metric is checked&#010;then in millimeters"><label>diameter</label><input id="tool-sdiam" size="7"></input></div>
<div class="row var-row" title="shaft length in inches&#010;unless metric is checked&#010;then in millimeters"><label>length</label><input id="tool-slen" size="7"></input></div>
<div class="t-group col">flute</div>
<div class="row var-row" title="flute diameter in inches&#010;unless metric is checked&#010;then in millimeters"><label>diameter</label><input id="tool-fdiam" size="7"></input></div>
<div class="row var-row" title="flute length in inches&#010;unless metric is checked&#010;then in millimeters"><label>length</label><input id="tool-flen" size="7"></input></div>
<div class="t-group col">taper</div>
<!-- <div class="flow-row" title="taper angle"><label>angle</label><input id="tool-tangle" size=5></input></div> -->
<div class="row" title="tip width in inches&#010;unless metric is checked&#010;then in millimeters"><label>tip</label><input id="tool-ttip" size="7"></input></div>
<div class="row var-row" title="tip width in inches&#010;unless metric is checked&#010;then in millimeters"><label>tip</label><input id="tool-ttip" size="7"></input></div>
</div>
<div id="tool-view" class="col"></div>
<div class="t-pad"></div>
<div id="tool-view" class="col t-33 t-body"></div>
</div>
<div id="tool-action" class="row">
<button id="tool-add">+</button>
<button id="tool-del">-</button>
<span id="tool-spacer"></span>
<div id="tool-action" class="row j-center">
<button id="tool-add"><i class="fas fa-plus"></i></button>
<button id="tool-del"><i class="fas fa-minus"></i></button>
<div class="t-pad2"></div>
<button id="tools-save">save</button>
<button id="tools-close">done</button>
</div>
@ -237,7 +258,7 @@
<div id="end" class="col a-center">
<div id="progress"><div id="progbar"><div id="progtxt">loading</div></div></div>
<div id="bottom">
<div id="layers">layers</div>
<div id="layers"></div>
</div>
<div id="alert-area">
<div id="alert-border">