Changeset 738

Timestamp:

Sep 14, 2010 1:22:53 PM (12 years ago)

Author:

srkline

Message:

ticket #290: now the Combine Table automatically lists the data files on startup, no need to click the button unless more files have been written. Also, the user is asked if they wish to clear the table or not (maybe the terminology of which table needs to be more clear?), either clearing the table, or retaining what had been filled in previously. The button has the same behavior.

File:

• sans/Dev/trunk/NCNR_User_Procedures/Reduction/SANS/NSORT.ipf (modified) (8 diffs)

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

@@ -1460 +1460 @@
         popNum = WhichListItem(absStr,lowQPopStr,";",0)
         if(popNum == -1)
-                Abort "Could not find file: " + absStr +" aborting..."
+                Abort "Could not find file: " + absStr +" aborting...  Be sure that your output format is the same as the input"
         endif
         popNum += 1             // add 1 to get the item number
@@ -1469 +1469 @@
         popNum = WhichListItem(absStr,medHiQPopStr,";",0)
         if(popNum == -1)
-                Abort "Could not find file: "+absStr+" aborting..."
+                Abort "Could not find file: "+absStr+" aborting...  Be sure that your output format is the same as the input"
         endif
         popNum += 1             // add 1 to get the item number
@@ -1480 +1480 @@
                 popNum = WhichListItem(absStr,medHiQPopStr,";",0)
                 if(popNum == -1)
-                        Abort "Could not find file: "+absStr+" aborting..."
+                        Abort "Could not find file: "+absStr+" aborting...  Be sure that your output format is the same as the input"
                 endif
                 popNum += 1             // add 1 to get the item number
@@ -1565 +1565 @@
         RemoveTransFilesFromCombine()
 //
-// make the waves and table for the sets to combine
-        Make/O/N=0 $"root:myGlobals:CombineTable:LowRun"
-        Make/O/N=0 $"root:myGlobals:CombineTable:MediumRun"
-        Make/O/N=0 $"root:myGlobals:CombineTable:HighRun"
-        Make/O/T/N=0 $"root:myGlobals:CombineTable:Prefix"
-        Make/O/T/N=0 $"root:myGlobals:CombineTable:SaveName"
-        
-        SetDataFolder root:myGlobals:CombineTable
-        
-        // make the second table
-        AppendToTable/W=CombinePanel#RunNumbersToCombine LowRun,MediumRun,HighRun,Prefix,SaveName
-
         SetDataFolder root:
+        
+        Killwaves/Z notRAWlist
 End
 
@@ -1843 +1833 @@
         saveName[num] = saveStr 
 
+        KillWaves/Z tmpLbl,tmpRun,tmpSDD
         return(0)
 end
@@ -1855 +1846 @@
         if(V_flag==0)
                 CombinePanel()
+                CreateTableToCombine("")
+                DoAlert 1,"Do you want to clear the list of runs and file names to combine?"
+                TableToCombineAndSave(V_flag==1)                // clear and initialize, if desired
         endif
 end
@@ -1867 +1861 @@
         Button button0_2,pos={509,40},size={60,20},proc=CombinePanelDone,title="Done"
         Button button0_3,pos={522,14},size={30,20},proc=ShowCombineHelp,title="?"
+        Button button0_4,pos={500,220},size={120,20},proc=ClearCombineTable,title="Clear Table?"
         Edit/W=(20,54,368,249)/HOST=# 
         ModifyTable format=1,width=0
@@ -1892 +1887 @@
         return(0)
 end
+
+Function ClearCombineTable(ctrlName)
+        String ctrlName
+        
+        DoAlert 1,"Do you want to clear the list of runs and file names to combine?"
+        TableToCombineAndSave(V_flag==1)                // clear and initialize, if desired
+        return(0)
+end
+
+Function TableToCombineAndSave(clear)
+        Variable clear
+        
+        if(clear)
+                // make the waves and table for the sets to combine
+                Make/O/N=0 $"root:myGlobals:CombineTable:LowRun"
+                Make/O/N=0 $"root:myGlobals:CombineTable:MediumRun"
+                Make/O/N=0 $"root:myGlobals:CombineTable:HighRun"
+                Make/O/T/N=0 $"root:myGlobals:CombineTable:Prefix"
+                Make/O/T/N=0 $"root:myGlobals:CombineTable:SaveName"
+        endif
+        SetDataFolder root:myGlobals:CombineTable
+        
+        // make the second table
+        AppendToTable/W=CombinePanel#RunNumbersToCombine LowRun,MediumRun,HighRun,Prefix,SaveName
+        
+        SetDataFolder root:
+End