Merge pull request #293 from sivu/experimental

added gcoder from another project. using gcoder to calculate dimensions and used filament

gcoder.py

+#!/usr/bin/env python
+# This file is copied from GCoder.
+#
+# GCoder is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# GCoder is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Printrun.  If not, see <http://www.gnu.org/licenses/>.
+
+import sys
+import re
+
+class Line(object):
+	def __init__(self,l):
+		self._x = None
+		self._y = None
+		self._z = None
+		self.e = None
+		self.f = 0
+		
+		self.regex = re.compile("[-]?\d+[.]?\d*")
+		self.raw = l.upper().lstrip()
+		self.imperial = False
+		self.relative = False
+		
+		if ";" in self.raw:
+			self.raw = self.raw.split(";")[0]
+		
+		self._parse_coordinates()
+		
+	def _to_mm(self,v):
+		if v and self.imperial:
+			return v*25.4
+		return v
+		
+	def _getx(self):
+		return self._to_mm(self._x)
+			
+	def _setx(self,v):
+		self._x = v
+
+	def _gety(self):
+		return self._to_mm(self._y)
+
+	def _sety(self,v):
+		self._y = v
+
+	def _getz(self):
+		return self._to_mm(self._z)
+
+	def _setz(self,v):
+		self._z = v
+
+	def _gete(self):
+		return self._to_mm(self._e)
+
+	def _sete(self,v):
+		self._e = v
+
+	x = property(_getx,_setx)
+	y = property(_gety,_sety)
+	z = property(_getz,_setz)
+	e = property(_gete,_sete)
+	
+		
+	def command(self):
+		try:
+			return self.raw.split(" ")[0]
+		except:
+			return ""
+			
+	def _get_float(self,which):
+		return float(self.regex.findall(self.raw.split(which)[1])[0])
+		
+		
+	def _parse_coordinates(self):
+		if "X" in self.raw:
+			self._x = self._get_float("X")
+			
+		if "Y" in self.raw:
+			self._y = self._get_float("Y")
+
+		if "Z" in self.raw:
+			self._z = self._get_float("Z")
+
+		if "E" in self.raw:
+			self.e = self._get_float("E")
+
+		if "F" in self.raw:
+			self.f = self._get_float("F")
+
+		
+	def is_move(self):
+		return "G1" in self.raw or "G0" in self.raw
+		
+
+class GCode(object):
+	def __init__(self,data):
+		self.lines = [Line(i) for i in data]
+		self._preprocess()
+	
+	def _preprocess(self):
+		#checks for G20, G21, G90 and G91, sets imperial and relative flags
+		imperial = False
+		relative = False
+		for line in self.lines:
+			if line.command() == "G20":
+				imperial = True
+			elif line.command() == "G21":
+				imperial = False
+			elif line.command() == "G90":
+				relative = False
+			elif line.command() == "G91":
+				relative = True
+			elif line.is_move():
+				line.imperial = imperial
+				line.relative = relative
+				
+
+	def measure(self):
+		xmin = 999999999
+		ymin = 999999999
+		zmin = 0
+		xmax = -999999999
+		ymax = -999999999
+		zmax = -999999999
+		relative = False
+		
+		current_x = 0
+		current_y = 0
+		current_z = 0
+
+		for line in self.lines:
+			if line.command() == "G92":
+				current_x = line.x or current_x
+				current_y = line.y or current_y
+				current_z = line.z or current_z	
+
+			if line.is_move():
+				x = line.x 
+				y = line.y
+				z = line.z
+				
+				if line.relative:
+					x = current_x + (x or 0)
+					y = current_y + (y or 0)
+					z = current_z + (z or 0)
+		
+				
+				if x and line.e:
+					if x < xmin:
+						xmin = x
+					if x > xmax:
+						xmax = x
+				if y and line.e:
+					if y < ymin:
+						ymin = y
+					if y > ymax:
+						ymax = y
+				if z:
+					if z < zmin:
+						zmin = z
+					if z > zmax:
+						zmax = z
+				
+				current_x = x or current_x
+				current_y = y or current_y
+				current_z = z or current_z
+				
+		self.xmin = xmin
+		self.ymin = ymin
+		self.zmin = zmin
+		self.xmax = xmax
+		self.ymax = ymax
+		self.zmax = zmax
+		
+		self.width = xmax-xmin
+		self.depth = ymax-ymin
+		self.height = zmax-zmin
+	
+	
+	def filament_length(self):
+		total_e = 0		
+		cur_e = 0
+		
+		for line in self.lines:
+			if line.command() == "G92":
+				if line.e != None:
+					total_e += cur_e
+					cur_e = line.e
+			elif line.is_move() and line.e:
+				if line.relative:
+					cur_e += line.e
+				else:
+					cur_e = line.e
+				
+				
+		return total_e
+
+
+def main():
+	if len(sys.argv) < 2:
+		print "usage: %s filename.gcode" % sys.argv[0]
+		return
+
+	gcode = GCode(sys.argv[1])
+	
+	gcode.measure()
+
+	print "Dimensions:"
+	print "\tX: %0.02f - %0.02f (%0.02f)" % (gcode.xmin,gcode.xmax,gcode.width)
+	print "\tY: %0.02f - %0.02f (%0.02f)" % (gcode.ymin,gcode.ymax,gcode.depth)
+	print "\tZ: %0.02f - %0.02f (%0.02f)" % (gcode.zmin,gcode.zmax,gcode.height)
+	print "Filament used: %0.02fmm" % gcode.filament_length()
+
+if __name__ == '__main__':
+	main()
\ No newline at end of file

