Ignore:
Timestamp:
Jun 10, 2016 3:40:55 PM (6 years ago)
Author:
srkline
Message:

A number of simple fixes to make the macros compatible with Igor 7, and in some places back-compatible with Igor 6. There were only a few instances where the IgorVersion? was checked, so it does not caues a huge disruption.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Common
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Installer/CheckVersionFTP.ipf

    r769 r1001  
    9494 
    9595Function OpenHelpMoviePage() 
    96         DoAlert 1,"Your web browser will open to a page where you can view help movies. OK? (You must have QuickTime installed)" 
     96        DoAlert 1,"Your web browser will open to a page where you can view help movies. OK?" 
    9797        if(V_flag==1) 
    9898//              BrowseURL "ftp://webster.ncnr.nist.gov/pub/sans/kline/movies/" 
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotManager_v40.ipf

    r888 r1001  
    157157        Variable rr,gg,bb 
    158158         
     159        SVAR angst = root:Packages:NIST:gAngstStr 
     160         
    159161        SetDataFolder $("root:"+DF) 
    160162        //iStr will end in "i" 
     
    175177                                 
    176178        Label left "I(q)" 
    177         Label bottom "q (A\\S-1\\M)" 
    178          
     179//      Label bottom "q (A\\S-1\\M)" 
     180        Label bottom "q ("+angst+"\\S-1\\M)"     
    179181        Legend 
    180182         
  • sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtils2D_v40.ipf

    r956 r1001  
    997997EndMacro 
    998998 
    999  
     999// 
     1000// in Igor 6, Gizmo windows are code 4096 
     1001// in Igor 7, Gizmo windows are code 65536 
     1002// need to check for version, since code 65536 is not allowed in Igor 6 
     1003//  
     1004// this function returns only the topmost window from the list 
    10001005Function/S TopGizmoWindow() 
    1001         Return(StringFromList(0,WinList("*",";","WIN:4096"))) 
     1006        if(IgorVersion() >= 7) 
     1007                return(StringFromList(0,WinList("*",";","WIN:65536"))) 
     1008        else 
     1009                return(StringFromList(0,WinList("*",";","WIN:4096"))) 
     1010        endif 
    10021011end 
    10031012 
Note: See TracChangeset for help on using the changeset viewer.