Changeset 167 for sans/SANSReduction/trunk/Put in User Procedures/SANS_Reduction_v5.00/Correct.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/Correct.ipf (modified) (7 diffs)

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

@@ -958 +958 @@
         endif
         //get input from the user
-        NewDataFolder/O root:tmp_trans
-        Variable/G root:tmp_trans:inputTrans=0.9
-        Variable/G root:tmp_trans:returnCode=0
+        NewDataFolder/O root:myGlobals:tmp_trans
+        Variable/G root:myGlobals:tmp_trans:inputTrans=0.9
+        Variable/G root:myGlobals:tmp_trans:returnCode=0
         DoTransInput(type)
-        NVAR inputTrans=root:tmp_trans:inputTrans
-        NVAR code=root:tmp_trans:returnCode
+        NVAR inputTrans=root:myGlobals:tmp_trans:inputTrans
+        NVAR code=root:myGlobals:tmp_trans:returnCode
         newTrans=inputTrans             //keep a copy before deleting everything
         newCode=code
@@ -970 +970 @@
         Endif
 //      printf "You entered %g and the code is %g\r",newTrans,newCode
-        KillDataFolder root:tmp_trans
+//      KillDataFolder root:tmp_trans
         
         if(newCode==1)
@@ -987 +987 @@
         
 //      Print "ignore now"
-        NVAR val=root:tmp_trans:returnCode
+        NVAR val=root:myGlobals:tmp_trans:returnCode
         val=0           //code for ignore once
         
@@ -1002 +1002 @@
         DrawText 15,125,"(Reset this in Preferences)"
         SetVariable setvar0,pos={20,170},size={160,17},limits={0,1,0.01}
-        SetVariable setvar0,value= root:tmp_trans:inputTrans,title="New Transmission"
+        SetVariable setvar0,value= root:myGlobals:tmp_trans:inputTrans,title="New Transmission"
 
         Button button0,pos={36,56},size={120,20},proc=IgnoreNowButton,title="Ignore This Time"
@@ -1015 +1015 @@
 
 //      Print "ignore always"
-        NVAR val=root:tmp_trans:returnCode
+        NVAR val=root:myGlobals:tmp_trans:returnCode
         val=1           //code for ignore always
         DoWindow/K tmp_GetInputPanel            // Kill self
@@ -1024 +1024 @@
 
 //      Print "use new Value"
-        NVAR val=root:tmp_trans:returnCode
+        NVAR val=root:myGlobals:tmp_trans:returnCode
         val=2           //code for use new Value
         DoWindow/K tmp_GetInputPanel            // Kill self
@@ -1033 +1033 @@
 
 //      Print "Abort"
-        NVAR val=root:tmp_trans:returnCode
+        NVAR val=root:myGlobals:tmp_trans:returnCode
         val=4           //code for abort
         DoWindow/K tmp_GetInputPanel            // Kill self