Changeset 662

Timestamp:

Apr 6, 2010 11:15:13 AM (12 years ago)

Author:

srkline

Message:

Modified installer to copy folders, rather than move them. This allows the installer to be re-run without downloading or unzipping a fresh copy.

Added a "refresh" button to the PlotManager?. Streamlined the filtering out of non-plottable data.

Made XML the default (set the global to 1 in Wrapper, Initialize, and Main_USANS).

Location:

sans/Dev/trunk

Files:

• NCNR_Install_or_Update.pxp (modified) (previous)
• NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf (modified) (1 diff)
• NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf (modified) (3 diffs)
• NCNR_User_Procedures/Common/Packages/PlotManager/PlotManager_v40.ipf (modified) (3 diffs)
• NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (1 diff)
• NCNR_User_Procedures/Reduction/SANS/CatVSTable.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Reduction/SANS/Initialize.ipf (modified) (1 diff)
• NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

@@ -28 +28 @@
         //Ugly. Put this here to make sure things don't break
         String/G root:Packages:NIST:gXMLLoader_Title
-        Variable/G root:Packages:NIST:gXML_Write = 0
+        Variable/G root:Packages:NIST:gXML_Write = 1
         
         DoWindow/F WrapperPanel

sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf

@@ -354 +354 @@
 // at this point all of the old stuff is cleaned up as best as I can
 //
-// at this point the paths point to the User Folder, not in the App folder      
+// at this point the paths point to the User Folder, not the App folder 
         
         
@@ -361 +361 @@
 //////////// INSTALL the new stuff
 //
-//(1) copy the items to install to the User Special Folder
-//(2) --- now I don't need to set up aliases! they are just there
+//(1) COPY the items to install to the User Special Folder
+//(2) --- now I don't need to set up aliases! Load everything from the Macros menu
 //
 // the old ones should be gone already, so just put in the new ones
-
 // they may not be possible to remove, so try to overwrite...
 
-        NewPath /Q/O SpecialPath, userPathStr
-
+
+///// now COPY the Folders to the special path
 // the help files
-        MoveFolder/Z=1 homePathStr+"NCNR_Help_Files" as IHPathStr+"NCNR_Help_Files"
-        Print "******Move folder NCNR_Help_Files into User Special Folder, NO overwite: "+IsMoveOK(V_flag)
-
-// not needed now
-//      CreateAliasShortcut/O/P=SpecialPath "NCNR_Help_Files" as igorPathStr+"Igor Help Files:NCNR_Help_Files"
-//      Print "Creating shortcut from NCNR_Help_Files into Igor Help Files: "+IsMoveOK(V_flag)
+        CopyFolder/Z=1 homePathStr+"NCNR_Help_Files" as IHPathStr+"NCNR_Help_Files"
+        Print "******Copy folder NCNR_Help_Files into User Special Folder, NO overwite: "+IsMoveOK(V_flag)
 
 // the Igor Procedures
-        MoveFolder/Z=1 homePathStr+"NCNR_Igor_Procedures" as IgProcPathStr+"NCNR_Igor_Procedures"
-        Print "*******Move folder NCNR_Igor_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag)
+        CopyFolder/Z=1 homePathStr+"NCNR_Igor_Procedures" as IgProcPathStr+"NCNR_Igor_Procedures"
+        Print "*******Copy folder NCNR_Igor_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag)
 
 // the User Procedures  
-        MoveFolder/Z=1 homePathStr+"NCNR_User_Procedures" as UPPathStr+"NCNR_User_Procedures"
-        Print "*******Move folder NCNR_User_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag)
-        
-// don't need an alias for the UserProcedures - they're already here....
-
+        CopyFolder/Z=1 homePathStr+"NCNR_User_Procedures" as UPPathStr+"NCNR_User_Procedures"
+        Print "*******Copy folder NCNR_User_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag)
 
 // Igor Extensions, platform-specific
         if(isMac)
