pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bugfix. working area svg stays where it is on modal dialogs.

Browse source
This commit is contained in:
Teja 2015-01-21 12:26:16 +01:00
parent a49f2b721f
commit f19d2deffa
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/octoprint/plugins/svgtogcode/static/js/convert.js
View file

@ -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 = '<svg height="'+ h +'" version="1.1" width="'+ w +'" xmlns="http://www.w3.org/2000/svg"><defs/>'+ tmpsvg +'</svg>';
// TODO: js svg conversion
self.title(gettext("Converting"));
var gcodeFile = self.create_gcode_filename(self.workingArea.placedDesigns());

1
src/octoprint/static/js/app/viewmodels/settings.js
View file

@ -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");
}
});