AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cleanup layer view, alert colors, fdm defaults

Browse source
This commit is contained in:
Stewart Allen 2019-01-18 20:41:10 -05:00
commit 39cb525819
4 changed files with 48 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

18
js/kiri.js
View file

@ -264,7 +264,7 @@ self.kiri.license = exports.LICENSE;
// --- FDM --- // --- FDM ---
sliceHeight: 0.25, sliceHeight: 0.25,
sliceShells: 2, sliceShells: 3,
sliceShellSpacing: 1.0, sliceShellSpacing: 1.0,
sliceFillAngle: 45, sliceFillAngle: 45,
sliceFillOverlap: 0.3, sliceFillOverlap: 0.3,
@ -282,7 +282,7 @@ self.kiri.license = exports.LICENSE;
sliceSolidMinArea: 1, sliceSolidMinArea: 1,
sliceSolidLayers: 3, sliceSolidLayers: 3,
sliceBottomLayers: 2, sliceBottomLayers: 3,
sliceTopLayers: 3, sliceTopLayers: 3,
sliceVase: false, sliceVase: false,
@ -299,22 +299,22 @@ self.kiri.license = exports.LICENSE;
outputFeedrate: 80, outputFeedrate: 80,
outputFinishrate: 60, outputFinishrate: 60,
outputSeekrate: 100, outputSeekrate: 100,
outputShellMult: 1.1, outputShellMult: 1.2,
outputFillMult: 1.2, outputFillMult: 1.2,
outputSparseMult: 1.3, outputSparseMult: 1.2,
outputRetractDist: 1.0, outputRetractDist: 1.0,
outputRetractSpeed: 40, outputRetractSpeed: 40,
outputRetractDwell: 30, outputRetractDwell: 30,
outputBrimCount: 2, outputBrimCount: 2,
outputBrimOffset: 2, outputBrimOffset: 2,
outputShortPoly: 15.0, outputShortPoly: 30.0,
outputShortDistance: 0.0, outputShortDistance: 0.0,
outputShortFactor: 0.2, outputShortFactor: 0.2,
outputFinishFactor: 0, outputFinishFactor: 0,
sliceMinHeight: 0, sliceMinHeight: 0,
detectThinWalls: false, detectThinWalls: false,
antiBacklash: 2, antiBacklash: 1,
zHopDistance: 0, zHopDistance: 0.2,
gcodeKFactor: 0, gcodeKFactor: 0,
gcodePauseLayers: "", gcodePauseLayers: "",
outputCooling: true, outputCooling: true,
@ -2156,12 +2156,12 @@ self.kiri.license = exports.LICENSE;
UI.modeArrange.setAttribute("class","buton"); UI.modeArrange.setAttribute("class","buton");
break; break;
case VIEWS.SLICE: case VIEWS.SLICE:
UI.layerView.style.display = 'block'; UI.layerView.style.display = 'flex';
UI.modeSlice.setAttribute("class","buton"); UI.modeSlice.setAttribute("class","buton");
updateSliderMax(); updateSliderMax();
break; break;
case VIEWS.PREVIEW: case VIEWS.PREVIEW:
UI.layerView.style.display = 'block'; UI.layerView.style.display = 'flex';
UI.modePreview.setAttribute("class","buton"); UI.modePreview.setAttribute("class","buton");
break; break;
default: default:

4
web/kiri/index.html
View file

@ -242,14 +242,12 @@
</div> </div>
<!-- layer slider --> <!-- layer slider -->
<div id="layer-view" class="flow-row"> <div id="layer-view" class="flow-row">
<span>
<button id="layer-toggle">layers</button> <button id="layer-toggle">layers</button>
<div id="layers"></div> <div id="layers"></div>
<input id="layer-id" size="4"> <input id="layer-id" size="4">
<input id="layer-slider" type="range"> <input id="layer-slider" type="range">
<button id="layer-range"> section</button> <button id="layer-range">section</button>
<input id="layer-span" size="4" value="1"> <input id="layer-span" size="4" value="1">
</span>
</div> </div>
<!-- alert area --> <!-- alert area -->
<div id="alert-area"> <div id="alert-area">

71
web/kiri/style.css
View file