pronsole.py

@@ -20,6 +20,7 @@ import glob, os, time, datetime
 import sys, subprocess
 import math, codecs
 from math import sqrt
+from gcoder import GCode
 
 import printcore
 from printrun.printrun_utils import install_locale
@@ -44,63 +45,13 @@ def dosify(name):
     return os.path.split(name)[1].split(".")[0][:8]+".g"
 
 def measurements(g):
-    Xcur = 0.0
-    Ycur = 0.0
-    Zcur = 0.0
-    Xmin = 1000000
-    Ymin = 1000000
-    Zmin = 1000000
-    Xmax=-1000000
-    Ymax=-1000000
-    Zmax=-1000000
-    Xtot = 0
-    Ytot = 0
-    Ztot = 0
-
-
-    for i in g:
-        if "X" in i and ("G1" in i or "G0" in i):
-            try:
-                Xcur = float(i.split("X")[1].split(" ")[0])
-                if Xcur<Xmin: Xmin=Xcur
-                if Xcur>Xmax: Xmax=Xcur
-            except:
-                pass
-        if "Y" in i and ("G1" in i or "G0" in i):
-            try:
-                Ycur = float(i.split("Y")[1].split(" ")[0])
-                if Ycur<Ymin: Ymin=Ycur
-                if Ycur>Ymax: Ymax=Ycur
-            except:
-                pass
-
-        if "Z" in i and ("G1" in i or "G0" in i):
-            try:
-                Zcur = float(i.split("Z")[1].split(" ")[0])
-                if Zcur<Zmin: Zmin = Zcur
-                if Zcur>Zmax: Zmax = Zcur
-            except:
-                pass
-
-
-        Xtot = Xmax - Xmin
-        Ytot = Ymax - Ymin
-        Ztot = Zmax - Zmin
-
-    return (Xtot, Ytot, Ztot, Xmin, Xmax, Ymin, Ymax, Zmin, Zmax)
+    gcode = GCode(g)
+    gcode.measure()
+    return (gcode.width, gcode.depth, gcode.height, gcode.xmin, gcode.xmax, gcode.ymin, gcode.ymax, gcode.zmin, gcode.zmax)
 
 def totalelength(g):
-    tot = 0
-    cur = 0
-    for i in g:
-        if "E" in i and ("G1" in i or "G0" in i):
-            try:
-                cur = float(i.split("E")[1].split(" ")[0])
-            except:
-                pass
-        elif "G92" in i and "E0" in i:
-            tot+=cur
-    return tot
+    gcode = GCode(g)
+    return gcode.filament_length()
 
 def get_coordinate_value(axis, parts):
     for i in parts: