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

- some fixes and prepared the activity monitor area to receive updated texts

Browse Source
This commit is contained in:
Marius Stanciu
2019-09-06 15:20:19 +03:00
parent 9f0b5d92db
commit c1ce72e9fb
7 changed files with 254 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
flatcamTools/ToolNonCopperClear.py
View File

@@ -1637,11 +1637,10 @@ class NonCopperClear(FlatCAMTool, Gerber):
area = MultiPolygon([area])
# variables to display the percentage of work done
step = int(len(area.geoms) / 100)
geo_len = len(area.geoms)
disp_number = 0
old_disp_number = 0
log.warning("Total number of polygons to be cleared. %s" % str(len(area.geoms)))
log.warning("Step: %d" % step)
log.warning("Total number of polygons to be cleared. %s" % str(geo_len))
if area.geoms:
if len(area.geoms) > 0:
@@ -1687,10 +1686,10 @@ class NonCopperClear(FlatCAMTool, Gerber):
continue
pol_nr += 1
disp_number = int(pol_nr / step)
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 99]))
# log.debug("Polygons cleared: %d" % pol_nr)
if disp_number > old_disp_number and disp_number <= 100:
if old_disp_number < disp_number <= 100:
app_obj.inform.emit(
'[success] %s %s%s %s: %d%%' % (_('Non-Copper Clearing with tool diameter = '),
str(tool),
@@ -1937,11 +1936,10 @@ class NonCopperClear(FlatCAMTool, Gerber):
allparts[:] = []
# variables to display the percentage of work done
step = int(len(area.geoms) / 100)
geo_len = len(area.geoms)
disp_number = 0
old_disp_number = 0
log.warning("Total number of polygons to be cleared. %s" % str(len(area.geoms)))
log.warning("Step: %d" % step)
log.warning("Total number of polygons to be cleared. %s" % str(geo_len))
if area.geoms:
if len(area.geoms) > 0:
@@ -1995,7 +1993,7 @@ class NonCopperClear(FlatCAMTool, Gerber):
rest_geo.append(poly)
pol_nr += 1
disp_number = int(pol_nr / step)
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 99]))
# log.debug("Polygons cleared: %d" % pol_nr)
if disp_number > old_disp_number and disp_number <= 100:

136
flatcamTools/ToolPaint.py
View File

