Merged master into Port_to_Python3k
This commit is contained in:
commit
da9f890c39
|
@ -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
|
||||||
|
|
|
@ -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:
|
||||||
|
|
|
@ -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):
|
||||||
"""
|
"""
|
||||||
|
|
Loading…
Reference in New Issue