- for whatever reason, using directly the name of the object in a

QtGui.QStadardItem is creating issues in the tests. Converting it to a
string solve this. After solving the conflict in the pull request this
modification was lost so I am doing it again.
- the FlatCAMObj.FlatCAMGerber.isolate() method is having the line
app.obj.info() which randomly create issues due of using QPixMaps outside
of the GUI thread.
This commit is contained in:
Marius Stanciu 2018-05-30 18:39:04 +03:00
parent 3298da6dc5
commit 4cf06b71e8
2 changed files with 5 additions and 2 deletions

View File

@ -554,7 +554,10 @@ class FlatCAMGerber(FlatCAMObj, Gerber):
# Propagate options # Propagate options
geo_obj.options["cnctooldia"] = self.options["isotooldia"] geo_obj.options["cnctooldia"] = self.options["isotooldia"]
geo_obj.solid_geometry = generate_envelope (offset, i == 0) geo_obj.solid_geometry = generate_envelope (offset, i == 0)
app_obj.info("Isolation geometry created: %s" % geo_obj.options["name"])
# The following line is commented because it creates errors
# regarding QPixmaps used outside GUI thread
# app_obj.info("Isolation geometry created: %s" % geo_obj.options["name"])
# TODO: Do something if this is None. Offer changing name? # TODO: Do something if this is None. Offer changing name?
self.app.new_object("geometry", iso_name, iso_init) self.app.new_object("geometry", iso_name, iso_init)

View File

@ -162,7 +162,7 @@ class ObjectCollection():
# Create the model item to insert into the QListView # Create the model item to insert into the QListView
icon = QtGui.QIcon(self.icons[obj.kind]) # self.icons["gerber"]) icon = QtGui.QIcon(self.icons[obj.kind]) # self.icons["gerber"])
item = QtGui.QStandardItem(icon, name) item = QtGui.QStandardItem(icon, str(name))
# Item is not editable, so that double click # Item is not editable, so that double click
# does not allow cell value modification. # does not allow cell value modification.
item.setEditable(False) item.setEditable(False)