Changeset 601

Timestamp:

Nov 23, 2009 10:14:41 PM (13 years ago)

Author:

ajj

Message:

• Added global variable and preference to set output format as XML

Location:

sans/Dev/trunk/NCNR_User_Procedures

Files:

• Common/NIST_XML_v40.ipf (modified) (1 diff)
• Reduction/SANS/Initialize.ipf (modified) (1 diff)
• Reduction/SANS/ProtocolAsPanel.ipf (modified) (2 diffs)
• Reduction/SANS/SANSPreferences.ipf (modified) (3 diffs)

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

@@ -702 +702 @@
 // root:myGlobals:Protocols:gProtoStr is the name of the currently active protocol
 //
+//AJJ Nov 2009 : This version of the function currently only works for Circular, Sector and Rectangular averages
+//i.e. anything that produces I vs Q. Need to add ability to handle Annular (I vs theta) but that requires namespace addition to XML format
+//and handling on load.
 Function WriteXMLWaves_W_Protocol(type,fullpath,dialog)
         String type,fullpath

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

@@ -117 +117 @@
         //set XML globals
         String/G root:Packages:NIST:gXMLLoader_Title = ""
+        Variable/G root:Packages:NIST:gXML_Write = 0
 
         

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

@@ -1467 +1467 @@
         pathStr=S_path
         
+        NVAR useXMLOutput = root:Packages:NIST:gXML_Write
         
         //Parse the instructions in the prot wave
@@ -1917 +1918 @@
                                 break
                         default:
-                                WriteWaves_W_Protocol(activeType,fullpath,dialog)
-                                //WriteXMLWaves_W_Protocol(activeType,fullpath,dialog)
+                                if (useXMLOutput == 1)
+                                        WriteXMLWaves_W_Protocol(activeType,fullPath,dialog)
+                                else
+                                        WriteWaves_W_Protocol(activeType,fullpath,dialog)
+                                endif
                 endswitch
                 

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

@@ -54 +54 @@
 End
 
+Function XMLWritePref(ctrlName,checked) : CheckBoxControl
+        String ctrlName
+        Variable checked
+        
+        NVAR gVal = root:Packages:NIST:gXML_Write
+        gVal = checked
+End
+
 Function PrefDoneButtonProc(ctrlName) : ButtonControl
         String ctrlName
@@ -81 +89 @@
         SetVariable setvar1,pos={10,105},size={200,15},title="# Phi Steps (annular avg)"
         SetVariable setvar1,limits={1,360,1},value= root:myGlobals:gNPhiSteps
+        CheckBox check3,pos={10,130},size={184,14},proc=XMLWritePref,title="Use canSAS XML Output"
+        CheckBox check3,help={"Checking this will set the default output format to be canSAS XML rather than NIST 6 column"}
+        CheckBox check3,value=root:Packages:NIST:gXML_Write
         //keep these hidden for now so that nobody can accidentally change them from
         //the default values set in Initialize.ipf (128x128)
@@ -89 +100 @@
 
 End
-