apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prefer selected shape when highlighting vertexes or shapes (#890)

Browse Source 
The use case is adjusting shapes by moving their vertexes, even if
they are adjacent or overlapping another shape. Currently always
the "later drawn" shape wins, making it impossible to adjust an
earlier shape without re-creating it. Adjusting existing shapes is
common for review scenarios.

I have experimented with preferring the highlighted shape, but
I found it finicky and less clear as to how the vertex preference
works. JOSM (and OpenStreetMap editor) also uses the "prefer
selected" approach and it works well there.
This commit is contained in:
Stefan Breunig 2022-06-12 19:05:06 +02:00 committed by GitHub
parent 1fca69f0b3
commit 9e06d10b94
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/canvas.py
View File

@ -216,7 +216,8 @@ class Canvas(QWidget):
# - Highlight vertex # - Highlight vertex
# Update shape/vertex fill and tooltip value accordingly. # Update shape/vertex fill and tooltip value accordingly.
self.setToolTip("Image") self.setToolTip("Image")
for shape in reversed([s for s in self.shapes if self.isVisible(s)]): priority_list = self.shapes + ([self.selected_shape] if self.selected_shape else [])
for shape in reversed([s for s in priority_list if self.isVisible(s)]):
# Look for a nearby vertex to highlight. If that fails, # Look for a nearby vertex to highlight. If that fails,
# check if we happen to be inside a shape. # check if we happen to be inside a shape.
index = shape.nearest_vertex(pos, self.epsilon) index = shape.nearest_vertex(pos, self.epsilon)