Changeset 165

Timestamp:

Sep 20, 2007 10:59:50 AM (15 years ago)

Author:

srkline

Message:

Added:
Report notebook generate/save
Feedback to panel
Macro to generate panel
Keyword=value bookkeeping for model=coef and coef=suffix correspondence
More logical interaction with popups.

File:

• sans/Analysis/branches/ajj_23APR07/IGOR_Package_Files/Put in User Procedures/SANS_Models_v3.00/Packages/Wrapper.ipf (modified) (23 diffs)

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

@@ -7 +7 @@
 //
 //
+
+Macro OpenWrapperPanel()
+        Init_WrapperPanel()
+End
+
+Function Init_WrapperPanel()
+        DoWindow/F WrapperPanel
+        if(V_flag==0)
+                if(exists("root:coefKWStr")==0)
+                        String/G root:coefKWStr=""
+                endif
+                if(exists("root:suffixKWStr")==0)
+                        String/G root:suffixKWStr=""
+                endif
+                Execute "WrapperPanel()"
+        endif
+End
+
 ////////
 //
@@ -17 +35 @@
 // and put these in the table as needed
 //
-Window WrapperPanel() : Panel
+Window WrapperPanel()
         PauseUpdate; Silent 1           // building window...
         NewPanel /W=(459,44,1113,499)/N=wrapperPanel as "Curve Fit Setup"
@@ -28 +46 @@
         Button button_1,pos={270,57},size={80,20},proc=PlotModelFunction,title="Plot"
         Button button_2,pos={270,93},size={80,20},proc=AppendModelToTarget,title="Append"
+        Button button_3,pos={270,20},size={80,20},proc=W_LoadDataButtonProc,title="Load Data"
         PopupMenu popup_0,pos={30,21},size={218,20},title="Data Set"
         PopupMenu popup_0,mode=1,value= #"W_DataSetPopupList()"
         PopupMenu popup_1,pos={30,57},size={136,20},title="Function"
-        PopupMenu popup_1,mode=1,value= #"W_FunctionPopupList()"
+        PopupMenu popup_1,mode=1,value= #"W_FunctionPopupList()",proc=Function_PopMenuProc
         PopupMenu popup_2,pos={30,93},size={123,20},title="Coefficients"
         PopupMenu popup_2,mode=1,value= #"W_CoefPopupList()",proc=Coef_PopMenuProc
@@ -37 +56 @@
         CheckBox check_1,pos={400,42},size={74,14},title="Use Epsilon?",value= 0
         CheckBox check_2,pos={400,65},size={95,14},title="Use Constraints?",value= 0
-        CheckBox check_3,pos={280,24},size={72,14},title="From target",value= 0
+        CheckBox check_3,pos={544,18},size={72,14},title="From target",value= 0
         CheckBox check_4,pos={400,85},size={72,14},title="Report?",value= 0
-        CheckBox check_5,pos={414,100},size={72,14},title="Save it?",value= 0
+        CheckBox check_5,pos={414,103},size={72,14},title="Save it?",value= 0
         Edit/W=(20,174,634,435)/HOST=#  
         ModifyTable width(Point)=0
@@ -46 +65 @@
 EndMacro
 
+//obvious use
+Function W_LoadDataButtonProc(ba) : ButtonControl
+        STRUCT WMButtonAction &ba
+
+        switch( ba.eventCode )
+                case 2: // mouse up
+                        // click code here
+                        String  topGraph= WinName(0,1)
+                        if(strlen(topGraph) != 0)
+                                DoWindow/F $topGraph                    //so that the panel is not on top
+                        endif
+                        Execute "LoadSANSorUSANSData()"
+                        break
+        endswitch
+
+        return 0
+End
+
 
 // is there a simpler way to do this?
@@ -52 +89 @@
         String str=GetAList(4),tmp="",onTargetStr=""
         Variable ii
-        ControlInfo check_3
+        ControlInfo/W=WrapperPanel check_3
         if(V_Value==1)          //if "from target" checked
                 //ther must be a better way to do this
@@ -121 +158 @@
 End
 
+
 // show all the appropriate coefficient waves
 // 
@@ -127 +165 @@
 //
 // - or - restrict the coefficient list based on the model function
-//
+// - new way, filter the possible values based on the data folder and function
 Function/S W_CoefPopupList()
