Changeset 578 for sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf

Timestamp:

Oct 22, 2009 2:37:45 PM (13 years ago)

Author:

srkline

Message:

fixes in USANS:

• now a click in the white space of the file list will not bring up two open file dialogs. Instead, the null string is caught.

when writing out simulated VAX files:

• now a proper date is written to the file header
• runNumber can be entered, and automatically increments

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf (modified) (2 diffs)

sans/Dev/trunk/NCNR_User_Procedures/Reduction/USANS/Main_USANS.ipf

@@ -608 +608 @@
         endif
         //Print fname
-        err = LoadBT5File(fname,"RAW")
-        if(err)
-                return(err)
-        endif
-        //if the "Raw Data" Graph exists, do nothing - else draw it
-        //DoWindow/F RawDataWin
-        if(WinType("RawDataWin")!=1)
-                Execute "GraphRawData()"
-        else
-                //just update the textbox
-                //String textStr=StringForRawGraph()
-                //TextBox/W=RawDataWin/C/N=text1/A=RC/X=0.50/Y=-2 textStr
-                //TextBox/W=RawDataWin/C/E=2/A=MT/X=0/Y=0/N=text0 textStr
-                TitleForRawGraph()
-        Endif
+        if(strlen(fileWave[ii]) > 0)            //make sure that this is not a click in blank space
+                err = LoadBT5File(fname,"RAW")
+                if(err)
+                        return(err)
+                endif
+                //if the "Raw Data" Graph exists, do nothing - else draw it
+                //DoWindow/F RawDataWin
+                if(WinType("RawDataWin")!=1)
+                        Execute "GraphRawData()"
+                else
+                        //just update the textbox
+                        //String textStr=StringForRawGraph()
+                        //TextBox/W=RawDataWin/C/N=text1/A=RC/X=0.50/Y=-2 textStr
+                        //TextBox/W=RawDataWin/C/E=2/A=MT/X=0/Y=0/N=text0 textStr
+                        TitleForRawGraph()
+                Endif
+        endif
         //bring the panel back to the front
         DoWindow/F USANS_Panel
@@ -692 +694 @@
         endif           
         //Print fname
-        ReadBT5Header(fname)
+        if(strlen(fileWave[ii]) > 0)            //make sure that this is not a click in blank space
+                ReadBT5Header(fname)
+        endif
 End