-                MoveFolder/Z=1 homePathStr+"NCNR_Extensions:Mac_XOP" as extPathStr+"NCNR_Extensions"
+                CopyFolder/Z=1 homePathStr+"NCNR_Extensions:Mac_XOP" as extPathStr+"NCNR_Extensions"
         else
-                MoveFolder/Z=1 homePathStr+"NCNR_Extensions:Win_XOP" as extPathStr+"NCNR_Extensions"
-        endif
-        Print "*******Move folder NCNR_Extensions:xxx_XOP into User Special Folder, NO overwrite: "+IsMoveOK(V_flag)
+                CopyFolder/Z=1 homePathStr+"NCNR_Extensions:Win_XOP" as extPathStr+"NCNR_Extensions"
+        endif
+        Print "*******Copy folder NCNR_Extensions:xxx_XOP into User Special Folder, NO overwrite: "+IsMoveOK(V_flag)
 //      
-// not needed now
+
+////////////////OLD way, moved the Folders//////////
+//// the help files
+//      MoveFolder/Z=1 homePathStr+"NCNR_Help_Files" as IHPathStr+"NCNR_Help_Files"
+//      Print "******Move folder NCNR_Help_Files into User Special Folder, NO overwite: "+IsMoveOK(V_flag)
+//
+//// the Igor Procedures
+//      MoveFolder/Z=1 homePathStr+"NCNR_Igor_Procedures" as IgProcPathStr+"NCNR_Igor_Procedures"
+//      Print "*******Move folder NCNR_Igor_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag)
+//
+//// the User Procedures        
+//      MoveFolder/Z=1 homePathStr+"NCNR_User_Procedures" as UPPathStr+"NCNR_User_Procedures"
+//      Print "*******Move folder NCNR_User_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag)
+//
+//// Igor Extensions, platform-specific
 //      if(isMac)
-//              CreateAliasShortcut/O/P=UPPath "NCNR_Extensions:Mac_XOP" as igorPathStr+"Igor Extensions:NCNR_Extensions"
+//              MoveFolder/Z=1 homePathStr+"NCNR_Extensions:Mac_XOP" as extPathStr+"NCNR_Extensions"
 //      else
-//              CreateAliasShortcut/O/P=UPPath "NCNR_Extensions:Win_XOP" as igorPathStr+"Igor Extensions:NCNR_Extensions"
+//              MoveFolder/Z=1 homePathStr+"NCNR_Extensions:Win_XOP" as extPathStr+"NCNR_Extensions"
 //      endif
-//      Print "Creating shortcut for XOP into Igor Extensions: "+IsMoveOK(V_flag)
-        
+//      Print "*******Move folder NCNR_Extensions:xxx_XOP into User Special Folder, NO overwrite: "+IsMoveOK(V_flag)
+////    
 
 
@@ -755 +761 @@
         String alertStr="There are old NCNR procedures and files present. You will need admin privileges to manually remove them before you can continue"
         if(flag == 0)
-                return(" OK")
+                return("  Copied OK")
         else
                 DoAlert 0,alertStr

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

@@ -40 +40 @@
         ListBox fileList,listWave=root:Packages:NIST:OneDLoader:fileWave
         ListBox fileList,selWave=root:Packages:NIST:OneDLoader:selWave,mode= 4
-        Button button6,pos={238,153},size={100,20},proc=A_OneDLoader_LoadButton,title="Load File(s)"
+        Button button6,pos={238,165},size={100,20},proc=A_OneDLoader_LoadButton,title="Load File(s)"
         Button button6,help={"Loads the selected files into memory and will graph them if that option is checked"}
         Button button7,pos={238,20},size={100,20},proc=A_OneDLoader_NewFolderButton,title="New Folder"
         Button button7,help={"Select a new data folder"}
-        GroupBox group0,pos={222,108},size={50,4},title="Shift-click to load"
-        GroupBox group0_1,pos={222,123},size={50,4},title="multiple files"
+        GroupBox group0,pos={222,127},size={50,4},title="Shift-click to load"
+        GroupBox group0_1,pos={222,143},size={50,4},title="multiple files"
         GroupBox group1,pos={7,207},size={350,4}
