new organization or dependency

include/DS2DSF.hh

@@ -29,6 +29,7 @@ public:
   vlDataSetToDataSetFilter();
   ~vlDataSetToDataSetFilter();
   char *GetClassName() {return "vlDataSetToDataSetFilter";};
+  char *GetDataType() {return this->DataSet->GetDataType();};
   void PrintSelf(ostream& os, vlIndent indent);
 
   // dataset interface
@@ -47,7 +48,6 @@ public:
     {return this->DataSet->FindCell(x,cell,tol2,subId,pc);};
 
   void ComputeBounds() {this->DataSet->ComputeBounds();};
-  vlMapper *MakeMapper();
   void Update();
 
 protected:

include/MergeF.hh

@@ -30,6 +30,7 @@ public:
   vlMergeFilter();
   ~vlMergeFilter();
   char *GetClassName() {return "vlMergeFilter";};
+  char *GetDataType() {return this->Geometry->GetDataType();};
   void PrintSelf(ostream& os, vlIndent indent);
 
   // dataset interface
@@ -48,7 +49,6 @@ public:
     {return this->Geometry->FindCell(x,cell,tol2,subId,pc);};
 
   void ComputeBounds() {this->Geometry->ComputeBounds();};
-  vlMapper *MakeMapper();
 
   // Filter interface
   void Update();

include/PtS2PtSF.hh

@@ -31,6 +31,7 @@ public:
   vlPointSetToPointSetFilter();
   ~vlPointSetToPointSetFilter();
   char *GetClassName() {return "vlPointSetToPointSetFilter";};
+  char *GetDataType() {return this->PointSet->GetDataType();};
   void PrintSelf(ostream& os, vlIndent indent);
 
   // dataset interface
@@ -42,7 +43,6 @@ public:
   void Initialize();
 
   void ComputeBounds() {this->PointSet->ComputeBounds();};
-  vlMapper *MakeMapper();
   void Update();
 
 protected:

src/MergeF.cc

@@ -59,26 +59,6 @@ void vlMergeFilter::Initialize()
     }
 }
 
-vlMapper *vlMergeFilter::MakeMapper()
-{
-//
-// A little tricky because mappers must be of concrete type, but this class 
-// deals at abstract level of DataSet.  Depending upon Input member of this 
-// filter, mapper may change.  Hence need to anticipate change in Input and 
-// create new mappers as necessary.
-//
-  vlMapper *mapper;
-
-  mapper = this->Geometry->MakeMapper();
-  if ( !this->Mapper || mapper != this->Mapper )
-    {
-    if (this->Mapper) this->Mapper->UnRegister(this);
-    this->Mapper = mapper;
-    this->Mapper->Register(this);
-    }
-  return this->Mapper;
-}
-
 void vlMergeFilter::PrintSelf(ostream& os, vlIndent indent)
 {
   if (this->ShouldIPrint(vlMergeFilter::GetClassName()))

src/PtS2PtSF.cc

@@ -52,27 +52,6 @@ void vlPointSetToPointSetFilter::Initialize()
     }
 }
 
-vlMapper *vlPointSetToPointSetFilter::MakeMapper()
-{
-//
-// A little tricky because mappers must be of concrete type, but this class 
-// deals at abstract level of PointSet.  Depending upon Input member of this 
-// filter, mapper may change.  Hence need to anticipate change in Input and 
-// create new mappers as necessary.
-//
-  vlMapper *mapper;
-
-  vlPointSetToPointSetFilter::Update(); // compiler bug, had to hard code call
-  mapper = this->PointSet->MakeMapper();
-  if ( !this->Mapper || mapper != this->Mapper )
-    {
-    if (this->Mapper) this->Mapper->UnRegister(this);
-    this->Mapper = mapper;
-    this->Mapper->Register(this);
-    }
-  return this->Mapper;
-}
-
 void vlPointSetToPointSetFilter::PrintSelf(ostream& os, vlIndent indent)
 {
   if (this->ShouldIPrint(vlPointSetToPointSetFilter::GetClassName()))