{
if(MYDEBUG) MESSAGE("CanPublishInStudy - "<<!CORBA::is_nil(getStudyServant()));
- if( !myIsEnablePublish )
+ if ( !myIsEnablePublish )
return false;
SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(theIOR);
if ( !sameIOR )
{
iorAttr->SetValue( objStr.in() );
- // UnRegister() !!! --> No: random problems when meshing in parallel (yacs foreach) in distributed python scripts
-// SALOME::GenericObj_var genObj = SALOME::GenericObj::_narrow( theIOR );
-// if ( !genObj->_is_nil() )
-// genObj->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();
}
}
{
Unexpect aCatch(SALOME_SalomeException);
SALOMEDS::SObject_wrap aSO;
+ if ( !myIsEnablePublish )
+ return aSO._retn();
if ( CORBA::is_nil( theIOR ))
return aSO._retn();
if(MYDEBUG) MESSAGE("PublishInStudy");
SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent()
{
if(MYDEBUG) MESSAGE("PublishComponent");
+ if ( !myIsEnablePublish )
+ return SALOMEDS::SComponent::_nil();
SALOMEDS::StudyBuilder_var aStudyBuilder = getStudyServant()->NewBuilder();
SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = getStudyServant()->GetUseCaseBuilder();
- CORBA::String_var compDataType = ComponentDataType();
- SALOMEDS::SComponent_wrap father = getStudyServant()->FindComponent( compDataType.in() );
+ std::string compDataType = ComponentDataType(); // SMESH module's data type
+ std::string ior = SMESH_Gen_i::GetORB()->object_to_string( SMESH_Gen::_this() ); // IOR of this SMESH engine
+
+ // Find study component which corresponds to this SMESH engine
+
+ SALOMEDS::SComponent_wrap father;
+ SALOMEDS::SComponentIterator_wrap citer = getStudyServant()->NewComponentIterator();
+ for ( ; citer->More(); citer->Next()) {
+ SALOMEDS::SComponent_wrap f_i = citer->Value();
+ CORBA::String_var ior_i;
+ bool ok = f_i->ComponentIOR(ior_i.out());
+ if ( ok && compDataType == f_i->ComponentDataType() && ior == ior_i.in()) {
+ father = f_i;
+ break;
+ }
+ }
+
if ( !CORBA::is_nil( father ) ) {
// check that the component is added to the use case browser
if ( !useCaseBuilder->IsUseCaseNode( father ) ) {
return father._retn();
}
+ // If component for this SMESH engine does not exist in the study, create it
+
SALOME_ModuleCatalog::ModuleCatalog_var aCat =
SALOME_ModuleCatalog::ModuleCatalog::_narrow( GetNS()->Resolve("/Kernel/ModulCatalog") );
if ( CORBA::is_nil( aCat ) )
return father._retn();
- SALOME_ModuleCatalog::Acomponent_var aComp = aCat->GetComponent( compDataType.in() );
+ SALOME_ModuleCatalog::Acomponent_var aComp = aCat->GetComponent( compDataType.c_str() );
if ( CORBA::is_nil( aComp ) )
return father._retn();
SALOMEDS::GenericAttribute_wrap anAttr;
SALOMEDS::AttributePixMap_wrap aPixmap;
- father = aStudyBuilder->NewComponent( compDataType.in() );
+ father = aStudyBuilder->NewComponent( compDataType.c_str() );
aStudyBuilder->DefineComponentInstance( father, SMESH_Gen::_this() );
anAttr = aStudyBuilder->FindOrCreateAttribute( father, "AttributePixMap" );
aPixmap = anAttr;
SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SMESH::SMESH_Mesh_ptr theMesh,
const char* theName)
{
+ if ( !myIsEnablePublish )
+ return SALOMEDS::SObject::_nil();
if ( CORBA::is_nil( theMesh ))
- return SALOMEDS::SComponent::_nil();
+ return SALOMEDS::SObject::_nil();
if(MYDEBUG) MESSAGE("PublishMesh--IN");
// find or publish a mesh
else
aTag++;
- aMeshSO = publish ( 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();
}
GEOM::GEOM_Object_ptr theShapeObject,
const char* theName)
{
+ if ( !myIsEnablePublish )
+ return SALOMEDS::SObject::_nil();
if ( theMesh->_is_nil() || theSubMesh->_is_nil() || theShapeObject->_is_nil() )
return SALOMEDS::SObject::_nil();
// Add reference to theShapeObject
- addReference( aSubMeshSO, theShapeObject, 1 );
+ addReference( aSubMeshSO, theShapeObject, GetRefOnShapeTag() );
// Publish hypothesis
GEOM::GEOM_Object_ptr theShapeObject,
const char* theName)
{
+ if ( !myIsEnablePublish )
+ return SALOMEDS::SObject::_nil();
if (theMesh->_is_nil() || theGroup->_is_nil() )
return SALOMEDS::SObject::_nil();
//Add reference to geometry
if ( !theShapeObject->_is_nil() )
- addReference( aGroupSO, theShapeObject, 1 );
+ addReference( aGroupSO, theShapeObject, GetRefOnShapeTag() );
return aGroupSO._retn();
}
const char* theName)
{
if(MYDEBUG) MESSAGE("PublishHypothesis")
+ if ( !myIsEnablePublish )
+ return SALOMEDS::SObject::_nil();
if (theHyp->_is_nil())
return SALOMEDS::SObject::_nil();
SetPixMap( so, "ICON_SMESH_TREE_MESH_WARN" );
else if ( mesh_i->IsComputedOK() )
SetPixMap( so, "ICON_SMESH_TREE_MESH" );
- else
+ 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();
}
return 0;
}
+
+//=======================================================================
+//function : Clear
+//purpose : clear data
+//=======================================================================
+
+void StudyContext::Clear()
+{
+ mapIdToIOR.Clear();
+ mapIdToId.Clear();
+}