Merge pull request #2318 from ales-erjavec/doc/tutorial-responsive-gui

[ENH] Add a tutorial section on responsive GUI

Orange/evaluation/testing.py

@@ -386,6 +386,7 @@ def split_by_model(self):
             res = Results()
             res.data = data
             res.domain = self.domain
+            res.learners = [self.learners[i]]
             res.row_indices = self.row_indices
             res.actual = self.actual
             res.folds = self.folds

Orange/tests/test_evaluation_testing.py

@@ -171,6 +171,7 @@ def test_split_by_model(self):
             self.assertEqual(len(result.models), 5)
             for model in result.models:
                 self.assertIsInstance(model, learners[i].__returns__)
+            self.assertSequenceEqual(result.learners, [res.learners[i]])
 
     def test_10_fold_probs(self):
         learners = [MajorityLearner(), MajorityLearner()]

Orange/widgets/gui.py

@@ -3115,7 +3115,7 @@ def table(widget, rows=0, columns=0, selectionMode=-1, addToLayout=True):
     if selectionMode != -1:
         w.setSelectionMode(selectionMode)
     w.setHorizontalScrollMode(QtWidgets.QTableWidget.ScrollPerPixel)
-    w.horizontalHeader().setMovable(True)
+    w.horizontalHeader().setSectionsMovable(True)
     return w
 
 

doc/development/source/index.rst

@@ -8,6 +8,7 @@ Widget Development
     tutorial-cont
     tutorial-settings
     tutorial-channels
+    tutorial-responsive-gui
     tutorial-utilities
     widget
     gui

doc/development/source/orange-demo/orangedemo/OWDataSamplerA.py

@@ -45,10 +45,13 @@ def set_data(self, dataset):
             self.Outputs.sample.send("Sampled Data")
 # [end-snippet-2]
 
+
 # [start-snippet-3]
-def main(argv=sys.argv):
-    from PyQt4.QtGui import QApplication
-    app = QApplication(list(argv))
+def main(argv=None):
+    from AnyQt.QtWidgets import QApplication
+    # PyQt changes argv list in-place
+    app = QApplication(list(argv) if argv else [])
+    argv = app.arguments()
     if len(argv) > 1:
         filename = argv[1]
     else:
@@ -64,9 +67,10 @@ def main(argv=sys.argv):
     app.exec_()
     ow.set_data(None)
     ow.handleNewSignals()
+    ow.onDeleteWidget()
     return 0
 
-if __name__=="__main__":
-    sys.exit(main())
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))
 
 # [end-snippet-3]

doc/development/source/orange-demo/orangedemo/OWDataSamplerB.py

@@ -5,6 +5,7 @@
 from Orange.widgets.widget import OWWidget, Input, Output, settings
 from Orange.widgets import gui
 
+
 # [start-snippet-1]
 class OWDataSamplerB(OWWidget):
     name = "Data Sampler (B)"
@@ -81,9 +82,12 @@ def checkCommit(self):
             self.commit()
 # [end-snippet-4]
 
-def main(argv=sys.argv):
-    from PyQt4.QtGui import QApplication
-    app = QApplication(list(argv))
+
+def main(argv=None):
+    from AnyQt.QtWidgets import QApplication
+    # PyQt changes argv list in-place
+    app = QApplication(list(argv) if argv else [])
+    argv = app.arguments()
     if len(argv) > 1:
         filename = argv[1]
     else:
@@ -99,7 +103,8 @@ def main(argv=sys.argv):
     app.exec_()
     ow.set_data(None)
     ow.handleNewSignals()
+    ow.onDeleteWidget()
     return 0
 
-if __name__=="__main__":
-    sys.exit(main())
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

doc/development/source/orange-demo/orangedemo/OWDataSamplerC.py

@@ -49,7 +49,7 @@ def __init__(self):
 
         self.resize(100,50)
 
-    @Input.data
+    @Inputs.data
     def set_data(self, dataset):
         if dataset is not None:
             self.dataset = dataset
@@ -84,9 +84,12 @@ def checkCommit(self):
         if self.commitOnChange:
             self.commit()
 
-def main(argv=sys.argv):
-    from PyQt4.QtGui import QApplication
-    app = QApplication(list(argv))
+
+def main(argv=None):
+    from AnyQt.QtWidgets import QApplication
+    # PyQt changes argv list in-place
+    app = QApplication(list(argv) if argv else [])
+    argv = app.arguments()
     if len(argv) > 1:
         filename = argv[1]
     else:
@@ -102,7 +105,8 @@ def main(argv=sys.argv):
     app.exec_()
     ow.set_data(None)
     ow.handleNewSignals()
+    ow.onDeleteWidget()
     return 0
 
-if __name__=="__main__":
-    sys.exit(main())
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

doc/development/source/orange-demo/orangedemo/OWLearningCurveA.py

