Changeset 696

Timestamp:

Apr 16, 2010 8:58:45 AM (12 years ago)

Author:

srkline

Message:

The pink average panel now saves in XML as set by preferences.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/AvgGraphics.ipf (modified) (3 diffs)

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

@@ -69 +69 @@
         // average the currently displayed data
         SVAR type=root:myGlobals:gDataDisplayType
-        
+        NVAR useXMLOutput = root:Packages:NIST:gXML_Write
+
         //Check for logscale data in "type" folder
         String dest = "root:Packages:NIST:"+type
@@ -125 +126 @@
                 case "Rectangular":             
                         RectangularAverageTo1D(type)
-                        If(doSave)
-                                //save the file, acting on the currently displayed file
-                                WriteWaves_W_Protocol(type,"",1)                //"" is an empty path, 1 will force a dialog
+                        If(doSave)                                      //save the file, acting on the currently displayed file
+                                if (useXMLOutput == 1)
+                                        WriteXMLWaves_W_Protocol(type,"",1)
+                                else
+                                        WriteWaves_W_Protocol(type,"",1)                //"" is an empty path, 1 will force a dialog
+                                endif
                         Endif
                         break                                   
                 case "Annular":         
                         AnnularAverageTo1D(type)
-                        If(doSave)
+                        If(doSave)              // XML here yet
                                 //save the file, acting on the currently displayed file
                                 WritePhiave_W_Protocol(type,"",1)               //"" is an empty path, 1 will force a dialog
@@ -142 +146 @@
                         CircularAverageTo1D(type)               //graph is drawn here
                         If(doSave)
-                                //save the file, acting on the currently displayed file
-                                WriteWaves_W_Protocol(type,"",1)                //"" is an empty path, 1 will force a dialog
+                                if (useXMLOutput == 1)
+                                        WriteXMLWaves_W_Protocol(type,"",1)
+                                else
+                                        WriteWaves_W_Protocol(type,"",1)                //"" is an empty path, 1 will force a dialog
+                                endif
                         Endif
                         break