X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Gen_i_1.cxx;h=1b1ccc4ea17c27c13d7974682a5a9b1edca3a87a;hp=30ef9e5c646f0a4cc84a465d185d85aa50c74ef7;hb=5552aec787c289730a35843d295811cfdadaacd3;hpb=7eda9ca931ed2a11cb5e4637e4ffe19f5c061115 diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx index 30ef9e5c6..1b1ccc4ea 100644 --- a/src/SMESH_I/SMESH_Gen_i_1.cxx +++ b/src/SMESH_I/SMESH_Gen_i_1.cxx @@ -26,6 +26,7 @@ #include "SMESH_Gen_i.hxx" +#include "SMESHDS_Mesh.hxx" #include "SMESH_Algo_i.hxx" #include "SMESH_Comment.hxx" #include "SMESH_Group_i.hxx" @@ -39,6 +40,7 @@ #include #include #include +#include #include #include @@ -161,10 +163,11 @@ long SMESH_Gen_i::GetBallElementsGroupsTag() bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) { - if(MYDEBUG) MESSAGE("CanPublishInStudy - "<_is_nil() ) return true; @@ -190,18 +193,26 @@ bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) //purpose : Put a result into a SALOMEDS::SObject_wrap or call UnRegister()! //======================================================================= -SALOMEDS::SObject_ptr SMESH_Gen_i::ObjectToSObject(SALOMEDS::Study_ptr theStudy, - CORBA::Object_ptr theObject) +SALOMEDS::SObject_ptr SMESH_Gen_i::ObjectToSObject(CORBA::Object_ptr theObject) { SALOMEDS::SObject_wrap aSO; - if ( !CORBA::is_nil( theStudy ) && !CORBA::is_nil( theObject )) + if ( !CORBA::is_nil( theObject )) { CORBA::String_var objStr = SMESH_Gen_i::GetORB()->object_to_string( theObject ); - aSO = theStudy->FindObjectIOR( objStr.in() ); + aSO = getStudyServant()->FindObjectIOR( objStr.in() ); } return aSO._retn(); } +//======================================================================= +//function : GetStudyPtr +//purpose : Get study from naming service +//======================================================================= +SALOMEDS::Study_var SMESH_Gen_i::getStudyServant() +{ + return SALOMEDS::Study::_duplicate(KERNEL::getStudyServant()); +} + //======================================================================= //function : objectToServant //purpose : @@ -254,18 +265,17 @@ TopoDS_Shape SMESH_Gen_i::GeomObjectToShape(GEOM::GEOM_Object_ptr theGeomObject) //purpose : //======================================================================= -static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy, - CORBA::Object_ptr theIOR, +static SALOMEDS::SObject_ptr publish(CORBA::Object_ptr theIOR, SALOMEDS::SObject_ptr theFatherObject, const int theTag = 0, const char* thePixMap = 0, const bool theSelectable = true) { - SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( theStudy, theIOR ); + SALOMEDS::Study_var theStudy = SMESH_Gen_i::getStudyServant(); + SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( theIOR ); SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder(); - SALOMEDS::SObject_wrap objAfter; - bool isNewSO = false; + bool isNewSO = false, isInUseCaseTree = false; if ( SO->_is_nil() ) { if ( theTag == 0 ) { @@ -276,22 +286,15 @@ static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy, { SO = aStudyBuilder->NewObjectToTag( theFatherObject, theTag ); isNewSO = true; - - // define the next tag after given one in the data tree to insert SObject - SALOMEDS::SObject_wrap curObj; - if ( theFatherObject->GetLastChildTag() > theTag ) - { - SALOMEDS::UseCaseIterator_wrap - anUseCaseIter = useCaseBuilder->GetUseCaseIterator(theFatherObject); - for ( ; anUseCaseIter->More(); anUseCaseIter->Next() ) { - curObj = anUseCaseIter->Value(); - if ( curObj->Tag() > theTag ) { - objAfter = curObj; - break; - } - } - } } + else + { + isInUseCaseTree = useCaseBuilder->IsUseCaseNode( SO ); + } + } + else + { + isInUseCaseTree = useCaseBuilder->IsUseCaseNode( SO ); } SALOMEDS::GenericAttribute_wrap anAttr; @@ -305,7 +308,9 @@ static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy, if ( !sameIOR ) { iorAttr->SetValue( objStr.in() ); - // UnRegister() !!! + // UnRegister() !!! --> random problems when meshing in parallel (yacs foreach) in + // distributed python scripts, because simultaneously created meshes are + // published into the same SO; as a result the mesh published first dies SALOME::GenericObj_var genObj = SALOME::GenericObj::_narrow( theIOR ); if ( !genObj->_is_nil() ) genObj->UnRegister(); @@ -324,13 +329,30 @@ static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy, selAttr->SetSelectable( false ); } + if ( !isNewSO ) + aStudyBuilder->RemoveReference( SO );// remove garbage reference (23336) + // add object to the use case tree // (to support tree representation customization and drag-n-drop) - if ( isNewSO ) + if ( isNewSO || !isInUseCaseTree ) { - if ( !CORBA::is_nil( objAfter ) ) + // define the next tag after given one in the data tree to insert SObject + SALOMEDS::SObject_wrap curObj, objAfter; + if ( theFatherObject->GetLastChildTag() > theTag && theTag > 0 ) + { + SALOMEDS::UseCaseIterator_wrap + anUseCaseIter = useCaseBuilder->GetUseCaseIterator(theFatherObject); + for ( ; anUseCaseIter->More(); anUseCaseIter->Next() ) { + curObj = anUseCaseIter->Value(); + if ( curObj->Tag() > theTag ) { + objAfter = curObj; + break; + } + } + } + if ( !CORBA::is_nil( objAfter )) useCaseBuilder->InsertBefore( SO, objAfter ); // insert at given tag - else if ( !useCaseBuilder->IsUseCaseNode( SO ) ) + else if ( !isInUseCaseTree ) useCaseBuilder->AppendTo( theFatherObject, SO ); // append to the end of list } return SO._retn(); @@ -346,8 +368,7 @@ void SMESH_Gen_i::SetName(SALOMEDS::SObject_ptr theSObject, const char* theDefaultName) { if ( !theSObject->_is_nil() ) { - SALOMEDS::Study_var aStudy = theSObject->GetStudy(); - SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::StudyBuilder_var aStudyBuilder = getStudyServant()->NewBuilder(); SALOMEDS::GenericAttribute_wrap anAttr = aStudyBuilder->FindOrCreateAttribute( theSObject, "AttributeName" ); SALOMEDS::AttributeName_wrap aNameAttr = anAttr; @@ -377,10 +398,9 @@ void SMESH_Gen_i::SetName(SALOMEDS::SObject_ptr theSObject, void SMESH_Gen_i::SetPixMap(SALOMEDS::SObject_ptr theSObject, const char* thePixMap) { - if ( !theSObject->_is_nil() && thePixMap && strlen( thePixMap )) + if ( !theSObject->_is_nil() && thePixMap && thePixMap && thePixMap[0] ) { - SALOMEDS::Study_var aStudy = theSObject->GetStudy(); - SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::StudyBuilder_var aStudyBuilder = getStudyServant()->NewBuilder(); SALOMEDS::GenericAttribute_wrap anAttr = aStudyBuilder->FindOrCreateAttribute( theSObject, "AttributePixMap" ); SALOMEDS::AttributePixMap_wrap aPMAttr = anAttr; @@ -393,21 +413,21 @@ void SMESH_Gen_i::SetPixMap(SALOMEDS::SObject_ptr theSObject, //purpose : //======================================================================= -static void addReference (SALOMEDS::Study_ptr theStudy, - SALOMEDS::SObject_ptr theSObject, +static void addReference (SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theToObject, int theTag = 0) { - SALOMEDS::SObject_wrap aToObjSO = SMESH_Gen_i::ObjectToSObject( theStudy, theToObject ); + SALOMEDS::Study_var aStudy = SMESH_Gen_i::getStudyServant(); + SALOMEDS::SObject_wrap aToObjSO = SMESH_Gen_i::ObjectToSObject( theToObject ); if ( !aToObjSO->_is_nil() && !theSObject->_is_nil() ) { - SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); + SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); SALOMEDS::SObject_wrap aReferenceSO; if ( !theTag ) { // check if the reference to theToObject already exists // and find a free label for the reference object bool isReferred = false; int tag = 1; - SALOMEDS::ChildIterator_wrap anIter = theStudy->NewChildIterator( theSObject ); + SALOMEDS::ChildIterator_wrap anIter = aStudy->NewChildIterator( theSObject ); for ( ; !isReferred && anIter->More(); anIter->Next(), ++tag ) { SALOMEDS::SObject_wrap curSO = anIter->Value(); if ( curSO->ReferencedObject( aReferenceSO.inout() )) { @@ -434,7 +454,7 @@ static void addReference (SALOMEDS::Study_ptr theStudy, // add reference to the use case tree // (to support tree representation customization and drag-n-drop) - SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder(); + SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = aStudy->GetUseCaseBuilder(); SALOMEDS::UseCaseIterator_wrap useCaseIter = useCaseBuilder->GetUseCaseIterator(theSObject); for ( ; useCaseIter->More(); useCaseIter->Next() ) { @@ -454,42 +474,43 @@ static void addReference (SALOMEDS::Study_ptr theStudy, */ //============================================================================= -SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy, - SALOMEDS::SObject_ptr theSObject, +SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theIOR, const char* theName) throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); SALOMEDS::SObject_wrap aSO; - if ( CORBA::is_nil( theStudy ) || CORBA::is_nil( theIOR )) + if ( !myIsEnablePublish ) + return aSO._retn(); + if ( CORBA::is_nil( theIOR )) return aSO._retn(); if(MYDEBUG) MESSAGE("PublishInStudy"); // Publishing a mesh SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( theIOR ); if( !aMesh->_is_nil() ) - aSO = PublishMesh( theStudy, aMesh, theName ); + aSO = PublishMesh( aMesh, theName ); // Publishing a sub-mesh SMESH::SMESH_subMesh_var aSubMesh = SMESH::SMESH_subMesh::_narrow( theIOR ); if( aSO->_is_nil() && !aSubMesh->_is_nil() ) { GEOM::GEOM_Object_var aShapeObject = aSubMesh->GetSubShape(); aMesh = aSubMesh->GetFather(); - aSO = PublishSubMesh( theStudy, aMesh, aSubMesh, aShapeObject, theName ); + aSO = PublishSubMesh( aMesh, aSubMesh, aShapeObject, theName ); } // Publishing a hypothesis or algorithm SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow( theIOR ); if ( aSO->_is_nil() && !aHyp->_is_nil() ) - aSO = PublishHypothesis( theStudy, aHyp ); + aSO = PublishHypothesis( aHyp, theName ); // Publishing a group SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow(theIOR); if ( aSO->_is_nil() && !aGroup->_is_nil() ) { GEOM::GEOM_Object_var aShapeObject; aMesh = aGroup->GetMesh(); - aSO = PublishGroup( theStudy, aMesh, aGroup, aShapeObject, theName ); + aSO = PublishGroup( aMesh, aGroup, aShapeObject, theName ); } if(MYDEBUG) MESSAGE("PublishInStudy_END"); @@ -501,17 +522,17 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy //purpose : //======================================================================= -SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent(SALOMEDS::Study_ptr theStudy) +SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent() { - if ( CORBA::is_nil( theStudy )) - return SALOMEDS::SComponent::_nil(); if(MYDEBUG) MESSAGE("PublishComponent"); + if ( !myIsEnablePublish ) + return SALOMEDS::SComponent::_nil(); - SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); - SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder(); + SALOMEDS::StudyBuilder_var aStudyBuilder = getStudyServant()->NewBuilder(); + SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = getStudyServant()->GetUseCaseBuilder(); CORBA::String_var compDataType = ComponentDataType(); - SALOMEDS::SComponent_wrap father = theStudy->FindComponent( compDataType.in() ); + SALOMEDS::SComponent_wrap father = getStudyServant()->FindComponent( compDataType.in() ); if ( !CORBA::is_nil( father ) ) { // check that the component is added to the use case browser if ( !useCaseBuilder->IsUseCaseNode( father ) ) { @@ -554,21 +575,21 @@ SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent(SALOMEDS::Study_ptr theSt //purpose : //======================================================================= -SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, +SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SMESH::SMESH_Mesh_ptr theMesh, const char* theName) { - if ( CORBA::is_nil( theStudy ) || - CORBA::is_nil( theMesh )) - return SALOMEDS::SComponent::_nil(); + if ( !myIsEnablePublish ) + return SALOMEDS::SObject::_nil(); + if ( CORBA::is_nil( theMesh )) + return SALOMEDS::SObject::_nil(); if(MYDEBUG) MESSAGE("PublishMesh--IN"); // find or publish a mesh - SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theStudy, theMesh ); + SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theMesh ); if ( aMeshSO->_is_nil() ) { - SALOMEDS::SComponent_wrap father = PublishComponent( theStudy ); + SALOMEDS::SComponent_wrap father = PublishComponent(); if ( father->_is_nil() ) return aMeshSO._retn(); @@ -579,7 +600,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, else aTag++; - aMeshSO = publish (theStudy, theMesh, father, aTag, "ICON_SMESH_TREE_MESH_WARN" ); + aMeshSO = publish( theMesh, father, aTag, "ICON_SMESH_TREE_MESH_WARN" ); if ( aMeshSO->_is_nil() ) return aMeshSO._retn(); } @@ -589,7 +610,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, GEOM::GEOM_Object_var aShapeObject = theMesh->GetShapeToMesh(); if ( !CORBA::is_nil( aShapeObject )) { - addReference( theStudy, aMeshSO, aShapeObject, GetRefOnShapeTag() ); + addReference( aMeshSO, aShapeObject, GetRefOnShapeTag() ); // Publish global hypotheses @@ -597,8 +618,8 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, for ( CORBA::ULong i = 0; i < hypList->length(); i++ ) { SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow( hypList[ i ]); - SALOMEDS::SObject_wrap so = PublishHypothesis( theStudy, aHyp ); - AddHypothesisToShape( theStudy, theMesh, aShapeObject, aHyp ); + SALOMEDS::SObject_wrap so = PublishHypothesis( aHyp ); + AddHypothesisToShape( theMesh, aShapeObject, aHyp ); } } @@ -613,7 +634,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, SMESH::SMESH_subMesh_ptr aSubMesh = (*subIt).second->_this(); if ( !CORBA::is_nil( aSubMesh )) { aShapeObject = aSubMesh->GetSubShape(); - SALOMEDS::SObject_wrap( PublishSubMesh( theStudy, theMesh, aSubMesh, aShapeObject )); + SALOMEDS::SObject_wrap( PublishSubMesh( theMesh, aSubMesh, aShapeObject )); } } @@ -628,7 +649,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( aGroup ); if ( !aGeomGroup->_is_nil() ) aShapeObj = aGeomGroup->GetShape(); - SALOMEDS::SObject_wrap( PublishGroup( theStudy, theMesh, aGroup, aShapeObj )); + SALOMEDS::SObject_wrap( PublishGroup( theMesh, aGroup, aShapeObj )); } } @@ -641,22 +662,22 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, //purpose : //======================================================================= -SALOMEDS::SObject_ptr SMESH_Gen_i::PublishSubMesh (SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, +SALOMEDS::SObject_ptr SMESH_Gen_i::PublishSubMesh (SMESH::SMESH_Mesh_ptr theMesh, SMESH::SMESH_subMesh_ptr theSubMesh, GEOM::GEOM_Object_ptr theShapeObject, const char* theName) { - if (theStudy->_is_nil() || theMesh->_is_nil() || - theSubMesh->_is_nil() || theShapeObject->_is_nil() ) + if ( !myIsEnablePublish ) + return SALOMEDS::SObject::_nil(); + if ( theMesh->_is_nil() || theSubMesh->_is_nil() || theShapeObject->_is_nil() ) return SALOMEDS::SObject::_nil(); - SALOMEDS::SObject_wrap aSubMeshSO = ObjectToSObject( theStudy, theSubMesh ); + SALOMEDS::SObject_wrap aSubMeshSO = ObjectToSObject( theSubMesh ); if ( aSubMeshSO->_is_nil() ) { - SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theStudy, theMesh ); + SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theMesh ); if ( aMeshSO->_is_nil() ) { - aMeshSO = PublishMesh( theStudy, theMesh ); + aMeshSO = PublishMesh( theMesh ); if ( aMeshSO->_is_nil()) return SALOMEDS::SObject::_nil(); } @@ -695,8 +716,8 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishSubMesh (SALOMEDS::Study_ptr theS } // Find or create submesh root - SALOMEDS::SObject_wrap aRootSO = publish (theStudy, CORBA::Object::_nil(), - aMeshSO, aRootTag, 0, false ); + SALOMEDS::SObject_wrap aRootSO = publish ( CORBA::Object::_nil(), + aMeshSO, aRootTag, 0, false ); if ( aRootSO->_is_nil() ) return aSubMeshSO._retn(); @@ -706,7 +727,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishSubMesh (SALOMEDS::Study_ptr theS SMESH::array_of_ElementType_var elemTypes = theSubMesh->GetTypes(); const int isEmpty = ( elemTypes->length() == 0 ); const char* pm[2] = { "ICON_SMESH_TREE_MESH", "ICON_SMESH_TREE_MESH_WARN" }; - aSubMeshSO = publish (theStudy, theSubMesh, aRootSO, 0, pm[isEmpty] ); + aSubMeshSO = publish ( theSubMesh, aRootSO, 0, pm[isEmpty] ); if ( aSubMeshSO->_is_nil() ) return aSubMeshSO._retn(); } @@ -714,15 +735,15 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishSubMesh (SALOMEDS::Study_ptr theS // Add reference to theShapeObject - addReference( theStudy, aSubMeshSO, theShapeObject, 1 ); + addReference( aSubMeshSO, theShapeObject, 1 ); // Publish hypothesis SMESH::ListOfHypothesis_var hypList = theMesh->GetHypothesisList( theShapeObject ); for ( CORBA::ULong i = 0; i < hypList->length(); i++ ) { SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow( hypList[ i ]); - SALOMEDS::SObject_wrap so = PublishHypothesis( theStudy, aHyp ); - AddHypothesisToShape( theStudy, theMesh, theShapeObject, aHyp ); + SALOMEDS::SObject_wrap so = PublishHypothesis( aHyp ); + AddHypothesisToShape( theMesh, theShapeObject, aHyp ); } return aSubMeshSO._retn(); @@ -733,21 +754,22 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishSubMesh (SALOMEDS::Study_ptr theS //purpose : //======================================================================= -SALOMEDS::SObject_ptr SMESH_Gen_i::PublishGroup (SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, +SALOMEDS::SObject_ptr SMESH_Gen_i::PublishGroup (SMESH::SMESH_Mesh_ptr theMesh, SMESH::SMESH_GroupBase_ptr theGroup, GEOM::GEOM_Object_ptr theShapeObject, const char* theName) { - if (theStudy->_is_nil() || theMesh->_is_nil() || theGroup->_is_nil() ) + if ( !myIsEnablePublish ) + return SALOMEDS::SObject::_nil(); + if (theMesh->_is_nil() || theGroup->_is_nil() ) return SALOMEDS::SObject::_nil(); - SALOMEDS::SObject_wrap aGroupSO = ObjectToSObject( theStudy, theGroup ); + SALOMEDS::SObject_wrap aGroupSO = ObjectToSObject( theGroup ); if ( aGroupSO->_is_nil() ) { - SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theStudy, theMesh ); + SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theMesh ); if ( aMeshSO->_is_nil() ) { - aMeshSO = PublishInStudy( theStudy, SALOMEDS::SObject::_nil(), theMesh, ""); + aMeshSO = PublishInStudy( SALOMEDS::SObject::_nil(), theMesh, ""); if ( aMeshSO->_is_nil()) return SALOMEDS::SObject::_nil(); } @@ -757,22 +779,21 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishGroup (SALOMEDS::Study_ptr theStudy "Groups of Faces", "Groups of Volumes", "Groups of 0D Elements", "Groups of Balls" }; - // Currently, groups with heterogenous content are not supported + // Currently, groups with heterogeneous content are not supported if ( aType != SMESH::ALL ) { long aRootTag = GetNodeGroupsTag() + aType - 1; // Find or create groups root - SALOMEDS::SObject_wrap aRootSO = publish (theStudy, CORBA::Object::_nil(), - aMeshSO, aRootTag, 0, false ); + SALOMEDS::SObject_wrap aRootSO = publish ( CORBA::Object::_nil(), + aMeshSO, aRootTag, 0, false ); if ( aRootSO->_is_nil() ) return SALOMEDS::SObject::_nil(); if ( aType < sizeof(aRootNames)/sizeof(char*) ) SetName( aRootSO, aRootNames[aType] ); // Add new group to corresponding sub-tree - SMESH::array_of_ElementType_var elemTypes = theGroup->GetTypes(); - int isEmpty = ( elemTypes->length() == 0 ); + int isEmpty = false; std::string pm[2] = { "ICON_SMESH_TREE_GROUP", "ICON_SMESH_TREE_MESH_WARN" }; if ( SMESH::DownCast< SMESH_GroupOnFilter_i* > ( theGroup )) { @@ -789,7 +810,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishGroup (SALOMEDS::Study_ptr theStudy isEmpty = ( allElemTypes[i] != theGroup->GetType() ); } } - aGroupSO = publish (theStudy, theGroup, aRootSO, 0, pm[isEmpty].c_str() ); + aGroupSO = publish ( theGroup, aRootSO, 0, pm[isEmpty].c_str() ); } if ( aGroupSO->_is_nil() ) return aGroupSO._retn(); @@ -799,7 +820,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishGroup (SALOMEDS::Study_ptr theStudy //Add reference to geometry if ( !theShapeObject->_is_nil() ) - addReference( theStudy, aGroupSO, theShapeObject, 1 ); + addReference( aGroupSO, theShapeObject, 1 ); return aGroupSO._retn(); } @@ -810,20 +831,21 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishGroup (SALOMEDS::Study_ptr theStudy //======================================================================= SALOMEDS::SObject_ptr - SMESH_Gen_i::PublishHypothesis (SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Hypothesis_ptr theHyp, + SMESH_Gen_i::PublishHypothesis (SMESH::SMESH_Hypothesis_ptr theHyp, const char* theName) { if(MYDEBUG) MESSAGE("PublishHypothesis") - if (theStudy->_is_nil() || theHyp->_is_nil()) + if ( !myIsEnablePublish ) + return SALOMEDS::SObject::_nil(); + if (theHyp->_is_nil()) return SALOMEDS::SObject::_nil(); CORBA::String_var hypType = theHyp->GetName(); - SALOMEDS::SObject_wrap aHypSO = ObjectToSObject( theStudy, theHyp ); + SALOMEDS::SObject_wrap aHypSO = ObjectToSObject( theHyp ); if ( aHypSO->_is_nil() ) { - SALOMEDS::SComponent_wrap father = PublishComponent( theStudy ); + SALOMEDS::SComponent_wrap father = PublishComponent(); if ( father->_is_nil() ) return aHypSO._retn(); @@ -831,7 +853,7 @@ SALOMEDS::SObject_ptr bool isAlgo = ( !SMESH::SMESH_Algo::_narrow( theHyp )->_is_nil() ); int aRootTag = isAlgo ? GetAlgorithmsRootTag() : GetHypothesisRootTag(); SALOMEDS::SObject_wrap aRootSO = - publish (theStudy, CORBA::Object::_nil(),father, aRootTag, + publish (CORBA::Object::_nil(),father, aRootTag, isAlgo ? "ICON_SMESH_TREE_ALGO" : "ICON_SMESH_TREE_HYPO", false); SetName( aRootSO, isAlgo ? "Algorithms" : "Hypotheses" ); @@ -842,7 +864,7 @@ SALOMEDS::SObject_ptr string pluginName = myHypCreatorMap[ hypType.in() ]->GetModuleName(); if ( pluginName != "StdMeshers" ) aPmName = pluginName + "::" + aPmName; - aHypSO = publish( theStudy, theHyp, aRootSO, 0, aPmName.c_str() ); + aHypSO = publish( theHyp, aRootSO, 0, aPmName.c_str() ); } SetName( aHypSO, theName, hypType.in() ); @@ -851,15 +873,89 @@ SALOMEDS::SObject_ptr return aHypSO._retn(); } +//======================================================================= +//function : UpdateIcons +//purpose : update icons of a mesh and its children upon mesh modification +//======================================================================= + +void SMESH_Gen_i::UpdateIcons( SMESH::SMESH_Mesh_ptr theMesh ) +{ + SMESH_Mesh_i* mesh_i = SMESH::DownCast< SMESH_Mesh_i* >( theMesh ); + if ( ! mesh_i ) + return; + + SALOMEDS::SObject_wrap so = ObjectToSObject( theMesh ); + if ( so->_is_nil() ) + return; + + // set icon of the mesh + if ( mesh_i->NbNodes() == 0 ) + SetPixMap( so, "ICON_SMESH_TREE_MESH_WARN" ); + else if ( mesh_i->IsComputedOK() ) + SetPixMap( so, "ICON_SMESH_TREE_MESH" ); + else if ( mesh_i->HasShapeToMesh() ) + SetPixMap( so, "ICON_SMESH_TREE_MESH_PARTIAL" ); + else + SetPixMap( so, "ICON_SMESH_TREE_MESH_IMPORTED" ); + + // set icons of sub-objects + SALOMEDS::Study_var study = getStudyServant(); + SALOMEDS::ChildIterator_wrap iter = study->NewChildIterator( so ); + for ( ; iter->More(); iter->Next() ) + { + so = iter->Value(); // 1st level child - root of algos, hyps, sub-meshes or groups + if ( so->Tag() < SMESH::Tag_FirstSubMesh ) + continue; + + SALOMEDS::ChildIterator_wrap subIter = study->NewChildIterator( so ); + for ( ; subIter->More(); subIter->Next() ) + { + so = subIter->Value(); // 2nd level child - a sub-mesh or group + + CORBA::Object_var obj = SObjectToObject( so ); + SMESH::SMESH_IDSource_var idSrc = SMESH::SMESH_IDSource::_narrow( obj ); + if ( idSrc->_is_nil() ) + continue; + + SMESH::SMESH_GroupBase_var grp = SMESH::SMESH_GroupBase::_narrow( obj ); + SMESH::SMESH_GroupOnFilter_var gof = SMESH::SMESH_GroupOnFilter::_narrow( obj ); + const bool isGroup = !grp->_is_nil(); + const bool isGroupOnFilter = !gof->_is_nil(); + + bool isEmpty = ( mesh_i->NbNodes() == 0 ); + if ( !isEmpty ) + { + if ( isGroupOnFilter ) // GetTypes() can be very long on GroupOnFilter! + { + SMESH::long_array_var nbByType = mesh_i->GetNbElementsByType(); + isEmpty = ( nbByType[ grp->GetType() ] == 0 ); + } + else + { + SMESH::array_of_ElementType_var elemTypes = idSrc->GetTypes(); + isEmpty = ( elemTypes->length() == 0 ); + } + } + if ( isEmpty ) + SetPixMap( so, "ICON_SMESH_TREE_MESH_WARN"); + else if ( !isGroup ) + SetPixMap( so, "ICON_SMESH_TREE_MESH" ); + else if ( isGroupOnFilter ) + SetPixMap( so, "ICON_SMESH_TREE_GROUP_ON_FILTER" ); + else + SetPixMap( so, "ICON_SMESH_TREE_GROUP" ); + } + } +} + //======================================================================= //function : GetMeshOrSubmeshByShape //purpose : //======================================================================= SALOMEDS::SObject_ptr - SMESH_Gen_i::GetMeshOrSubmeshByShape (SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, - GEOM::GEOM_Object_ptr theShape) +SMESH_Gen_i::GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh, + GEOM::GEOM_Object_ptr theShape) { if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape") SALOMEDS::SObject_wrap aMeshOrSubMesh; @@ -877,12 +973,12 @@ SALOMEDS::SObject_ptr if ( !aShape.IsNull() && mesh_i && mesh_i->GetImpl().GetMeshDS() ) { SMESHDS_Mesh* meshDS = mesh_i->GetImpl().GetMeshDS(); if ( aShape.IsSame( meshDS->ShapeToMesh() )) - aMeshOrSubMesh = ObjectToSObject( theStudy, theMesh ); + aMeshOrSubMesh = ObjectToSObject( theMesh ); else { int shapeID = meshDS->ShapeToIndex( aShape ); SMESH::SMESH_subMesh_var aSubMesh = mesh_i->getSubMesh(shapeID); if ( !aSubMesh->_is_nil() ) - aMeshOrSubMesh = ObjectToSObject( theStudy, aSubMesh ); + aMeshOrSubMesh = ObjectToSObject( aSubMesh ); } } if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape--END") @@ -894,27 +990,26 @@ SALOMEDS::SObject_ptr //purpose : //======================================================================= -bool SMESH_Gen_i::AddHypothesisToShape(SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, +bool SMESH_Gen_i::AddHypothesisToShape(SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShape, SMESH::SMESH_Hypothesis_ptr theHyp) { if(MYDEBUG) MESSAGE("AddHypothesisToShape") - if (theStudy->_is_nil() || theMesh->_is_nil() || + if (theMesh->_is_nil() || theHyp->_is_nil() || (theShape->_is_nil() && theMesh->HasShapeToMesh()) ) return false; - SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theStudy, theMesh ); + SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theMesh ); if ( aMeshSO->_is_nil() ) - aMeshSO = PublishMesh( theStudy, theMesh ); - SALOMEDS::SObject_wrap aHypSO = PublishHypothesis( theStudy, theHyp ); + aMeshSO = PublishMesh( theMesh ); + SALOMEDS::SObject_wrap aHypSO = PublishHypothesis( theHyp ); if ( aMeshSO->_is_nil() || aHypSO->_is_nil()) return false; - // Find a mesh or submesh refering to theShape + // Find a mesh or submesh referring to theShape SALOMEDS::SObject_wrap aMeshOrSubMesh = - GetMeshOrSubmeshByShape( theStudy, theMesh, theShape ); + GetMeshOrSubmeshByShape( theMesh, theShape ); if ( aMeshOrSubMesh->_is_nil() ) { // publish submesh @@ -924,7 +1019,7 @@ bool SMESH_Gen_i::AddHypothesisToShape(SALOMEDS::Study_ptr theStudy, SMESHDS_Mesh* meshDS = mesh_i->GetImpl().GetMeshDS(); int shapeID = meshDS->ShapeToIndex( aShape ); SMESH::SMESH_subMesh_var aSubMesh = mesh_i->getSubMesh(shapeID); - aMeshOrSubMesh = PublishSubMesh( theStudy, theMesh, aSubMesh, theShape ); + aMeshOrSubMesh = PublishSubMesh( theMesh, aSubMesh, theShape ); } if ( aMeshOrSubMesh->_is_nil() ) return false; @@ -933,12 +1028,12 @@ bool SMESH_Gen_i::AddHypothesisToShape(SALOMEDS::Study_ptr theStudy, //Find or Create Applied Hypothesis root bool aIsAlgo = !SMESH::SMESH_Algo::_narrow( theHyp )->_is_nil(); SALOMEDS::SObject_wrap AHR = - publish (theStudy, CORBA::Object::_nil(), aMeshOrSubMesh, + publish (CORBA::Object::_nil(), aMeshOrSubMesh, aIsAlgo ? GetRefOnAppliedAlgorithmsTag() : GetRefOnAppliedHypothesisTag(), aIsAlgo ? "ICON_SMESH_TREE_ALGO" : "ICON_SMESH_TREE_HYPO", false); SetName( AHR, aIsAlgo ? "Applied algorithms" : "Applied hypotheses" ); - addReference( theStudy, AHR, theHyp ); + addReference( AHR, theHyp ); if(MYDEBUG) MESSAGE("AddHypothesisToShape--END") return true; @@ -949,17 +1044,16 @@ bool SMESH_Gen_i::AddHypothesisToShape(SALOMEDS::Study_ptr theStudy, //purpose : //======================================================================= -bool SMESH_Gen_i::RemoveHypothesisFromShape(SALOMEDS::Study_ptr theStudy, - SMESH::SMESH_Mesh_ptr theMesh, +bool SMESH_Gen_i::RemoveHypothesisFromShape(SMESH::SMESH_Mesh_ptr theMesh, GEOM::GEOM_Object_ptr theShape, SMESH::SMESH_Hypothesis_ptr theHyp) { - if (theStudy->_is_nil() || theMesh->_is_nil() || + if (theMesh->_is_nil() || theHyp->_is_nil() || (theShape->_is_nil() && theMesh->HasShapeToMesh())) return false; - SALOMEDS::SObject_wrap aHypSO = ObjectToSObject( theStudy, theHyp ); + SALOMEDS::SObject_wrap aHypSO = ObjectToSObject( theHyp ); if ( aHypSO->_is_nil() ) return false; @@ -967,13 +1061,13 @@ bool SMESH_Gen_i::RemoveHypothesisFromShape(SALOMEDS::Study_ptr theStudy // Find a mesh or sub-mesh referring to theShape SALOMEDS::SObject_wrap aMeshOrSubMesh = - GetMeshOrSubmeshByShape( theStudy, theMesh, theShape ); + GetMeshOrSubmeshByShape( theMesh, theShape ); if ( aMeshOrSubMesh->_is_nil() ) return false; // Find and remove a reference to aHypSO SALOMEDS::SObject_wrap aRef, anObj; - SALOMEDS::ChildIterator_wrap it = theStudy->NewChildIterator( aMeshOrSubMesh ); + SALOMEDS::ChildIterator_wrap it = getStudyServant()->NewChildIterator( aMeshOrSubMesh ); bool found = false; for ( it->InitEx( true ); ( it->More() && !found ); it->Next() ) { anObj = it->Value(); @@ -984,7 +1078,7 @@ bool SMESH_Gen_i::RemoveHypothesisFromShape(SALOMEDS::Study_ptr theStudy } if ( found ) { - SALOMEDS::StudyBuilder_var builder = theStudy->NewBuilder(); + SALOMEDS::StudyBuilder_var builder = getStudyServant()->NewBuilder(); builder->RemoveObject( anObj ); } } @@ -997,22 +1091,18 @@ bool SMESH_Gen_i::RemoveHypothesisFromShape(SALOMEDS::Study_ptr theStudy * \brief Stores names of variables that WILL be passes as parameters when calling * some method of a given object. * \param [in] theObject - the object whose a method WILL be called with \a theParameters. - * \param [in] theParameters - a string contating parameters separated by ':'. + * \param [in] theParameters - a string containing parameters separated by ':'. */ //================================================================================ void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theParameters) { - SALOMEDS::Study_var aStudy = GetCurrentStudy(); - if ( aStudy->_is_nil() ) - return; - // find variable names within theParameters myLastObj.clear(); myLastParameters.clear(); myLastParamIndex.clear(); /* vector holding indices of virables within the string - of all varibles used for theObject */ + of all variables used for theObject */ int nbVars = 0; int pos = 0, prevPos = 0, len = strlen( theParameters ); if ( len == 0 ) return; @@ -1023,7 +1113,7 @@ void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP if ( prevPos < pos ) { string val( theParameters + prevPos, theParameters + pos ); - if ( !aStudy->IsVariable( val.c_str() )) + if ( !getStudyServant()->IsVariable( val.c_str() )) val.clear(); myLastParameters.push_back( val ); nbVars += (! myLastParameters.back().empty() ); @@ -1041,18 +1131,18 @@ void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP return; // store - // (1) variable names in the string of all varibles used for theObject and + // (1) variable names in the string of all variables used for theObject and // (2) indices of found variables in myLastParamIndex. // remember theObject - SALOMEDS::SObject_wrap aSObj = ObjectToSObject(aStudy,theObject); + SALOMEDS::SObject_wrap aSObj = ObjectToSObject(theObject); if ( aSObj->_is_nil() ) return; CORBA::String_var anObjEntry = aSObj->GetID(); myLastObj = anObjEntry.in(); // get a string of variable names - SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::StudyBuilder_var aStudyBuilder = getStudyServant()->NewBuilder(); SALOMEDS::GenericAttribute_wrap anAttr = aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString" ); SALOMEDS::AttributeString_wrap aStringAttr = anAttr; @@ -1088,7 +1178,7 @@ void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP if ( pos < varStr.size() ) { varFound = ( varStr.compare( pos, myLastParameters[i].size(), myLastParameters[i] ) == 0 && - // same string begining but is length same? + // same string beginning but is length same? ( pos + myLastParameters[i].size() >= varStr.size() || separators.find( varStr[ pos+1 ]) != std::string::npos )); if ( varFound ) @@ -1121,15 +1211,11 @@ void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP std::vector< std::string > SMESH_Gen_i::GetAllParameters(const std::string& theObjectEntry) const { std::vector< std::string > varNames; - if ( myCurrentStudy->_is_nil() ) - return varNames; - SALOMEDS::SObject_wrap aSObj = myCurrentStudy->FindObjectID( theObjectEntry.c_str() ); - if ( myCurrentStudy->_is_nil() ) - return varNames; + SALOMEDS::SObject_wrap aSObj = getStudyServant()->FindObjectID( theObjectEntry.c_str() ); // get a string of variable names - SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder(); + SALOMEDS::StudyBuilder_var aStudyBuilder = getStudyServant()->NewBuilder(); SALOMEDS::GenericAttribute_wrap anAttr = aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString" ); SALOMEDS::AttributeString_wrap aStringAttr = anAttr; @@ -1174,7 +1260,7 @@ std::vector< std::string > SMESH_Gen_i::GetAllParameters(const std::string& theO // //const char* aParameters = theParameters; // // const char* aParameters = CORBA::string_dup(theParameters); // TCollection_AsciiString anInputParams; -// SALOMEDS::Study_var aStudy = GetCurrentStudy(); +// SALOMEDS::Study_var aStudy = getStudyServant(); // if( !aStudy->_is_nil() ) { // // SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(theParameters); // // for(int j=0;jlength();j++) { @@ -1223,7 +1309,7 @@ char* SMESH_Gen_i::GetParameters(CORBA::Object_ptr theObject) { CORBA::String_var aResult(""); - SALOMEDS::SObject_wrap aSObj = ObjectToSObject( myCurrentStudy, theObject ); + SALOMEDS::SObject_wrap aSObj = ObjectToSObject( theObject ); if ( !aSObj->_is_nil() ) { SALOMEDS::GenericAttribute_wrap attr; @@ -1235,3 +1321,96 @@ char* SMESH_Gen_i::GetParameters(CORBA::Object_ptr theObject) } return aResult._retn(); } + + + +// ============== +// Study context +// ============== + +//======================================================================= +//function : addObject +//purpose : register object in the internal map and return its id +//======================================================================= + +int StudyContext::addObject( const std::string& theIOR ) +{ + int nextId = getNextId(); + mapIdToIOR.Bind( nextId, theIOR ); + return nextId; +} + +//======================================================================= +//function : findId +//purpose : find the object id in the internal map by the IOR +//======================================================================= + +int StudyContext::findId( const std::string& theIOR ) +{ + TInt2StringMap::iterator imap; + for ( imap = mapIdToIOR.begin(); imap != mapIdToIOR.end(); ++imap ) { + if ( *imap == theIOR ) + return imap.Iterator().Key(); + } + return 0; +} + +//======================================================================= +//function : getIORbyId +//purpose : get object's IOR by id +//======================================================================= + +std::string StudyContext::getIORbyId( const int theId ) +{ + if ( mapIdToIOR.IsBound( theId ) ) + return mapIdToIOR( theId ); + return std::string(); +} + +//======================================================================= +//function : getIORbyOldId +//purpose : get object's IOR by old id +//======================================================================= + +std::string StudyContext::getIORbyOldId( const int theOldId ) +{ + if ( mapIdToId.IsBound( theOldId ) ) + return getIORbyId( mapIdToId( theOldId )); + return std::string(); +} + +//======================================================================= +//function : mapOldToNew +//purpose : maps old object id to the new one (used when restoring data) +//======================================================================= + +void StudyContext::mapOldToNew( const int oldId, const int newId ) +{ + mapIdToId.Bind( oldId, newId ); +} + +//======================================================================= +//function : getOldId +//purpose : get old id by a new one +//======================================================================= + +int StudyContext::getOldId( const int newId ) +{ + TInt2IntMap::iterator imap; + for ( imap = mapIdToId.begin(); imap != mapIdToId.end(); ++imap ) { + if ( *imap == newId ) + return imap.Iterator().Key(); + } + return 0; +} + +//======================================================================= +//function : Clear +//purpose : clear data +//======================================================================= + +void StudyContext::Clear() +{ + mapIdToIOR.Clear(); + mapIdToId.Clear(); +}