From 81aa0d4ef5ea22084e8fa96d84bb815cbeefdbc0 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sat, 18 Sep 2021 21:17:00 +0300 Subject: [PATCH] - fixed the Geometry object merge functionality - fixed a message when renaming an object --- CHANGELOG.md | 2 ++ appObjects/FlatCAMGeometry.py | 2 +- appObjects/ObjectCollection.py | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49ead322..1272056e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,8 @@ CHANGELOG for FlatCAM beta 18.09.2021 - some code reformatting in Extract Plugin +- fixed the Geometry object merge functionality +- fixed a message when renaming an object 15.09.2021 diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py index 0c2c7656..04ff3732 100644 --- a/appObjects/FlatCAMGeometry.py +++ b/appObjects/FlatCAMGeometry.py @@ -1595,7 +1595,7 @@ class GeometryObject(FlatCAMObj, Geometry): # find tools that have the same tool_type and group them by tool_type 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 intersect_list = [] diff --git a/appObjects/ObjectCollection.py b/appObjects/ObjectCollection.py index 9f4b9920..d7d9eecf 100644 --- a/appObjects/ObjectCollection.py +++ b/appObjects/ObjectCollection.py @@ -528,8 +528,8 @@ class ObjectCollection(QtCore.QAbstractItemModel): "setData() --> Could not remove the old object name from auto-completer model list. %s" % str(e)) # obj.build_ui() - self.app.inform.emit(_("Object renamed from {old} to {new}").format(old=old_name, - new=new_name)) + msg = "%s: %s %s: %s" % (_("Object renamed from"), old_name, _("to"), new_name) + self.app.inform.emit(msg) self.dataChanged.emit(index, index) return True