OWSave: Change GUI as decided last week

Author: janezd

Orange/widgets/data/owsave.py

@@ -1,7 +1,6 @@
 import os.path
 
-from AnyQt.QtWidgets import QFileDialog
-from AnyQt.QtCore import Qt
+from AnyQt.QtWidgets import QFileDialog, QGridLayout, QWidget
 
 from Orange.data.table import Table
 from Orange.data.io import TabReader, CSVReader, PickleReader, ExcelReader
@@ -21,29 +20,27 @@ class OWSave(widget.OWWidget):
     settings_version = 2
 
     writers = [TabReader, CSVReader, PickleReader, ExcelReader]
-    filters = [f"{w.DESCRIPTION} ({w.EXTENSIONS[0]})" for w in writers]
+    filters = [f"{w.DESCRIPTION} (*{w.EXTENSIONS[0]})" for w in writers]
     filt_ext = {filter: w.EXTENSIONS[0] for filter, w in zip(filters, writers)}
     userhome = os.path.expanduser(f"~{os.sep}")
 
     class Inputs:
         data = Input("Data", Table)
 
     class Error(widget.OWWidget.Error):
-        # This message is short to (almost) fit into the widget's width
-        unsupported_sparse = widget.Msg("Format can't store sparse data.")
+        unsupported_sparse = widget.Msg("Use .pkl format for sparse data.")
+        no_file_name = widget.Msg("File name is not set.")
         general_error = widget.Msg("{}")
 
     class Warning(widget.OWWidget.Warning):
-        no_file_name = widget.Msg("Set the file name.")
-        general_error = widget.Msg("{}")
+        ignored_flag = widget.Msg("{} ignored for this format.")
 
     want_main_area = False
     resizing_enabled = False
 
     compress: bool
     add_type_annotations: bool
 
-    filetype = Setting(0)
     last_dir = Setting("")
     filter = Setting(filters[0])
     compress = Setting(False)
@@ -56,22 +53,31 @@ def __init__(self):
         self.filename = ""
         self.writer = self.writers[0]
 
-        box = gui.vBox(self.controlArea, True)
-        box.layout().setSpacing(8)
-        self.lb_filename = gui.widgetLabel(box)
-        gui.checkBox(
-            box, self, "add_type_annotations", "Save with type annotations")
-        gui.checkBox(
-            box, self, "compress", "Compress file (gzip)")
-        self.bt_set_file = gui.button(
-            None, self, "Set File Name", callback=self.set_file_name)
-        box.layout().addWidget(self.bt_set_file, Qt.AlignRight)
-
-        box = gui.vBox(self.controlArea, box=True)
-        box.layout().setSpacing(8)
-        gui.checkBox(
-            box, self, "auto_save", "Autosave when receiving new data")
-        self.bt_save = gui.button(box, self, "Save", callback=self.save_file)
+        grid = QGridLayout()
+        gui.widgetBox(self.controlArea, box=True, orientation=grid)
+        grid.setSpacing(8)
+        self.bt_save = gui.button(None, self, "Save", callback=self.save_file)
+        grid.addWidget(self.bt_save, 0, 0)
+        grid.addWidget(
+            gui.button(None, self, "Save as ...", callback=self.save_file_as),
+            0, 1)
+        grid.addWidget(
+            gui.checkBox(None, self, "auto_save",
+                         "Autosave when receiving new data"),
+            1, 0, 1, 2)
+        grid.addWidget(QWidget(), 2, 0, 1, 2)
+
+        grid.addWidget(
+            gui.checkBox(
+                None, self, "add_type_annotations",
+                "Save with type annotations", callback=self._update_controls),
+            3, 0, 1, 2)
+        grid.addWidget(
+            gui.checkBox(
+                None, self, "compress", "Compress file (gzip)",
+                callback=self._update_controls),
+            4, 0, 1, 2)
+
         self.adjustSize()
         self._update_controls()
 
@@ -91,7 +97,7 @@ def dataset(self, data):
                 f"Data set {self.data.name or '(no name)'} "
                 f"with {len(self.data)} instances")
 
-    def set_file_name(self):
+    def save_file_as(self):
         if self.filename:
             start_dir = self.filename
         else:
@@ -100,56 +106,69 @@ def set_file_name(self):
                 data_name += self.filt_ext[self.filter]
             start_dir = os.path.join(self.last_dir or self.userhome, data_name)
 
-        dlg = QFileDialog(None, "Set File", start_dir, ";;".join(self.filters))
-        dlg.setLabelText(dlg.Accept, "Select")
-        dlg.setAcceptMode(dlg.AcceptSave)
-        dlg.setSupportedSchemes(["file"])
-        dlg.selectNameFilter(self.filter)
-        if dlg.exec() == dlg.Rejected:
+        filename, selected_filter = QFileDialog.getSaveFileName(
+            self, "Save data", start_dir, ";;".join(self.filters), self.filter)
+        if not filename:
             return
 
-        self.filename = dlg.selectedFiles()[0]
-        self.last_dir = os.path.split(self.filename)[0]
-        self.filter = dlg.selectedNameFilter()
+        self.filename = filename
+        self.last_dir = os.path.split(filename)[0]
+        self.filter = selected_filter
         self.writer = self.writers[self.filters.index(self.filter)]
         self._update_controls()
+        self.save_file()
 
     def save_file(self):
+        if not self.filename:
+            self.save_file_as()
+            return
         self.Error.general_error.clear()
         if not self._can_save():
             return
-        name = self.filename \
-            + ".gz" * self.writer.SUPPORT_COMPRESSED * self.compress
         try:
