Changeset 29


Ignore:
Timestamp:
Jan 10, 2007 1:52:56 PM (16 years ago)
Author:
ajj
Message:

Removed code for old panel - only new panel with current data is now used.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/USANSReduction/branches/AJJ-branch1/Put in User Procedures Folder/USANS Procedures v2.00/Main_USANS.ipf

    r28 r29  
    2121Menu "USANS" 
    2222        "USANS Reduction Panel",ShowUSANSPanel() 
    23         "New USANS Reduction Panel",ShowUSANSPanelNew() 
    2423        "Build USANS Notebook" 
    2524        "Desmear USANS Data",Desmear() 
     
    3534Proc ShowUSANSPanel() 
    3635        //version number 
    37         Variable/G root:USANS_RED_VERSION=2.11                  //distribution as of 01MAY06 
     36        Variable/G root:USANS_RED_VERSION=2.11                  //distribution as of Jan 2007 
    3837         
    3938        Init_MainUSANS() 
     
    4140        if(V_Flag==0) 
    4241                USANS_Panel() 
    43         Endif 
    44 End 
    45  
    46 Proc ShowUSANSPanelNew() 
    47         //version number 
    48         Variable/G root:USANS_RED_VERSION=2.11          //distribution as of OCT06 
    49          
    50         Init_MainUSANS() 
    51         DoWindow/F USANS_Panel_NG 
    52         if(V_Flag==0) 
    53                 USANS_Panel_NG() 
    5442        Endif 
    5543End 
     
    118106// 
    119107 
    120 Window USANS_Panel_NG() : Panel 
    121         DoWindow/K USANS_Panel 
    122         DoWindow/K USANS_Panel_NG 
     108Window USANS_Panel() : Panel 
    123109        PauseUpdate; Silent 1           // building window... 
    124110        NewPanel /W=(501,44,915,493)/K=1 as "USANS_Panel" 
     
    181167EndMacro 
    182168 
    183 Proc USANS_Panel() 
    184         DoWindow/K USANS_Panel_NG 
    185         DoWindow/K USANS_Panel 
    186         PauseUpdate; Silent 1           // building window... 
    187         NewPanel /W=(501,44,925,391) /K=1 as "USANS_Panel" 
    188         DoWindow/C USANS_Panel 
    189         SetDrawLayer UserBack 
    190         SetDrawEnv fstyle= 1 
    191         DrawText 16,53,"Data Files" 
    192         SetDrawEnv fstyle= 1 
    193         DrawText 234,140,"Empty Scans" 
    194         SetDrawEnv fstyle= 1 
    195         DrawText 229,58,"Sample Scans" 
    196         DrawLine 206,224,387,224 
    197         DrawLine 5,33,370,33 
    198         SetDrawEnv fstyle= 1 
    199         DrawText 9,251,"Raw Data Header" 
    200         ListBox fileLB,pos={5,59},size={155,146},proc=FileListBoxProc 
    201         ListBox fileLB,listWave=root:Globals:MainPanel:fileWave 
    202         ListBox fileLB,selWave=root:Globals:MainPanel:selFileW,mode= 4 
    203         ListBox samLB,pos={207,59},size={150,66},listWave=root:Globals:MainPanel:samWave 
    204         ListBox samLB,mode= 1,selRow= 1 
    205         Button ClearSamButton,pos={170,103},size={30,20},proc=ClearButtonProc,title="Clr" 
    206         Button ClearSamButton,help={"Clears the list of sample scans"} 
    207         Button ClearEmpButton,pos={170,185},size={30,20},proc=ClearButtonProc,title="Clr" 
    208         Button ClearEmpButton,help={"Clears the list of empty scans"} 
    209         Button RefreshButton,pos={97,36},size={60,20},proc=RefreshListButtonProc,title="Refresh" 
    210         Button RefreshButton,help={"Refreshes the list of raw ICP data files"} 
    211         Button DelSamButton,pos={167,81},size={35,20},proc=DelSamButtonProc,title="Del" 
    212         Button DelSamButton,help={"Deletes the selected file(s) from the list of sample scans"} 
    213         Button DelEmpButton,pos={167,163},size={35,20},proc=DelEmpButtonProc,title="Del" 
    214         Button DelEmpButton,help={"Deletes the selected file(s) from the list of empty scans"} 
    215         ListBox empLB,pos={206,142},size={153,66} 
    216         ListBox empLB,listWave=root:Globals:MainPanel:empWave,mode= 1,selRow= 0 
    217         Button toSamList,pos={167,59},size={35,20},proc=toSamListButtonProc,title="->S" 
    218         Button toSamList,help={"Adds the selected file(s) to the list of sample scans"} 
    219         Button toEmpList,pos={167,141},size={35,20},proc=toEmptyListButtonProc,title="->E" 
    220         Button toEmpList,help={"Adds the selected file(s) to the list of empty (cell) scans"} 
    221 //      Button PlotButton,pos={27,208},size={110,20},proc=PlotRawButtonProc,title="Plot Raw Data" 
    222 //      Button PlotButton,help={"Plot the selected raw data file along with its transmission and monitor counts"} 
    223         ListBox StatusLB,pos={7,256},size={189,83} 
    224         ListBox StatusLB,listWave=root:Globals:MainPanel:statusWave 
    225         Button pickPathButton,pos={6,8},size={80,20},proc=PickBT5PathButton,title="DataPath..." 
    226         Button pickPathButton,help={"Select the data folder where the raw ICP data files are located"} 
    227         Button PlotSelectedSAMButton,pos={364,61},size={50,20},proc=PlotSelectedSAMButtonProc,title="Plot" 
    228         Button PlotSelectedSAMButton,help={"Plot the selected sample scattering files in the COR_Graph"} 
    229         Button PlotSelectedEMPButton,pos={366,143},size={50,20},proc=PlotSelectedEMPButtonProc,title="Plot" 
    230         Button PlotSelectedEMPButton,help={"Plot the selected empty cell scattering files in the COR_Graph"} 
    231         Button pickSavePathButton,pos={97,8},size={80,20},proc=PickSaveButtonProc,title="SavePath..." 
    232         Button pickSavePathButton,help={"Select the data folder where data is to be saved to disk"} 
    233         Button USANSHelpButton,pos={200,8},size={50,20},proc=USANSHelpButtonProc,title="Help" 
    234         Button USANSHelpButton,help={"Show the USANS reduction help file"} 
    235 EndMacro 
    236  
    237169//draws a simple graph of the monitor counts, transmission counts, and detector counts 
    238170// plots the selected raw data file when "plot raw" is selected from the USANS_Panel 
Note: See TracChangeset for help on using the changeset viewer.