From e93608134fc5403765b2b72402624ed8e06188f0 Mon Sep 17 00:00:00 2001
From: paukstelis <paukstel@umd.edu>
Date: Fri, 17 Jul 2020 17:33:27 -0400
Subject: [PATCH] Move default toggle to tab change. README update.

---
 README.md                                     |  12 +-
 octoprint_cancelobject/__init__.pyc           | Bin 0 -> 19984 bytes
 .../static/js/cancelobject.js                 | 563 +++++++++---------
 .../templates/cancelobject_settings.jinja2    |   2 +-
 4 files changed, 293 insertions(+), 284 deletions(-)
 create mode 100644 octoprint_cancelobject/__init__.pyc

diff --git a/README.md b/README.md
index 968be1c..eaf00f9 100644
--- a/README.md
+++ b/README.md
@@ -5,8 +5,8 @@ See below for instructions for specific slicers.
 ### New version 0.4.2, 07/2020
 * Remove case sensitivity for `@Object` tags.
 * Improvements to absolute extrusion tracking.
-* Read object information from SuperSlicer object comments to create `@Objectinfo` tags. This includes object centers so these no longer have to be calculated from extrusion moves.
-* `; stop printing object` comments now generate `@Objectstop` tags which should improve compatibility with extruder wipes 
+* Read object information from SuperSlicer object comments to create `@Objectinfo` tags. This includes object centers so these no longer have to be calculated from extrusion moves. Special note: as of this moment cloned objects will not give unique positions. 
+* `; stop printing object` comments now generate `@Objectstop` tags which should improve compatibility with extruder wipes in PrusaSlicer/SuperSlicer
 
 ### New version 0.3.0, 02/26/2019
 * Gcodeviewer integration. Objects are tagged wtih an orange dot in the Gcodeviewer and can be cancelled directly.
@@ -29,9 +29,9 @@ See below for instructions for specific slicers.
 * Please note that the way that Cura does supports means that ALL supports are placed into an object called `NONMESH`. Cancelling an object will not cancel its supports.
 * Do not use stl files that have non-ASCII characters. This will confuse all current versions of Marlin.
 * Is is a good idea to add `;MESH:ENDGCODE` at the start of your ending gcode script.
-### PrusaSlicer/Slic3r PE (1.42 alpha and future versions)
+### PrusaSlicer/SuperSlicer
 * Enable `Label objects` in the Output section
-* Object names can be modified in the object list in the right panel. Note, this only works for objects that are imported independently, not on copies of objects.
+* Object names can be modified in the object list in the right panel. Note, this only works for objects that are imported independently, not on copies/clones of objects.
 * For the end custom GCODE, include at the start: `; printing object ENDGCODE`
 ### Slic3r
 * Use the current development build snapshot: https://dl.slic3r.org/dev/
@@ -45,9 +45,9 @@ See below for instructions for specific slicers.
 
 ## Other notes
 * If you upload files directly to your octoprint instance, direct them to the `watched` directory and not the `upload` directory. This will make sure that the plugin processes your gocde and substitutes the `@Object` tag it uses to identify
-* This plugin can only be used when streaming files via USB (no SD card support)
+* This plugin can only be used when streaming files via USB (no SD card support). If you are looking for SD card support, look into Marlin or RepRap firmware M486 commands.
 * It is designed for use with Marlin and Marlin-flavored firmwares. The behaviour with other firmwares is unknown.
-* Gcodeviewer integration requires that the object has to have had some printing moves before its coordinates are known. Use the `Refresh Objects` button to update.
+* Gcodeviewer integration requires that the object has to have had some printing moves before its coordinates are known. Use the `Refresh Objects` button to update. The exception to this is SuperSlicer which includes object information comments in the gcode that include object centers.
 * Some slicers will place first layer extras (brim, raft, etc.) as part of an object. If this throws off the position of the objects in the gcodeviewer you can use the `Reset Objects` button.
 ## Setup
 
