Changeset 167 for sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NSORT.ipf

Timestamp:

Sep 21, 2007 3:18:47 PM (16 years ago)

Author:

srkline

Message:

Changed NSORT to display rescaling and overlap constants behind the OS file save dialog, allowing the user to cancel the save it something is amiss.

No significant change in trans=1 panel behavior in Correct.ipf

Cosmetic changes to RawWindowHook? (drawing order) to look nicer w/OS native panels.

File:

• sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NSORT.ipf (modified) (6 diffs)

sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/NSORT.ipf

@@ -767 +767 @@
         PopupMenu popup_3,mode=1,value= #"root:myGlobals:NSORT:gDataPopList_3"
         PopupMenu popup_3,help={"Choose the dataset with the highest overall q-value (shortest detector distance), or NONE if no third set desired"}
-        CheckBox AutoCheck,pos={14,310},size={100,20},title="Auto Scale",value=1
+        CheckBox AutoCheck,pos={14,310},size={100,20},title="Auto Scale",value=0
         CheckBox AutoCheck,help={"If checked, the scale factor will be automatically determined, if not checked, the current values in the fields will be used"}
 EndMacro
@@ -831 +831 @@
         While(0)
         ControlUpdate/A/W=NSORT_Panel
+                DoUpdate
                 
 End
@@ -1050 +1051 @@
                 Sort q12, q12,i12,sig12
                 //at this point 1-2 are combined
+                
+                ControlUpdate/A/W=NSORT_Panel
+                DoUpdate
+                
                 //do we need to continue, or write out the set here and stop?
                 if(cmpstr(name3,"none") == 0)
@@ -1118 +1123 @@
                 Endif
                 
+                ControlUpdate/A/W=NSORT_Panel
+                DoUpdate
+
                 //Print "NSORT-ed ",name1," + ", name2, " + ", name3
                 //Print "normalized to ",normTo
@@ -1217 +1225 @@
                 //Print "normalized to ",normTo
                 //Print "multiplicative factor = ",norm12
-                
+                ControlUpdate/A/W=NSORT_Panel
+                DoUpdate
+
                 
                 //Make the combined, scaled dataset by overwriting the old sets
@@ -1316 +1326 @@
                 //Print "normalized to ",normTo
                 //Print "multiplicative factor 1-2 = ",norm12," multiplicative factor 12 - 3 = ",norm23
-                
+                ControlUpdate/A/W=NSORT_Panel
+                DoUpdate
                 
                 Make/O/N=(n123) q123,i123,sig123,sq123,qb123,fs123