Changeset 380 for sans/Dev/trunk/NCNR_User_Procedures/SANS

Timestamp:

Jun 11, 2008 10:45:06 AM (15 years ago)

Author:

srkline

Message:

Changes in response to Lionel:

• ShowSchematic? now warns you if there is one already open
• FreezeModel? is now truly data folder aware. Supposedly was done 9/27/07, but I could find no modifications in the log.

Location:

sans/Dev/trunk/NCNR_User_Procedures/SANS

Files:

• Analysis/Models/Packages/ModelPicker/SANSModelPicker_v40.ipf (modified) (2 diffs)
• Analysis/Models/Packages/Wrapper_v40.ipf (modified) (1 diff)
• Reduction/Schematic.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/ModelPicker/SANSModelPicker_v40.ipf

@@ -771 +771 @@
 // SRK  09 JUN 2006
 //
-Proc FreezeModel(xWave,yWave,newNameStr)
+// made data folder-aware in a somewhat messy way, but wavelist works only on the
+// current data folder, and WaveSelectorWidget is waaaaaay too complex
+//
+Function FreezeModel()
+        String modelType
+        Prompt modelType,"What type of model to freeze? (smeared models use the current data set)",popup,"Unsmeared Model;Smeared Model;"
+        DoPrompt "Type of Data",modelType
+        
+        if(V_Flag==1)           //user canceled
+                return(1)
+        endif
+        
         String xWave,yWave,newNameStr
-        Prompt xwave,"X data",popup,WaveList("*",";","")
-        Prompt ywave,"y data",popup,WaveList("*",";","")
-        Prompt newNameStr,"new name for the waves, _q and _i will be appended"
-        
+
+        SetDataFolder root:
+        if(cmpstr(modelType,"Smeared Model")==0)
+                ControlInfo/W=WrapperPanel popup_0
+                String folderStr=S_Value
+                SetDataFolder $("root:"+folderStr)
+        
+                Prompt xwave,"X data",popup,WaveList("s*",";","")
+                Prompt ywave,"Y data",popup,WaveList("s*",";","")
+                Prompt newNameStr,"new name for the waves, _q and _i will be appended"
+        else
+                Prompt xwave,"X data",popup,WaveList("x*",";","")
+                Prompt ywave,"Y data",popup,WaveList("y*",";","")
+                Prompt newNameStr,"new name for the waves, _q and _i will be appended"
+        endif
+
+        DoPrompt "Select the Waves to Freeze",xwave,ywave,newNameStr
+        if(V_Flag==1)           //user canceled
+                SetDataFolder root:
+                return(1)
+        endif
+
         Duplicate/O $xwave,$(newNameStr+"_q")
         Duplicate/O $ywave,$(newNameStr+"_i")
@@ -783 +812 @@
         AppendToGraph $(newNameStr+"_i") vs $(newNameStr+"_q") 
         
-End
+        SetDataFolder root:
+end

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/Packages/Wrapper_v40.ipf

@@ -133 +133 @@
         endswitch
 
-        ControlUpdate/W=WrapperPanel popup_0
+//      ControlUpdate/W=WrapperPanel popup_0
+        //instead of a simple controlUpdate, better to pop the menu to make sure that the other menus follow
+        // but not sure how to get the most recently loaded file as the selected item - bring the 
+        // wrapper panel back to the top - then pop - 
+
         return 0
 End

sans/Dev/trunk/NCNR_User_Procedures/SANS/Reduction/Schematic.ipf

@@ -23 +23 @@
 Proc ShowSchematic()
 
+        Dowindow/F Schematic_Layout
+        if(V_flag==1)
+                Abort "Please close the existing schematic before creating a new one. Print it out if you want to save it."
+                //DoWindow/K Schematic_Layout
+        endif
+        
         Variable oldScaling=root:myGlobals:gLogScalingAsDefault
 
@@ -466 +472 @@
         PauseUpdate; Silent 1           // building window...
         Layout/C=1/W=(5,42,360,460) as "Data Reduction Schematic"
+        DoWindow/C Schematic_Layout
         Textbox/N=text0/F=0/A=LB/X=9.65/Y=98.03 "SAM"
         Textbox/N=text1/F=0/A=LB/X=26.69/Y=98.03 "EMP"