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

- fixed the Geometry object merge functionality

Browse Source 
- fixed a message when renaming an object
This commit is contained in:
Marius Stanciu
2021-09-18 21:17:00 +03:00
committed by Marius
parent 824fae3bcb
commit 81aa0d4ef5
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -10,6 +10,8 @@ CHANGELOG for FlatCAM beta
18.09.2021 18.09.2021
- some code reformatting in Extract Plugin - some code reformatting in Extract Plugin
- fixed the Geometry object merge functionality
- fixed a message when renaming an object
15.09.2021 15.09.2021

2
appObjects/FlatCAMGeometry.py
View File

@@ -1595,7 +1595,7 @@ class GeometryObject(FlatCAMObj, Geometry):
# find tools that have the same tool_type and group them by tool_type # find tools that have the same tool_type and group them by tool_type
for k, v in new_tools.items(): for k, v in new_tools.items():
same_tool_type[v['tool_type']].append(k) same_tool_type[v['data']['tools_mill_tool_shape']].append(k)
# find the intersections in the above groups # find the intersections in the above groups
intersect_list = [] intersect_list = []

4
appObjects/ObjectCollection.py
View File

@@ -528,8 +528,8 @@ class ObjectCollection(QtCore.QAbstractItemModel):
"setData() --> Could not remove the old object name from auto-completer model list. %s" % "setData() --> Could not remove the old object name from auto-completer model list. %s" %
str(e)) str(e))
# obj.build_ui() # obj.build_ui()
self.app.inform.emit(_("Object renamed from <b>{old}</b> to <b>{new}</b>").format(old=old_name, msg = "%s: <b>%s</b> %s: <b>%s</b>" % (_("Object renamed from"), old_name, _("to"), new_name)
new=new_name)) self.app.inform.emit(msg)
self.dataChanged.emit(index, index) self.dataChanged.emit(index, index)
return True return True