Changeset 181

Timestamp:

Oct 19, 2007 5:04:09 PM (15 years ago)

Author:

srkline

Message:

Changes to wrapper are to toggle button labels and their procedures as needed for 1d/2d analysis and to hopefully not undo the conflict with r180 changes to the sizing of controls on the panel.

File:

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

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

@@ -1 +1 @@
 #pragma rtGlobals=1             // Use modern global access method.
-
+#pragma IgorVersion=6.0
 
 //
@@ -57 +57 @@
         CheckBox check_1,pos={440,42},size={74,14},title="Use Epsilon?",value= 0
         CheckBox check_2,pos={440,65},size={95,14},title="Use Constraints?",value= 0
-//      CheckBox check_3,pos={544,18},size={72,14},title="From target",value= 0
+        CheckBox check_3,pos={530,18},size={72,14},title="2D Functions?",value= 0
+        CheckBox check_3 proc=Toggle2DControlsCheckProc
         CheckBox check_4,pos={440,85},size={72,14},title="Report?",value= 0
         CheckBox check_5,pos={454,103},size={72,14},title="Save it?",value= 0
@@ -550 +551 @@
 // folderStr is the data folder for the desired data set
 //
-// -- this looks like something that can be made rather generic rather easily
 //
 Function FitWrapper(folderStr,funcStr,coefStr,useCursors,useEps,useConstr)
@@ -681 +681 @@
                 endif
                 
-/////   same as above, but all without useRes
+/////   same as above, but all without useRes (no /STRC flag)
                 if(useEps && useCursors && useConstr)           //do it all
                         FuncFit/H=getHStr(hold) /NTHR=0 $funcStr cw, yw[pcsr(A),pcsr(B)] /X=xw /W=sw /I=1 /E=eps /D=fitYw /C=constr
@@ -764 +764 @@
                 String topGraph= WinName(0,1)   //this is the topmost graph
         
+                DoUpdate                //force an update of the graph before making a copy of it for the report
+
                 W_GenerateReport(funcStr,folderStr,$parStr,cw,yesSave,V_chisq,W_sigma,V_npnts,V_FitError,V_FitQuitReason,V_startRow,V_endRow,topGraph)
         endif
@@ -840 +842 @@
         
         //
-        Wave dataXw = $("root:"+dataname+":"+dataname+"_q")     
+        // no "fitted range" for 2D data, so make sure that this exists before using it
+        Wave/Z dataXw = $("root:"+dataname+":"+dataname+"_q")   
         //
         Notebook $nb ruler=Normal
@@ -849 +852 @@
         sprintf str,"Npnts = %g \t\t Sqrt(X^2/N) = %g\r",npts,sqrt(chiSq/npts)
         Notebook $nb textRGB=(0,0,0),fstyle=0, text=str
-        sprintf str "Fitted range = [%d,%d] = %g < Q < %g\r",fitStart,fitEnd,dataXw(fitStart),dataXw(fitEnd)
-        Notebook $nb textRGB=(0,0,0),fstyle=0, text=str
+        if(WaveExists(dataXw))
+                sprintf str "Fitted range = [%d,%d] = %g < Q < %g\r",fitStart,fitEnd,dataXw(fitStart),dataXw(fitEnd)
+                Notebook $nb textRGB=(0,0,0),fstyle=0, text=str
+        endif
         sprintf str,"FitError = %s\t\tFitQuitReason = %s\r",W_ErrorMessage(FitErr),W_QuitMessage(FitQuit)
         Notebook $nb textRGB=(65000,0,0),fstyle=1,text=str
@@ -856 +861 @@
         
         // insert graphs
-        Notebook $nb picture={$topGraph(0, 0, 400, 300), 0, 1}, text="\r"
-        
-
+        if(WaveExists(dataXw))
+                Notebook $nb picture={$topGraph(0, 0, 400, 300), 0, 1}, text="\r"
+        //
+        else            //must be 2D Gizmo
+                Execute "ExportGizmo Clip"
+                LoadPict/Q/O "Clipboard",tmp_Gizmo
+                Notebook $nb picture={tmp_Gizmo(0, 0, 400, 300), 0, 1}, text="\r"
+        endif
         //Notebook Report picture={Table1, 0, 0}, text="\r"
         
@@ -880 +890 @@
                 // E=2 is PICT @2x screen resolution
 ///             SavePICT /E=-5/O/P=home /I/W=(0,0,3,3) as pictStr
-                SavePICT /E=-5/O/P=home/WIN=$topGraph /W=(0,0,400,300) as pictStr
+                if(WaveExists(dataXw))
+                        SavePICT /E=-5/O/P=home/WIN=$topGraph /W=(0,0,400,300) as pictStr
+                else
+                        Execute "ExportGizmo /P=home as \""+pictStr+"\""
+                        //SavePICT /E=-5/O/P=home/WIN=$topGraph /W=(0,0,400,300) as pictStr
+                endif
         Endif
         
@@ -886 +901 @@
 End
 
-static Function/S W_ErrorMessage(code)
+Function/S W_ErrorMessage(code)
         Variable code
         
@@ -907 +922 @@
 end
 
-static Function/S W_QuitMessage(code)
+Function/S W_QuitMessage(code)
         Variable code
         
@@ -928 +943 @@
 end
 
+Function Toggle2DControlsCheckProc(cba) : CheckBoxControl
+        STRUCT WMCheckboxAction &cba
+
+        switch( cba.eventCode )
+                case 2: // mouse up
+                        Variable checked = cba.checked
+                        if(checked)
+                                //print "change the buttons to 2D"
+                                Button button_0,proc=Do2DFitButtonProc,title="Do 2D Fit"
+                                Button button_1,size={120,20},proc=Plot2DFunctionButtonProc,title="Plot 2D Function"
+                                Button button_2,size={100,20},proc=Append2DModelButtonProc,title="Append 2D"
+                                Button button_3,size={100,20},proc=Load2DDataButtonProc,title="Load 2D Data"
+                                
+                                Button button_2D_0,pos={520,37},size={70,20},proc=LogToggle2DButtonProc,title="Log/Lin"
+                                Button button_2D_1,pos={520,60},size={100,20},proc=Plot2DButtonProc,title="Plot 2D Data"
+                                
+                                Button button_2D_0,disable=0            //visible again, and enabled
+                                Button button_2D_1,disable=0
+                        else
+                                //print "unchecked, change them back to 1D"
+                                Button button_0,pos={520,93},size={100,20},proc=DoTheFitButton,title="Do 1D Fit"
+                                Button button_1,pos={240,57},size={120,20},proc=PlotModelFunction,title="Plot 1D Function"
+                                Button button_2,pos={240,93},size={100,20},proc=AppendModelToTarget,title="Append 1D"
+                                Button button_3,pos={240,20},size={100,20},proc=W_LoadDataButtonProc,title="Load 1D Data"
+                                
+                                Button button_2D_0,disable=3    //hide the extra 2D buttons, and disable
+                                Button button_2D_1,disable=3
+                        endif
+                        break
+        endswitch
+
+        return 0
+End