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 threading detection in cam slicer, rename slicer2 to slicer_topo for clarity

Browse source
This commit is contained in:
Stewart Allen 2025-07-09 11:56:46 -04:00
commit d47dc4e4e2
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri-mode/cam/slicer.js
View file

@ -28,7 +28,7 @@ export class Slicer {
this.setOptions(options); this.setOptions(options);
if (widget) { if (widget) {
this.threaded = widget.settings.controller.threaded; this.threaded = this.minions && this.minions.running;
this.setPoints(widget.getGeoVertices({ unroll: true, translate: true })); this.setPoints(widget.getGeoVertices({ unroll: true, translate: true }));
this.computeFeatures(); this.computeFeatures();
} }

1
src/kiri-mode/cam/slicer2.js → src/kiri-mode/cam/slicer_topo.js
View file

@ -6,6 +6,7 @@ import { newOrderedLine } from '../../geo/line.js';
const { config } = base; const { config } = base;
/** Slicer used in Topo3 and Topo4 to find contour lines */
export class Slicer { export class Slicer {
static intersectPoints = intersectPoints; static intersectPoints = intersectPoints;

2
src/kiri-mode/cam/topo3.js
View file

@ -4,7 +4,7 @@ import { codec } from '../../kiri/codec.js';
import { newPoint } from '../../geo/point.js'; import { newPoint } from '../../geo/point.js';
import { newPolygon } from '../../geo/polygon.js'; import { newPolygon } from '../../geo/polygon.js';
import { newSlice } from '../../kiri/slice.js'; import { newSlice } from '../../kiri/slice.js';
import { Slicer as topo_slicer } from './slicer2.js'; import { Slicer as topo_slicer } from './slicer_topo.js';
import { polygons as POLY } from '../../geo/polygons.js'; import { polygons as POLY } from '../../geo/polygons.js';
import { Tool } from './tool.js'; import { Tool } from './tool.js';

2
src/kiri-mode/cam/topo4.js
View file

@ -5,7 +5,7 @@ import { newPoint } from '../../geo/point.js';
import { newPolygon } from '../../geo/polygon.js'; import { newPolygon } from '../../geo/polygon.js';
import { sliceConnect } from '../../geo/slicer.js'; import { sliceConnect } from '../../geo/slicer.js';
import { Tool } from './tool.js'; import { Tool } from './tool.js';
import { Slicer as topo_slicer } from './slicer2.js'; import { Slicer as topo_slicer } from './slicer_topo.js';
const RAD2DEG = 180 / Math.PI; const RAD2DEG = 180 / Math.PI;
const DEG2RAD = Math.PI / 180; const DEG2RAD = Math.PI / 180;

4
src/kiri-run/minion.js
View file

@ -7,13 +7,13 @@ import '../add/class.js';
import '../add/three.js'; import '../add/three.js';
import { base } from '../geo/base.js'; import { base } from '../geo/base.js';
import { codec, encode } from '../kiri/codec.js'; import { codec, encode, encodePointArray } from '../kiri/codec.js';
import { doTopShells } from '../kiri-mode/fdm/post.js'; import { doTopShells } from '../kiri-mode/fdm/post.js';
import { newPoint } from '../geo/point.js'; import { newPoint } from '../geo/point.js';
import { polygons as POLY } from '../geo/polygons.js'; import { polygons as POLY } from '../geo/polygons.js';
import { sliceZ } from '../geo/slicer.js'; import { sliceZ } from '../geo/slicer.js';
import { Slicer as cam_slicer } from '../kiri-mode/cam/slicer.js'; import { Slicer as cam_slicer } from '../kiri-mode/cam/slicer.js';
import { Slicer as topo_slicer } from '../kiri-mode/cam/slicer2.js'; import { Slicer as topo_slicer } from '../kiri-mode/cam/slicer_topo.js';
import { Probe, Trace, raster_slice } from '../kiri-mode/cam/topo3.js'; import { Probe, Trace, raster_slice } from '../kiri-mode/cam/topo3.js';
import { wasm_ctrl } from '../geo/wasm.js'; import { wasm_ctrl } from '../geo/wasm.js';