Changeset 541 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/PatchFiles.ipf

Timestamp:

Jul 22, 2009 5:43:18 PM (14 years ago)

Author:

srkline

Message:

(1) changes to ProDiv? to get the linear scaling correct with the new panel.

(2) bug fix in NCNR_Utils in file open dialog

(3) assorted changes to SASCALC and Simulation procedures to allow 1D simulation of data collection. 2D is now hidden and will be brought back later, as needed.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/PatchFiles.ipf (modified) (4 diffs)

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

@@ -107 +107 @@
         
         //then update the popup list
-        PatchPopMenuProc("PatchPopup",1,"")
+        // (don't update the list - not until someone enters a search critera) -- Jul09
+        //
+        SetMatchStrProc("",0,"*","")            //this is equivalent to finding everything, typical startup case
+
 End
 
@@ -301 +304 @@
         ControlUpdate PatchPopup
         PopupMenu PatchPopup,mode=1
-        ShowHeaderButtonProc("SHButton")
+        
+        if(strlen(list) > 0)
+                ShowHeaderButtonProc("SHButton")
+        endif
 End
 
@@ -318 +324 @@
         String partialName, tempName
         Variable ok
-        ControlInfo patchPopup
-        If(cmpstr(S_value,"")==0)
+        ControlInfo/W=Patch_Panel PatchPopup
+        If(strlen(S_value)==0)
                 //null selection
                 Abort "no file selected in popup menu"
@@ -603 +609 @@
 Proc Patch_Panel()
         PauseUpdate; Silent 1      // building window...
-//      NewPanel /W=(519,85,950,608)/K=1 as "Patch Raw SANS Data Files"
-        NewPanel /W=(519,85,950,608) as "Patch Raw SANS Data Files"
+        NewPanel /W=(519,85,950,608)/K=1 as "Patch Raw SANS Data Files"
+//      NewPanel /W=(519,85,950,608) as "Patch Raw SANS Data Files"
         DoWindow/C Patch_Panel
         ModifyPanel cbRGB=(1,39321,19939)