Changeset 667

Timestamp:

Apr 6, 2010 5:33:41 PM (12 years ago)

Author:

srkline

Message:

USANS dialogs now prompt with "x" added to the suffix when saving.

These files are also filtered out at the same time as normal .cor and .dsm file extensions

Location:

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS

Files:

• Main_USANS.ipf (modified) (1 diff)
• USANSCatNotebook.ipf (modified) (1 diff)
• WriteUSANSData.ipf (modified) (3 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf

@@ -123 +123 @@
         Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gDQv = 0.117         //divergence, in terms of Q (1/A)  (NOV 2004)
 
+        String/G root:Packages:NIST:gXMLLoader_Title
+
         //initializes preferences. this includes XML y/n, and SANS Reduction items. 
         // if they already exist, they won't be overwritten
+        
         Execute "init_pref()"   
         

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/USANSCatNotebook.ipf

@@ -77 +77 @@
         
         // remove .cor, .dsm reduced data files
-        tmp = ListMatch(list,"*.cor",";")               
+        // should also catch .corx, .dsmx if they are generated
+        tmp = ListMatch(list,"*.cor*",";")              
         list = RemoveFromList(tmp, list  ,";")
-        tmp = ListMatch(list,"*.dsm",";")               
+        tmp = ListMatch(list,"*.dsm*",";")              
         list = RemoveFromList(tmp, list  ,";")
         tmp = ListMatch(list,"*.pxp",";")               

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/WriteUSANSData.ipf

@@ -245 +245 @@
         if(dialog)
                 PathInfo/S catPathName
-                fullPath = DoSaveFileDialog("Save data as")
+                fullPath = DoSaveFileDialog("Save data as",fname="",suffix="."+type+"x")
                 If(cmpstr(fullPath,"")==0)
                         //user cancel, don't write out a file
@@ -254 +254 @@
         Endif
         
-        SVAR samFiles = $("root:Packages:NIST:"+type+":fileList")
         //actually open the file here
         //Open refNum as fullpath
@@ -388 +387 @@
         
         if(dialog)
-                Open/D refnum as fullpath+".dsm"                //won't actually open the file
+                Open/D refnum as fullpath+".dsmx"               //won't actually open the file
                 If(cmpstr(S_filename,"")==0)
                         //user cancel, don't write out a file