Changeset 132 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/ModelPicker

Timestamp:

Jul 26, 2007 1:33:58 PM (16 years ago)

Author:

srkline

Message:

Modifications to SumSANSModels to make it data folder aware

Modifications to SumSANSModels and SANSPicker to bury their folders in :myGlobals

New (3.01) template that uses these folder structures
Removed (3.00) template

File:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/ModelPicker/SANSModelPicker.ipf (modified) (25 diffs)

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/ModelPicker/SANSModelPicker.ipf

@@ -52 +52 @@
 // the list box in the panel
 Proc Init_FileList()
-        //create the data folder
-        if(!DataFolderExists("root:FileList"))
-                NewDataFolder/O/S root:FileList
+        //create the data folders  and globals
+        NewDataFolder/O root:myGlobals          //others will need this...make it just in case
+        
+        if(!DataFolderExists("root:myGlobals:FileList"))
+                NewDataFolder/O/S root:myGlobals:FileList
                 //create the waves
                 Make/O/T/N=0 fileWave,includedFileWave
@@ -65 +67 @@
                 // a switch for me to turn off file checking
                 Variable/G checkForFiles=1              //set to true initially
+                checkForFiles = !(stringmatch(ParseFilePath(0,SpecialDirPath("Desktop",0,0,0),":",1,1),"s*ine"))                //zero for me
                 
                 //fill the list of procedures
@@ -75 +78 @@
                 FileList_InsertButtonProc("") 
                 
-                NewDataFolder/O root:myGlobals          //others will need this...make it just in case
+
                 
                 SetDataFolder root:
@@ -86 +89 @@
 // if the wave SANS_Model_List does not exist
 Proc ReadNewProcList()
-        KillWaves/Z root:FileList:SANS_Model_List               //kill the old list
+        KillWaves/Z root:myGlobals:FileList:SANS_Model_List             //kill the old list
         FileList_GetListButtonProc("")
 End
@@ -101 +104 @@
 //
 Proc TypeNewModelList()
-        variable ii=0,num=numpnts(root:FileList:SANS_Model_List)
+        variable ii=0,num=numpnts(root:myGlobals:FileList:SANS_Model_List)
         printf "Make/O/T/N/=%d  SANS_Model_List\r\r",num
         do
-                printf "SANS_Model_List[%d] = \"%s\"\r",ii,root:FileList:SANS_Model_List[ii]
+                printf "SANS_Model_List[%d] = \"%s\"\r",ii,root:myGlobals:FileList:SANS_Model_List[ii]
                 ii+=1
         while(ii<num)
@@ -110 +113 @@
 
 Proc FileList_BuiltInList()
-        SetDataFolder root:FileList
+        SetDataFolder root:myGlobals:FileList
 
 ////paste here... after deleting the old make statement and list
@@ -189 +192 @@
         String ProcedureName
         
-        SetDataFolder root:FileList
+        SetDataFolder root:myGlobals:FileList
         Variable num
         num=numpnts(fileWave)
@@ -206 +209 @@
         Variable val
         // a switch for me to turn off file checking
-        root:FileList:checkForFiles=val //0==no check, 1=check  
+        root:myGlobals:FileList:checkForFiles=val       //0==no check, 1=check  
 End
 
@@ -223 +226 @@
         DoWindow/C Procedure_List
         ModifyPanel fixedSize=1
-        ListBox fileList,pos={4,3},size={200,100},listWave=root:FileList:fileWave
-        ListBox fileList,selWave=root:FileList:selWave,mode= 4
+        ListBox fileList,pos={4,3},size={200,100},listWave=root:myGlobals:FileList:fileWave
+        ListBox fileList,selWave=root:myGlobals:FileList:selWave,mode= 4
         ListBox inclList,pos={4,110},size={200,100}
-        ListBox inclList,listWave=root:FileList:includedFileWave
-        ListBox inclList,selWave=root:FileList:selToDelWave,mode= 4
+        ListBox inclList,listWave=root:myGlobals:FileList:includedFileWave
+        ListBox inclList,selWave=root:myGlobals:FileList:selToDelWave,mode= 4
         Button button0,pos={212,77},size={110,20},proc=FileList_InsertButtonProc,title="Include File(s)"
         Button button0,help={"Includes the selected procedures, functions appear under the SANS Models menu"}
