ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-28 18:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

19997: Compute does not work in script, ok in GUI

Browse Source 
fix MakeComputed() for group projection
This commit is contained in:
eap 2008-10-13 08:09:25 +00:00
parent 4c2f4f9b50
commit 40fa3efd39
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/StdMeshers/StdMeshers_ProjectionUtils.cxx
View File

@ -66,6 +66,7 @@
using namespace std; using namespace std;
#define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; } #define RETURN_BAD_RESULT(msg) { MESSAGE(")-: Error: " << msg); return false; }
#define SHOW_VERTEX(v,msg) // { \ #define SHOW_VERTEX(v,msg) // { \
// if ( v.IsNull() ) cout << msg << " NULL SHAPE" << endl; \ // if ( v.IsNull() ) cout << msg << " NULL SHAPE" << endl; \
@ -1634,7 +1635,17 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter
SMESH_Gen* gen = mesh->GetGen(); SMESH_Gen* gen = mesh->GetGen();
SMESH_Algo* algo = gen->GetAlgo( *mesh, sm->GetSubShape() ); SMESH_Algo* algo = gen->GetAlgo( *mesh, sm->GetSubShape() );
if ( !algo ) if ( !algo )
RETURN_BAD_RESULT("No algo assigned to submesh " << sm->GetId()); {
if ( sm->GetSubShape().ShapeType() != TopAbs_COMPOUND )
RETURN_BAD_RESULT("No algo assigned to submesh " << sm->GetId());
// group
bool computed = true;
for ( TopoDS_Iterator grMember( sm->GetSubShape() ); grMember.More(); grMember.Next())
if ( SMESH_subMesh* grSub = mesh->GetSubMesh( grMember.Value() ))
if ( !MakeComputed( grSub, iterationNb + 1 ))
computed = false;
return computed;
}
string algoType = algo->GetName(); string algoType = algo->GetName();
if ( algoType.substr(0, 11) != "Projection_") if ( algoType.substr(0, 11) != "Projection_")
@ -1678,7 +1689,10 @@ bool StdMeshers_ProjectionUtils::MakeComputed(SMESH_subMesh * sm, const int iter
if ( !srcMesh ) if ( !srcMesh )
srcMesh = mesh; srcMesh = mesh;
return MakeComputed( srcMesh->GetSubMesh( srcShape ), iterationNb + 1 ); if ( MakeComputed( srcMesh->GetSubMesh( srcShape ), iterationNb + 1 ))
return gen->Compute( *mesh, sm->GetSubShape() );
return false;
} }
//================================================================================ //================================================================================