-        String list
-        setDataFolder root:
-        list = WaveList("coef*",";","")
-        
+
+        String notPlotted="Please plot the function"
+        ControlInfo/W=wrapperpanel popup_1
+        String funcStr=S_Value
+        String coefStr=getFunctionCoef(funcStr)
+        
+        if(cmpstr(coefStr,"")==0)               //no correspondence in the KW string
+                return(notPlotted)
+        endif
+        
+        
+        //found a coefficient wave - only two places to look
+        // is it in the root folder?
+        if(exists("root:"+coefStr) != 0)
+                return(coefStr)
+        endif
+        
+        // is it in the data folder?
         ControlInfo/W=wrapperpanel popup_0
-        if(V_Value != 0)                //0== no items in menu
-                if(DataFolderExists("root:"+S_Value))
-                        SetDataFolder $("root:"+S_Value)
-                        list += WaveList("*coef*",";","")
-                endif
-        endif
-        
-        // tmp coefficients that aren't being cleaned up from somewhere...
-        list = RemoveFromList("temp_coef_1;temp_coef_2;", list  ,";")
-
-        if(strlen(list)==0)
-                list = "No functions plotted"
-        endif
-        list = SortList(list)
-        
-//      Print itemsinlist(list,";")
-        
-        setDataFolder root:
-        return(list)
-End
+        String folderStr=S_Value
+        if(exists("root:"+folderStr+":"+coefStr) != 0)
+                return(coefStr)
+        endif
+
+        return(notPlotted)
+End
+
+// show all the appropriate coefficient waves
+// 
+// also need to search the folder listed in "data set" popup
+// for smeared coefs
+//
+// - or - restrict the coefficient list based on the model function
+//
+// --old way
+//Function/S W_CoefPopupList()
+//      String list
+//      setDataFolder root:
+//      list = WaveList("coef*",";","")
+//      
+//      ControlInfo/W=wrapperpanel popup_0
+//      if(V_Value != 0)                //0== no items in menu
+//              if(DataFolderExists("root:"+S_Value))
+//                      SetDataFolder $("root:"+S_Value)
+//                      list += WaveList("*coef*",";","")
+//              endif
+//      endif
+//      
+//      // tmp coefficients that aren't being cleaned up from somewhere...
+//      list = RemoveFromList("temp_coef_1;temp_coef_2;", list  ,";")
+//
+//      if(strlen(list)==0)
+//              list = "No functions plotted"
+//      endif
+//      list = SortList(list)
+//      
+////    Print itemsinlist(list,";")
+//      
+//      setDataFolder root:
+//      return(list)
+//End
 
 // if the coefficients are changed, then update the table
@@ -171 +245 @@
                         String popStr = pa.popStr
                         String suffix = getModelSuffix(popStr)
-                        ControlInfo popup_0
+                        ControlInfo/W=WrapperPanel popup_0
                         String folderStr=S_Value
                         
+                        if(cmpstr(popStr,"Please plot the function")==0)
+                                Print "function not plotted"
+                                return(0)
+                        endif
+
+// this if/else/endif should not ever return an error alert     
+// it should simply set the data folder properly        
                         if(DataFolderExists("root:"+folderStr))
                                 SetDataFolder $("root:"+folderStr)
@@ -180 +261 @@
                                         SetDataFolder root:                             
                                         if(!exists(popStr))             //this should be fine if the coef filter is working, but check anyhow
-                                                DoAlert 0,"the coefficient and data sets do not match"
+                                                DoAlert 0,"the coefficient and data sets do not match (1)"
                                                 return 0
                                         endif
@@ -188 +269 @@
                                 SetDataFolder root:     
                                 if(!exists(popStr))             //this should be fine if the coef filter is working, but check anyhow
-                                        DoAlert 0,"the coefficient and data sets do not match"
+                                        DoAlert 0,"the coefficient and data sets do not match (2)"
                                         return 0
                                 endif
@@ -196 +277 @@
                         Variable num=numpnts($popStr)
                         // make the necessary waves
-                        Make/O/D/N=(num) $("epsilon"+suffix),$("Hold"+suffix)
-                        Make/O/T/N=(num) $("LoLim"+suffix),$("HiLim"+suffix)
+                        Make/O/D/N=(num) $("epsilon_"+suffix),$("Hold_"+suffix)
+                        Make/O/T/N=(num) $("LoLim_"+suffix),$("HiLim_"+suffix)
                         
                         // default epsilon values, sometimes needed for the fit
