-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include "SMESH_Gen_i.hxx"
-#include "SMESH_Mesh_i.hxx"
-#include "SMESH_Hypothesis_i.hxx"
+#include "SMESHDS_Mesh.hxx"
#include "SMESH_Algo_i.hxx"
+#include "SMESH_Comment.hxx"
#include "SMESH_Group_i.hxx"
+#include "SMESH_Hypothesis_i.hxx"
+#include "SMESH_Mesh_i.hxx"
#include "SMESH_subMesh_i.hxx"
#include CORBA_CLIENT_HEADER(SALOME_ModuleCatalog)
-#include "utilities.h"
-#include "Utils_ExceptHandlers.hxx"
+#include <utilities.h>
+#include <Utils_ExceptHandlers.hxx>
+#include <SALOMEDS_wrap.hxx>
+#include <SALOMEDS_Attributes_wrap.hxx>
+#include <SALOME_KernelServices.hxx>
#include <TCollection_AsciiString.hxx>
#include <TopoDS_Solid.hxx>
+#include <cctype>
+
#ifdef _DEBUG_
static int MYDEBUG = 0;
-//static int VARIABLE_DEBUG = 0;
#else
static int MYDEBUG = 0;
-//static int VARIABLE_DEBUG = 0;
#endif
+using namespace std;
+
//=============================================================================
/*!
* Get...Tag [ static ]
bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
{
- if(MYDEBUG) MESSAGE("CanPublishInStudy - "<<!CORBA::is_nil(myCurrentStudy));
- if(CORBA::is_nil(myCurrentStudy))
- return false;
+ if(MYDEBUG) MESSAGE("CanPublishInStudy - "<<!CORBA::is_nil(getStudyServant()));
+ if ( !myIsEnablePublish )
+ return false;
+
SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow(theIOR);
if( !aMesh->_is_nil() )
return true;
//=======================================================================
//function : ObjectToSObject
-//purpose :
+//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_var aSO;
- if ( !CORBA::is_nil( theStudy ) && !CORBA::is_nil( theObject ))
+ SALOMEDS::SObject_wrap aSO;
+ 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 :
//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_var SO = SMESH_Gen_i::ObjectToSObject( theStudy, theIOR );
- SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
- if ( SO->_is_nil() ) {
- if ( theTag == 0 )
+ 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();
+ bool isNewSO = false, isInUseCaseTree = false;
+ if ( SO->_is_nil() )
+ {
+ if ( theTag == 0 ) {
SO = aStudyBuilder->NewObject( theFatherObject );
- else if ( !theFatherObject->FindSubObject( theTag, SO ))
+ isNewSO = true;
+ }
+ else if ( !theFatherObject->FindSubObject( theTag, SO.inout() ))
+ {
SO = aStudyBuilder->NewObjectToTag( theFatherObject, theTag );
+ isNewSO = true;
+ }
+ else
+ {
+ isInUseCaseTree = useCaseBuilder->IsUseCaseNode( SO );
+ }
+ }
+ else
+ {
+ isInUseCaseTree = useCaseBuilder->IsUseCaseNode( SO );
}
- SALOMEDS::GenericAttribute_var anAttr;
- if ( !CORBA::is_nil( theIOR )) {
+ SALOMEDS::GenericAttribute_wrap anAttr;
+ if ( !CORBA::is_nil( theIOR ))
+ {
anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributeIOR" );
CORBA::String_var objStr = SMESH_Gen_i::GetORB()->object_to_string( theIOR );
- SALOMEDS::AttributeIOR::_narrow(anAttr)->SetValue( objStr.in() );
+ SALOMEDS::AttributeIOR_wrap iorAttr = anAttr;
+ CORBA::String_var objStrCur = iorAttr->Value();
+ bool sameIOR = ( objStrCur.in() && strcmp( objStr.in(), objStrCur.in() ) == 0 );
+ if ( !sameIOR )
+ {
+ iorAttr->SetValue( objStr.in() );
+ // 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();
+ }
}
+
if ( thePixMap ) {
anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributePixMap" );
- SALOMEDS::AttributePixMap_var pm = SALOMEDS::AttributePixMap::_narrow( anAttr );
+ SALOMEDS::AttributePixMap_wrap pm = anAttr;
pm->SetPixMap( thePixMap );
}
+
if ( !theSelectable ) {
- anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributeSelectable" );
- SALOMEDS::AttributeSelectable::_narrow( anAttr )->SetSelectable( false );
+ anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributeSelectable" );
+ SALOMEDS::AttributeSelectable_wrap selAttr = anAttr;
+ 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 || !isInUseCaseTree )
+ {
+ // 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 ( !isInUseCaseTree )
+ useCaseBuilder->AppendTo( theFatherObject, SO ); // append to the end of list
}
return SO._retn();
}
//=======================================================================
//function : setName
-//purpose :
+//purpose :
//=======================================================================
void SMESH_Gen_i::SetName(SALOMEDS::SObject_ptr theSObject,
const char* theDefaultName)
{
if ( !theSObject->_is_nil() ) {
- SALOMEDS::StudyBuilder_var aStudyBuilder = theSObject->GetStudy()->NewBuilder();
- SALOMEDS::GenericAttribute_var anAttr =
+ SALOMEDS::StudyBuilder_var aStudyBuilder = getStudyServant()->NewBuilder();
+ SALOMEDS::GenericAttribute_wrap anAttr =
aStudyBuilder->FindOrCreateAttribute( theSObject, "AttributeName" );
- SALOMEDS::AttributeName_var aNameAttr = SALOMEDS::AttributeName::_narrow( anAttr );
- if ( theName && strlen( theName ) != 0 )
- aNameAttr->SetValue( theName );
- else {
- CORBA::String_var curName = CORBA::string_dup( aNameAttr->Value() );
- if ( strlen( curName ) == 0 ) {
- TCollection_AsciiString aName( (char*) theDefaultName );
- aName += TCollection_AsciiString("_") + TCollection_AsciiString( theSObject->Tag() );
- aNameAttr->SetValue( aName.ToCString() );
+ SALOMEDS::AttributeName_wrap aNameAttr = anAttr;
+ if ( theName && theName[0] ) {
+ std::string name( theName ); // trim trailing white spaces
+ for ( size_t i = name.size()-1; i > 0; --i )
+ if ( isspace( name[i] )) name[i] = '\0';
+ else break;
+ aNameAttr->SetValue( name.c_str() );
+ }
+ else
+ {
+ CORBA::String_var curName = aNameAttr->Value();
+ if ( strlen( curName.in() ) == 0 ) {
+ SMESH_Comment aName(theDefaultName);
+ aNameAttr->SetValue( ( aName<< "_" << theSObject->Tag()).c_str() );
}
}
}
//=======================================================================
//function : SetPixMap
-//purpose :
+//purpose :
//=======================================================================
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::GenericAttribute_var anAttr =
+ SALOMEDS::StudyBuilder_var aStudyBuilder = getStudyServant()->NewBuilder();
+ SALOMEDS::GenericAttribute_wrap anAttr =
aStudyBuilder->FindOrCreateAttribute( theSObject, "AttributePixMap" );
- SALOMEDS::AttributePixMap_var aPMAttr = SALOMEDS::AttributePixMap::_narrow( anAttr );
+ SALOMEDS::AttributePixMap_wrap aPMAttr = anAttr;
aPMAttr->SetPixMap( thePixMap );
}
}
//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_var 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::SObject_var aReferenceSO;
+ 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_var anIter = theStudy->NewChildIterator( theSObject );
+ SALOMEDS::ChildIterator_wrap anIter = aStudy->NewChildIterator( theSObject );
for ( ; !isReferred && anIter->More(); anIter->Next(), ++tag ) {
- if ( anIter->Value()->ReferencedObject( aReferenceSO )) {
- if ( strcmp( aReferenceSO->GetID(), aToObjSO->GetID() ) == 0 )
+ SALOMEDS::SObject_wrap curSO = anIter->Value();
+ if ( curSO->ReferencedObject( aReferenceSO.inout() )) {
+ CORBA::String_var refEntry = aReferenceSO->GetID();
+ CORBA::String_var toEntry = aToObjSO->GetID();
+ if ( strcmp( refEntry, toEntry ) == 0 )
isReferred = true;
}
else if ( !theTag ) {
- SALOMEDS::GenericAttribute_var anAttr;
- if ( !anIter->Value()->FindAttribute( anAttr, "AttributeIOR" ))
+ SALOMEDS::GenericAttribute_wrap anAttr;
+ if ( !curSO->FindAttribute( anAttr.inout(), "AttributeIOR" ))
theTag = tag;
}
}
if ( !theTag )
theTag = tag;
}
- if ( !theSObject->FindSubObject( theTag, aReferenceSO ))
+ if ( !theSObject->FindSubObject( theTag, aReferenceSO.inout() ))
aReferenceSO = aStudyBuilder->NewObjectToTag( theSObject, theTag );
+
aStudyBuilder->Addreference( aReferenceSO, aToObjSO );
+
+ // add reference to the use case tree
+ // (to support tree representation customization and drag-n-drop)
+ SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = aStudy->GetUseCaseBuilder();
+ SALOMEDS::UseCaseIterator_wrap useCaseIter = useCaseBuilder->GetUseCaseIterator(theSObject);
+ for ( ; useCaseIter->More(); useCaseIter->Next() )
+ {
+ SALOMEDS::SObject_wrap curSO = useCaseIter->Value();
+ if ( curSO->Tag() == theTag )
+ return;
+ }
+ useCaseBuilder->AppendTo( theSObject, aReferenceSO );
}
}
*/
//=============================================================================
-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_var aSO;
- if ( CORBA::is_nil( theStudy ) || CORBA::is_nil( theIOR ))
+ SALOMEDS::SObject_wrap aSO;
+ 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");
//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::SComponent_var father =
- SALOMEDS::SComponent::_narrow( theStudy->FindComponent( ComponentDataType() ) );
- if ( !CORBA::is_nil( father ) )
+ 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() );
+ if ( !CORBA::is_nil( father ) ) {
+ // check that the component is added to the use case browser
+ if ( !useCaseBuilder->IsUseCaseNode( father ) ) {
+ useCaseBuilder->SetRootCurrent();
+ useCaseBuilder->Append( father ); // component object is added as the top level item
+ }
return father._retn();
+ }
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( ComponentDataType() );
+ SALOME_ModuleCatalog::Acomponent_var aComp = aCat->GetComponent( compDataType.in() );
if ( CORBA::is_nil( aComp ) )
return father._retn();
- SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder();
- SALOMEDS::GenericAttribute_var anAttr;
- SALOMEDS::AttributePixMap_var aPixmap;
+ SALOMEDS::GenericAttribute_wrap anAttr;
+ SALOMEDS::AttributePixMap_wrap aPixmap;
- father = aStudyBuilder->NewComponent( ComponentDataType() );
+ father = aStudyBuilder->NewComponent( compDataType.in() );
aStudyBuilder->DefineComponentInstance( father, SMESH_Gen::_this() );
anAttr = aStudyBuilder->FindOrCreateAttribute( father, "AttributePixMap" );
- aPixmap = SALOMEDS::AttributePixMap::_narrow( anAttr );
- aPixmap ->SetPixMap( "ICON_OBJBROWSER_SMESH" );
- SetName( father, aComp->componentusername(), "MESH" );
+ aPixmap = anAttr;
+ aPixmap->SetPixMap( "ICON_OBJBROWSER_SMESH" );
+ CORBA::String_var userName = aComp->componentusername();
+ SetName( father, userName.in(), "MESH" );
+ // add component to the use case tree
+ // (to support tree representation customization and drag-n-drop)
+ useCaseBuilder->SetRootCurrent();
+ useCaseBuilder->Append( father ); // component object is added as the top level item
if(MYDEBUG) MESSAGE("PublishComponent--END");
return father._retn();
}
-//=============================================================================
-/*!
- * findMaxChildTag [ static internal ]
- *
- * Finds maximum child tag for the given object
- */
-//=============================================================================
-
-static long findMaxChildTag( SALOMEDS::SObject_ptr theSObject )
-{
- long aTag = 0;
- if ( !theSObject->_is_nil() ) {
- SALOMEDS::Study_var aStudy = theSObject->GetStudy();
- if ( !aStudy->_is_nil() ) {
- SALOMEDS::ChildIterator_var anIter = aStudy->NewChildIterator( theSObject );
- for ( ; anIter->More(); anIter->Next() ) {
- long nTag = anIter->Value()->Tag();
- if ( nTag > aTag )
- aTag = nTag;
- }
- }
- }
- return aTag;
-}
-
//=======================================================================
//function : PublishMesh
//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_var aMeshSO = ObjectToSObject( theStudy, theMesh );
+ SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theMesh );
if ( aMeshSO->_is_nil() )
{
- SALOMEDS::SComponent_var father = PublishComponent( theStudy );
+ SALOMEDS::SComponent_wrap father = PublishComponent();
if ( father->_is_nil() )
return aMeshSO._retn();
// Find correct free tag
- long aTag = findMaxChildTag( father.in() );
+ long aTag = father->GetLastChildTag();
if ( aTag <= GetAlgorithmsRootTag() )
aTag = GetAlgorithmsRootTag() + 1;
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();
}
GEOM::GEOM_Object_var aShapeObject = theMesh->GetShapeToMesh();
if ( !CORBA::is_nil( aShapeObject )) {
- addReference( theStudy, aMeshSO, aShapeObject, GetRefOnShapeTag() );
+ addReference( aMeshSO, aShapeObject, GetRefOnShapeTag() );
// Publish global hypotheses
SMESH::ListOfHypothesis_var hypList = theMesh->GetHypothesisList( aShapeObject );
- for ( int i = 0; i < hypList->length(); i++ ) {
+ for ( CORBA::ULong i = 0; i < hypList->length(); i++ )
+ {
SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow( hypList[ i ]);
- PublishHypothesis( theStudy, aHyp );
- AddHypothesisToShape( theStudy, theMesh, aShapeObject, aHyp );
+ SALOMEDS::SObject_wrap so = PublishHypothesis( aHyp );
+ AddHypothesisToShape( theMesh, aShapeObject, aHyp );
}
}
SMESH::SMESH_subMesh_ptr aSubMesh = (*subIt).second->_this();
if ( !CORBA::is_nil( aSubMesh )) {
aShapeObject = aSubMesh->GetSubShape();
- PublishSubMesh( theStudy, theMesh, aSubMesh, aShapeObject );
+ SALOMEDS::SObject_wrap( PublishSubMesh( theMesh, aSubMesh, aShapeObject ));
}
}
{
SMESH::SMESH_GroupBase_ptr aGroup = (*it).second;
if ( !aGroup->_is_nil() ) {
- GEOM::GEOM_Object_var aShapeObj;
- SMESH::SMESH_GroupOnGeom_var aGeomGroup =
- SMESH::SMESH_GroupOnGeom::_narrow( aGroup );
+ GEOM::GEOM_Object_var aShapeObj;
+ SMESH::SMESH_GroupOnGeom_var aGeomGroup = SMESH::SMESH_GroupOnGeom::_narrow( aGroup );
if ( !aGeomGroup->_is_nil() )
aShapeObj = aGeomGroup->GetShape();
- PublishGroup( theStudy, theMesh, aGroup, aShapeObj );
+ SALOMEDS::SObject_wrap( PublishGroup( theMesh, aGroup, aShapeObj ));
}
}
//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_var aSubMeshSO = ObjectToSObject( theStudy, theSubMesh );
+ SALOMEDS::SObject_wrap aSubMeshSO = ObjectToSObject( theSubMesh );
if ( aSubMeshSO->_is_nil() )
{
- SALOMEDS::SObject_var 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();
}
}
// Find or create submesh root
- SALOMEDS::SObject_var 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();
+
SetName( aRootSO, aRootName );
// Add new submesh to corresponding sub-tree
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();
}
// Add reference to theShapeObject
- addReference( theStudy, aSubMeshSO, theShapeObject, 1 );
+ addReference( aSubMeshSO, theShapeObject, 1 );
// Publish hypothesis
- SMESH::ListOfHypothesis * hypList = theMesh->GetHypothesisList( theShapeObject );
- if ( hypList )
- for ( int i = 0; i < hypList->length(); i++ ) {
- SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow( (*hypList)[ i ]);
- PublishHypothesis( theStudy, aHyp );
- AddHypothesisToShape( theStudy, theMesh, theShapeObject, aHyp );
- }
+ 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( aHyp );
+ AddHypothesisToShape( theMesh, theShapeObject, aHyp );
+ }
return aSubMeshSO._retn();
}
//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_var aGroupSO = ObjectToSObject( theStudy, theGroup );
+ SALOMEDS::SObject_wrap aGroupSO = ObjectToSObject( theGroup );
if ( aGroupSO->_is_nil() )
{
- SALOMEDS::SObject_var 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();
}
- int aType = (int)theGroup->GetType();
+ size_t aType = (int)theGroup->GetType();
const char* aRootNames[] = {
"Compound Groups", "Groups of Nodes", "Groups of Edges",
"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_var 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 ))
{
}
else if ( SMESH::DownCast< SMESH_Group_i* > ( theGroup ))
{
- SMESH::array_of_ElementType_var allElemTypes = theMesh->GetTypes();
- for ( size_t i =0; i < allElemTypes->length() && isEmpty; ++i )
- isEmpty = ( allElemTypes[i] != theGroup->GetType() );
+ if ( theGroup->GetType() == SMESH::NODE )
+ isEmpty = ( theMesh->NbNodes() == 0 );
+ else
+ {
+ SMESH::array_of_ElementType_var allElemTypes = theMesh->GetTypes();
+ for ( size_t i =0; i < allElemTypes->length() && isEmpty; ++i )
+ 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();
//Add reference to geometry
if ( !theShapeObject->_is_nil() )
- addReference( theStudy, aGroupSO, theShapeObject, 1 );
+ addReference( aGroupSO, theShapeObject, 1 );
return aGroupSO._retn();
}
//=======================================================================
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();
- SALOMEDS::SObject_var aHypSO = ObjectToSObject( theStudy, theHyp );
+ CORBA::String_var hypType = theHyp->GetName();
+
+ SALOMEDS::SObject_wrap aHypSO = ObjectToSObject( theHyp );
if ( aHypSO->_is_nil() )
{
- SALOMEDS::SComponent_var father = PublishComponent( theStudy );
+ SALOMEDS::SComponent_wrap father = PublishComponent();
if ( father->_is_nil() )
return aHypSO._retn();
//Find or Create Hypothesis root
bool isAlgo = ( !SMESH::SMESH_Algo::_narrow( theHyp )->_is_nil() );
int aRootTag = isAlgo ? GetAlgorithmsRootTag() : GetHypothesisRootTag();
- SALOMEDS::SObject_var aRootSO =
- publish (theStudy, CORBA::Object::_nil(),father, aRootTag,
+ SALOMEDS::SObject_wrap aRootSO =
+ publish (CORBA::Object::_nil(),father, aRootTag,
isAlgo ? "ICON_SMESH_TREE_ALGO" : "ICON_SMESH_TREE_HYPO", false);
SetName( aRootSO, isAlgo ? "Algorithms" : "Hypotheses" );
// Add New Hypothesis
string aPmName = isAlgo ? "ICON_SMESH_TREE_ALGO_" : "ICON_SMESH_TREE_HYPO_";
- aPmName += theHyp->GetName();
+ aPmName += hypType.in();
// prepend plugin name to pixmap name
- string pluginName = myHypCreatorMap[string(theHyp->GetName())]->GetModuleName();
+ 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() );
}
- if ( !aHypSO->_is_nil() ) {
- CORBA::String_var aHypName = CORBA::string_dup( theHyp->GetName() );
- SetName( aHypSO, theName, aHypName );
- }
+ SetName( aHypSO, theName, hypType.in() );
if(MYDEBUG) MESSAGE("PublishHypothesis--END")
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_var aMeshOrSubMesh;
+ SALOMEDS::SObject_wrap aMeshOrSubMesh;
if (theMesh->_is_nil() || ( theShape->_is_nil() && theMesh->HasShapeToMesh()))
return aMeshOrSubMesh._retn();
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")
//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_var aMeshSO = ObjectToSObject( theStudy, theMesh );
+ SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theMesh );
if ( aMeshSO->_is_nil() )
- aMeshSO = PublishMesh( theStudy, theMesh );
- SALOMEDS::SObject_var 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
- SALOMEDS::SObject_var aMeshOrSubMesh =
- GetMeshOrSubmeshByShape( theStudy, theMesh, theShape );
+ // Find a mesh or submesh referring to theShape
+ SALOMEDS::SObject_wrap aMeshOrSubMesh =
+ GetMeshOrSubmeshByShape( theMesh, theShape );
if ( aMeshOrSubMesh->_is_nil() )
{
// publish submesh
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;
//Find or Create Applied Hypothesis root
bool aIsAlgo = !SMESH::SMESH_Algo::_narrow( theHyp )->_is_nil();
- SALOMEDS::SObject_var AHR =
- publish (theStudy, CORBA::Object::_nil(), aMeshOrSubMesh,
+ SALOMEDS::SObject_wrap AHR =
+ 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" );
- if ( AHR->_is_nil() )
- return false;
- addReference( theStudy, AHR, theHyp );
+ addReference( AHR, theHyp );
+
if(MYDEBUG) MESSAGE("AddHypothesisToShape--END")
return true;
}
//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_var aHypSO = ObjectToSObject( theStudy, theHyp );
+ SALOMEDS::SObject_wrap aHypSO = ObjectToSObject( theHyp );
if ( aHypSO->_is_nil() )
return false;
- // Find a mesh or submesh refering to theShape
- SALOMEDS::SObject_var aMeshOrSubMesh =
- GetMeshOrSubmeshByShape( theStudy, theMesh, theShape );
+ CORBA::String_var hypEntry = aHypSO->GetID();
+
+ // Find a mesh or sub-mesh referring to theShape
+ SALOMEDS::SObject_wrap aMeshOrSubMesh =
+ GetMeshOrSubmeshByShape( theMesh, theShape );
if ( aMeshOrSubMesh->_is_nil() )
return false;
// Find and remove a reference to aHypSO
- SALOMEDS::SObject_var aRef, anObj;
- CORBA::String_var anID = CORBA::string_dup( aHypSO->GetID() );
- SALOMEDS::ChildIterator_var it = theStudy->NewChildIterator( aMeshOrSubMesh );
- for ( it->InitEx( true ); it->More(); it->Next() ) {
+ SALOMEDS::SObject_wrap aRef, anObj;
+ SALOMEDS::ChildIterator_wrap it = getStudyServant()->NewChildIterator( aMeshOrSubMesh );
+ bool found = false;
+ for ( it->InitEx( true ); ( it->More() && !found ); it->Next() ) {
anObj = it->Value();
- if (anObj->ReferencedObject( aRef ) && strcmp( aRef->GetID(), anID ) == 0 ) {
- theStudy->NewBuilder()->RemoveObject( anObj );
- break;
+ if (anObj->ReferencedObject( aRef.inout() ))
+ {
+ CORBA::String_var refEntry = aRef->GetID();
+ found = ( strcmp( refEntry, hypEntry ) == 0 );
+ }
+ if ( found )
+ {
+ SALOMEDS::StudyBuilder_var builder = getStudyServant()->NewBuilder();
+ builder->RemoveObject( anObj );
}
}
+
return true;
}
-//=======================================================================
-//function : UpdateParameters
-//purpose :
-//=======================================================================
-void SMESH_Gen_i::UpdateParameters(/*CORBA::Object_ptr theObject,*/ const char* theParameters)
+//================================================================================
+/*!
+ * \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 containing parameters separated by ':'.
+ */
+//================================================================================
+
+void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theParameters)
{
- SALOMEDS::Study_ptr 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 variables used for theObject */
+ int nbVars = 0;
int pos = 0, prevPos = 0, len = strlen( theParameters );
if ( len == 0 ) return;
while ( pos <= len )
{
if ( prevPos < pos )
{
- string val(theParameters + prevPos, theParameters + pos );
- if ( !aStudy->IsVariable( val.c_str() ))
+ string val( theParameters + prevPos, theParameters + pos );
+ if ( !getStudyServant()->IsVariable( val.c_str() ))
val.clear();
myLastParameters.push_back( val );
+ nbVars += (! myLastParameters.back().empty() );
}
else
{
}
++pos;
}
- return;
-
- // OLD VARIANT
-
- // if(VARIABLE_DEBUG)
- // cout<<"UpdateParameters : "<<theParameters<<endl;
- // //SALOMEDS::Study_ptr aStudy = GetCurrentStudy();
- // if(aStudy->_is_nil() || CORBA::is_nil(theObject))
- // return;
-
- // SALOMEDS::SObject_var aSObj = ObjectToSObject(aStudy,theObject);
- // if(aSObj->_is_nil())
- // return;
-
- // SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
-
- // SALOMEDS::GenericAttribute_var aFindAttr;
- // bool hasAttr = aSObj->FindAttribute(aFindAttr, "AttributeString");
- // if(VARIABLE_DEBUG)
- // cout<<"Find Attribute "<<hasAttr<<endl;
-
- // SALOMEDS::GenericAttribute_var anAttr;
- // anAttr = aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString");
- // SALOMEDS::AttributeString_var aStringAttr = SALOMEDS::AttributeString::_narrow(anAttr);
-
- // CORBA::String_var oldparVar = aStringAttr->Value();
- // CORBA::String_var inpparVar = ParseParameters(theParameters);
- // TCollection_AsciiString aNewParams;
- // TCollection_AsciiString aOldParameters(oldparVar.inout());
- // TCollection_AsciiString anInputParams(inpparVar.inout());
- // if(!hasAttr)
- // aNewParams = anInputParams;
- // else
- // {
- // int pos = aOldParameters.SearchFromEnd("|");
- // if(pos==-1) pos = 0;
- // TCollection_AsciiString previousParamFull(aOldParameters.Split(pos));
- // TCollection_AsciiString previousParam(previousParamFull);
- // TCollection_AsciiString theRepet("1");
- // pos = previousParam.SearchFromEnd(";*=");
- // if(pos >= 0)
- // {
- // theRepet = previousParam.Split(pos+2);
- // pos = pos-1;
- // if(pos==-1) pos = 0;
- // previousParam.Split(pos);
- // }
- // if(previousParam == anInputParams)
- // {
- // theRepet = theRepet.IntegerValue()+1;
- // aNewParams = aOldParameters + previousParam + ";*=" + theRepet;
- // }
- // else
- // {
- // aNewParams = aOldParameters + previousParamFull + "|" + anInputParams;
- // }
- // }
-
- // if(VARIABLE_DEBUG)
- // {
- // cout<<"Input Parameters : "<<anInputParams<<endl;
- // cout<<"Old Parameters : "<<aOldParameters<<endl;
- // cout<<"New Parameters : "<<aNewParams<<endl;
- // }
-
- // aStringAttr->SetValue( aNewParams.ToCString() );
+
+ if ( nbVars < 1 )
+ return;
+
+ // store
+ // (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(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 = getStudyServant()->NewBuilder();
+ SALOMEDS::GenericAttribute_wrap anAttr =
+ aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString" );
+ SALOMEDS::AttributeString_wrap aStringAttr = anAttr;
+ CORBA::String_var oldVars = aStringAttr->Value();
+ std::string varStr = oldVars.in();
+
+ // add new variables and find indices of variables
+ for ( size_t i = 0; i < myLastParameters.size(); ++i )
+ {
+ int varIndex = -1;
+ if ( !myLastParameters[i].empty() )
+ {
+ // find index of myLastParameters[i] in varStr
+ int curIndex = 0;
+ bool varFound = false;
+ size_t pos = 0;
+ // varStr can be "A|B::C;*=2|D"
+ const std::string separators(":|;*=");
+ while ( pos < varStr.size() && !varFound )
+ {
+ // skip separators
+ while ( separators.find( varStr[ pos ]) != std::string::npos )
+ if ( ++pos >= varStr.size() )
+ break;
+ // skip repetition number following '='
+ if ( varStr[ pos-1 ] == '=' )
+ {
+ while ( '0' <= varStr[ pos ] && varStr[ pos ] <= '9' )
+ ++pos;
+ continue; // to skip next separator
+ }
+ // compare variable name
+ if ( pos < varStr.size() )
+ {
+ varFound = ( varStr.compare( pos, myLastParameters[i].size(), myLastParameters[i] ) == 0 &&
+ // same string beginning but is length same?
+ ( pos + myLastParameters[i].size() >= varStr.size() ||
+ separators.find( varStr[ pos+1 ]) != std::string::npos ));
+ if ( varFound )
+ varIndex = curIndex;
+ else
+ pos = varStr.find_first_of( separators, pos ); // goto the next separator
+ ++curIndex;
+ }
+ }
+ // add new variable
+ if ( !varFound )
+ {
+ varStr += ":" + myLastParameters[i];
+ varIndex = curIndex;
+ }
+ }
+ myLastParamIndex.push_back( varIndex );
+ }
+ aStringAttr->SetValue( varStr.c_str() );
+}
+
+//================================================================================
+/*!
+ * \brief Return all variables used to create an object
+ * \param [in] theObjectEntry - an object entry in the current study
+ * \return std::vector< std::string > - all variable names (or values of removed variables)
+ */
+//================================================================================
+
+std::vector< std::string > SMESH_Gen_i::GetAllParameters(const std::string& theObjectEntry) const
+{
+ std::vector< std::string > varNames;
+
+ SALOMEDS::SObject_wrap aSObj = getStudyServant()->FindObjectID( theObjectEntry.c_str() );
+
+ // get a string of variable names
+ SALOMEDS::StudyBuilder_var aStudyBuilder = getStudyServant()->NewBuilder();
+ SALOMEDS::GenericAttribute_wrap anAttr =
+ aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString" );
+ SALOMEDS::AttributeString_wrap aStringAttr = anAttr;
+ CORBA::String_var oldVars = aStringAttr->Value();
+ std::string varStr = oldVars.in();
+
+ // separate variables within varStr;
+ // varStr can be "A|B::C;*=2|D"
+ size_t pos = 0;
+ const std::string separators(":|;*=");
+ while ( pos < varStr.size() )
+ {
+ // skip separators
+ pos = varStr.find_first_not_of( separators, pos );
+ // while ( separators.find( varStr[ pos ]) != std::string::npos )
+ // if ( ++pos >= varStr.size() )
+ // break;
+ // skip repetition number following '='
+ if ( varStr[ pos-1 ] == '=' )
+ {
+ while ( '0' <= varStr[ pos ] && varStr[ pos ] <= '9' )
+ ++pos;
+ continue; // to skip next separator
+ }
+ // store variable name
+ if ( pos < varStr.size() )
+ {
+ size_t pos2 = varStr.find_first_of( separators, pos );
+ varNames.push_back( varStr.substr( pos, pos2 - pos));
+ pos = pos2;
+ }
+ }
+ return varNames;
}
//=======================================================================
//function : ParseParameters
//purpose : Replace variables by their values
//=======================================================================
-char* SMESH_Gen_i::ParseParameters(const char* theParameters)
-{
- //const char* aParameters = theParameters;
-// const char* aParameters = CORBA::string_dup(theParameters);
- TCollection_AsciiString anInputParams;
- SALOMEDS::Study_var aStudy = GetCurrentStudy();
- if( !aStudy->_is_nil() ) {
-// SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(theParameters);
-// for(int j=0;j<aSections->length();j++) {
-// SALOMEDS::ListOfStrings aVars= aSections[j];
-// for(int i=0;i<aVars.length();i++ ) {
-// anInputParams += aStudy->IsVariable(aVars[i].in()) ?
-// TCollection_AsciiString(aVars[i].in()) : TCollection_AsciiString("");
-// if(i != aVars.length()-1)
-// anInputParams+=":";
+// char* SMESH_Gen_i::ParseParameters(const char* theParameters)
+// {
+// //const char* aParameters = theParameters;
+// // const char* aParameters = CORBA::string_dup(theParameters);
+// TCollection_AsciiString anInputParams;
+// SALOMEDS::Study_var aStudy = getStudyServant();
+// if( !aStudy->_is_nil() ) {
+// // SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(theParameters);
+// // for(int j=0;j<aSections->length();j++) {
+// // SALOMEDS::ListOfStrings aVars= aSections[j];
+// // for(int i=0;i<aVars.length();i++ ) {
+// // anInputParams += aStudy->IsVariable(aVars[i].in()) ?
+// // TCollection_AsciiString(aVars[i].in()) : TCollection_AsciiString("");
+// // if(i != aVars.length()-1)
+// // anInputParams+=":";
+// // }
+// // if(j!=aSections->length()-1)
+// // anInputParams+="|";
+// // }
+// TCollection_AsciiString paramStr( theParameters );
+// int beg = 0, end;
+// char sep, *pParams = (char*)paramStr.ToCString();
+// while ( beg < paramStr.Length() )
+// {
+// end = beg-1;
+// while ( ++end < paramStr.Length() )
+// if ( pParams[end] == ':' || pParams[end] == '|')
+// break;
+// if ( end < paramStr.Length())
+// {
+// sep = pParams[end];
+// pParams[end] = '\0';
// }
-// if(j!=aSections->length()-1)
-// anInputParams+="|";
+// if ( aStudy->IsVariable( pParams+beg ))
+// anInputParams += pParams+beg;
+// if ( end < paramStr.Length() )
+// anInputParams += sep;
+// else
+// break;
+// beg = end + 1;
// }
- TCollection_AsciiString paramStr( theParameters );
- static TCollection_AsciiString separators(":|");
- int beg = 0, end;
- char sep, *pParams = (char*)paramStr.ToCString();
- while ( beg < paramStr.Length() )
- {
- end = beg-1;
- while ( ++end < paramStr.Length() )
- if ( pParams[end] == ':' || pParams[end] == '|')
- break;
- if ( end < paramStr.Length())
- {
- sep = pParams[end];
- pParams[end] = '\0';
- }
- if ( aStudy->IsVariable( pParams+beg ))
- anInputParams += pParams+beg;
- if ( end < paramStr.Length() )
- anInputParams += sep;
- else
- break;
- beg = end + 1;
- }
- }
- return CORBA::string_dup(anInputParams.ToCString());
-}
+// }
+// return CORBA::string_dup(anInputParams.ToCString());
+// }
//=======================================================================
//function : GetParameters
//purpose :
//=======================================================================
+
char* SMESH_Gen_i::GetParameters(CORBA::Object_ptr theObject)
{
- TCollection_AsciiString aResult;
-
- SALOMEDS::Study_ptr aStudy = GetCurrentStudy();
- SALOMEDS::SObject_var aSObj = ObjectToSObject(aStudy,theObject);
-
- if(!aStudy->_is_nil() &&
- !CORBA::is_nil(theObject) &&
- !aSObj->_is_nil()){
-
- SALOMEDS::GenericAttribute_var anAttr;
- if ( aSObj->FindAttribute(anAttr, "AttributeString")) {
- aResult = TCollection_AsciiString(SALOMEDS::AttributeString::_narrow(anAttr)->Value());
+ CORBA::String_var aResult("");
+
+ SALOMEDS::SObject_wrap aSObj = ObjectToSObject( theObject );
+ if ( !aSObj->_is_nil() )
+ {
+ SALOMEDS::GenericAttribute_wrap attr;
+ if ( aSObj->FindAttribute( attr.inout(), "AttributeString"))
+ {
+ SALOMEDS::AttributeString_wrap strAttr = attr;
+ aResult = strAttr->Value();
}
}
-
- return CORBA::string_dup( aResult.ToCString() );
+ 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();
}
