Merge pull request #5804 from ales-erjavec/fixes/feature-constructor-…

…update-models [FIX] owfeatureconstructor: Always update models on data change
biolab · Feb 3, 2022 · aa14e94 · aa14e94
2 parents ef36780 + 6b987ca
commit aa14e94
Showing 1 changed file with 9 additions and 16 deletions.
diff --git a/Orange/widgets/data/owfeatureconstructor.py b/Orange/widgets/data/owfeatureconstructor.py
@@ -681,27 +681,20 @@ def setData(self, data=None):
         self.data = data
         self.expressions_with_values = False
 
+        self.descriptors = []
+        self.currentIndex = -1
         if self.data is not None:
-            descriptors = list(self.descriptors)
-            currindex = self.currentIndex
-            self.descriptors = []
-            self.currentIndex = -1
             self.openContext(data)
-            self.fix_button.setHidden(not self.expressions_with_values)
 
-            if descriptors != self.descriptors or \
-                    self.currentIndex != currindex:
-                # disconnect from the selection model while reseting the model
-                selmodel = self.featureview.selectionModel()
-                selmodel.selectionChanged.disconnect(
-                    self._on_selectedVariableChanged)
+        # disconnect from the selection model while reseting the model
+        selmodel = self.featureview.selectionModel()
+        selmodel.selectionChanged.disconnect(self._on_selectedVariableChanged)
 
-                self.featuremodel[:] = list(self.descriptors)
-                self.setCurrentIndex(self.currentIndex)
-
-                selmodel.selectionChanged.connect(
-                    self._on_selectedVariableChanged)
+        self.featuremodel[:] = list(self.descriptors)
+        self.setCurrentIndex(self.currentIndex)
 
+        selmodel.selectionChanged.connect(self._on_selectedVariableChanged)
+        self.fix_button.setHidden(not self.expressions_with_values)
         self.editorstack.setEnabled(self.currentIndex >= 0)
 
     def handleNewSignals(self):