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

- some fixes in the Import Image Plugin

Browse Source 
- made sure that the CNCJob objects made out of non-multi-toolGeometries are plotted correctly
This commit is contained in:
Marius Stanciu
2022-04-24 01:48:25 +03:00
committed by Marius
parent cb7bcf257f
commit 1972ed302f
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@@ -7,6 +7,11 @@ CHANGELOG for FlatCAM Evo beta
=================================================
24.04.2022
- some fixes in the Import Image Plugin
- made sure that the CNCJob objects made out of non-multi-toolGeometries are plotted correctly
23.04.2022
- fixed some leftovers due of recent changes in the theme management

16
appParsers/ParseSVG.py
View File

@@ -433,44 +433,44 @@ def getsvggeo(node, object_type, root=None, units='MM', res=64, factor=1.0, app=
# Parse
elif kind == 'path':
log.debug("***PATH***")
# log.debug("***PATH***")
P = parse_path(node.get('d'))
P = path2shapely(P, object_type, units=units, factor=factor)
# for path, the resulting geometry is already a list so no need to create a new one
geo = P
elif kind == 'rect':
log.debug("***RECT***")
# log.debug("***RECT***")
R = svgrect2shapely(node, n_points=res, factor=factor)
geo = [R]
elif kind == 'circle':
log.debug("***CIRCLE***")
# log.debug("***CIRCLE***")
C = svgcircle2shapely(node, n_points=res, factor=factor)
geo = [C]
elif kind == 'ellipse':
log.debug("***ELLIPSE***")
# log.debug("***ELLIPSE***")
E = svgellipse2shapely(node, n_points=res, factor=factor)
geo = [E]
elif kind == 'polygon':
log.debug("***POLYGON***")
# log.debug("***POLYGON***")
poly = svgpolygon2shapely(node, n_points=res, factor=factor)
geo = [poly]
elif kind == 'line':
log.debug("***LINE***")
# log.debug("***LINE***")
line = svgline2shapely(node, factor=factor)
geo = [line]
elif kind == 'polyline':
log.debug("***POLYLINE***")
# log.debug("***POLYLINE***")
pline = svgpolyline2shapely(node, factor=factor)
geo = [pline]
elif kind == 'use':
log.debug('***USE***')
# log.debug('***USE***')
# href= is the preferred name for this[1], but inkscape still generates xlink:href=.
# [1] https://developer.mozilla.org/en-US/docs/Web/SVG/Element/use#Attributes
href = node.attrib['href'] if 'href' in node.attrib else node.attrib['{http://www.w3.org/1999/xlink}href']

6
appPlugins/ToolImage.py
View File

@@ -179,6 +179,8 @@ class ToolImage(AppTool):
if response == bt_no:
self.app.inform.emit('[WARNING_NOTCL] %s' % _("Cancelled."))
return
self.app.inform.emit(_("Please be patient. Chromium is being downloaded in background.\n"
"The app will resume after it is installed."))
_filter = "Image Files(*.BMP *.PNG *.JPG *.JPEG);;" \
"Bitmap File (*.BMP);;" \
@@ -289,7 +291,7 @@ class ToolImage(AppTool):
1: {
'tooldia': tooldia,
'data': deepcopy(new_data),
'solid_geometry': geo_obj.solid_geometry
'solid_geometry': deepcopy(geo_obj.solid_geometry)
}
})
@@ -885,7 +887,7 @@ class ImageUI:
options_grid.addWidget(self.blur_lbl, 38, 0, 1, 2)
# Radius
self.blur_radius_lbl = FCLabel('%s' % _("Rounding"))
self.blur_radius_lbl = FCLabel('%s' % _("Radius"))
self.blur_radius_lbl.setToolTip(
_("Selective Gaussian blur preprocessing.")
)

5
appPlugins/ToolMilling.py
View File

@@ -3060,8 +3060,11 @@ class ToolMilling(AppTool, Excellon):
new_cncjob_obj.z_pdepth = float(geo_obj.obj_options["tools_mill_z_pdepth"])
new_cncjob_obj.feedrate_probe = float(geo_obj.obj_options["tools_mill_feedrate_probe"])
used_tools = list(tools_dict.keys())
new_cncjob_obj.used_tools = used_tools
total_gcode = ''
for tooluid_key in list(tools_dict.keys()):
for tooluid_key in used_tools:
tool_cnt += 1
dia_cnc_dict = deepcopy(tools_dict[tooluid_key])