@@ -257 +260 @@
         //loop through the selected files in the list...
         //
-        Wave/T fileWave=$"root:FileList:fileWave"
-        Wave sel=$"root:FileList:selWave"
+        Wave/T fileWave=$"root:myGlobals:FileList:fileWave"
+        Wave sel=$"root:myGlobals:FileList:selWave"
         
         Variable num=numpnts(sel),ii
         String fname=""
         
-//      NVAR doCheck=root:FileList:checkForFiles
+//      NVAR doCheck=root:myGlobals:FileList:checkForFiles
         ii=num-1                //work bottom-up to not lose the index
         do
@@ -275 +278 @@
         //try the list of already-included files
         if(cmpstr(fname,"")==0)
-                Wave/T inclFileWave=$"root:FileList:includedFileWave"
-                Wave seltoDel=$"root:FileList:selToDelWave"
+                Wave/T inclFileWave=$"root:myGlobals:FileList:includedFileWave"
+                Wave seltoDel=$"root:myGlobals:FileList:selToDelWave"
                 num=numpnts(seltoDel)
                 ii=num-1                //work bottom-up to not lose the index
@@ -322 +325 @@
         String list=""
 
-        if(Exists("root:FileList:SANS_Model_List") != 1)
-                SetDataFolder root:FileList
+        if(Exists("root:myGlobals:FileList:SANS_Model_List") != 1)
+                SetDataFolder root:myGlobals:FileList
                 LoadWave/A/T
                 WAVE/T w=$(StringFromList(0,S_WaveNames,";"))
                 SetDataFolder root:
         else
-                WAVE/T w=$("root:FileList:SANS_Model_List")
+                WAVE/T w=$("root:myGlobals:FileList:SANS_Model_List")
         endif
         
 //      // convert the input wave to a semi-list
-//      SVAR allFiles=root:FileList:allFiles
+//      SVAR allFiles=root:myGlobals:FileList:allFiles
 //      allFiles=MP_TextWave2SemiList(w)
         list=MP_TextWave2SemiList(w)
@@ -341 +344 @@
 
         // remove the items that have already been included
-        Wave/T includedFileWave=$"root:FileList:includedFileWave"
+        Wave/T includedFileWave=$"root:myGlobals:FileList:includedFileWave"
         Variable numInc=numpnts(includedFileWave)
         for(ii=0;ii<numInc;ii+=1)
@@ -348 +351 @@
         list = SortList(list,";",0)
         num=ItemsInList(list,";")
-        WAVE/T fileWave=$"root:FileList:fileWave"
-        WAVE selWave=$"root:FileList:selWave"
+        WAVE/T fileWave=$"root:myGlobals:FileList:fileWave"
+        WAVE selWave=$"root:myGlobals:FileList:selWave"
         Redimension/N=(num) fileWave            //make the waves the proper length
         Redimension/N=(num) selWave
@@ -381 +384 @@
 
 // new way, to catch all files in all subfolders
-        SVAR allFiles=root:FileList:allFiles
+        SVAR allFiles=root:myGlobals:FileList:allFiles
         allFiles=""             //clear the list
 
@@ -400 +403 @@
         list = RemoveFromList("DemoLoader.ipf",list,";" )
         // remove the items that have already been included
-        Wave/T includedFileWave=$"root:FileList:includedFileWave"
+        Wave/T includedFileWave=$"root:myGlobals:FileList:includedFileWave"
         Variable numInc=numpnts(includedFileWave)
         for(ii=0;ii<numInc;ii+=1)
@@ -407 +410 @@
         list = SortList(list,";",0)
         num=ItemsInList(list,";")
-        WAVE/T fileWave=$"root:FileList:fileWave"
-        WAVE selWave=$"root:FileList:selWave"
+        WAVE/T fileWave=$"root:myGlobals:FileList:fileWave"
+        WAVE selWave=$"root:myGlobals:FileList:selWave"
         Redimension/N=(num) fileWave            //make the waves the proper length
         Redimension/N=(num) selWave
@@ -422 +425 @@
 
         Variable err=0
-        String/G root:FileList:allFiles=""
-        SVAR allFiles = root:FileList:allFiles
+        String/G root:myGlobals:FileList:allFiles=""
+        SVAR allFiles = root:myGlobals:FileList:allFiles
         
         PathInfo Igor
