Ignore:
Timestamp:
Mar 23, 2010 4:10:58 PM (13 years ago)
Author:
srkline
Message:

Changes to move the "Do Combine Files" to a separate panel that is accessible from the MainPanel?->1D Ops tab.

Updated the help files.

Disabled the SANSBeta menu.

File:
1 edited

Legend:

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

    r626 r648  
    2222         
    2323        Variable rr,gg,bb 
    24         NVAR dQv = root:Packages:NIST:USANS_dQv 
     24        NVAR/Z dQv = root:Packages:NIST:USANS_dQv 
    2525 
    2626                 
     
    905905        Variable norm12,norm23 
    906906 
    907         Variable err=0,refNum,numCols 
    908         String fullPath="",formatStr="" 
     907        Variable err=0,refNum,numCols,dialog=1 
     908        String fullPath="",formatStr="",str2 
    909909        //check each wave - else REALLY FATAL error when writing file 
    910910        If(!(WaveExists(qw))) 
     
    927927        endif 
    928928         
    929         Variable dialog = 1 
     929// 05SEP05 SRK -- added to automatically combine files from a table - see the end of NSORT.ipf for details 
     930// - use the flag set in DoCombineFiles() to decide if the table entries should be used 
     931//Ê Êroot:myGlobals:CombineTable:useTable= (1) (0) 
     932//if(exists("root:myGlobals:CombineTable:SaveName")) 
     933        NVAR/Z useTable = root:myGlobals:CombineTable:useTable 
     934        if(NVAR_Exists(useTable) && useTable==1) 
     935                SVAR str=root:myGlobals:CombineTable:SaveNameStr        //messy, but pass in as a global 
     936                fullPath = str 
     937//              str2 = "Is the file name "+str+" correct?" 
     938//              DoAlert 1,str2 
     939//              if(V_flag==1) 
     940                        dialog=0                //bypass the dialog if the name is good (assumed, since DoAlert is bypassed) 
     941//              endif 
     942        endif 
     943 
    930944        if(dialog) 
    931945                PathInfo/S catPathName 
Note: See TracChangeset for help on using the changeset viewer.