Remove redundant code

[modules/geom.git] / src / OCC2VTK / GEOM_EdgeSource.h

diff --git a/src/OCC2VTK/GEOM_EdgeSource.h b/src/OCC2VTK/GEOM_EdgeSource.h
index da64b0a5223111b692417666d218474da4ba0565..23433fb509fcffea5bbaa262d88274eddfab6b3e 100755 (executable)
--- a/src/OCC2VTK/GEOM_EdgeSource.h
+++ b/src/OCC2VTK/GEOM_EdgeSource.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -23,26 +23,26 @@
 #include "OCC2VTK.h" 
  
 #include <TopoDS_Edge.hxx> 
+#include <TopTools_ShapeMapHasher.hxx>
+#include <NCollection_Map.hxx> 
+ 
+typedef NCollection_Map<TopoDS_Edge, TopTools_ShapeMapHasher> TEdgeSet; 
  
 #include <vtkPoints.h> 
 #include <vtkPolyDataAlgorithm.h> 
 
 class vtkPolyData;
-class EdgeSourceInternal;
 
 class OCC2VTK_EXPORT GEOM_EdgeSource: public vtkPolyDataAlgorithm 
 { 
 public: 
-  vtkTypeMacro(GEOM_EdgeSource, vtkPolyDataAlgorithm); 
-
+  vtkTypeMacro(GEOM_EdgeSource,vtkPolyDataAlgorithm); 
   static GEOM_EdgeSource* New(); 
  
   void AddEdge (const TopoDS_Edge& theEdge,
                 bool theIsVector = false);
-  void Clear();
+  void Clear(){ myEdgeSet.Clear();}
   
-  bool IsEmpty();
-
   void SetVectorMode(bool);
 
   bool GetVectorMode();
@@ -52,14 +52,17 @@ public:
                vtkPolyData* thePolyData, 
                vtkPoints* thePts,
                bool theIsVector = false); 
+
+  bool IsEmpty(){return myEdgeSet.IsEmpty();}
+
  
 protected: 
-  EdgeSourceInternal* myData;
+  TEdgeSet myEdgeSet;
   // The <myIsVector> flag is common for all edges, because the shape,
   // representing a vector, can have only one edge.
   bool myIsVector, myIsVectorMode;
  
-  virtual int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*);
+  virtual int RequestData(vtkInformation *, vtkInformationVector **, vtkInformationVector *);
  
   GEOM_EdgeSource(); 
   ~GEOM_EdgeSource(); 
@@ -70,4 +73,5 @@ private:
   void operator=(const GEOM_EdgeSource&); 
 }; 
  
+ 
 #endif //GEOM_EDGESOURCE_H