Changeset 420

Timestamp:

10/07/08 14:26:40 (5 years ago)

Author:

ajj

Message:

PlotManager? fixes for common use

Location:

sans/Dev/trunk

Files:

• NCNR_SANS_Utilities/SANS_Reduction_v5.2.pxt (modified) (previous)
• NCNR_User_Procedures/Common/NIST_XML_v40.ipf (modified) (1 diff)
• NCNR_User_Procedures/Common/Packages/PlotManager/PlotManager_v40.ipf (modified) (2 diffs)
• NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf (modified) (1 diff)
• NCNR_User_Procedures/Reduction/SANS/Includes_v520.ipf (modified) (1 diff)

sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

@@ -160 +160 @@
 
         Wave/T meta = $mdstring
-        FindValue/TEXT="Title"/TXOP=4/Z meta
+        FindValue/TEXT="Run"/TXOP=4/Z meta
 
         String title = meta[V_Value][1]

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotManager_v40.ipf

@@ -193 +193 @@
         KillVariables/A                 //removes the dependent variables
         SetDataFolder savDF
-        
+                
         //now kill the data folder
         KillDataFolder/Z $DF
@@ -293 +293 @@
                 ii+=1
         while(ii<num)
+
+        ControlUpdate/W=Plot_Manager popup0
 
         return(0)

sans/Dev/trunk/NCNR_User_Procedures/Common/Packages/PlotManager/PlotUtilsMacro_v40.ipf

@@ -95 +95 @@
                 //if no path or file is specified for LoadWave, the default Mac open dialog will appear
                 LoadWave/G/D/A/Q fileStr
-                //String fileName = S_fileName
-                String basestr = ParseFilePath(3,ParseFilePath(5,S_Path,":",0,0),":",0,0)
+                String fileNamePath = S_Path+S_fileName
+                String basestr = ParseFilePath(3,ParseFilePath(5,fileNamePath,":",0,0),":",0,0)
+                print "basestr :"+basestr
                 String fileName =  ParseFilePath(0,ParseFilePath(5,filestr,":",0,0),":",1,0)
+                print "filename :"+filename
                 Variable numCols = V_flag
                 

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

@@ -31 +31 @@
 #include "NIST_XML_v40"
 #include "USANS_SlitSmearing_v40"
+#include "GaussUtils_v40" // for isSANSResolution - could put this function elsewhere
 //
 #include "ProDiv"                               version>=5.0