ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-15 21:21:21 +05:00
Code Issues Packages Projects Releases Wiki Activity

use new method SMESH_subMesh::GetAlgo()

Browse Source
This commit is contained in:
eap 2011-10-28 12:55:08 +00:00
parent 2c766c3b15
commit e182c4b354
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/StdMeshers/StdMeshers_CompositeSegment_1D.cxx
View File

@ -172,8 +172,7 @@ namespace {
if ( subMesh->GetAlgoState() != SMESH_subMesh::HYP_OK ) if ( subMesh->GetAlgoState() != SMESH_subMesh::HYP_OK )
hypRemoved = true; hypRemoved = true;
else { else {
SMESH_Gen * gen = subMesh->GetFather()->GetGen(); SMESH_Algo* algo = subMesh->GetAlgo();
SMESH_Algo* algo = gen->GetAlgo( *subMesh->GetFather(), subMesh->GetSubShape() );
hypRemoved = ( string( algo->GetName() ) != StdMeshers_CompositeSegment_1D::AlgoName()); hypRemoved = ( string( algo->GetName() ) != StdMeshers_CompositeSegment_1D::AlgoName());
} }
if ( hypRemoved ) if ( hypRemoved )

6
src/StdMeshers/StdMeshers_Import_1D.cxx
View File

@ -413,8 +413,7 @@ namespace // INTERNAL STUFF
{ {
// re-call SetEventListener() to take into account valid parameters // re-call SetEventListener() to take into account valid parameters
// of ImportSource hypothesis // of ImportSource hypothesis
SMESH_Gen* gen = subMesh->GetFather()->GetGen(); if ( SMESH_Algo* algo = subMesh->GetAlgo() )
if ( SMESH_Algo* algo = gen->GetAlgo(*subMesh->GetFather(), subMesh->GetSubShape()))
algo->SetEventListener( subMesh ); algo->SetEventListener( subMesh );
} }
} }
@ -461,8 +460,7 @@ namespace // INTERNAL STUFF
SMESH_subMesh::REMOVE_FATHER_ALGO == event ) && SMESH_subMesh::REMOVE_FATHER_ALGO == event ) &&
SMESH_subMesh::ALGO_EVENT == eventType ) SMESH_subMesh::ALGO_EVENT == eventType )
{ {
SMESH_Gen* gen = subMesh->GetFather()->GetGen(); SMESH_Algo* algo = subMesh->GetAlgo();
SMESH_Algo* algo = gen->GetAlgo(*subMesh->GetFather(),subMesh->GetSubShape() );
removeImport = ( strncmp( "Import", algo->GetName(), 6 ) != 0 ); removeImport = ( strncmp( "Import", algo->GetName(), 6 ) != 0 );
} }

6
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -1940,7 +1940,7 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter
SMESH_Mesh* mesh = sm->GetFather(); SMESH_Mesh* mesh = sm->GetFather();
SMESH_Gen* gen = mesh->GetGen(); SMESH_Gen* gen = mesh->GetGen();
SMESH_Algo* algo = gen->GetAlgo( *mesh, sm->GetSubShape() ); SMESH_Algo* algo = sm->GetAlgo();
if ( !algo ) if ( !algo )
{ {
if ( sm->GetSubShape().ShapeType() != TopAbs_COMPOUND ) if ( sm->GetSubShape().ShapeType() != TopAbs_COMPOUND )
@ -2080,9 +2080,7 @@ namespace {
// delete current source listener // delete current source listener
subMesh->DeleteEventListener( GetSrcSubMeshListener() ); subMesh->DeleteEventListener( GetSrcSubMeshListener() );
// let algo set a new one // let algo set a new one
SMESH_Gen* gen = subMesh->GetFather()->GetGen(); if ( SMESH_Algo* algo = subMesh->GetAlgo() )
if ( SMESH_Algo* algo = gen->GetAlgo( *subMesh->GetFather(),
subMesh->GetSubShape() ))
algo->SetEventListener( subMesh ); algo->SetEventListener( subMesh );
} }
} }