Changeset 601


Ignore:
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:
4 edited

Legend:

Unmodified
Added
Removed
  • sans/Dev/trunk/NCNR_User_Procedures/Common/NIST_XML_v40.ipf

    r570 r601  
    702702// root:myGlobals:Protocols:gProtoStr is the name of the currently active protocol 
    703703// 
     704//AJJ Nov 2009 : This version of the function currently only works for Circular, Sector and Rectangular averages 
     705//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 
     706//and handling on load. 
    704707Function WriteXMLWaves_W_Protocol(type,fullpath,dialog) 
    705708        String type,fullpath 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/Initialize.ipf

    r570 r601  
    117117        //set XML globals 
    118118        String/G root:Packages:NIST:gXMLLoader_Title = "" 
     119        Variable/G root:Packages:NIST:gXML_Write = 0 
    119120 
    120121         
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/ProtocolAsPanel.ipf

    r588 r601  
    14671467        pathStr=S_path 
    14681468         
     1469        NVAR useXMLOutput = root:Packages:NIST:gXML_Write 
    14691470         
    14701471        //Parse the instructions in the prot wave 
     
    19171918                                break 
    19181919                        default: 
    1919                                 WriteWaves_W_Protocol(activeType,fullpath,dialog) 
    1920                                 //WriteXMLWaves_W_Protocol(activeType,fullpath,dialog) 
     1920                                if (useXMLOutput == 1) 
     1921                                        WriteXMLWaves_W_Protocol(activeType,fullPath,dialog) 
     1922                                else 
     1923                                        WriteWaves_W_Protocol(activeType,fullpath,dialog) 
     1924                                endif 
    19211925                endswitch 
    19221926                 
  • sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/SANSPreferences.ipf

    r570 r601  
    5454End 
    5555 
     56Function XMLWritePref(ctrlName,checked) : CheckBoxControl 
     57        String ctrlName 
     58        Variable checked 
     59         
     60        NVAR gVal = root:Packages:NIST:gXML_Write 
     61        gVal = checked 
     62End 
     63 
    5664Function PrefDoneButtonProc(ctrlName) : ButtonControl 
    5765        String ctrlName 
     
    8189        SetVariable setvar1,pos={10,105},size={200,15},title="# Phi Steps (annular avg)" 
    8290        SetVariable setvar1,limits={1,360,1},value= root:myGlobals:gNPhiSteps 
     91        CheckBox check3,pos={10,130},size={184,14},proc=XMLWritePref,title="Use canSAS XML Output" 
     92        CheckBox check3,help={"Checking this will set the default output format to be canSAS XML rather than NIST 6 column"} 
     93        CheckBox check3,value=root:Packages:NIST:gXML_Write 
    8394        //keep these hidden for now so that nobody can accidentally change them from 
    8495        //the default values set in Initialize.ipf (128x128) 
     
    89100 
    90101End 
    91  
Note: See TracChangeset for help on using the changeset viewer.