@ -91,23 +91,23 @@ select {
left: 20%; left: 20%;
right: 20%; right: 20%;
margin: 2px; margin: 2px;
background-color: rgba(200,200,200,0.75); background-color: rgba(200,200,200,0.65);
border: 3px solid rgba(200,200,200,0.5); border: 3px solid rgba(200,200,200,0.5);
border-radius: 5px; border-radius: 5px;
text-align: center; text-align: center;
display: none; display: none;
} }
#progress { #progress {
display: flex;
position: relative; position: relative;
background-color: #f00;
text-align: left; text-align: left;
padding: 5px; background-color: rgba(255,0,0,0.75);
height: 100%; width: 100%;
width: 1%;
} }
#progress > span { #prostatus {
color: white; color: white;
padding-left: 10px; padding: 5px;
margin: 5px;
} }
#modal { #modal {
z-index: 20000; z-index: 20000;
@ -608,45 +608,48 @@ button[import="1"] {
#layer-view { #layer-view {
display: none; display: none;
position: fixed; position: fixed;
left: 0; flex-direction: row;
right: 0; justify-content: center;
align-items: stretch;
bottom: 0; bottom: 0;
height: 25px; left: 20%;
text-align: center; right: 20%;
vertical-align: middle; margin: 0;
} padding: 4px;
#layer-view span {
position: relative;
border-radius: 5px;
padding: 3px 8px 8px 8px;
background-color: rgba(170,221,255,0.75); background-color: rgba(170,221,255,0.75);
color: rgba(0,0,0,0.5); border: 1px solid #ccc;
} border-bottom: 0;
#layer-view input { border-top-left-radius: 5px;
vertical-align: middle; border-top-right-radius: 5px;
} }
#layer-view button { #layer-view button {
position: relative; margin: 0 !important;
margin-left: 1px;
border: 1px solid rgba(255,255,255,0.75); border: 1px solid rgba(255,255,255,0.75);
} }
#layer-view input {
border-width: 1px;
padding: 2px;
}
#layer-view > button,input {
margin-left: 4px !important;
margin-right: 4px !important;
}
#layer-slider { #layer-slider {
border: 0; border: 0;
margin: 0; margin: 0;
padding: 0; padding: 0;
height: 100%; flex-grow: 1;
width: 50%;
} }
#layers { #layers {
display: none; display: none;
position: fixed; position: fixed;
bottom: 25px; bottom: 25px;
background-color: rgba(0,0,0,0.2); background-color: rgba(170,221,255,0.75);
border: 1px solid rgba(0,0,0,0.5); border: 1px solid rgba(0,0,0,0.2);
border-radius: 3px; border-radius: 3px;
padding: 6px; padding: 6px;
-webkit-transform: translate(-10px, 0); -webkit-transform: translate(-9px, -5px);
transform: translate(-10px, 0); transform: translate(-9px, -5px);
} }
#layers label { #layers label {
text-align: left; text-align: left;
@ -679,7 +682,7 @@ button[import="1"] {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
position: fixed; position: fixed;
bottom: 30px; bottom: 40px;
left: 0; left: 0;
right: 0; right: 0;
} }
@ -689,13 +692,13 @@ button[import="1"] {
align-items: center; align-items: center;
min-width: 25%; min-width: 25%;
max-width: 50%; max-width: 50%;
background-color: rgba(255,230,230,0.8); background-color: rgba(230,245,255,0.8);
border: 3px solid rgba(255,200,200,0.5); border: 3px solid rgba(200,215,255,0.6);
border-radius: 5px; border-radius: 5px;
} }
#alert-border:hover { #alert-border:hover {
background-color: rgba(255,230,230,0.9); background-color: rgba(230,245,255,0.9);
border: 3px solid rgba(255,200,200,0.95); border: 3px solid rgba(200,215,255,0.95);
} }
#alert-text { #alert-text {
display: flex; display: flex;

2
web/moto/style.css
View file

@ -39,7 +39,7 @@ button {
} }
button:hover { button:hover {
background-color: #aaa; background-color: #aaa;
font-weight: bold; color: black;
} }
button[load] { button[load] {
width: 100%; width: 100%;