Skip to content

Commit af6670e

Browse files
committed
Patch for box deletion issues
1 parent 4bda65c commit af6670e

File tree

1 file changed

+19
-25
lines changed

1 file changed

+19
-25
lines changed

src/sas/qtgui/Plotting/Slicers/BoxSlicer.py

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -126,22 +126,10 @@ def clear(self):
126126
Clear the slicer and all connected events related to this slicer
127127
"""
128128
self.averager = None
129-
try:
130-
self.clear_markers()
131-
except (ValueError, AttributeError):
132-
pass
133-
try:
134-
self.horizontal_lines.clear()
135-
except (ValueError, AttributeError):
136-
pass
137-
try:
138-
self.vertical_lines.clear()
139-
except (ValueError, AttributeError):
140-
pass
141-
try:
142-
self.center.clear()
143-
except (ValueError, AttributeError):
144-
pass
129+
self.clear_markers()
130+
self.center.clear()
131+
self.horizontal_lines.clear()
132+
self.vertical_lines.clear()
145133

146134
def update(self):
147135
"""
@@ -673,9 +661,18 @@ def clear(self):
673661
Clear this slicer and its markers
674662
"""
675663
self.clear_markers()
676-
self.right_marker.remove()
677-
self.right_line.remove()
678-
self.left_line.remove()
664+
try:
665+
self.right_marker.remove()
666+
except (ValueError, AttributeError):
667+
pass
668+
try:
669+
self.right_line.remove()
670+
except (ValueError, AttributeError):
671+
pass
672+
try:
673+
self.left_line.remove()
674+
except (ValueError, AttributeError):
675+
pass
679676

680677
def update(self, x1=None, x2=None, y1=None, y2=None, half_width=None, half_height=None, center=None):
681678
"""
@@ -859,20 +856,17 @@ def clear(self):
859856
"""
860857
Clear this figure and its markers
861858
"""
862-
try:
863-
self.clear_markers()
864-
except (ValueError, AttributeError):
865-
pass
859+
self.clear_markers()
866860
try:
867861
self.top_marker.remove()
868862
except (ValueError, AttributeError):
869863
pass
870864
try:
871-
self.bottom_line.remove()
865+
self.top_line.remove()
872866
except (ValueError, AttributeError):
873867
pass
874868
try:
875-
self.top_line.remove()
869+
self.bottom_line.remove()
876870
except (ValueError, AttributeError):
877871
pass
878872

0 commit comments

Comments
 (0)