bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in marius_stanciu/flatcam_mpl/TCL_edit_focus (pull request #93)

Browse Source 
TCL edit focus
This commit is contained in:
Marius Stanciu
2018-05-29 03:04:18 +00:00
committed by jpcgt
parent 20bb287586 b85c490256
commit 4bacc22b1f
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camlib.py
View File

@@ -2994,7 +2994,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
@@ -3016,7 +3016,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:
@@ -3187,7 +3187,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

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):
""" """