Changeset 476 for sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/SumModel

Timestamp:

Feb 17, 2009 4:37:09 PM (14 years ago)

Author:

srkline

Message:

Tried to stop the unloading clash of GlobalFit? and SimpleGlobalFit?. The Simple fit depends on GlobalFit?, so it can't be unloaded.

SumSANSModels now automatically finds the number of coefficients, since the coefficients are always in the root: folder. Saves the users a step.

Added more windows to the analysis list in the package loader

File:

• sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/SumModel/SumSANSModels_v40.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Analysis/Packages/SumModel/SumSANSModels_v40.ipf

@@ -69 +69 @@
         PopupMenu popup2_0,mode=1,popvalue="Pick model 2",value= #"SumModelPopupList()"
         PopupMenu popup1_1,pos={15,98},size={173,20},title="Coef"
-        PopupMenu popup1_1,mode=1,popvalue="Pick coef for model 1",value= #"CoefPopupList()"
+        PopupMenu popup1_1,mode=1,popvalue="Pick coef for model 1",value= #"CoefPopupList()",proc=Func_1_2PopMenuProc
         PopupMenu popup2_1,pos={15,221},size={173,20},title="Coef"
-        PopupMenu popup2_1,mode=1,popvalue="Pick coef for model 2",value= #"CoefPopupList()"
+        PopupMenu popup2_1,mode=1,popvalue="Pick coef for model 2",value= #"CoefPopupList()",proc=Func_1_2PopMenuProc
         GroupBox group1,pos={5,50},size={216,107},title="Function # 1"
         SetVariable setvar1,pos={14,128},size={140,15},title="# of Parameters"
@@ -82 +82 @@
         Button button2,pos={190,23},size={25,20},proc=Sum_HelpButtonProc,title="?"
 EndMacro
+
+Function Func_1_2PopMenuProc(pa) : PopupMenuControl
+        STRUCT WMPopupAction &pa
+
+        switch( pa.eventCode )
+                case 2: // mouse up
+                        Variable popNum = pa.popNum
+                        String popStr = pa.popStr
+                        String name=pa.ctrlName
+                        Variable num=0
+                        
+                        Wave/Z coef=$("root:"+popStr)
+                        if(WaveExists(coef))
+                                num=numpnts(coef)
+                        endif
+                        
+                        
+                        if(cmpstr(name,"popup1_1")==0)          //function #1
+                                NVAR pts1 = root:Packages:NIST:SumModel:gNParMod1
+                                pts1 = num
+                        else
+                                NVAR pts2 = root:Packages:NIST:SumModel:gNParMod2
+                                pts2 = num
+                        endif
+                        
+                        break
+        endswitch
+
+        return 0
+End
 
 // show the available models