Ignore:
Timestamp:
Sep 16, 2016 2:37:34 PM (6 years ago)
Author:
srkline
Message:

Updating the patch panel for the VSANS variables, a first pass at including the essential values, and a section that has per-detector values.

Still needs to be fully stress tested to be sure that it does all of read/write operations correctly.

adjusted the "last file loaded" global variable that is displayed on the data display to only update when a file is loaded for display, not when any file is loaded for the catalog, or for the patch panel.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/VSANS/V_Utilities_General.ipf

    r1004 r1012  
    182182         
    183183        NewPanel /N=ProgressPanel /W=(285,111,739,193) 
    184         ValDisplay valdisp0,pos={18,32},size={342,18},limits={0,num,0},barmisc={0,0} 
    185         ValDisplay valdisp0,value= _NUM:0 
     184        ValDisplay valdisp0,win=ProgressPanel,pos={18,32},size={342,18},limits={0,num,0},barmisc={0,0} 
     185        ValDisplay valdisp0,win=ProgressPanel,value= _NUM:0 
    186186        DrawText 20,24,"Cleaning up old files... Please Wait..." 
    187187         
    188188        if( indefinite ) 
    189                 ValDisplay valdisp0,mode= 4     // candy stripe 
     189                ValDisplay valdisp0,win=ProgressPanel,mode= 4   // candy stripe 
    190190        else 
    191                 ValDisplay valdisp0,mode= 3     // bar with no fractional part 
     191                ValDisplay valdisp0,win=ProgressPanel,mode= 3   // bar with no fractional part 
    192192        endif 
    193193        if( useIgorDraw ) 
    194                 ValDisplay valdisp0,highColor=(15000,45535,15000)               //(0,65535,0) 
    195         endif 
    196         Button bStop,pos={375,32},size={50,20},title="Stop" 
     194                ValDisplay valdisp0,win=ProgressPanel,highColor=(15000,45535,15000)             //(0,65535,0) 
     195        endif 
     196        Button bStop,win=ProgressPanel,pos={375,32},size={50,20},title="Stop" 
    197197        DoUpdate /W=ProgressPanel /E=1  // mark this as our progress window 
    198198 
     
    203203                endif 
    204204                 
    205                 ValDisplay valdisp0,value= _NUM:num,win=ProgressPanel 
     205                ValDisplay valdisp0,win=ProgressPanel,value= _NUM:num,win=ProgressPanel 
    206206                DoUpdate /W=ProgressPanel 
    207207        while(1) 
     
    414414        String filename,tmp,curFileName 
    415415        //take the currently displayed RAW file  
    416         SVAR oldName = root:file_name 
     416        SVAR oldName = root:Packages:NIST:VSANS:Globals:gLastLoadedFile 
    417417        oldname = V_RemoveAllSpaces(oldname)            //  
    418418        curFileName = oldName 
     
    456456                 
    457457                FakeRestorePanelsButtonClick()          //so the panels display correctly 
    458                  
     458                // set the global to display ONLY if the load was called from here, not from the  
     459                // other routines that load data (to read in values) 
     460                SVAR gLastLoad = root:Packages:NIST:VSANS:Globals:gLastLoadedFile 
     461                gLastLoad = hdfDF 
    459462        endif 
    460463 
Note: See TracChangeset for help on using the changeset viewer.