// 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
//
//
// File : SMESH_Gen_i_1.cxx
#include "SMESH_Hypothesis_i.hxx"
#include "SMESH_Algo_i.hxx"
#include "SMESH_Group_i.hxx"
-
-#include "SMESH.hxx"
+#include "SMESH_subMesh_i.hxx"
#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
long SMESH_Gen_i::GetHypothesisRootTag()
{
- return Tag_HypothesisRoot;
+ return SMESH::Tag_HypothesisRoot;
}
long SMESH_Gen_i::GetAlgorithmsRootTag()
{
- return Tag_AlgorithmsRoot;
+ return SMESH::Tag_AlgorithmsRoot;
}
long SMESH_Gen_i::GetRefOnShapeTag()
{
- return Tag_RefOnShape;
+ return SMESH::Tag_RefOnShape;
}
long SMESH_Gen_i::GetRefOnAppliedHypothesisTag()
{
- return Tag_RefOnAppliedHypothesis;
+ return SMESH::Tag_RefOnAppliedHypothesis;
}
long SMESH_Gen_i::GetRefOnAppliedAlgorithmsTag()
{
- return Tag_RefOnAppliedAlgorithms;
+ return SMESH::Tag_RefOnAppliedAlgorithms;
}
long SMESH_Gen_i::GetSubMeshOnVertexTag()
{
- return Tag_SubMeshOnVertex;
+ return SMESH::Tag_SubMeshOnVertex;
}
long SMESH_Gen_i::GetSubMeshOnEdgeTag()
{
- return Tag_SubMeshOnEdge;
+ return SMESH::Tag_SubMeshOnEdge;
}
long SMESH_Gen_i::GetSubMeshOnFaceTag()
{
- return Tag_SubMeshOnFace;
+ return SMESH::Tag_SubMeshOnFace;
}
long SMESH_Gen_i::GetSubMeshOnSolidTag()
{
- return Tag_SubMeshOnSolid;
+ return SMESH::Tag_SubMeshOnSolid;
}
long SMESH_Gen_i::GetSubMeshOnCompoundTag()
{
- return Tag_SubMeshOnCompound;
+ return SMESH::Tag_SubMeshOnCompound;
}
long SMESH_Gen_i::GetSubMeshOnWireTag()
{
- return Tag_SubMeshOnWire;
+ return SMESH::Tag_SubMeshOnWire;
}
long SMESH_Gen_i::GetSubMeshOnShellTag()
{
- return Tag_SubMeshOnShell;
+ return SMESH::Tag_SubMeshOnShell;
}
long SMESH_Gen_i::GetNodeGroupsTag()
{
- return Tag_NodeGroups;
+ return SMESH::Tag_NodeGroups;
}
long SMESH_Gen_i::GetEdgeGroupsTag()
{
- return Tag_EdgeGroups;
+ return SMESH::Tag_EdgeGroups;
}
long SMESH_Gen_i::GetFaceGroupsTag()
{
- return Tag_FaceGroups;
+ return SMESH::Tag_FaceGroups;
}
long SMESH_Gen_i::GetVolumeGroupsTag()
{
- return Tag_VolumeGroups;
+ return SMESH::Tag_VolumeGroups;
}
//=============================================================================
bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
{
- if(MYDEBUG) MESSAGE("CanPublishInStudy");
+ if(MYDEBUG) MESSAGE("CanPublishInStudy - "<<!CORBA::is_nil(myCurrentStudy));
+ if(CORBA::is_nil(myCurrentStudy))
+ return false;
+
SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(theIOR);
if( !aMesh->_is_nil() )
return true;
{
SALOMEDS::SObject_var aSO;
if ( !CORBA::is_nil( theStudy ) && !CORBA::is_nil( theObject ))
- aSO = theStudy->FindObjectIOR( SMESH_Gen_i::GetORB()->object_to_string( theObject ) );
+ {
+ CORBA::String_var objStr = SMESH_Gen_i::GetORB()->object_to_string( theObject );
+ aSO = theStudy->FindObjectIOR( objStr.in() );
+ }
return aSO._retn();
}
TopoDS_Shape S;
if ( !theGeomObject->_is_nil() ) {
GEOM_Client* aClient = GetShapeReader();
- GEOM::GEOM_Gen_var aGeomEngine = GetGeomEngine();
+ GEOM::GEOM_Gen_ptr aGeomEngine = GetGeomEngine();
if ( aClient && !aGeomEngine->_is_nil () )
S = aClient->GetShape( aGeomEngine, theGeomObject );
}
SALOMEDS::GenericAttribute_var anAttr;
if ( !CORBA::is_nil( theIOR )) {
anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributeIOR" );
- SALOMEDS::AttributeIOR::_narrow(anAttr)->SetValue
- ( SMESH_Gen_i::GetORB()->object_to_string( theIOR ) );
+ CORBA::String_var objStr = SMESH_Gen_i::GetORB()->object_to_string( theIOR );
+ SALOMEDS::AttributeIOR::_narrow(anAttr)->SetValue( objStr.in() );
}
if ( thePixMap ) {
anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributePixMap" );
SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
SALOMEDS::SObject_var 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_var anIter = theStudy->NewChildIterator( theSObject );
- for ( ; !isReferred && anIter->More(); anIter->Next() ) {
- if ( anIter->Value()->ReferencedObject( aReferenceSO ) &&
- strcmp( aReferenceSO->GetID(), aToObjSO->GetID() ) == 0 )
- isReferred = true;
+ for ( ; !isReferred && anIter->More(); anIter->Next(), ++tag ) {
+ if ( anIter->Value()->ReferencedObject( aReferenceSO )) {
+ if ( strcmp( aReferenceSO->GetID(), aToObjSO->GetID() ) == 0 )
+ isReferred = true;
+ }
+ else if ( !theTag ) {
+ SALOMEDS::GenericAttribute_var anAttr;
+ if ( !anIter->Value()->FindAttribute( anAttr, "AttributeIOR" ))
+ theTag = tag;
+ }
}
- if ( !isReferred ) {
- aReferenceSO = aStudyBuilder->NewObject( theSObject );
- aStudyBuilder->Addreference( aReferenceSO, aToObjSO );
- }
- }
- else {
- if ( !theSObject->FindSubObject( theTag, aReferenceSO ))
- aReferenceSO = aStudyBuilder->NewObjectToTag( theSObject, theTag );
- aStudyBuilder->Addreference( aReferenceSO, aToObjSO );
+ if ( isReferred )
+ return;
+ if ( !theTag )
+ theTag = tag;
}
+ if ( !theSObject->FindSubObject( theTag, aReferenceSO ))
+ aReferenceSO = aStudyBuilder->NewObjectToTag( theSObject, theTag );
+ aStudyBuilder->Addreference( aReferenceSO, aToObjSO );
}
}
else
aTag++;
- aMeshSO = publish (theStudy, theMesh, father, aTag, "ICON_SMESH_TREE_MESH" );
+ aMeshSO = publish (theStudy, theMesh, father, aTag, "ICON_SMESH_TREE_MESH_WARN" );
if ( aMeshSO->_is_nil() )
return aMeshSO._retn();
}
SetName( aRootSO, aRootName );
// Add new submesh to corresponding sub-tree
- aSubMeshSO = publish (theStudy, theSubMesh, aRootSO, 0, "ICON_SMESH_TREE_MESH");
+ aSubMeshSO = publish (theStudy, theSubMesh, aRootSO, 0, "ICON_SMESH_TREE_MESH_WARN");
if ( aSubMeshSO->_is_nil() )
return aSubMeshSO._retn();
}
// Add New Hypothesis
string aPmName = isAlgo ? "ICON_SMESH_TREE_ALGO_" : "ICON_SMESH_TREE_HYPO_";
aPmName += theHyp->GetName();
+ // prepend plugin name to pixmap name
+ string pluginName = myHypCreatorMap[string(theHyp->GetName())]->GetModuleName();
+ if ( pluginName != "StdMeshers" )
+ aPmName = pluginName + "::" + aPmName;
aHypSO = publish( theStudy, theHyp, aRootSO, 0, aPmName.c_str() );
}
{
if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape")
SALOMEDS::SObject_var aMeshOrSubMesh;
- if ( theShape->_is_nil() || theMesh->_is_nil() )
+ if (theMesh->_is_nil() || ( theShape->_is_nil() && theMesh->HasShapeToMesh()))
return aMeshOrSubMesh._retn();
+
+ TopoDS_Shape aShape;
+ if(theMesh->HasShapeToMesh())
+ aShape = GeomObjectToShape( theShape );
+ else
+ aShape = SMESH_Mesh::PseudoShape();
- TopoDS_Shape aShape = GeomObjectToShape( theShape );
SMESH_Mesh_i* mesh_i = objectToServant<SMESH_Mesh_i>( theMesh );
if ( !aShape.IsNull() && mesh_i && mesh_i->GetImpl().GetMeshDS() ) {
{
if(MYDEBUG) MESSAGE("AddHypothesisToShape")
if (theStudy->_is_nil() || theMesh->_is_nil() ||
- theHyp->_is_nil() || theShape->_is_nil() )
+ theHyp->_is_nil() || (theShape->_is_nil()
+ && theMesh->HasShapeToMesh()) )
return false;
SALOMEDS::SObject_var aMeshSO = ObjectToSObject( theStudy, theMesh );
SALOMEDS::SObject_var aMeshOrSubMesh =
GetMeshOrSubmeshByShape( theStudy, theMesh, theShape );
if ( aMeshOrSubMesh->_is_nil() )
- return false;
+ {
+ // publish submesh
+ TopoDS_Shape aShape = GeomObjectToShape( theShape );
+ SMESH_Mesh_i* mesh_i = objectToServant<SMESH_Mesh_i>( theMesh );
+ if ( !aShape.IsNull() && mesh_i && mesh_i->GetImpl().GetMeshDS() ) {
+ 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 );
+ }
+ if ( aMeshOrSubMesh->_is_nil() )
+ return false;
+ }
//Find or Create Applied Hypothesis root
bool aIsAlgo = !SMESH::SMESH_Algo::_narrow( theHyp )->_is_nil();
SMESH::SMESH_Hypothesis_ptr theHyp)
{
if (theStudy->_is_nil() || theMesh->_is_nil() ||
- theHyp->_is_nil() || theShape->_is_nil() )
+ theHyp->_is_nil() || (theShape->_is_nil()
+ && theMesh->HasShapeToMesh()))
return false;
SALOMEDS::SObject_var aHypSO = ObjectToSObject( theStudy, theHyp );