Changeset 257

Timestamp:

Feb 12, 2008 3:18:09 PM (15 years ago)

Author:

ajj

Message:

• Updated fixed includes to point to _v40 versions
• Modified SANSModelPicker functions to find files based on version string in global so that the model picker list always has the same names in it regardless of version
• Updated template to use new procedures

Location:

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files

Files:

• Put in User Procedures/SANS_Models_v4.00/Packages/ModelPicker/SANSModelPicker_v40.ipf (modified) (8 diffs)
• Put in User Procedures/SANS_Models_v4.00/Packages/Wrapper_v40.ipf (modified) (1 diff)
• Put in User Procedures/SANS_Models_v4.00/PlotManager_v40.ipf (modified) (1 diff)
• SANS_Analysis_v4.0.pxt (modified) (previous)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/Packages/ModelPicker/SANSModelPicker_v40.ipf

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
 #pragma IgorVersion=6.0
-#pragma version=3.00
+#pragma version=4.00
 
 //************************
@@ -39 +39 @@
 // initializes each time to make sure
 Proc ModelPicker_Panel()
-
-        Variable/G root:SANS_ANA_VERSION=3.00
         
         DoWindow/F Procedure_List
@@ -437 +435 @@
         String/G root:Packages:NIST:FileList:allFiles=""
         SVAR allFiles = root:Packages:NIST:FileList:allFiles
+
+        SVAR fileVerExt = root:Packages:NIST:SANS_ANA_EXTENSION
+
+        fileStr = RemoveExten(fileStr)+fileVerExt
         
         PathInfo Igor
@@ -464 +466 @@
         Wave/T includedFileWave=$"root:Packages:NIST:FileList:includedFileWave"
         Wave selToDel=$"root:Packages:NIST:FileList:selToDelWave"
+
+        SVAR fileVerExt=root:Packages:NIST:SANS_ANA_EXTENSION
         
         Variable numIncl=numpnts(includedFileWave)
@@ -470 +474 @@
 
         //Necessary for every analysis experiment
-        Execute/P "INSERTINCLUDE \"PlotUtilsMacro\""
-        Execute/P "INSERTINCLUDE \"GaussUtils\""
-        Execute/P "INSERTINCLUDE \"WriteModelData\""
+        Execute/P "INSERTINCLUDE \"PlotUtilsMacro_v40\""
+        Execute/P "INSERTINCLUDE \"GaussUtils_v40\""
+        Execute/P "INSERTINCLUDE \"WriteModelData_v40\""
         
         NVAR doCheck=root:Packages:NIST:FileList:checkForFiles
@@ -485 +489 @@
                         if(ok || !doCheck)
                                 fname = RemoveExten(fileWave[ii])       
-                                Execute/P "INSERTINCLUDE \""+fname+"\""
+                                Execute/P "INSERTINCLUDE \""+fname+fileVerExt+"\""
                                 // add to the already included list, and remove from the to-include list (and selWaves also)
                                 InsertPoints numpnts(includedFileWave), 1, includedFileWave,selToDel
@@ -516 +520 @@
         Wave sel=$"root:Packages:NIST:FileList:selWave"
         
+        SVAR fileVerExt=root:Packages:NIST:SANS_ANA_EXTENSION
         
         Variable num=numpnts(selToDel),ii
@@ -524 +529 @@
                 if(selToDel[ii] == 1)
                         fname = RemoveExten(includedFileWave[ii])
-                        Execute/P "DELETEINCLUDE \""+fname+"\""
+                        Execute/P "DELETEINCLUDE \""+fname+fileVerExt+"\""
                         //add to the to-include list
                         InsertPoints numpnts(fileWave), 1, fileWave,sel

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/Packages/Wrapper_v40.ipf

@@ -16 +16 @@
         NewDataFolder/O root:Packages
         NewDataFolder/O root:Packages:NIST
+
+        //Create useful globals
+        Variable/G root:Packages:NIST:SANS_ANA_VERSION=4.00
+        String/G root:Packages:NIST:SANS_ANA_EXTENSION="_v40"
         
         DoWindow/F WrapperPanel

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v4.00/PlotManager_v40.ipf

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
-#pragma version=3.00
+#pragma version=4.00
 #pragma IgorVersion=6.0