Changeset 29 for sans/USANSReduction/branches/AJJ-branch1/Put in User Procedures Folder/USANS Procedures v2.00/Main_USANS.ipf

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:

• sans/USANSReduction/branches/AJJ-branch1/Put in User Procedures Folder/USANS Procedures v2.00/Main_USANS.ipf (modified) (5 diffs)

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

@@ -21 +21 @@
 Menu "USANS"
         "USANS Reduction Panel",ShowUSANSPanel()
-        "New USANS Reduction Panel",ShowUSANSPanelNew()
         "Build USANS Notebook"
         "Desmear USANS Data",Desmear()
@@ -35 +34 @@
 Proc ShowUSANSPanel()
         //version number
-        Variable/G root:USANS_RED_VERSION=2.11                  //distribution as of 01MAY06
+        Variable/G root:USANS_RED_VERSION=2.11                  //distribution as of Jan 2007
         
         Init_MainUSANS()
@@ -41 +40 @@
         if(V_Flag==0)
                 USANS_Panel()
-        Endif
-End
-
-Proc ShowUSANSPanelNew()
-        //version number
-        Variable/G root:USANS_RED_VERSION=2.11          //distribution as of OCT06
-        
-        Init_MainUSANS()
-        DoWindow/F USANS_Panel_NG
-        if(V_Flag==0)
-                USANS_Panel_NG()
         Endif
 End
@@ -118 +106 @@
 //
 
-Window USANS_Panel_NG() : Panel
-        DoWindow/K USANS_Panel
-        DoWindow/K USANS_Panel_NG
+Window USANS_Panel() : Panel
         PauseUpdate; Silent 1           // building window...
         NewPanel /W=(501,44,915,493)/K=1 as "USANS_Panel"
@@ -181 +167 @@
 EndMacro
 
-Proc USANS_Panel()
-        DoWindow/K USANS_Panel_NG
-        DoWindow/K USANS_Panel
-        PauseUpdate; Silent 1           // building window...
-        NewPanel /W=(501,44,925,391) /K=1 as "USANS_Panel"
-        DoWindow/C USANS_Panel
-        SetDrawLayer UserBack
-        SetDrawEnv fstyle= 1
-        DrawText 16,53,"Data Files"
-        SetDrawEnv fstyle= 1
-        DrawText 234,140,"Empty Scans"
-        SetDrawEnv fstyle= 1
-        DrawText 229,58,"Sample Scans"
-        DrawLine 206,224,387,224
-        DrawLine 5,33,370,33
-        SetDrawEnv fstyle= 1
-        DrawText 9,251,"Raw Data Header"
-        ListBox fileLB,pos={5,59},size={155,146},proc=FileListBoxProc
-        ListBox fileLB,listWave=root:Globals:MainPanel:fileWave
-        ListBox fileLB,selWave=root:Globals:MainPanel:selFileW,mode= 4
-        ListBox samLB,pos={207,59},size={150,66},listWave=root:Globals:MainPanel:samWave
-        ListBox samLB,mode= 1,selRow= 1
-        Button ClearSamButton,pos={170,103},size={30,20},proc=ClearButtonProc,title="Clr"
-        Button ClearSamButton,help={"Clears the list of sample scans"}
-        Button ClearEmpButton,pos={170,185},size={30,20},proc=ClearButtonProc,title="Clr"
-        Button ClearEmpButton,help={"Clears the list of empty scans"}
-        Button RefreshButton,pos={97,36},size={60,20},proc=RefreshListButtonProc,title="Refresh"
-        Button RefreshButton,help={"Refreshes the list of raw ICP data files"}
-        Button DelSamButton,pos={167,81},size={35,20},proc=DelSamButtonProc,title="Del"
-        Button DelSamButton,help={"Deletes the selected file(s) from the list of sample scans"}
-        Button DelEmpButton,pos={167,163},size={35,20},proc=DelEmpButtonProc,title="Del"
-        Button DelEmpButton,help={"Deletes the selected file(s) from the list of empty scans"}
-        ListBox empLB,pos={206,142},size={153,66}
-        ListBox empLB,listWave=root:Globals:MainPanel:empWave,mode= 1,selRow= 0
-        Button toSamList,pos={167,59},size={35,20},proc=toSamListButtonProc,title="->S"
-        Button toSamList,help={"Adds the selected file(s) to the list of sample scans"}
-        Button toEmpList,pos={167,141},size={35,20},proc=toEmptyListButtonProc,title="->E"
-        Button toEmpList,help={"Adds the selected file(s) to the list of empty (cell) scans"}
-//      Button PlotButton,pos={27,208},size={110,20},proc=PlotRawButtonProc,title="Plot Raw Data"
-//      Button PlotButton,help={"Plot the selected raw data file along with its transmission and monitor counts"}
-        ListBox StatusLB,pos={7,256},size={189,83}
-        ListBox StatusLB,listWave=root:Globals:MainPanel:statusWave
-        Button pickPathButton,pos={6,8},size={80,20},proc=PickBT5PathButton,title="DataPath..."
-        Button pickPathButton,help={"Select the data folder where the raw ICP data files are located"}
-        Button PlotSelectedSAMButton,pos={364,61},size={50,20},proc=PlotSelectedSAMButtonProc,title="Plot"
-        Button PlotSelectedSAMButton,help={"Plot the selected sample scattering files in the COR_Graph"}
-        Button PlotSelectedEMPButton,pos={366,143},size={50,20},proc=PlotSelectedEMPButtonProc,title="Plot"
-        Button PlotSelectedEMPButton,help={"Plot the selected empty cell scattering files in the COR_Graph"}
-        Button pickSavePathButton,pos={97,8},size={80,20},proc=PickSaveButtonProc,title="SavePath..."
-        Button pickSavePathButton,help={"Select the data folder where data is to be saved to disk"}
-        Button USANSHelpButton,pos={200,8},size={50,20},proc=USANSHelpButtonProc,title="Help"
-        Button USANSHelpButton,help={"Show the USANS reduction help file"}
-EndMacro
-
 //draws a simple graph of the monitor counts, transmission counts, and detector counts
 // plots the selected raw data file when "plot raw" is selected from the USANS_Panel