prevent loop ranges from mixing with other parameter ranges
This commit is contained in:
parent
d9824b02df
commit
164013834a
1 changed files with 8 additions and 1 deletions
|
|
@ -763,6 +763,11 @@
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// set aside belt loops and re-append later
|
||||||
|
// since we do not want to collapse/merge loops
|
||||||
|
let exclude = ranges.filter(r => r.fields.outputLoops);
|
||||||
|
ranges = ranges.filter(r => !r.fields.outputLoops);
|
||||||
|
|
||||||
// flatten ranges
|
// flatten ranges
|
||||||
ranges.push({lo, hi, fields: values});
|
ranges.push({lo, hi, fields: values});
|
||||||
for (let range of ranges) {
|
for (let range of ranges) {
|
||||||
|
|
@ -780,7 +785,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// merge contiguous matching ranges
|
// merge contiguous matching ranges
|
||||||
ranges.length = 0;
|
ranges = settings.process.ranges = [];
|
||||||
let range;
|
let range;
|
||||||
for (let i=min; i<=max; i++) {
|
for (let i=min; i<=max; i++) {
|
||||||
let slice = slices[i];
|
let slice = slices[i];
|
||||||
|
|
@ -799,6 +804,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
ranges.push(range);
|
ranges.push(range);
|
||||||
|
ranges.appendAll(exclude);
|
||||||
|
|
||||||
updateFieldsFromSettings(settings.process);
|
updateFieldsFromSettings(settings.process);
|
||||||
API.show.alert("update ranges", 2);
|
API.show.alert("update ranges", 2);
|
||||||
API.event.emit("range.updates", ranges);
|
API.event.emit("range.updates", ranges);
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue