Changeset 662 for sans/Dev


Ignore:
Timestamp:
Apr 6, 2010 11:15:13 AM (13 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:
8 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/Wrapper_v40.ipf

    r607 r662  
    2828        //Ugly. Put this here to make sure things don't break 
    2929        String/G root:Packages:NIST:gXMLLoader_Title 
    30         Variable/G root:Packages:NIST:gXML_Write = 0 
     30        Variable/G root:Packages:NIST:gXML_Write = 1 
    3131         
    3232        DoWindow/F WrapperPanel 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf

    r660 r662  
    354354// at this point all of the old stuff is cleaned up as best as I can 
    355355// 
    356 // at this point the paths point to the User Folder, not in the App folder       
     356// at this point the paths point to the User Folder, not the App folder  
    357357         
    358358         
     
    361361//////////// INSTALL the new stuff 
    362362// 
    363 //(1) copy the items to install to the User Special Folder 
    364 //(2) --- now I don't need to set up aliases! they are just there 
     363//(1) COPY the items to install to the User Special Folder 
     364//(2) --- now I don't need to set up aliases! Load everything from the Macros menu 
    365365// 
    366366// the old ones should be gone already, so just put in the new ones 
    367  
    368367// they may not be possible to remove, so try to overwrite... 
    369368 
    370         NewPath /Q/O SpecialPath, userPathStr 
    371  
     369 
     370///// now COPY the Folders to the special path 
    372371// the help files 
    373         MoveFolder/Z=1 homePathStr+"NCNR_Help_Files" as IHPathStr+"NCNR_Help_Files" 
    374         Print "******Move folder NCNR_Help_Files into User Special Folder, NO overwite: "+IsMoveOK(V_flag) 
    375  
    376 // not needed now 
    377 //      CreateAliasShortcut/O/P=SpecialPath "NCNR_Help_Files" as igorPathStr+"Igor Help Files:NCNR_Help_Files" 
    378 //      Print "Creating shortcut from NCNR_Help_Files into Igor Help Files: "+IsMoveOK(V_flag) 
     372        CopyFolder/Z=1 homePathStr+"NCNR_Help_Files" as IHPathStr+"NCNR_Help_Files" 
     373        Print "******Copy folder NCNR_Help_Files into User Special Folder, NO overwite: "+IsMoveOK(V_flag) 
    379374 
    380375// the Igor Procedures 
    381         MoveFolder/Z=1 homePathStr+"NCNR_Igor_Procedures" as IgProcPathStr+"NCNR_Igor_Procedures" 
    382         Print "*******Move folder NCNR_Igor_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
     376        CopyFolder/Z=1 homePathStr+"NCNR_Igor_Procedures" as IgProcPathStr+"NCNR_Igor_Procedures" 
     377        Print "*******Copy folder NCNR_Igor_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
    383378 
    384379// the User Procedures   
    385         MoveFolder/Z=1 homePathStr+"NCNR_User_Procedures" as UPPathStr+"NCNR_User_Procedures" 
    386         Print "*******Move folder NCNR_User_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
    387          
    388 // don't need an alias for the UserProcedures - they're already here.... 
    389  
     380        CopyFolder/Z=1 homePathStr+"NCNR_User_Procedures" as UPPathStr+"NCNR_User_Procedures" 
     381        Print "*******Copy folder NCNR_User_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
    390382 
    391383// Igor Extensions, platform-specific 
    392384        if(isMac) 
    393                 MoveFolder/Z=1 homePathStr+"NCNR_Extensions:Mac_XOP" as extPathStr+"NCNR_Extensions" 
     385                CopyFolder/Z=1 homePathStr+"NCNR_Extensions:Mac_XOP" as extPathStr+"NCNR_Extensions" 
    394386        else 
    395                 MoveFolder/Z=1 homePathStr+"NCNR_Extensions:Win_XOP" as extPathStr+"NCNR_Extensions" 
    396         endif 
    397         Print "*******Move folder NCNR_Extensions:xxx_XOP into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
     387                CopyFolder/Z=1 homePathStr+"NCNR_Extensions:Win_XOP" as extPathStr+"NCNR_Extensions" 
     388        endif 
     389        Print "*******Copy folder NCNR_Extensions:xxx_XOP into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
    398390//       
    399 // not needed now 
     391 
     392////////////////OLD way, moved the Folders////////// 
     393//// the help files 
     394//      MoveFolder/Z=1 homePathStr+"NCNR_Help_Files" as IHPathStr+"NCNR_Help_Files" 
     395//      Print "******Move folder NCNR_Help_Files into User Special Folder, NO overwite: "+IsMoveOK(V_flag) 
     396// 
     397//// the Igor Procedures 
     398//      MoveFolder/Z=1 homePathStr+"NCNR_Igor_Procedures" as IgProcPathStr+"NCNR_Igor_Procedures" 
     399//      Print "*******Move folder NCNR_Igor_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
     400// 
     401//// the User Procedures         
     402//      MoveFolder/Z=1 homePathStr+"NCNR_User_Procedures" as UPPathStr+"NCNR_User_Procedures" 
     403//      Print "*******Move folder NCNR_User_Procedures into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
     404// 
     405//// Igor Extensions, platform-specific 
    400406//      if(isMac) 
    401 //              CreateAliasShortcut/O/P=UPPath "NCNR_Extensions:Mac_XOP" as igorPathStr+"Igor Extensions:NCNR_Extensions" 
     407//              MoveFolder/Z=1 homePathStr+"NCNR_Extensions:Mac_XOP" as extPathStr+"NCNR_Extensions" 
    402408//      else 
    403 //              CreateAliasShortcut/O/P=UPPath "NCNR_Extensions:Win_XOP" as igorPathStr+"Igor Extensions:NCNR_Extensions" 
     409//              MoveFolder/Z=1 homePathStr+"NCNR_Extensions:Win_XOP" as extPathStr+"NCNR_Extensions" 
    404410//      endif 
    405 //      Print "Creating shortcut for XOP into Igor Extensions: "+IsMoveOK(V_flag) 
    406          
     411//      Print "*******Move folder NCNR_Extensions:xxx_XOP into User Special Folder, NO overwrite: "+IsMoveOK(V_flag) 
     412////     
    407413 
    408414 
     
    755761        String alertStr="There are old NCNR procedures and files present. You will need admin privileges to manually remove them before you can continue" 
    756762        if(flag == 0) 
    757                 return(" OK") 
     763                return("  Copied OK") 
    758764        else 
    759765                DoAlert 0,alertStr 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotManager_v40.ipf

    r570 r662  
    4040        ListBox fileList,listWave=root:Packages:NIST:OneDLoader:fileWave 
    4141        ListBox fileList,selWave=root:Packages:NIST:OneDLoader:selWave,mode= 4 
    42         Button button6,pos={238,153},size={100,20},proc=A_OneDLoader_LoadButton,title="Load File(s)" 
     42        Button button6,pos={238,165},size={100,20},proc=A_OneDLoader_LoadButton,title="Load File(s)" 
    4343        Button button6,help={"Loads the selected files into memory and will graph them if that option is checked"} 
    4444        Button button7,pos={238,20},size={100,20},proc=A_OneDLoader_NewFolderButton,title="New Folder" 
    4545        Button button7,help={"Select a new data folder"} 
    46         GroupBox group0,pos={222,108},size={50,4},title="Shift-click to load" 
    47         GroupBox group0_1,pos={222,123},size={50,4},title="multiple files" 
     46        GroupBox group0,pos={222,127},size={50,4},title="Shift-click to load" 
     47        GroupBox group0_1,pos={222,143},size={50,4},title="multiple files" 
    4848        GroupBox group1,pos={7,207},size={350,4} 
    49         Button button8,pos={238,50},size={100,20},proc=A_OneDLoader_HelpButton,title="Help" 
     49        Button button8,pos={238,76},size={100,20},proc=A_OneDLoader_HelpButton,title="Help" 
     50        Button button9,pos={238,48},size={100,20},proc=A_PlotManager_Refresh,title="Refresh List" 
    5051EndMacro 
    5152 
     
    244245End 
    245246 
     247//refresh the listing 
     248Function A_PlotManager_Refresh(ctrlName) : ButtonControl 
     249        String ctrlName 
     250 
     251        A_OneDLoader_GetListButton("") 
     252        return(0) 
     253End 
     254 
    246255//filters to remove only the files that are named like a raw data file, i.e. "*.SAn" 
    247256//does not check to see if they really are RAW files though...(too tedious) 
     
    323332         
    324333        list = IndexedFile(catpathName,-1,"????") 
    325         num=ItemsInList(list,";") 
    326         //print "num = ",num 
    327         for(ii=(num-1);ii>=0;ii-=1) 
    328                 item = StringFromList(ii, list  ,";") 
    329                 //simply remove all that are not raw data files (SA1 SA2 SA3) 
    330                 if( !stringmatch(item,"*.SA1*") && !stringmatch(item,"*.SA2*") && !stringmatch(item,"*.SA3*") ) 
    331                         if( !stringmatch(item,".*") && !stringmatch(item,"*.pxp") && !stringmatch(item,"*.DIV"))                //eliminate mac "hidden" files, pxp, and div files 
    332                                 newlist += item + ";" 
    333                         endif 
    334                 endif 
    335         endfor 
     334         
     335        list = RemoveFromList(ListMatch(list,"*.SA1*",";"), list, ";", 0) 
     336        list = RemoveFromList(ListMatch(list,"*.SA2*",";"), list, ";", 0) 
     337        list = RemoveFromList(ListMatch(list,"*.SA3*",";"), list, ";", 0) 
     338        list = RemoveFromList(ListMatch(list,".*",";"), list, ";", 0) 
     339        list = RemoveFromList(ListMatch(list,"*.pxp",";"), list, ";", 0) 
     340        list = RemoveFromList(ListMatch(list,"*.DIV",";"), list, ";", 0) 
     341        list = RemoveFromList(ListMatch(list,"*.GSP",";"), list, ";", 0) 
     342        list = RemoveFromList(ListMatch(list,"*.MASK",";"), list, ";", 0) 
     343 
    336344        //sort 
    337         newList = SortList(newList,";",0) 
     345        newList = SortList(List,";",0) 
    338346 
    339347        return newlist 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

    r661 r662  
    864864                str = RemoveFromList("TISANE", str, ";") 
    865865                str = RemoveFromList("HayPenMSA", str, ";") 
     866                str = RemoveFromList("SAS", str, ";")                   //from Irena 
     867                str = RemoveFromList("USAXS", str, ";") 
    866868        endif 
    867869         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/CatVSTable.ipf

    r661 r662  
    7676        WAVE XCenter = $"root:myGlobals:CatVSHeaderInfo:XCenter" 
    7777        WAVE YCenter = $"root:myGlobals:CatVSHeaderInfo:YCenter" 
    78         WAVE/B NumGuides = $"root:myGlobals:CatVSHeaderInfo:nGuides" 
     78        WAVE/B nGuides = $"root:myGlobals:CatVSHeaderInfo:nGuides" 
    7979        WAVE/B NumAttens = $"root:myGlobals:CatVSHeaderInfo:NumAttens" 
    8080        WAVE RunNumber = $"root:myGlobals:CatVSHeaderInfo:RunNumber" 
     
    108108#if (exists("NCNR")==6) 
    109109                ModifyTable width(:myGlobals:CatVSHeaderInfo:nGuides)=40 
    110                 ModifyTable width(:myGlobals:CatVSHedaerInfo:Pos)=30 
     110                ModifyTable width(:myGlobals:CatVSHeaderInfo:Pos)=30 
    111111#endif 
    112112 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Initialize.ipf

    r601 r662  
    117117        //set XML globals 
    118118        String/G root:Packages:NIST:gXMLLoader_Title = "" 
    119         Variable/G root:Packages:NIST:gXML_Write = 0 
     119        Variable/G root:Packages:NIST:gXML_Write = 1 
    120120 
    121121         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf

    r661 r662  
    6969         
    7070        //Preference value to determine if we are outputting XML 
    71         Variable/G root:Packages:NIST:gXML_Write = 0 
     71        Variable/G root:Packages:NIST:gXML_Write = 1 
    7272         
    7373        Make/O/T/N=1 fileWave,samWave,empWave,curWave //Added curWave Sept 06 A. Jackson 
Note: See TracChangeset for help on using the changeset viewer.