-        Button button8,pos={238,50},size={100,20},proc=A_OneDLoader_HelpButton,title="Help"
+        Button button8,pos={238,76},size={100,20},proc=A_OneDLoader_HelpButton,title="Help"
+        Button button9,pos={238,48},size={100,20},proc=A_PlotManager_Refresh,title="Refresh List"
 EndMacro
 
@@ -244 +245 @@
 End
 
+//refresh the listing
+Function A_PlotManager_Refresh(ctrlName) : ButtonControl
+        String ctrlName
+
+        A_OneDLoader_GetListButton("")
+        return(0)
+End
+
 //filters to remove only the files that are named like a raw data file, i.e. "*.SAn"
 //does not check to see if they really are RAW files though...(too tedious)
@@ -323 +332 @@
         
         list = IndexedFile(catpathName,-1,"????")
-        num=ItemsInList(list,";")
-        //print "num = ",num
-        for(ii=(num-1);ii>=0;ii-=1)
-                item = StringFromList(ii, list  ,";")
-                //simply remove all that are not raw data files (SA1 SA2 SA3)
-                if( !stringmatch(item,"*.SA1*") && !stringmatch(item,"*.SA2*") && !stringmatch(item,"*.SA3*") )
-                        if( !stringmatch(item,".*") && !stringmatch(item,"*.pxp") && !stringmatch(item,"*.DIV"))                //eliminate mac "hidden" files, pxp, and div files
-                                newlist += item + ";"
-                        endif
-                endif
-        endfor
+        
+        list = RemoveFromList(ListMatch(list,"*.SA1*",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.SA2*",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.SA3*",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,".*",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.pxp",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.DIV",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.GSP",";"), list, ";", 0)
+        list = RemoveFromList(ListMatch(list,"*.MASK",";"), list, ";", 0)
+
         //sort
-        newList = SortList(newList,";",0)
+        newList = SortList(List,";",0)
 
         return newlist

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

@@ -864 +864 @@
                 str = RemoveFromList("TISANE", str, ";")
                 str = RemoveFromList("HayPenMSA", str, ";")
+                str = RemoveFromList("SAS", str, ";")                   //from Irena
+                str = RemoveFromList("USAXS", str, ";")
         endif
         

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

@@ -76 +76 @@
         WAVE XCenter = $"root:myGlobals:CatVSHeaderInfo:XCenter"
         WAVE YCenter = $"root:myGlobals:CatVSHeaderInfo:YCenter"
-        WAVE/B NumGuides = $"root:myGlobals:CatVSHeaderInfo:nGuides"
+        WAVE/B nGuides = $"root:myGlobals:CatVSHeaderInfo:nGuides"
         WAVE/B NumAttens = $"root:myGlobals:CatVSHeaderInfo:NumAttens"
         WAVE RunNumber = $"root:myGlobals:CatVSHeaderInfo:RunNumber"
@@ -108 +108 @@
 #if (exists("NCNR")==6)
                 ModifyTable width(:myGlobals:CatVSHeaderInfo:nGuides)=40
-                ModifyTable width(:myGlobals:CatVSHedaerInfo:Pos)=30
+                ModifyTable width(:myGlobals:CatVSHeaderInfo:Pos)=30
 #endif
 

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

@@ -117 +117 @@
         //set XML globals
         String/G root:Packages:NIST:gXMLLoader_Title = ""
-        Variable/G root:Packages:NIST:gXML_Write = 0
+        Variable/G root:Packages:NIST:gXML_Write = 1
 
         

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

@@ -69 +69 @@
         
         //Preference value to determine if we are outputting XML
-        Variable/G root:Packages:NIST:gXML_Write = 0
+        Variable/G root:Packages:NIST:gXML_Write = 1
         
         Make/O/T/N=1 fileWave,samWave,empWave,curWave //Added curWave Sept 06 A. Jackson