X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Mesh_i.cxx;h=a52c3b0c2cef3fe7d61804767797881e9f545ba3;hb=385b46d935289596a6621c5486eea7864c1ff7d6;hp=d8445554f8678f0294de357f9589877ffeccfb6a;hpb=95dab66d27ba89f7ef91cf50e207367d2b48125a;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_Mesh_i.cxx b/src/SMESH_I/SMESH_Mesh_i.cxx index d8445554f..a52c3b0c2 100644 --- a/src/SMESH_I/SMESH_Mesh_i.cxx +++ b/src/SMESH_I/SMESH_Mesh_i.cxx @@ -17,7 +17,7 @@ // License along with this library; if not, write to the Free Software // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -27,35 +27,46 @@ // $Header$ #include "SMESH_Mesh_i.hxx" -#include "SMESH_subMesh_i.hxx" -#include "SMESH_MEDMesh_i.hxx" -#include "SMESH_Group_i.hxx" + #include "SMESH_Filter_i.hxx" +#include "SMESH_Gen_i.hxx" +#include "SMESH_Group_i.hxx" +#include "SMESH_MEDMesh_i.hxx" +#include "SMESH_MeshEditor_i.hxx" #include "SMESH_PythonDump.hxx" +#include "SMESH_subMesh_i.hxx" -#include "Utils_CorbaException.hxx" -#include "Utils_ExceptHandlers.hxx" -#include "utilities.h" +#include "DriverMED_R_SMESHDS_Mesh.h" +#include "DriverMED_W_SMESHDS_Mesh.h" +#include "SMDS_VolumeTool.hxx" +#include "SMESHDS_Command.hxx" +#include "SMESHDS_CommandType.hxx" +#include "SMESHDS_GroupOnGeom.hxx" +#include "SMESH_Group.hxx" +#include "SMESH_MeshEditor.hxx" +#include "SMESH_MesherHelper.hxx" +#include "SMDS_EdgePosition.hxx" +#include "SMDS_FacePosition.hxx" +#include "OpUtil.hxx" #include "SALOME_NamingService.hxx" +#include "Utils_CorbaException.hxx" +#include "Utils_ExceptHandlers.hxx" #include "Utils_SINGLETON.hxx" -#include "OpUtil.hxx" - -#include "SMESHDS_Command.hxx" -#include "SMESHDS_CommandType.hxx" -#include "SMESH_MeshEditor_i.hxx" -#include "SMESH_Gen_i.hxx" -#include "DriverMED_R_SMESHDS_Mesh.h" +#include "utilities.h" // OCCT Includes -#include -#include +#include #include +#include +#include #include -#include #include +#include #include -#include "TCollection_AsciiString.hxx" +#include +#include +#include // STL Includes #include @@ -73,6 +84,8 @@ using SMESH::TPythonDump; int SMESH_Mesh_i::myIdGenerator = 0; + + //============================================================================= /*! * Constructor @@ -84,12 +97,11 @@ SMESH_Mesh_i::SMESH_Mesh_i( PortableServer::POA_ptr thePOA, CORBA::Long studyId ) : SALOME::GenericObj_i( thePOA ) { - INFOS("SMESH_Mesh_i"); + MESSAGE("SMESH_Mesh_i"); _impl = NULL; _gen_i = gen_i; _id = myIdGenerator++; _studyId = studyId; - thePOA->activate_object( this ); } //============================================================================= @@ -105,14 +117,14 @@ SMESH_Mesh_i::~SMESH_Mesh_i() for ( it = _mapGroups.begin(); it != _mapGroups.end(); it++ ) { SMESH_GroupBase_i* aGroup = dynamic_cast( SMESH_Gen_i::GetServant( it->second ).in() ); if ( aGroup ) { - // this method is colled from destructor of group (PAL6331) //_impl->RemoveGroup( aGroup->GetLocalID() ); - + aGroup->Destroy(); } } _mapGroups.clear(); + delete _impl; } //============================================================================= @@ -137,6 +149,26 @@ void SMESH_Mesh_i::SetShape( GEOM::GEOM_Object_ptr theShapeObject ) } } +//================================================================================ +/*! + * \brief return true if mesh has a shape to build a shape on + */ +//================================================================================ + +CORBA::Boolean SMESH_Mesh_i::HasShapeToMesh() + throw (SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + bool res = false; + try { + res = _impl->HasShapeToMesh(); + } + catch(SALOME_Exception & S_ex) { + THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM); + } + return res; +} + //======================================================================= //function : GetShapeToMesh //purpose : @@ -199,7 +231,7 @@ SMESH_Mesh_i::ImportMEDFile( const char* theFileName, const char* theMeshName ) Unexpect aCatch(SALOME_SalomeException); int status; try { - status = importMEDFile( theFileName, theMeshName ); + status = _impl->MEDToMesh( theFileName, theMeshName ); } catch( SALOME_Exception& S_ex ) { THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM); @@ -208,19 +240,24 @@ SMESH_Mesh_i::ImportMEDFile( const char* theFileName, const char* theMeshName ) THROW_SALOME_CORBA_EXCEPTION("ImportMEDFile(): unknown exception", SALOME::BAD_PARAM); } - SALOMEDS::Study_ptr aStudy = _gen_i->GetCurrentStudy(); - if ( !aStudy->_is_nil() ) { - // publishing of the groups in the study (sub-meshes are out of scope of MED import) - map::iterator it = _mapGroups.begin(); - for (; it != _mapGroups.end(); it++ ) { - SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_duplicate( it->second ); - _gen_i->PublishGroup( aStudy, _this(), aGroup, - GEOM::GEOM_Object::_nil(), aGroup->GetName()); - } - } + CreateGroupServants(); + return ConvertDriverMEDReadStatus(status); } +//================================================================================ +/*! + * \brief Return string representation of a MED file version comprising nbDigits + */ +//================================================================================ + +char* SMESH_Mesh_i::GetVersionString(SMESH::MED_VERSION version, CORBA::Short nbDigits) +{ + std::string ver = DriverMED_W_SMESHDS_Mesh::GetVersionString(MED::EVersion(version), + nbDigits); + return CORBA::string_dup( ver.c_str() ); +} + //============================================================================= /*! * ImportUNVFile @@ -235,6 +272,8 @@ int SMESH_Mesh_i::ImportUNVFile( const char* theFileName ) // Read mesh with name = into SMESH_Mesh _impl->UNVToMesh( theFileName ); + CreateGroupServants(); + return 1; } @@ -262,31 +301,14 @@ int SMESH_Mesh_i::ImportSTLFile( const char* theFileName ) */ //============================================================================= -int SMESH_Mesh_i::importMEDFile( const char* theFileName, const char* theMeshName ) -{ - // Read mesh with name = and all its groups into SMESH_Mesh - int status = _impl->MEDToMesh( theFileName, theMeshName ); - - // Create group servants, if any groups were imported - list aGroupIds = _impl->GetGroupIds(); - for ( list::iterator it = aGroupIds.begin(); it != aGroupIds.end(); it++ ) { - SMESH_Group_i* aGroupImpl = new SMESH_Group_i( SMESH_Gen_i::GetPOA(), this, *it ); - - // PAL7962: san -- To ensure correct mapping of servant and correct reference counting in GenericObj_i - SMESH_Gen_i::GetPOA()->activate_object( aGroupImpl ); - aGroupImpl->Register(); - // PAL7962: san -- To ensure correct mapping of servant and correct reference counting in GenericObj_i - - SMESH::SMESH_Group_var aGroup = SMESH::SMESH_Group::_narrow( aGroupImpl->_this() ); - _mapGroups[*it] = SMESH::SMESH_Group::_duplicate( aGroup ); - - // register CORBA object for persistence - int nextId = _gen_i->RegisterObject( aGroup ); - if(MYDEBUG) MESSAGE( "Add group to map with id = "<< nextId); - } +// int SMESH_Mesh_i::importMEDFile( const char* theFileName, const char* theMeshName ) +// { +// // Read mesh with name = and all its groups into SMESH_Mesh +// int status = _impl->MEDToMesh( theFileName, theMeshName ); +// CreateGroupServants(); - return status; -} +// return status; +// } //============================================================================= /*! @@ -294,32 +316,28 @@ int SMESH_Mesh_i::importMEDFile( const char* theFileName, const char* theMeshNam */ //============================================================================= -static SMESH::Hypothesis_Status ConvertHypothesisStatus +#define RETURNCASE(hyp_stat) case SMESH_Hypothesis::hyp_stat: return SMESH::hyp_stat; + +SMESH::Hypothesis_Status SMESH_Mesh_i::ConvertHypothesisStatus (SMESH_Hypothesis::Hypothesis_Status theStatus) { - SMESH::Hypothesis_Status res; - switch (theStatus) - { - case SMESH_Hypothesis::HYP_OK: - res = SMESH::HYP_OK; break; - case SMESH_Hypothesis::HYP_MISSING: - res = SMESH::HYP_MISSING; break; - case SMESH_Hypothesis::HYP_CONCURENT: - res = SMESH::HYP_CONCURENT; break; - case SMESH_Hypothesis::HYP_BAD_PARAMETER: - res = SMESH::HYP_BAD_PARAMETER; break; - case SMESH_Hypothesis::HYP_INCOMPATIBLE: - res = SMESH::HYP_INCOMPATIBLE; break; - case SMESH_Hypothesis::HYP_NOTCONFORM: - res = SMESH::HYP_NOTCONFORM; break; - case SMESH_Hypothesis::HYP_ALREADY_EXIST: - res = SMESH::HYP_ALREADY_EXIST; break; - case SMESH_Hypothesis::HYP_BAD_DIM: - res = SMESH::HYP_BAD_DIM; break; - default: - res = SMESH::HYP_UNKNOWN_FATAL; + switch (theStatus) { + RETURNCASE( HYP_OK ); + RETURNCASE( HYP_MISSING ); + RETURNCASE( HYP_CONCURENT ); + RETURNCASE( HYP_BAD_PARAMETER ); + RETURNCASE( HYP_HIDDEN_ALGO ); + RETURNCASE( HYP_HIDING_ALGO ); + RETURNCASE( HYP_UNKNOWN_FATAL ); + RETURNCASE( HYP_INCOMPATIBLE ); + RETURNCASE( HYP_NOTCONFORM ); + RETURNCASE( HYP_ALREADY_EXIST ); + RETURNCASE( HYP_BAD_DIM ); + RETURNCASE( HYP_BAD_SUBSHAPE ); + RETURNCASE( HYP_BAD_GEOMETRY ); + default:; } - return res; + return SMESH::HYP_UNKNOWN_FATAL; } //============================================================================= @@ -346,9 +364,14 @@ SMESH::Hypothesis_Status SMESH_Mesh_i::AddHypothesis(GEOM::GEOM_Object_ptr aSubS if(MYDEBUG) MESSAGE( " AddHypothesis(): status = " << status ); // Update Python script - TPythonDump() << "status = " << _this() << ".AddHypothesis( " - << aSubShapeObject << ", " << anHyp << " )"; - + if(_impl->HasShapeToMesh()) { + TPythonDump() << "status = " << _this() << ".AddHypothesis( " + << aSubShapeObject << ", " << anHyp << " )"; + } + else { + TPythonDump() << "status = " << _this() << ".AddHypothesis( "<< anHyp << " )"; + } + return ConvertHypothesisStatus(status); } @@ -364,7 +387,7 @@ SMESH_Hypothesis::Hypothesis_Status { if(MYDEBUG) MESSAGE("addHypothesis"); - if (CORBA::is_nil(aSubShapeObject)) + if (CORBA::is_nil(aSubShapeObject) && HasShapeToMesh()) THROW_SALOME_CORBA_EXCEPTION("bad subShape reference", SALOME::BAD_PARAM); @@ -376,11 +399,17 @@ SMESH_Hypothesis::Hypothesis_Status SMESH_Hypothesis::Hypothesis_Status status = SMESH_Hypothesis::HYP_OK; try { - TopoDS_Shape myLocSubShape = _gen_i->GeomObjectToShape( aSubShapeObject); + TopoDS_Shape myLocSubShape; + //use PseudoShape in case if mesh has no shape + if(HasShapeToMesh()) + myLocSubShape = _gen_i->GeomObjectToShape( aSubShapeObject); + else + myLocSubShape = _impl->GetShapeToMesh(); + int hypId = myHyp->GetId(); status = _impl->AddHypothesis(myLocSubShape, hypId); if ( !SMESH_Hypothesis::IsStatusFatal(status) ) { - _mapHypo[hypId] = myHyp; + _mapHypo[hypId] = SMESH::SMESH_Hypothesis::_duplicate( myHyp ); // assure there is a corresponding submesh if ( !_impl->IsMainShape( myLocSubShape )) { int shapeId = _impl->GetMeshDS()->ShapeToIndex( myLocSubShape ); @@ -414,8 +443,15 @@ SMESH::Hypothesis_Status SMESH_Mesh_i::RemoveHypothesis(GEOM::GEOM_Object_ptr aS aSubShapeObject, anHyp ); // Update Python script + // Update Python script + if(_impl->HasShapeToMesh()) { TPythonDump() << "status = " << _this() << ".RemoveHypothesis( " << aSubShapeObject << ", " << anHyp << " )"; + } + else { + TPythonDump() << "status = " << _this() << ".RemoveHypothesis( " + << anHyp << " )"; + } return ConvertHypothesisStatus(status); } @@ -432,7 +468,7 @@ SMESH_Hypothesis::Hypothesis_Status SMESH_Mesh_i::removeHypothesis(GEOM::GEOM_Ob if(MYDEBUG) MESSAGE("removeHypothesis()"); // **** proposer liste de subShape (selection multiple) - if (CORBA::is_nil(aSubShapeObject)) + if (CORBA::is_nil(aSubShapeObject) && HasShapeToMesh()) THROW_SALOME_CORBA_EXCEPTION("bad subShape reference", SALOME::BAD_PARAM); @@ -444,8 +480,14 @@ SMESH_Hypothesis::Hypothesis_Status SMESH_Mesh_i::removeHypothesis(GEOM::GEOM_Ob SMESH_Hypothesis::Hypothesis_Status status = SMESH_Hypothesis::HYP_OK; try { - TopoDS_Shape myLocSubShape = _gen_i->GeomObjectToShape(aSubShapeObject); - int hypId = myHyp->GetId(); + TopoDS_Shape myLocSubShape; + //use PseudoShape in case if mesh has no shape + if(HasShapeToMesh()) + myLocSubShape = _gen_i->GeomObjectToShape( aSubShapeObject); + else + myLocSubShape = _impl->GetShapeToMesh(); + + int hypId = myHyp->GetId(); status = _impl->RemoveHypothesis(myLocSubShape, hypId); if ( !SMESH_Hypothesis::IsStatusFatal(status) ) _mapHypo.erase( hypId ); @@ -726,6 +768,61 @@ void SMESH_Mesh_i::RemoveGroupWithContents( SMESH::SMESH_GroupBase_ptr theGroup _gen_i->RemoveLastFromPythonScript(_gen_i->GetCurrentStudy()->StudyId()); } + +//================================================================================ +/*! + * \brief Get the list of groups existing in the mesh + * \retval SMESH::ListOfGroups * - list of groups + */ +//================================================================================ + +SMESH::ListOfGroups * SMESH_Mesh_i::GetGroups() throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + if (MYDEBUG) MESSAGE("GetGroups"); + + SMESH::ListOfGroups_var aList = new SMESH::ListOfGroups(); + + // Python Dump + TPythonDump aPythonDump; + if ( !_mapGroups.empty() ) // (IMP13463) avoid "SyntaxError: can't assign to []" + aPythonDump << "[ "; + + try { + aList->length( _mapGroups.size() ); + int i = 0; + map::iterator it = _mapGroups.begin(); + for ( ; it != _mapGroups.end(); it++ ) { + if ( CORBA::is_nil( it->second )) continue; + aList[i++] = SMESH::SMESH_GroupBase::_duplicate( it->second ); + // Python Dump + if (i > 1) aPythonDump << ", "; + aPythonDump << it->second; + } + aList->length( i ); + } + catch(SALOME_Exception & S_ex) { + THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM); + } + + // Update Python script + if ( !_mapGroups.empty() ) // (IMP13463) avoid "SyntaxError: can't assign to []" + aPythonDump << " ] = " << _this() << ".GetGroups()"; + + return aList._retn(); +} +//============================================================================= +/*! + * Get number of groups existing in the mesh + */ +//============================================================================= + +CORBA::Long SMESH_Mesh_i::NbGroups() throw (SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + return _mapGroups.size(); +} + //============================================================================= /*! UnionGroups * New group is created. All mesh elements that are @@ -896,6 +993,139 @@ SMESH::SMESH_Group_ptr SMESH_Mesh_i::CutGroups( SMESH::SMESH_GroupBase_ptr theGr return aResGrp._retn(); } +//================================================================================ +/*! + * \brief Return group items of a group present in a study + */ +//================================================================================ + +static GEOM::GEOM_Object_ptr getGroupItemsFromStudy(CORBA::Object_ptr theMesh, + SMESH_Gen_i* theGen, + list & theItems) +{ + GEOM::GEOM_Object_var groupObj; + SALOMEDS::Study_var study = theGen->GetCurrentStudy(); + GEOM::GEOM_Gen_var geomGen = theGen->GetGeomEngine(); + if ( study->_is_nil() || geomGen->_is_nil() ) + return groupObj._retn(); + + GEOM::GEOM_IGroupOperations_var groupOp = + geomGen->GetIGroupOperations( theGen->GetCurrentStudyID() ); + GEOM::GEOM_IShapesOperations_var shapeOp = + geomGen->GetIShapesOperations( theGen->GetCurrentStudyID() ); + + SALOMEDS::SObject_var meshOS = theGen->ObjectToSObject(study, theMesh); + if ( meshOS->_is_nil() || groupOp->_is_nil() || shapeOp->_is_nil() ) + return groupObj._retn(); + SALOMEDS::SObject_var fatherSO = meshOS->GetFather(); + if ( fatherSO->_is_nil() || fatherSO->Tag() != theGen->GetSubMeshOnCompoundTag() ) + return groupObj._retn(); // keep only submeshes on groups + + SALOMEDS::ChildIterator_var anIter = study->NewChildIterator(meshOS); + if ( anIter->_is_nil() ) return groupObj._retn(); + for ( ; anIter->More(); anIter->Next()) + { + SALOMEDS::SObject_var aSObject = anIter->Value(); + SALOMEDS::SObject_var aRefSO; + if ( !aSObject->_is_nil() && aSObject->ReferencedObject(aRefSO) ) + { + groupObj = GEOM::GEOM_Object::_narrow(aRefSO->GetObject()); + if ( groupObj->_is_nil() ) break; + GEOM::ListOfLong_var ids = groupOp->GetObjects( groupObj ); + GEOM::GEOM_Object_var mainShape = groupObj->GetMainShape(); + for ( int i = 0; i < ids->length(); ++i ) { + GEOM::GEOM_Object_var subShape = shapeOp->GetSubShape( mainShape, ids[i] ); + TopoDS_Shape S = theGen->GeomObjectToShape( subShape ); + if ( !S.IsNull() ) + theItems.push_back( S ); + } + break; + } + } + return groupObj._retn(); +} + +//============================================================================= +/*! + * \brief Update hypotheses assigned to geom groups if the latter change + * + * NPAL16168: "geometrical group edition from a submesh don't modifiy mesh computation" + */ +//============================================================================= + +void SMESH_Mesh_i::CheckGeomGroupModif() +{ + if ( !_impl->HasShapeToMesh() ) return; + + SALOMEDS::Study_var study = _gen_i->GetCurrentStudy(); + if ( study->_is_nil() ) return; + + // check if items of groups changed + map::iterator i_sm = _mapSubMesh.begin(); + for ( ; i_sm != _mapSubMesh.end(); ++i_sm ) + { + const TopoDS_Shape & oldGroupShape = i_sm->second->GetSubShape(); + SMESHDS_SubMesh * oldDS = i_sm->second->GetSubMeshDS(); + if ( !oldDS /*|| !oldDS->IsComplexSubmesh()*/ ) + continue; + int oldID = i_sm->first; + map::iterator i_smIor = _mapSubMeshIor.find( oldID ); + if ( i_smIor == _mapSubMeshIor.end() ) + continue; + list< TopoDS_Shape> newItems; + GEOM::GEOM_Object_var groupObj = getGroupItemsFromStudy ( i_smIor->second, _gen_i, newItems ); + if ( groupObj->_is_nil() ) + continue; + + int nbOldItems = oldDS->IsComplexSubmesh() ? oldDS->NbSubMeshes() : 1; + int nbNewItems = newItems.size(); + bool groupChanged = ( nbOldItems != nbNewItems); + if ( !groupChanged ) { + if ( !oldDS->IsComplexSubmesh() ) { // old group has one item + groupChanged = ( oldGroupShape != newItems.front() ); + } + else { + list::iterator item = newItems.begin(); + for ( ; item != newItems.end() && !groupChanged; ++item ) + { + SMESHDS_SubMesh * itemDS = _impl->GetMeshDS()->MeshElements( *item ); + groupChanged = ( !itemDS || !oldDS->ContainsSubMesh( itemDS )); + } + } + } + // update hypotheses and submeshes if necessary + if ( groupChanged ) + { + // get a new group shape + GEOM_Client* geomClient = _gen_i->GetShapeReader(); + if ( !geomClient ) continue; + TCollection_AsciiString groupIOR = _gen_i->GetGeomEngine()->GetStringFromIOR( groupObj ); + geomClient->RemoveShapeFromBuffer( groupIOR ); + TopoDS_Shape newGroupShape = _gen_i->GeomObjectToShape( groupObj ); + // update hypotheses + list hyps = _impl->GetHypothesisList(oldGroupShape); + list ::iterator hypIt; + for ( hypIt = hyps.begin(); hypIt != hyps.end(); ++hypIt ) + { + _impl->RemoveHypothesis( oldGroupShape, (*hypIt)->GetID()); + _impl->AddHypothesis ( newGroupShape, (*hypIt)->GetID()); + } + // care of submeshes + SMESH_subMesh* newSubmesh = _impl->GetSubMesh( newGroupShape ); + int newID = newSubmesh->GetId(); + if ( newID != oldID ) { + _mapSubMesh [ newID ] = newSubmesh; + _mapSubMesh_i [ newID ] = _mapSubMesh_i [ oldID ]; + _mapSubMeshIor[ newID ] = _mapSubMeshIor[ oldID ]; + _mapSubMesh.erase (oldID); + _mapSubMesh_i.erase (oldID); + _mapSubMeshIor.erase(oldID); + _mapSubMesh_i [ newID ]->changeLocalId( newID ); + } + } + } +} + //============================================================================= /*! * @@ -1142,17 +1372,16 @@ void SMESH_Mesh_i::SetImpl(::SMESH_Mesh * impl) return *_impl; } - //============================================================================= /*! - * + * Return mesh editor */ //============================================================================= SMESH::SMESH_MeshEditor_ptr SMESH_Mesh_i::GetMeshEditor() { // Create MeshEditor - SMESH_MeshEditor_i *aMeshEditor = new SMESH_MeshEditor_i( _impl ); + SMESH_MeshEditor_i *aMeshEditor = new SMESH_MeshEditor_i( this, false ); SMESH::SMESH_MeshEditor_var aMesh = aMeshEditor->_this(); // Update Python script @@ -1161,12 +1390,53 @@ SMESH::SMESH_MeshEditor_ptr SMESH_Mesh_i::GetMeshEditor() return aMesh._retn(); } +//============================================================================= +/*! + * Return mesh edition previewer + */ +//============================================================================= + +SMESH::SMESH_MeshEditor_ptr SMESH_Mesh_i::GetMeshEditPreviewer() +{ + SMESH_MeshEditor_i *aMeshEditor = new SMESH_MeshEditor_i( this, true ); + SMESH::SMESH_MeshEditor_var aMesh = aMeshEditor->_this(); + return aMesh._retn(); +} + +//============================================================================= +/*! + * + */ +//============================================================================= +void SMESH_Mesh_i::SetAutoColor(CORBA::Boolean theAutoColor) throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + _impl->SetAutoColor(theAutoColor); +} + +//============================================================================= +/*! + * + */ +//============================================================================= +CORBA::Boolean SMESH_Mesh_i::GetAutoColor() throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + return _impl->GetAutoColor(); +} + + //============================================================================= /*! * Export in different formats */ //============================================================================= +CORBA::Boolean SMESH_Mesh_i::HasDuplicatedGroupNamesMED() +{ + return _impl->HasDuplicatedGroupNamesMED(); +} + static void PrepareForWriting (const char* file) { TCollection_AsciiString aFullName ((char*)file); @@ -1194,29 +1464,16 @@ static void PrepareForWriting (const char* file) THROW_SALOME_CORBA_EXCEPTION(msg.ToCString(), SALOME::BAD_PARAM); } } else { - // nonexisting file - TCollection_AsciiString aDirName = aPath.TrekValue(aPath.TrekLength()); - aPath.UpTrek(); - aPath.SetName(aDirName); - aPath.SetExtension(""); - OSD_Directory aDir (aPath); - TCollection_AsciiString aFullDirName; - aPath.SystemName(aFullDirName); - if (aDir.Exists()) { - aFile.Reset(); - aFile.Build(OSD_WriteOnly, OSD_Protection()); - if (aFile.Failed()) { - TCollection_AsciiString msg ("You cannot write to directory "); - msg += aFullDirName + "."; - THROW_SALOME_CORBA_EXCEPTION(msg.ToCString(), SALOME::BAD_PARAM); - } else { - aFile.Close(); - aFile.Remove(); - } - } else { - TCollection_AsciiString msg ("Directory "); - msg += aFullDirName + " does not exist."; + // nonexisting file; check if it can be created + aFile.Reset(); + aFile.Build(OSD_WriteOnly, OSD_Protection()); + if (aFile.Failed()) { + TCollection_AsciiString msg ("You cannot create the file "); + msg += aFullName + ". Check the directory existance and access rights."; THROW_SALOME_CORBA_EXCEPTION(msg.ToCString(), SALOME::BAD_PARAM); + } else { + aFile.Close(); + aFile.Remove(); } } } @@ -1358,6 +1615,13 @@ CORBA::Long SMESH_Mesh_i::NbEdges()throw(SALOME::SALOME_Exception) return _impl->NbEdges(); } +CORBA::Long SMESH_Mesh_i::NbEdgesOfOrder(SMESH::ElementOrder order) + throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + return _impl->NbEdges( (SMDSAbs_ElementOrder) order); +} + //============================================================================= /*! * @@ -1387,6 +1651,27 @@ CORBA::Long SMESH_Mesh_i::NbPolygons()throw(SALOME::SALOME_Exception) return _impl->NbPolygons(); } +CORBA::Long SMESH_Mesh_i::NbFacesOfOrder(SMESH::ElementOrder order) + throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + return _impl->NbFaces( (SMDSAbs_ElementOrder) order); +} + +CORBA::Long SMESH_Mesh_i::NbTrianglesOfOrder(SMESH::ElementOrder order) + throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + return _impl->NbTriangles( (SMDSAbs_ElementOrder) order); +} + +CORBA::Long SMESH_Mesh_i::NbQuadranglesOfOrder(SMESH::ElementOrder order) + throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + return _impl->NbQuadrangles( (SMDSAbs_ElementOrder) order); +} + //============================================================================= /*! * @@ -1428,6 +1713,41 @@ CORBA::Long SMESH_Mesh_i::NbPolyhedrons()throw(SALOME::SALOME_Exception) return _impl->NbPolyhedrons(); } +CORBA::Long SMESH_Mesh_i::NbVolumesOfOrder(SMESH::ElementOrder order) + throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + return _impl->NbVolumes( (SMDSAbs_ElementOrder) order); +} + +CORBA::Long SMESH_Mesh_i::NbTetrasOfOrder(SMESH::ElementOrder order) + throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + return _impl->NbTetras( (SMDSAbs_ElementOrder) order); +} + +CORBA::Long SMESH_Mesh_i::NbHexasOfOrder(SMESH::ElementOrder order) + throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + return _impl->NbHexas( (SMDSAbs_ElementOrder) order); +} + +CORBA::Long SMESH_Mesh_i::NbPyramidsOfOrder(SMESH::ElementOrder order) + throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + return _impl->NbPyramids( (SMDSAbs_ElementOrder) order); +} + +CORBA::Long SMESH_Mesh_i::NbPrismsOfOrder(SMESH::ElementOrder order) + throw(SALOME::SALOME_Exception) +{ + Unexpect aCatch(SALOME_SalomeException); + return _impl->NbPrisms( (SMDSAbs_ElementOrder) order); +} + //============================================================================= /*! * @@ -1458,17 +1778,19 @@ char* SMESH_Mesh_i::Dump() //============================================================================= SMESH::long_array* SMESH_Mesh_i::GetIDs() { - SMESH::long_array_var aResult = new SMESH::long_array(); - SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); - int aMinId = aSMESHDS_Mesh->MinElementID(); - int aMaxId = aSMESHDS_Mesh->MaxElementID(); +// SMESH::long_array_var aResult = new SMESH::long_array(); +// SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); +// int aMinId = aSMESHDS_Mesh->MinElementID(); +// int aMaxId = aSMESHDS_Mesh->MaxElementID(); - aResult->length(aMaxId - aMinId + 1); +// aResult->length(aMaxId - aMinId + 1); - for (int i = 0, id = aMinId; id <= aMaxId; id++ ) - aResult[i++] = id; +// for (int i = 0, id = aMinId; id <= aMaxId; id++ ) +// aResult[i++] = id; - return aResult._retn(); +// return aResult._retn(); + // PAL12398 + return GetElementsId(); } //============================================================================= @@ -1576,3 +1898,584 @@ SMESH::ElementType SMESH_Mesh_i::GetElementType( const CORBA::Long id, const boo { return ( SMESH::ElementType )_impl->GetElementType( id, iselem ); } + + +//============================================================================= +/*! + * Returns ID of elements for given submesh + */ +//============================================================================= +SMESH::long_array* SMESH_Mesh_i::GetSubMeshElementsId(const CORBA::Long ShapeID) + throw (SALOME::SALOME_Exception) +{ + SMESH::long_array_var aResult = new SMESH::long_array(); + + SMESH_subMesh* SM = _impl->GetSubMeshContaining(ShapeID); + if(!SM) return aResult._retn(); + + SMESHDS_SubMesh* SDSM = SM->GetSubMeshDS(); + if(!SDSM) return aResult._retn(); + + aResult->length(SDSM->NbElements()); + + SMDS_ElemIteratorPtr eIt = SDSM->GetElements(); + int i = 0; + while ( eIt->more() ) { + aResult[i++] = eIt->next()->GetID(); + } + + return aResult._retn(); +} + + +//============================================================================= +/*! + * Returns ID of nodes for given submesh + * If param all==true - returns all nodes, else - + * returns only nodes on shapes. + */ +//============================================================================= +SMESH::long_array* SMESH_Mesh_i::GetSubMeshNodesId(const CORBA::Long ShapeID, CORBA::Boolean all) + throw (SALOME::SALOME_Exception) +{ + SMESH::long_array_var aResult = new SMESH::long_array(); + + SMESH_subMesh* SM = _impl->GetSubMeshContaining(ShapeID); + if(!SM) return aResult._retn(); + + SMESHDS_SubMesh* SDSM = SM->GetSubMeshDS(); + if(!SDSM) return aResult._retn(); + + set theElems; + if( !all || (SDSM->NbElements()==0) ) { // internal nodes or vertex submesh + SMDS_NodeIteratorPtr nIt = SDSM->GetNodes(); + while ( nIt->more() ) { + const SMDS_MeshNode* elem = nIt->next(); + theElems.insert( elem->GetID() ); + } + } + else { // all nodes of submesh elements + SMDS_ElemIteratorPtr eIt = SDSM->GetElements(); + while ( eIt->more() ) { + const SMDS_MeshElement* anElem = eIt->next(); + SMDS_ElemIteratorPtr nIt = anElem->nodesIterator(); + while ( nIt->more() ) { + const SMDS_MeshElement* elem = nIt->next(); + theElems.insert( elem->GetID() ); + } + } + } + + aResult->length(theElems.size()); + set::iterator itElem; + int i = 0; + for ( itElem = theElems.begin(); itElem != theElems.end(); itElem++ ) + aResult[i++] = *itElem; + + return aResult._retn(); +} + + +//============================================================================= +/*! + * Returns type of elements for given submesh + */ +//============================================================================= +SMESH::ElementType SMESH_Mesh_i::GetSubMeshElementType(const CORBA::Long ShapeID) + throw (SALOME::SALOME_Exception) +{ + SMESH_subMesh* SM = _impl->GetSubMeshContaining(ShapeID); + if(!SM) return SMESH::ALL; + + SMESHDS_SubMesh* SDSM = SM->GetSubMeshDS(); + if(!SDSM) return SMESH::ALL; + + if(SDSM->NbElements()==0) + return (SM->GetSubShape().ShapeType() == TopAbs_VERTEX) ? SMESH::NODE : SMESH::ALL; + + SMDS_ElemIteratorPtr eIt = SDSM->GetElements(); + const SMDS_MeshElement* anElem = eIt->next(); + return ( SMESH::ElementType ) anElem->GetType(); +} + + +//============================================================================= +/*! + * + */ +//============================================================================= + +CORBA::LongLong SMESH_Mesh_i::GetMeshPtr() +{ + CORBA::LongLong pointeur = CORBA::LongLong(_impl); + cerr << "CORBA::LongLong SMESH_Mesh_i::GetMeshPtr() " << pointeur << endl; + return pointeur; +} + + +//============================================================================= +/*! + * Get XYZ coordinates of node as list of double + * If there is not node for given ID - returns empty list + */ +//============================================================================= + +SMESH::double_array* SMESH_Mesh_i::GetNodeXYZ(const CORBA::Long id) +{ + SMESH::double_array_var aResult = new SMESH::double_array(); + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) + return aResult._retn(); + + // find node + const SMDS_MeshNode* aNode = aSMESHDS_Mesh->FindNode(id); + if(!aNode) + return aResult._retn(); + + // add coordinates + aResult->length(3); + aResult[0] = aNode->X(); + aResult[1] = aNode->Y(); + aResult[2] = aNode->Z(); + return aResult._retn(); +} + + +//============================================================================= +/*! + * For given node returns list of IDs of inverse elements + * If there is not node for given ID - returns empty list + */ +//============================================================================= + +SMESH::long_array* SMESH_Mesh_i::GetNodeInverseElements(const CORBA::Long id) +{ + SMESH::long_array_var aResult = new SMESH::long_array(); + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) + return aResult._retn(); + + // find node + const SMDS_MeshNode* aNode = aSMESHDS_Mesh->FindNode(id); + if(!aNode) + return aResult._retn(); + + // find inverse elements + SMDS_ElemIteratorPtr eIt = aNode->GetInverseElementIterator(); + TColStd_SequenceOfInteger IDs; + while(eIt->more()) { + const SMDS_MeshElement* elem = eIt->next(); + IDs.Append(elem->GetID()); + } + if(IDs.Length()>0) { + aResult->length(IDs.Length()); + int i = 1; + for(; i<=IDs.Length(); i++) { + aResult[i-1] = IDs.Value(i); + } + } + return aResult._retn(); +} + +//============================================================================= +/*! + * \brief Return position of a node on shape + */ +//============================================================================= + +SMESH::NodePosition* SMESH_Mesh_i::GetNodePosition(CORBA::Long NodeID) +{ + SMESH::NodePosition* aNodePosition = new SMESH::NodePosition(); + aNodePosition->shapeID = 0; + aNodePosition->shapeType = GEOM::SHAPE; + + SMESHDS_Mesh* mesh = _impl->GetMeshDS(); + if ( !mesh ) return aNodePosition; + + if ( const SMDS_MeshNode* aNode = mesh->FindNode(NodeID) ) + { + if ( SMDS_PositionPtr pos = aNode->GetPosition() ) + { + aNodePosition->shapeID = pos->GetShapeId(); + switch ( pos->GetTypeOfPosition() ) { + case SMDS_TOP_EDGE: + aNodePosition->shapeType = GEOM::EDGE; + aNodePosition->params.length(1); + aNodePosition->params[0] = + static_cast( pos.get() )->GetUParameter(); + break; + case SMDS_TOP_FACE: + aNodePosition->shapeType = GEOM::FACE; + aNodePosition->params.length(2); + aNodePosition->params[0] = + static_cast( pos.get() )->GetUParameter(); + aNodePosition->params[1] = + static_cast( pos.get() )->GetVParameter(); + break; + case SMDS_TOP_VERTEX: + aNodePosition->shapeType = GEOM::VERTEX; + break; + case SMDS_TOP_3DSPACE: + if ( TopExp_Explorer(_impl->GetShapeToMesh(), TopAbs_SOLID).More() ) + aNodePosition->shapeType = GEOM::SOLID; + else if ( TopExp_Explorer(_impl->GetShapeToMesh(), TopAbs_SHELL).More() ) + aNodePosition->shapeType = GEOM::SHELL; + break; + default:; + } + } + } + return aNodePosition; +} + +//============================================================================= +/*! + * If given element is node returns IDs of shape from position + * If there is not node for given ID - returns -1 + */ +//============================================================================= + +CORBA::Long SMESH_Mesh_i::GetShapeID(const CORBA::Long id) +{ + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) + return -1; + + // try to find node + const SMDS_MeshNode* aNode = aSMESHDS_Mesh->FindNode(id); + if(aNode) { + SMDS_PositionPtr pos = aNode->GetPosition(); + if(!pos) + return -1; + else + return pos->GetShapeId(); + } + + return -1; +} + + +//============================================================================= +/*! + * For given element returns ID of result shape after + * ::FindShape() from SMESH_MeshEditor + * If there is not element for given ID - returns -1 + */ +//============================================================================= + +CORBA::Long SMESH_Mesh_i::GetShapeIDForElem(const CORBA::Long id) +{ + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) + return -1; + + // try to find element + const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(id); + if(!elem) + return -1; + + //SMESH::SMESH_MeshEditor_var aMeshEditor = SMESH_Mesh_i::GetMeshEditor(); + ::SMESH_MeshEditor aMeshEditor(_impl); + int index = aMeshEditor.FindShape( elem ); + if(index>0) + return index; + + return -1; +} + + +//============================================================================= +/*! + * Returns number of nodes for given element + * If there is not element for given ID - returns -1 + */ +//============================================================================= + +CORBA::Long SMESH_Mesh_i::GetElemNbNodes(const CORBA::Long id) +{ + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) return -1; + // try to find element + const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(id); + if(!elem) return -1; + return elem->NbNodes(); +} + + +//============================================================================= +/*! + * Returns ID of node by given index for given element + * If there is not element for given ID - returns -1 + * If there is not node for given index - returns -2 + */ +//============================================================================= + +CORBA::Long SMESH_Mesh_i::GetElemNode(const CORBA::Long id, const CORBA::Long index) +{ + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) return -1; + const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(id); + if(!elem) return -1; + if( index>=elem->NbNodes() || index<0 ) return -1; + return elem->GetNode(index)->GetID(); +} + +//============================================================================= +/*! + * Returns IDs of nodes of given element + */ +//============================================================================= + +SMESH::long_array* SMESH_Mesh_i::GetElemNodes(const CORBA::Long id) +{ + SMESH::long_array_var aResult = new SMESH::long_array(); + if ( SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS() ) + { + if ( const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(id) ) + { + aResult->length( elem->NbNodes() ); + for ( int i = 0; i < elem->NbNodes(); ++i ) + aResult[ i ] = elem->GetNode( i )->GetID(); + } + } + return aResult._retn(); +} + +//============================================================================= +/*! + * Returns true if given node is medium node + * in given quadratic element + */ +//============================================================================= + +CORBA::Boolean SMESH_Mesh_i::IsMediumNode(const CORBA::Long ide, const CORBA::Long idn) +{ + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) return false; + // try to find node + const SMDS_MeshNode* aNode = aSMESHDS_Mesh->FindNode(idn); + if(!aNode) return false; + // try to find element + const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(ide); + if(!elem) return false; + + return elem->IsMediumNode(aNode); +} + + +//============================================================================= +/*! + * Returns true if given node is medium node + * in one of quadratic elements + */ +//============================================================================= + +CORBA::Boolean SMESH_Mesh_i::IsMediumNodeOfAnyElem(const CORBA::Long idn, + SMESH::ElementType theElemType) +{ + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) return false; + + // try to find node + const SMDS_MeshNode* aNode = aSMESHDS_Mesh->FindNode(idn); + if(!aNode) return false; + + SMESH_MesherHelper aHelper( *(_impl) ); + + SMDSAbs_ElementType aType; + if(theElemType==SMESH::EDGE) aType = SMDSAbs_Edge; + else if(theElemType==SMESH::FACE) aType = SMDSAbs_Face; + else if(theElemType==SMESH::VOLUME) aType = SMDSAbs_Volume; + else aType = SMDSAbs_All; + + return aHelper.IsMedium(aNode,aType); +} + + +//============================================================================= +/*! + * Returns number of edges for given element + */ +//============================================================================= + +CORBA::Long SMESH_Mesh_i::ElemNbEdges(const CORBA::Long id) +{ + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) return -1; + const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(id); + if(!elem) return -1; + return elem->NbEdges(); +} + + +//============================================================================= +/*! + * Returns number of faces for given element + */ +//============================================================================= + +CORBA::Long SMESH_Mesh_i::ElemNbFaces(const CORBA::Long id) +{ + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) return -1; + const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(id); + if(!elem) return -1; + return elem->NbFaces(); +} + + +//============================================================================= +/*! + * Returns true if given element is polygon + */ +//============================================================================= + +CORBA::Boolean SMESH_Mesh_i::IsPoly(const CORBA::Long id) +{ + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) return false; + const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(id); + if(!elem) return false; + return elem->IsPoly(); +} + + +//============================================================================= +/*! + * Returns true if given element is quadratic + */ +//============================================================================= + +CORBA::Boolean SMESH_Mesh_i::IsQuadratic(const CORBA::Long id) +{ + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) return false; + const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(id); + if(!elem) return false; + return elem->IsQuadratic(); +} + + +//============================================================================= +/*! + * Returns bary center for given element + */ +//============================================================================= + +SMESH::double_array* SMESH_Mesh_i::BaryCenter(const CORBA::Long id) +{ + SMESH::double_array_var aResult = new SMESH::double_array(); + SMESHDS_Mesh* aSMESHDS_Mesh = _impl->GetMeshDS(); + if ( aSMESHDS_Mesh == NULL ) + return aResult._retn(); + + const SMDS_MeshElement* elem = aSMESHDS_Mesh->FindElement(id); + if(!elem) + return aResult._retn(); + + if(elem->GetType()==SMDSAbs_Volume) { + SMDS_VolumeTool aTool; + if(aTool.Set(elem)) { + aResult->length(3); + if (!aTool.GetBaryCenter( aResult[0], aResult[1], aResult[2]) ) + aResult->length(0); + } + } + else { + SMDS_ElemIteratorPtr anIt = elem->nodesIterator(); + int nbn = 0; + double x=0., y=0., z=0.; + for(; anIt->more(); ) { + nbn++; + const SMDS_MeshNode* aNode = static_cast(anIt->next()); + x += aNode->X(); + y += aNode->Y(); + z += aNode->Z(); + } + if(nbn>0) { + // add coordinates + aResult->length(3); + aResult[0] = x/nbn; + aResult[1] = y/nbn; + aResult[2] = z/nbn; + } + } + + return aResult._retn(); +} + + +//============================================================================= +/*! + * Create and publish group servants if any groups were imported or created anyhow + */ +//============================================================================= + +void SMESH_Mesh_i::CreateGroupServants() +{ + SALOMEDS::Study_ptr aStudy = _gen_i->GetCurrentStudy(); + + ::SMESH_Mesh::GroupIteratorPtr groupIt = _impl->GetGroups(); + while ( groupIt->more() ) + { + ::SMESH_Group* group = groupIt->next(); + int anId = group->GetGroupDS()->GetID(); + + map::iterator it = _mapGroups.find(anId); + if ( it != _mapGroups.end() && !CORBA::is_nil( it->second )) + continue; + + SMESH_GroupBase_i* aGroupImpl; + TopoDS_Shape shape; + if ( SMESHDS_GroupOnGeom* groupOnGeom = + dynamic_cast( group->GetGroupDS() )) + { + aGroupImpl = new SMESH_GroupOnGeom_i( SMESH_Gen_i::GetPOA(), this, anId ); + shape = groupOnGeom->GetShape(); + } + else { + aGroupImpl = new SMESH_Group_i( SMESH_Gen_i::GetPOA(), this, anId ); + } + + // To ensure correct mapping of servant and correct reference counting in GenericObj_i + SMESH_Gen_i::GetPOA()->activate_object( aGroupImpl ); + aGroupImpl->Register(); + + SMESH::SMESH_GroupBase_var groupVar = + SMESH::SMESH_GroupBase::_narrow( aGroupImpl->_this() ); + _mapGroups[anId] = SMESH::SMESH_GroupBase::_duplicate( groupVar ); + + // register CORBA object for persistence + int nextId = _gen_i->RegisterObject( groupVar ); + if(MYDEBUG) MESSAGE( "Add group to map with id = "<< nextId); + + // publishing of the groups in the study + if ( !aStudy->_is_nil() ) { + GEOM::GEOM_Object_var shapeVar = _gen_i->ShapeToGeomObject( shape ); + _gen_i->PublishGroup( aStudy, _this(), groupVar, shapeVar, groupVar->GetName()); + } + } +} + +//============================================================================= +/*! + * \brief Return groups cantained in _mapGroups by their IDs + */ +//============================================================================= + +SMESH::ListOfGroups* SMESH_Mesh_i::GetGroups(const list& groupIDs) const +{ + int nbGroups = groupIDs.size(); + SMESH::ListOfGroups_var aList = new SMESH::ListOfGroups(); + aList->length( nbGroups ); + + list::const_iterator ids = groupIDs.begin(); + for ( nbGroups = 0; ids != groupIDs.end(); ++ids ) + { + map::const_iterator it = _mapGroups.find( *ids ); + if ( it != _mapGroups.end() && !CORBA::is_nil( it->second )) + aList[nbGroups++] = SMESH::SMESH_GroupBase::_duplicate( it->second ); + } + aList->length( nbGroups ); + return aList._retn(); +}