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

re-enable danish. round scaling values. stub in adaptive platform in belt mode

Browse source
This commit is contained in:
Stewart Allen 2021-01-16 10:08:11 -05:00
commit 59759f1bd5
4 changed files with 29 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/kiri/init.js
View file

@ -1929,10 +1929,10 @@
SDB.setItem('kiri-lang', 'en-us'); SDB.setItem('kiri-lang', 'en-us');
API.space.reload(); API.space.reload();
}; };
// $('lset-da').onclick = function() { $('lset-da').onclick = function() {
// SDB.setItem('kiri-lang', 'da-dk'); SDB.setItem('kiri-lang', 'da-dk');
// API.space.reload(); API.space.reload();
// }; };
SPACE.addEventHandlers(self, [ SPACE.addEventHandlers(self, [
'keyup', keyUpHandler, 'keyup', keyUpHandler,

28
src/kiri/main.js
View file

@ -1139,12 +1139,12 @@
dy = bounds.max.y - bounds.min.y, dy = bounds.max.y - bounds.min.y,
dz = bounds.max.z - bounds.min.z, dz = bounds.max.z - bounds.min.z,
scale = unitScale(); scale = unitScale();
UI.sizeX.value = UI.sizeX.was = UTIL.round(dx/scale,2); UI.sizeX.value = UI.sizeX.was = (dx / scale).round(2)
UI.sizeY.value = UI.sizeY.was = UTIL.round(dy/scale,2); UI.sizeY.value = UI.sizeY.was = (dy / scale).round(2)
UI.sizeZ.value = UI.sizeZ.was = UTIL.round(dz/scale,2); UI.sizeZ.value = UI.sizeZ.was = (dz / scale).round(2)
UI.scaleX.value = UI.scaleX.was = track.scale.x; UI.scaleX.value = UI.scaleX.was = track.scale.x.round(2);
UI.scaleY.value = UI.scaleY.was = track.scale.y; UI.scaleY.value = UI.scaleY.was = track.scale.y.round(2);
UI.scaleZ.value = UI.scaleZ.was = track.scale.z; UI.scaleZ.value = UI.scaleZ.was = track.scale.z.round(2);
updateSelectedBounds(); updateSelectedBounds();
} }
@ -1383,6 +1383,20 @@
wb.max.y += wp.y; wb.max.y += wp.y;
bounds.union(wb); bounds.union(wb);
}); });
if (settings.device.bedBelt) {
let dev = settings.device,
isBelt = dev.bedBelt,
maxy = bounds.max.y - bounds.min.y;
// if (maxy > dev.bedDepth) {
// console.log({maxy}, settings.device.bedDepth)
// SPACE.platform.setSize(
// parseInt(dev.bedWidth),
// parseInt(maxy),
// parseFloat(dev.bedHeight),
// parseFloat(dev.maxHeight)
// );
// }
}
return settings.bounds = bounds; return settings.bounds = bounds;
} }
@ -1696,7 +1710,7 @@
if (isBelt) { if (isBelt) {
let bounds = platformUpdateBounds(), let bounds = platformUpdateBounds(),
movey = -(dev.bedDepth / 2 + bounds.min.y); movey = -(dev.bedDepth / 2 + bounds.min.y);
forAllWidgets(widget => widget.move(0, movey + 10, 0)); forAllWidgets(widget => widget.move(0, movey + 5, 0));
} }
platform.update_origin(); platform.update_origin();

6
web/kiri/index.html
View file

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html lang="en">
<head lang="en"> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="author" content="Stewart Allen"> <meta name="author" content="Stewart Allen">
<meta name="keywords" content="3d slicer,slicer,3d slicing,cnc,cam,toolpaths,toolpath generation,kiri,kirimoto,kiri:moto,gcode,cura,simplify 3d,prusaslicer,fdm,sla" /> <meta name="keywords" content="3d slicer,slicer,3d slicing,cnc,cam,toolpaths,toolpath generation,kiri,kirimoto,kiri:moto,gcode,cura,simplify 3d,prusaslicer,fdm,sla" />
@ -48,7 +48,7 @@
<label><i class="fas fa-caret-left"></i>&nbsp;language</label> <label><i class="fas fa-caret-left"></i>&nbsp;language</label>
<div id="lang-pop" class="f-col"> <div id="lang-pop" class="f-col">
<div id="lset-en">english</div> <div id="lset-en">english</div>
<!-- <div id="lset-da">danish</div> --> <div id="lset-da">danish</div>
</div> </div>
</div> </div>
<div id="acct-export" class="f-col a-end"> <div id="acct-export" class="f-col a-end">

2
web/kiri/lang/da-dk-help.html
View file

@ -1 +1 @@
da-help.html en-help.html