From 17b708df4ad486b9c904d2e67ab71ffc45147753 Mon Sep 17 00:00:00 2001 From: eap Date: Wed, 21 Feb 2007 16:58:23 +0000 Subject: [PATCH] PAL13460 (PAL EDF 301 force the mesh to go through a point) make simple constructors protected to allow creating ancestors without SMESH_Gen --- src/SMESH/SMESH_Mesh.cxx | 22 +++++++++++----------- src/SMESH/SMESH_Mesh.hxx | 17 +++++++++-------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/src/SMESH/SMESH_Mesh.cxx b/src/SMESH/SMESH_Mesh.cxx index 3f3177694..67dc0a6bd 100644 --- a/src/SMESH/SMESH_Mesh.cxx +++ b/src/SMESH/SMESH_Mesh.cxx @@ -81,22 +81,22 @@ static int MYDEBUG = 0; */ //============================================================================= -SMESH_Mesh::SMESH_Mesh(int theLocalId, - int theStudyId, - SMESH_Gen* theGen, - bool theIsEmbeddedMode, +SMESH_Mesh::SMESH_Mesh(int theLocalId, + int theStudyId, + SMESH_Gen* theGen, + bool theIsEmbeddedMode, SMESHDS_Document* theDocument): _groupId( 0 ) { MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)"); - _id = theLocalId; - _studyId = theStudyId; - _gen = theGen; - _myDocument = theDocument; - _idDoc = theDocument->NewMesh(theIsEmbeddedMode); - _myMeshDS = theDocument->GetMesh(_idDoc); - _myMeshDS->ShapeToMesh( PseudoShape() ); + _id = theLocalId; + _studyId = theStudyId; + _gen = theGen; + _myDocument = theDocument; + _idDoc = theDocument->NewMesh(theIsEmbeddedMode); + _myMeshDS = theDocument->GetMesh(_idDoc); _isShapeToMesh = false; + _myMeshDS->ShapeToMesh( PseudoShape() ); } //============================================================================= diff --git a/src/SMESH/SMESH_Mesh.hxx b/src/SMESH/SMESH_Mesh.hxx index 3b4eef596..69743f2af 100644 --- a/src/SMESH/SMESH_Mesh.hxx +++ b/src/SMESH/SMESH_Mesh.hxx @@ -72,18 +72,15 @@ class SMESH_subMesh; class SMESH_HypoFilter; class TopoDS_Solid; -//typedef NMTTools_IndexedDataMapOfShapeIndexedMapOfShape IndexedMapOfChain; typedef SMESH_IndexedDataMapOfShapeIndexedMapOfShape IndexedMapOfChain; class SMESH_Mesh { - SMESH_Mesh(); - SMESH_Mesh(const SMESH_Mesh&); public: - SMESH_Mesh(int theLocalId, - int theStudyId, - SMESH_Gen* theGen, - bool theIsEmbeddedMode, + SMESH_Mesh(int theLocalId, + int theStudyId, + SMESH_Gen* theGen, + bool theIsEmbeddedMode, SMESHDS_Document* theDocument); virtual ~SMESH_Mesh(); @@ -273,7 +270,7 @@ private: void CleanMeshOnPropagationChain(const TopoDS_Shape& theMainEdge); // -private: +protected: int _id; // id given by creator (unique within the creator instance) int _studyId; int _idDoc; // id given by SMESHDS_Document @@ -289,6 +286,10 @@ private: TopTools_IndexedDataMapOfShapeListOfShape _mapAncestors; IndexedMapOfChain _mapPropagationChains; // Propagation hypothesis management + +protected: + SMESH_Mesh() {}; + SMESH_Mesh(const SMESH_Mesh&) {}; }; #endif -- 2.39.2