-                        Wave eps = $("epsilon"+suffix)
+                        Wave eps = $("epsilon_"+suffix)
                         Wave coef=$popStr
                         eps = abs(coef*1e-4) + 1e-10                    //default eps is proportional to the coefficients
-                        WAVE/T LoLim = $("LoLim"+suffix)
-                        WAVE/T HiLim = $("HiLim"+suffix)
+                        WAVE/T LoLim = $("LoLim_"+suffix)
+                        WAVE/T HiLim = $("HiLim_"+suffix)
                         LoLim = ""              //should have nicer way of keeping the previous values
                         HiLim = ""
@@ -216 +297 @@
                         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)
+                        AppendToTable/W=wrapperPanel#T0 $("Hold_"+suffix),$("LoLim_"+suffix),$("HiLim_"+suffix),$("epsilon_"+suffix)
                         ModifyTable width(Point)=0
                         
@@ -225 +306 @@
         return 0
 End
+
+// if the Function is changed, then update the coef popup (if possible) and then the table (if possible)
+//
+// !! only respond to mouse up
+//
+Function Function_PopMenuProc(pa) : PopupMenuControl
+        STRUCT WMPopupAction &pa
+
+        switch( pa.eventCode )
+                case 2: // mouse up
+                        Variable popNum = pa.popNum
+                        String funcStr = pa.popStr
+                        String coefStr = W_CoefPopupList()
+                        
+//                      Print "coefStr = ",coefStr
+                        
+                        ControlInfo/W=WrapperPanel popup_0
+                        String folderStr=S_Value
+                        
+                        String listStr = W_CoefPopupList()
+                        Variable num=WhichListItem(coefStr, listStr, ";")
+                        String str=StringFromList(num, listStr  ,";")
+//                      print "str = ",str
+                        //set the item in the coef popup, and pop it
+                        PopupMenu popup_2 mode=(num+1)
+                        
+                        Struct WMPopupAction ps
+                        ps.eventCode = 2                //fake mouse up
+                        ps.popStr = str
+                        Coef_PopMenuProc(ps)
+                        
+                        SetDataFolder root:
+                        break
+        endswitch
+
+        return 0
+End
+
 
 // always pass this the coefficient string
@@ -231 +350 @@
 // or "smear_coef_"
 //
+Function/S getFunctionCoef(funcStr)
+        String funcStr
+
+        SVAR listStr=root:coefKWStr
+        String coefStr = StringByKey(funcStr, listStr  ,"=",";",0)
+
+        return(coefStr)
+End
+
+// always pass this the coefficient string
+//
+// either "coef_"
+// or "smear_coef_"
+//
+// does NOT return the leading "_" as part of the suffix
 Function/S getModelSuffix(coefStr)
         String coefStr
 
-        Variable pos,start=0
-//      Variable pos=Strsearch(modelStr,"_",Inf,1)              //look backwards to find "_" - this fails for form+struct models
-
-        if(stringmatch(coefStr,"smear_*") == 1)
-                start=7 //look forwards to find "_", skipping "smear_coe" if necessary
-        endif
-        pos=Strsearch(coefStr,"_",start,0)
+        SVAR listStr=root:suffixKWStr
+        String suffixStr = StringByKey(coefStr, listStr  ,"=",";",0)
+
+        return(suffixStr)
+//      Variable pos,start=0
+
+//      if(stringmatch(coefStr,"smear_*") == 1)
+//              start=7 //look forwards to find "_", skipping "smear_coe" if necessary
+//      endif
+//      pos=Strsearch(coefStr,"_",start,0)
         //Print start, pos
-        return(coefStr[pos,strlen(coefStr)-1])
+//      return(coefStr[pos,strlen(coefStr)-1])
 End
 
@@ -266 +403 @@
         switch( ba.eventCode )
                 case 2: // mouse up
-                        ControlInfo popup_0
+                        ControlInfo/W=WrapperPanel popup_0
                         folderStr=S_Value
                         
-                        ControlInfo popup_1
+                        ControlInfo/W=WrapperPanel popup_1
                         funcStr=S_Value
                         
@@ -283 +420 @@
                         //Print cmdStr
                         Execute cmdStr
