Changeset 968f72d in sasview

Timestamp:

Mar 26, 2013 5:09:59 PM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3b148c3

Parents:

98b12205

Message:

GENSANS: set all Gen files as default in fileDialog.

Files:

• calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py (modified) (1 diff)
• sanscalculator/src/sans/calculator/sans_gen.py (modified) (1 diff)

calculatorview/src/sans/perspectives/calculator/gen_scatter_panel.py

@@ -465 +465 @@
         if location == None:
             location = os.getcwd()
-        
+
+        exts = "*" + self.omfreader.ext[0]
+        exts += ", *" + self.sldreader.ext[0]
+        exts += ", *" + self.pdbreader.ext[0]
+        all_type = "All GEN files (%s, %s) | %s"% (exts.upper(), exts.lower(), 
+                                               exts.lower().replace(',', ';'))        
+        wildcard = [all_type]
         omf_type = self.omfreader.type
         sld_type = self.sldreader.type
         pdb_type = self.pdbreader.type
-        wildcard = []
+
         for type in sld_type:
             wildcard.append(type)

sanscalculator/src/sans/calculator/sans_gen.py

@@ -641 +641 @@
     ## Wildcards
     type = ["sld files (*.SLD, *.sld)|*.sld",
-            "txt files (*.TXT, *.txt)|*.txt"]
+            "txt files (*.TXT, *.txt)|*.txt",
+            "all files (*.*)|*.*"]
     ## List of allowed extensions
-    ext = ['.txt', '.TXT', '.sld', 'SLD', '.*']
+    ext = ['.sld', '.SLD', '.txt', '.TXT', '.*']
     
     def read(self, path):