Skip to content

[FIX] Select Rows: Keep condition rows in sync after removing one #7335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raashish1601 wants to merge 3 commits into
base: master
Choose a base branch
from
+44 −15
Open

[FIX] Select Rows: Keep condition rows in sync after removing one #7335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ff68cf
Select Rows: Keep condition rows in sync after removing one
raashish1601 Oct 6, 2026
d505f4e
Select Rows: Check value widgets follow the operator after removing a…
raashish1601 Oct 7, 2026
73b126f
Select Rows: Use persistent model indices to keep track of row numbers
janezd Oct 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions Orange/widgets/data/owselectrows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ def add_row(self, attr=None, condition_type=None, condition_value=None):
minimumContentsLength=12,
sizeAdjustPolicy=QComboBox.AdjustToMinimumContentsLengthWithIcon)
attr_combo.setModel(self.variable_model)
attr_combo.row = row
attr_cell_index = QPersistentModelIndex(model.index(row, 3))
attr_combo.setCurrentIndex(self.variable_model.indexOf(attr) if attr
else len(self.AllTypes) + 1)
self.cond_list.setCellWidget(row, 0, attr_combo)
Expand All @@ -288,10 +288,10 @@ def add_row(self, attr=None, condition_type=None, condition_value=None):
self.cond_list.setCellWidget(row, 3, temp_button)

self.remove_all_button.setDisabled(False)
self.set_new_operators(attr_combo, attr is not None,
self.set_new_operators(attr_cell_index, attr is not None,
condition_type, condition_value)
attr_combo.currentIndexChanged.connect(
lambda _: self.set_new_operators(attr_combo, False))
lambda _: self.set_new_operators(attr_cell_index, False))

self.cond_list.resizeRowToContents(row)

Expand Down Expand Up @@ -332,12 +332,13 @@ def remove_all_rows(self):
self.cond_list.setRowCount(0)
self.remove_all_button.setDisabled(True)

def set_new_operators(self, attr_combo, adding_all,
def set_new_operators(self, attr_cell_index, adding_all,
selected_index=None, selected_values=None):
old_combo = self.cond_list.cellWidget(attr_combo.row, 1)
row = attr_cell_index.row()
old_combo = self.cond_list.cellWidget(row, 1)
prev_text = old_combo.currentText() if old_combo else ""
oper_combo = QComboBox()
oper_combo.row = attr_combo.row
attr_combo = self.cond_list.cellWidget(row, 0)
oper_combo.attr_combo = attr_combo
attr_name = attr_combo.currentText()
if attr_name in self.AllTypes:
Expand All @@ -350,10 +351,11 @@ def set_new_operators(self, attr_combo, adding_all,
if selected_index == -1:
selected_index = 0
oper_combo.setCurrentIndex(selected_index)
self.cond_list.setCellWidget(oper_combo.row, 1, oper_combo)
self.set_new_values(oper_combo, adding_all, selected_values)
self.cond_list.setCellWidget(row, 1, oper_combo)
oper_cell_index = QPersistentModelIndex(self.cond_list.model().index(row, 1))
self.set_new_values(oper_cell_index, adding_all, selected_values)
oper_combo.currentIndexChanged.connect(
lambda _: self.set_new_values(oper_combo, False))
lambda _: self.set_new_values(oper_cell_index, False))

@staticmethod
def _get_lineedit_contents(box):
Expand Down Expand Up @@ -410,7 +412,7 @@ def validate(self, input_, pos):
return QDoubleValidator.Invalid, input_, pos
return super().validate(input_, pos)

def set_new_values(self, oper_combo, adding_all, selected_values=None):
def set_new_values(self, oper_cell_index, adding_all, selected_values=None):
# def remove_children():
# for child in box.children()[1:]:
# box.layout().removeWidget(child)
Expand All @@ -431,7 +433,9 @@ def add_numeric(contents):
le.setValidator(OWSelectRows.QDoubleValidatorEmpty())
return le

box = self.cond_list.cellWidget(oper_combo.row, 2)
row = oper_cell_index.row()
oper_combo = self.cond_list.cellWidget(row, 1)
box = self.cond_list.cellWidget(row, 2)
lc = ["", ""]
oper = oper_combo.currentIndex()
attr_name = oper_combo.attr_combo.currentText()
Expand All @@ -451,14 +455,14 @@ def add_numeric(contents):
if "defined" in oper_combo.currentText():
label = QLabel()
label.var_type = vtype
self.cond_list.setCellWidget(oper_combo.row, 2, label)
self.cond_list.setCellWidget(row, 2, label)
elif var is not None and var.is_discrete:
if oper_combo.currentText().endswith(" one of"):
if selected_values:
lc = list(selected_values)
button = DropDownToolButton(self, var, lc)
button.var_type = vtype
self.cond_list.setCellWidget(oper_combo.row, 2, button)
self.cond_list.setCellWidget(row, 2, button)
else:
combo = ComboBoxSearch()
combo.addItems(("", ) + var.values)
Expand All @@ -467,12 +471,12 @@ def add_numeric(contents):
else:
combo.setCurrentIndex(0)
combo.var_type = vartype(var)
self.cond_list.setCellWidget(oper_combo.row, 2, combo)
self.cond_list.setCellWidget(row, 2, combo)
combo.currentIndexChanged.connect(self.conditions_changed)
else:
box = gui.hBox(self.cond_list, addToLayout=False)
box.var_type = vtype
self.cond_list.setCellWidget(oper_combo.row, 2, box)
self.cond_list.setCellWidget(row, 2, box)
if vtype == 2: # continuous:
box.controls = [add_numeric(lc[0])]
if oper > 5:
Expand Down
25 changes: 25 additions & 0 deletions Orange/widgets/data/tests/test_owselectrows.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,31 @@ def test_keep_operator(self):
self.assertEqual(
self.widget.cond_list.cellWidget(0, 1).currentText(), "is")

def test_remove_condition_keeps_rows(self):
data = Table("heart_disease")
domain = data.domain

self.send_signal(self.widget.Inputs.data, data)

self.widget.remove_all_button.click()
for value in ("40", "50", "60"):
self.enterFilter(domain["age"], "is below", value)
cond_list = self.widget.cond_list
self.widget.remove_one(0)
self.assertEqual(cond_list.rowCount(), 2)

simulate.combobox_activate_item(
cond_list.cellWidget(0, 0), "chest pain", delay=0)
self.assertEqual(cond_list.cellWidget(0, 1).currentText(), "is")
self.assertEqual(cond_list.cellWidget(1, 0).currentText(), "age")
self.assertEqual(cond_list.cellWidget(1, 1).currentText(), "is below")

simulate.combobox_activate_item(
cond_list.cellWidget(1, 1), "is between", delay=0)
self.assertEqual(cond_list.cellWidget(0, 1).currentText(), "is")
self.assertEqual(cond_list.cellWidget(1, 1).currentText(), "is between")
self.assertEqual(len(self.__get_value_widgets(1)), 2)

def test_calendar_dates(self):
data = Table(test_filename("datasets/cyber-security-breaches.tab"))
self.send_signal(self.widget.Inputs.data, data)
Expand Down
Loading