Merge branch 'stable-1.2.2' into v2_proto

src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js

@@ -158,7 +158,7 @@ $(function() {
                 text += "<small>" + gettext("Those components marked with <i class=\"icon-ok\"></i> can be updated directly.") + "</small>";
 
                 var options = {
-                    title: gettext("Update Available"),
+                    title: gettext("Mr Beam Update Available"),
                     text: text,
                     hide: false
                 };

src/octoprint/plugins/svgtogcode/__init__.py

@@ -270,7 +270,7 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin,
 			feedrate = max(1,data["defaultFeedrate"])
 			s.set(["defaultFeedrate"], feedrate)
 		if "svgDPI" in data and data["svgDPI"]:
-			s.set(["svgDPI"], data["svgDPI"])
+			s.set_int(["svgDPI"], data["svgDPI"])
 		if "debug_logging" in data:
 			old_debug_logging = s.get_boolean(["debug_logging"])
 			new_debug_logging = data["debug_logging"] in octoprint.settings.valid_boolean_trues
@@ -357,6 +357,8 @@ class SvgToGcodePlugin(octoprint.plugin.SlicerPlugin,
 			converter_path = '/home/teja/workspace/mrbeam-inkscape-ext'
 		elif("denkbrett" in hostname):
 			converter_path = '/home/flo/mrbeam/git/mrbeam-inkscape-ext'
+		elif ("clems-Air" in hostname):
+			converter_path = '/Users/clem/Dropbox/mrBeam/mrbeam-inkscape-ext'
 
 		import sys
 		sys.path.append(converter_path)

src/octoprint/plugins/svgtogcode/static/js/convert.js

@@ -41,8 +41,10 @@ $(function(){
 		// image engraving stuff
 		// preset values are a good start for wood engraving
 		self.images_placed = ko.observable(false);
+		self.text_placed = ko.observable(false);
 		self.show_image_parameters = ko.computed(function(){
-			return self.images_placed() || (self.fill_areas() && self.show_vector_parameters());
+			return (self.images_placed() || self.text_placed()
+				|| (self.fill_areas() && self.show_vector_parameters()));
 		});
 		self.imgIntensityWhite = ko.observable(0);
 		self.imgIntensityBlack = ko.observable(500);
@@ -85,6 +87,7 @@ $(function(){
 			self.show_vector_parameters(self.workingArea.getPlacedSvgs().length > 0);
 			self.show_fill_areas_checkbox(self.workingArea.hasFilledVectors())
 			self.images_placed(self.workingArea.getPlacedImages().length > 0);
+			self.text_placed(self.workingArea.hasTextItems());
 			//self.show_image_parameters(self.workingArea.getPlacedImages().length > 0);
 
 			if(self.show_vector_parameters() || self.show_image_parameters()){

src/octoprint/plugins/svgtogcode/static/js/matrix_oven.js

@@ -30,14 +30,15 @@ Snap.plugin(function (Snap, Element, Paper, global) {
 	 */
 	Element.prototype.bake = function (toCubics, dec) {
 		var elem = this;
-		if (!elem || !elem.paper) // don't handle unplaced elements. this causes double handling.
+
+		if (!elem || !elem.paper || elem.type !== "text" || elem.type !== "#text" || elem.type !== "tspan"){
 			return;
+		} // don't handle unplaced elements. this causes double handling.
 
 		if (typeof (toCubics) === 'undefined')
 			toCubics = false;
 		if (typeof (dec) === 'undefined')
 			dec = 5;
-		//var children = elem.selectAll('*')
 		var children = elem.children();
 		if (children.length > 0) {
 			for (var i = 0; i < children.length; i++) {
@@ -54,14 +55,15 @@ Snap.plugin(function (Snap, Element, Paper, global) {
 			elem.type !== "polygon" &&
 			elem.type !== "polyline" &&
 			elem.type !== "image" &&
-			elem.type !== "path"){
+			elem.type !== "path" &&
-			
+			elem.type !== "text" &&
-//			if(elem.type !== 'g' && elem.type !== 'desc' && elem.type !== 'defs')
+			elem.type !== "tspan" &&
-//				console.log('skipping unsupported element ', elem.type);
+			elem.type !== "#text"){
 			return;
 		}
 		
-		if (elem.type == 'image'){
+
+		if (elem.type == 'image' || elem.type == "text" || elem.type == "#text"){
 			// TODO ...
 			var x = parseFloat(elem.attr('x')),
 				y = parseFloat(elem.attr('y')),
@@ -89,7 +91,6 @@ Snap.plugin(function (Snap, Element, Paper, global) {
 			return;
 		}
 
-		//if(elem.type !== 'path') console.log("bake: converting " + elem.type + " to path");
 		var path_elem = elem.convertToPath();
 
 		if (!path_elem || path_elem.attr('d') === '' || path_elem.attr('d') === null)
@@ -438,6 +439,19 @@ Snap.plugin(function (Snap, Element, Paper, global) {
 		// Possibly the cubed root of 6, but 1.81 works best
 		var num = 1.81;
 		var tag = old_element.type;
+
+		var convertMMtoPixel = function (val) {
+			attrList = ['rx','ry','r','cx','cy','x1','x2','y1','y2','x','y','width','height'];
+			for(var attrIdx in attrList) {
+				if(val.attr(attrList[attrIdx]) != null && val.attr(attrList[attrIdx]).indexOf('mm') > -1) {
+					var tmp = parseFloat(val.attr(attrList[attrIdx])) * 3.5433;
+					val.attr(attrList[attrIdx], tmp);
+				}
+			}
+		}
+
+		convertMMtoPixel(old_element);
+
 		switch (tag) {
 			case 'ellipse':
 			case 'circle':

src/octoprint/plugins/svgtogcode/static/js/render_fills.js

@@ -50,7 +50,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
 				}
 			}
 		} else {
-			if(elem.type === 'image'){
+			if(elem.type === 'image' || elem.type === "text" || elem.type === "#text"){
 				selection.push(elem);
 			} else {
 				if(fillPaths && elem.is_filled()){
@@ -74,7 +74,10 @@ Snap.plugin(function (Snap, Element, Paper, global) {
 			elem.type !== "line" &&
 			elem.type !== "polygon" &&
 			elem.type !== "polyline" &&
-			elem.type !== "path" ){
+			elem.type !== "path" //&&
+			// elem.type !== "text" &&
+			// elem.type !== "#text"
+		){
 
 			return false;
 		}
@@ -121,7 +124,7 @@ Snap.plugin(function (Snap, Element, Paper, global) {
 
 		// get svg as dataUrl
 		var svgStr = elem.outerSVG();
-		var svgDataUri = 'data:image/svg+xml;base64,' + window.btoa(svgStr);
+		var svgDataUri = 'data:image/svg+xml;base64,' + window.btoa(unescape(encodeURIComponent(svgStr))); //deprecated unescape needed!
 		var source = new Image();
 		source.src = svgDataUri;
 

src/octoprint/plugins/svgtogcode/static/js/working_area.js

@@ -107,6 +107,7 @@ $(function(){
 		self.clear = function(){
 			snap.selectAll('#userContent>*').remove();
 			snap.selectAll('#placedGcodes>*').remove();
+			snap.selectAll('rect:not(#coordGrid)').remove();
 			self.placedDesigns([]);
 		};
 
@@ -132,14 +133,9 @@ $(function(){
 		};
 
 		self.getXYCoord = function(evt){
-			if(isFirefox) {
+			var scale = evt.target.parentElement.transform.baseVal[0].matrix.a;
-				var scale = evt.target.parentElement.transform.baseVal[0].matrix.a;
+			var x = self.px2mm(evt.offsetX) * scale;
-				var x = self.px2mm(evt.offsetX) * scale;
+			var y = self.px2mm(parseFloat(evt.target.attributes.height.value) - evt.offsetY) * scale;
-				var y = self.px2mm(parseFloat(evt.target.attributes.height.value) - evt.offsetY) * scale;
-			} else {
-				var x = self.px2mm(evt.offsetX);
-				var y = self.px2mm(evt.target.ownerSVGElement.getBoundingClientRect().height - evt.offsetY); // hopefully this works across browsers
-			}
 			x = Math.min(x, self.workingAreaWidthMM());
 			y = Math.min(y, self.workingAreaHeightMM());
 			return {x:x, y:y};
@@ -241,11 +237,26 @@ $(function(){
 			var url = self._getSVGserveUrl(file);
 			callback = function (f) {
 				var newSvgAttrs = {};
-				var root_attrs = f.select('svg').node.attributes;
+				if(f.select('svg') == null){
+					root_attrs = f.node.attributes;
+				} else {
+					var root_attrs = f.select('svg').node.attributes;
+				}
 				var doc_width = null;
 				var doc_height = null;
 				var doc_viewbox = null;
 
+				// find clippath elements
+				var clipPathEl = f.selectAll('clipPath');
+				if(clipPathEl.length != 0){
+					console.warn("Warning: removed unsupported clipPath element in SVG");
+					self.svg_contains_clipPath_warning();
+					clipPathEl.remove()
+				}
+
+				// find all elements with "display=none" and remove them
+				f.selectAll("[display=none]").remove()
+
 				// iterate svg tag attributes
 				for(var i = 0; i < root_attrs.length; i++){
 					var attr = root_attrs[i];
@@ -261,9 +272,19 @@ $(function(){
 					}
 				}
 
+				// find Illustrator comment and notify
+				f.node.childNodes.forEach(function(entry) {
+					if(entry.nodeType == 8) { // Nodetype 8 = comment
+						if(entry.textContent.indexOf('Illustrator') > -1) {
+							new PNotify({title: gettext("Illustrator SVG Detected"), text: "Illustrator SVG detected! To preserve coorect scale, please go to the \'Settings\' menu and change the \'SVG dpi\' field under \'Plugins/Svg Conversion\' according to your file. And add it again.", type: "info", hide: false});
+						}
+					}
+				});
+
 				// scale matrix
 				var mat = self.getDocumentViewBoxMatrix(doc_width, doc_height, doc_viewbox);
-				var scaleMatrixStr = new Snap.Matrix(mat[0][0],mat[0][1],mat[1][0],mat[1][1],mat[0][2],mat[1][2]).toTransformString();
+				var dpiscale = 90 / self.settings.settings.plugins.svgtogcode.svgDPI();
+				var scaleMatrixStr = new Snap.Matrix(mat[0][0],mat[0][1],mat[1][0],mat[1][1],mat[0][2],mat[1][2]).scale(dpiscale).toTransformString();
 				newSvgAttrs['transform'] = scaleMatrixStr;
 
 				var newSvg = snap.group(f.selectAll("svg>*"));
@@ -389,8 +410,20 @@ $(function(){
 			};
 		};
 
+
+		self.svg_contains_clipPath_warning = function(){
+            var error = "<p>" + gettext("The SVG file contains clipPath elements.<br/>clipPath is not supported yet and has been removed from file.") + "</p>";
+            //error += pnotifyAdditionalInfo("<pre>" + data.jqXHR.responseText + "</pre>");
+            new PNotify({
+                title: "clipPath elements removed",
+                text: error,
+                type: "warn",
+                hide: false
+            });
+		};
+
 		self.svg_contains_text_warning = function(svg){
-            var error = "<p>" + gettext("The svg file contains text elements.<br/>Please convert them to paths.<br/>Otherwise they will be ignored.") + "</p>";
+            var error = "<p>" + gettext("The SVG file contains text elements.<br/>If you want to laser just their outlines,<br/>please convert them to paths.<br/>Otherwise they will be engraved with infill.") + "</p>";
             //error += pnotifyAdditionalInfo("<pre>" + data.jqXHR.responseText + "</pre>");
             new PNotify({
                 title: "Text elements found",
@@ -398,7 +431,6 @@ $(function(){
                 type: "warn",
                 hide: false
             });
-			svg.selectAll('text,tspan').remove();
 		};
 
 		self.svg_misfitting_warning = function(svg, misfitting){
@@ -704,6 +736,16 @@ $(function(){
 			return snap.selectAll("#userContent image");
 		};
 
+		self.hasTextItems = function () {
+			if(snap.selectAll("#userContent tspan").length > 0 ||
+				snap.selectAll("#userContent text").length > 0 ||
+				snap.selectAll("userContent #text").length > 0) {
+				return true
+			}else{
+				return false
+			}
+		};
+
 		self.getPlacedGcodes = ko.computed(function() {
 			var gcodeFiles = [];
 			ko.utils.arrayForEach(self.placedDesigns(), function(design) {
@@ -826,7 +868,7 @@ $(function(){
 				for (var i = 0; i < fillings.length; i++) {
 					var item = fillings[i];
 
-					if (item.type === 'image') {
+					if (item.type === 'image' || item.type === "text" || item.type === "#text") {
 						// remove filter effects on images for proper rendering
 						var style = item.attr('style');
 						if (style !== null) {

src/octoprint/printer/standard.py

@@ -331,7 +331,7 @@ class Printer(PrinterInterface, comm.MachineComPrintCallback):
 	def position(self, x, y):
 		printer_profile = self._printerProfileManager.get_current_or_default()
 		movement_speed = min(printer_profile["axes"]["x"]["speed"], printer_profile["axes"]["y"]["speed"])
-		self.commands(["G90", "G0 X%.3f Y%.3f F%d" % (x, y, movement_speed), "?"])
+		self.commands(["G90", "G0 X%.3f Y%.3f F%d" % (x, y, movement_speed)])
 
 	def _convert_rate_value(self, factor, min=0, max=200):
 		if not isinstance(factor, (int, float, long)):

src/octoprint/translations/de/LC_MESSAGES/messages.po

@@ -568,8 +568,8 @@ msgstr ""
 "aktualisiert werden."
 
 #: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:131
-msgid "Update Available"
+msgid "Mr Beam Update Available"
-msgstr "Aktualisierung verfügbar"
+msgstr "Mr Beam Aktualisierung verfügbar"
 
 #: src/octoprint/plugins/softwareupdate/static/js/softwareupdate.js:143
 msgid "Ignore"

src/octoprint/util/comm_acc2.py

@@ -88,7 +88,7 @@ class MachineCom(object):
 		self._finished_passes = 0
 
 		# regular expressions
-		self._regex_command = re.compile("^\s*\$?([GM]\d+|[TH])")
+		self._regex_command = re.compile("^\s*\$?([GM]\d+|[THX])")
 		self._regex_feedrate = re.compile("F\d+", re.IGNORECASE)
 		self._regex_intensity = re.compile("S\d+", re.IGNORECASE)
 
@@ -147,7 +147,7 @@ class MachineCom(object):
 				elif line.startswith('['): # feedback message
 					self._handle_feedback_message(line)
 				elif line.startswith('Grb'): # Grbl startup message
-					self._handle_startup_message()
+					self._handle_startup_message(line)
 			except:
 				self._logger.exception("Something crashed inside the monitoring loop, please report this to Mr. Beam")
 				errorMsg = "See octoprint.log for details"
@@ -406,7 +406,7 @@ class MachineCom(object):
 		elif line[1:].startswith('Dis'): # [Disabled]
 			pass
 
-	def _handle_startup_message(self):
+	def _handle_startup_message(self, line):
 		if self.isOperational():
 			errorMsg = "Machine reset."
 			self._cmd = None
@@ -421,7 +421,14 @@ class MachineCom(object):
 			self._changeState(self.STATE_LOCKED)
 			eventManager().fire(Events.ERROR, {"error": self.getErrorString()})
 		else:
-			self._onConnected(self.STATE_LOCKED)
+			versionMatch = re.search("Grbl (?P<grbl>.+?)(_(?P<git>[0-9a-f]{7})(?P<dirty>-dirty)?)? \[.+\]", line)
+			if versionMatch:
+				versionDict = versionMatch.groupdict()
+				self._writeGrblVersionToFile(versionDict)
+				if self._compareGrblVersion(versionDict) is False:
+					self._flashGrbl()
+				else:
+					self._onConnected(self.STATE_LOCKED)
 
 	def _update_grbl_pos(self, line):
 		# line example:
@@ -617,7 +624,7 @@ class MachineCom(object):
 		params = ["avrdude", "-patmega328p", "-carduino", "-b" + str(self._baudrate), "-P" + str(self._port), "-D", "-Uflash:w:" + pathToGrblHex]
 		rc = subprocesscall(params)
 
-		if rc is False:
+		if rc == 0:
 			self._log("successfully flashed new grbl version")
 			self._openSerial()
 			self._changeState(self.STATE_CONNECTING)
@@ -754,6 +761,10 @@ class MachineCom(object):
 		self._changeState(self.STATE_HOMING)
 		return cmd
 
+	def _gcode_X_sent(self, cmd, cmd_type=None):
+		self._changeState(self.STATE_HOMING) # TODO: maybe change to seperate $X mode
+		return cmd
+
 	def _gcode_Hold_sent(self, cmd, cmd_type=None):
 		self._changeState(self.STATE_PAUSED)
 		return cmd
@@ -1164,6 +1175,9 @@ class PrintingGcodeFileInformation(PrintingFileInformation):
 
 		if not os.path.exists(self._filename) or not os.path.isfile(self._filename):
 			raise IOError("File %s does not exist" % self._filename)
+
+		self._stripCommments()
+
 		self._size = os.stat(self._filename).st_size
 		self._pos = 0
 
@@ -1217,6 +1231,16 @@ class PrintingGcodeFileInformation(PrintingFileInformation):
 			self._logger.exception("Exception while processing line")
 			raise e
 
+	def _stripCommments(self):
+		dir     = os.path.dirname(os.path.abspath(self._filename))
+		tmpfile = open(dir + '/gcode.tmp', 'w')
+		with open(self._filename, "r") as fileobject:
+			for line in fileobject:
+				if process_gcode_line(line) is not None:
+					tmpfile.write(line)
+		tmpfile.close()
+		self._filename = dir + '/gcode.tmp'
+
 def convert_pause_triggers(configured_triggers):
 	triggers = {
 		"enable": [],
@@ -1281,6 +1305,7 @@ def serialList():
 	baselist = baselist \
 				+ glob.glob("/dev/ttyUSB*") \
 				+ glob.glob("/dev/ttyACM*") \
+				+ glob.glob("/dev/ttyAMA*") \
 				+ glob.glob("/dev/tty.usb*") \
 				+ glob.glob("/dev/cu.*") \
 				+ glob.glob("/dev/cuaU*") \