This commit is contained in:
eap 2009-10-02 13:09:52 +00:00
parent 425391ca7c
commit 692b18b251
3 changed files with 29 additions and 29 deletions

View File

@ -39,8 +39,8 @@ using namespace std;
//============================================================================= //=============================================================================
SMESH_Hypothesis::SMESH_Hypothesis(int hypId, SMESH_Hypothesis::SMESH_Hypothesis(int hypId,
int studyId, int studyId,
SMESH_Gen* gen) : SMESHDS_Hypothesis(hypId) SMESH_Gen* gen) : SMESHDS_Hypothesis(hypId)
{ {
//MESSAGE("SMESH_Hypothesis::SMESH_Hypothesis"); //MESSAGE("SMESH_Hypothesis::SMESH_Hypothesis");
_gen = gen; _gen = gen;

View File

@ -81,10 +81,10 @@ typedef SMESH_HypoFilter THypType;
//============================================================================= //=============================================================================
SMESH_Mesh::SMESH_Mesh(int theLocalId, SMESH_Mesh::SMESH_Mesh(int theLocalId,
int theStudyId, int theStudyId,
SMESH_Gen* theGen, SMESH_Gen* theGen,
bool theIsEmbeddedMode, bool theIsEmbeddedMode,
SMESHDS_Document* theDocument): SMESHDS_Document* theDocument):
_groupId( 0 ), _nbSubShapes( 0 ) _groupId( 0 ), _nbSubShapes( 0 )
{ {
MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)"); MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)");
@ -325,14 +325,14 @@ void SMESH_Mesh::ClearSubMesh(const int theShapeId)
if ( SMESH_subMesh *sm = GetSubMeshContaining( theShapeId ) ) if ( SMESH_subMesh *sm = GetSubMeshContaining( theShapeId ) )
{ {
SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(/*includeSelf=*/true, SMESH_subMeshIteratorPtr smIt = sm->getDependsOnIterator(/*includeSelf=*/true,
/*complexShapeFirst=*/false); /*complexShapeFirst=*/false);
while ( smIt->more() ) while ( smIt->more() )
{ {
sm = smIt->next(); sm = smIt->next();
TopAbs_ShapeEnum shapeType = sm->GetSubShape().ShapeType(); TopAbs_ShapeEnum shapeType = sm->GetSubShape().ShapeType();
if ( shapeType == TopAbs_VERTEX || shapeType < TopAbs_SOLID ) if ( shapeType == TopAbs_VERTEX || shapeType < TopAbs_SOLID )
// all other shapes depends on vertices so they are already cleaned // all other shapes depends on vertices so they are already cleaned
sm->ComputeStateEngine( SMESH_subMesh::CLEAN ); sm->ComputeStateEngine( SMESH_subMesh::CLEAN );
// to recompute even if failed // to recompute even if failed
sm->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE ); sm->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE );
} }
@ -373,21 +373,21 @@ int SMESH_Mesh::UNVToMesh(const char* theFileName)
SMESH_Group* aSMESHGroup = AddGroup( aSubGroup->GetType(), aName.c_str(), aId ); SMESH_Group* aSMESHGroup = AddGroup( aSubGroup->GetType(), aName.c_str(), aId );
if ( aSMESHGroup ) { if ( aSMESHGroup ) {
if(MYDEBUG) MESSAGE("UNVToMesh - group added: "<<aName); if(MYDEBUG) MESSAGE("UNVToMesh - group added: "<<aName);
SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( aSMESHGroup->GetGroupDS() ); SMESHDS_Group* aGroupDS = dynamic_cast<SMESHDS_Group*>( aSMESHGroup->GetGroupDS() );
if ( aGroupDS ) { if ( aGroupDS ) {
aGroupDS->SetStoreName(aName.c_str()); aGroupDS->SetStoreName(aName.c_str());
aSubGroup->InitIterator(); aSubGroup->InitIterator();
const SMDS_MeshElement* aElement = 0; const SMDS_MeshElement* aElement = 0;
while (aSubGroup->More()) { while (aSubGroup->More()) {
aElement = aSubGroup->Next(); aElement = aSubGroup->Next();
if (aElement) { if (aElement) {
aGroupDS->SMDSGroup().Add(aElement); aGroupDS->SMDSGroup().Add(aElement);
} }
} }
if (aElement) if (aElement)
aGroupDS->SetType(aElement->GetType()); aGroupDS->SetType(aElement->GetType());
} }
} }
} }
} }
@ -1086,9 +1086,9 @@ bool SMESH_Mesh::HasDuplicatedGroupNamesMED()
} }
void SMESH_Mesh::ExportMED(const char *file, void SMESH_Mesh::ExportMED(const char *file,
const char* theMeshName, const char* theMeshName,
bool theAutoGroups, bool theAutoGroups,
int theVersion) int theVersion)
throw(SALOME_Exception) throw(SALOME_Exception)
{ {
Unexpect aCatch(SalomeException); Unexpect aCatch(SalomeException);
@ -1376,7 +1376,7 @@ bool SMESH_Mesh::IsMainShape(const TopoDS_Shape& theShape) const
SMESH_Group* SMESH_Mesh::AddGroup (const SMDSAbs_ElementType theType, SMESH_Group* SMESH_Mesh::AddGroup (const SMDSAbs_ElementType theType,
const char* theName, const char* theName,
int& theId, int& theId,
const TopoDS_Shape& theShape) const TopoDS_Shape& theShape)
{ {
if (_mapGroup.find(_groupId) != _mapGroup.end()) if (_mapGroup.find(_groupId) != _mapGroup.end())

View File

@ -61,7 +61,7 @@ class SMESH_EXPORT SMESH_subMesh
{ {
public: public:
SMESH_subMesh(int Id, SMESH_Mesh * father, SMESHDS_Mesh * meshDS, SMESH_subMesh(int Id, SMESH_Mesh * father, SMESHDS_Mesh * meshDS,
const TopoDS_Shape & aSubShape); const TopoDS_Shape & aSubShape);
virtual ~ SMESH_subMesh(); virtual ~ SMESH_subMesh();
int GetId() const; int GetId() const;