Changeset f9b61ca in sasview


Ignore:
Timestamp:
Sep 17, 2017 10:36:12 AM (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:
6479f3a
Parents:
35d518f (diff), cfd27dd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'origin/master' into 898_imageviewer_file_selector

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/calculator/image_viewer.py

    ra1b8fee rc245ca4  
    8989        if location is None: 
    9090            location = os.getcwd() 
    91         dlg = wx.FileDialog(self.parent, "Image Viewer: Choose a image file", 
    92                             location, "", "", style=wx.FD_OPEN | wx.FD_MULTIPLE) 
     91        wildcard="Bitmap (*.bmp)|*.bmp|"\ 
     92            "GIF (*.gif)|*.gif|"\ 
     93            "JPEG (*.jpg;*.jpeg)|*.jpg;*.jpeg|"\ 
     94            "PNG (*.png)|*.png|"\ 
     95            "TIFF (*.tif;*.tiff)|*.tif;*tiff|"\ 
     96            "All Files (*.*)|*.*|" 
     97 
     98        dlg = wx.FileDialog(self.parent, "Image Viewer: Choose an image file", 
     99                            location, "", wildcard, style=wx.FD_OPEN | wx.FD_MULTIPLE) 
    93100        if dlg.ShowModal() == wx.ID_OK: 
    94101            path = dlg.GetPaths() 
Note: See TracChangeset for help on using the changeset viewer.