Changeset 177 for sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files

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:

• Packages/ModelPicker/SANSModelPicker.ipf (modified) (1 diff)
• Packages/Wrapper.ipf (modified) (3 diffs)
• SA_includes_v301.ipf (modified) (1 diff)

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

@@ -223 +223 @@
 Proc Procedure_List()
         PauseUpdate; Silent 1           // building window...
-        NewPanel/W=(1115,44,1453,263)/K=2
+        NewPanel /W=(1115,44,1453,363) /K=2
         DoWindow/C Procedure_List
         ModifyPanel fixedSize=1
-        ListBox fileList,pos={4,3},size={200,100},listWave=root:myGlobals:FileList:fileWave
+        
+        ListBox fileList,pos={4,3},size={200,203},listWave=root:myGlobals:FileList:fileWave
         ListBox fileList,selWave=root:myGlobals:FileList:selWave,mode= 4
-        ListBox inclList,pos={4,110},size={200,100}
+        ListBox inclList,pos={4,212},size={200,100}
         ListBox inclList,listWave=root:myGlobals:FileList:includedFileWave
         ListBox inclList,selWave=root:myGlobals:FileList:selToDelWave,mode= 4
-        Button button0,pos={212,77},size={110,20},proc=FileList_InsertButtonProc,title="Include File(s)"
+        Button button0,pos={212,173},size={110,20},proc=FileList_InsertButtonProc,title="Include File(s)"
         Button button0,help={"Includes the selected procedures, functions appear under the SANS Models menu"}
-        Button button5,pos={212,187},size={110,20},proc=FileList_RemoveButtonProc,title="Remove File(s)"
+        Button button5,pos={212,283},size={110,20},proc=FileList_RemoveButtonProc,title="Remove File(s)"
         Button button5,help={"Removes selected procedures from the experiment"}
-        Button PickerButton,pos={212,12},size={90,20},proc=FileList_HelpButtonProc,title="Picker Help"
+        Button PickerButton,pos={212,14},size={90,20},proc=FileList_HelpButtonProc,title="Help"
         Button PickerButton,help={"If you need help understanding what a help button does, you really need help"}
-        Button button1,pos={212,35},size={100,20},proc=FileList_HelpButtonProc,title="Function Help"
+        Button button1,pos={212,37},size={100,20},proc=FileList_HelpButtonProc,title="Function Help"
         Button button1,help={"If you need help understanding what a help button does, you really need help"}
+        GroupBox group0,pos={203,128},size={46,11},title="Select model functions"
+        GroupBox group0_1,pos={203,145},size={46,11},title="to include"
 EndMacro
 

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/Wrapper.ipf

@@ -297 +297 @@
                         // get them onto the table
                         // how do I get the parameter name?
-                        String param = WaveList("*param*"+suffix, "", "TEXT:1," )               //this is *hopefully* one wave
+                        String param = WaveList("*param*_"+suffix, "", "TEXT:1," )              //this is *hopefully* one wave
                         AppendtoTable/W=wrapperPanel#T0 $param,$(popStr)
                         AppendToTable/W=wrapperPanel#T0 $("Hold_"+suffix),$("LoLim_"+suffix),$("HiLim_"+suffix),$("epsilon_"+suffix)
@@ -384 +384 @@
 End
 
-// How to bypass the step of plot and append?
-//
-// - does not yet work
-// -- may need more serious changes in the way the "Plot" macros work
-// - may need to have a separate "append" button that looks at what is available in the specified 
-//   data folder, or as a PauseForUser, after the plot is done
-//
-// - different Cmd if smeared or unsmeared
-// - stringent "PlotNNN" naming requirements
+
+
+// - this is based on stringent "PlotNNN" naming requirements
+//
+//  ???
 // - how to kill the generated table and graph, that are not needed now
-//
-// - how to plot when there are no files loaded, no data folders, no resolution information
 //
 Function PlotModelFunction(ba) : ButtonControl
@@ -414 +408 @@
                         if(stringmatch(funcStr, "Smear*" )==1)
                                 //it's a smeared model
-                                sprintf cmdStr, "Plot%s(\"%s\")",funcStr,folderStr
+                                // check for the special case of RPA that has an extra parameter
+                                if(strsearch(funcStr, "RPAForm", 0 ,0) == -1)
+                                        sprintf cmdStr, "Plot%s(\"%s\")",funcStr,folderStr              //not RPA
+                                else
+                                        sprintf cmdStr, "Plot%s(\"%s\",)",funcStr,folderStr             //yes RPA, leave a comma for input
+                                endif
                         else
                                 // it's not,                    

sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/SA_includes_v301.ipf

@@ -20 +20 @@
 Menu "SANS Models"
         "Fit Manager", Init_WrapperPanel()
+        "Load Model Functions",Execute/P "INSERTINCLUDE \"SANSModelPicker\"";Execute/P "COMPILEPROCEDURES ";Execute/P "ModelPicker_Panel()"
         "Plot Manager", Show_Plot_Manager()
-        "Load Model Functions",Execute/P "INSERTINCLUDE \"SANSModelPicker\"";Execute/P "COMPILEPROCEDURES ";Execute/P "ModelPicker_Panel()"
         "Write Model Data"
         "-"