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=fc50bc409a4e4a2de0110a1ca00be527c6dbab38;hp=1638083b5869b129580b36225e97542b924cff39;hb=7c7b4b0636cbb5fdb2ae67658ec9709be1c58812;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6 diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx index 1638083b5..fc50bc409 100644 --- a/src/SMESH_I/SMESH_Gen_i_1.cxx +++ b/src/SMESH_I/SMESH_Gen_i_1.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 @@ -26,16 +26,19 @@ #include "SMESH_Gen_i.hxx" -#include "SMESH_Mesh_i.hxx" -#include "SMESH_Hypothesis_i.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 +#include +#include +#include #include #include @@ -182,13 +185,13 @@ bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) //======================================================================= //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_var aSO; + SALOMEDS::SObject_wrap aSO; if ( !CORBA::is_nil( theStudy ) && !CORBA::is_nil( theObject )) { CORBA::String_var objStr = SMESH_Gen_i::GetORB()->object_to_string( theObject ); @@ -256,30 +259,38 @@ static SALOMEDS::SObject_ptr publish(SALOMEDS::Study_ptr theStudy, const char* thePixMap = 0, const bool theSelectable = true) { - SALOMEDS::SObject_var SO = SMESH_Gen_i::ObjectToSObject( theStudy, theIOR ); + SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( theStudy, theIOR ); SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); + SALOMEDS::UseCaseBuilder_var useCaseBuilder = theStudy->GetUseCaseBuilder(); if ( SO->_is_nil() ) { if ( theTag == 0 ) SO = aStudyBuilder->NewObject( theFatherObject ); - else if ( !theFatherObject->FindSubObject( theTag, SO )) + else if ( !theFatherObject->FindSubObject( theTag, SO.inout() )) SO = aStudyBuilder->NewObjectToTag( theFatherObject, theTag ); } - SALOMEDS::GenericAttribute_var anAttr; + 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; + iorAttr->SetValue( objStr.in() ); } 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 ); } + + // add object to the use case tree + // (to support tree representation customization and drag-n-drop) + useCaseBuilder->AppendTo( SO->GetFather(), SO ); + return SO._retn(); } @@ -293,18 +304,18 @@ 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::Study_var aStudy = theSObject->GetStudy(); + SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::GenericAttribute_wrap anAttr = aStudyBuilder->FindOrCreateAttribute( theSObject, "AttributeName" ); - SALOMEDS::AttributeName_var aNameAttr = SALOMEDS::AttributeName::_narrow( anAttr ); + SALOMEDS::AttributeName_wrap aNameAttr = 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() ); + CORBA::String_var curName = aNameAttr->Value(); + if ( strlen( curName.in() ) == 0 ) { + SMESH_Comment aName(theDefaultName); + aNameAttr->SetValue( ( aName<< "_" << theSObject->Tag()).c_str() ); } } } @@ -320,11 +331,11 @@ void SMESH_Gen_i::SetPixMap(SALOMEDS::SObject_ptr theSObject, { if ( !theSObject->_is_nil() && thePixMap && strlen( thePixMap )) { - SALOMEDS::Study_var aStudy = theSObject->GetStudy(); + SALOMEDS::Study_var aStudy = theSObject->GetStudy(); SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); - SALOMEDS::GenericAttribute_var anAttr = + SALOMEDS::GenericAttribute_wrap anAttr = aStudyBuilder->FindOrCreateAttribute( theSObject, "AttributePixMap" ); - SALOMEDS::AttributePixMap_var aPMAttr = SALOMEDS::AttributePixMap::_narrow( anAttr ); + SALOMEDS::AttributePixMap_wrap aPMAttr = anAttr; aPMAttr->SetPixMap( thePixMap ); } } @@ -339,24 +350,27 @@ static void addReference (SALOMEDS::Study_ptr theStudy, CORBA::Object_ptr theToObject, int theTag = 0) { - SALOMEDS::SObject_var aToObjSO = SMESH_Gen_i::ObjectToSObject( theStudy, theToObject ); + SALOMEDS::SObject_wrap aToObjSO = SMESH_Gen_i::ObjectToSObject( theStudy, theToObject ); if ( !aToObjSO->_is_nil() && !theSObject->_is_nil() ) { SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); - SALOMEDS::SObject_var aReferenceSO; + 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 = theStudy->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; } } @@ -365,9 +379,12 @@ static void addReference (SALOMEDS::Study_ptr theStudy, 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) + theStudy->GetUseCaseBuilder()->AppendTo( aReferenceSO->GetFather(), aReferenceSO ); } } @@ -386,7 +403,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy throw (SALOME::SALOME_Exception) { Unexpect aCatch(SALOME_SalomeException); - SALOMEDS::SObject_var aSO; + SALOMEDS::SObject_wrap aSO; if ( CORBA::is_nil( theStudy ) || CORBA::is_nil( theIOR )) return aSO._retn(); if(MYDEBUG) MESSAGE("PublishInStudy"); @@ -432,8 +449,8 @@ SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent(SALOMEDS::Study_ptr theSt return SALOMEDS::SComponent::_nil(); if(MYDEBUG) MESSAGE("PublishComponent"); - SALOMEDS::SComponent_var father = - SALOMEDS::SComponent::_narrow( theStudy->FindComponent( ComponentDataType() ) ); + CORBA::String_var compDataType = ComponentDataType(); + SALOMEDS::SComponent_wrap father = theStudy->FindComponent( compDataType.in() ); if ( !CORBA::is_nil( father ) ) return father._retn(); @@ -442,20 +459,26 @@ SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent(SALOMEDS::Study_ptr theSt 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::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); + SALOMEDS::UseCaseBuilder_var useCaseBuilder = theStudy->GetUseCaseBuilder(); + 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(); @@ -475,9 +498,10 @@ static long findMaxChildTag( SALOMEDS::SObject_ptr theSObject ) if ( !theSObject->_is_nil() ) { SALOMEDS::Study_var aStudy = theSObject->GetStudy(); if ( !aStudy->_is_nil() ) { - SALOMEDS::ChildIterator_var anIter = aStudy->NewChildIterator( theSObject ); + SALOMEDS::ChildIterator_wrap anIter = aStudy->NewChildIterator( theSObject ); for ( ; anIter->More(); anIter->Next() ) { - long nTag = anIter->Value()->Tag(); + SALOMEDS::SObject_wrap anSO = anIter->Value(); + long nTag = anSO->Tag(); if ( nTag > aTag ) aTag = nTag; } @@ -502,10 +526,10 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, // find or publish a mesh - SALOMEDS::SObject_var aMeshSO = ObjectToSObject( theStudy, theMesh ); + SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theStudy, theMesh ); if ( aMeshSO->_is_nil() ) { - SALOMEDS::SComponent_var father = PublishComponent( theStudy ); + SALOMEDS::SComponent_wrap father = PublishComponent( theStudy ); if ( father->_is_nil() ) return aMeshSO._retn(); @@ -531,9 +555,10 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, // Publish global hypotheses SMESH::ListOfHypothesis_var hypList = theMesh->GetHypothesisList( aShapeObject ); - for ( int i = 0; i < hypList->length(); i++ ) { + for ( int i = 0; i < hypList->length(); i++ ) + { SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow( hypList[ i ]); - PublishHypothesis( theStudy, aHyp ); + SALOMEDS::SObject_wrap so = PublishHypothesis( theStudy, aHyp ); AddHypothesisToShape( theStudy, theMesh, aShapeObject, aHyp ); } } @@ -549,7 +574,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(); - PublishSubMesh( theStudy, theMesh, aSubMesh, aShapeObject ); + SALOMEDS::SObject_wrap( PublishSubMesh( theStudy, theMesh, aSubMesh, aShapeObject )); } } @@ -560,12 +585,11 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, { 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( theStudy, theMesh, aGroup, aShapeObj )); } } @@ -588,10 +612,10 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishSubMesh (SALOMEDS::Study_ptr theS theSubMesh->_is_nil() || theShapeObject->_is_nil() ) return SALOMEDS::SObject::_nil(); - SALOMEDS::SObject_var aSubMeshSO = ObjectToSObject( theStudy, theSubMesh ); + SALOMEDS::SObject_wrap aSubMeshSO = ObjectToSObject( theStudy, theSubMesh ); if ( aSubMeshSO->_is_nil() ) { - SALOMEDS::SObject_var aMeshSO = ObjectToSObject( theStudy, theMesh ); + SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theStudy, theMesh ); if ( aMeshSO->_is_nil() ) { aMeshSO = PublishMesh( theStudy, theMesh ); if ( aMeshSO->_is_nil()) @@ -632,8 +656,11 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishSubMesh (SALOMEDS::Study_ptr theS } // Find or create submesh root - SALOMEDS::SObject_var aRootSO = publish (theStudy, CORBA::Object::_nil(), + SALOMEDS::SObject_wrap aRootSO = publish (theStudy, CORBA::Object::_nil(), aMeshSO, aRootTag, 0, false ); + if ( aRootSO->_is_nil() ) + return aSubMeshSO._retn(); + SetName( aRootSO, aRootName ); // Add new submesh to corresponding sub-tree @@ -652,13 +679,12 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishSubMesh (SALOMEDS::Study_ptr theS // 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 ( int 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 ); + } return aSubMeshSO._retn(); } @@ -677,10 +703,10 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishGroup (SALOMEDS::Study_ptr theStudy if (theStudy->_is_nil() || theMesh->_is_nil() || theGroup->_is_nil() ) return SALOMEDS::SObject::_nil(); - SALOMEDS::SObject_var aGroupSO = ObjectToSObject( theStudy, theGroup ); + SALOMEDS::SObject_wrap aGroupSO = ObjectToSObject( theStudy, theGroup ); if ( aGroupSO->_is_nil() ) { - SALOMEDS::SObject_var aMeshSO = ObjectToSObject( theStudy, theMesh ); + SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theStudy, theMesh ); if ( aMeshSO->_is_nil() ) { aMeshSO = PublishInStudy( theStudy, SALOMEDS::SObject::_nil(), theMesh, ""); if ( aMeshSO->_is_nil()) @@ -698,8 +724,10 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishGroup (SALOMEDS::Study_ptr theStudy long aRootTag = GetNodeGroupsTag() + aType - 1; // Find or create groups root - SALOMEDS::SObject_var aRootSO = publish (theStudy, CORBA::Object::_nil(), + SALOMEDS::SObject_wrap aRootSO = publish (theStudy, 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] ); @@ -746,35 +774,34 @@ SALOMEDS::SObject_ptr if (theStudy->_is_nil() || 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( theStudy, theHyp ); if ( aHypSO->_is_nil() ) { - SALOMEDS::SComponent_var father = PublishComponent( theStudy ); + SALOMEDS::SComponent_wrap father = PublishComponent( theStudy ); 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 = + SALOMEDS::SObject_wrap aRootSO = publish (theStudy, 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() ); } - 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(); @@ -791,7 +818,7 @@ SALOMEDS::SObject_ptr 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(); @@ -834,15 +861,15 @@ bool SMESH_Gen_i::AddHypothesisToShape(SALOMEDS::Study_ptr theStudy, && theMesh->HasShapeToMesh()) ) return false; - SALOMEDS::SObject_var aMeshSO = ObjectToSObject( theStudy, theMesh ); + SALOMEDS::SObject_wrap aMeshSO = ObjectToSObject( theStudy, theMesh ); if ( aMeshSO->_is_nil() ) aMeshSO = PublishMesh( theStudy, theMesh ); - SALOMEDS::SObject_var aHypSO = PublishHypothesis( theStudy, theHyp ); + SALOMEDS::SObject_wrap aHypSO = PublishHypothesis( theStudy, theHyp ); if ( aMeshSO->_is_nil() || aHypSO->_is_nil()) return false; // Find a mesh or submesh refering to theShape - SALOMEDS::SObject_var aMeshOrSubMesh = + SALOMEDS::SObject_wrap aMeshOrSubMesh = GetMeshOrSubmeshByShape( theStudy, theMesh, theShape ); if ( aMeshOrSubMesh->_is_nil() ) { @@ -861,15 +888,14 @@ 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_var AHR = + SALOMEDS::SObject_wrap AHR = publish (theStudy, 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 ); + if(MYDEBUG) MESSAGE("AddHypothesisToShape--END") return true; } @@ -889,40 +915,61 @@ bool SMESH_Gen_i::RemoveHypothesisFromShape(SALOMEDS::Study_ptr theStudy && theMesh->HasShapeToMesh())) return false; - SALOMEDS::SObject_var aHypSO = ObjectToSObject( theStudy, theHyp ); + SALOMEDS::SObject_wrap aHypSO = ObjectToSObject( theStudy, theHyp ); if ( aHypSO->_is_nil() ) return false; + CORBA::String_var hypEntry = aHypSO->GetID(); + // Find a mesh or submesh refering to theShape - SALOMEDS::SObject_var aMeshOrSubMesh = + SALOMEDS::SObject_wrap aMeshOrSubMesh = GetMeshOrSubmeshByShape( theStudy, 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 = theStudy->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 = theStudy->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 contating parameters separated by ':'. + */ +//================================================================================ + +void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theParameters) { - SALOMEDS::Study_ptr aStudy = GetCurrentStudy(); + 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 */ + int nbVars = 0; int pos = 0, prevPos = 0, len = strlen( theParameters ); if ( len == 0 ) return; while ( pos <= len ) @@ -931,10 +978,11 @@ void SMESH_Gen_i::UpdateParameters(/*CORBA::Object_ptr theObject,*/ const char* { if ( prevPos < pos ) { - string val(theParameters + prevPos, theParameters + pos ); + string val( theParameters + prevPos, theParameters + pos ); if ( !aStudy->IsVariable( val.c_str() )) val.clear(); myLastParameters.push_back( val ); + nbVars += (! myLastParameters.back().empty() ); } else { @@ -944,144 +992,203 @@ void SMESH_Gen_i::UpdateParameters(/*CORBA::Object_ptr theObject,*/ const char* } ++pos; } - return; - - // OLD VARIANT - - // if(VARIABLE_DEBUG) - // cout<<"UpdateParameters : "<_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 "<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 : "<SetValue( aNewParams.ToCString() ); + + if ( nbVars < 1 ) + return; + + // store + // (1) variable names in the string of all varibles used for theObject and + // (2) indices of found variables in myLastParamIndex. + + // remember theObject + SALOMEDS::SObject_wrap aSObj = ObjectToSObject(aStudy,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::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 begining 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; + if ( myCurrentStudy->_is_nil() ) + return varNames; + + SALOMEDS::SObject_wrap aSObj = myCurrentStudy->FindObjectID( theObjectEntry.c_str() ); + if ( myCurrentStudy->_is_nil() ) + return varNames; + + // get a string of variable names + SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->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;jlength();j++) { -// SALOMEDS::ListOfStrings aVars= aSections[j]; -// for(int i=0;iIsVariable(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 = GetCurrentStudy(); +// if( !aStudy->_is_nil() ) { +// // SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(theParameters); +// // for(int j=0;jlength();j++) { +// // SALOMEDS::ListOfStrings aVars= aSections[j]; +// // for(int i=0;iIsVariable(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( myCurrentStudy,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 CORBA::string_dup( aResult.in() ); }