@@ -446 +449 @@
         
         //loop through the selected files in the list...
-        Wave/T fileWave=$"root:FileList:fileWave"
-        Wave sel=$"root:FileList:selWave"
+        Wave/T fileWave=$"root:myGlobals:FileList:fileWave"
+        Wave sel=$"root:myGlobals:FileList:selWave"
         //and adjust the included file lists
-        Wave/T includedFileWave=$"root:FileList:includedFileWave"
-        Wave selToDel=$"root:FileList:selToDelWave"
+        Wave/T includedFileWave=$"root:myGlobals:FileList:includedFileWave"
+        Wave selToDel=$"root:myGlobals:FileList:selToDelWave"
         
         Variable numIncl=numpnts(includedFileWave)
@@ -461 +464 @@
         Execute/P "INSERTINCLUDE \"WriteModelData\""
         
-        NVAR doCheck=root:FileList:checkForFiles
+        NVAR doCheck=root:myGlobals:FileList:checkForFiles
         
         ii=num-1                //work bottom-up to not lose the index
@@ -496 +499 @@
         
         //loop through the selected files in the list...
-        Wave/T includedFileWave=$"root:FileList:includedFileWave"
-        Wave selToDel=$"root:FileList:selToDelWave"
+        Wave/T includedFileWave=$"root:myGlobals:FileList:includedFileWave"
+        Wave selToDel=$"root:myGlobals:FileList:selToDelWave"
         // and put the unwanted procedures back in the to-add list
-        Wave/T fileWave=$"root:FileList:fileWave"
-        Wave sel=$"root:FileList:selWave"
+        Wave/T fileWave=$"root:myGlobals:FileList:fileWave"
+        Wave sel=$"root:myGlobals:FileList:selWave"
         
         
@@ -564 +567 @@
 // if root:MenuItemStr exists
 Menu "SANS Models"
-        StrVarOrDefault("root:FileList:MenuItemStr_def","ModelPicker_Panel")//, RefreshMenu()
+        StrVarOrDefault("root:myGlobals:FileList:MenuItemStr_def","ModelPicker_Panel")//, RefreshMenu()
         SubMenu "Unsmeared Models"
-                StrVarOrDefault("root:FileList:MenuItemStr1","ModelPicker_Panel")
+                StrVarOrDefault("root:myGlobals:FileList:MenuItemStr1","ModelPicker_Panel")
         End
         SubMenu "Smeared Models"
-                StrVarOrDefault("root:FileList:MenuItemStr2","ModelPicker_Panel")
+                StrVarOrDefault("root:myGlobals:FileList:MenuItemStr2","ModelPicker_Panel")
         End
 //      SubMenu "Models 3"
@@ -594 +597 @@
         list += MacroList("WriteM*",sep,"KIND:1,NPARAMS:4")             //data writer
         list += "-"+sep
-        String/G root:FileList:MenuItemStr_def = TrimListTo255(list)
+        String/G root:myGlobals:FileList:MenuItemStr_def = TrimListTo255(list)
         
         list = ""
@@ -601 +604 @@
         list = RemoveFromList("FreezeModel", list ,";")                 // remove FreezeModel, it's not a model
         //      list += "-"+sep
-        String/G root:FileList:MenuItemStr1 = TrimListTo255(list)
+        String/G root:myGlobals:FileList:MenuItemStr1 = TrimListTo255(list)
 
         list=""
         list += MacroList("PlotSmea*",sep,"KIND:1,NPARAMS:1")                   //smeared plot procedures
         list += MacroList("PlotSmea*",sep,"KIND:1,NPARAMS:2")                   //smeared RPA has 2 parameters
-        String/G root:FileList:MenuItemStr2 = TrimListTo255(list)
+        String/G root:myGlobals:FileList:MenuItemStr2 = TrimListTo255(list)
 
         BuildMenu "SANS Models"
@@ -664 +667 @@
         String prefix
         
-        SVAR allFiles=root:FileList:allFiles
+        SVAR allFiles=root:myGlobals:FileList:allFiles
         // Build a prefix (a number of tabs to indicate the folder level by indentation)
         prefix = ""