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 display of extruder mode in device editor

Browse source
This commit is contained in:
Stewart Allen 2020-02-18 19:45:00 -05:00
commit 39c4ad85a7
3 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
js/kiri-slicer.js
View file

@ -110,6 +110,7 @@ var gs_kiri_slicer = exports;
zOrdered = [], // ordered list of Z vertices zOrdered = [], // ordered list of Z vertices
zList = {}, // list of z indices for auto slicing (laser) zList = {}, // list of z indices for auto slicing (laser)
zFlat = {}, // area of z offset flat areas (cam) zFlat = {}, // area of z offset flat areas (cam)
zLines = {}, // count of lines flat on a z index
zScale, // bucket span in z units zScale, // bucket span in z units
timeStart = time(), timeStart = time(),
slices = [], slices = [],
@ -137,6 +138,22 @@ var gs_kiri_slicer = exports;
countZ(p2.z); countZ(p2.z);
countZ(p3.z); countZ(p3.z);
} }
// detect zLines
// if (p1.z === p2.z && p1.z > bounds.min.z) {
// let zkey = p1.z.toFixed(5);
// let zval = zLines[zkey];
// zLines[zkey] = (zval || 0) + 1;
// }
// if (p2.z === p3.z && p2.z > bounds.min.z) {
// let zkey = p2.z.toFixed(5);
// let zval = zLines[zkey];
// zLines[zkey] = (zval || 0) + 1;
// }
// if (p3.z === p1.z && p3.z > bounds.min.z) {
// let zkey = p3.z.toFixed(5);
// let zval = zLines[zkey];
// zLines[zkey] = (zval || 0) + 1;
// }
// auto-detect flats for cam faces and to avoid slicing directly on flats // auto-detect flats for cam faces and to avoid slicing directly on flats
if (p1.z === p2.z && p2.z === p3.z && p1.z > bounds.min.z) { if (p1.z === p2.z && p2.z === p3.z && p1.z > bounds.min.z) {
var zkey = p1.z.toFixed(5), var zkey = p1.z.toFixed(5),

8
js/kiri.js
View file

@ -3252,7 +3252,8 @@ self.kiri.license = exports.LICENSE;
var cmd = code.cmd || {}, var cmd = code.cmd || {},
set = code.settings || {}, set = code.settings || {},
local = isLocalDevice(devicename), local = isLocalDevice(devicename),
dproc = settings.devproc[devicename]; dproc = settings.devproc[devicename],
mode = getMode();
settings.device = { settings.device = {
bedHeight: 2.5, bedHeight: 2.5,
@ -3338,6 +3339,7 @@ self.kiri.license = exports.LICENSE;
}); });
// hide spindle fields when device doens't support it // hide spindle fields when device doens't support it
if (mode === 'CAM')
[ [
UI.setDeviceExtrusion, UI.setDeviceExtrusion,
UI.roughingSpindle, UI.roughingSpindle,
@ -3353,8 +3355,8 @@ self.kiri.license = exports.LICENSE;
updateFields(); updateFields();
updatePlatformSize(); updatePlatformSize();
settings.filter[getMode()] = devicename; settings.filter[mode] = devicename;
settings.cdev[getMode()] = dev; settings.cdev[mode] = dev;
// restore last process associated with this device // restore last process associated with this device
if (dproc) loadNamedSetting(null, dproc); if (dproc) loadNamedSetting(null, dproc);

2
js/license.js
View file

@ -1,7 +1,7 @@
var exports = { var exports = {
COPYRIGHT:"Copyright (C) 2014-2019 Stewart Allen <sa@grid.space> - All Rights Reserved", COPYRIGHT:"Copyright (C) 2014-2019 Stewart Allen <sa@grid.space> - All Rights Reserved",
LICENSE:"See the license.md file included with the source distribution", LICENSE:"See the license.md file included with the source distribution",
VERSION:"1.6.0" VERSION:"1.6.1"
}; };
if (!module) var module = {}; if (!module) var module = {};
module.exports = exports; module.exports = exports;