X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Group_i.cxx;h=6312b7389cfa1b6882f06e896baf8e00c5cab54c;hb=5958bdcce798556f2ef6866cb0066b0351f9b053;hp=81a4951376d511581ea477481360b89918de73bc;hpb=c3bf92bd87b770fd81631a3853f7f5bb1ac6a4e8;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_Group_i.cxx b/src/SMESH_I/SMESH_Group_i.cxx index 81a495137..6312b7389 100644 --- a/src/SMESH_I/SMESH_Group_i.cxx +++ b/src/SMESH_I/SMESH_Group_i.cxx @@ -1,37 +1,46 @@ -// SMESH SMESH_I : idl implementation based on 'SMESH' unit's classes +// Copyright (C) 2007-2011 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. // -// Copyright (C) 2004 CEA -// -// 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.salome-platform.org or email : webmaster.salome@opencascade.org +// 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 // + +// SMESH SMESH_I : idl implementation based on 'SMESH' unit's classes // File : SMESH_Group_i.cxx // Author : Sergey ANIKIN, OCC // Module : SMESH -// $Header$ - +// #include "SMESH_Group_i.hxx" #include "SMESH_Mesh_i.hxx" #include "SMESH_Gen_i.hxx" -#include -#include -#include -#include +#include "SMESH_Group.hxx" +#include "SMESHDS_Group.hxx" +#include "SMESHDS_GroupOnGeom.hxx" +#include "SMDSAbs_ElementType.hxx" + +#include "SMESH_Filter_i.hxx" +#include "SMESH_PythonDump.hxx" + +#include CORBA_SERVER_HEADER(SMESH_Filter) + +#include "utilities.h" + +using namespace SMESH; //============================================================================= /*! @@ -39,14 +48,29 @@ */ //============================================================================= -SMESH_Group_i::SMESH_Group_i( PortableServer::POA_ptr thePOA, SMESH_Mesh_i* theMeshServant, const int theLocalID ) +SMESH_GroupBase_i::SMESH_GroupBase_i( PortableServer::POA_ptr thePOA, SMESH_Mesh_i* theMeshServant, const int theLocalID ) : SALOME::GenericObj_i( thePOA ), myMeshServant( theMeshServant ), myLocalID( theLocalID ) { - thePOA->activate_object( this ); + // PAL7962: san -- To ensure correct mapping of servant and correct reference counting in GenericObj_i, + // servant activation is performed by SMESH_Mesh_i::createGroup() + // thePOA->activate_object( this ); +} + +SMESH_Group_i::SMESH_Group_i( PortableServer::POA_ptr thePOA, SMESH_Mesh_i* theMeshServant, const int theLocalID ) + : SALOME::GenericObj_i( thePOA ), + SMESH_GroupBase_i( thePOA, theMeshServant, theLocalID ) +{ + //MESSAGE("SMESH_Group_i; this = "<GetName() && !strcmp( aGroup->GetName(), theName ) ) + return; // nothing to rename + + aGroup->SetName(theName); + + // Update group name in a study + SMESH_Gen_i* aGen = myMeshServant->GetGen(); + aGen->SetName( aGen->ObjectToSObject( aGen->GetCurrentStudy(), _this() ), theName ); + + // Update Python script + TPythonDump() << _this() << ".SetName( '" << theName << "' )"; +} //============================================================================= /*! @@ -98,42 +146,36 @@ void SMESH_Group_i::SetName( const char* theName ) */ //============================================================================= -char* SMESH_Group_i::GetName() +char* SMESH_GroupBase_i::GetName() { - if ( myMeshServant ) { - ::SMESH_Mesh& aMesh = myMeshServant->GetImpl(); - ::SMESH_Group* aGroup = aMesh.GetGroup(myLocalID); - if (aGroup) - return CORBA::string_dup (aGroup->GetName()); - } + ::SMESH_Group* aGroup = GetSmeshGroup(); + if (aGroup) + return CORBA::string_dup (aGroup->GetName()); MESSAGE("get name of a vague group"); return CORBA::string_dup( "NO_NAME" ); } - //============================================================================= /*! * */ //============================================================================= -SMESH::ElementType SMESH_Group_i::GetType() +SMESH::ElementType SMESH_GroupBase_i::GetType() { - if ( myMeshServant ) { - ::SMESH_Mesh& aMesh = myMeshServant->GetImpl(); - ::SMESH_Group* aGroup = aMesh.GetGroup(myLocalID); - if (aGroup) { - SMDSAbs_ElementType aSMDSType = aGroup->GetGroupDS()->GetType(); - SMESH::ElementType aType; - switch (aSMDSType) { - case SMDSAbs_Node: aType = SMESH::NODE; break; - case SMDSAbs_Edge: aType = SMESH::EDGE; break; - case SMDSAbs_Face: aType = SMESH::FACE; break; - case SMDSAbs_Volume: aType = SMESH::VOLUME; break; - default: aType = SMESH::ALL; break; - } - return aType; + SMESHDS_GroupBase* aGroupDS = GetGroupDS(); + if (aGroupDS) { + SMDSAbs_ElementType aSMDSType = aGroupDS->GetType(); + SMESH::ElementType aType; + switch (aSMDSType) { + case SMDSAbs_Node: aType = SMESH::NODE; break; + case SMDSAbs_Edge: aType = SMESH::EDGE; break; + case SMDSAbs_Face: aType = SMESH::FACE; break; + case SMDSAbs_Volume: aType = SMESH::VOLUME; break; + case SMDSAbs_0DElement: aType = SMESH::ELEM0D; break; + default: aType = SMESH::ALL; break; } + return aType; } MESSAGE("get type of a vague group"); return SMESH::ALL; @@ -146,42 +188,30 @@ SMESH::ElementType SMESH_Group_i::GetType() */ //============================================================================= -CORBA::Long SMESH_Group_i::Size() +CORBA::Long SMESH_GroupBase_i::Size() { - if ( myMeshServant ) { - ::SMESH_Mesh& aMesh = myMeshServant->GetImpl(); - ::SMESH_Group* aGroup = aMesh.GetGroup(myLocalID); - if (aGroup) { - int aSize = aGroup->GetGroupDS()->Extent(); - return aSize; - } - } + SMESHDS_GroupBase* aGroupDS = GetGroupDS(); + if (aGroupDS) + return aGroupDS->Extent(); MESSAGE("get size of a vague group"); return 0; } - //============================================================================= /*! * */ //============================================================================= -CORBA::Boolean SMESH_Group_i::IsEmpty() +CORBA::Boolean SMESH_GroupBase_i::IsEmpty() { - if ( myMeshServant ) { - ::SMESH_Mesh& aMesh = myMeshServant->GetImpl(); - ::SMESH_Group* aGroup = aMesh.GetGroup(myLocalID); - if (aGroup) { - bool isEmpty = aGroup->GetGroupDS()->IsEmpty(); - return isEmpty; - } - } + SMESHDS_GroupBase* aGroupDS = GetGroupDS(); + if (aGroupDS) + return aGroupDS->IsEmpty(); MESSAGE("checking IsEmpty of a vague group"); return true; } - //============================================================================= /*! * @@ -190,42 +220,33 @@ CORBA::Boolean SMESH_Group_i::IsEmpty() void SMESH_Group_i::Clear() { - if ( myMeshServant ) { - ::SMESH_Mesh& aMesh = myMeshServant->GetImpl(); - ::SMESH_Group* aGroup = aMesh.GetGroup(myLocalID); - if (aGroup) { - // a SMDS group forgets its type after clearing, so we must re-set it - SMDSAbs_ElementType aSMDSType = aGroup->GetGroupDS()->GetType(); - aGroup->GetGroupDS()->Clear(); - aGroup->GetGroupDS()->SetType(aSMDSType); - return; - } + // Update Python script + TPythonDump() << _this() << ".Clear()"; + + // Clear the group + SMESHDS_Group* aGroupDS = dynamic_cast( GetGroupDS() ); + if (aGroupDS) { + aGroupDS->Clear(); + return; } MESSAGE("attempt to clear a vague group"); } - //============================================================================= /*! * */ //============================================================================= -CORBA::Boolean SMESH_Group_i::Contains( CORBA::Long theID ) +CORBA::Boolean SMESH_GroupBase_i::Contains( CORBA::Long theID ) { - if ( myMeshServant ) { - ::SMESH_Mesh& aMesh = myMeshServant->GetImpl(); - ::SMESH_Group* aGroup = aMesh.GetGroup(myLocalID); - if (aGroup) { - bool res = aGroup->GetGroupDS()->Contains(theID); - return res; - } - } + SMESHDS_GroupBase* aGroupDS = GetGroupDS(); + if (aGroupDS) + return aGroupDS->Contains(theID); MESSAGE("attempt to check contents of a vague group"); return false; } - //============================================================================= /*! * @@ -234,71 +255,145 @@ CORBA::Boolean SMESH_Group_i::Contains( CORBA::Long theID ) CORBA::Long SMESH_Group_i::Add( const SMESH::long_array& theIDs ) { - if ( myMeshServant ) { - ::SMESH_Mesh& aMesh = myMeshServant->GetImpl(); - ::SMESH_Group* aGroup = aMesh.GetGroup(myLocalID); - if (aGroup) { - SMESHDS_Group* aGroupDS = aGroup->GetGroupDS(); - int nbAdd = 0; - for (int i = 0; i < theIDs.length(); i++) { - int anID = (int) theIDs[i]; - if (aGroupDS->Add(anID)) - nbAdd++; - } - return nbAdd; + // Update Python script + TPythonDump() << "nbAdd = " << _this() << ".Add( " << theIDs << " )"; + + // Add elements to the group + SMESHDS_Group* aGroupDS = dynamic_cast( GetGroupDS() ); + if (aGroupDS) { + int nbAdd = 0; + for (int i = 0; i < theIDs.length(); i++) { + int anID = (int) theIDs[i]; + if (aGroupDS->Add(anID)) + nbAdd++; } + return nbAdd; } MESSAGE("attempt to add elements to a vague group"); return 0; } - //============================================================================= /*! * */ //============================================================================= -CORBA::Long SMESH_Group_i::GetID( CORBA::Long theIndex ) +CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs ) { - if ( myMeshServant ) { - ::SMESH_Mesh& aMesh = myMeshServant->GetImpl(); - ::SMESH_Group* aGroup = aMesh.GetGroup(myLocalID); - if (aGroup) { - int anID = aGroup->GetGroupDS()->GetID(theIndex); - return anID; + // Update Python script + TPythonDump() << "nbDel = " << _this() << ".Remove( " << theIDs << " )"; + + // Remove elements from the group + SMESHDS_Group* aGroupDS = dynamic_cast( GetGroupDS() ); + if (aGroupDS) { + int nbDel = 0; + for (int i = 0; i < theIDs.length(); i++) { + int anID = (int) theIDs[i]; + if (aGroupDS->Remove(anID)) + nbDel++; } + return nbDel; } - MESSAGE("attempt to iterate on a vague group"); - return -1; + MESSAGE("attempt to remove elements from a vague group"); + return 0; } - //============================================================================= /*! * */ //============================================================================= -SMESH::long_array* SMESH_Group_i::GetListOfID() +typedef bool (SMESHDS_Group::*TFunChangeGroup)(const int); + +CORBA::Long +ChangeByPredicate( SMESH::Predicate_i* thePredicate, + SMESHDS_GroupBase* theGroupBase, + TFunChangeGroup theFun) { - SMESH::long_array_var aRes = new SMESH::long_array(); - if ( myMeshServant ) { - ::SMESH_Mesh& aMesh = myMeshServant->GetImpl(); - ::SMESH_Group* aGroup = aMesh.GetGroup(myLocalID); - if (aGroup) { - SMESHDS_Group* aGroupDS = aGroup->GetGroupDS(); - int aSize = aGroupDS->Extent(); - aRes->length(aSize); - for (int i = 0; i < aSize; i++) - aRes[i] = aGroupDS->GetID(i+1); - return aRes._retn(); + CORBA::Long aNb = 0; + if(SMESHDS_Group* aGroupDS = dynamic_cast(theGroupBase)){ + SMESH::Controls::Filter::TIdSequence aSequence; + const SMDS_Mesh* aMesh = theGroupBase->GetMesh(); + SMESH::Filter_i::GetElementsId(thePredicate,aMesh,aSequence); + + CORBA::Long i = 0, iEnd = aSequence.size(); + for(; i < iEnd; i++) + if((aGroupDS->*theFun)(aSequence[i])) + aNb++; + return aNb; + } + return aNb; +} + +CORBA::Long +SMESH_Group_i:: +AddByPredicate( SMESH::Predicate_ptr thePredicate ) +{ + if(SMESH::Predicate_i* aPredicate = SMESH::GetPredicate(thePredicate)){ + TPythonDump()<<_this()<<".AddByPredicate("<( GetGroupDS() ); + if (aGroupDS) { + SMESH::long_array_var anIds; + SMESH::SMESH_GroupBase_var group = SMESH::SMESH_GroupBase::_narrow(theSource); + SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow(theSource); + SMESH::SMESH_subMesh_var submesh = SMESH::SMESH_subMesh::_narrow(theSource); + SMESH::Filter_var filter = SMESH::Filter::_narrow(theSource); + if ( !group->_is_nil()) + anIds = group->GetType()==GetType() ? theSource->GetIDs() : new SMESH::long_array(); + else if ( !mesh->_is_nil() ) + anIds = mesh->GetElementsByType( GetType() ); + else if ( !submesh->_is_nil()) + anIds = submesh->GetElementsByType( GetType() ); + else if ( !filter->_is_nil() ) + anIds = filter->GetElementType()==GetType() ? theSource->GetIDs() : new SMESH::long_array(); + else + anIds = theSource->GetIDs(); + for ( int i = 0, total = anIds->length(); i < total; i++ ) { + if ( aGroupDS->Add((int)anIds[i]) ) nbAdd++; } } - MESSAGE("get list of IDs of a vague group"); - return aRes._retn(); + + // Update Python script + TPythonDump() << "nbAdd = " << _this() << ".AddFrom( " << theSource << " )"; + + return nbAdd; } +//============================================================================= +/*! + * + */ +//============================================================================= + +CORBA::Long SMESH_GroupBase_i::GetID( CORBA::Long theIndex ) +{ + SMESHDS_GroupBase* aGroupDS = GetGroupDS(); + if (aGroupDS) + return aGroupDS->GetID(theIndex); + MESSAGE("attempt to iterate on a vague group"); + return -1; +} //============================================================================= /*! @@ -306,53 +401,179 @@ SMESH::long_array* SMESH_Group_i::GetListOfID() */ //============================================================================= -CORBA::Long SMESH_Group_i::Remove( const SMESH::long_array& theIDs ) +SMESH::long_array* SMESH_GroupBase_i::GetListOfID() { - if ( myMeshServant ) { - ::SMESH_Mesh& aMesh = myMeshServant->GetImpl(); - ::SMESH_Group* aGroup = aMesh.GetGroup(myLocalID); - if (aGroup) { - // a SMDS group forgets its type after clearing, so we must re-set it - // if the group becomes empty - SMDSAbs_ElementType aSMDSType = aGroup->GetGroupDS()->GetType(); - SMESHDS_Group* aGroupDS = aGroup->GetGroupDS(); - int nbDel = 0; - for (int i = 0; i < theIDs.length(); i++) { - int anID = (int) theIDs[i]; - if (aGroupDS->Remove(anID)) - nbDel++; - } - if (aGroupDS->IsEmpty()) - aGroupDS->SetType(aSMDSType); - return nbDel; - } + SMESH::long_array_var aRes = new SMESH::long_array(); + SMESHDS_GroupBase* aGroupDS = GetGroupDS(); + if (aGroupDS) { + int aSize = aGroupDS->Extent(); + aRes->length(aSize); + for (int i = 0; i < aSize; i++) + aRes[i] = aGroupDS->GetID(i+1); + return aRes._retn(); } - MESSAGE("attempt to remove elements from a vague group"); - return 0; + MESSAGE("get list of IDs of a vague group"); + return aRes._retn(); } - //============================================================================= /*! * */ //============================================================================= -SMESH::SMESH_Mesh_ptr SMESH_Group_i::GetMesh() +SMESH::SMESH_Mesh_ptr SMESH_GroupBase_i::GetMesh() { - MESSAGE("SMESH_Group_i::GetMesh(): mesh servant = " << myMeshServant ); SMESH::SMESH_Mesh_var aMesh; if ( myMeshServant ) aMesh = SMESH::SMESH_Mesh::_narrow( myMeshServant->_this() ); return aMesh._retn(); } +//======================================================================= +//function : GetShape +//purpose : +//======================================================================= + +GEOM::GEOM_Object_ptr SMESH_GroupOnGeom_i::GetShape() +{ + GEOM::GEOM_Object_var aGeomObj; + SMESHDS_GroupOnGeom* aGroupDS = dynamic_cast( GetGroupDS() ); + if ( aGroupDS ) { + SMESH_Gen_i* aGen = GetMeshServant()->GetGen(); + aGeomObj = aGen->ShapeToGeomObject( aGroupDS->GetShape() ); + } + return aGeomObj._retn(); +} //============================================================================= /*! - * + * */ //============================================================================= -int SMESH_Group_i::GetLocalID() +SALOMEDS::Color SMESH_GroupBase_i::GetColor() { - return myLocalID; + SMESHDS_GroupBase* aGroupDS = GetGroupDS(); + if (aGroupDS) + { + Quantity_Color aQColor = aGroupDS->GetColor(); + SALOMEDS::Color aColor; + aColor.R = aQColor.Red(); + aColor.G = aQColor.Green(); + aColor.B = aQColor.Blue(); + + return aColor; + } + MESSAGE("get color of a group"); + return SALOMEDS::Color(); } + +//============================================================================= +/*! + * + */ +//============================================================================= +void SMESH_GroupBase_i::SetColor(const SALOMEDS::Color& color) +{ + SMESHDS_GroupBase* aGroupDS = GetGroupDS(); + if (aGroupDS) + { + Quantity_Color aQColor( color.R, color.G, color.B, Quantity_TOC_RGB ); + aGroupDS->SetColor(aQColor); + TPythonDump()<<_this()<<".SetColor( SALOMEDS.Color( "<GetColorGroup(); + MESSAGE("get color number of a group"); + return 0; +} + +//============================================================================= +/*! + * + */ +//============================================================================= +void SMESH_GroupBase_i::SetColorNumber(CORBA::Long color) +{ + SMESHDS_GroupBase* aGroupDS = GetGroupDS(); + if (aGroupDS) + { + aGroupDS->SetColorGroup(color); + TPythonDump()<<_this()<<".SetColorNumber( "<length(SMESH::Entity_Last); + for (int i = SMESH::Entity_Node; i < SMESH::Entity_Last; i++) + aRes[i] = 0; + + SMESHDS_GroupBase* aGrpDS = GetGroupDS(); + if ( !aGrpDS ) + return aRes._retn(); + if ( GetType() == NODE ) + aRes[ SMESH::Entity_Node ] = aGrpDS->Extent(); + else + SMESH_Mesh_i::CollectMeshInfo( aGrpDS->GetElements(), aRes); + +// SMDS_ElemIteratorPtr it = aGrpDS->GetElements(); +// if ( it->more() ) +// { +// cout << "START" << endl; +// set< const SMDS_MeshElement* > nodes; +// const SMDS_MeshElement* e = it->next(); +// for ( int i = 0; i < 1000000; ++i) +// { +// SMDS_ElemIteratorPtr it = e->nodesIterator(); +// nodes.insert( e + i ); +// } +// cout << "END "<< nodes.size() << endl; +// } + + return aRes._retn(); +} + +//======================================================================= +//function : GetIDs +//purpose : Returns ids of members +//======================================================================= + +SMESH::long_array* SMESH_GroupBase_i::GetIDs() +{ + SMESH::long_array_var aResult = GetListOfID(); + return aResult._retn(); +} + +//======================================================================= +//function : GetTypes +//purpose : Returns types of elements it contains +//======================================================================= + +SMESH::array_of_ElementType* SMESH_GroupBase_i::GetTypes() +{ + SMESH::array_of_ElementType_var types = new SMESH::array_of_ElementType; + types->length( 1 ); + types[0] = GetType(); + return types._retn(); +} +