giuliof
/
flatcam
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged master into Port_to_Python3k

This commit is contained in:
Marius Stanciu 2018-05-29 17:43:33 +03:00
parent 4c0884e16d 214f4491ae
commit da9f890c39
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
camlib.py
View File

@ -2970,7 +2970,7 @@ class CNCjob(Geometry):
log.debug("Creating CNC Job from Excellon...") log.debug("Creating CNC Job from Excellon...")
# Tools # Tools
# Sort tools by diameter. items() -> [('name', diameter), ...] # Sort tools by diameter. items() -> [('name', diameter), ...]
#sorted_tools = sorted(list(exobj.tools.items()), key=lambda tl: tl[1]) #sorted_tools = sorted(list(exobj.tools.items()), key=lambda tl: tl[1])
sort = [] sort = []
@ -2987,7 +2987,7 @@ class CNCjob(Geometry):
# Create a sorted list of selected tools from the sorted_tools list # Create a sorted list of selected tools from the sorted_tools list
tools = [i for i, j in sorted_tools for k in selected_tools if i == k] tools = [i for i, j in sorted_tools for k in selected_tools if i == k]
log.debug("Tools selected and sorted are: %s" % str(tools)) log.debug("Tools selected and sorted are: %s" % str(tools))
# Points (Group by tool) # Points (Group by tool)
points = {} points = {}
@ -2998,7 +2998,7 @@ class CNCjob(Geometry):
except KeyError: except KeyError:
points[drill['tool']] = [drill['point']] points[drill['tool']] = [drill['point']]
#log.debug("Found %d drills." % len(points)) # log.debug("Found %d drills." % len(points))
self.gcode = [] self.gcode = []
# Basic G-Code macros # Basic G-Code macros
@ -3020,7 +3020,7 @@ class CNCjob(Geometry):
else: else:
gcode += "M03\n" # Spindle start gcode += "M03\n" # Spindle start
#gcode += self.pausecode + "\n" # gcode += self.pausecode + "\n"
for tool in tools: for tool in tools:
@ -3191,7 +3191,7 @@ class CNCjob(Geometry):
log.warning("G-code generation not implemented for %s" % (str(type(geo)))) log.warning("G-code generation not implemented for %s" % (str(type(geo))))
# Reverse coordinates if not a loop so we can continue # Reverse coordinates if not a loop so we can continue
# cutting without returning to the beginhing. # cutting without returning to the beginning.
if type(geo) == LineString: if type(geo) == LineString:
geo.coords = list(geo.coords)[::-1] geo.coords = list(geo.coords)[::-1]
reverse = True reverse = True

4
tclCommands/TclCommandSetSys.py
View File

@ -55,7 +55,9 @@ class TclCommandSetSys(TclCommand):
"false": False, "false": False,
"False": False, "False": False,
"true": True, "true": True,
"True": True "True": True,
"mm": "MM",
"in": "IN"
} }
if param in self.app.defaults: if param in self.app.defaults:

2
termwidget.py
View File

@ -132,6 +132,7 @@ class TermWidget(QWidget):
self._edit.setPlainText("...proccessing... [%s]" % detail) self._edit.setPlainText("...proccessing... [%s]" % detail)
self._edit.setDisabled(True) self._edit.setDisabled(True)
self._edit.setFocus()
def close_proccessing(self): def close_proccessing(self):
""" """
@ -143,6 +144,7 @@ class TermWidget(QWidget):
self._edit.setTextBackgroundColor(Qt.white) self._edit.setTextBackgroundColor(Qt.white)
self._edit.setPlainText('') self._edit.setPlainText('')
self._edit.setDisabled(False) self._edit.setDisabled(False)
self._edit.setFocus()
def _append_to_browser(self, style, text): def _append_to_browser(self, style, text):
""" """