- SMDS_ElemIteratorPtr interlacedNodesElemIterator() const;

diff --git a/src/SMDS/SMDS_QuadraticEdge.cxx b/src/SMDS/SMDS_QuadraticEdge.cxx
index caf28eff8cddb0de278ecbe28192dc90edc624a1..b0f60c13e1b86f2bb8b17e849992d4e3b65521b0 100644 (file)
--- a/src/SMDS/SMDS_QuadraticEdge.cxx
+++ b/src/SMDS/SMDS_QuadraticEdge.cxx
@@ -116,21 +116,6 @@ namespace
     }
   };
 
     }
   };
 

-  //=======================================================================
-  //class : _MyInterlacedNodeElemIterator
-  //purpose  : 
-  //=======================================================================
-
-  class _MyInterlacedNodeElemIterator : public SMDS_ElemIterator
-  {
-    SMDS_NodeIteratorPtr myItr;
-  public:
-    _MyInterlacedNodeElemIterator(SMDS_NodeIteratorPtr interlacedNodeItr):
-      myItr( interlacedNodeItr ) {}
-    bool more()                    { return myItr->more(); }
-    const SMDS_MeshElement* next() { return myItr->next(); }
-  };
-

   //=======================================================================
   //class : _MyNodeIterator
   //purpose  : 
   //=======================================================================
   //class : _MyNodeIterator
   //purpose  : 


@@ -154,18 +139,6 @@ SMDS_NodeIteratorPtr SMDS_QuadraticEdge::interlacedNodesIterator() const
   return SMDS_NodeIteratorPtr (new _MyInterlacedNodeIterator (myNodes));
 }
 
   return SMDS_NodeIteratorPtr (new _MyInterlacedNodeIterator (myNodes));
 }
 

-
-//=======================================================================
-//function : interlacedNodesElemIterator
-//purpose  : 
-//=======================================================================
-
-SMDS_ElemIteratorPtr SMDS_QuadraticEdge::interlacedNodesElemIterator() const
-{
-  return SMDS_ElemIteratorPtr
-    (new _MyInterlacedNodeElemIterator ( interlacedNodesIterator() ));
-}
-

 //=======================================================================
 //function : elementsIterator
 //purpose  : 
 //=======================================================================
 //function : elementsIterator
 //purpose  : 

diff --git a/src/SMDS/SMDS_QuadraticEdge.hxx b/src/SMDS/SMDS_QuadraticEdge.hxx
index d6acab105acd7927d4883d14c61d8ad09a130e29..cdabd8f34f72dfe556f6c45e7aa6462393089b38 100644 (file)
--- a/src/SMDS/SMDS_QuadraticEdge.hxx
+++ b/src/SMDS/SMDS_QuadraticEdge.hxx
@@ -56,8 +56,6 @@ public:
 
   SMDS_NodeIteratorPtr interlacedNodesIterator() const;
 
 
   SMDS_NodeIteratorPtr interlacedNodesIterator() const;
 

-  SMDS_ElemIteratorPtr interlacedNodesElemIterator() const;
-

 protected:
   SMDS_ElemIteratorPtr
   elementsIterator(SMDSAbs_ElementType type) const;
 protected:
   SMDS_ElemIteratorPtr
   elementsIterator(SMDSAbs_ElementType type) const;

diff --git a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx
index 43093dafb2e29cbd1a543263535ba0e1421d7144..de4dbb47427c479675657e4ad0c61dae0a0ddbe2 100644 (file)
--- a/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx
+++ b/src/SMDS/SMDS_QuadraticFaceOfNodes.cxx
@@ -192,21 +192,6 @@ namespace {
     }
   };
 
     }
   };
 

-  //=======================================================================
-  //class : _MyInterlacedNodeElemIterator
-  //purpose  : 
-  //=======================================================================
-
-  class _MyInterlacedNodeElemIterator : public SMDS_ElemIterator
-  {
-    SMDS_NodeIteratorPtr myItr;
-  public:
-    _MyInterlacedNodeElemIterator(SMDS_NodeIteratorPtr interlacedNodeItr):
-      myItr( interlacedNodeItr ) {}
-    bool more()                    { return myItr->more(); }
-    const SMDS_MeshElement* next() { return myItr->next(); }
-  };
-

   //=======================================================================
   //class : _MyNodeIterator
   //purpose  : 
   //=======================================================================
   //class : _MyNodeIterator
   //purpose  : 


@@ -234,16 +219,6 @@ SMDS_NodeIteratorPtr SMDS_QuadraticFaceOfNodes::interlacedNodesIterator() const
     (new _MyInterlacedNodeIterator (myNodes, myNodes.size()==6 ? triaInterlace : quadInterlace));
 }
 
     (new _MyInterlacedNodeIterator (myNodes, myNodes.size()==6 ? triaInterlace : quadInterlace));
 }
 

-//=======================================================================
-//function : interlacedNodesElemIterator
-//purpose  : 
-//=======================================================================
-
-SMDS_ElemIteratorPtr SMDS_QuadraticFaceOfNodes::interlacedNodesElemIterator() const
-{
-  return SMDS_ElemIteratorPtr
-    (new _MyInterlacedNodeElemIterator ( interlacedNodesIterator() ));
-}

 /// ===================================================================
 /*!
  * \brief Iterator on edges of face
 /// ===================================================================
 /*!
  * \brief Iterator on edges of face


@@ -257,10 +232,10 @@ class _MyEdgeIterator : public SMDS_ElemIterator
 public:
   _MyEdgeIterator(const SMDS_QuadraticFaceOfNodes* face):myIndex(0) {
     myElems.reserve( face->NbNodes() );
 public:
   _MyEdgeIterator(const SMDS_QuadraticFaceOfNodes* face):myIndex(0) {
     myElems.reserve( face->NbNodes() );

-    SMDS_ElemIteratorPtr nIt = face->interlacedNodesElemIterator();
+    SMDS_NodeIteratorPtr nIt = face->interlacedNodesIterator();

     const SMDS_MeshNode* n0 = face->GetNodeWrap( -1 );
     while ( nIt->more() ) {
     const SMDS_MeshNode* n0 = face->GetNodeWrap( -1 );
     while ( nIt->more() ) {

-      const SMDS_MeshNode* n1 = static_cast<const SMDS_MeshNode*>( nIt->next() );
+      const SMDS_MeshNode* n1 = nIt->next();

       const SMDS_MeshElement* edge = SMDS_Mesh::FindEdge( n0, n1 );
       if ( edge )
         myElems.push_back( edge );
       const SMDS_MeshElement* edge = SMDS_Mesh::FindEdge( n0, n1 );
       if ( edge )
         myElems.push_back( edge );

diff --git a/src/SMDS/SMDS_QuadraticFaceOfNodes.hxx b/src/SMDS/SMDS_QuadraticFaceOfNodes.hxx
index e1829cd1f2378380a8af2be24a9d5374331031f3..e56a3ab992756304e2509e11b33455b35c069dd0 100644 (file)
--- a/src/SMDS/SMDS_QuadraticFaceOfNodes.hxx
+++ b/src/SMDS/SMDS_QuadraticFaceOfNodes.hxx
@@ -66,8 +66,6 @@ public:
 
   SMDS_NodeIteratorPtr interlacedNodesIterator() const;
 
 
   SMDS_NodeIteratorPtr interlacedNodesIterator() const;
 

-  SMDS_ElemIteratorPtr interlacedNodesElemIterator() const;
-

   /*!
    * \brief Return node by its index
     * \param ind - node index
   /*!
    * \brief Return node by its index
     * \param ind - node index