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=b08b7e3e6d35d8b09a536a17ca8b5b5e75a68af5;hp=d3c645941bb8bbf65da35314c8e06cc352d73426;hb=e5b4cc5b6e8acda597188ff4b6c8247283fb194c;hpb=0ad037c9895435b064ea5855edac9db9a9d5b3dd diff --git a/src/SMESH_I/SMESH_Gen_i_1.cxx b/src/SMESH_I/SMESH_Gen_i_1.cxx index d3c645941..b08b7e3e6 100644 --- a/src/SMESH_I/SMESH_Gen_i_1.cxx +++ b/src/SMESH_I/SMESH_Gen_i_1.cxx @@ -1,46 +1,50 @@ -// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003 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. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// 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 +// 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, or (at your option) any later version. // -// File : SMESH_Gen_i_1.cxx -// Created : Thu Oct 21 17:24:06 2004 -// Author : Edward AGAPOV (eap) -// Module : SMESH -// $Header: +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// File : SMESH_Gen_i_1.cxx +// Created : Thu Oct 21 17:24:06 2004 +// Author : Edward AGAPOV (eap) +// Module : SMESH #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.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 + +#include #ifdef _DEBUG_ static int MYDEBUG = 0; @@ -48,6 +52,8 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif +using namespace std; + //============================================================================= /*! * Get...Tag [ static ] @@ -58,82 +64,92 @@ static int MYDEBUG = 0; 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; +} + +long SMESH_Gen_i::Get0DElementsGroupsTag() +{ + return SMESH::Tag_0DElementsGroups; +} + +long SMESH_Gen_i::GetBallElementsGroupsTag() +{ + return SMESH::Tag_BallElementsGroups; } //============================================================================= @@ -147,7 +163,7 @@ long SMESH_Gen_i::GetVolumeGroupsTag() bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) { if(MYDEBUG) MESSAGE("CanPublishInStudy - "<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(); } @@ -206,8 +225,10 @@ GEOM::GEOM_Object_ptr SMESH_Gen_i::ShapeToGeomObject (const TopoDS_Shape& theSha GEOM_Client* aClient = GetShapeReader(); TCollection_AsciiString IOR; if ( aClient && aClient->Find( theShape, IOR )) - aShapeObj = GEOM::GEOM_Object::_narrow - ( GetORB()->string_to_object( IOR.ToCString() ) ); + { + CORBA::Object_var obj = GetORB()->string_to_object( IOR.ToCString() ); + aShapeObj = GEOM::GEOM_Object::_narrow ( obj ); + } } return aShapeObj._retn(); } @@ -222,7 +243,7 @@ TopoDS_Shape SMESH_Gen_i::GeomObjectToShape(GEOM::GEOM_Object_ptr theGeomObject) 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 ); } @@ -241,35 +262,93 @@ 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::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); - if ( SO->_is_nil() ) { - if ( theTag == 0 ) + SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( theStudy, 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" ); - 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_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() !!! + SALOME::GenericObj_var genObj = SALOME::GenericObj::_narrow( theIOR ); + if ( !genObj->_is_nil() ) + genObj->UnRegister(); + } } + if ( thePixMap ) { anAttr = aStudyBuilder->FindOrCreateAttribute( SO, "AttributePixMap" ); - SALOMEDS::AttributePixMap::_narrow( anAttr )->SetPixMap( thePixMap ); + 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, @@ -277,23 +356,48 @@ 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 ); - 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 : +//======================================================================= + +void SMESH_Gen_i::SetPixMap(SALOMEDS::SObject_ptr theSObject, + const char* thePixMap) +{ + if ( !theSObject->_is_nil() && thePixMap && strlen( thePixMap )) + { + SALOMEDS::Study_var aStudy = theSObject->GetStudy(); + SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); + SALOMEDS::GenericAttribute_wrap anAttr = + aStudyBuilder->FindOrCreateAttribute( theSObject, "AttributePixMap" ); + SALOMEDS::AttributePixMap_wrap aPMAttr = anAttr; + aPMAttr->SetPixMap( thePixMap ); + } +} + //======================================================================= //function : addReference //purpose : @@ -304,28 +408,51 @@ 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; - 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; - } - if ( !isReferred ) { - aReferenceSO = aStudyBuilder->NewObject( theSObject ); - aStudyBuilder->Addreference( aReferenceSO, aToObjSO ); + int tag = 1; + SALOMEDS::ChildIterator_wrap anIter = theStudy->NewChildIterator( theSObject ); + for ( ; !isReferred && anIter->More(); anIter->Next(), ++tag ) { + 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_wrap anAttr; + if ( !curSO->FindAttribute( anAttr.inout(), "AttributeIOR" )) + theTag = tag; + } } + if ( isReferred ) + return; + if ( !theTag ) + theTag = tag; } - else { - if ( !theSObject->FindSubObject( theTag, aReferenceSO )) - aReferenceSO = aStudyBuilder->NewObjectToTag( theSObject, theTag ); - aStudyBuilder->Addreference( aReferenceSO, aToObjSO ); + 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 = theStudy->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 ); } } @@ -338,13 +465,13 @@ static void addReference (SALOMEDS::Study_ptr theStudy, //============================================================================= SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::Study_ptr theStudy, - SALOMEDS::SObject_ptr theSObject, - CORBA::Object_ptr theIOR, - const char* theName) + SALOMEDS::SObject_ptr theSObject, + CORBA::Object_ptr theIOR, + const char* theName) 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"); @@ -390,60 +517,48 @@ 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() ) ); - if ( !CORBA::is_nil( father ) ) + SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); + SALOMEDS::UseCaseBuilder_wrap useCaseBuilder = theStudy->GetUseCaseBuilder(); + + CORBA::String_var compDataType = ComponentDataType(); + SALOMEDS::SComponent_wrap father = theStudy->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 : @@ -460,15 +575,15 @@ 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(); // Find correct free tag - long aTag = findMaxChildTag( father.in() ); + long aTag = father->GetLastChildTag(); if ( aTag <= GetAlgorithmsRootTag() ) aTag = GetAlgorithmsRootTag() + 1; else @@ -488,13 +603,13 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SALOMEDS::Study_ptr theStudy, // Publish global hypotheses - SMESH::ListOfHypothesis * hypList = theMesh->GetHypothesisList( aShapeObject ); - 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, aShapeObject, aHyp ); - } + SMESH::ListOfHypothesis_var hypList = theMesh->GetHypothesisList( aShapeObject ); + for ( CORBA::ULong i = 0; i < hypList->length(); i++ ) + { + SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow( hypList[ i ]); + SALOMEDS::SObject_wrap so = PublishHypothesis( theStudy, aHyp ); + AddHypothesisToShape( theStudy, theMesh, aShapeObject, aHyp ); + } } // Publish submeshes @@ -508,7 +623,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 )); } } @@ -519,12 +634,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 )); } } @@ -547,10 +661,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()) @@ -558,7 +672,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishSubMesh (SALOMEDS::Study_ptr theS } // Find submesh sub-tree tag long aRootTag; - char* aRootName = ""; + const char* aRootName = ""; switch ( theShapeObject->GetShapeType() ) { case GEOM::VERTEX: aRootTag = GetSubMeshOnVertexTag(); @@ -591,12 +705,18 @@ 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 - aSubMeshSO = publish (theStudy, theSubMesh, aRootSO, 0, "ICON_SMESH_TREE_MESH_WARN"); + 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] ); if ( aSubMeshSO->_is_nil() ) return aSubMeshSO._retn(); } @@ -608,13 +728,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 ( CORBA::ULong i = 0; i < hypList->length(); i++ ) { + SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow( hypList[ i ]); + SALOMEDS::SObject_wrap so = PublishHypothesis( theStudy, aHyp ); + AddHypothesisToShape( theStudy, theMesh, theShapeObject, aHyp ); + } return aSubMeshSO._retn(); } @@ -633,32 +752,53 @@ 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()) 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" }; + "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 - if ( aType != SMESH::ALL ) { + // 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(), + SALOMEDS::SObject_wrap aRootSO = publish (theStudy, CORBA::Object::_nil(), aMeshSO, aRootTag, 0, false ); - if ( aType < 5 ) + 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 - aGroupSO = publish (theStudy, theGroup, aRootSO, 0, "ICON_SMESH_TREE_GROUP" ); + int isEmpty = false; + std::string pm[2] = { "ICON_SMESH_TREE_GROUP", "ICON_SMESH_TREE_MESH_WARN" }; + if ( SMESH::DownCast< SMESH_GroupOnFilter_i* > ( theGroup )) + { + pm[0] = "ICON_SMESH_TREE_GROUP_ON_FILTER"; + } + else if ( SMESH::DownCast< SMESH_Group_i* > ( theGroup )) + { + 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() ); } if ( aGroupSO->_is_nil() ) return aGroupSO._retn(); @@ -687,31 +827,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[ 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(); @@ -728,11 +871,16 @@ SALOMEDS::SObject_ptr GEOM::GEOM_Object_ptr theShape) { if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape") - SALOMEDS::SObject_var aMeshOrSubMesh; - if ( theShape->_is_nil() || theMesh->_is_nil() ) + SALOMEDS::SObject_wrap aMeshOrSubMesh; + 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( theMesh ); if ( !aShape.IsNull() && mesh_i && mesh_i->GetImpl().GetMeshDS() ) { @@ -762,18 +910,19 @@ bool SMESH_Gen_i::AddHypothesisToShape(SALOMEDS::Study_ptr theStudy, { 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_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 = + // Find a mesh or submesh referring to theShape + SALOMEDS::SObject_wrap aMeshOrSubMesh = GetMeshOrSubmeshByShape( theStudy, theMesh, theShape ); if ( aMeshOrSubMesh->_is_nil() ) { @@ -792,15 +941,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; } @@ -816,30 +964,283 @@ bool SMESH_Gen_i::RemoveHypothesisFromShape(SALOMEDS::Study_ptr theStudy 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 ); + SALOMEDS::SObject_wrap aHypSO = ObjectToSObject( theStudy, theHyp ); if ( aHypSO->_is_nil() ) return false; - // Find a mesh or submesh refering to theShape - SALOMEDS::SObject_var aMeshOrSubMesh = + CORBA::String_var hypEntry = aHypSO->GetID(); + + // Find a mesh or sub-mesh referring to theShape + 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; } +//================================================================================ +/*! + * \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_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 ) + { + if ( pos == len || theParameters[pos] == ':' ) + { + if ( prevPos < pos ) + { + string val( theParameters + prevPos, theParameters + pos ); + if ( !aStudy->IsVariable( val.c_str() )) + val.clear(); + myLastParameters.push_back( val ); + nbVars += (! myLastParameters.back().empty() ); + } + else + { + myLastParameters.push_back(""); + } + prevPos = pos+1; + } + ++pos; + } + + 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 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; + 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+=":"; +// // } +// // 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 ( aStudy->IsVariable( pParams+beg )) +// anInputParams += pParams+beg; +// if ( end < paramStr.Length() ) +// anInputParams += sep; +// else +// break; +// beg = end + 1; +// } +// } +// return CORBA::string_dup(anInputParams.ToCString()); +// } + +//======================================================================= +//function : GetParameters +//purpose : +//======================================================================= + +char* SMESH_Gen_i::GetParameters(CORBA::Object_ptr theObject) +{ + 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 aResult._retn(); +}