-            self.writer.write(name, self.data, self.add_type_annotations)
+            self.writer.write(
+                self._fullname(), self.data, self.add_type_annotations)
         except IOError as err_value:
             self.Error.general_error(str(err_value))
 
+    def _fullname(self):
+        return self.filename \
+               + ".gz" * self.writer.SUPPORT_COMPRESSED * self.compress
+
     def _update_controls(self):
-        has_file = bool(self.filename)
-        self.lb_filename.setVisible(has_file)
-        self.Warning.no_file_name(shown=not has_file)
         if self.filename:
-            name = self.filename
-            if name.startswith(self.userhome):
-                name = name[len(self.userhome):]
-            self.lb_filename.setText(f"Save to: {name}")
-
-        self.controls.add_type_annotations.setVisible(
-            has_file and self.writer.OPTIONAL_TYPE_ANNOTATIONS)
-        self.controls.compress.setVisible(
-            has_file and self.writer.SUPPORT_COMPRESSED)
+            self.bt_save.setText(
+                f"Save as {os.path.split(self._fullname())[1]}")
+        else:
+            self.bt_save.setText("Save")
+        self.Error.no_file_name(shown=not self.filename)
 
         self.Error.unsupported_sparse(
             shown=self.data is not None and self.data.is_sparse()
-            and self.filename
-            and not self.writer.SUPPORT_SPARSE_DATA)
-        self.bt_save.setEnabled(self._can_save())
+            and self.filename and not self.writer.SUPPORT_SPARSE_DATA)
+
+        if self.data is None or not self.filename:
+            self.Warning.ignored_flag.clear()
+        else:
+            no_compress = self.compress \
+                          and not self.writer.SUPPORT_COMPRESSED
+            no_anotation = self.add_type_annotations \
+                           and not self.writer.OPTIONAL_TYPE_ANNOTATIONS
+            ignored = [
+                "",
+                "Compression flag is",
+                "Type annotation flag is",
+                "Compression and type annotation flags are"
+            ][no_compress + 2 * no_anotation]
+            self.Warning.ignored_flag(ignored, shown=bool(ignored))
 
     def _can_save(self):
-        return self.data is not None \
-            and bool(self.filename) \
-            and (not self.data.is_sparse() or self.writer.SUPPORT_SPARSE_DATA)
+        return not (
+            self.data is None
+            or not self.filename
+            or self.data.is_sparse() and not self.writer.SUPPORT_SPARSE_DATA
+            or self.compress and not self.writer.SUPPORT_COMPRESSED
+        )
 
     def send_report(self):
         self.report_data_brief(self.data)

Orange/widgets/data/tests/test_owsave.py

@@ -38,7 +38,6 @@ def test_dataset(self):
         datasig = widget.Inputs.data
         self.send_signal(datasig, self.iris)
         self.assertEqual(insum.call_args[0][0], "150")
-        self.assertFalse(widget.bt_save.isEnabled())
         insum.reset_mock()
         savefile.reset_mock()
 
@@ -47,18 +46,15 @@ def test_dataset(self):
         widget.auto_save = False
         self.send_signal(datasig, self.iris)
         self.assertEqual(insum.call_args[0][0], "150")
-        self.assertTrue(widget.bt_save.isEnabled())
         savefile.assert_not_called()
 
         widget.auto_save = True
         self.send_signal(datasig, self.iris)
         self.assertEqual(insum.call_args[0][0], "150")
-        self.assertTrue(widget.bt_save.isEnabled())
         savefile.assert_called()
 
         self.send_signal(datasig, None)
         insum.assert_called_with(widget.info.NoInput)
-        self.assertFalse(widget.bt_save.isEnabled())
 
     @patch("Orange.widgets.data.owsave.QFileDialog")
     def test_set_file_name_start_dir(self, filedialog):
@@ -210,39 +206,15 @@ def test_file_label(self):
 
         widget.filename = ""
         widget._update_controls()
-        self.assertTrue(widget.lb_filename.isHidden())
-        self.assertTrue(widget.Warning.no_file_name.is_shown())
+        self.assertTrue(widget.Error.no_file_name.is_shown())
 
         widget.filename = _w("/foo/bar/baz.csv")
         widget._update_controls()
         self.assertFalse(widget.lb_filename.isHidden())
         self.assertIn(
-            widget.lb_filename.text(), _w("Save to: /foo/bar/baz.csv"))
-        self.assertFalse(widget.Warning.no_file_name.is_shown())
+            widget.lb_filename.text(), _w("File name: baz.csv"))
+        self.assertFalse(widget.Error.no_file_name.is_shown())
 
-        widget.filename = os.path.expanduser(_w("~/baz/bar/foo.csv"))
-        widget._update_controls()
-        self.assertFalse(widget.lb_filename.isHidden())
-        self.assertEqual(
-            widget.lb_filename.text(), _w("Save to: baz/bar/foo.csv"))
-
-    def test_annotation_checkbox(self):
-        widget = self.widget
-        for _, widget.writer in FILE_TYPES:
-            widget.filename = f"foo.{widget.writer.EXTENSIONS[0]}"
-            widget._update_controls()
-            self.assertIsNot(widget.controls.add_type_annotations.isHidden(),
-                             widget.writer.OPTIONAL_TYPE_ANNOTATIONS,
-                             msg=f"for {widget.writer}")
-            self.assertIsNot(widget.controls.compress.isHidden(),
-                             widget.writer.SUPPORT_COMPRESSED,
-                             msg=f"for {widget.writer}")
-
-        widget.writer = TabReader
-        widget.filename = ""
-        self.widget._update_controls()
-        self.assertFalse(widget.controls.add_type_annotations.isVisible())
-        self.assertFalse(widget.controls.compress.isVisible())
 
     def test_sparse_error(self):
         widget = self.widget