Changeset 177


Ignore:
Timestamp:
Oct 2, 2007 12:32:43 PM (15 years ago)
Author:
srkline
Message:

Minor bug fixes after testing the plot and append buttons on the WrapperPanel? for all of the (202) model functions. Changed how the parameter name wave is identified and added a special case for the SmearedRPAForm which has an extra parameter.

Location:
sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/ModelPicker/SANSModelPicker.ipf

    r172 r177  
    223223Proc Procedure_List() 
    224224        PauseUpdate; Silent 1           // building window... 
    225         NewPanel/W=(1115,44,1453,263)/K=2 
     225        NewPanel /W=(1115,44,1453,363) /K=2 
    226226        DoWindow/C Procedure_List 
    227227        ModifyPanel fixedSize=1 
    228         ListBox fileList,pos={4,3},size={200,100},listWave=root:myGlobals:FileList:fileWave 
     228         
     229        ListBox fileList,pos={4,3},size={200,203},listWave=root:myGlobals:FileList:fileWave 
    229230        ListBox fileList,selWave=root:myGlobals:FileList:selWave,mode= 4 
    230         ListBox inclList,pos={4,110},size={200,100} 
     231        ListBox inclList,pos={4,212},size={200,100} 
    231232        ListBox inclList,listWave=root:myGlobals:FileList:includedFileWave 
    232233        ListBox inclList,selWave=root:myGlobals:FileList:selToDelWave,mode= 4 
    233         Button button0,pos={212,77},size={110,20},proc=FileList_InsertButtonProc,title="Include File(s)" 
     234        Button button0,pos={212,173},size={110,20},proc=FileList_InsertButtonProc,title="Include File(s)" 
    234235        Button button0,help={"Includes the selected procedures, functions appear under the SANS Models menu"} 
    235         Button button5,pos={212,187},size={110,20},proc=FileList_RemoveButtonProc,title="Remove File(s)" 
     236        Button button5,pos={212,283},size={110,20},proc=FileList_RemoveButtonProc,title="Remove File(s)" 
    236237        Button button5,help={"Removes selected procedures from the experiment"} 
    237         Button PickerButton,pos={212,12},size={90,20},proc=FileList_HelpButtonProc,title="Picker Help" 
     238        Button PickerButton,pos={212,14},size={90,20},proc=FileList_HelpButtonProc,title="Help" 
    238239        Button PickerButton,help={"If you need help understanding what a help button does, you really need help"} 
    239         Button button1,pos={212,35},size={100,20},proc=FileList_HelpButtonProc,title="Function Help" 
     240        Button button1,pos={212,37},size={100,20},proc=FileList_HelpButtonProc,title="Function Help" 
    240241        Button button1,help={"If you need help understanding what a help button does, you really need help"} 
     242        GroupBox group0,pos={203,128},size={46,11},title="Select model functions" 
     243        GroupBox group0_1,pos={203,145},size={46,11},title="to include" 
    241244EndMacro 
    242245 
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/Wrapper.ipf

    r173 r177  
    297297                        // get them onto the table 
    298298                        // how do I get the parameter name? 
    299                         String param = WaveList("*param*"+suffix, "", "TEXT:1," )               //this is *hopefully* one wave 
     299                        String param = WaveList("*param*_"+suffix, "", "TEXT:1," )              //this is *hopefully* one wave 
    300300                        AppendtoTable/W=wrapperPanel#T0 $param,$(popStr) 
    301301                        AppendToTable/W=wrapperPanel#T0 $("Hold_"+suffix),$("LoLim_"+suffix),$("HiLim_"+suffix),$("epsilon_"+suffix) 
     
    384384End 
    385385 
    386 // How to bypass the step of plot and append? 
    387 // 
    388 // - does not yet work 
    389 // -- may need more serious changes in the way the "Plot" macros work 
    390 // - may need to have a separate "append" button that looks at what is available in the specified  
    391 //   data folder, or as a PauseForUser, after the plot is done 
    392 // 
    393 // - different Cmd if smeared or unsmeared 
    394 // - stringent "PlotNNN" naming requirements 
     386 
     387 
     388// - this is based on stringent "PlotNNN" naming requirements 
     389// 
     390//  ??? 
    395391// - how to kill the generated table and graph, that are not needed now 
    396 // 
    397 // - how to plot when there are no files loaded, no data folders, no resolution information 
    398392// 
    399393Function PlotModelFunction(ba) : ButtonControl 
     
    414408                        if(stringmatch(funcStr, "Smear*" )==1) 
    415409                                //it's a smeared model 
    416                                 sprintf cmdStr, "Plot%s(\"%s\")",funcStr,folderStr 
     410                                // check for the special case of RPA that has an extra parameter 
     411                                if(strsearch(funcStr, "RPAForm", 0 ,0) == -1) 
     412                                        sprintf cmdStr, "Plot%s(\"%s\")",funcStr,folderStr              //not RPA 
     413                                else 
     414                                        sprintf cmdStr, "Plot%s(\"%s\",)",funcStr,folderStr             //yes RPA, leave a comma for input 
     415                                endif 
    417416                        else 
    418417                                // it's not,                     
  • sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/SA_includes_v301.ipf

    r176 r177  
    2020Menu "SANS Models" 
    2121        "Fit Manager", Init_WrapperPanel() 
     22        "Load Model Functions",Execute/P "INSERTINCLUDE \"SANSModelPicker\"";Execute/P "COMPILEPROCEDURES ";Execute/P "ModelPicker_Panel()" 
    2223        "Plot Manager", Show_Plot_Manager() 
    23         "Load Model Functions",Execute/P "INSERTINCLUDE \"SANSModelPicker\"";Execute/P "COMPILEPROCEDURES ";Execute/P "ModelPicker_Panel()" 
    2424        "Write Model Data" 
    2525        "-" 
Note: See TracChangeset for help on using the changeset viewer.