Changeset 474

Timestamp:

Feb 3, 2009 4:45:55 PM (14 years ago)

Author:

srkline

Message:

Moved DoFileSaveDialog? and DoFileOpenDialog? to PlotUtilsMacro_v40 since it is common to all packages. Then there is no need to duplicate functions and no new files to include.

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Analysis/WriteModelData_v40.ipf (modified) (2 diffs)
• Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (1 diff)
• Reduction/SANS/WriteQIS.ipf (modified) (1 diff)
• Reduction/USANS/WriteUSANSData.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/WriteModelData_v40.ipf

@@ -84 +84 @@
         if(dialog)
                 PathInfo/S catPathName
-                fullPath = A_DoSaveFileDialog("Save data as",fname=NameofWave(ywave)+".txt")
+                fullPath = DoSaveFileDialog("Save data as",fname=NameofWave(ywave)+".txt")
                 If(cmpstr(fullPath,"")==0)
                         //user cancel, don't write out a file
@@ -101 +101 @@
 End
 
-// returns the path to the file, or null if the user cancelled
-// fancy use of optional parameters
-// 
-// enforce short file names (26 characters)
-// DUPLICATE of similar-named function in WriteQIS (including starts a bad dependency chain)
-Function/S A_DoSaveFileDialog(msg,[fname,suffix])
-        String msg,fname,suffix
-        Variable refNum
-//      String message = "Save the file as"
-
-        if(ParamIsDefault(fname))
-//              Print "fname not supplied"
-                fname = ""
-        endif
-        if(ParamIsDefault(suffix))
-//              Print "suffix not supplied"
-                suffix = ""
-        endif
-        
-        String outputPath,tmpName,testStr
-        Variable badLength=0,maxLength=26,l1,l2
-        
-        
-        tmpName = fname + suffix
-        
-        do
-                badLength=0
-                Open/D/M=msg/T="????" refNum as tmpName
-                outputPath = S_fileName
-                
-                testStr = ParseFilePath(0, outputPath, ":", 1, 0)               //just the filename
-                if(strlen(testStr)==0)
-                        break           //cancel, allow exit
-                endif
-                if(strlen(testStr) > maxLength)
-                        badlength = 1
-                        DoAlert 2,"File name is too long. Is\r"+testStr[0,25]+"\rOK?"
-                        if(V_flag==3)
-                                outputPath = ""
-                                break
-                        endif
-                        if(V_flag==1)                   //my suggested name is OK, so trim the output
-                                badlength=0
-                                l1 = strlen(testStr)            //too long length
-                                l1 = l1-maxLength               //number to trim
-                                //Print outputPath
-                                l2=strlen(outputPath)
-                                outputPath = outputPath[0,l2-1-l1]
-                                //Print "modified  ",outputPath
-                        endif
-                        //if(V_flag==2)  do nothing, let it go around again
-                endif
-                
-        while(badLength)
-        
-        return outputPath
-End

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

@@ -825 +825 @@
         return(str)
 End
+
+
+//returns the path to the file, or null if cancel
+Function/S DoOpenFileDialog(msg)
+        String msg
+        
+        Variable refNum
+//      String message = "Select a file"
+        String outputPath
+        
+        Open/D/R/T="????"/M=msg refNum
+        outputPath = S_fileName
+        
+        return outputPath
+End
+
+// returns the path to the file, or null if the user cancelled
+// fancy use of optional parameters
+// 
+// enforce short file names (26 characters)
+Function/S DoSaveFileDialog(msg,[fname,suffix])
+        String msg,fname,suffix
+        Variable refNum
+//      String message = "Save the file as"
+
+        if(ParamIsDefault(fname))
+//              Print "fname not supplied"
+                fname = ""
+        endif
+        if(ParamIsDefault(suffix))
+//              Print "suffix not supplied"
+                suffix = ""
+        endif
+        
+        String outputPath,tmpName,testStr
+        Variable badLength=0,maxLength=26,l1,l2
+        
+        
+        tmpName = fname + suffix
+        
+        do
+                badLength=0
+                Open/D/M=msg/T="????" refNum as tmpName
+                outputPath = S_fileName
+                
+                testStr = ParseFilePath(0, outputPath, ":", 1, 0)               //just the filename
+                if(strlen(testStr)==0)
+                        break           //cancel, allow exit
+                endif
+                if(strlen(testStr) > maxLength)
+                        badlength = 1
+                        DoAlert 2,"File name is too long. Is\r"+testStr[0,25]+"\rOK?"
+                        if(V_flag==3)
+                                outputPath = ""
+                                break
+                        endif
+                        if(V_flag==1)                   //my suggested name is OK, so trim the output
+                                badlength=0
+                                l1 = strlen(testStr)            //too long length
+                                l1 = l1-maxLength               //number to trim
+                                //Print outputPath
+                                l2=strlen(outputPath)
+                                outputPath = outputPath[0,l2-1-l1]
+                                //Print "modified  ",outputPath
+                        endif
+                        //if(V_flag==2)  do nothing, let it go around again
+                endif
+                
+        while(badLength)
+        
+        return outputPath
+End

sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/WriteQIS.ipf

@@ -813 +813 @@
 End
 
-
-//returns the path to the file, or null if cancel
-Function/S DoOpenFileDialog(msg)
-        String msg
-        
-        Variable refNum
-//      String message = "Select a file"
-        String outputPath
-        
-        Open/D/R/T="????"/M=msg refNum
-        outputPath = S_fileName
-        
-        return outputPath
-End
-
-// returns the path to the file, or null if the user cancelled
-// fancy use of optional parameters
-// 
-// enforce short file names (26 characters)
-Function/S DoSaveFileDialog(msg,[fname,suffix])
-        String msg,fname,suffix
-        Variable refNum
-//      String message = "Save the file as"
-
-        if(ParamIsDefault(fname))
-//              Print "fname not supplied"
-                fname = ""
-        endif
-        if(ParamIsDefault(suffix))
-//              Print "suffix not supplied"
-                suffix = ""
-        endif
-        
-        String outputPath,tmpName,testStr
-        Variable badLength=0,maxLength=26,l1,l2
-        
-        
-        tmpName = fname + suffix
-        
-        do
-                badLength=0
-                Open/D/M=msg/T="????" refNum as tmpName
-                outputPath = S_fileName
-                
-                testStr = ParseFilePath(0, outputPath, ":", 1, 0)               //just the filename
-                if(strlen(testStr)==0)
-                        break           //cancel, allow exit
-                endif
-                if(strlen(testStr) > maxLength)
-                        badlength = 1
-                        DoAlert 2,"File name is too long. Is\r"+testStr[0,25]+"\rOK?"
-                        if(V_flag==3)
-                                outputPath = ""
-                                break
-                        endif
-                        if(V_flag==1)                   //my suggested name is OK, so trim the output
-                                badlength=0
-                                l1 = strlen(testStr)            //too long length
-                                l1 = l1-maxLength               //number to trim
-                                //Print outputPath
-                                l2=strlen(outputPath)
-                                outputPath = outputPath[0,l2-1-l1]
-                                //Print "modified  ",outputPath
-                        endif
-                        //if(V_flag==2)  do nothing, let it go around again
-                endif
-                
-        while(badLength)
-        
-        return outputPath
-End

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

@@ -53 +53 @@
         if(dialog)
                 PathInfo/S catPathName
-                fullPath = U_DoSaveFileDialog("Save data as")
+                fullPath = DoSaveFileDialog("Save data as")
                 If(cmpstr(fullPath,"")==0)
                         //user cancel, don't write out a file
@@ -199 +199 @@
 End
 
-// returns the path to the file, or null if the user cancelled
-// fancy use of optional parameters
-// 
-// enforce short file names (26 characters)
-//DUPLICATE of similar-named function in WriteQIS (including starts a bad dependency cascade)
-Function/S U_DoSaveFileDialog(msg,[fname,suffix])
-        String msg,fname,suffix
-        Variable refNum
-//      String message = "Save the file as"
-
-        if(ParamIsDefault(fname))
-//              Print "fname not supplied"
-                fname = ""
-        endif
-        if(ParamIsDefault(suffix))
-//              Print "suffix not supplied"
-                suffix = ""
-        endif
-        
-        String outputPath,tmpName,testStr
-        Variable badLength=0,maxLength=26,l1,l2
-        
-        
-        tmpName = fname + suffix
-        
-        do
-                badLength=0
-                Open/D/M=msg/T="????" refNum as tmpName
-                outputPath = S_fileName
-                
-                testStr = ParseFilePath(0, outputPath, ":", 1, 0)               //just the filename
-                if(strlen(testStr)==0)
-                        break           //cancel, allow exit
-                endif
-                if(strlen(testStr) > maxLength)
-                        badlength = 1
-                        DoAlert 2,"File name is too long. Is\r"+testStr[0,25]+"\rOK?"
-                        if(V_flag==3)
-                                outputPath = ""
-                                break
-                        endif
-                        if(V_flag==1)                   //my suggested name is OK, so trim the output
-                                badlength=0
-                                l1 = strlen(testStr)            //too long length
-                                l1 = l1-maxLength               //number to trim
-                                //Print outputPath
-                                l2=strlen(outputPath)
-                                outputPath = outputPath[0,l2-1-l1]
-                                //Print "modified  ",outputPath
-                        endif
-                        //if(V_flag==2)  do nothing, let it go around again
-                endif
-                
-        while(badLength)
-        
-        return outputPath
-End