Replace Tk based file dialog with PyQt5 baed version

Stoner/Core.py

@@ -1170,7 +1170,7 @@ def __file_dialog(self, mode):
         """
         # Wildcard pattern to be used in file dialogs.
 
-        descs = {}
+        descs = {"*.*": "All Files"}
         patterns = self.patterns
         for p in patterns:  # pylint: disable=not-an-iterable
             descs[p] = self.__class__.__name__ + " file"
@@ -1181,9 +1181,6 @@ def __file_dialog(self, mode):
                 else:
                     descs[p] = self.subclasses[c].__name__ + " file"  # pylint: disable=unsubscriptable-object
 
-        patterns = [(descs[p], p) for p in sorted(descs.keys())]
-        patterns.insert(0, ("All File", "*.*"))
-
         if self.filename is not None:
             filename = os.path.basename(self.filename)
             dirname = os.path.dirname(self.filename)
@@ -1196,7 +1193,7 @@ def __file_dialog(self, mode):
             mode = "save"
         else:
             mode = "directory"
-        dlg = get_filedialog(what=mode, initialdir=dirname, initialfile=filename, filetypes=patterns)
+        dlg = get_filedialog(what=mode, start=dirname, patterns=descs)
         if dlg:
             self.filename = dlg
             return self.filename

Stoner/Folders.py

@@ -1,31 +1,31 @@
-"""Stoner.Folders : Classes for working collections of :class:`.Data` files.
-
-The core classes provides a means to access them as an ordered collection or as a mapping.
-"""
-__all__ = ["DataFolder", "PlotFolder"]
-
-from .folders.core import baseFolder
-from .folders.mixins import DiskBasedFolder, DataMethodsMixin, PlotMethodsMixin
-
-
-class DataFolder(DataMethodsMixin, DiskBasedFolder, baseFolder):
-
-    """Provide an interface to manipulating lots of data files stored within a directory structure on disc.
-
-    By default, the members of the DataFolder are isntances of :class:`Stoner.Data`. The DataFolder emplys a lazy open strategy, so that
-    files are only read in from disc when actually needed.
-
-    .. inheritance-diagram:: DataFolder
-
-    """
-
-    def __init__(self, *args, **kargs):
-        from Stoner import Data
-
-        self.type = kargs.pop("type", Data)
-        super(DataFolder, self).__init__(*args, **kargs)
-
-
-class PlotFolder(PlotMethodsMixin, DataFolder):
-
-    """A :py:class:`Stoner.folders.baseFolder` that knows how to ploth its underlying data files."""
+"""Stoner.Folders : Classes for working collections of :class:`.Data` files.
+
+The core classes provides a means to access them as an ordered collection or as a mapping.
+"""
+__all__ = ["DataFolder", "PlotFolder"]
+
+from .folders.core import baseFolder
+from .folders.mixins import DiskBasedFolder, DataMethodsMixin, PlotMethodsMixin
+
+
+class DataFolder(DataMethodsMixin, DiskBasedFolder, baseFolder):
+
+    """Provide an interface to manipulating lots of data files stored within a directory structure on disc.
+
+    By default, the members of the DataFolder are isntances of :class:`Stoner.Data`. The DataFolder emplys a lazy open strategy, so that
+    files are only read in from disc when actually needed.
+
+    .. inheritance-diagram:: DataFolder
+
+    """
+
+    def __init__(self, *args, **kargs):
+        from Stoner import Data
+
+        self.type = kargs.pop("type", Data)
+        super(DataFolder, self).__init__(*args, **kargs)
+
+
+class PlotFolder(PlotMethodsMixin, DataFolder):
+
+    """A :py:class:`Stoner.folders.baseFolder` that knows how to ploth its underlying data files."""

Stoner/Image/core.py

@@ -1079,10 +1079,10 @@ def __init__(self, *args, **kargs):
         elif len(args) > 0 and isinstance(args[0], ImageFile):  # Fixing type
             self._image = args[0].image
         elif len(args) > 0 and isinstance(args[0], np.ndarray):  # Fixing type
-            if isinstance(args[0],ImageArray): #Special handling for ImageArray
-                self._image=args[0]
-                self.filename=self._image.filename
-                self.metadata=self._image.metadata
+            if isinstance(args[0], ImageArray):  # Special handling for ImageArray
+                self._image = args[0]
+                self.filename = self._image.filename
+                self.metadata = self._image.metadata
             else:
                 self._image = ImageArray(*args, **kargs)
         elif len(args) > 0 and isinstance(