Changeset 319


Ignore:
Timestamp:
Apr 28, 2008 10:32:28 AM (14 years ago)
Author:
srkline
Message:

Changes for the SANS beta menu functions, including the (brief) help file.

Location:
sans/SANSReduction/trunk
Files:
1 added
2 edited

Legend:

Unmodified
Added
Removed
  • sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.10/NSORT.ipf

    r316 r319  
    342342                SVAR str=$"root:myGlobals:CombineTable:SaveNameStr"             //messy, but pass in as a global 
    343343                fullPath = str 
    344                 String str2 = "Is the file name "+str+" correct?" 
    345                 DoAlert 1,str2 
    346                 if(V_flag==1) 
     344//              String str2 = "Is the file name "+str+" correct?" 
     345//              DoAlert 1,str2 
     346//              if(V_flag==1) 
    347347                        dialog=0        //bypass the dialog if the name is good 
    348                 endif 
     348//              endif 
    349349        endif 
    350350         
     
    18501850//      Print V_startRow, V_endRow 
    18511851         
     1852        //prompt for combined name, give the user a chance to cancel 
    18521853        Variable num=V_endRow-V_startRow+1 
    18531854        Variable ii 
    1854          
     1855        String saveStr="" 
     1856        Prompt saveStr,"saved file name for "+ gLabels[V_StartRow]      //+tmpLbl[1] 
     1857        DoPrompt "Enter the combined file name",saveStr 
     1858        if(V_flag==1) 
     1859                return(1)               //user cancel, get out before anything is set 
     1860        endif 
     1861        saveName[num] = saveStr 
     1862         
     1863         
     1864         
     1865 
    18551866        if( !(num==2 || num==3) ) 
    18561867                Abort "invalid table selection - must select either 2 or 3 files to combine" 
     
    18801891        prefix[num] = GetPrefixStrFromFile(filenames[ii]) 
    18811892         
    1882         //prompt for combined name 
    1883         String saveStr="" 
    1884         Prompt saveStr,"saved file name for "+tmpLbl[1] 
    1885         DoPrompt "Enter the combined file name",saveStr 
    1886         saveName[num] = saveStr 
    1887          
     1893 
    18881894        return(0) 
    18891895end 
  • sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.10/Transmission.ipf

    r316 r319  
    16981698        Wave/T tnam = root:myGlobals:TransHeaderInfo:T_FileNames        //trans file names 
    16991699        Wave/T snam = root:myGlobals:TransHeaderInfo:S_TRANS_FileNames  //Scattering - trans correspondence 
    1700          
     1700        Wave/T samfile = root:myGlobals:TransHeaderInfo:S_FileNames     //Scattering file name 
     1701         
     1702        // can do fancy formatted string with ... 
     1703        //"asdf* matches file: \\f01filen\\f00 \\K(52428,1,1)\\f01afdsfdd\\f00\\K(0,0,0)asdfasdfs" 
    17011704        Variable num=numpnts(matchRows) 
    17021705        String result="",tmpStr 
    17031706        for(ii=0;ii<num;ii+=1) 
    1704                 sprintf tmpStr,"%s* Matches file: %s %s\r",(tw[row])[0,numChars-1],snam[matchRows[ii]],sw[matchRows[ii]] 
     1707                sprintf tmpStr,"\\f01\\K(52428,1,1)%s\\K(0,0,0)\\f00* Matches file: \\f01%s\\f00 | \\K(52428,1,1)\\f01%s\\f00\\K(0,0,0)%s\r",(tw[row])[0,numChars-1],samfile[matchRows[ii]],(sw[matchRows[ii]])[0,numchars-1],(sw[matchRows[ii]])[numchars,59] 
    17051708                result += tmpStr 
    17061709        endfor 
     
    17101713        endif 
    17111714         
    1712         Print result 
     1715//      Print result 
    17131716        Print "*******" 
    17141717         
    17151718        String/G root:myGlobals:TransHeaderInfo:gResultStr = result 
     1719         
    17161720        DoWindow/F ConfirmGuess         //it really shouldn't exist... 
    17171721        if(V_flag==1) 
    17181722                TitleBox title0,pos={9,5},variable=root:myGlobals:TransHeaderInfo:gResultStr 
    17191723        else 
    1720                 NewPanel /W=(763,44,1284,181) as "Confirm Guess" 
     1724                NewPanel /W=(578,44,1263,214) as "Confirm Guess" 
    17211725                DoWindow/C ConfirmGuess 
    17221726                TitleBox title0,pos={9,5},size={501,32} 
     
    17281732         
    17291733        PauseForUser ConfirmGuess 
     1734 
    17301735// figure out from the return code what the user did... 
    17311736// 1 = OK, accept guess (assign, and calculate immediately) 
Note: See TracChangeset for help on using the changeset viewer.