@@ -2,10 +2,11 @@
 from collections import OrderedDict
 
 import numpy
-from PyQt4.QtGui import QTableWidget, QTableWidgetItem
+from AnyQt.QtWidgets import QTableWidget, QTableWidgetItem
 
 import Orange.data
 import Orange.classification
+import Orange.evaluation
 
 from Orange.widgets import gui, settings
 from Orange.widgets.widget import OWWidget, Input
@@ -179,14 +180,11 @@ def _update(self):
 
         learners = [learner for _, learner in need_update]
 
-        self.progressBarInit()
         # compute the learning curve result for all learners in one go
         results = learning_curve(
             learners, self.data, folds=self.folds,
             proportions=self.curvePoints,
-            callback=lambda value: self.progressBarSet(100 * value)
         )
-        self.progressBarFinished()
         # split the combined result into per learner/model results
         results = [list(Results.split_by_model(p_results))
                    for p_results in results]
@@ -259,10 +257,10 @@ def select_proportion_preproc(data, p, rstate=None):
     return results
 
 
-def main(argv=sys.argv):
-    from PyQt4.QtGui import QApplication
-    app = QApplication(argv)
-    argv = app.argv()
+def main(argv=None):
+    from AnyQt.QtWidgets import QApplication
+    app = QApplication(list(argv) if argv else [])
+    argv = app.arguments()
     if len(argv) > 1:
         filename = argv[1]
     else:
@@ -297,7 +295,8 @@ def main(argv=sys.argv):
     ow.set_learner(None, 2)
     ow.set_learner(None, 3)
     ow.handleNewSignals()
+    ow.onDeleteWidget()
     return 0
 
-if __name__=="__main__":
-    sys.exit(main())
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))

doc/development/source/orange-demo/orangedemo/OWLearningCurveB.py

@@ -3,12 +3,12 @@
 from functools import reduce
 
 import numpy
-import sklearn.cross_validation
 
-from PyQt4.QtGui import QTableWidget, QTableWidgetItem
+from AnyQt.QtWidgets import QTableWidget, QTableWidgetItem
 
 import Orange.data
 import Orange.classification
+import Orange.evaluation
 
 from Orange.widgets import gui, settings
 from Orange.widgets.widget import OWWidget, Input
@@ -193,22 +193,17 @@ def _update(self):
             return
         learners = [learner for _, learner in need_update]
 
-        self.progressBarInit()
         if self.testdata is None:
             # compute the learning curve result for all learners in one go
             results = learning_curve(
                 learners, self.data, folds=self.folds,
                 proportions=self.curvePoints,
-                callback=lambda value: self.progressBarSet(100 * value)
             )
         else:
             results = learning_curve_with_test_data(
                 learners, self.data, self.testdata, times=self.folds,
                 proportions=self.curvePoints,
-                callback=lambda value: self.progressBarSet(100 * value)
             )
-
-        self.progressBarFinished()
         # split the combined result into per learner/model results
         results = [list(Results.split_by_model(p_results)) for p_results in results]
 
@@ -279,6 +274,7 @@ def select_proportion_preproc(data, p, rstate=None):
     ]
     return results
 
+
 def learning_curve_with_test_data(learners, traindata, testdata, times=10,
                                   proportions=None, random_state=None,
                                   callback=None):
@@ -327,6 +323,9 @@ def is_empty(res):
     assert x.domain is y.domain
     assert x.predicted.shape[0] == y.predicted.shape[0]
 
+    assert len(x.learners) == len(y.learners)
+    assert all(xl is yl for xl, yl in zip(x.learners, y.learners))
+
     row_indices = numpy.hstack((x.row_indices, y.row_indices))
     predicted = numpy.hstack((x.predicted, y.predicted))
     actual = numpy.hstack((x.actual, y.actual))
@@ -344,6 +343,7 @@ def is_empty(res):
     res = Orange.evaluation.Results()
     res.data = x.data
     res.domain = x.domain
+    res.learners = x.learners
     res.row_indices = row_indices
     res.actual = actual
     res.predicted = predicted
@@ -363,10 +363,10 @@ def is_empty(res):
     return res
 
 
-def main(argv=sys.argv):
-    from PyQt4.QtGui import QApplication
-    app = QApplication(argv)
-    argv = app.argv()
+def main(argv=None):
+    from AnyQt.QtWidgets import QApplication
+    app = QApplication(list(argv) if argv else [])
+    argv = app.arguments()
     if len(argv) > 1:
         filename = argv[1]
     else:
@@ -407,7 +407,8 @@ def main(argv=sys.argv):
     ow.set_learner(None, 2)
     ow.set_learner(None, 3)
     ow.handleNewSignals()
+    ow.onDeleteWidget()
     return 0
 
-if __name__=="__main__":
-    sys.exit(main())
+if __name__ == "__main__":
+    sys.exit(main(sys.argv))