Ignore:
Timestamp:
Oct 16, 2009 11:35:04 AM (13 years ago)
Author:
srkline
Message:

Merging changes:

NCNR_Utils -> merging these into FACILITY, HFIR, and ILL_Utils

HFIR files merged by hand to reflect JaeHie?'s 29JUL09 version

Changed MainPanel? to look for TISANE or RealTime? functions to prevent button procedures from being called when the procedures aren't there. Seemed easier than separate versions without the buttons. #define at the begining of TISANE.ipf -> #ifdef in MainPanel? didn't work for some reason?

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/MainPanel.ipf

    r570 r572  
    202202        String ctrlName 
    203203         
    204         Show_TISANE_Panel() 
     204        if(exists("Show_TISANE_Panel")==0) 
     205                // procedure file was not loaded 
     206                DoAlert 0,"This operation is not available in this set of macros" 
     207        else 
     208                Show_TISANE_Panel() 
     209        endif 
     210         
    205211End 
    206212 
     
    214220        String ctrlName 
    215221 
    216         if(root:myGlobals:isDemoVersion == 1) 
    217                 //      comment out in DEMO_MODIFIED version, and show the alert 
    218                 DoAlert 0,"This operation is not available in the Demo version of IGOR" 
     222        if(exists("Init_for_RealTime")==0) 
     223                // procedure file was not loaded 
     224                DoAlert 0,"This operation is not available in this set of macros" 
    219225        else 
    220226                Show_RealTime_Panel() 
     
    227233        Show_Preferences_Panel() 
    228234End 
     235 
    229236//////////////////////////////////////////////// 
    230237//************* NEW version of Main control Panel ***************** 
Note: See TracChangeset for help on using the changeset viewer.