Changeset 174

Timestamp:

Oct 1, 2007 2:16:25 PM (15 years ago)

Author:

srkline

Message:

changed my mind - made the global fit report "auto-save". It picks up the save name from the history text - so if that changes, the file names will be quite unusual.

File:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/GlobalFit/GlobalFit2_NCNR.ipf (modified) (2 diffs)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/GlobalFit/GlobalFit2_NCNR.ipf

@@ -1107 +1107 @@
 //                      endif
                         
-                        //SRK - generate a simple report
-                        
-                        String topGraph= WinName(0,1)
-                        Generate_GF_Report(topGraph,GF_resultStr)
-                        
-                        //eSRK
+
                         SetDataFolder $saveDF   
                 endfor
         endif
+        
+        //SRK - generate a simple report
+                        
+        String topGraph= WinName(0,1)
+        Generate_GF_Report(topGraph,GF_resultStr)
+        
+        //eSRK
         
         return 0
@@ -4767 +4769 @@
         //save the notebook and the graphic file
 //      if(yesSave)
+                String dataFileStr="",nameStr
+                sscanf StringFromList(4,GF_ResultStr,"\r"),"Data Set:%s",dataFileStr            //reads the 5th line to find the data set name
 //              String nameStr=CleanupName(func,0)
 //              nameStr = nameStr[0,8]  //shorten the name
-//              nameStr += "_"+dataname
-//              //make sure the name is no more than 31 characters
-//              namestr = namestr[0,30]         //if shorter than 31, this will NOT pad to 31 characters
-//              Print "file saved as ",nameStr
-//              SaveNotebook /O/P=home/S=2 $nb as nameStr
+                nameStr = "GF_"+dataFileStr
+                //make sure the name is no more than 31 characters
+                namestr = namestr[0,30]         //if shorter than 31, this will NOT pad to 31 characters
+                Print "file saved as ",nameStr
+                SaveNotebook /O/P=home/S=2 $nb as nameStr
 //              //save the graph separately as a PICT file, 2x screen
 //              pictStr += nameStr