@@ -1497,6 +1497,8 @@ class ToolPaint(FlatCAMTool, Gerber):
# assert isinstance(geo_obj, FlatCAMGeometry), \
# "Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
log.debug("Paint Tool. Normal painting all task started.")
tool_dia = None
if order == 'fwd':
sorted_tools.sort(reverse=False)
@@ -1520,6 +1522,14 @@ class ToolPaint(FlatCAMTool, Gerber):
geo_obj.solid_geometry = []
for tool_dia in sorted_tools:
log.debug("Starting geometry processing for tool: %s" % str(tool_dia))
app_obj.inform.emit(
'[success] %s %s%s %s: %d%%' % (_('Painting with tool diameter = '),
str(tool_dia),
self.units.lower(),
_('started. Progress'),
0)
)
# find the tooluid associated with the current tool_dia so we know where to add the tool solid_geometry
for k, v in tools_storage.items():
@@ -1527,7 +1537,15 @@ class ToolPaint(FlatCAMTool, Gerber):
current_uid = int(k)
break
for geo in recurse(obj.solid_geometry):
painted_area = recurse(obj.solid_geometry)
# variables to display the percentage of work done
geo_len = len(painted_area)
disp_number = 0
old_disp_number = 0
log.warning("Total number of polygons to be cleared. %s" % str(geo_len))
pol_nr = 0
for geo in painted_area:
try:
# Polygons are the only really paintable geometries, lines in theory have no area to be painted
if not isinstance(geo, Polygon):
@@ -1570,6 +1588,21 @@ class ToolPaint(FlatCAMTool, Gerber):
"Or a different Method of paint\n%s") % str(e))
return
pol_nr += 1
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 99]))
# log.debug("Polygons cleared: %d" % pol_nr)
if old_disp_number < disp_number <= 100:
app_obj.inform.emit(
'[success] %s %s%s %s: %d%%' % (_('Painting with tool diameter = '),
str(tool_dia),
self.units.lower(),
_('started. Progress'),
disp_number)
)
old_disp_number = disp_number
# log.debug("Polygons cleared: %d. Percentage done: %d%%" % (pol_nr, disp_number))
# add the solid_geometry to the current too in self.paint_tools (tools_storage)
# dictionary and then reset the temporary list that stored that solid_geometry
tools_storage[current_uid]['solid_geometry'] = deepcopy(total_geometry)
@@ -1618,6 +1651,8 @@ class ToolPaint(FlatCAMTool, Gerber):
assert isinstance(geo_obj, FlatCAMGeometry), \
"Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
log.debug("Paint Tool. Rest machining painting all task started.")
tool_dia = None
sorted_tools.sort(reverse=True)
@@ -1636,7 +1671,17 @@ class ToolPaint(FlatCAMTool, Gerber):
return
for tool_dia in sorted_tools:
for geo in recurse(obj.solid_geometry):
log.debug("Starting geometry processing for tool: %s" % str(tool_dia))
painted_area = recurse(obj.solid_geometry)
# variables to display the percentage of work done
geo_len = int(len(painted_area) / 100)
disp_number = 0
old_disp_number = 0
log.warning("Total number of polygons to be cleared. %s" % str(geo_len))
pol_nr = 0
for geo in painted_area:
try:
geo = Polygon(geo) if not isinstance(geo, Polygon) else geo
poly_buf = geo.buffer(-paint_margin)
@@ -1670,6 +1715,21 @@ class ToolPaint(FlatCAMTool, Gerber):
"Or a different Method of paint\n%s") % str(e))
return
pol_nr += 1
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 99]))
# log.debug("Polygons cleared: %d" % pol_nr)
if old_disp_number < disp_number <= 100:
app_obj.inform.emit(
'[success] %s %s%s %s: %d%%' % (_('Painting with tool diameter = '),
str(tool_dia),
self.units.lower(),
_('started. Progress'),
disp_number)
)
old_disp_number = disp_number
# log.debug("Polygons cleared: %d. Percentage done: %d%%" % (pol_nr, disp_number))
# find the tooluid associated with the current tool_dia so we know where to add the tool solid_geometry
for k, v in tools_storage.items():
if float('%.4f' % v['tooldia']) == float('%.4f' % tool_dia):
@@ -1833,6 +1893,9 @@ class ToolPaint(FlatCAMTool, Gerber):
def gen_paintarea(geo_obj, app_obj):
# assert isinstance(geo_obj, FlatCAMGeometry), \
# "Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
log.debug("Paint Tool. Normal painting area task started.")
tool_dia = None
if order == 'fwd':
sorted_tools.sort(reverse=False)
@@ -1867,6 +1930,14 @@ class ToolPaint(FlatCAMTool, Gerber):
geo_obj.solid_geometry = []
for tool_dia in sorted_tools:
log.debug("Starting geometry processing for tool: %s" % str(tool_dia))
app_obj.inform.emit(
'[success] %s %s%s %s: %d%%' % (_('Painting with tool diameter = '),
str(tool_dia),
self.units.lower(),
_('started. Progress'),
0)
)
# find the tooluid associated with the current tool_dia so we know where to add the tool solid_geometry
for k, v in tools_storage.items():
@@ -1874,7 +1945,15 @@ class ToolPaint(FlatCAMTool, Gerber):
current_uid = int(k)
break
for geo in recurse(geo_to_paint):
painted_area = recurse(geo_to_paint)
# variables to display the percentage of work done
geo_len = len(painted_area)
disp_number = 0
old_disp_number = 0
log.warning("Total number of polygons to be cleared. %s" % str(geo_len))
pol_nr = 0
for geo in painted_area:
try:
# Polygons are the only really paintable geometries, lines in theory have no area to be painted
if not isinstance(geo, Polygon):
@@ -1917,6 +1996,21 @@ class ToolPaint(FlatCAMTool, Gerber):
"Or a different Method of paint\n%s") % str(e))
return
pol_nr += 1
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 99]))
# log.debug("Polygons cleared: %d" % pol_nr)
if disp_number > old_disp_number and disp_number <= 100:
app_obj.inform.emit(
'[success] %s %s%s %s: %d%%' % (_('Painting with tool diameter = '),
str(tool_dia),
self.units.lower(),
_('started. Progress'),
disp_number)
)
old_disp_number = disp_number
# log.debug("Polygons cleared: %d. Percentage done: %d%%" % (pol_nr, disp_number))
# add the solid_geometry to the current too in self.paint_tools (tools_storage)
# dictionary and then reset the temporary list that stored that solid_geometry
tools_storage[current_uid]['solid_geometry'] = deepcopy(total_geometry)
@@ -1965,6 +2059,8 @@ class ToolPaint(FlatCAMTool, Gerber):
assert isinstance(geo_obj, FlatCAMGeometry), \
"Initializer expected a FlatCAMGeometry, got %s" % type(geo_obj)
log.debug("Paint Tool. Rest machining painting area task started.")
tool_dia = None
sorted_tools.sort(reverse=True)
@@ -1983,7 +2079,24 @@ class ToolPaint(FlatCAMTool, Gerber):
return
for tool_dia in sorted_tools:
for geo in recurse(obj.solid_geometry):
log.debug("Starting geometry processing for tool: %s" % str(tool_dia))
app_obj.inform.emit(
'[success] %s %s%s %s: %d%%' % (_('Painting with tool diameter = '),
str(tool_dia),
self.units.lower(),
_('started. Progress'),
0)
)
painted_area = recurse(obj.solid_geometry)
# variables to display the percentage of work done
geo_len = len(painted_area)
disp_number = 0
old_disp_number = 0
log.warning("Total number of polygons to be cleared. %s" % str(geo_len))
pol_nr = 0
for geo in painted_area:
try:
geo = Polygon(geo) if not isinstance(geo, Polygon) else geo
poly_buf = geo.buffer(-paint_margin)
@@ -2017,6 +2130,21 @@ class ToolPaint(FlatCAMTool, Gerber):
"Or a different Method of paint\n%s") % str(e))
return
pol_nr += 1
disp_number = int(np.interp(pol_nr, [0, geo_len], [0, 99]))
# log.debug("Polygons cleared: %d" % pol_nr)
if disp_number > old_disp_number and disp_number <= 100:
app_obj.inform.emit(
'[success] %s %s%s %s: %d%%' % (_('Painting with tool diameter = '),
str(tool_dia),
self.units.lower(),
_('started. Progress'),
disp_number)
)
old_disp_number = disp_number
# log.debug("Polygons cleared: %d. Percentage done: %d%%" % (pol_nr, disp_number))
# find the tooluid associated with the current tool_dia so we know where to add the tool solid_geometry
for k, v in tools_storage.items():
if float('%.4f' % v['tooldia']) == float('%.4f' % tool_dia):

5
flatcamTools/ToolPanelize.py
View File

@@ -620,6 +620,9 @@ class Panelize(FlatCAMTool):
app_obj.log.debug("Found %s geometries. Creating a panel geometry cascaded union ..." %
len(obj_fin.solid_geometry))
self.app.inform.emit(_("Found %s geometries. Creating a final panel geometry ...") %
len(obj_fin.solid_geometry))
obj_fin.solid_geometry = cascaded_union(obj_fin.solid_geometry)
app_obj.log.debug("Finished creating a cascaded union for the panel.")
@@ -639,7 +642,7 @@ class Panelize(FlatCAMTool):
"Final panel has {col} columns and {row} rows").format(
col=columns, row=rows))
proc = self.app.proc_container.new(_("Generating panel ... Please wait."))
proc = self.app.proc_container.new(_("Generating panel ..."))
def job_thread(app_obj):
try: