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 update/render bug with align top toggle

Browse source
This commit is contained in:
Stewart Allen 2020-03-15 10:08:46 -04:00
commit 7c56383b82
5 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1147,7 +1147,7 @@ var gs_kiri_cam = exports;
newOutput.push(layerOut); newOutput.push(layerOut);
layerOut = []; layerOut = [];
} }
// console.log({index, zadd, zmax, bz:bounds.max.z});
/** /**
* @param {Point} point * @param {Point} point
* @param {number} emit (0=move, !0=filament emit/laser on/cut mode) * @param {number} emit (0=move, !0=filament emit/laser on/cut mode)

3
js/kiri-init.js
View file

@ -445,7 +445,8 @@ var gs_kiri_init = exports;
current.controller.alignTop = UI.alignTop.checked; current.controller.alignTop = UI.alignTop.checked;
current.controller.reverseZoom = UI.reverseZoom.checked; current.controller.reverseZoom = UI.reverseZoom.checked;
SPACE.view.setZoom(current.controller.reverseZoom, current.controller.zoomSpeed); SPACE.view.setZoom(current.controller.reverseZoom, current.controller.zoomSpeed);
platform.update_origin(); platform.layout();
platform.update_stock();
API.conf.save(); API.conf.save();
} }

8
js/kiri.js
View file

@ -1206,20 +1206,16 @@ self.kiri.license = exports.LICENSE;
camStock.position.z = csz / 2; camStock.position.z = csz / 2;
camStock.material.visible = settings.mode === 'CAM'; camStock.material.visible = settings.mode === 'CAM';
camTopZ = csz; camTopZ = csz;
platform.update_top_z();
SPACE.update();
} else if (camStock) { } else if (camStock) {
settings.stock = { }; settings.stock = { };
UI.stock.style.display = 'none'; UI.stock.style.display = 'none';
SPACE.platform.remove(camStock); SPACE.platform.remove(camStock);
SPACE.update();
camStock = null; camStock = null;
camTopZ = topZ; camTopZ = topZ;
platform.update_top_z();
} else if (settings.controller.alignTop) {
platform.update_top_z();
} }
platform.update_top_z();
platform.update_origin(); platform.update_origin();
SPACE.update();
} }
/** ****************************************************************** /** ******************************************************************

2
notes.md
View file

@ -39,10 +39,12 @@
# CAM # CAM
* `F` trapezoidal tabs (in the Z axis)
* `F` lead-in milling * `F` lead-in milling
* `F` ease-in and ease-out especially on tab cut-out start/stop * `F` ease-in and ease-out especially on tab cut-out start/stop
* `F` add option to spiral in vs out (optimal tool life) vs mixed (optimal path) * `F` add option to spiral in vs out (optimal tool life) vs mixed (optimal path)
* `F` add endmill spiral direction to fully respect climb vs conventional * `F` add endmill spiral direction to fully respect climb vs conventional
* `F` add tapered ball mills
* `F` warn when part > stock or cuts go outside bed * `F` warn when part > stock or cuts go outside bed
* `F` add M03 tool feedrate support * `F` add M03 tool feedrate support
* `P` refactor slicing around flats w/ interpolation instead of culling * `P` refactor slicing around flats w/ interpolation instead of culling

2
web/kiri/index.html
View file

@ -61,7 +61,7 @@
<!-- file load catalog --> <!-- file load catalog -->
<div id="catalog" class="dialog"> <div id="catalog" class="dialog">
<div id="catalogBody" class="flow-col"> <div id="catalogBody" class="flow-col">
<label id="localCache">local cache</label> <label id="localCache">recent files</label>
<div id="catalogList"></div> <div id="catalogList"></div>
</div> </div>
</div> </div>