Ignore:
Timestamp:
Apr 6, 2010 4:56:48 PM (13 years ago)
Author:
srkline
Message:

Made preferences a common panel (moved to PlotUtilsMacro?.ipf and globals to root:Packages:NIST:) and added menu items for all packages. Many files had to be modified so that the preferences could be properly accessed

File Open dialog now is set to "All files" so that XML can be selected. I think that all open access that doesn't already have the full path go through this common function.

Location:
sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/LakeDesmearing_JB.ipf

    r624 r665  
    10761076        SetDataFolder root: 
    10771077        Execute "A_LoadOneDDataWithName(\"\",0)" 
     1078        SVAR fileStr = root:Packages:NIST:gLastFileName 
     1079        if (cmpstr(fileStr,"") == 0) 
     1080                return(0)               //get out if no file selected 
     1081        endif 
    10781082        //define the waves that the smoothing will be looking for... 
    10791083        SVAR fname = $("root:Packages:NIST:gLastFileName")              //this changes as any data is loaded 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf

    r662 r665  
    3232        "USANS Simulator",Show_UCALC() 
    3333        "-" 
     34        "NCNR Preferences",Show_Preferences_Panel() 
    3435        "Feedback or Bug Report",OpenTracTicketPage() 
    3536        "Open Help Movie Page",OpenHelpMoviePage() 
     
    6869        //NB This is also hardcoded a bit further down - search for "WHY WHY WHY" AJJ Sept 08 
    6970         
    70         //Preference value to determine if we are outputting XML 
    71         Variable/G root:Packages:NIST:gXML_Write = 1 
    72          
     71 
    7372        Make/O/T/N=1 fileWave,samWave,empWave,curWave //Added curWave Sept 06 A. Jackson 
    7473        fileWave="" 
     
    124123        Variable/G      root:Packages:NIST:USANS:Globals:MainPanel:gDQv = 0.117         //divergence, in terms of Q (1/A)  (NOV 2004) 
    125124 
     125        //initializes preferences. this includes XML y/n, and SANS Reduction items.  
     126        // if they already exist, they won't be overwritten 
     127        Execute "init_pref()"    
    126128         
    127129 
     
    131133// 
    132134 
    133 Window USANS_Panel() : Panel 
     135Window USANS_Panel() 
    134136        PauseUpdate; Silent 1           // building window... 
    135137        NewPanel /W=(600,44,1015,493)/K=1 as "USANS_Panel" 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/U_CALC.ipf

    r605 r665  
    297297// left of 1055 is good for Mac, 955 is better for Win 
    298298// 
    299 Window UCALC_Panel() : Graph 
     299Window UCALC_Panel() 
    300300        PauseUpdate; Silent 1           // building window... 
    301301        String platform=UpperStr(IgorInfo(2)) 
Note: See TracChangeset for help on using the changeset viewer.