fix contour curvesOnly with threaded slicing. add booleans to codec
This commit is contained in:
parent
a52942b471
commit
3f372e70aa
3 changed files with 8 additions and 4 deletions
|
|
@ -133,7 +133,9 @@ class Topo {
|
|||
const trace = this.trace = new Trace(probe, {
|
||||
curvesOnly,
|
||||
maxangle,
|
||||
flatness
|
||||
flatness,
|
||||
bridge,
|
||||
contourX
|
||||
});
|
||||
|
||||
if (topo.raster) {
|
||||
|
|
@ -472,7 +474,7 @@ class Trace {
|
|||
|
||||
constructor(probe, params) {
|
||||
|
||||
const { curvesOnly, maxangle, flatness } = params;
|
||||
const { curvesOnly, maxangle, flatness, bridge, contourX } = params;
|
||||
|
||||
this.params = params;
|
||||
this.probe = probe;
|
||||
|
|
@ -559,7 +561,6 @@ class Trace {
|
|||
|
||||
if (minions && this.cross.concurrent) {
|
||||
const { codec } = kiri;
|
||||
|
||||
minions.broadcast("trace_init", codec.encode({
|
||||
probe: this.probe.params,
|
||||
trace: this.params,
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ function toCodable(object) {
|
|||
switch (typeof object) {
|
||||
case 'function':
|
||||
return undefined;
|
||||
// case 'boolean':
|
||||
case 'string':
|
||||
case 'number':
|
||||
return object;
|
||||
|
|
@ -101,6 +102,7 @@ function encode(o, state) {
|
|||
return arr;
|
||||
}
|
||||
switch (typeof(o)) {
|
||||
case 'boolean':
|
||||
case 'string':
|
||||
case 'number':
|
||||
return o;
|
||||
|
|
@ -120,6 +122,7 @@ function decode(o, state) {
|
|||
return o;
|
||||
}
|
||||
switch (typeof(o)) {
|
||||
case 'boolean':
|
||||
case 'string':
|
||||
case 'number':
|
||||
return o;
|
||||
|
|
|
|||
|
|
@ -561,7 +561,7 @@ const conf = exports({
|
|||
camFastFeedZ: 300,
|
||||
camTolerance: 0,
|
||||
camFlatness: 0.001,
|
||||
camContourBridge: 10,
|
||||
camContourBridge: 0,
|
||||
camStockX: 5,
|
||||
camStockY: 5,
|
||||
camStockZ: 0,
|
||||
|
|
|
|||
Loading…
Reference in a new issue