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

- made sure that the timeout parameter used by some Tcl Commands is seen as an integer in all cases 

- minor changes in Paint Tool
This commit is contained in:
Marius Stanciu 2020-04-10 18:54:04 +03:00 committed by Marius
parent 13644187e4
commit 496be49027
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -9,6 +9,12 @@ CAD program, and create G-Code for Isolation routing.
=================================================
10.04.2020
- made sure that the timeout parameter used by some Tcl Commands is seen as an integer in all cases
- minor changes in Paint Tool
9.04.2020
- if FlatCAM is not run with Python version >= 3.5 it will exit.

25
flatcamTools/ToolPaint.py
View File

@ -12,12 +12,11 @@ from FlatCAMTool import FlatCAMTool
from copy import deepcopy
# from ObjectCollection import *
from flatcamParsers.ParseGerber import Gerber
from FlatCAMObj import FlatCAMGerber, FlatCAMGeometry
from camlib import Geometry, FlatCAMRTreeStorage
from flatcamGUI.GUIElements import FCTable, FCDoubleSpinner, FCCheckBox, FCInputDialog, RadioSet, FCButton, FCComboBox
import FlatCAMApp
from shapely.geometry import base, Polygon, MultiPolygon, LinearRing, Point, MultiLineString
from shapely.geometry import base, Polygon, MultiPolygon, LinearRing, Point
from shapely.ops import cascaded_union, unary_union, linemerge
from matplotlib.backend_bases import KeyEvent as mpl_key_event
@ -2075,7 +2074,7 @@ class ToolPaint(FlatCAMTool, Gerber):
:return: None
"""
if isinstance(obj, FlatCAMGerber):
if obj.kind == 'gerber':
# I don't do anything here, like buffering when the Gerber is loaded without buffering????!!!!
if self.app.defaults["gerber_buffering"] == 'no':
self.app.inform.emit('%s %s %s' %
@ -2417,7 +2416,7 @@ class ToolPaint(FlatCAMTool, Gerber):
# "Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
log.debug("Paint Tool. Normal painting all task started.")
if isinstance(obj, FlatCAMGerber):
if obj.kind == 'gerber':
if app_obj.defaults["gerber_buffering"] == 'no':
app_obj.inform.emit('%s %s' %
(_("Paint Tool. Normal painting all task started."),
@ -2435,7 +2434,7 @@ class ToolPaint(FlatCAMTool, Gerber):
else:
pass
if isinstance(obj, FlatCAMGerber):
if obj.kind == 'gerber':
if self.app.defaults["tools_paint_plotting"] == 'progressive':
if isinstance(obj.solid_geometry, list):
obj.solid_geometry = MultiPolygon(obj.solid_geometry).buffer(0)
@ -2629,7 +2628,7 @@ class ToolPaint(FlatCAMTool, Gerber):
# "Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
log.debug("Paint Tool. Rest machining painting all task started.")
if isinstance(obj, FlatCAMGerber):
if obj.kind == 'gerber':
if app_obj.defaults["gerber_buffering"] == 'no':
app_obj.inform.emit('%s %s %s' %
(_("Paint Tool."), _("Rest machining painting all task started."),
@ -2644,7 +2643,7 @@ class ToolPaint(FlatCAMTool, Gerber):
tool_dia = None
sorted_tools.sort(reverse=True)
if isinstance(obj, FlatCAMGerber):
if obj.kind == 'gerber':
if self.app.defaults["tools_paint_plotting"] == 'progressive':
if isinstance(obj.solid_geometry, list):
obj.solid_geometry = MultiPolygon(obj.solid_geometry).buffer(0)
@ -3079,7 +3078,7 @@ class ToolPaint(FlatCAMTool, Gerber):
# "Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
log.debug("Paint Tool. Normal painting area task started.")
if isinstance(obj, FlatCAMGerber):
if obj.kind == 'gerber':
if app_obj.defaults["gerber_buffering"] == 'no':
app_obj.inform.emit('%s %s' %
(_("Paint Tool. Normal painting area task started."),
@ -3100,14 +3099,13 @@ class ToolPaint(FlatCAMTool, Gerber):
# this is were heavy lifting is done and creating the geometry to be painted
target_geo = MultiPolygon(obj.solid_geometry)
if isinstance(obj, FlatCAMGerber):
if obj.kind == 'gerber':
if self.app.defaults["tools_paint_plotting"] == 'progressive':
if isinstance(target_geo, list):
target_geo = MultiPolygon(target_geo).buffer(0)
else:
target_geo = target_geo.buffer(0)
geo_to_paint = target_geo.intersection(sel_obj)
painted_area = recurse(geo_to_paint)
@ -3444,7 +3442,7 @@ class ToolPaint(FlatCAMTool, Gerber):
# "Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
log.debug("Paint Tool. Rest machining painting area task started.")
if isinstance(obj, FlatCAMGerber):
if obj.kind == 'gerber':
if app_obj.defaults["gerber_buffering"] == 'no':
app_obj.inform.emit('%s %s %s' %
(_("Paint Tool."), _("Rest machining painting area task started."),
@ -3468,7 +3466,7 @@ class ToolPaint(FlatCAMTool, Gerber):
# this is were heavy lifting is done and creating the geometry to be painted
target_geo = obj.solid_geometry
if isinstance(obj, FlatCAMGerber):
if obj.kind == 'gerber':
if self.app.defaults["tools_paint_plotting"] == 'progressive':
if isinstance(target_geo, list):
target_geo = MultiPolygon(target_geo).buffer(0)
@ -3533,7 +3531,6 @@ class ToolPaint(FlatCAMTool, Gerber):
pol_nr = 0
for geo in poly_buf:
try:
cp = None
@ -3952,7 +3949,7 @@ class ToolPaint(FlatCAMTool, Gerber):
for row in range(self.tools_table.rowCount()):
for col in [2, 4]:
try:
self.ui.geo_tools_table.cellWidget(row, col).currentIndexChanged.disconnect()
self.tools_table.cellWidget(row, col).currentIndexChanged.disconnect()
except (TypeError, AttributeError):
pass

3
tclCommands/TclCommand.py
View File

@ -387,7 +387,8 @@ class TclCommandSignaled(TclCommand):
# Terminate on timeout
if timeout is not None:
QtCore.QTimer.singleShot(timeout, report_quit)
time_val = int(timeout)
QtCore.QTimer.singleShot(time_val, report_quit)
# Block
loop.exec_()