Changeset 385 for sans/Dev

Timestamp:

Jun 16, 2008 3:44:46 PM (15 years ago)

Author:

srkline

Message:

Minor fixes to cursor hook in Wrapper - to act only on mouseup
Version number 6.010

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• InstalledVersion.txt (modified) (2 diffs)
• SANS/Analysis/Models/Packages/Wrapper_v40.ipf (modified) (1 diff)
• SANS/Analysis/Models/PlotUtilsMacro_v40.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/InstalledVersion.txt

@@ -1 @@
-PACKAGE_VERSION=6.004;SANS_RED_VERSION=5.10;SANS_ANA_VERSION=4.00;USANS_RED_VERSION=2.21;
+PACKAGE_VERSION=6.010;SANS_RED_VERSION=5.10;SANS_ANA_VERSION=4.00;USANS_RED_VERSION=2.21;
 
 Only the first line of the file is read in.
@@ -6 +6 @@
 
 These are the current versions as of:
-11 JUN 2008 SRK
+16 JUN 2008 SRK
 

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

@@ -1183 +1183 @@
         STRUCT WMCheckboxAction &cba
 
-        String topGraph= WinName(0,1)   //this is the topmost graph
-        if(cmpstr(topGraph,"")==0)      //no graphs, uncheck and exit
-                CheckBox check_0,value=0
-                return(0)
-        endif
-                
-        String ciStr = CsrInfo(A , topGraph)
-        
-        ControlInfo/W=wrapperpanel popup_0
-        String folderStr=S_Value
-        String traceList = TraceNameList(topGraph, ";", 1 )
-        
+
         switch( cba.eventCode )
                 case 2: // mouse up
+                        // check to make sure there really is a "topmost" graph         
+                        String topGraph= WinName(0,1)   //this is the topmost graph
+                        if(cmpstr(topGraph,"")==0)      //no graphs, uncheck and exit
+                                CheckBox check_0,value=0
+                                return(0)
+                        endif
+                                
+                        String ciStr = CsrInfo(A , topGraph)
+                        
+                        ControlInfo/W=wrapperpanel popup_0
+                        String folderStr=S_Value
+                        String traceList = TraceNameList(topGraph, ";", 1 )             
+                
                         Variable checked = cba.checked
+                        
                         if(checked)
                                 //print "add the cursors to the topmost graph, if the data set is there, or move them"

sans/Dev/trunk/NCNR_User_Procedures/SANS/Analysis/Models/PlotUtilsMacro_v40.ipf

@@ -141 +141 @@
                                         SetDataFolder root:
                                         KillWaves $n0,$n1,$n2,$n3,$n4,$n5               // kill the default waveX that were loaded
-                                        //if(DataFolderExists("root:Packages:NIST"))
-                                        //      String/G root:Packages:NIST:gLastFileName = filename
-                                        //endif         //set the last file loaded to the one NOT loaded
+                                        if(DataFolderExists("root:Packages:NIST"))
+                                                String/G root:Packages:NIST:gLastFileName = filename
+                                        endif           //set the last file loaded to the one NOT loaded
                                         return          //quits the macro
                                 endif