From 23c4589a5eb986a046eba9315fada4ab66d9a890 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Wed, 11 Nov 2020 17:52:06 +0200 Subject: [PATCH] - removed the forcing of multigeo geometry usage when creating CNCJobs --- CHANGELOG.md | 4 ++++ appObjects/FlatCAMGeometry.py | 3 ++- app_Main.py | 9 +++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b2224d53..fec46966 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ CHANGELOG for FlatCAM beta ================================================= +11.11.2020 + +- removed the forcing of multigeo geometry usage when creating CNCJobs + 10.11.2020 - renamed the Extract Drills Tool to Extract Tool and enhanced the tool to extract a Soldermask Gerber from a given Gerber object diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py index 17b6a570..54b1b0e9 100644 --- a/appObjects/FlatCAMGeometry.py +++ b/appObjects/FlatCAMGeometry.py @@ -2103,7 +2103,8 @@ class GeometryObject(FlatCAMObj, Geometry): self.app.inform.emit(msg) return - self.multigeo = True + # force everything as MULTI-GEO + # self.multigeo = True # Object initialization function for app.app_obj.new_object() # RUNNING ON SEPARATE THREAD! diff --git a/app_Main.py b/app_Main.py index 9cbad171..47d00f3e 100644 --- a/app_Main.py +++ b/app_Main.py @@ -4240,13 +4240,11 @@ class App(QtCore.QObject): obj = self.collection.get_active() if obj is None: - self.inform.emit('[ERROR_NOTCL] %s' % - _("Failed. Select a Geometry Object and try again.")) + self.inform.emit('[ERROR_NOTCL] %s' % _("Failed. Select a Geometry Object and try again.")) return if not isinstance(obj, GeometryObject): - self.inform.emit('[ERROR_NOTCL] %s: %s' % - (_("Expected a GeometryObject, got"), type(obj))) + self.inform.emit('[ERROR_NOTCL] %s: %s' % (_("Expected a GeometryObject, got"), type(obj))) return obj.multigeo = False @@ -4260,8 +4258,7 @@ class App(QtCore.QObject): self.should_we_save = True - self.inform.emit('[success] %s' % - _("A Geometry object was converted to SingleGeo type.")) + self.inform.emit('[success] %s' % _("A Geometry object was converted to SingleGeo type.")) def on_defaults_dict_change(self, field): """