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

IPAL52735: Modification of Geom group breaks a mesh

Browse Source 
Description:	If there are two meshes based on the same geom group, modification of the group breaks one of meshes. Compute, Edit mesh and some other commands are missing from the pop-up of the broken mesh.
This commit is contained in:
eap 2015-05-15 20:14:18 +03:00
parent bb10a2d7a2
commit 716be18032
1 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -232,7 +232,25 @@ GEOM::GEOM_Object_ptr SMESH_Mesh_i::GetShapeToMesh()
try { try {
TopoDS_Shape S = _impl->GetMeshDS()->ShapeToMesh(); TopoDS_Shape S = _impl->GetMeshDS()->ShapeToMesh();
if ( !S.IsNull() ) if ( !S.IsNull() )
{
aShapeObj = _gen_i->ShapeToGeomObject( S ); aShapeObj = _gen_i->ShapeToGeomObject( S );
if ( aShapeObj->_is_nil() )
{
// S was removed from GEOM_Client by newGroupShape() called by other mesh;
// find GEOM_Object by entry (IPAL52735)
list<TGeomGroupData>::iterator data = _geomGroupData.begin();
for ( ; data != _geomGroupData.end(); ++data )
if ( data->_smeshObject->_is_equivalent( _this() ))
{
SALOMEDS::Study_var study = _gen_i->GetCurrentStudy();
if ( study->_is_nil() ) break;
SALOMEDS::SObject_wrap so = study->FindObjectID( data->_groupEntry.c_str() );
CORBA::Object_var obj = _gen_i->SObjectToObject( so );
aShapeObj = GEOM::GEOM_Object::_narrow( obj );
break;
}
}
}
} }
catch(SALOME_Exception & S_ex) { catch(SALOME_Exception & S_ex) {
THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM); THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
@ -1953,9 +1971,11 @@ void SMESH_Mesh_i::CheckGeomModif()
if ( study->_is_nil() ) return; if ( study->_is_nil() ) return;
GEOM::GEOM_Object_var mainGO = _gen_i->ShapeToGeomObject( _impl->GetShapeToMesh() ); GEOM::GEOM_Object_var mainGO = _gen_i->ShapeToGeomObject( _impl->GetShapeToMesh() );
if ( mainGO->_is_nil() ) return; //if ( mainGO->_is_nil() ) return;
if ( mainGO->GetType() == GEOM_GROUP || if ( mainGO->_is_nil() || /* shape was removed from GEOM_Client by newGroupShape()
called by other mesh (IPAL52735) */
mainGO->GetType() == GEOM_GROUP ||
mainGO->GetTick() == _mainShapeTick ) mainGO->GetTick() == _mainShapeTick )
{ {
CheckGeomGroupModif(); CheckGeomGroupModif();
@ -2239,7 +2259,8 @@ void SMESH_Mesh_i::CheckGeomGroupModif()
groupData.push_back groupData.push_back
( make_pair( TIndexedShape( gog->GetID(),gog->GetShape()), gog->GetType())); ( make_pair( TIndexedShape( gog->GetID(),gog->GetShape()), gog->GetType()));
} }
// set new shape to mesh -> DS of sub-meshes and geom groups is deleted // set new shape to mesh -> DS of sub-meshes and geom groups are deleted
_impl->Clear();
_impl->ShapeToMesh( TopoDS_Shape() ); // IPAL52730 _impl->ShapeToMesh( TopoDS_Shape() ); // IPAL52730
_impl->ShapeToMesh( newShape ); _impl->ShapeToMesh( newShape );