Skip to content

Commit aa14e94

Browse files
authored
Merge pull request #5804 from ales-erjavec/fixes/feature-constructor-update-models
[FIX] owfeatureconstructor: Always update models on data change
2 parents ef36780 + 6b987ca commit aa14e94

File tree

1 file changed

+9
-16
lines changed

1 file changed

+9
-16
lines changed

Orange/widgets/data/owfeatureconstructor.py

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -681,27 +681,20 @@ def setData(self, data=None):
681681
self.data = data
682682
self.expressions_with_values = False
683683

684+
self.descriptors = []
685+
self.currentIndex = -1
684686
if self.data is not None:
685-
descriptors = list(self.descriptors)
686-
currindex = self.currentIndex
687-
self.descriptors = []
688-
self.currentIndex = -1
689687
self.openContext(data)
690-
self.fix_button.setHidden(not self.expressions_with_values)
691688

692-
if descriptors != self.descriptors or \
693-
self.currentIndex != currindex:
694-
# disconnect from the selection model while reseting the model
695-
selmodel = self.featureview.selectionModel()
696-
selmodel.selectionChanged.disconnect(
697-
self._on_selectedVariableChanged)
689+
# disconnect from the selection model while reseting the model
690+
selmodel = self.featureview.selectionModel()
691+
selmodel.selectionChanged.disconnect(self._on_selectedVariableChanged)
698692

699-
self.featuremodel[:] = list(self.descriptors)
700-
self.setCurrentIndex(self.currentIndex)
701-
702-
selmodel.selectionChanged.connect(
703-
self._on_selectedVariableChanged)
693+
self.featuremodel[:] = list(self.descriptors)
694+
self.setCurrentIndex(self.currentIndex)
704695

696+
selmodel.selectionChanged.connect(self._on_selectedVariableChanged)
697+
self.fix_button.setHidden(not self.expressions_with_values)
705698
self.editorstack.setEnabled(self.currentIndex >= 0)
706699

707700
def handleNewSignals(self):

0 commit comments

Comments
 (0)