This commit is contained in:
eap 2011-01-18 10:49:35 +00:00
parent 1876773996
commit cbe181b40c
6 changed files with 18 additions and 17 deletions

View File

@ -73,7 +73,8 @@ salomeinclude_HEADERS = \
SMDS_MeshInfo.hxx \ SMDS_MeshInfo.hxx \
SMDS_UnstructuredGrid.hxx \ SMDS_UnstructuredGrid.hxx \
SMDS_Downward.hxx \ SMDS_Downward.hxx \
SMDS_StdIterator.hxx SMDS_StdIterator.hxx \
SMDS_IteratorOnIterators.hxx
# Libraries targets # Libraries targets

View File

@ -2,7 +2,7 @@
SMDSAbs_ElementType SMDS_MeshEdge::GetType() const SMDSAbs_ElementType SMDS_MeshEdge::GetType() const
{ {
return SMDSAbs_Edge; return SMDSAbs_Edge;
} }
vtkIdType SMDS_MeshEdge::GetVtkType() const vtkIdType SMDS_MeshEdge::GetVtkType() const

View File

@ -33,7 +33,7 @@
class SMDS_EXPORT SMDS_MeshEdge:public SMDS_MeshCell class SMDS_EXPORT SMDS_MeshEdge:public SMDS_MeshCell
{ {
public: public:
SMDSAbs_ElementType GetType() const; SMDSAbs_ElementType GetType() const;
virtual vtkIdType GetVtkType() const; virtual vtkIdType GetVtkType() const;

View File

@ -91,24 +91,24 @@ void SMDS_MeshIDFactory::ReleaseID(int ID, int vtkId)
void SMDS_MeshIDFactory::Clear() void SMDS_MeshIDFactory::Clear()
{ {
myMaxID = 0; myMaxID = 0;
myPoolOfID.clear(); myPoolOfID.clear();
} }
void SMDS_MeshIDFactory::SetMesh(SMDS_Mesh *mesh) void SMDS_MeshIDFactory::SetMesh(SMDS_Mesh *mesh)
{ {
myMesh = mesh; myMesh = mesh;
} }
SMDS_Mesh* SMDS_MeshIDFactory::GetMesh() SMDS_Mesh* SMDS_MeshIDFactory::GetMesh()
{ {
return myMesh; return myMesh;
} }
void SMDS_MeshIDFactory::emptyPool(int maxId) void SMDS_MeshIDFactory::emptyPool(int maxId)
{ {
MESSAGE("SMDS_MeshIDFactory::emptyPool " << myMaxID << " --> " << maxId); MESSAGE("SMDS_MeshIDFactory::emptyPool " << myMaxID << " --> " << maxId);
myMaxID = maxId; myMaxID = maxId;
myPoolOfID.clear(); myPoolOfID.clear();
} }

View File

@ -147,11 +147,11 @@ void SMDS_UnstructuredGrid::compactGrid(std::vector<int>& idNodesOldToNew, int n
} enumState; } enumState;
enumState compactState = lookHoleStart; enumState compactState = lookHoleStart;
// if (this->Links) // if (this->Links)
// { // {
// this->Links->UnRegister(this); // this->Links->UnRegister(this);
// this->Links = 0; // this->Links = 0;
// } // }
// --- if newNodeSize, create a new compacted vtkPoints // --- if newNodeSize, create a new compacted vtkPoints

View File

@ -6,7 +6,7 @@
*/ */
#ifndef _SMDS_UNSTRUCTUREDGRID_HXX #ifndef _SMDS_UNSTRUCTUREDGRID_HXX
#define _SMDS_UNSTRUCTUREDGRID_HXX #define _SMDS_UNSTRUCTUREDGRID_HXX
#include <vtkUnstructuredGrid.h> #include <vtkUnstructuredGrid.h>
#include <vtkCellLinks.h> #include <vtkCellLinks.h>
@ -89,5 +89,5 @@ protected:
std::vector<SMDS_Downward*> _downArray; std::vector<SMDS_Downward*> _downArray;
}; };
#endif /* _SMDS_UNSTRUCTUREDGRID_HXX */ #endif /* _SMDS_UNSTRUCTUREDGRID_HXX */