Commit 7c9e076f authored by Clarence Risher's avatar Clarence Risher

simpler code for build dimensions, remove debugging prints

parent 5d4aad0c
...@@ -84,11 +84,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -84,11 +84,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
] ]
self.custombuttons=[] self.custombuttons=[]
self.btndict={} self.btndict={}
print self.settings.build_dimensions
self.parse_cmdline(sys.argv[1:]) self.parse_cmdline(sys.argv[1:])
print self.settings.build_dimensions
self.build_dimensions_list = self.get_build_dimensions(self.settings.build_dimensions) self.build_dimensions_list = self.get_build_dimensions(self.settings.build_dimensions)
print self.build_dimensions_list
customdict={} customdict={}
try: try:
execfile("custombtn.txt",customdict) execfile("custombtn.txt",customdict)
...@@ -1480,15 +1477,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole): ...@@ -1480,15 +1477,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
"[^\d+-]*([+-]\d+)?" + # Y corner coordinate "[^\d+-]*([+-]\d+)?" + # Y corner coordinate
"[^\d+-]*([+-]\d+)?" # Z corner coordinate "[^\d+-]*([+-]\d+)?" # Z corner coordinate
,bdim).groups() ,bdim).groups()
print bdl defaults = [200, 200, 100, 0, 0, 0]
bdl_float = [ bdl_float = [float(value) if value else defaults[i] for i, value in enumerate(bdl)]
200.0 if bdl[0]==None else float(bdl[0]),
200.0 if bdl[1]==None else float(bdl[1]),
100.0 if bdl[2]==None else float(bdl[2]),
0.0 if bdl[3]==None else float(bdl[3]),
0.0 if bdl[4]==None else float(bdl[4]),
0.0 if bdl[5]==None else float(bdl[5]),
]
return bdl_float return bdl_float
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment