Changeset 732 for sans/Dev/trunk/NCNR_User_Procedures

Timestamp:

Sep 10, 2010 5:50:17 PM (13 years ago)

Author:

srkline

Message:

some changes to the XML and the DataSetHandling? to get closer to a functional batch conversion panel. Functionality is mmostly there with these changes. Still to be done is to verify that all of the proper information is being re-written to the converted files.

Location:

sans/Dev/trunk/NCNR_User_Procedures/Common

Files:

• DataSetHandling.ipf (modified) (9 diffs)
• NIST_XML_v40.ipf (modified) (4 diffs)

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

@@ -363 +363 @@
         Make/O/T/N=1 filewave=""
         Make/O/N=1 selWave=0
-        Variable/G ind=0
+        Variable/G ind=0,gRadioVal=1
         SetDataFolder root:
 End
@@ -370 +370 @@
         PauseUpdate; Silent 1           // building window...
         NewPanel /W=(658,347,1018,737)/N=NCNRBatchConvertPanel/K=2 as "Batch Convert 1D Data"
+//      NewPanel /W=(658,347,1018,737)/N=NCNRBatchConvertPanel as "Batch Convert 1D Data"
         ModifyPanel cbRGB=(40000,50000,32896)
         ModifyPanel fixedSize=1
@@ -383 +384 @@
         
         GroupBox filterGroup,pos={13,200},size={206,60},title="Filter list by input file type"
+        CheckBox filterCheck_1,pos={24,220},size={36,14},title="XML",value= 1,mode=1, proc=BC_filterCheckProc
+        CheckBox filterCheck_2,pos={24,239},size={69,14},title="ABS or AVE",value= 0,mode=1, proc=BC_filterCheckProc
+        CheckBox filterCheck_3,pos={100,220},size={69,14},title="none",value= 0,mode=1, proc=BC_filterCheckProc
         
         Button button8,pos={238,76},size={100,20},proc=NCNRBatchConvertHelpProc,title="Help"
@@ -389 +393 @@
 
         GroupBox outputGroup,pos={13,270},size={206,60},title="Output File Type"
-
+        CheckBox outputCheck_1,pos={24,289},size={36,14},title="XML",value= 0,mode=1, proc=BC_outputCheckProc
+        CheckBox outputCheck_2,pos={24,309},size={69,14},title="ABS or AVE",value= 1,mode=1, proc=BC_outputCheckProc
         
         Button button6,pos={13,350},size={206,20},proc=NCNRBatchConvertFiles,title="Convert File(s)"
@@ -398 +403 @@
 End
 
+Function BC_filterCheckProc(ctrlName,checked) : CheckBoxControl
+        String ctrlName
+        Variable checked
+
+        NVAR gRadioVal= root:Packages:NIST:BatchConvert:gRadioVal
+        
+        strswitch (ctrlName)
+                case "filterCheck_1":
+                        gRadioVal= 1
+                        break
+                case "filterCheck_2":
+                        gRadioVal= 2
+                        break
+                case "filterCheck_3":
+                        gRadioVal= 3
+                        break
+        endswitch
+        CheckBox filterCheck_1,value= gRadioVal==1
+        CheckBox filterCheck_2,value= gRadioVal==2
+        CheckBox filterCheck_3,value= gRadioVal==3
+        
+        NCNRBatchConvertGetList()
+         
+        return(0)
+End
+
+Function BC_outputCheckProc(ctrlName,checked) : CheckBoxControl
+        String ctrlName
+        Variable checked
+
+        if(cmpstr("outputCheck_1",ctrlName)==0)
+                CheckBox outputCheck_1,value=checked
+                CheckBox outputCheck_2,value=!checked
+        else
+                CheckBox outputCheck_1,value=!checked
+                CheckBox outputCheck_2,value=checked
+        endif
+        
+        return(0)
+End
 
 Function NCNRBatchConvertFiles(ba) : ButtonControl
                 STRUCT WMButtonAction &ba
                 
+                
                 switch (ba.eventCode)
                         case 2:
+                        
+                                //check the input/output as best I can (none may be the input filter)
+                                Variable inputType,outputType=1
+                                NVAR gRadioVal= root:Packages:NIST:BatchConvert:gRadioVal
+                                inputType = gRadioVal
+                                ControlInfo outputCheck_1
+                                if(V_value==1)
+                                        outputType = 1          //xml
+                                else
+                                        outputType = 2          //6-col
+                                endif
+                                
+                                if(inputType==outputType)
+                                        DoAlert 0,"Input and output types are the same. Nothing will be converted"
+                                        return(0)
+                                endif
+                        
+                        
+                                        // input and output are different, proceed
+
                                 Wave/T fileWave=$"root:Packages:NIST:BatchConvert:fileWave"
-                                Wave sel=$"root:BatchConvert:NIST:BatchConvert:selWave"
+                                Wave sel=$"root:Packages:NIST:BatchConvert:selWave"
+                                
+                                String fname="",pathStr="",newFileName=""
+                                Variable ii,num
+                                PathInfo catPathName                    //this is where the files are
+                                pathStr=S_path
+                                                        
+                                // process the selected items
+                                num=numpnts(sel)
+                                ii=0
+                                do
+                                        if(sel[ii] == 1)
+                                                fname=pathStr + fileWave[ii]
+                                                
+                                                if(outputType == 1)
+                                                        convertNISTtoNISTXML(fname)
+                                                endif
+                                                
+                                                if(outputType == 2)
+                                                        convertNISTXMLtoNIST6Col(fname)
+                                                endif
+                                        endif
+                                        ii+=1
+                                while(ii<num)
                                 
                                 break
@@ -426 +515 @@
 End
 
+
+// filter is a bit harsh - will need to soften this by presenting an option to enter the suffix
+//
 Function NCNRBatchConvertGetList()
 
@@ -434 +526 @@
         Endif
         
-        String newList = A_ReducedDataFileList("")
+        String newList = A_ReducedDataFileList(""),tmpList=""
         Variable num
+        
+        NVAR gRadioVal= root:Packages:NIST:BatchConvert:gRadioVal
+        ControlInfo filterCheck_1
+        if(gRadioVal == 1)
+                //keep XML data
+                tmpList = ListMatch(newList, "*.ABSx" ,";")
+                tmpList += ListMatch(newList, "*.AVEx" ,";")
+                tmpList += ListMatch(newList, "*.xml" ,";")
+        else
+                if(gRadioVal ==2)
+                        //keep ave, abs data
+                        tmpList = ListMatch(newList, "*.ABS" ,";")
+                        tmpList += ListMatch(newList, "*.AVE" ,";")
+                else
+                        //return everything
+                        tmpList = newList
+                endif
+        endif
+        newList = tmpList
         
         num=ItemsInList(newlist,";")
@@ -444 +555 @@
         fileWave = StringFromList(p,newlist,";")
         Sort filewave,filewave
+        
+        return 0
 End
 
@@ -1551 +1664 @@
 
 
+
+// still need to get the header information, and possibly the SASprocessnote from the XML load into the 6-column header
+//
+// start by looking in: 
+//      String xmlReaderFolder = "root:Packages:CS_XMLreader:"
+// for Title and Title_folder strings -> then the metadata (but the processnote is still not there
+//
+// may need to get it directly using the filename
+Function  convertNISTXMLtoNIST6Col(fname)
+        String fname
+
+        String list, item,path
+        Variable num,ii
+        
+        //load the XML
+        
+        LoadNISTXMLData(fname,"",0,0)           //no plot, no force overwrite
+//      Execute "A_LoadOneDDataWithName(\""+fname+"\",0)"               //won't plot
+
+        // then rewrite what is in the data folder that was just loaded
+        String basestr = ParseFilePath(0, fname, ":", 1, 0)
+        baseStr = CleanupName(baseStr,0)
+        print fname
+        print basestr
+
+        fReWrite1DData_noPrompt(baseStr,"tab","CR")
+
+        return(0)
+End
+
+
 ///////// SRK - VERY SIMPLE batch converter
 // no header information is preserved

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

@@ -565 +565 @@
 end
 
+//
+// !!! nf.Sample_ID is not set correctly here, since it's not read in from the NIST 6-col data file
+// and SASprocessnote does not get set either!
+//
 Function convertNISTtoNISTXML(fileStr)
         String fileStr
@@ -639 +643 @@
                         
                 endif
-                
-                //Tidy up
-                Variable i = 0
-                do
-                        WAVE/Z wv= $(StringFromList(i,S_waveNames,";"))
-                        if( WaveExists(wv) == 0 )
-                                break
-                        endif
-                        KillWaves wv
-                        i += 1
-                while (1)       // exit is via break statement
-
         
         endif   //6-col data
@@ -666 +658 @@
 
         writeNISTXML(outfileName, nf)
+
+        //Tidy up AFTER we're all done, since STRUCT points to wave0,wave1, etc.
+        Variable i = 0
+        do
+                WAVE/Z wv= $(StringFromList(i,S_waveNames,";"))
+                if( WaveExists(wv) == 0 )
+                        break
+                endif
+                KillWaves wv
+                i += 1
+        while (1)       // exit is via break statement
 
 end
@@ -695 +698 @@
                 if (stringmatch(buffer,"*FIRST File LABEL:*") == 1)
                         NISTfile.title = TrimWS(StringFromList(1,buffer, ":"))
-                elseif(stringmatch(buffer,"*LABEL:*") == 1)
+                endif
+                if(stringmatch(buffer,"*LABEL:*") == 1)
                         NISTfile.title = TrimWS(StringFromList(1,buffer, ":"))
+                endif
+                if(stringmatch(buffer,"NSORT*") == 1)
+                        NISTfile.title = buffer
                 endif