From 6060bfef443d24712c4bdcea453cd11476769468 Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sun, 19 Sep 2021 04:30:07 +0300 Subject: [PATCH] - In Plugins: Panelize, Cutout, Extract, Copper Thieving disabled the autoload of the last created APP object --- CHANGELOG.md | 1 + appPlugins/ToolCopperThieving.py | 6 +++--- appPlugins/ToolCutOut.py | 10 +++++----- appPlugins/ToolExtract.py | 2 +- appPlugins/ToolPanelize.py | 11 ++++++----- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aecc318..4c4279b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ CHANGELOG for FlatCAM beta - fixed Extract Plugin not extracting soldermask for aperture macros - fixed INFO in Gerber Object UI to show correctly the type of geometric element in Follow geometry - in INFO functionality for Gerber Object made the difference if the Follow geometry is not a Point or a LineString +- In Plugins: Panelize, Cutout, Extract, Copper Thieving disabled the autoload of the last created APP object 18.09.2021 diff --git a/appPlugins/ToolCopperThieving.py b/appPlugins/ToolCopperThieving.py index a159cbbe..6dfe4f44 100644 --- a/appPlugins/ToolCopperThieving.py +++ b/appPlugins/ToolCopperThieving.py @@ -716,7 +716,7 @@ class ToolCopperThieving(AppTool): tool_obj.app.inform.emit('[ERROR_NOTCL] %s' % _("The reference object type is not supported.")) return 'fail' - log.debug("Copper Thieving Tool. Finished creating areas to fill with copper.") + self.app.log.debug("Copper Thieving Tool. Finished creating areas to fill with copper.") tool_obj.app.inform.emit(_("Copper Thieving Tool. Appending new geometry and buffering.")) @@ -947,7 +947,7 @@ class ToolCopperThieving(AppTool): local_use=grb_obj, use_thread=False) - ret_val = self.app.app_obj.new_object('gerber', outname, initialize, plot=True) + ret_val = self.app.app_obj.new_object('gerber', outname, initialize, plot=True, autoselected=False) tool_obj.app.proc_container.update_view_text(' %s' % '') if ret_val == 'fail': self.app.call_source = "app" @@ -1310,7 +1310,7 @@ class ThievingUI: self.grb_object_combo = FCComboBox() self.grb_object_combo.setModel(self.app.collection) self.grb_object_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) - self.grb_object_combo.is_last = True + self.grb_object_combo.is_last = False self.grb_object_combo.obj_type = 'Gerber' i_grid_lay.addWidget(self.grb_object_combo, 0, 0, 1, 2) diff --git a/appPlugins/ToolCutOut.py b/appPlugins/ToolCutOut.py index 45bf6887..6434848b 100644 --- a/appPlugins/ToolCutOut.py +++ b/appPlugins/ToolCutOut.py @@ -1082,11 +1082,11 @@ class CutOut(AppTool): try: if self.ui.gaptype_radio.get_value() == 'mb': - ret = app_obj.app_obj.new_object('excellon', outname_exc, excellon_init) + ret = app_obj.app_obj.new_object('excellon', outname_exc, excellon_init, autoselected=False) if ret == 'fail': app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Mouse bites failed.")) - ret = app_obj.app_obj.new_object('geometry', outname, geo_init) + ret = app_obj.app_obj.new_object('geometry', outname, geo_init, autoselected=False) if ret == 'fail': app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Failed.")) return @@ -1460,11 +1460,11 @@ class CutOut(AppTool): try: if self.ui.gaptype_radio.get_value() == 'mb': - ret = app_obj.app_obj.new_object('excellon', outname_exc, excellon_init) + ret = app_obj.app_obj.new_object('excellon', outname_exc, excellon_init, autoselected=False) if ret == 'fail': app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Mouse bites failed.")) - ret = app_obj.app_obj.new_object('geometry', outname, geo_init) + ret = app_obj.app_obj.new_object('geometry', outname, geo_init, autoselected=False) if ret == 'fail': app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Failed.")) return @@ -2371,7 +2371,7 @@ class CutoutUI: self.obj_combo = FCComboBox() self.obj_combo.setModel(self.app.collection) self.obj_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) - self.obj_combo.is_last = True + self.obj_combo.is_last = False grid0.addWidget(self.obj_combo, 6, 0, 1, 2) diff --git a/appPlugins/ToolExtract.py b/appPlugins/ToolExtract.py index 0dada504..27f4bf8b 100644 --- a/appPlugins/ToolExtract.py +++ b/appPlugins/ToolExtract.py @@ -964,7 +964,7 @@ class ExtractUI: self.gerber_object_combo = FCComboBox() self.gerber_object_combo.setModel(self.app.collection) self.gerber_object_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) - self.gerber_object_combo.is_last = True + self.gerber_object_combo.is_last = False self.gerber_object_combo.obj_type = "Gerber" self.tools_box.addWidget(self.gerber_object_combo) diff --git a/appPlugins/ToolPanelize.py b/appPlugins/ToolPanelize.py index 4c21438d..0429ec15 100644 --- a/appPlugins/ToolPanelize.py +++ b/appPlugins/ToolPanelize.py @@ -133,6 +133,7 @@ class Panelize(AppTool): self.reset_fields() self.ui.reference_radio.set_value('bbox') + self.on_reference_radio_changed(current_val=self.ui.reference_radio.get_value()) # SELECT THE CURRENT OBJECT obj = self.app.collection.get_active() @@ -1044,14 +1045,14 @@ class Panelize(AppTool): self.app.inform.emit('%s: %d' % (_("Generating panel... Spawning copies"), (int(rows * columns)))) if panel_source_obj.kind == 'excellon': self.app.app_obj.new_object( - "excellon", self.outname, job_init_excellon, plot=True, autoselected=True) + "excellon", self.outname, job_init_excellon, plot=True, autoselected=False) else: if panel_type == 'geometry': self.app.app_obj.new_object( - 'geometry', self.outname, job_init_geometry, plot=True, autoselected=True) + 'geometry', self.outname, job_init_geometry, plot=True, autoselected=False) if panel_type == 'gerber': self.app.app_obj.new_object( - 'gerber', self.outname, job_init_gerber, plot=True, autoselected=True) + 'gerber', self.outname, job_init_gerber, plot=True, autoselected=False) if self.constrain_flag is False: self.app.inform.emit('[success] %s' % _("Done.")) @@ -1067,7 +1068,7 @@ class Panelize(AppTool): panelize_worker() app_obj.inform.emit('[success] %s' % _("Panel created successfully.")) except Exception as ee: - log.error(str(ee)) + self.app.log.error(str(ee)) return self.app.collection.promise(self.outname) @@ -1155,7 +1156,7 @@ class PanelizeUI: self.object_combo = FCComboBox() self.object_combo.setModel(self.app.collection) self.object_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex())) - self.object_combo.is_last = True + self.object_combo.is_last = False self.object_combo.setToolTip( _("Object to be panelized. This means that it will\n"