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 linear xy offsetting bug

Browse source
This commit is contained in:
Stewart Allen 2020-03-25 09:46:02 -04:00
commit 137d183061
4 changed files with 2 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

21
js/kiri-driver-cam.js
View file

@ -171,12 +171,6 @@ var gs_kiri_cam = exports;
return zmax; return zmax;
}; };
const lastTopo = {
lx:0,
ly:0,
lr:undefined
};
/** /**
* x,y are in topo grid int coordinates * x,y are in topo grid int coordinates
*/ */
@ -185,20 +179,11 @@ var gs_kiri_cam = exports;
const sx = topo.stepsx, sy = topo.stepsy; const sx = topo.stepsx, sy = topo.stepsy;
let {lx, ly, lr} = lastTopo;
let dx = x - lx;
let dy = y - ly;
while (i < profile.length) { while (i < profile.length) {
// tool profile point x, y, and z offsets // tool profile point x, y, and z offsets
let tx = profile[i++]; let tx = profile[i++];
let ty = profile[i++]; let ty = profile[i++];
let tz = profile[i++]; let tz = profile[i++];
// only check points in the direction of travel
if (dx == -1 && tx > 0) continue;
if (dx == 1 && tx < 0) continue;
if (dy == -1 && ty > 0) continue;
if (dy == 1 && ty < 0) continue;
// update with tool profile point offset // update with tool profile point offset
tx += x; tx += x;
ty += y; ty += y;
@ -223,11 +208,7 @@ var gs_kiri_cam = exports;
mz = Math.max(tz + gv, mz); mz = Math.max(tz + gv, mz);
} }
lastTopo.lx = x; return Math.max(mz,0);//mz >= 0.0 ? mz : topo.bounds.max.z;
lastTopo.ly = y;
lastTopo.lr = Math.max(mz,0);//mz >= 0.0 ? mz : topo.bounds.max.z;
return lastTopo.lr;
}; };
/** /**

1
js/web-server.js
View file

@ -1343,7 +1343,6 @@ process.on('unhandledRejection', (reason, p) => {
process.on('uncaughtException', (err) => { process.on('uncaughtException', (err) => {
logger.log({uncaught_exception: err}); logger.log({uncaught_exception: err});
// process.exit(1);
}); });
processLoad(); processLoad();

1
web/kiri/index.html
View file

@ -6,7 +6,6 @@
<meta name="description" content="3d slice modeler, gcode and CNC toolpath generator"> <meta name="description" content="3d slice modeler, gcode and CNC toolpath generator">
<meta name="keywords" content="3d slicer,slicer,3d slicing,cnc,cam,toolpaths,toolpath generation,kiri,kirimoto,kiri:moto,gcode" /> <meta name="keywords" content="3d slicer,slicer,3d slicing,cnc,cam,toolpaths,toolpath generation,kiri,kirimoto,kiri:moto,gcode" />
<meta name="author" content="Stewart Allen"> <meta name="author" content="Stewart Allen">
<meta name="robots" content="noindex, nofollow">
<meta property="og:description" content="Kiri:Moto is a unique multi-modal 3D slicer that runs entirely in browser and creates output for your favorite maker tools: 3D Printers, CNC Mills and Laser Cutters. Advanted layer view helps debug prints ahead of time."> <meta property="og:description" content="Kiri:Moto is a unique multi-modal 3D slicer that runs entirely in browser and creates output for your favorite maker tools: 3D Printers, CNC Mills and Laser Cutters. Advanted layer view helps debug prints ahead of time.">
<meta property="og:title" content="Browser-based Slicer for Makers"> <meta property="og:title" content="Browser-based Slicer for Makers">
<meta property="og:type" content="website"> <meta property="og:type" content="website">

2
web/kiri/lang/en.js
View file

@ -153,7 +153,7 @@ kiri.lang['en-us'] = {
fi_type: "type", fi_type: "type",
fi_pcnt_s: "percentage", fi_pcnt_s: "percentage",
fi_pcnt_l: "fill density values\n0.0 - 1.0", fi_pcnt_l: "fill density values\n0.0 - 1.0",
fi_angl_s: "solid angle", fi_angl_s: "start angle",
fi_angl_l: "base angle in degrees", fi_angl_l: "base angle in degrees",
fi_over_s: "overlap", fi_over_s: "overlap",
fi_over_l: "overlap with shell and fill\nas % of nozzle width\nhigher bonds better\n0.0 - 1.0", fi_over_l: "overlap with shell and fill\nas % of nozzle width\nhigher bonds better\n0.0 - 1.0",