Changeset 660 for sans/Dev


Ignore:
Timestamp:
Apr 5, 2010 10:30:25 AM (13 years ago)
Author:
srkline
Message:

Changes to the installer:

Templates are obsolete now. Packages are all loaded from the macros menu. Templates have been deleted from SVN.

Location:
sans/Dev/trunk
Files:
5 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/FilesToRemove++.itx

    r659 r660  
    9191WAVES/T IgProcFiles 
    9292BEGIN 
    93         "NCNR_Package_Loader" 
     93        "NCNR_Package_Loader.ipf" 
    9494END 
    9595X SetScale/P x 0,1,"", IgProcFiles; SetScale y 0,0,"", IgProcFiles 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/NCNR_Install.ipf

    r659 r660  
    406406         
    407407 
    408 // put shortcuts to the template in the "top" folder 
    409 // 
    410         NewPath/O/Q UtilPath, homePathStr+"NCNR_SANS_Utilities:" 
    411         strFileList = IndexedFile(UtilPath,-1,".pxt")    
    412         for (i=0; i<itemsInList(strFileList); i+=1) 
    413                 tmpStr = StringFromList(i,strFileList) 
    414 //              isThere = CheckForMatch(tmpStr,IHFolders) 
    415 //              if(isThere) 
    416 //                      Print "Move "+ tmpStr 
    417 //                      MoveFolder/O/P=IHPath tmpStr as homePathStr+"NCNR_Moved_Files:"+tmpStr 
    418                         CreateAliasShortcut/O/P=UtilPath tmpStr as homePathStr +tmpStr 
    419                         Print "Creating shortcut for "+tmpStr+" into top level: "+IsMoveOK(V_flag) 
    420 //              endif 
    421         endfor 
     408 
     409// now with the NCNR_Package_Loader in the Igor Procedures, the templates are obsolete 
     410//// put shortcuts to the template in the "top" folder 
     411//// 
     412//      NewPath/O/Q UtilPath, homePathStr+"NCNR_SANS_Utilities:" 
     413//      strFileList = IndexedFile(UtilPath,-1,".pxt")    
     414//      for (i=0; i<itemsInList(strFileList); i+=1) 
     415//              tmpStr = StringFromList(i,strFileList) 
     416////            isThere = CheckForMatch(tmpStr,IHFolders) 
     417////            if(isThere) 
     418////                    Print "Move "+ tmpStr 
     419////                    MoveFolder/O/P=IHPath tmpStr as homePathStr+"NCNR_Moved_Files:"+tmpStr 
     420//                      CreateAliasShortcut/O/P=UtilPath tmpStr as homePathStr +tmpStr 
     421//                      Print "Creating shortcut for "+tmpStr+" into top level: "+IsMoveOK(V_flag) 
     422////            endif 
     423//      endfor 
    422424 
    423425 
    424426// installation is done, quit to start fresh 
    425         DoAlert 1, "Quit Igor to complete installation.\rQuit now? " 
     427        DoAlert 1, "Quit and restart Igor to complete installation.\rQuit now? " 
    426428        if (V_Flag==1) 
    427429                execute "Quit /Y" 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

    r645 r660  
    411411                                        ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 
    412412                                        ModifyGraph tickUnit(left)=1 
     413                                        Label left "I(q)" 
     414                                        Label bottom "q (A\\S-1\\M)" 
    413415                                        Legend 
    414416                                endif 
     
    420422                                ErrorBars/T=0 $w1 Y,wave=($w2,$w2) 
    421423                                ModifyGraph tickUnit(left)=1 
     424                                Label left "I(q)" 
     425                                Label bottom "q (A\\S-1\\M)" 
    422426                                Legend 
    423427                        endif 
     
    10041008        list = RemoveFromList(tmp, list  ,";") 
    10051009         
     1010        // anything that might be included in Irena 
     1011        tmp = FunctionList("GEN_*",";","KIND:10") 
     1012        list = RemoveFromList(tmp, list  ,";") 
     1013        tmp = FunctionList("IN2G_*",";","KIND:10") 
     1014        list = RemoveFromList(tmp, list  ,";") 
     1015        tmp = FunctionList("IR1A_*",";","KIND:10") 
     1016        list = RemoveFromList(tmp, list  ,";") 
     1017        tmp = FunctionList("IR1B_*",";","KIND:10") 
     1018        list = RemoveFromList(tmp, list  ,";") 
     1019        tmp = FunctionList("IR1U_*",";","KIND:10") 
     1020        list = RemoveFromList(tmp, list  ,";") 
     1021        tmp = FunctionList("IR1V_*",";","KIND:10") 
     1022        list = RemoveFromList(tmp, list  ,";") 
     1023        tmp = FunctionList("IR1_*",";","KIND:10") 
     1024        list = RemoveFromList(tmp, list  ,";") 
     1025        tmp = FunctionList("IR2D_*",";","KIND:10") 
     1026        list = RemoveFromList(tmp, list  ,";") 
     1027 
     1028        tmp = FunctionList("IR2D_*",";","KIND:10") 
     1029        list = RemoveFromList(tmp, list  ,";") 
     1030        tmp = FunctionList("IR2H_*",";","KIND:10") 
     1031        list = RemoveFromList(tmp, list  ,";")   
     1032        tmp = FunctionList("IR2L_*",";","KIND:10") 
     1033        list = RemoveFromList(tmp, list  ,";") 
     1034        tmp = FunctionList("IR2Pr_*",";","KIND:10") 
     1035        list = RemoveFromList(tmp, list  ,";") 
     1036        tmp = FunctionList("IR2R_*",";","KIND:10") 
     1037        list = RemoveFromList(tmp, list  ,";") 
     1038        tmp = FunctionList("IR2S_*",";","KIND:10") 
     1039        list = RemoveFromList(tmp, list  ,";") 
     1040        tmp = FunctionList("IR2_*",";","KIND:10") 
     1041        list = RemoveFromList(tmp, list  ,";") 
     1042        tmp = FunctionList("*LogLog",";","KIND:10") 
     1043        list = RemoveFromList(tmp, list  ,";") 
     1044         
    10061045//      tmp = FunctionList("*X",";","KIND:4")           //XOPs, but these shouldn't show up if KIND:10 is used initially 
    10071046//      Print "X* = ",tmp 
Note: See TracChangeset for help on using the changeset viewer.