From 971e19f527ac66ba3c61f926efb2c8fe7455d06e Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Wed, 10 Feb 2021 01:02:18 -0500
Subject: [PATCH] checkpoint fdm ranges work

---
 src/kiri/conf.js |   3 +-
 src/kiri/init.js |   3 ++
 src/kiri/main.js | 111 +++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 108 insertions(+), 9 deletions(-)

diff --git a/src/kiri/conf.js b/src/kiri/conf.js
index 43eecf9c..6f9f7a69 100644
--- a/src/kiri/conf.js
+++ b/src/kiri/conf.js
@@ -348,7 +348,8 @@
                     zHopDistance: 0.2,
                     arcTolerance: 0,
                     antiBacklash: 1,
-                    gcodePause: ""
+                    gcodePause: "",
+                    ranges: []
                 }
             },
             sla:{
diff --git a/src/kiri/init.js b/src/kiri/init.js
index 3e50c115..286bf507 100644
--- a/src/kiri/init.js
+++ b/src/kiri/init.js
@@ -1851,6 +1851,9 @@
             return settings().device.spindleMax > 0;
         }
 
+        // FDM region override setup
+        UI.sliceFillSparse.region = true;
+
         // slider setup
         const slbar = 30;
         const slbar2 = slbar * 2;
diff --git a/src/kiri/main.js b/src/kiri/main.js
index 79a7cba2..3dc34203 100644
--- a/src/kiri/main.js
+++ b/src/kiri/main.js
@@ -669,11 +669,76 @@
         return Math.max(min,Math.min(max,v));
     }
 
+    function getOverlappingRanges(lo, hi) {
+        let ranges = [];
+        for (let range of settings.process.ranges) {
+            let in_lo = range.lo >= lo && range.lo <= hi;
+            let in_hi = range.hi >= lo && range.hi <= hi;
+            if (in_lo || in_hi) {
+                ranges.push(range);
+            }
+        }
+        return ranges;
+    }
+
+    function updateRange(lo, hi, values) {
+        let exact;
+        // remove matching values from overlapping ranges
+        for (let range of getOverlappingRanges(lo, hi)) {
+            if (range.lo === lo && range.hi === hi) {
+                exact = range;
+            }
+            for (let key of Object.keys(values)) {
+                delete range.fields[key];
+            }
+        }
+        // add values to matched range or new range
+        if (!exact) {
+            exact = { lo, hi, fields: {} };
+            settings.process.ranges.push(exact);
+        }
+        for (let key of Object.keys(values)) {
+            exact.fields[key] = values[key];
+        }
+    }
+
+    let overrides = {};
+
+    // updates that are region (slice range) dependent
+    function updateFieldsFromRange() {
+        if (settings.mode !== 'FDM' || viewMode !== VIEWS.SLICE || !settings.process.ranges) {
+            return;
+        }
+        let match = 0;
+        let values = {};
+        let restores = Object.clone(overrides);
+        let { layer_lo, layer_hi } = API.var;
+        for (let range of getOverlappingRanges(API.var.layer_lo, API.var.layer_hi)) {
+            for (let key of Object.keys(range.fields)) {
+                values[key] = range.fields[key];
+                overrides[key] = settings.process[key];
+                delete restores[key];
+                match++;
+            }
+        }
+        if (match) {
+            updateFieldsFromSettings(values);
+        }
+        let rkeys = Object.keys(restores);
+        if (rkeys.length) {
+            updateFieldsFromSettings(restores);
+            for (let key of rkeys) {
+                delete overrides[key];
+            }
+        }
+    }
+
     function updateSlider() {
         API.event.emit("slider.set", {
             start: (API.var.layer_lo / API.var.layer_max),
             end: (API.var.layer_hi / API.var.layer_max)
         });
+        updateFieldsFromRange();
     }
 
     function setVisibleLayer(h, l) {
@@ -1894,18 +1959,31 @@
         }
     }
 
+    function isEquals(o1, o2) {
+        if (o1 == o2) return true;
+        if (Array.isArray(o1) && Array.isArray(o2)) {
+            if (o1.length === o2.length) {
+                for (let i=0; i<o1.length; i++) {
+                    if (o1[i] !== o2[i]) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * @returns {Object}
      */
-    function updateSettingsFromFields(setrec, uirec = UI) {
+    function updateSettingsFromFields(setrec, uirec = UI, changes) {
         if (!setrec) {
             return console.trace("missing scope");
         }
 
-        let key, changed = false;
-
         // for each key in setrec object
-        for (key in setrec) {
+        for (let key in setrec) {
             if (!setrec.hasOwnProperty(key)) {
                 continue;
             }
@@ -1936,8 +2014,11 @@
             } else {
                 continue;
             }
-            if (setrec[key] != nval) {
+            if (!isEquals(setrec[key], nval)) {
                 setrec[key] = nval;
+                if (changes) {
+                    changes[key] = nval;
+                }
             }
         }
 
@@ -1993,16 +2074,30 @@
             return;
         }
         updateSettingsFromFields(device);
-        updateSettingsFromFields(process);
+        if (settings.mode === 'FDM' && viewMode === VIEWS.SLICE) {
+            let changes = {};
+            let values = process;
+            let { layer_lo, layer_hi, layer_max } = API.var;
+            let range;
+            if (layer_lo > 0 || layer_hi < layer_max) {
+                values = Object.clone(process);
+                range = { lo: layer_lo, hi: layer_hi };
+            }
+            updateSettingsFromFields(values, undefined, changes);
+            if (range) {
+                updateRange(range.lo, range.hi, changes);
+            }
+        } else {
+            updateSettingsFromFields(process);
+        }
         if (device.extruders && device.extruders[device.internal]) {
             updateSettingsFromFields(device.extruders[device.internal]);
         }
         API.conf.save();
-        let current = process;
         let compare = sproc[mode][cproc[mode]];
         let same = true;
         for (let [key, val] of Object.entries(compare).filter(v => v[0] !== 'processName')) {
-            let tval = current[key];
+            let tval = process[key];
             // outputLoopLayers misbehaving and setting null on empty
             if (val === '' && tval == null) {
                 continue;