Merge remote-tracking branch 'origin/Beta' into Beta

This commit is contained in:
Marius 2019-10-10 19:33:55 +03:00
commit 7e6554b7ab
3 changed files with 7 additions and 6 deletions

View File

@ -8169,11 +8169,12 @@ class App(QtCore.QObject):
try:
# If there is no element in the overlapped objects list then make everyone inactive
# because we selected "nothing"
if not objects_under_the_click_list:
self.collection.set_all_inactive()
self.collection.set_all_inactive()
# delete the possible selection box around a possible selected object
self.delete_selection_shape()
# delete the possible selection box around a possible selected object
self.delete_selection_shape()
if not objects_under_the_click_list:
# and as a convenience move the focus to the Project tab because Selected tab is now empty but
# only when working on App

View File

@ -414,7 +414,7 @@ class FlatCAMObj(QtCore.QObject):
return self.shapes.visible
@visible.setter
def visible(self, value, threaded=True):
def visible(self, value, threaded=False):
log.debug("FlatCAMObj.visible()")
def worker_task(app_obj):

View File

@ -66,7 +66,7 @@ class Gerber(Geometry):
self.steps_per_circle = int(self.app.defaults["gerber_circle_steps"])
# Initialize parent
Geometry.__init__(self, geo_steps_per_circle=int(self.app.defaults["gerber_circle_steps"]))
Geometry.__init__(self, geo_steps_per_circle=self.steps_per_circle)
# Number format
self.int_digits = 3