Changeset 6479f3a in sasview for src

Timestamp:

Sep 17, 2017 2:55:16 PM (7 years ago)

Author:

butler

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

412e9e8b

Parents:

f9b61ca

Message:

Add file choice

Add file choice of all allowed image files (as opposed to all files) and
make the default choice.
Need to update images in rst help. Also seems to be a bug in
matplotlib.image being used (not properly closing the file after a
read?" the first should be fixed before merging. Second may leave for
another time.

File:

• src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) (2 diffs)

src/sas/sasgui/perspectives/calculator/image_viewer.py

@@ -89 +89 @@
         if location is None:
             location = os.getcwd()
-        wildcard="Bitmap (*.bmp)|*.bmp|"\
+        wildcard="Images (*.bmp;*.gif;*jpeg,*jpg;*.png;*tif;*.tiff)|*bmp;\
+            *.gif; *.jpg; *.jpeg;*png;*.png;*.tif;*.tiff|"\
+            "Bitmap (*.bmp)|*.bmp|"\
             "GIF (*.gif)|*.gif|"\
             "JPEG (*.jpg;*.jpeg)|*.jpg;*.jpeg|"\
@@ -97 +99 @@
 
         dlg = wx.FileDialog(self.parent, "Image Viewer: Choose an image file",
-                            location, "", wildcard, style=wx.FD_OPEN | wx.FD_MULTIPLE)
+                            location, "", wildcard, style=wx.FD_OPEN
+                            | wx.FD_MULTIPLE)
         if dlg.ShowModal() == wx.ID_OK:
             path = dlg.GetPaths()