ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-11 16:19:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

IPAL13978: Problem of updating SubMeshes on Face and Compound in Object Browser after compute of mesh

Browse Source 
Fix a bug that icons updated starting from the 4th child of mesh object

IPAL13023: To correct alignment for output of "Dump()" functionality.
This commit is contained in:
eap 2015-05-15 21:20:14 +03:00
parent 716be18032
commit 43ce5a9126
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/SMESH/SMESH_Mesh.cxx
View File

@ -2116,11 +2116,11 @@ ostream& SMESH_Mesh::Dump(ostream& save)
{
int clause = 0;
save << "========================== Dump contents of mesh ==========================" << endl << endl;
save << ++clause << ") Total number of nodes: \t" << NbNodes() << endl;
save << ++clause << ") Total number of edges: \t" << NbEdges() << endl;
save << ++clause << ") Total number of faces: \t" << NbFaces() << endl;
save << ++clause << ") Total number of polygons:\t" << NbPolygons() << endl;
save << ++clause << ") Total number of volumes:\t" << NbVolumes() << endl;
save << ++clause << ") Total number of nodes: \t" << NbNodes() << endl;
save << ++clause << ") Total number of edges: \t" << NbEdges() << endl;
save << ++clause << ") Total number of faces: \t" << NbFaces() << endl;
save << ++clause << ") Total number of polygons: \t" << NbPolygons() << endl;
save << ++clause << ") Total number of volumes: \t" << NbVolumes() << endl;
save << ++clause << ") Total number of polyhedrons:\t" << NbPolyhedrons() << endl << endl;
for ( int isQuadratic = 0; isQuadratic < 2; ++isQuadratic )
{
@ -2155,10 +2155,10 @@ ostream& SMESH_Mesh::Dump(ostream& save)
int nb4 = NbTetras(order);
int nb5 = NbPyramids(order);
int nb6 = NbPrisms(order);
save << clause << ".1) Number of " << orderStr << " hexahedrons:\t" << nb8 << endl;
save << clause << ".1) Number of " << orderStr << " hexahedrons: \t" << nb8 << endl;
save << clause << ".2) Number of " << orderStr << " tetrahedrons:\t" << nb4 << endl;
save << clause << ".3) Number of " << orderStr << " prisms: \t" << nb6 << endl;
save << clause << ".4) Number of " << orderStr << " pyramids:\t" << nb5 << endl;
save << clause << ".4) Number of " << orderStr << " pyramids: \t" << nb5 << endl;
if ( nb8 + nb4 + nb5 + nb6 != NbVolumes(order) ) {
map<int,int> myVolumesMap;
SMDS_VolumeIteratorPtr itVolumes=_myMeshDS->volumesIterator();

4
src/SMESHGUI/SMESHGUI_Utils.cxx
View File

@ -300,7 +300,7 @@ namespace SMESH
_PTR(ChildIterator) anIter = aStudy->NewChildIterator(theSObject);
for (int i = 1; anIter->More(); anIter->Next(), i++) {
_PTR(SObject) aSObj = anIter->Value();
if (i >= 4) {
/*if (i >= 1)*/ {
_PTR(ChildIterator) anIter1 = aStudy->NewChildIterator(aSObj);
for ( ; anIter1->More(); anIter1->Next())
{
@ -311,6 +311,8 @@ namespace SMESH
std::string entry = aSObj1->GetID();
int objType = SMESHGUI_Selection::type( entry.c_str(), aStudy );
if ( objType == SMESH::HYPOTHESIS || objType == SMESH::ALGORITHM )
continue;
SMESH::SMESH_IDSource_var idSrc = SObjectToInterface<SMESH::SMESH_IDSource>( aSObj1 );
if ( !idSrc->_is_nil() )

4
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -1973,6 +1973,8 @@ void SMESH_Mesh_i::CheckGeomModif()
GEOM::GEOM_Object_var mainGO = _gen_i->ShapeToGeomObject( _impl->GetShapeToMesh() );
//if ( mainGO->_is_nil() ) return;
// Update after group modification
if ( mainGO->_is_nil() || /* shape was removed from GEOM_Client by newGroupShape()
called by other mesh (IPAL52735) */
mainGO->GetType() == GEOM_GROUP ||
@ -1982,6 +1984,8 @@ void SMESH_Mesh_i::CheckGeomModif()
return;
}
// Update after shape transformation like Translate
GEOM_Client* geomClient = _gen_i->GetShapeReader();
if ( !geomClient ) return;
GEOM::GEOM_Gen_var geomGen = _gen_i->GetGeomEngine();