- finished work on object hovering

This commit is contained in:
Marius Stanciu
2019-03-04 03:52:12 +02:00
parent 06fb48eb6a
commit 85ff3805ae
3 changed files with 13 additions and 7 deletions

View File

@@ -94,7 +94,7 @@ class App(QtCore.QObject):
# Version # Version
version = 8.911 version = 8.911
version_date = "2019/03/2" version_date = "2019/03/4"
beta = True beta = True
# current date now # current date now
@@ -2467,6 +2467,7 @@ class App(QtCore.QObject):
obj.options[oname] = self.options[option] obj.options[oname] = self.options[option]
obj.isHovering = False obj.isHovering = False
obj.notHovering = True
# Initialize as per user request # Initialize as per user request
# User must take care to implement initialize # User must take care to implement initialize
@@ -4748,15 +4749,15 @@ class App(QtCore.QObject):
(obj.options['xmin'], obj.options['ymax'])] (obj.options['xmin'], obj.options['ymax'])]
) )
if Point(pos).within(poly_obj): if Point(pos).within(poly_obj):
if self.isHovering is False: if obj.isHovering is False:
self.isHovering = True obj.isHovering = True
self.notHovering = True obj.notHovering = True
# create the selection box around the selected object # create the selection box around the selected object
self.draw_hover_shape(obj, color='#d1e0e0') self.draw_hover_shape(obj, color='#d1e0e0')
else: else:
if self.notHovering is True: if obj.notHovering is True:
self.notHovering = False obj.notHovering = False
self.isHovering = False obj.isHovering = False
self.delete_hover_shape() self.delete_hover_shape()
except: except:
# the Exception here will happen if we try to select on screen and we have an newly (and empty) # the Exception here will happen if we try to select on screen and we have an newly (and empty)

View File

@@ -80,6 +80,7 @@ class FlatCAMObj(QtCore.QObject):
self._drawing_tolerance = 0.01 self._drawing_tolerance = 0.01
self.isHovering = False self.isHovering = False
self.notHovering = True
# assert isinstance(self.ui, ObjectUI) # assert isinstance(self.ui, ObjectUI)
# self.ui.name_entry.returnPressed.connect(self.on_name_activate) # self.ui.name_entry.returnPressed.connect(self.on_name_activate)

View File

@@ -9,6 +9,10 @@ CAD program, and create G-Code for Isolation routing.
================================================= =================================================
4.03.2019
- finished work on object hovering
3.03.2019 3.03.2019
- minor UI changes for Gerber UI - minor UI changes for Gerber UI