Changeset 5251ec6 in sasview for src/sas/sasgui/perspectives/calculator/image_viewer.py

Timestamp:

Oct 11, 2018 2:20:56 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1249

Children:

98b9f32

Parents:

67ed543

Message:

improved support for py37 in sasgui

File:

• src/sas/sasgui/perspectives/calculator/image_viewer.py (modified) (1 diff)

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

@@ -95 +95 @@
         if location is None:
             location = os.getcwd()
-        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|"\
-            "PNG (*.png)|*.png|"\
-            "TIFF (*.tif;*.tiff)|*.tif;*tiff|"\
-            "All Files (*.*)|*.*|"
+        wildcard="|".join((
+            "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",
+            "PNG (*.png)|*.png",
+            "TIFF (*.tif;*.tiff)|*.tif;*tiff",
+            "All Files (*.*)|*.*",
+            ))
 
         dlg = wx.FileDialog(self.parent, "Image Viewer: Choose an image file",