diff --git a/src/octoprint/plugins/svgtogcode/static/js/convert.js b/src/octoprint/plugins/svgtogcode/static/js/convert.js index e4d735d3..0273b61a 100644 --- a/src/octoprint/plugins/svgtogcode/static/js/convert.js +++ b/src/octoprint/plugins/svgtogcode/static/js/convert.js @@ -31,13 +31,11 @@ function VectorConversionViewModel(loginStateViewModel, settingsViewModel, worki }; self.show2 = function() { - var tmpsvg = snap.select("#scaleGroup"); // get working area + var tmpsvg = snap.select("#scaleGroup").innerSVG(); // get working area var dim = self.settings.printer_bedDimensions(); var w = dim.x * 90/25.4; // convert mm to pix with 90dpi (inkscape default - TODO use 72 for illustrator svg) var h = dim.y * 90/25.4; - var s = Snap(w, h); // create new empty svg with working area dimensions - s.append(tmpsvg); // .. and fill it - self.svg = s.outerSVG(); + self.svg = ''+ tmpsvg +''; // TODO: js svg conversion self.title(gettext("Converting")); var gcodeFile = self.create_gcode_filename(self.workingArea.placedDesigns()); diff --git a/src/octoprint/static/js/app/viewmodels/settings.js b/src/octoprint/static/js/app/viewmodels/settings.js index 23a8360e..4554b4d0 100644 --- a/src/octoprint/static/js/app/viewmodels/settings.js +++ b/src/octoprint/static/js/app/viewmodels/settings.js @@ -400,7 +400,6 @@ function SettingsViewModel(loginStateViewModel, usersViewModel) { // $("#settings_dialog").modal("hide"); // $("#settings_save_btn").attr("disabled", "disabled"); $("#settings_save_btn").css("visibility", "hidden"); - console.log("save callback"); } });