+                        
+                        //pop the function menu to set the proper coefficients
+                        DoWindow/F WrapperPanel
+                        STRUCT WMPopupAction pa
+                        pa.popStr = funcStr
+                        pa.eventcode = 2
+                        Function_PopMenuProc(pa)
+        
                         break
         endswitch
@@ -300 +445 @@
         switch( ba.eventCode )
                 case 2: // mouse up                     
-                        ControlInfo popup_2
+                        ControlInfo/W=WrapperPanel popup_2
                         coefStr=S_Value
                         suffix = getModelSuffix(coefStr)
@@ -307 +452 @@
                         if(stringmatch(coefStr, "smear*" )==1)
                                 //it's a smeared model
-                                ControlInfo popup_0
+                                ControlInfo/W=WrapperPanel popup_0
                                 folderStr=S_Value
                                 xWStr = "root:"+folderStr+":smeared_qvals"
-                                ywStr = "root:"+folderStr+":smeared"+suffix
+                                ywStr = "root:"+folderStr+":smeared_"+suffix
                         else
                                 // it's not, so it's in the root folder
-                                xWStr = "xwave"+suffix
-                                yWStr = "ywave"+suffix
-                        endif
-                        
-                        Wave yw = $yWStr
-                        Wave xw = $xWStr
-                        AppendtoGraph yw vs xw
+                                xWStr = "xwave_"+suffix
+                                yWStr = "ywave_"+suffix
+                        endif
+                        
+                        Wave/Z yw = $yWStr
+                        Wave/Z xw = $xWStr
+                        if(WaveExists(yw) && WaveExists(xw))
+                                AppendtoGraph yw vs xw
+                        else
+                                DoAlert 0,"The selected model has not been plotted for the selected data set."
+                        endif
                         break
         endswitch
@@ -336 +485 @@
         switch( ba.eventCode )
                 case 2: // mouse up
-                        ControlInfo popup_0
+                        ControlInfo/W=WrapperPanel popup_0
                         folderStr=S_Value
                         
-                        ControlInfo popup_1
+                        ControlInfo/W=WrapperPanel popup_1
                         funcStr=S_Value
                         
-                        ControlInfo popup_2
+                        ControlInfo/W=WrapperPanel popup_2
                         coefStr=S_Value
                         
-                        Controlinfo check_0
+                        ControlInfo/W=WrapperPanel check_0
                         useCursors=V_Value
-                        Controlinfo check_1
+                        ControlInfo/W=WrapperPanel check_1
                         useEps=V_Value
-                        Controlinfo check_2
+                        ControlInfo/W=WrapperPanel check_2
                         useConstr=V_Value
+                        
+                        if(!CheckFunctionAndCoef(funcStr,coefStr))
+                                DoAlert 0,"The coefficients and function type do not match. Please correct the selections in the popup menus."
+                                break
+                        endif
                         
                         FitWrapper(folderStr,funcStr,coefStr,useCursors,useEps,useConstr)
@@ -370 +524 @@
 End
 
+Function CheckFunctionAndCoef(funcStr,coefStr)
+        String funcStr,coefStr
+        
+        SVAR listStr=root:coefKWStr
+        String properCoefStr = StringByKey(funcStr, listStr  ,"=",";",0)
+        if(cmpstr(coefStr,properCoefStr)==0)
+                return(1)               //true, the coef is the correct match
+        endif
+        return(0)                       //false, wrong coef
+End
 
 /////////////////////////////////
@@ -396 +560 @@
                 
         WAVE cw=$(coefStr)      
-        Wave hold=$("Hold"+suffix)
-        Wave/T lolim=$("LoLim"+suffix)
-        Wave/T hilim=$("HiLim"+suffix)
-        Wave eps=$("epsilon"+suffix)
+        Wave hold=$("Hold_"+suffix)
+        Wave/T lolim=$("LoLim_"+suffix)
+        Wave/T hilim=$("HiLim_"+suffix)
+        Wave eps=$("epsilon_"+suffix)
         
 // fill a struct instance whether I need one or not
@@ -577 +741 @@
         
         Variable yesSave=0,yesReport=0
-        ControlInfo check_4
+        ControlInfo/W=WrapperPanel check_4
         yesReport = V_Value
-        ControlInfo check_5
+        ControlInfo/W=WrapperPanel check_5
         yesSave = V_Value