diff --git a/octoprint_cancelobject/__init__.pyc b/octoprint_cancelobject/__init__.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3b7c14dee360927f1b5631a768dd14fca566a4d5
GIT binary patch
literal 19984
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

literal 0
HcmV?d00001

diff --git a/octoprint_cancelobject/static/js/cancelobject.js b/octoprint_cancelobject/static/js/cancelobject.js
index 68fe6be..b1b50ea 100644
--- a/octoprint_cancelobject/static/js/cancelobject.js
+++ b/octoprint_cancelobject/static/js/cancelobject.js
@@ -4,7 +4,7 @@
  * Author: Paul Paukstelis
  * License: AGPLv3
  */
-$(function() {
+$(function () {
     var $cancelOverlay = $('<canvas id="gcode_canvas_cancel_overlay" style="visibility: hidden">');
     var cancelOverlayContext = $cancelOverlay[0].getContext('2d');
 
@@ -25,9 +25,9 @@ $(function() {
         self.aftergcode = ko.observableArray();
         self.allowed = ko.observableArray();
         self.markers = ko.observable();
-        
-        self.onBeforeBinding = function() {
-            OctoPrint.get("api/plugin/"+PLUGIN_ID);
+
+        self.onBeforeBinding = function () {
+            OctoPrint.get("api/plugin/" + PLUGIN_ID);
             self.settings = self.global_settings.settings.plugins.cancelobject;
             self.object_regex(self.settings.object_regex.slice(0));
             self.ignored = self.settings.ignored;
@@ -37,34 +37,44 @@ $(function() {
             self.shownav = self.settings.shownav;
             self.markers(self.settings.markers());
         };
-        
-        self.isFileSelected = ko.pureComputed(function() {
+
+        self.isFileSelected = ko.pureComputed(function () {
             return !!self.gcodeViewModel.selectedFile.path();
         });
 
-        self.isFileSelected.subscribe(function() {
+        self.isFileSelected.subscribe(function () {
             enableCancelButtons(self.isFileSelected());
         });
-        
-        self.addRegex = function() {
-            self.object_regex.push({objreg : ""});
+
+        self.addRegex = function () {
+            self.object_regex.push({ objreg: "" });
         };
 
-        self.removeRegex = function(regex) {
+        self.removeRegex = function (regex) {
             self.object_regex.remove(regex)
         };
 
-        self.onStartupComplete = function() {
-             generateOverlays();
-             CancelButtons();
+        self.onStartupComplete = function () {
+            generateOverlays();
+            CancelButtons();
+
+        }
+
+        self.onAfterTabChange = function () {
+            if (self.markers() == false) { toggleMarkers(false); }
+        }
+
+        self.onEventSettingsUpdated = function (payload) {
+            self.object_regex(self.settings.object_regex.slice(0));
+            self.markers(self.global_settings.settings.plugins.cancelobject.markers());
         }
-        
         self.onSettingsBeforeSave = function () {
 
             self.global_settings.settings.plugins.cancelobject.object_regex(self.object_regex.slice(0));
+            self.global_settings.settings.plugins.cancelobject.markers(self.markers());
         };
 
-        self.cancelObject = function(obj) {
+        self.cancelObject = function (obj) {
             $.ajax({
                 url: API_BASEURL + "plugin/cancelobject",
                 type: "POST",
@@ -74,13 +84,13 @@ $(function() {
                     cancelled: obj
                 }),
                 contentType: "application/json; charset=UTF-8"
-            }); 
-            
+            });
+
             self.updateObjects();
         }
-        
-        self.updateObjects = function() {
-        
+
+        self.updateObjects = function () {
+
             $.ajax({
                 url: API_BASEURL + "plugin/cancelobject",
                 type: "POST",
@@ -90,11 +100,11 @@ $(function() {
                 }),
                 contentType: "application/json; charset=UTF-8"
             });
-            
+
         }
-        
-        self.resetObjects = function() {
-        
+
+        self.resetObjects = function () {
+
             $.ajax({
                 url: API_BASEURL + "plugin/cancelobject",
                 type: "POST",
@@ -110,9 +120,9 @@ $(function() {
             clear_Context(ctx);
             ctx.restore();
         }
-        
-        self.updateObjectList = function() {
-            
+
+        self.updateObjectList = function () {
+
             //start a new entry, don't yet know if this is something that can be done with jinja2
             var canceltable = document.getElementById("cancel-table");
             canceltable.innerHTML = "";
@@ -121,15 +131,15 @@ $(function() {
                 for (var i = 0; i < self.ObjectList.length; i++) {
                     //Ignore entries that are just there for functional purposes
                     if (self.ObjectList[i]["ignore"]) { continue; }
-                    
+
                     var entry = document.createElement("div"); entry.className = "entry-cancel";
-                    entry.id = "entry"+self.ObjectList[i]["id"];
+                    entry.id = "entry" + self.ObjectList[i]["id"];
                     entry.activeobj = "false";
-                    
+
                     var objname = document.createElement("label"); objname.className = "entrylabel";
                     objname.appendChild(document.createTextNode(self.ObjectList[i]["object"]));
                     entry.appendChild(objname);
-                    
+
                     var cancelbutton = document.createElement("BUTTON"); cancelbutton.className = "cancel-btn btn";
                     cancelbutton.value = self.ObjectList[i]["id"];
                     cancelbutton.innerHTML = "Cancel";
@@ -143,301 +153,300 @@ $(function() {
             canceltable.appendChild(entries);
 
         }
-        
-        self.updateActive = function() {
+
+        self.updateActive = function () {
             var entries = $("div[id^='entry']");
             //console.log(entries);
             for (var i = 0; i < entries.length; i++) {
                 entries[i].className = "entry-cancel";
             }
-            var entry = document.getElementById("entry"+self.ActiveID);
+            var entry = document.getElementById("entry" + self.ActiveID);
             entry.className = "entry activeobject";
         }
-        
+
         function get_object_name(objid) {
             var objname = self.ObjectList[objid]["object"];
-            return objname;    
+            return objname;
         }
-        
+
         function confirm_cancel_button(event) {
             //console.log(event.target);
             var theobject = event.target.value;
             var objname = get_object_name(theobject);
             confirm_cancel(theobject, objname);
         }
-        
+
         function confirm_cancel(objid, objname) {
             showConfirmationDialog({
                 title: gettext("Are you sure?"),
-                message: gettext("<p><strong>You are about to cancel object "+objname+".</strong>"),
+                message: gettext("<p><strong>You are about to cancel object " + objname + ".</strong>"),
                 question: gettext("Are you sure you want to do this?"),
                 cancel: gettext("Exit"),
                 proceed: gettext("Yes, Cancel It"),
-                onproceed:  function() {
-                            //thebutton.attr("disabled", "disabled");
-                            self.cancelObject(objid);
-                        }
-              });
+                onproceed: function () {
+                    //thebutton.attr("disabled", "disabled");
+                    self.cancelObject(objid);
+                }
+            });
         }
-        
+
         $(document.body).on("click", ".cancel-btn", confirm_cancel_button);
-        
-        
-        self.onDataUpdaterPluginMessage = function (plugin, data) {          
+
+
+        self.onDataUpdaterPluginMessage = function (plugin, data) {
             if (data.navBarActive) {
-                self.navBarActive('Current Object: '+data.navBarActive);
+                self.navBarActive('Current Object: ' + data.navBarActive);
             }
-            
+
             if (data.ActiveID >= 0) {
                 self.ActiveID = data.ActiveID;
                 self.updateActive();
             }
             //New list of objects
-            if (data.objects){
+            if (data.objects) {
                 self.ObjectList = data.objects;
                 self.updateObjectList();
             }
         }
-        
-//Everything below here is borrowed heavily from bradcfisher's ExcludeRegion plugin
-//https://github.com/bradcfisher/OctoPrint-ExcludeRegionPlugin
-    function CancelButtons() {
-      // Don't create buttons if using TouchUI, since they don't work anyway
-      if (self.touchui && self.touchui.isActive())
-        return;
-      
-      if (!$("#gcode_cancel_controls").length) {
-        $("#canvas_container").after(
-          '<div id="gcode_cancel_controls">'+
-            '<div class="main">'+
-              gettext("Cancel Objects")+
-              ' <div class="btn-group action-buttons">'+
-                '<div class="btn btn-mini disabled refreshCO" title="'+ gettext("Refresh object markers") +'">'+
-                  '<i class="fa"></i>'+ gettext("Refresh objects") +'</div>'+
-                '<div class="btn btn-mini disabled resetCO" title="'+ gettext("Reset objects, requires printing moves to recalculate") +'">'+
-                  '<i class="fa"></i>'+ gettext("Reset objects") +'</div>'+
-                '<div class="btn btn-mini disabled toggleCO" title="'+ gettext("Toggle object markers on/off") +'">'+
-                  '<i class="fa"></i>'+ gettext("Toggle markers") +'</div>'+
-              '</div>'+
-            '</div>'+
-          '</div>'
-        );
-
-        // Check if user isn't logged in
-        if (!self.loginState.loggedIn()) {
-            // Disable edit buttons
-            $("#gcode_cancel_controls button").addClass("disabled");
+
+        //Everything below here is borrowed heavily from bradcfisher's ExcludeRegion plugin
+        //https://github.com/bradcfisher/OctoPrint-ExcludeRegionPlugin
+        function CancelButtons() {
+            // Don't create buttons if using TouchUI, since they don't work anyway
+            if (self.touchui && self.touchui.isActive())
+                return;
+
+            if (!$("#gcode_cancel_controls").length) {
+                $("#canvas_container").after(
+                    '<div id="gcode_cancel_controls">' +
+                    '<div class="main">' +
+                    gettext("Cancel Objects") +
+                    ' <div class="btn-group action-buttons">' +
+                    '<div class="btn btn-mini disabled refreshCO" title="' + gettext("Refresh object markers") + '">' +
+                    '<i class="fa"></i>' + gettext("Refresh objects") + '</div>' +
+                    '<div class="btn btn-mini disabled resetCO" title="' + gettext("Reset objects, requires printing moves to recalculate") + '">' +
+                    '<i class="fa"></i>' + gettext("Reset objects") + '</div>' +
+                    '<div class="btn btn-mini disabled toggleCO" title="' + gettext("Toggle object markers on/off") + '">' +
+                    '<i class="fa"></i>' + gettext("Toggle markers") + '</div>' +
+                    '</div>' +
+                    '</div>' +
+                    '</div>'
+                );
+
+                // Check if user isn't logged in
+                if (!self.loginState.loggedIn()) {
+                    // Disable edit buttons
+                    $("#gcode_cancel_controls button").addClass("disabled");
+                }
+
+                // Edit button click event
+                self.$cancelButtons = $("#gcode_cancel_controls .btn");
+
+                self.$cancelButtons.click(function () {
+                    var $button = $(this);
+
+                    // Blur self
+                    $button.blur();
+
+                    // Check if button is not disabled
+                    if (!$button.hasClass("disabled")) {
+                        if ($button.hasClass("refreshCO")) {
+                            self.updateObjects();
+                            rendercancelOverlay();
+                        } else if ($button.hasClass("resetCO")) {
+                            self.resetObjects();
+                            self.updateObjects();
+                        } else if ($button.hasClass("toggleCO")) {
+                            toggleMarkers();
+                        }
+                    }
+                });
+                enableCancelButtons(self.isFileSelected());
+            }
         }
 
-        // Edit button click event
-        self.$cancelButtons = $("#gcode_cancel_controls .btn");
-
-        self.$cancelButtons.click(function() {
-          var $button = $(this);
-
-          // Blur self
-          $button.blur();
-
-          // Check if button is not disabled
-          if (!$button.hasClass("disabled")) {
-            if ($button.hasClass("refreshCO")) {
-              self.updateObjects();
-              rendercancelOverlay();
-            } else if ($button.hasClass("resetCO")) {
-              self.resetObjects();
-              self.updateObjects();
-            } else if ($button.hasClass("toggleCO")) {
-              toggleMarkers();
+        function toggleMarkers(showMarkers) {
+            var overlay = document.getElementById('gcode_canvas_cancel_overlay');
+            if (overlay == null) return;
+            var markersVisible = (overlay.style.visibility == 'visible');
+
+            if ((showMarkers === undefined) || (markersVisible != showMarkers)) {
+                var $gcodeCanvas = $("#gcode_canvas");
+                if (markersVisible) {
+                    overlay.style.visibility = 'hidden';
+                    $gcodeCanvas.off("click", check_point);
+                } else {
+                    overlay.style.visibility = 'visible';
+                    $gcodeCanvas.on("click", check_point);
+                }
             }
-          }
-        });       
-        enableCancelButtons(self.isFileSelected());
-      }
-    }
+        }
 
-    function toggleMarkers(showMarkers) {
-      var overlay = document.getElementById('gcode_canvas_cancel_overlay');
-      if (overlay == null) return;
-      var markersVisible = (overlay.style.visibility == 'visible');
-
-      if ((showMarkers === undefined) || (markersVisible != showMarkers)) {
-        var $gcodeCanvas = $("#gcode_canvas");
-        if (markersVisible) {
-          overlay.style.visibility='hidden';
-          $gcodeCanvas.off("click", check_point);
-        } else {
-          overlay.style.visibility='visible';
-          $gcodeCanvas.on("click", check_point);
+        function removeCancelButtons() {
+            $("#gcode_cancel_controls").remove();
+            delete self.$cancelButtons;
+            toggleMarkers(false);
         }
-      }
-    }
-    
-    function removeCancelButtons() {
-      $("#gcode_cancel_controls").remove();
-      delete self.$cancelButtons;
-      toggleMarkers(false);
-    }
 
-    function enableCancelButtons(enabled) {
-      if (self.$cancelButtons) {
-        if (enabled) {
-          self.$cancelButtons.removeClass("disabled");
-          toggleMarkers(true);
-        } else {
-          self.$cancelButtons.addClass("disabled");
-          toggleMarkers(false);
+        function enableCancelButtons(enabled) {
+            if (self.$cancelButtons) {
+                if (enabled) {
+                    self.$cancelButtons.removeClass("disabled");
+                    toggleMarkers(true);
+                } else {
+                    self.$cancelButtons.addClass("disabled");
+                    toggleMarkers(false);
+                }
+            }
         }
-      }    
-    }
 
-    function resetCancelButtons() {
-      removeCancelButtons();
-      CancelButtons();
-    }
+        function resetCancelButtons() {
+            removeCancelButtons();
+            CancelButtons();
+        }
 
-    if (self.touchui) {
-      self.touchui.isActive.subscribe(resetCancelButtons);
-    }
-    self.onSettingsHidden = resetCancelButtons;
-    self.onUserLoggedIn = resetCancelButtons;
+        if (self.touchui) {
+            self.touchui.isActive.subscribe(resetCancelButtons);
+        }
+        self.onSettingsHidden = resetCancelButtons;
+        self.onUserLoggedIn = resetCancelButtons;
 
-    self.onUserLoggedOut = function() {
-      removeCancelButtons();
-    }
+        self.onUserLoggedOut = function () {
+            removeCancelButtons();
+        }
+
+        function generateOverlays() {
+            if ($("#canvas_container").find(".gcode_canvas_wrapper1").length == 0) {
+                var $gcodeCanvas = $("#gcode_canvas");
+                var $wrapper = $('<div class="gcode_canvas_wrapper1"></div>');
+                $gcodeCanvas[0].parentNode.insertBefore($wrapper[0], $gcodeCanvas[0]);
+                $wrapper.append($gcodeCanvas);
+                clone_node($gcodeCanvas[0], $wrapper[0]);
+                placeOverlay($wrapper, $cancelOverlay, $gcodeCanvas);
+            }
+        }
+
+        function check_point(event) {
+            //assume all circular
+            console.log("Checking point");
+            var pt = eventToCanvasPt(event)
+
+            if (self.ObjectList.length > 0) {
+                for (var i = 0; i < self.ObjectList.length; i++) {
+                    if (self.ObjectList[i]["ignore"] || self.ObjectList[i]["cancelled"]) { continue; }
+                    var px = (self.ObjectList[i]["max_x"] + self.ObjectList[i]["min_x"]) / 2
+                    var py = (self.ObjectList[i]["max_y"] + self.ObjectList[i]["min_y"]) / 2
+                    var r = 4;
+                    var check = Math.hypot(px - pt.x, py - pt.y);
+                    console.log(check);
+
+                    if (check <= r) {
+                        confirm_cancel(self.ObjectList[i]["id"], self.ObjectList[i]["object"]);
+                        break;
+                    }
 
-    function generateOverlays() {
-      if ($("#canvas_container").find(".gcode_canvas_wrapper1").length == 0) {
-        var $gcodeCanvas = $("#gcode_canvas");
-        var $wrapper = $('<div class="gcode_canvas_wrapper1"></div>');
-        $gcodeCanvas[0].parentNode.insertBefore($wrapper[0], $gcodeCanvas[0]);
-        $wrapper.append($gcodeCanvas);
-        clone_node($gcodeCanvas[0], $wrapper[0]);
-        placeOverlay($wrapper, $cancelOverlay, $gcodeCanvas);        
-      }
-    }
-    
-   function check_point(event) {
-      //assume all circular
-      console.log("Checking point");
-      var pt = eventToCanvasPt(event)
-      
-      if (self.ObjectList.length > 0) {    
-            for (var i = 0; i < self.ObjectList.length; i++) {
-                if (self.ObjectList[i]["ignore"] || self.ObjectList[i]["cancelled"]) { continue; }
-                var px = (self.ObjectList[i]["max_x"] + self.ObjectList[i]["min_x"])/2
-                var py = (self.ObjectList[i]["max_y"] + self.ObjectList[i]["min_y"])/2
-                var r = 4;
-                var check = Math.hypot(px - pt.x, py - pt.y);
-                console.log(check);
-                
-                if (check <= r) { 
-                    confirm_cancel(self.ObjectList[i]["id"], self.ObjectList[i]["object"]);
-                    break;
                 }
+            }
+        }
 
-             }
-        }   
-    }
-    
-    var pixRatio = window.devicePixelRatio || 1;
-    function eventToCanvasPt(event) {
-      var canvas = $cancelOverlay[0];
-      var x = (event.offsetX !== undefined ? event.offsetX : (event.pageX - canvas.offsetLeft));
-      var y = (event.offsetY !== undefined ? event.offsetY : (event.pageY - canvas.offsetTop));
-      var pt = transformPoint(x * pixRatio, y * pixRatio);
-      return pt;
-    }
+        var pixRatio = window.devicePixelRatio || 1;
+        function eventToCanvasPt(event) {
+            var canvas = $cancelOverlay[0];
+            var x = (event.offsetX !== undefined ? event.offsetX : (event.pageX - canvas.offsetLeft));
+            var y = (event.offsetY !== undefined ? event.offsetY : (event.pageY - canvas.offsetTop));
+            var pt = transformPoint(x * pixRatio, y * pixRatio);
+            return pt;
+        }
 
-    function placeOverlay($parent, $overlay, $canvas) {
-      $parent.append($overlay);
-      clone_node($canvas[0], $overlay[0]);
-    }
-    
-    function clone_node(fromNode, toNode) {
-      toNode.style.height = fromNode.style.height || fromNode.width+"px";
-      toNode.style.width = fromNode.style.width || fromNode.height+"px";
-      if ((toNode.width !== undefined) && (fromNode.width !== undefined)) {
-        toNode.width = fromNode.width;
-        toNode.height = fromNode.height;
-      }
-    } 
-
-    function clear_Context(ctx) {
-      var p1 = transformPoint(0, 0);
-      var p2 = transformPoint(ctx.canvas.width, ctx.canvas.height);
-      ctx.clearRect(p1.x, p1.y, p2.x - p1.x, p2.y - p1.y);
-    }
-    
-    var render_frameCallbacks;    
-    function render_frame(id, callback /*, ...args */) {
-      if (render_frameCallbacks == null) {
-        render_frameCallbacks = {};
-
-        requestAnimationFrame(function() {
-          var callbacks = render_frameCallbacks;
-          render_frameCallbacks = null;
-
-          for (var id in callbacks) {
-            var cb = callbacks[id];
-            cb[0].apply(null, cb[1]);
-          }
-        });
-      }
+        function placeOverlay($parent, $overlay, $canvas) {
+            $parent.append($overlay);
+            clone_node($canvas[0], $overlay[0]);
+        }
 
-      if (!render_frameCallbacks[id]) {
-        render_frameCallbacks[id] = [ callback, Array.prototype.slice.call(arguments, 2) ];
-      }
-    }
+        function clone_node(fromNode, toNode) {
+            toNode.style.height = fromNode.style.height || fromNode.width + "px";
+            toNode.style.width = fromNode.style.width || fromNode.height + "px";
+            if ((toNode.width !== undefined) && (fromNode.width !== undefined)) {
+                toNode.width = fromNode.width;
+                toNode.height = fromNode.height;
+            }
+        }
 
-    var svgs = document.createElementNS("http://www.w3.org/2000/svg",'svg');
-    var pts  = svgs.createSVGPoint();
-    overXform = svgs.createSVGMatrix();
-    
-    function rendercancelOverlay() {
-      render_frame("cancelOverlay",the_callback);
-    }
-    
-    function the_callback() {
-        var ctx = cancelOverlayContext;
-        ctx.save();
-        clear_Context(ctx);       
-        if (self.ObjectList.length > 0) {    
-            for (var i = 0; i < self.ObjectList.length; i++) {
-                //Ignore entries that are just there for functional purposes
-                if (self.ObjectList[i]["ignore"]) { continue; }
-                ctx.beginPath();
-                var px = (self.ObjectList[i]["max_x"] + self.ObjectList[i]["min_x"])/2
-                var py = (self.ObjectList[i]["max_y"] + self.ObjectList[i]["min_y"])/2
-                ctx.fillStyle = "orange";
-                if (self.ObjectList[i]["cancelled"]) { ctx.fillStyle = "grey"; }
-                ctx.arc(px, py, 4, 0, 2 * Math.PI);
-                ctx.fill()
-                
-             }
-        }                               
-        ctx.restore();           
-    }
+        function clear_Context(ctx) {
+            var p1 = transformPoint(0, 0);
+            var p2 = transformPoint(ctx.canvas.width, ctx.canvas.height);
+            ctx.clearRect(p1.x, p1.y, p2.x - p1.x, p2.y - p1.y);
+        }
+
+        var render_frameCallbacks;
+        function render_frame(id, callback /*, ...args */) {
+            if (render_frameCallbacks == null) {
+                render_frameCallbacks = {};
 
-    function transformPoint(x,y) {
-        pts.x=x; pts.y=y;
-        return pts.matrixTransform(overXform.inverse());
+                requestAnimationFrame(function () {
+                    var callbacks = render_frameCallbacks;
+                    render_frameCallbacks = null;
+
+                    for (var id in callbacks) {
+                        var cb = callbacks[id];
+                        cb[0].apply(null, cb[1]);
+                    }
+                });
+            }
+
+            if (!render_frameCallbacks[id]) {
+                render_frameCallbacks[id] = [callback, Array.prototype.slice.call(arguments, 2)];
+            }
+        }
+
+        var svgs = document.createElementNS("http://www.w3.org/2000/svg", 'svg');
+        var pts = svgs.createSVGPoint();
+        overXform = svgs.createSVGMatrix();
+
+        function rendercancelOverlay() {
+            render_frame("cancelOverlay", the_callback);
+        }
+
+        function the_callback() {
+            var ctx = cancelOverlayContext;
+            ctx.save();
+            clear_Context(ctx);
+            if (self.ObjectList.length > 0) {
+                for (var i = 0; i < self.ObjectList.length; i++) {
+                    //Ignore entries that are just there for functional purposes
+                    if (self.ObjectList[i]["ignore"]) { continue; }
+                    ctx.beginPath();
+                    var px = (self.ObjectList[i]["max_x"] + self.ObjectList[i]["min_x"]) / 2
+                    var py = (self.ObjectList[i]["max_y"] + self.ObjectList[i]["min_y"]) / 2
+                    ctx.fillStyle = "orange";
+                    if (self.ObjectList[i]["cancelled"]) { ctx.fillStyle = "grey"; }
+                    ctx.arc(px, py, 4, 0, 2 * Math.PI);
+                    ctx.fill()
+
+                }
+            }
+            ctx.restore();
+        }
+
+        function transformPoint(x, y) {
+            pts.x = x; pts.y = y;
+            return pts.matrixTransform(overXform.inverse());
+        }
+
+        var previousOnViewportChange = GCODE.renderer.getOptions().onViewportChange;
+        GCODE.renderer.setOption({
+            onViewportChange: function (tform) {
+                overXform = tform;
+                cancelOverlayContext.setTransform(tform.a, tform.b, tform.c, tform.d, tform.e, tform.f);
+                rendercancelOverlay();
+                // Invoke any previously registered viewport change handler to ensure we don't interfere
+                // with other plugins which may also be listening.
+                if (previousOnViewportChange)
+                    previousOnViewportChange(tform);
+            },
+        });
     }
-   
-    var previousOnViewportChange = GCODE.renderer.getOptions().onViewportChange;
-    GCODE.renderer.setOption({
-        onViewportChange: function(tform) {
-          overXform = tform;
-          cancelOverlayContext.setTransform(tform.a, tform.b, tform.c, tform.d, tform.e, tform.f);
-          rendercancelOverlay();
-          if (self.markers() == false) { toggleMarkers(false); }  
-          // Invoke any previously registered viewport change handler to ensure we don't interfere
-          // with other plugins which may also be listening.
-          if (previousOnViewportChange)
-            previousOnViewportChange(tform);
-        },
-    });
-}
- 
+
     // This is how our plugin registers itself with the application, by adding some configuration
     // information to the global variable OCTOPRINT_VIEWMODELS
     OCTOPRINT_VIEWMODELS.push([
@@ -447,10 +456,10 @@ $(function() {
         // This is a list of dependencies to inject into the plugin, the order which you request
         // here is the order in which the dependencies will be injected into your view model upon
         // instantiation via the parameters argument
-        ["settingsViewModel","loginStateViewModel","gcodeViewModel"],
+        ["settingsViewModel", "loginStateViewModel", "gcodeViewModel"],
 
         // Finally, this is the list of selectors for all elements we want this view model to be bound to.
-        
-        ["#navbar_plugin_cancelobject","#tab_plugin_cancelobject","#settings_plugin_cancelobject"]
+
+        ["#navbar_plugin_cancelobject", "#tab_plugin_cancelobject", "#settings_plugin_cancelobject"]
     ]);
 });
diff --git a/octoprint_cancelobject/templates/cancelobject_settings.jinja2 b/octoprint_cancelobject/templates/cancelobject_settings.jinja2
index 4cbf251..a164b6c 100644
--- a/octoprint_cancelobject/templates/cancelobject_settings.jinja2
+++ b/octoprint_cancelobject/templates/cancelobject_settings.jinja2
@@ -55,7 +55,7 @@
         <label class="control-label">{{ _('GcodeViewer Marker Default On') }}</label>
         <div class="controls">
             <i class="icon icon-info-sign" title="If markers should be shown by default in the Gcodeviewer" data-toggle="tooltip"></i><br>
-            <input type="checkbox" name="markers" data-bind="checked: markers">
+            <input type="checkbox" data-bind="checked: markers">
         </div>
         <br>