Skip to content

Commit 144b5e7

Browse files
committed
- Fixed bug in hideEvent
- Fixed error that led to no updated when selecting specific controller
1 parent d588e87 commit 144b5e7

1 file changed

Lines changed: 10 additions & 18 deletions

File tree

src/petab_gui/views/find_replace_bar.py

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33

44
import qtawesome as qta
55
from PySide6.QtCore import Qt
6-
from PySide6.QtGui import QAction
6+
from PySide6.QtGui import QAction, QHideEvent, QShowEvent
77
from PySide6.QtWidgets import (
8-
QCheckBox,
98
QHBoxLayout,
109
QLabel,
1110
QLineEdit,
@@ -27,7 +26,7 @@ def __init__(self, controller, parent=None):
2726
"Parameter Table": self.controller.parameter_controller,
2827
"Measurement Table": self.controller.measurement_controller,
2928
}
30-
self.selected_controllers = set()
29+
self.selected_controllers = self.controller_map.values()
3130
self.only_search = False
3231
self.matches = None
3332

@@ -129,12 +128,7 @@ def run_find(self):
129128
"""Triggered when the search text changes."""
130129
search_text = self.find_input.text()
131130
if not search_text:
132-
for controller in [
133-
self.controller.observable_controller,
134-
self.controller.condition_controller,
135-
self.controller.parameter_controller,
136-
self.controller.measurement_controller,
137-
]:
131+
for controller in self.controller_map.values():
138132
controller.cleanse_highlighted_cells()
139133
self.matches = []
140134
self.current_match_ind = -1
@@ -147,12 +141,10 @@ def run_find(self):
147141
self.matches = []
148142
self.current_match_ind = -1
149143

150-
for controller in [
151-
self.controller.observable_controller,
152-
self.controller.condition_controller,
153-
self.controller.parameter_controller,
154-
self.controller.measurement_controller,
155-
]:
144+
for controller in self.controller_map.values():
145+
if controller not in self.selected_controllers:
146+
controller.cleanse_highlighted_cells()
147+
continue
156148
matches = controller.find_text(
157149
search_text, case_sensitive, regex, whole_cell
158150
)
@@ -289,13 +281,13 @@ def keyPressEvent(self, event):
289281
else:
290282
super().keyPressEvent(event)
291283

292-
def hideEvent(self, event):
284+
def hideEvent(self, event: QHideEvent):
293285
"""Reset highlights when the Find/Replace bar is hidden."""
294-
for controller in self.selected_controllers:
286+
for controller in self.controller_map.values():
295287
controller.cleanse_highlighted_cells()
296288
super().hideEvent(event)
297289

298-
def showEvent(self, event):
290+
def showEvent(self, event: QShowEvent):
299291
"""Reset highlights when the Find/Replace bar is shown."""
300292
# group matches by controller
301293
if not self.matches:

0 commit comments

Comments
 (0)