- wip; Tool Move problem: it tries to select all objects, even those that are disabled.
This commit is contained in:
parent
c3a7725a39
commit
e6a5e32002
|
@ -8169,12 +8169,13 @@ class App(QtCore.QObject):
|
||||||
try:
|
try:
|
||||||
# If there is no element in the overlapped objects list then make everyone inactive
|
# If there is no element in the overlapped objects list then make everyone inactive
|
||||||
# because we selected "nothing"
|
# 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
|
# delete the possible selection box around a possible selected object
|
||||||
self.delete_selection_shape()
|
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
|
# and as a convenience move the focus to the Project tab because Selected tab is now empty but
|
||||||
# only when working on App
|
# only when working on App
|
||||||
if self.call_source == 'app':
|
if self.call_source == 'app':
|
||||||
|
|
|
@ -414,7 +414,7 @@ class FlatCAMObj(QtCore.QObject):
|
||||||
return self.shapes.visible
|
return self.shapes.visible
|
||||||
|
|
||||||
@visible.setter
|
@visible.setter
|
||||||
def visible(self, value, threaded=True):
|
def visible(self, value, threaded=False):
|
||||||
log.debug("FlatCAMObj.visible()")
|
log.debug("FlatCAMObj.visible()")
|
||||||
|
|
||||||
def worker_task(app_obj):
|
def worker_task(app_obj):
|
||||||
|
|
|
@ -66,7 +66,7 @@ class Gerber(Geometry):
|
||||||
self.steps_per_circle = int(self.app.defaults["gerber_circle_steps"])
|
self.steps_per_circle = int(self.app.defaults["gerber_circle_steps"])
|
||||||
|
|
||||||
# Initialize parent
|
# 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
|
# Number format
|
||||||
self.int_digits = 3
|
self.int_digits = 3
|
||||||
|
|
|
@ -263,6 +263,7 @@ class ToolMove(FlatCAMTool):
|
||||||
self.mm = self.app.plotcanvas.graph_event_connect('mouse_move', self.on_move)
|
self.mm = self.app.plotcanvas.graph_event_connect('mouse_move', self.on_move)
|
||||||
self.mp = self.app.plotcanvas.graph_event_connect('mouse_press', self.on_left_click)
|
self.mp = self.app.plotcanvas.graph_event_connect('mouse_press', self.on_left_click)
|
||||||
self.kr = self.app.plotcanvas.graph_event_connect('key_release', self.on_key_press)
|
self.kr = self.app.plotcanvas.graph_event_connect('key_release', self.on_key_press)
|
||||||
|
|
||||||
# first get a bounding box to fit all
|
# first get a bounding box to fit all
|
||||||
for obj in obj_list:
|
for obj in obj_list:
|
||||||
xmin, ymin, xmax, ymax = obj.bounds()
|
xmin, ymin, xmax, ymax = obj.bounds()
|
||||||
|
|
Loading…
Reference in New Issue