[Nsclspectcl-cvscommits] SpecTcl/SpecTcl FilterCommand.cpp,1.10,1.11

[<ro...@us...>]

Update of /cvsroot/nsclspectcl/SpecTcl/SpecTcl
In directory sc8-pr-cvs1:/tmp/cvs-serv7476

Modified Files:
	FilterCommand.cpp 
Log Message:
1. Added doxygen comments.
2. Create: Parmeter list stored by filter should
    be names not numbers.
3. Simplify the entire logic of creating a filter
4. Replace return TCL_OK with assert(0) in 
    branches of code that should not be 
    reachable.
5. Factored ListFilter into one by name and one
    given a pointer to a filter to destroy 
    duplicate code.

Index: FilterCommand.cpp
===================================================================
RCS file: /cvsroot/nsclspectcl/SpecTcl/SpecTcl/FilterCommand.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FilterCommand.cpp	28 Aug 2003 18:32:33 -0000	1.10
--- FilterCommand.cpp	16 Sep 2003 12:06:13 -0000	1.11
***************
*** 281,284 ****
--- 281,296 ----
  
    $Log$
+   Revision 1.11  2003/09/16 12:06:13  ron-fox
+   1. Added doxygen comments.
+   2. Create: Parmeter list stored by filter should
+       be names not numbers.
+   3. Simplify the entire logic of creating a filter
+   4. Replace return TCL_OK with assert(0) in
+       branches of code that should not be
+       reachable.
+   5. Factored ListFilter into one by name and one
+       given a pointer to a filter to destroy
+       duplicate code.
+ 
    Revision 1.10  2003/08/28 18:32:33  ron-fox
    - Use rInterp.TildeSubst to do tilde substitution
***************
*** 517,521 ****
    StringArray Description; 
    vector<string> Parameters; 
-   vector<UInt_t> ParameterIds;
  
    if(ParameterList.Split(Description) != TCL_OK) { // Bust the list apart.
--- 529,532 ----
***************
*** 548,554 ****
  	CParameter* pParameter = 
  	  ((CHistogrammer*)gpEventSink)->FindParameter(Parameters[i]);
! 	if(pParameter != (CParameter*)kpNULL) { 
! 	  ParameterIds.push_back(pParameter->getNumber());
! 	} else {
  	  rResult += "Error: Invalid parameter (" + Parameters[i] + ").";
  	  return TCL_ERROR; 
--- 559,563 ----
  	CParameter* pParameter = 
  	  ((CHistogrammer*)gpEventSink)->FindParameter(Parameters[i]);
! 	if(pParameter == (CParameter*)kpNULL) { 
  	  rResult += "Error: Invalid parameter (" + Parameters[i] + ").";
  	  return TCL_ERROR; 
***************
*** 561,565 ****
        pGatedEventFilter->setGateContainer(*pGateContainer);
        pGatedEventFilter->setParameterNames(Parameters); 
-       pGatedEventFilter->setParameterIds(ParameterIds); 
        pFilterDictionary->Enter(pFilterName, pGatedEventFilter);
  
--- 570,573 ----