- In Plugins: Panelize, Cutout, Extract, Copper Thieving disabled the autoload of the last created APP object
This commit is contained in:
@@ -12,6 +12,7 @@ CHANGELOG for FlatCAM beta
|
|||||||
- fixed Extract Plugin not extracting soldermask for aperture macros
|
- 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
|
- 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 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
|
18.09.2021
|
||||||
|
|
||||||
|
|||||||
@@ -716,7 +716,7 @@ class ToolCopperThieving(AppTool):
|
|||||||
tool_obj.app.inform.emit('[ERROR_NOTCL] %s' % _("The reference object type is not supported."))
|
tool_obj.app.inform.emit('[ERROR_NOTCL] %s' % _("The reference object type is not supported."))
|
||||||
return 'fail'
|
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."))
|
tool_obj.app.inform.emit(_("Copper Thieving Tool. Appending new geometry and buffering."))
|
||||||
|
|
||||||
@@ -947,7 +947,7 @@ class ToolCopperThieving(AppTool):
|
|||||||
local_use=grb_obj,
|
local_use=grb_obj,
|
||||||
use_thread=False)
|
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' % '')
|
tool_obj.app.proc_container.update_view_text(' %s' % '')
|
||||||
if ret_val == 'fail':
|
if ret_val == 'fail':
|
||||||
self.app.call_source = "app"
|
self.app.call_source = "app"
|
||||||
@@ -1310,7 +1310,7 @@ class ThievingUI:
|
|||||||
self.grb_object_combo = FCComboBox()
|
self.grb_object_combo = FCComboBox()
|
||||||
self.grb_object_combo.setModel(self.app.collection)
|
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.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'
|
self.grb_object_combo.obj_type = 'Gerber'
|
||||||
|
|
||||||
i_grid_lay.addWidget(self.grb_object_combo, 0, 0, 1, 2)
|
i_grid_lay.addWidget(self.grb_object_combo, 0, 0, 1, 2)
|
||||||
|
|||||||
@@ -1082,11 +1082,11 @@ class CutOut(AppTool):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
if self.ui.gaptype_radio.get_value() == 'mb':
|
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':
|
if ret == 'fail':
|
||||||
app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Mouse bites failed."))
|
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':
|
if ret == 'fail':
|
||||||
app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Failed."))
|
app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Failed."))
|
||||||
return
|
return
|
||||||
@@ -1460,11 +1460,11 @@ class CutOut(AppTool):
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
if self.ui.gaptype_radio.get_value() == 'mb':
|
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':
|
if ret == 'fail':
|
||||||
app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Mouse bites failed."))
|
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':
|
if ret == 'fail':
|
||||||
app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Failed."))
|
app_obj.inform.emit('[ERROR_NOTCL] %s' % _("Failed."))
|
||||||
return
|
return
|
||||||
@@ -2371,7 +2371,7 @@ class CutoutUI:
|
|||||||
self.obj_combo = FCComboBox()
|
self.obj_combo = FCComboBox()
|
||||||
self.obj_combo.setModel(self.app.collection)
|
self.obj_combo.setModel(self.app.collection)
|
||||||
self.obj_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
|
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)
|
grid0.addWidget(self.obj_combo, 6, 0, 1, 2)
|
||||||
|
|
||||||
|
|||||||
@@ -964,7 +964,7 @@ class ExtractUI:
|
|||||||
self.gerber_object_combo = FCComboBox()
|
self.gerber_object_combo = FCComboBox()
|
||||||
self.gerber_object_combo.setModel(self.app.collection)
|
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.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.gerber_object_combo.obj_type = "Gerber"
|
||||||
|
|
||||||
self.tools_box.addWidget(self.gerber_object_combo)
|
self.tools_box.addWidget(self.gerber_object_combo)
|
||||||
|
|||||||
@@ -133,6 +133,7 @@ class Panelize(AppTool):
|
|||||||
self.reset_fields()
|
self.reset_fields()
|
||||||
|
|
||||||
self.ui.reference_radio.set_value('bbox')
|
self.ui.reference_radio.set_value('bbox')
|
||||||
|
self.on_reference_radio_changed(current_val=self.ui.reference_radio.get_value())
|
||||||
|
|
||||||
# SELECT THE CURRENT OBJECT
|
# SELECT THE CURRENT OBJECT
|
||||||
obj = self.app.collection.get_active()
|
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))))
|
self.app.inform.emit('%s: %d' % (_("Generating panel... Spawning copies"), (int(rows * columns))))
|
||||||
if panel_source_obj.kind == 'excellon':
|
if panel_source_obj.kind == 'excellon':
|
||||||
self.app.app_obj.new_object(
|
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:
|
else:
|
||||||
if panel_type == 'geometry':
|
if panel_type == 'geometry':
|
||||||
self.app.app_obj.new_object(
|
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':
|
if panel_type == 'gerber':
|
||||||
self.app.app_obj.new_object(
|
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:
|
if self.constrain_flag is False:
|
||||||
self.app.inform.emit('[success] %s' % _("Done."))
|
self.app.inform.emit('[success] %s' % _("Done."))
|
||||||
@@ -1067,7 +1068,7 @@ class Panelize(AppTool):
|
|||||||
panelize_worker()
|
panelize_worker()
|
||||||
app_obj.inform.emit('[success] %s' % _("Panel created successfully."))
|
app_obj.inform.emit('[success] %s' % _("Panel created successfully."))
|
||||||
except Exception as ee:
|
except Exception as ee:
|
||||||
log.error(str(ee))
|
self.app.log.error(str(ee))
|
||||||
return
|
return
|
||||||
|
|
||||||
self.app.collection.promise(self.outname)
|
self.app.collection.promise(self.outname)
|
||||||
@@ -1155,7 +1156,7 @@ class PanelizeUI:
|
|||||||
self.object_combo = FCComboBox()
|
self.object_combo = FCComboBox()
|
||||||
self.object_combo.setModel(self.app.collection)
|
self.object_combo.setModel(self.app.collection)
|
||||||
self.object_combo.setRootModelIndex(self.app.collection.index(0, 0, QtCore.QModelIndex()))
|
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(
|
self.object_combo.setToolTip(
|
||||||
_("Object to be panelized. This means that it will\n"
|
_("Object to be panelized. This means that it will\n"
|
||||||
|
|||||||
Reference in New Issue
Block a user