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

Merge branch 'rel-4.0' of github.com:GridSpace/grid-apps into rel-4.0

Browse source
This commit is contained in:
Stewart Allen 2024-09-05 21:49:06 -04:00
commit b6022dfb76
5 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/kiri-mode/fdm/slice.js
View file

@ -25,13 +25,14 @@ const POLY = polygons,
tracker = util.pwait,
lopacity = 0.6,
opacity = 1,
fat = 1.5,
COLOR = {
anchor: { check: 0x999933, face: 0x999933, line: 0x999933, opacity, lopacity },
shell: { check: 0x0077bb, face: 0x0077bb, line: 0x0077bb, opacity, lopacity },
fill: { check: 0x00bb77, face: 0x00bb77, line: 0x00bb77, opacity, lopacity },
infill: { check: 0x3322bb, face: 0x3322bb, line: 0x3322bb, opacity, lopacity },
support: { check: 0xaa5533, face: 0xaa5533, line: 0xaa5533, opacity, lopacity },
gaps: { check: 0xaa3366, face: 0xaa3366, line: 0xaa3366, opacity, lopacity }
anchor: { check: 0x999933, face: 0x999933, line: 0x999933, opacity, lopacity, fat },
shell: { check: 0x0077bb, face: 0x0077bb, line: 0x0077bb, opacity, lopacity, fat },
fill: { check: 0x00bb77, face: 0x00bb77, line: 0x00bb77, opacity, lopacity, fat },
infill: { check: 0x3322bb, face: 0x3322bb, line: 0x3322bb, opacity, lopacity, fat },
support: { check: 0xaa5533, face: 0xaa5533, line: 0xaa5533, opacity, lopacity, fat },
gaps: { check: 0xaa3366, face: 0xaa3366, line: 0xaa3366, opacity, lopacity, fat }
},
PROTO = Object.clone(COLOR),
profile = false,

12
src/kiri/function.js
View file

@ -215,9 +215,9 @@ function prepareSlices(callback, scale = 1, offset = 0) {
if (scale === 1) {
view.update_stack_labels();
}
if (!isBelt && controller.lineType === 'line' && !process.xray && !controller.devel) {
$('render-ghost').onclick();
}
// if (!isBelt && controller.lineType === 'line' && !process.xray && !controller.devel) {
// $('render-ghost').onclick();
// }
if (scale === 1) {
show.progress(0);
}
@ -372,9 +372,9 @@ function preparePreview(callback, scale = 1, offset = 0) {
view.update_stack_labels();
let { controller, process } = settings;
if (!isBelt && controller.lineType === 'line' && !process.xray && !controller.devel) {
$('render-ghost').onclick();
}
// if (!isBelt && controller.lineType === 'line' && !process.xray && !controller.devel) {
// $('render-ghost').onclick();
// }
// mark preview complete for export
complete.preview = feature.pmode;

1
src/kiri/render.js
View file

@ -71,6 +71,7 @@ async function path(levels, update, opts = {}) {
opacity: flat ? 0.5 : 1
};
const printOpt = {
// fat: thin ? 1.5 : 0,
face: printColor,
line: flat ? 1 : printColor,
opacity: flat ? 0.5 : 1

2
src/main/mesh.js
View file

@ -311,7 +311,7 @@ function space_init(data) {
if ([api.modes.object, api.modes.tool, api.modes.sketch].contains(mode)) {
selection.delete();
} else {
for (let m of selection.models()) {
for (let m of api.model.list()) {
m.deleteSelections();
space.refresh()
}

3
src/mesh/model.js
View file

@ -697,6 +697,9 @@ mesh.model = class MeshModel extends mesh.object {
}
deleteSelections(append) {
if (!this.sel.faces.length) {
return;
}
let newverts = this.collectFacesByMaterialIndex(0);
if (newverts) {
if (append) {