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

fix cam origin top. set slice complete mark before firing event

Browse source
This commit is contained in:
Stewart Allen 2020-11-17 13:45:46 -05:00
commit 75b9a6ac4c
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

3
notes.md
View file

@ -1,7 +1,8 @@
# Kiri:Moto todo # Kiri:Moto todo
## 2.3 remaining ## 2.3 remaining
* cnc path routing collisions with two or more parts * deprecate cam device origin settings
* gcode render broken when layer hints disabled
* cap path ends * cap path ends
* onshape mouse mapping option * onshape mouse mapping option

7
src/kiri/init.js
View file

@ -684,9 +684,6 @@
} }
} }
if (mode === 'CAM') {
proc.camOriginTop = dev.outputOriginTop;
}
// disable editing for non-local devices // disable editing for non-local devices
[ [
UI.deviceName, UI.deviceName,
@ -698,7 +695,6 @@
UI.maxHeight, UI.maxHeight,
UI.extrudeAbs, UI.extrudeAbs,
UI.deviceOrigin, UI.deviceOrigin,
UI.deviceOriginTop,
UI.deviceRound, UI.deviceRound,
UI.gcodeFan, UI.gcodeFan,
UI.gcodeTrack, UI.gcodeTrack,
@ -1364,8 +1360,7 @@
bedDepth: UC.newInput(LANG.dv_bedd_s, {title:LANG.dv_bedd_l, convert:UC.toFloat, size:6, units:true}), bedDepth: UC.newInput(LANG.dv_bedd_s, {title:LANG.dv_bedd_l, convert:UC.toFloat, size:6, units:true}),
maxHeight: UC.newInput(LANG.dv_bedh_s, {title:LANG.dv_bedh_l, convert:UC.toFloat, size:6, modes:FDM_SLA}), maxHeight: UC.newInput(LANG.dv_bedh_s, {title:LANG.dv_bedh_l, convert:UC.toFloat, size:6, modes:FDM_SLA}),
spindleMax: UC.newInput(LANG.dv_spmx_s, {title:LANG.dv_spmx_l, convert:UC.toInt, size: 6, modes:CAM}), spindleMax: UC.newInput(LANG.dv_spmx_s, {title:LANG.dv_spmx_l, convert:UC.toInt, size: 6, modes:CAM}),
deviceOrigin: UC.newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l, modes:GCODE}), deviceOrigin: UC.newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l, modes:FDM_LASER_SLA}),
deviceOriginTop: UC.newBoolean(LANG.dv_orgt_s, onBooleanClick, {title:LANG.dv_orgt_l, modes:CAM}),
deviceRound: UC.newBoolean(LANG.dv_bedc_s, onBooleanClick, {title:LANG.dv_bedc_l, modes:FDM}), deviceRound: UC.newBoolean(LANG.dv_bedc_s, onBooleanClick, {title:LANG.dv_bedc_l, modes:FDM}),
extruder: UC.newGroup(LANG.dv_gr_ext, $('device'), {group:"dext", inline:true, modes:FDM}), extruder: UC.newGroup(LANG.dv_gr_ext, $('device'), {group:"dext", inline:true, modes:FDM}),

4
src/kiri/main.js
View file

@ -750,13 +750,13 @@
widget.setColor(color.deselected); widget.setColor(color.deselected);
// on the last exit, update ui and call the callback // on the last exit, update ui and call the callback
if (--countdown === 0 || error || errored) { if (--countdown === 0 || error || errored) {
// mark slicing complete for prep/preview
complete.slice = true;
API.show.progress(0); API.show.progress(0);
SPACE.scene.active(); SPACE.scene.active();
API.event.emit('slice.end', getMode()); API.event.emit('slice.end', getMode());
// print stats // print stats
DBUG.log(segtimes); DBUG.log(segtimes);
// mark slicing complete for prep/preview
complete.slice = true;
if (callback && typeof callback === 'function') { if (callback && typeof callback === 'function') {
callback(); callback();
} }

4
src/moto/space.js
View file

@ -353,7 +353,7 @@
canvas.mesh.position.set(0, - h - labelSize / 2 - 5, zp); canvas.mesh.position.set(0, - h - labelSize / 2 - 5, zp);
rulersView.add(canvas.mesh); rulersView.add(canvas.mesh);
if (axesOn) { if (axesOn && false) {
canvas.ctx.font = (labelSize * 0.75) + 'px sans-serif'; canvas.ctx.font = (labelSize * 0.75) + 'px sans-serif';
canvas.ctx.fillText('X', rulerXFirst, labelSize * (1/8)); canvas.ctx.fillText('X', rulerXFirst, labelSize * (1/8));
canvas.ctx.font = labelSize + 'px sans-serif'; canvas.ctx.font = labelSize + 'px sans-serif';
@ -372,7 +372,7 @@
canvas.mesh.position.set(-w - labelSize * 2 - 5, 0, zp); canvas.mesh.position.set(-w - labelSize * 2 - 5, 0, zp);
rulersView.add(canvas.mesh); rulersView.add(canvas.mesh);
if (axesOn) { if (axesOn && false) {
canvas.ctx.font = (labelSize * 0.75) + 'px sans-serif'; canvas.ctx.font = (labelSize * 0.75) + 'px sans-serif';
canvas.ctx.fillText('Y', labelSize * 3.5, y); canvas.ctx.fillText('Y', labelSize * 3.5, y);
canvas.ctx.font = labelSize + 'px sans-serif'; canvas.ctx.font = labelSize + 'px sans-serif';

4
web/kiri/index.css
View file

@ -728,6 +728,10 @@ th, tr, td, label {
height: 450px; height: 450px;
transform: translateX(-1px); transform: translateX(-1px);
} }
#help-tab-support a:hover {
background-color: #aee;
border-radius: 5px;
}
.help-tab { .help-tab {
flex-grow: 1; flex-grow: 1;
display: none; display: none;