X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_MeshEditor_i.cxx;h=d88c81400cbf295a0d4f148f3b95e1c8e7fb104b;hb=refs%2Ftags%2FdistribGeom_06Mar13;hp=4ce4b901e6f9b165c43980d96be18fc4b2d5f4f1;hpb=512a8923018c8a53648b6bc2dd02a29cd8e94eed;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index 4ce4b901e..d88c81400 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -1,25 +1,24 @@ -// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 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 +// 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. +// 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. +// 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 +// 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses // File : SMESH_MeshEditor_i.cxx // Author : Nicolas REJNERI // Module : SMESH @@ -30,22 +29,34 @@ #include "SMESH_MeshEditor_i.hxx" -#include "SMDS_Mesh0DElement.hxx" +#include "SMDS_EdgePosition.hxx" +#include "SMDS_ElemIterator.hxx" +#include "SMDS_FacePosition.hxx" +#include "SMDS_IteratorOnIterators.hxx" #include "SMDS_LinearEdge.hxx" +#include "SMDS_Mesh0DElement.hxx" #include "SMDS_MeshFace.hxx" #include "SMDS_MeshVolume.hxx" #include "SMDS_PolyhedralVolumeOfNodes.hxx" -#include "SMESH_subMeshEventListener.hxx" -#include "SMESH_Gen_i.hxx" +#include "SMDS_SetIterator.hxx" +#include "SMDS_VolumeTool.hxx" +#include "SMESHDS_Group.hxx" +#include "SMESHDS_GroupOnGeom.hxx" +#include "SMESH_ControlsDef.hxx" #include "SMESH_Filter_i.hxx" -#include "SMESH_subMesh_i.hxx" +#include "SMESH_Gen_i.hxx" +#include "SMESH_Group.hxx" #include "SMESH_Group_i.hxx" +#include "SMESH_MeshPartDS.hxx" +#include "SMESH_MesherHelper.hxx" #include "SMESH_PythonDump.hxx" -#include "SMESH_ControlsDef.hxx" +#include "SMESH_subMeshEventListener.hxx" +#include "SMESH_subMesh_i.hxx" -#include "utilities.h" -#include "Utils_ExceptHandlers.hxx" -#include "Utils_CorbaException.hxx" +#include +#include +#include +#include #include #include @@ -70,12 +81,15 @@ #include #include +#include "SMESH_TryCatch.hxx" // include after OCCT headers! + #define cast2Node(elem) static_cast( elem ) using namespace std; using SMESH::TPythonDump; +using SMESH::TVar; -namespace { +namespace MeshEditor_I { //============================================================================= /*! @@ -88,12 +102,12 @@ namespace { SMDSAbs_ElementType myPreviewType; // type to show //!< Constructor TPreviewMesh(SMDSAbs_ElementType previewElements = SMDSAbs_All) { - _isShapeToMesh = (_id =_studyId =_idDoc = 0); + _isShapeToMesh = (_id =_studyId = 0); _myMeshDS = new SMESHDS_Mesh( _id, true ); myPreviewType = previewElements; } //!< Destructor - virtual ~TPreviewMesh() { delete _myMeshDS; } + virtual ~TPreviewMesh() { delete _myMeshDS; _myMeshDS = 0; } //!< Copy a set of elements void Copy(const TIDSortedElemSet & theElements, TIDSortedElemSet& theCopyElements, @@ -110,8 +124,12 @@ namespace { if ( type == theAvoidType || ( theSelectType != SMDSAbs_All && type != theSelectType )) continue; - - if ( const SMDS_MeshElement* anElemCopy = Copy( anElem )) + const SMDS_MeshElement* anElemCopy; + if ( type == SMDSAbs_Node) + anElemCopy = Copy( cast2Node(anElem) ); + else + anElemCopy = Copy( anElem ); + if ( anElemCopy ) theCopyElements.insert( theCopyElements.end(), anElemCopy ); } } @@ -166,8 +184,10 @@ namespace { struct TSearchersDeleter : public SMESH_subMeshEventListener { SMESH_Mesh* myMesh; + string myMeshPartIOR; //!< Constructor - TSearchersDeleter(): SMESH_subMeshEventListener( false ), // won't be deleted by submesh + TSearchersDeleter(): SMESH_subMeshEventListener( false, // won't be deleted by submesh + "SMESH_MeshEditor_i::TSearchersDeleter"), myMesh(0) {} //!< Delete theNodeSearcher static void Delete() @@ -186,15 +206,16 @@ namespace { } } //!< set self on all submeshes and delete theNodeSearcher if other mesh is set - void Set(SMESH_Mesh* mesh) + void Set(SMESH_Mesh* mesh, const string& meshPartIOR = string()) { - if ( myMesh != mesh ) + if ( myMesh != mesh || myMeshPartIOR != meshPartIOR) { if ( myMesh ) { Delete(); Unset( myMesh ); } myMesh = mesh; + myMeshPartIOR = meshPartIOR; if ( SMESH_subMesh* myMainSubMesh = mesh->GetSubMeshContaining(1) ) { const TDependsOnMap & subMeshes = myMainSubMesh->DependsOn(); TDependsOnMap::const_iterator sm; @@ -234,7 +255,7 @@ namespace { } //================================================================================ /*! - * \brief function for conversion long_array to TIDSortedElemSet + * \brief function for conversion of long_array to TIDSortedElemSet * \param IDs - array of IDs * \param aMesh - mesh * \param aMap - collection to fill @@ -252,7 +273,7 @@ namespace { const SMDS_MeshElement * elem = (aType == SMDSAbs_Node ? aMesh->FindNode(ind) : aMesh->FindElement(ind)); if ( elem && ( aType == SMDSAbs_All || elem->GetType() == aType )) - aMap.insert( elem ); + aMap.insert( aMap.end(), elem ); } } //================================================================================ @@ -287,6 +308,7 @@ namespace { else { arrayToSet( anIDs, theMeshDS, theElemSet, theType); + return bool(anIDs->length()) == bool(theElemSet.size()); } return true; } @@ -311,13 +333,85 @@ namespace { if ( const SMDS_MeshNode * n = theMeshDS->FindNode( aElementsId[i] )) theNodeSet.insert( theNodeSet.end(), n); } - else { + else if ( SMESH::DownCast( theObject )) + { + SMDS_NodeIteratorPtr nIt = theMeshDS->nodesIterator(); + while ( nIt->more( )) + if( const SMDS_MeshElement * elem = nIt->next() ) + theNodeSet.insert( elem->begin_nodes(), elem->end_nodes()); + } + else + { for(int i = 0; i < aElementsId->length(); i++) if( const SMDS_MeshElement * elem = theMeshDS->FindElement( aElementsId[i] )) theNodeSet.insert( elem->begin_nodes(), elem->end_nodes()); } } -} + + //================================================================================ + /*! + * \brief Returns elements connected to the given elements + */ + //================================================================================ + + void getElementsAround(const TIDSortedElemSet& theElements, + const SMESHDS_Mesh* theMeshDS, + TIDSortedElemSet& theElementsAround) + { + if ( theElements.empty() ) return; + + SMDSAbs_ElementType elemType = (*theElements.begin())->GetType(); + bool sameElemType = ( elemType == (*theElements.rbegin())->GetType() ); + if ( sameElemType && + theMeshDS->GetMeshInfo().NbElements( elemType ) == theElements.size() ) + return; // all the elements are in theElements + + if ( !sameElemType ) + elemType = SMDSAbs_All; + + TIDSortedElemSet visitedNodes; + TIDSortedElemSet::const_iterator elemIt = theElements.begin(); + for ( ; elemIt != theElements.end(); ++elemIt ) + { + const SMDS_MeshElement* e = *elemIt; + int i = e->NbCornerNodes(); + while ( --i != -1 ) + { + const SMDS_MeshNode* n = e->GetNode( i ); + if ( visitedNodes.insert( n ).second ) + { + SMDS_ElemIteratorPtr invIt = n->GetInverseElementIterator(elemType); + while ( invIt->more() ) + { + const SMDS_MeshElement* elemAround = invIt->next(); + if ( !theElements.count( elemAround )) + theElementsAround.insert( elemAround ); + } + } + } + } + } + + //================================================================================ + /*! + * \brief Return a string used to detect change of mesh part on which theElementSearcher + * is going to be used + */ + //================================================================================ + + string getPartIOR( SMESH::SMESH_IDSource_ptr theMeshPart, SMESH::ElementType type) + { + string partIOR = SMESH_Gen_i::GetORB()->object_to_string( theMeshPart ); + if ( SMESH_Group_i* group_i = SMESH::DownCast( theMeshPart )) + // take into account passible group modification + partIOR += SMESH_Comment( ((SMESHDS_Group*)group_i->GetGroupDS())->SMDSGroup().Tic() ); + partIOR += SMESH_Comment( type ); + return partIOR; + } + +} // namespace MeshEditor_I + +using namespace MeshEditor_I; //============================================================================= /*! @@ -325,11 +419,14 @@ namespace { */ //============================================================================= -SMESH_MeshEditor_i::SMESH_MeshEditor_i(SMESH_Mesh_i* theMesh, bool isPreview) +SMESH_MeshEditor_i::SMESH_MeshEditor_i(SMESH_Mesh_i* theMesh, bool isPreview): + myMesh_i( theMesh ), + myMesh( &theMesh->GetImpl() ), + myEditor( myMesh ), + myIsPreviewMode ( isPreview ), + myPreviewMesh( 0 ), + myPreviewEditor( 0 ) { - myMesh_i = theMesh; - myMesh = & theMesh->GetImpl(); - myPreviewMode = isPreview; } //================================================================================ @@ -340,6 +437,9 @@ SMESH_MeshEditor_i::SMESH_MeshEditor_i(SMESH_Mesh_i* theMesh, bool isPreview) SMESH_MeshEditor_i::~SMESH_MeshEditor_i() { + deleteAuxIDSources(); + delete myPreviewMesh; myPreviewMesh = 0; + delete myPreviewEditor; myPreviewEditor = 0; } //================================================================================ @@ -350,15 +450,237 @@ SMESH_MeshEditor_i::~SMESH_MeshEditor_i() void SMESH_MeshEditor_i::initData(bool deleteSearchers) { - if ( myPreviewMode ) { - myPreviewData = new SMESH::MeshPreviewStruct(); + if ( myIsPreviewMode ) { + if ( myPreviewMesh ) myPreviewMesh->Clear(); } else { - myLastCreatedElems = new SMESH::long_array(); - myLastCreatedNodes = new SMESH::long_array(); if ( deleteSearchers ) TSearchersDeleter::Delete(); } + getEditor().GetError().reset(); + getEditor().CrearLastCreated(); +} + +//================================================================================ +/*! + * \brief Increment mesh modif time and optionally record that the performed + * modification may influence futher mesh re-compute. + * \param [in] isReComputeSafe - true if the modification does not infulence + * futher mesh re-compute + */ +//================================================================================ + +void SMESH_MeshEditor_i::declareMeshModified( bool isReComputeSafe ) +{ + myMesh->GetMeshDS()->Modified(); + if ( !isReComputeSafe ) + myMesh->SetIsModified( true ); +} + +//================================================================================ +/*! + * \brief Return either myEditor or myPreviewEditor depending on myIsPreviewMode. + * WARNING: in preview mode call getPreviewMesh() before getEditor()! + */ +//================================================================================ + +::SMESH_MeshEditor& SMESH_MeshEditor_i::getEditor() +{ + if ( myIsPreviewMode && !myPreviewEditor ) { + if ( !myPreviewMesh ) getPreviewMesh(); + myPreviewEditor = new ::SMESH_MeshEditor( myPreviewMesh ); + } + return myIsPreviewMode ? *myPreviewEditor : myEditor; +} + +//================================================================================ +/*! + * \brief Initialize and return myPreviewMesh + * \param previewElements - type of elements to show in preview + * + * WARNING: call it once par a method! + */ +//================================================================================ + +TPreviewMesh * SMESH_MeshEditor_i::getPreviewMesh(SMDSAbs_ElementType previewElements) +{ + if ( !myPreviewMesh || myPreviewMesh->myPreviewType != previewElements ) + { + delete myPreviewEditor; + myPreviewEditor = 0; + delete myPreviewMesh; + myPreviewMesh = new TPreviewMesh( previewElements ); + } + myPreviewMesh->Clear(); + return myPreviewMesh; +} + +//================================================================================ +/*! + * Return data of mesh edition preview + */ +//================================================================================ + +SMESH::MeshPreviewStruct* SMESH_MeshEditor_i::GetPreviewData() + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + const bool hasBadElems = ( getEditor().GetError() && getEditor().GetError()->HasBadElems() ); + + if ( myIsPreviewMode || hasBadElems ) { // --- MeshPreviewStruct filling --- + + list aNodesConnectivity; + typedef map TNodesMap; + TNodesMap nodesMap; + + SMESHDS_Mesh* aMeshDS; + std::auto_ptr< SMESH_MeshPartDS > aMeshPartDS; + if ( hasBadElems ) { + aMeshPartDS.reset( new SMESH_MeshPartDS( getEditor().GetError()->myBadElements )); + aMeshDS = aMeshPartDS.get(); + } + else { + aMeshDS = getEditor().GetMeshDS(); + } + myPreviewData = new SMESH::MeshPreviewStruct(); + myPreviewData->nodesXYZ.length(aMeshDS->NbNodes()); + + + SMDSAbs_ElementType previewType = SMDSAbs_All; + if ( !hasBadElems ) + if (TPreviewMesh * aPreviewMesh = dynamic_cast< TPreviewMesh* >( getEditor().GetMesh() )) { + previewType = aPreviewMesh->myPreviewType; + switch ( previewType ) { + case SMDSAbs_Edge : break; + case SMDSAbs_Face : break; + case SMDSAbs_Volume: break; + default:; + if ( aMeshDS->GetMeshInfo().NbElements() == 0 ) previewType = SMDSAbs_Node; + } + } + + myPreviewData->elementTypes.length( aMeshDS->GetMeshInfo().NbElements( previewType )); + int i = 0, j = 0; + SMDS_ElemIteratorPtr itMeshElems = aMeshDS->elementsIterator(previewType); + + while ( itMeshElems->more() ) { + const SMDS_MeshElement* aMeshElem = itMeshElems->next(); + SMDS_ElemIteratorPtr itElemNodes = aMeshElem->nodesIterator(); + while ( itElemNodes->more() ) { + const SMDS_MeshNode* aMeshNode = + static_cast( itElemNodes->next() ); + int aNodeID = aMeshNode->GetID(); + TNodesMap::iterator anIter = nodesMap.find(aNodeID); + if ( anIter == nodesMap.end() ) { + // filling the nodes coordinates + myPreviewData->nodesXYZ[j].x = aMeshNode->X(); + myPreviewData->nodesXYZ[j].y = aMeshNode->Y(); + myPreviewData->nodesXYZ[j].z = aMeshNode->Z(); + anIter = nodesMap.insert( make_pair(aNodeID, j) ).first; + j++; + } + aNodesConnectivity.push_back(anIter->second); + } + + // filling the elements types + SMDSAbs_ElementType aType = aMeshElem->GetType(); + bool isPoly = aMeshElem->IsPoly(); + + myPreviewData->elementTypes[i].SMDS_ElementType = (SMESH::ElementType) aType; + myPreviewData->elementTypes[i].isPoly = isPoly; + myPreviewData->elementTypes[i].nbNodesInElement = aMeshElem->NbNodes(); + i++; + + } + myPreviewData->nodesXYZ.length( j ); + + // filling the elements connectivities + list::iterator aConnIter = aNodesConnectivity.begin(); + myPreviewData->elementConnectivities.length(aNodesConnectivity.size()); + for( int i = 0; aConnIter != aNodesConnectivity.end(); aConnIter++, i++ ) + myPreviewData->elementConnectivities[i] = *aConnIter; + } + + return myPreviewData._retn(); + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} + +//================================================================================ +/*! + * \brief Returns list of it's IDs of created nodes + * \retval SMESH::long_array* - list of node ID + */ +//================================================================================ + +SMESH::long_array* SMESH_MeshEditor_i::GetLastCreatedNodes() + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + SMESH::long_array_var myLastCreatedNodes = new SMESH::long_array(); + + const SMESH_SequenceOfElemPtr& aSeq = getEditor().GetLastCreatedNodes(); + myLastCreatedNodes->length( aSeq.Length() ); + for (int i = 1; i <= aSeq.Length(); i++) + myLastCreatedNodes[i-1] = aSeq.Value(i)->GetID(); + + return myLastCreatedNodes._retn(); + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} + +//================================================================================ +/*! + * \brief Returns list of it's IDs of created elements + * \retval SMESH::long_array* - list of elements' ID + */ +//================================================================================ + +SMESH::long_array* SMESH_MeshEditor_i::GetLastCreatedElems() + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + SMESH::long_array_var myLastCreatedElems = new SMESH::long_array(); + + const SMESH_SequenceOfElemPtr& aSeq = getEditor().GetLastCreatedElems(); + myLastCreatedElems->length( aSeq.Length() ); + for ( int i = 1; i <= aSeq.Length(); i++ ) + myLastCreatedElems[i-1] = aSeq.Value(i)->GetID(); + + return myLastCreatedElems._retn(); + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} + +//======================================================================= +/* + * Returns description of an error/warning occured during the last operation + */ +//======================================================================= + +SMESH::ComputeError* SMESH_MeshEditor_i::GetLastError() + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + SMESH::ComputeError_var errOut = new SMESH::ComputeError; + SMESH_ComputeErrorPtr& errIn = getEditor().GetError(); + if ( errIn && !errIn->IsOK() ) + { + errOut->code = -( errIn->myName < 0 ? errIn->myName + 1: errIn->myName ); // -1 -> 0 + errOut->comment = errIn->myComment.c_str(); + errOut->subShapeID = -1; + errOut->hasBadMesh = !errIn->myBadElements.empty(); + } + else + { + errOut->code = 0; + errOut->subShapeID = -1; + errOut->hasBadMesh = false; + } + + return errOut._retn(); + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -366,7 +688,7 @@ void SMESH_MeshEditor_i::initData(bool deleteSearchers) //purpose : Wrap a sequence of ids in a SMESH_IDSource //======================================================================= -struct _IDSource : public POA_SMESH::SMESH_IDSource +struct SMESH_MeshEditor_i::_IDSource : public POA_SMESH::SMESH_IDSource { SMESH::long_array _ids; SMESH::ElementType _type; @@ -374,11 +696,14 @@ struct _IDSource : public POA_SMESH::SMESH_IDSource SMESH::long_array* GetIDs() { return new SMESH::long_array( _ids ); } SMESH::long_array* GetMeshInfo() { return 0; } SMESH::SMESH_Mesh_ptr GetMesh() { return SMESH::SMESH_Mesh::_duplicate( _mesh ); } + bool IsMeshInfoCorrect() { return true; } SMESH::array_of_ElementType* GetTypes() { SMESH::array_of_ElementType_var types = new SMESH::array_of_ElementType; - types->length( 1 ); - types[0] = _type; + if ( _ids.length() > 0 ) { + types->length( 1 ); + types[0] = _type; + } return types._retn(); } }; @@ -386,15 +711,33 @@ struct _IDSource : public POA_SMESH::SMESH_IDSource SMESH::SMESH_IDSource_ptr SMESH_MeshEditor_i::MakeIDSource(const SMESH::long_array& ids, SMESH::ElementType type) { - _IDSource* anIDSource = new _IDSource; - anIDSource->_ids = ids; - anIDSource->_type = type; - anIDSource->_mesh = myMesh_i->_this(); - SMESH::SMESH_IDSource_var anIDSourceVar = anIDSource->_this(); + if ( myAuxIDSources.size() > 10 ) + deleteAuxIDSources(); + + _IDSource* idSrc = new _IDSource; + idSrc->_mesh = myMesh_i->_this(); + idSrc->_ids = ids; + idSrc->_type = type; + myAuxIDSources.push_back( idSrc ); + + SMESH::SMESH_IDSource_var anIDSourceVar = idSrc->_this(); return anIDSourceVar._retn(); } +bool SMESH_MeshEditor_i::IsTemporaryIDSource( SMESH::SMESH_IDSource_ptr& idSource ) +{ + return SMESH::DownCast( idSource ); +} + +void SMESH_MeshEditor_i::deleteAuxIDSources() +{ + std::list< _IDSource* >::iterator idSrcIt = myAuxIDSources.begin(); + for ( ; idSrcIt != myAuxIDSources.end(); ++idSrcIt ) + delete *idSrcIt; + myAuxIDSources.clear(); +} + //============================================================================= /*! * @@ -403,10 +746,11 @@ SMESH::SMESH_IDSource_ptr SMESH_MeshEditor_i::MakeIDSource(const SMESH::long_arr CORBA::Boolean SMESH_MeshEditor_i::RemoveElements(const SMESH::long_array & IDsOfElements) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor anEditor( myMesh ); list< int > IdList; for (int i = 0; i < IDsOfElements.length(); i++) @@ -416,11 +760,13 @@ SMESH_MeshEditor_i::RemoveElements(const SMESH::long_array & IDsOfElements) TPythonDump() << "isDone = " << this << ".RemoveElements( " << IDsOfElements << " )"; // Remove Elements - bool ret = anEditor.Remove( IdList, false ); - myMesh->GetMeshDS()->Modified(); - if ( IDsOfElements.length() ) - myMesh->SetIsModified( true ); // issue 0020693 + bool ret = getEditor().Remove( IdList, false ); + + declareMeshModified( /*isReComputeSafe=*/ IDsOfElements.length() == 0 ); // issue 0020693 return ret; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //============================================================================= @@ -430,10 +776,11 @@ SMESH_MeshEditor_i::RemoveElements(const SMESH::long_array & IDsOfElements) //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::long_array & IDsOfNodes) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor anEditor( myMesh ); list< int > IdList; for (int i = 0; i < IDsOfNodes.length(); i++) IdList.push_back( IDsOfNodes[i] ); @@ -441,11 +788,13 @@ CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::long_array & IDsOfNo // Update Python script TPythonDump() << "isDone = " << this << ".RemoveNodes( " << IDsOfNodes << " )"; - bool ret = anEditor.Remove( IdList, true ); - myMesh->GetMeshDS()->Modified(); - if ( IDsOfNodes.length() ) - myMesh->SetIsModified( true ); // issue 0020693 + bool ret = getEditor().Remove( IdList, true ); + + declareMeshModified( /*isReComputeSafe=*/ !ret ); // issue 0020693 return ret; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //============================================================================= @@ -455,86 +804,126 @@ CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::long_array & IDsOfNo //============================================================================= CORBA::Long SMESH_MeshEditor_i::RemoveOrphanNodes() + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor anEditor( myMesh ); - // Update Python script TPythonDump() << "nbRemoved = " << this << ".RemoveOrphanNodes()"; // Create filter to find all orphan nodes SMESH::Controls::Filter::TIdSequence seq; SMESH::Controls::PredicatePtr predicate( new SMESH::Controls::FreeNodes() ); - SMESH::Controls::Filter::GetElementsId( GetMeshDS(), predicate, seq ); + SMESH::Controls::Filter::GetElementsId( getMeshDS(), predicate, seq ); // remove orphan nodes (if there are any) list< int > IdList; for ( int i = 0; i < seq.size(); i++ ) IdList.push_back( seq[i] ); - bool ret = anEditor.Remove( IdList, true ); - myMesh->GetMeshDS()->Modified(); - if ( IdList.size() ) - myMesh->SetIsModified( true ); + int nbNodesBefore = myMesh->NbNodes(); + getEditor().Remove( IdList, true ); + int nbNodesAfter = myMesh->NbNodes(); - return ret; + declareMeshModified( /*isReComputeSafe=*/ IdList.size() == 0 ); // issue 0020693 + return nbNodesBefore - nbNodesAfter; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //============================================================================= /*! - * + * Add a new node. */ //============================================================================= -CORBA::Long SMESH_MeshEditor_i::AddNode(CORBA::Double x, - CORBA::Double y, CORBA::Double z) +CORBA::Long SMESH_MeshEditor_i::AddNode(CORBA::Double x,CORBA::Double y, CORBA::Double z) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - const SMDS_MeshNode* N = GetMeshDS()->AddNode(x, y, z); + const SMDS_MeshNode* N = getMeshDS()->AddNode(x, y, z); // Update Python script TPythonDump() << "nodeID = " << this << ".AddNode( " - << x << ", " << y << ", " << z << " )"; + << TVar( x ) << ", " << TVar( y ) << ", " << TVar( z )<< " )"; - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); // issue 0020693 + declareMeshModified( /*isReComputeSafe=*/false ); return N->GetID(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //============================================================================= /*! - * + * Create 0D element on the given node. */ //============================================================================= + CORBA::Long SMESH_MeshEditor_i::Add0DElement(CORBA::Long IDOfNode) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - const SMDS_MeshNode* aNode = GetMeshDS()->FindNode(IDOfNode); - SMDS_MeshElement* elem = GetMeshDS()->Add0DElement(aNode); + const SMDS_MeshNode* aNode = getMeshDS()->FindNode(IDOfNode); + SMDS_MeshElement* elem = getMeshDS()->Add0DElement(aNode); // Update Python script TPythonDump() << "elem0d = " << this << ".Add0DElement( " << IDOfNode <<" )"; - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); // issue 0020693 + declareMeshModified( /*isReComputeSafe=*/false ); - if (elem) - return elem->GetID(); + return elem ? elem->GetID() : 0; + SMESH_CATCH( SMESH::throwCorbaException ); return 0; } //============================================================================= /*! - * + * Create a ball element on the given node. + */ +//============================================================================= + +CORBA::Long SMESH_MeshEditor_i::AddBall(CORBA::Long IDOfNode, CORBA::Double diameter) + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + initData(); + + if ( diameter < std::numeric_limits::min() ) + THROW_SALOME_CORBA_EXCEPTION("Invalid diameter", SALOME::BAD_PARAM); + + const SMDS_MeshNode* aNode = getMeshDS()->FindNode(IDOfNode); + SMDS_MeshElement* elem = getMeshDS()->AddBall(aNode, diameter); + + // Update Python script + TPythonDump() << "ballElem = " + << this << ".AddBall( " << IDOfNode << ", " << diameter <<" )"; + + declareMeshModified( /*isReComputeSafe=*/false ); + return elem ? elem->GetID() : 0; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} + +//============================================================================= +/*! + * Create an edge, either linear and quadratic (this is determed + * by number of given nodes, two or three) */ //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddEdge(const SMESH::long_array & IDsOfNodes) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); int NbNodes = IDsOfNodes.length(); @@ -543,7 +932,8 @@ CORBA::Long SMESH_MeshEditor_i::AddEdge(const SMESH::long_array & IDsOfNodes) { CORBA::Long index1 = IDsOfNodes[0]; CORBA::Long index2 = IDsOfNodes[1]; - elem = GetMeshDS()->AddEdge(GetMeshDS()->FindNode(index1), GetMeshDS()->FindNode(index2)); + elem = getMeshDS()->AddEdge( getMeshDS()->FindNode(index1), + getMeshDS()->FindNode(index2)); // Update Python script TPythonDump() << "edge = " << this << ".AddEdge([ " @@ -553,18 +943,18 @@ CORBA::Long SMESH_MeshEditor_i::AddEdge(const SMESH::long_array & IDsOfNodes) CORBA::Long n1 = IDsOfNodes[0]; CORBA::Long n2 = IDsOfNodes[1]; CORBA::Long n12 = IDsOfNodes[2]; - elem = GetMeshDS()->AddEdge(GetMeshDS()->FindNode(n1), - GetMeshDS()->FindNode(n2), - GetMeshDS()->FindNode(n12)); + elem = getMeshDS()->AddEdge( getMeshDS()->FindNode(n1), + getMeshDS()->FindNode(n2), + getMeshDS()->FindNode(n12)); // Update Python script TPythonDump() << "edgeID = " << this << ".AddEdge([ " <GetMeshDS()->Modified(); - if(elem) - return myMesh->SetIsModified( true ), elem->GetID(); + declareMeshModified( /*isReComputeSafe=*/false ); + return elem ? elem->GetID() : 0; + SMESH_CATCH( SMESH::throwCorbaException ); return 0; } @@ -575,7 +965,9 @@ CORBA::Long SMESH_MeshEditor_i::AddEdge(const SMESH::long_array & IDsOfNodes) //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddFace(const SMESH::long_array & IDsOfNodes) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); int NbNodes = IDsOfNodes.length(); @@ -586,34 +978,39 @@ CORBA::Long SMESH_MeshEditor_i::AddFace(const SMESH::long_array & IDsOfNodes) std::vector nodes (NbNodes); for (int i = 0; i < NbNodes; i++) - nodes[i] = GetMeshDS()->FindNode(IDsOfNodes[i]); + nodes[i] = getMeshDS()->FindNode(IDsOfNodes[i]); SMDS_MeshElement* elem = 0; if (NbNodes == 3) { - elem = GetMeshDS()->AddFace(nodes[0], nodes[1], nodes[2]); + elem = getMeshDS()->AddFace(nodes[0], nodes[1], nodes[2]); } else if (NbNodes == 4) { - elem = GetMeshDS()->AddFace(nodes[0], nodes[1], nodes[2], nodes[3]); + elem = getMeshDS()->AddFace(nodes[0], nodes[1], nodes[2], nodes[3]); } else if (NbNodes == 6) { - elem = GetMeshDS()->AddFace(nodes[0], nodes[1], nodes[2], nodes[3], + elem = getMeshDS()->AddFace(nodes[0], nodes[1], nodes[2], nodes[3], nodes[4], nodes[5]); } else if (NbNodes == 8) { - elem = GetMeshDS()->AddFace(nodes[0], nodes[1], nodes[2], nodes[3], + elem = getMeshDS()->AddFace(nodes[0], nodes[1], nodes[2], nodes[3], nodes[4], nodes[5], nodes[6], nodes[7]); } + else if (NbNodes == 9) { + elem = getMeshDS()->AddFace(nodes[0], nodes[1], nodes[2], nodes[3], + nodes[4], nodes[5], nodes[6], nodes[7], nodes[8] ); + } else if (NbNodes > 2) { - elem = GetMeshDS()->AddPolygonalFace(nodes); + elem = getMeshDS()->AddPolygonalFace(nodes); } // Update Python script TPythonDump() << "faceID = " << this << ".AddFace( " << IDsOfNodes << " )"; - myMesh->GetMeshDS()->Modified(); - if(elem) - return myMesh->SetIsModified( true ), elem->GetID(); + declareMeshModified( /*isReComputeSafe=*/false ); + + return elem ? elem->GetID() : 0; + SMESH_CATCH( SMESH::throwCorbaException ); return 0; } @@ -623,67 +1020,83 @@ CORBA::Long SMESH_MeshEditor_i::AddFace(const SMESH::long_array & IDsOfNodes) */ //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddPolygonalFace (const SMESH::long_array & IDsOfNodes) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); int NbNodes = IDsOfNodes.length(); std::vector nodes (NbNodes); for (int i = 0; i < NbNodes; i++) - nodes[i] = GetMeshDS()->FindNode(IDsOfNodes[i]); + nodes[i] = getMeshDS()->FindNode(IDsOfNodes[i]); - const SMDS_MeshElement* elem = GetMeshDS()->AddPolygonalFace(nodes); + const SMDS_MeshElement* elem = getMeshDS()->AddPolygonalFace(nodes); // Update Python script TPythonDump() <<"faceID = "<GetMeshDS()->Modified(); - return elem ? ( myMesh->SetIsModified( true ), elem->GetID()) : 0; + declareMeshModified( /*isReComputeSafe=*/false ); + return elem ? elem->GetID() : 0; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //============================================================================= /*! - * + * Create volume, either linear and quadratic (this is determed + * by number of given nodes) */ //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddVolume(const SMESH::long_array & IDsOfNodes) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); int NbNodes = IDsOfNodes.length(); vector< const SMDS_MeshNode*> n(NbNodes); for(int i=0;iFindNode(IDsOfNodes[i]); + n[i]= getMeshDS()->FindNode(IDsOfNodes[i]); SMDS_MeshElement* elem = 0; switch(NbNodes) { - case 4 :elem = GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3]); break; - case 5 :elem = GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4]); break; - case 6 :elem = GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5]); break; - case 8 :elem = GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5],n[6],n[7]); break; - case 10:elem = GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5], + case 4 :elem = getMeshDS()->AddVolume(n[0],n[1],n[2],n[3]); break; + case 5 :elem = getMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4]); break; + case 6 :elem = getMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5]); break; + case 8 :elem = getMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5],n[6],n[7]); break; + case 10:elem = getMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5], n[6],n[7],n[8],n[9]); break; - case 13:elem = GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5],n[6], + case 12:elem = getMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5], + n[6],n[7],n[8],n[9],n[10],n[11]); + break; + case 13:elem = getMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5],n[6], n[7],n[8],n[9],n[10],n[11],n[12]); break; - case 15:elem = GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5],n[6],n[7],n[8], + case 15:elem = getMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5],n[6],n[7],n[8], n[9],n[10],n[11],n[12],n[13],n[14]); break; - case 20:elem = GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5],n[6],n[7], + case 20:elem = getMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5],n[6],n[7], n[8],n[9],n[10],n[11],n[12],n[13],n[14], n[15],n[16],n[17],n[18],n[19]); break; + case 27:elem = getMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5],n[6],n[7], + n[8],n[9],n[10],n[11],n[12],n[13],n[14], + n[15],n[16],n[17],n[18],n[19], + n[20],n[21],n[22],n[23],n[24],n[25],n[26]); + break; } // Update Python script TPythonDump() << "volID = " << this << ".AddVolume( " << IDsOfNodes << " )"; - myMesh->GetMeshDS()->Modified(); - if(elem) - return myMesh->SetIsModified( true ), elem->GetID(); + declareMeshModified( /*isReComputeSafe=*/false ); + return elem ? elem->GetID() : 0; + SMESH_CATCH( SMESH::throwCorbaException ); return 0; } @@ -694,14 +1107,16 @@ CORBA::Long SMESH_MeshEditor_i::AddVolume(const SMESH::long_array & IDsOfNodes) //============================================================================= CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolume (const SMESH::long_array & IDsOfNodes, const SMESH::long_array & Quantities) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); int NbNodes = IDsOfNodes.length(); std::vector n (NbNodes); for (int i = 0; i < NbNodes; i++) { - const SMDS_MeshNode* aNode = GetMeshDS()->FindNode(IDsOfNodes[i]); + const SMDS_MeshNode* aNode = getMeshDS()->FindNode(IDsOfNodes[i]); if (!aNode) return 0; n[i] = aNode; } @@ -711,14 +1126,17 @@ CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolume (const SMESH::long_array & I for (int j = 0; j < NbFaces; j++) q[j] = Quantities[j]; - const SMDS_MeshElement* elem = GetMeshDS()->AddPolyhedralVolume(n, q); + const SMDS_MeshElement* elem = getMeshDS()->AddPolyhedralVolume(n, q); // Update Python script TPythonDump() << "volID = " << this << ".AddPolyhedralVolume( " << IDsOfNodes << ", " << Quantities << " )"; - myMesh->GetMeshDS()->Modified(); - return elem ? ( myMesh->SetIsModified( true ), elem->GetID()) : 0; + declareMeshModified( /*isReComputeSafe=*/false ); + return elem ? elem->GetID() : 0; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //============================================================================= @@ -726,8 +1144,11 @@ CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolume (const SMESH::long_array & I * AddPolyhedralVolumeByFaces */ //============================================================================= + CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolumeByFaces (const SMESH::long_array & IdsOfFaces) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); int NbFaces = IdsOfFaces.length(); @@ -735,7 +1156,7 @@ CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolumeByFaces (const SMESH::long_ar std::vector quantities (NbFaces); for (int i = 0; i < NbFaces; i++) { - const SMDS_MeshElement* aFace = GetMeshDS()->FindElement(IdsOfFaces[i]); + const SMDS_MeshElement* aFace = getMeshDS()->FindElement(IdsOfFaces[i]); quantities[i] = aFace->NbNodes(); SMDS_ElemIteratorPtr It = aFace->nodesIterator(); @@ -744,14 +1165,92 @@ CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolumeByFaces (const SMESH::long_ar } } - const SMDS_MeshElement* elem = GetMeshDS()->AddPolyhedralVolume(poly_nodes, quantities); + const SMDS_MeshElement* elem = getMeshDS()->AddPolyhedralVolume(poly_nodes, quantities); // Update Python script TPythonDump() << "volID = " << this << ".AddPolyhedralVolumeByFaces( " << IdsOfFaces << " )"; - myMesh->GetMeshDS()->Modified(); - return elem ? ( myMesh->SetIsModified( true ), elem->GetID()) : 0; + declareMeshModified( /*isReComputeSafe=*/false ); + return elem ? elem->GetID() : 0; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} + +//============================================================================= +// +// \brief Create 0D elements on all nodes of the given object except those +// nodes on which a 0D element already exists. +// \param theObject object on whose nodes 0D elements will be created. +// \param theGroupName optional name of a group to add 0D elements created +// and/or found on nodes of \a theObject. +// \return an object (a new group or a temporary SMESH_IDSource) holding +// ids of new and/or found 0D elements. +// +//============================================================================= + +SMESH::SMESH_IDSource_ptr +SMESH_MeshEditor_i::Create0DElementsOnAllNodes(SMESH::SMESH_IDSource_ptr theObject, + const char* theGroupName) + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + initData(); + + SMESH::SMESH_IDSource_var result; + TPythonDump pyDump; + + TIDSortedElemSet elements, elems0D; + if ( idSourceToSet( theObject, getMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) + getEditor().Create0DElementsOnAllNodes( elements, elems0D ); + + SMESH::long_array_var newElems = new SMESH::long_array; + newElems->length( elems0D.size() ); + TIDSortedElemSet::iterator eIt = elems0D.begin(); + for ( size_t i = 0; i < elems0D.size(); ++i, ++eIt ) + newElems[ i ] = (*eIt)->GetID(); + + SMESH::SMESH_GroupBase_var groupToFill; + if ( theGroupName && strlen( theGroupName )) + { + // Get existing group named theGroupName + SMESH::ListOfGroups_var groups = myMesh_i->GetGroups(); + for (int i = 0, nbGroups = groups->length(); i < nbGroups; i++ ) { + SMESH::SMESH_GroupBase_var group = groups[i]; + if ( !group->_is_nil() ) { + CORBA::String_var name = group->GetName(); + if ( strcmp( name.in(), theGroupName ) == 0 && group->GetType() == SMESH::ELEM0D ) { + groupToFill = group; + break; + } + } + } + if ( groupToFill->_is_nil() ) + groupToFill = myMesh_i->CreateGroup( SMESH::ELEM0D, theGroupName ); + else if ( !SMESH::DownCast< SMESH_Group_i* > ( groupToFill )) + groupToFill = myMesh_i->ConvertToStandalone( groupToFill ); + } + + if ( SMESH_Group_i* group_i = SMESH::DownCast< SMESH_Group_i* > ( groupToFill )) + { + group_i->Add( newElems ); + result = SMESH::SMESH_IDSource::_narrow( groupToFill ); + pyDump << groupToFill; + } + else + { + result = MakeIDSource( newElems, SMESH::ELEM0D ); + pyDump << "elem0DIDs"; + } + + pyDump << " = " << this << ".Create0DElementsOnAllNodes( " + << theObject << ", '" << theGroupName << "' )"; + + return result._retn(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //============================================================================= @@ -766,9 +1265,9 @@ CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolumeByFaces (const SMESH::long_ar void SMESH_MeshEditor_i::SetNodeOnVertex(CORBA::Long NodeID, CORBA::Long VertexID) throw (SALOME::SALOME_Exception) { - Unexpect aCatch(SALOME_SalomeException); + SMESH_TRY; - SMESHDS_Mesh * mesh = GetMeshDS(); + SMESHDS_Mesh * mesh = getMeshDS(); SMDS_MeshNode* node = const_cast( mesh->FindNode(NodeID) ); if ( !node ) THROW_SALOME_CORBA_EXCEPTION("Invalid NodeID", SALOME::BAD_PARAM); @@ -783,6 +1282,8 @@ void SMESH_MeshEditor_i::SetNodeOnVertex(CORBA::Long NodeID, CORBA::Long VertexI mesh->SetNodeOnVertex( node, VertexID ); myMesh->SetIsModified( true ); + + SMESH_CATCH( SMESH::throwCorbaException ); } //============================================================================= @@ -799,9 +1300,9 @@ void SMESH_MeshEditor_i::SetNodeOnEdge(CORBA::Long NodeID, CORBA::Long EdgeID, CORBA::Double paramOnEdge) throw (SALOME::SALOME_Exception) { - Unexpect aCatch(SALOME_SalomeException); + SMESH_TRY; - SMESHDS_Mesh * mesh = GetMeshDS(); + SMESHDS_Mesh * mesh = getMeshDS(); SMDS_MeshNode* node = const_cast( mesh->FindNode(NodeID) ); if ( !node ) THROW_SALOME_CORBA_EXCEPTION("Invalid NodeID", SALOME::BAD_PARAM); @@ -821,6 +1322,8 @@ void SMESH_MeshEditor_i::SetNodeOnEdge(CORBA::Long NodeID, CORBA::Long EdgeID, mesh->SetNodeOnEdge( node, EdgeID, paramOnEdge ); myMesh->SetIsModified( true ); + + SMESH_CATCH( SMESH::throwCorbaException ); } //============================================================================= @@ -838,9 +1341,8 @@ void SMESH_MeshEditor_i::SetNodeOnFace(CORBA::Long NodeID, CORBA::Long FaceID, CORBA::Double u, CORBA::Double v) throw (SALOME::SALOME_Exception) { - Unexpect aCatch(SALOME_SalomeException); - - SMESHDS_Mesh * mesh = GetMeshDS(); + SMESH_TRY; + SMESHDS_Mesh * mesh = getMeshDS(); SMDS_MeshNode* node = const_cast( mesh->FindNode(NodeID) ); if ( !node ) THROW_SALOME_CORBA_EXCEPTION("Invalid NodeID", SALOME::BAD_PARAM); @@ -871,6 +1373,8 @@ void SMESH_MeshEditor_i::SetNodeOnFace(CORBA::Long NodeID, CORBA::Long FaceID, mesh->SetNodeOnFace( node, FaceID, u, v ); myMesh->SetIsModified( true ); + + SMESH_CATCH( SMESH::throwCorbaException ); } //============================================================================= @@ -885,9 +1389,8 @@ void SMESH_MeshEditor_i::SetNodeOnFace(CORBA::Long NodeID, CORBA::Long FaceID, void SMESH_MeshEditor_i::SetNodeInVolume(CORBA::Long NodeID, CORBA::Long SolidID) throw (SALOME::SALOME_Exception) { - Unexpect aCatch(SALOME_SalomeException); - - SMESHDS_Mesh * mesh = GetMeshDS(); + SMESH_TRY; + SMESHDS_Mesh * mesh = getMeshDS(); SMDS_MeshNode* node = const_cast( mesh->FindNode(NodeID) ); if ( !node ) THROW_SALOME_CORBA_EXCEPTION("Invalid NodeID", SALOME::BAD_PARAM); @@ -902,7 +1405,7 @@ void SMESH_MeshEditor_i::SetNodeInVolume(CORBA::Long NodeID, CORBA::Long SolidID mesh->SetNodeInVolume( node, SolidID ); - // myMesh->SetIsModified( true ); - SetNodeInVolume() can't prevent re-compute, I believe + SMESH_CATCH( SMESH::throwCorbaException ); } //============================================================================= @@ -918,9 +1421,8 @@ void SMESH_MeshEditor_i::SetMeshElementOnShape(CORBA::Long ElementID, CORBA::Long ShapeID) throw (SALOME::SALOME_Exception) { - Unexpect aCatch(SALOME_SalomeException); - - SMESHDS_Mesh * mesh = GetMeshDS(); + SMESH_TRY; + SMESHDS_Mesh * mesh = getMeshDS(); SMDS_MeshElement* elem = const_cast(mesh->FindElement(ElementID)); if ( !elem ) THROW_SALOME_CORBA_EXCEPTION("Invalid ElementID", SALOME::BAD_PARAM); @@ -938,6 +1440,8 @@ void SMESH_MeshEditor_i::SetMeshElementOnShape(CORBA::Long ElementID, mesh->SetMeshElementOnShape( elem, ShapeID ); myMesh->SetIsModified( true ); + + SMESH_CATCH( SMESH::throwCorbaException ); } //============================================================================= @@ -948,11 +1452,13 @@ void SMESH_MeshEditor_i::SetMeshElementOnShape(CORBA::Long ElementID, CORBA::Boolean SMESH_MeshEditor_i::InverseDiag(CORBA::Long NodeID1, CORBA::Long NodeID2) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - const SMDS_MeshNode * n1 = GetMeshDS()->FindNode( NodeID1 ); - const SMDS_MeshNode * n2 = GetMeshDS()->FindNode( NodeID2 ); + const SMDS_MeshNode * n1 = getMeshDS()->FindNode( NodeID1 ); + const SMDS_MeshNode * n2 = getMeshDS()->FindNode( NodeID2 ); if ( !n1 || !n2 ) return false; @@ -960,12 +1466,13 @@ CORBA::Boolean SMESH_MeshEditor_i::InverseDiag(CORBA::Long NodeID1, TPythonDump() << "isDone = " << this << ".InverseDiag( " << NodeID1 << ", " << NodeID2 << " )"; + int ret = getEditor().InverseDiag ( n1, n2 ); - ::SMESH_MeshEditor aMeshEditor( myMesh ); - int ret = aMeshEditor.InverseDiag ( n1, n2 ); - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); + declareMeshModified( /*isReComputeSafe=*/false ); return ret; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //============================================================================= @@ -976,11 +1483,13 @@ CORBA::Boolean SMESH_MeshEditor_i::InverseDiag(CORBA::Long NodeID1, CORBA::Boolean SMESH_MeshEditor_i::DeleteDiag(CORBA::Long NodeID1, CORBA::Long NodeID2) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - const SMDS_MeshNode * n1 = GetMeshDS()->FindNode( NodeID1 ); - const SMDS_MeshNode * n2 = GetMeshDS()->FindNode( NodeID2 ); + const SMDS_MeshNode * n1 = getMeshDS()->FindNode( NodeID1 ); + const SMDS_MeshNode * n2 = getMeshDS()->FindNode( NodeID2 ); if ( !n1 || !n2 ) return false; @@ -988,17 +1497,15 @@ CORBA::Boolean SMESH_MeshEditor_i::DeleteDiag(CORBA::Long NodeID1, TPythonDump() << "isDone = " << this << ".DeleteDiag( " << NodeID1 << ", " << NodeID2 << " )"; - ::SMESH_MeshEditor aMeshEditor( myMesh ); - - bool stat = aMeshEditor.DeleteDiag ( n1, n2 ); - myMesh->GetMeshDS()->Modified(); - if ( stat ) - myMesh->SetIsModified( true ); // issue 0020693 + bool stat = getEditor().DeleteDiag ( n1, n2 ); - storeResult(aMeshEditor); + declareMeshModified( /*isReComputeSafe=*/!stat ); return stat; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //============================================================================= @@ -1008,27 +1515,27 @@ CORBA::Boolean SMESH_MeshEditor_i::DeleteDiag(CORBA::Long NodeID1, //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::long_array & IDsOfElements) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor anEditor( myMesh ); for (int i = 0; i < IDsOfElements.length(); i++) { CORBA::Long index = IDsOfElements[i]; - const SMDS_MeshElement * elem = GetMeshDS()->FindElement(index); + const SMDS_MeshElement * elem = getMeshDS()->FindElement(index); if ( elem ) - anEditor.Reorient( elem ); + getEditor().Reorient( elem ); } // Update Python script TPythonDump() << "isDone = " << this << ".Reorient( " << IDsOfElements << " )"; - myMesh->GetMeshDS()->Modified(); - if ( IDsOfElements.length() ) - myMesh->SetIsModified( true ); // issue 0020693 - + declareMeshModified( /*isReComputeSafe=*/ IDsOfElements.length() == 0 ); return true; -} + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} //============================================================================= /*! @@ -1037,7 +1544,9 @@ CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::long_array & IDsOfEleme //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::ReorientObject(SMESH::SMESH_IDSource_ptr theObject) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); TPythonDump aTPythonDump; // suppress dump in Reorient() @@ -1048,7 +1557,98 @@ CORBA::Boolean SMESH_MeshEditor_i::ReorientObject(SMESH::SMESH_IDSource_ptr theO // Update Python script aTPythonDump << "isDone = " << this << ".ReorientObject( " << theObject << " )"; + declareMeshModified( /*isReComputeSafe=*/ anElementsId->length() == 0 ); return isDone; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} + +//======================================================================= +//function : Reorient2D +//purpose : Reorient faces contained in \a the2Dgroup. +// the2Dgroup - the mesh or its part to reorient +// theDirection - desired direction of normal of \a theFace +// theFace - ID of face whose orientation is checked. +// It can be < 1 then \a thePoint is used to find a face. +// thePoint - is used to find a face if \a theFace < 1. +// return number of reoriented elements. +//======================================================================= + +CORBA::Long SMESH_MeshEditor_i::Reorient2D(SMESH::SMESH_IDSource_ptr the2Dgroup, + const SMESH::DirStruct& theDirection, + CORBA::Long theFace, + const SMESH::PointStruct& thePoint) + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + initData(/*deleteSearchers=*/false); + + TIDSortedElemSet elements; + if ( !idSourceToSet( the2Dgroup, getMeshDS(), elements, SMDSAbs_Face, /*emptyIfIsMesh=*/1)) + THROW_SALOME_CORBA_EXCEPTION("No faces in given group", SALOME::BAD_PARAM); + + + const SMDS_MeshElement* face = 0; + if ( theFace > 0 ) + { + face = getMeshDS()->FindElement( theFace ); + if ( !face ) + THROW_SALOME_CORBA_EXCEPTION("Inexistent face given", SALOME::BAD_PARAM); + if ( face->GetType() != SMDSAbs_Face ) + THROW_SALOME_CORBA_EXCEPTION("Wrong element type", SALOME::BAD_PARAM); + } + else + { + // create theElementSearcher if needed + theSearchersDeleter.Set( myMesh, getPartIOR( the2Dgroup, SMESH::FACE )); + if ( !theElementSearcher ) + { + if ( elements.empty() ) // search in the whole mesh + { + if ( myMesh->NbFaces() == 0 ) + THROW_SALOME_CORBA_EXCEPTION("No faces in the mesh", SALOME::BAD_PARAM); + + theElementSearcher = myEditor.GetElementSearcher(); + } + else + { + typedef SMDS_SetIterator TIter; + SMDS_ElemIteratorPtr elemsIt( new TIter( elements.begin(), elements.end() )); + + theElementSearcher = myEditor.GetElementSearcher(elemsIt); + } + } + // find a face + gp_Pnt p( thePoint.x, thePoint.y, thePoint.z ); + face = theElementSearcher->FindClosestTo( p, SMDSAbs_Face ); + + if ( !face ) + THROW_SALOME_CORBA_EXCEPTION("No face found by point", SALOME::INTERNAL_ERROR ); + if ( !elements.empty() && !elements.count( face )) + THROW_SALOME_CORBA_EXCEPTION("Found face is not in the group", SALOME::BAD_PARAM ); + } + + const SMESH::PointStruct * P = &theDirection.PS; + gp_Vec dirVec( P->x, P->y, P->z ); + if ( dirVec.Magnitude() < std::numeric_limits< double >::min() ) + THROW_SALOME_CORBA_EXCEPTION("Zero size vector", SALOME::BAD_PARAM); + + int nbReori = getEditor().Reorient2D( elements, dirVec, face ); + + if ( nbReori ) { + declareMeshModified( /*isReComputeSafe=*/false ); + } + TPythonDump() << this << ".Reorient2D( " + << the2Dgroup << ", " + << theDirection << ", " + << theFace << ", " + << thePoint << " )"; + + return nbReori; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //============================================================================= @@ -1056,13 +1656,16 @@ CORBA::Boolean SMESH_MeshEditor_i::ReorientObject(SMESH::SMESH_IDSource_ptr theO * */ //============================================================================= + CORBA::Boolean SMESH_MeshEditor_i::TriToQuad (const SMESH::long_array & IDsOfElements, SMESH::NumericalFunctor_ptr Criterion, CORBA::Double MaxAngle) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - SMESHDS_Mesh* aMesh = GetMeshDS(); + SMESHDS_Mesh* aMesh = getMeshDS(); TIDSortedElemSet faces; arrayToSet(IDsOfElements, aMesh, faces, SMDSAbs_Face); @@ -1070,36 +1673,36 @@ CORBA::Boolean SMESH_MeshEditor_i::TriToQuad (const SMESH::long_array & IDsOfE dynamic_cast( SMESH_Gen_i::GetServant( Criterion ).in() ); SMESH::Controls::NumericalFunctorPtr aCrit; if ( !aNumericalFunctor ) - aCrit.reset( new SMESH::Controls::AspectRatio() ); + aCrit.reset( new SMESH::Controls::MaxElementLength2D() ); else aCrit = aNumericalFunctor->GetNumericalFunctor(); // Update Python script TPythonDump() << "isDone = " << this << ".TriToQuad( " - << IDsOfElements << ", " << aNumericalFunctor << ", " << MaxAngle << " )"; + << IDsOfElements << ", " << aNumericalFunctor << ", " << TVar( MaxAngle ) << " )"; - ::SMESH_MeshEditor anEditor( myMesh ); - bool stat = anEditor.TriToQuad( faces, aCrit, MaxAngle ); - myMesh->GetMeshDS()->Modified(); - if ( stat ) - myMesh->SetIsModified( true ); // issue 0020693 - - storeResult(anEditor); + bool stat = getEditor().TriToQuad( faces, aCrit, MaxAngle ); + declareMeshModified( /*isReComputeSafe=*/!stat ); return stat; -} + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} //============================================================================= /*! * */ //============================================================================= + CORBA::Boolean SMESH_MeshEditor_i::TriToQuadObject (SMESH::SMESH_IDSource_ptr theObject, SMESH::NumericalFunctor_ptr Criterion, CORBA::Double MaxAngle) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); TPythonDump aTPythonDump; // suppress dump in TriToQuad() @@ -1111,23 +1714,28 @@ CORBA::Boolean SMESH_MeshEditor_i::TriToQuadObject (SMESH::SMESH_IDSource_ptr // Update Python script aTPythonDump << "isDone = " << this << ".TriToQuadObject(" - << theObject << ", " << aNumericalFunctor << ", " << MaxAngle << " )"; + << theObject << ", " << aNumericalFunctor << ", " << TVar( MaxAngle ) << " )"; return isDone; -} + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} //============================================================================= /*! * */ //============================================================================= + CORBA::Boolean SMESH_MeshEditor_i::QuadToTri (const SMESH::long_array & IDsOfElements, SMESH::NumericalFunctor_ptr Criterion) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - SMESHDS_Mesh* aMesh = GetMeshDS(); + SMESHDS_Mesh* aMesh = getMeshDS(); TIDSortedElemSet faces; arrayToSet(IDsOfElements, aMesh, faces, SMDSAbs_Face); @@ -1143,15 +1751,13 @@ CORBA::Boolean SMESH_MeshEditor_i::QuadToTri (const SMESH::long_array & IDsOfE // Update Python script TPythonDump() << "isDone = " << this << ".QuadToTri( " << IDsOfElements << ", " << aNumericalFunctor << " )"; - ::SMESH_MeshEditor anEditor( myMesh ); - CORBA::Boolean stat = anEditor.QuadToTri( faces, aCrit ); - myMesh->GetMeshDS()->Modified(); - if ( stat ) - myMesh->SetIsModified( true ); // issue 0020693 - - storeResult(anEditor); + CORBA::Boolean stat = getEditor().QuadToTri( faces, aCrit ); + declareMeshModified( /*isReComputeSafe=*/false ); return stat; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } @@ -1162,7 +1768,9 @@ CORBA::Boolean SMESH_MeshEditor_i::QuadToTri (const SMESH::long_array & IDsOfE //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::QuadToTriObject (SMESH::SMESH_IDSource_ptr theObject, SMESH::NumericalFunctor_ptr Criterion) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); TPythonDump aTPythonDump; // suppress dump in QuadToTri() @@ -1176,7 +1784,11 @@ CORBA::Boolean SMESH_MeshEditor_i::QuadToTriObject (SMESH::SMESH_IDSource_ptr // Update Python script aTPythonDump << "isDone = " << this << ".QuadToTriObject( " << theObject << ", " << aNumericalFunctor << " )"; + declareMeshModified( /*isReComputeSafe=*/false ); return isDone; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } @@ -1187,10 +1799,12 @@ CORBA::Boolean SMESH_MeshEditor_i::QuadToTriObject (SMESH::SMESH_IDSource_ptr //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::SplitQuad (const SMESH::long_array & IDsOfElements, CORBA::Boolean Diag13) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - SMESHDS_Mesh* aMesh = GetMeshDS(); + SMESHDS_Mesh* aMesh = getMeshDS(); TIDSortedElemSet faces; arrayToSet(IDsOfElements, aMesh, faces, SMDSAbs_Face); @@ -1198,16 +1812,13 @@ CORBA::Boolean SMESH_MeshEditor_i::SplitQuad (const SMESH::long_array & IDsOfEle TPythonDump() << "isDone = " << this << ".SplitQuad( " << IDsOfElements << ", " << Diag13 << " )"; - ::SMESH_MeshEditor anEditor( myMesh ); - CORBA::Boolean stat = anEditor.QuadToTri( faces, Diag13 ); - myMesh->GetMeshDS()->Modified(); - if ( stat ) - myMesh->SetIsModified( true ); // issue 0020693 - - - storeResult(anEditor); + CORBA::Boolean stat = getEditor().QuadToTri( faces, Diag13 ); + declareMeshModified( /*isReComputeSafe=*/ !stat ); return stat; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } @@ -1218,7 +1829,9 @@ CORBA::Boolean SMESH_MeshEditor_i::SplitQuad (const SMESH::long_array & IDsOfEle //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::SplitQuadObject (SMESH::SMESH_IDSource_ptr theObject, CORBA::Boolean Diag13) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); TPythonDump aTPythonDump; // suppress dump in SplitQuad() @@ -1230,7 +1843,11 @@ CORBA::Boolean SMESH_MeshEditor_i::SplitQuadObject (SMESH::SMESH_IDSource_ptr th aTPythonDump << "isDone = " << this << ".SplitQuadObject( " << theObject << ", " << Diag13 << " )"; + declareMeshModified( /*isReComputeSafe=*/!isDone ); return isDone; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } @@ -1239,12 +1856,15 @@ CORBA::Boolean SMESH_MeshEditor_i::SplitQuadObject (SMESH::SMESH_IDSource_ptr th * BestSplit */ //============================================================================= + CORBA::Long SMESH_MeshEditor_i::BestSplit (CORBA::Long IDOfQuad, SMESH::NumericalFunctor_ptr Criterion) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - const SMDS_MeshElement* quad = GetMeshDS()->FindElement(IDOfQuad); + const SMDS_MeshElement* quad = getMeshDS()->FindElement(IDOfQuad); if (quad && quad->GetType() == SMDSAbs_Face && quad->NbNodes() == 4) { SMESH::NumericalFunctor_i* aNumericalFunctor = @@ -1255,10 +1875,12 @@ CORBA::Long SMESH_MeshEditor_i::BestSplit (CORBA::Long IDOfQuad, else aCrit.reset(new SMESH::Controls::AspectRatio()); - ::SMESH_MeshEditor anEditor (myMesh); - return anEditor.BestSplit(quad, aCrit); + int id = getEditor().BestSplit(quad, aCrit); + declareMeshModified( /*isReComputeSafe=*/ id < 1 ); } - return -1; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ @@ -1271,25 +1893,20 @@ void SMESH_MeshEditor_i::SplitVolumesIntoTetra (SMESH::SMESH_IDSource_ptr elems, CORBA::Short methodFlags) throw (SALOME::SALOME_Exception) { - Unexpect aCatch(SALOME_SalomeException); - + SMESH_TRY; initData(); SMESH::long_array_var anElementsId = elems->GetIDs(); TIDSortedElemSet elemSet; - arrayToSet( anElementsId, GetMeshDS(), elemSet, SMDSAbs_Volume ); - - ::SMESH_MeshEditor anEditor (myMesh); - anEditor.SplitVolumesIntoTetra( elemSet, int( methodFlags )); - myMesh->GetMeshDS()->Modified(); - - storeResult(anEditor); + arrayToSet( anElementsId, getMeshDS(), elemSet, SMDSAbs_Volume ); -// if ( myLastCreatedElems.length() ) - it does not influence Compute() -// myMesh->SetIsModified( true ); // issue 0020693 + getEditor().SplitVolumesIntoTetra( elemSet, int( methodFlags )); + declareMeshModified( /*isReComputeSafe=*/true ); // it does not influence Compute() TPythonDump() << this << ".SplitVolumesIntoTetra( " << elems << ", " << methodFlags << " )"; + + SMESH_CATCH( SMESH::throwCorbaException ); } //======================================================================= @@ -1303,6 +1920,7 @@ SMESH_MeshEditor_i::Smooth(const SMESH::long_array & IDsOfElements, CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method) + throw (SALOME::SALOME_Exception) { return smooth( IDsOfElements, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method, false ); @@ -1320,6 +1938,7 @@ SMESH_MeshEditor_i::SmoothParametric(const SMESH::long_array & IDsO CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method) + throw (SALOME::SALOME_Exception) { return smooth( IDsOfElements, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method, true ); @@ -1337,6 +1956,7 @@ SMESH_MeshEditor_i::SmoothObject(SMESH::SMESH_IDSource_ptr theObjec CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method) + throw (SALOME::SALOME_Exception) { return smoothObject (theObject, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method, false); @@ -1354,6 +1974,7 @@ SMESH_MeshEditor_i::SmoothParametricObject(SMESH::SMESH_IDSource_ptr CORBA::Long MaxNbOfIterations, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method) + throw (SALOME::SALOME_Exception) { return smoothObject (theObject, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method, true); @@ -1373,10 +1994,12 @@ SMESH_MeshEditor_i::smooth(const SMESH::long_array & IDsOfElements, CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method, bool IsParametric) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - SMESHDS_Mesh* aMesh = GetMeshDS(); + SMESHDS_Mesh* aMesh = getMeshDS(); TIDSortedElemSet elements; arrayToSet(IDsOfElements, aMesh, elements, SMDSAbs_Face); @@ -1392,25 +2015,24 @@ SMESH_MeshEditor_i::smooth(const SMESH::long_array & IDsOfElements, if ( Method != SMESH::SMESH_MeshEditor::LAPLACIAN_SMOOTH ) method = ::SMESH_MeshEditor::CENTROIDAL; - ::SMESH_MeshEditor anEditor( myMesh ); - anEditor.Smooth(elements, fixedNodes, method, + getEditor().Smooth(elements, fixedNodes, method, MaxNbOfIterations, MaxAspectRatio, IsParametric ); - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); // issue 0020693 - - storeResult(anEditor); + declareMeshModified( /*isReComputeSafe=*/true ); // does not prevent re-compute // Update Python script TPythonDump() << "isDone = " << this << "." << (IsParametric ? "SmoothParametric( " : "Smooth( ") << IDsOfElements << ", " << IDsOfFixedNodes << ", " - << MaxNbOfIterations << ", " << MaxAspectRatio << ", " + << TVar( MaxNbOfIterations ) << ", " << TVar( MaxAspectRatio ) << ", " << "SMESH.SMESH_MeshEditor." << ( Method == SMESH::SMESH_MeshEditor::CENTROIDAL_SMOOTH ? "CENTROIDAL_SMOOTH )" : "LAPLACIAN_SMOOTH )"); return true; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } @@ -1427,7 +2049,9 @@ SMESH_MeshEditor_i::smoothObject(SMESH::SMESH_IDSource_ptr theObjec CORBA::Double MaxAspectRatio, SMESH::SMESH_MeshEditor::Smooth_Method Method, bool IsParametric) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); TPythonDump aTPythonDump; // suppress dump in smooth() @@ -1440,12 +2064,15 @@ SMESH_MeshEditor_i::smoothObject(SMESH::SMESH_IDSource_ptr theObjec aTPythonDump << "isDone = " << this << "." << (IsParametric ? "SmoothParametricObject( " : "SmoothObject( ") << theObject << ", " << IDsOfFixedNodes << ", " - << MaxNbOfIterations << ", " << MaxAspectRatio << ", " + << TVar( MaxNbOfIterations ) << ", " << TVar( MaxAspectRatio ) << ", " << "SMESH.SMESH_MeshEditor." << ( Method == SMESH::SMESH_MeshEditor::CENTROIDAL_SMOOTH ? "CENTROIDAL_SMOOTH )" : "LAPLACIAN_SMOOTH )"); return isDone; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } @@ -1456,13 +2083,16 @@ SMESH_MeshEditor_i::smoothObject(SMESH::SMESH_IDSource_ptr theObjec //============================================================================= void SMESH_MeshEditor_i::RenumberNodes() + throw (SALOME::SALOME_Exception) { + SMESH_TRY; // Update Python script TPythonDump() << this << ".RenumberNodes()"; - GetMeshDS()->Renumber( true ); -} + getMeshDS()->Renumber( true ); + SMESH_CATCH( SMESH::throwCorbaException ); +} //============================================================================= /*! @@ -1471,11 +2101,15 @@ void SMESH_MeshEditor_i::RenumberNodes() //============================================================================= void SMESH_MeshEditor_i::RenumberElements() + throw (SALOME::SALOME_Exception) { + SMESH_TRY; // Update Python script TPythonDump() << this << ".RenumberElements()"; - GetMeshDS()->Renumber( false ); + getMeshDS()->Renumber( false ); + + SMESH_CATCH( SMESH::throwCorbaException ); } //======================================================================= @@ -1485,11 +2119,16 @@ void SMESH_MeshEditor_i::RenumberElements() //======================================================================= SMESH::ListOfGroups* SMESH_MeshEditor_i::getGroups(const std::list* groupIDs) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; if ( !groupIDs ) return 0; myMesh_i->CreateGroupServants(); return myMesh_i->GetGroups( *groupIDs ); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -1505,42 +2144,37 @@ SMESH_MeshEditor_i::rotationSweep(const SMESH::long_array & theIDsOfElements, CORBA::Double theTolerance, const bool theMakeGroups, const SMDSAbs_ElementType theElementType) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); TIDSortedElemSet inElements, copyElements; - arrayToSet(theIDsOfElements, GetMeshDS(), inElements, theElementType); + arrayToSet(theIDsOfElements, getMeshDS(), inElements, theElementType); TIDSortedElemSet* workElements = & inElements; - TPreviewMesh tmpMesh( SMDSAbs_Face ); - SMESH_Mesh* mesh = 0; bool makeWalls=true; - if ( myPreviewMode ) + if ( myIsPreviewMode ) { SMDSAbs_ElementType select = SMDSAbs_All, avoid = SMDSAbs_Volume; - tmpMesh.Copy( inElements, copyElements, select, avoid ); - mesh = &tmpMesh; + getPreviewMesh( SMDSAbs_Face )->Copy( inElements, copyElements, select, avoid ); workElements = & copyElements; //makeWalls = false; } - else - { - mesh = myMesh; - } gp_Ax1 Ax1 (gp_Pnt( theAxis.x, theAxis.y, theAxis.z ), gp_Vec( theAxis.vx, theAxis.vy, theAxis.vz )); - ::SMESH_MeshEditor anEditor( mesh ); ::SMESH_MeshEditor::PGroupIDs groupIds = - anEditor.RotationSweep (*workElements, Ax1, theAngleInRadians, - theNbOfSteps, theTolerance, theMakeGroups, makeWalls); - storeResult(anEditor); - myMesh->GetMeshDS()->Modified(); + getEditor().RotationSweep (*workElements, Ax1, theAngleInRadians, + theNbOfSteps, theTolerance, theMakeGroups, makeWalls); - // myMesh->SetIsModified( true ); -- it does not influence Compute() + declareMeshModified( /*isReComputeSafe=*/true ); // does not influence Compute() return theMakeGroups ? getGroups(groupIds.get()) : 0; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -1553,14 +2187,15 @@ void SMESH_MeshEditor_i::RotationSweep(const SMESH::long_array & theIDsOfElement CORBA::Double theAngleInRadians, CORBA::Long theNbOfSteps, CORBA::Double theTolerance) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << this << ".RotationSweep( " - << theIDsOfElements << ", " - << theAxis << ", " - << theAngleInRadians << ", " - << theNbOfSteps << ", " - << theTolerance << " )"; + << theIDsOfElements << ", " + << theAxis << ", " + << TVar( theAngleInRadians ) << ", " + << TVar( theNbOfSteps ) << ", " + << TVar( theTolerance ) << " )"; } rotationSweep(theIDsOfElements, theAxis, @@ -1581,6 +2216,7 @@ SMESH_MeshEditor_i::RotationSweepMakeGroups(const SMESH::long_array& theIDsOfEle CORBA::Double theAngleInRadians, CORBA::Long theNbOfSteps, CORBA::Double theTolerance) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -1590,14 +2226,14 @@ SMESH_MeshEditor_i::RotationSweepMakeGroups(const SMESH::long_array& theIDsOfEle theNbOfSteps, theTolerance, true); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".RotationSweepMakeGroups( " - << theIDsOfElements << ", " - << theAxis << ", " - << theAngleInRadians << ", " - << theNbOfSteps << ", " - << theTolerance << " )"; + << theIDsOfElements << ", " + << theAxis << ", " + << TVar( theAngleInRadians ) << ", " + << TVar( theNbOfSteps ) << ", " + << TVar( theTolerance ) << " )"; } return aGroups; } @@ -1612,8 +2248,9 @@ void SMESH_MeshEditor_i::RotationSweepObject(SMESH::SMESH_IDSource_ptr theObject CORBA::Double theAngleInRadians, CORBA::Long theNbOfSteps, CORBA::Double theTolerance) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << this << ".RotationSweepObject( " << theObject << ", " << theAxis << ", " @@ -1640,14 +2277,15 @@ void SMESH_MeshEditor_i::RotationSweepObject1D(SMESH::SMESH_IDSource_ptr theObje CORBA::Double theAngleInRadians, CORBA::Long theNbOfSteps, CORBA::Double theTolerance) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << this << ".RotationSweepObject1D( " - << theObject << ", " - << theAxis << ", " - << theAngleInRadians << ", " - << theNbOfSteps << ", " - << theTolerance << " )"; + << theObject << ", " + << theAxis << ", " + << TVar( theAngleInRadians ) << ", " + << TVar( theNbOfSteps ) << ", " + << TVar( theTolerance ) << " )"; } SMESH::long_array_var anElementsId = theObject->GetIDs(); rotationSweep(anElementsId, @@ -1669,14 +2307,15 @@ void SMESH_MeshEditor_i::RotationSweepObject2D(SMESH::SMESH_IDSource_ptr theObje CORBA::Double theAngleInRadians, CORBA::Long theNbOfSteps, CORBA::Double theTolerance) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << this << ".RotationSweepObject2D( " - << theObject << ", " - << theAxis << ", " - << theAngleInRadians << ", " - << theNbOfSteps << ", " - << theTolerance << " )"; + << theObject << ", " + << theAxis << ", " + << TVar( theAngleInRadians ) << ", " + << TVar( theNbOfSteps ) << ", " + << TVar( theTolerance ) << " )"; } SMESH::long_array_var anElementsId = theObject->GetIDs(); rotationSweep(anElementsId, @@ -1699,6 +2338,7 @@ SMESH_MeshEditor_i::RotationSweepObjectMakeGroups(SMESH::SMESH_IDSource_ptr theO CORBA::Double theAngleInRadians, CORBA::Long theNbOfSteps, CORBA::Double theTolerance) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -1709,8 +2349,8 @@ SMESH_MeshEditor_i::RotationSweepObjectMakeGroups(SMESH::SMESH_IDSource_ptr theO theNbOfSteps, theTolerance, true); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".RotationSweepObjectMakeGroups( " << theObject << ", " << theAxis << ", " @@ -1732,6 +2372,7 @@ SMESH_MeshEditor_i::RotationSweepObject1DMakeGroups(SMESH::SMESH_IDSource_ptr th CORBA::Double theAngleInRadians, CORBA::Long theNbOfSteps, CORBA::Double theTolerance) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -1743,14 +2384,14 @@ SMESH_MeshEditor_i::RotationSweepObject1DMakeGroups(SMESH::SMESH_IDSource_ptr th theTolerance, true, SMDSAbs_Edge); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".RotationSweepObject1DMakeGroups( " - << theObject << ", " - << theAxis << ", " - << theAngleInRadians << ", " - << theNbOfSteps << ", " - << theTolerance << " )"; + << theObject << ", " + << theAxis << ", " + << TVar( theAngleInRadians ) << ", " + << TVar( theNbOfSteps ) << ", " + << TVar( theTolerance ) << " )"; } return aGroups; } @@ -1766,6 +2407,7 @@ SMESH_MeshEditor_i::RotationSweepObject2DMakeGroups(SMESH::SMESH_IDSource_ptr th CORBA::Double theAngleInRadians, CORBA::Long theNbOfSteps, CORBA::Double theTolerance) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -1777,14 +2419,14 @@ SMESH_MeshEditor_i::RotationSweepObject2DMakeGroups(SMESH::SMESH_IDSource_ptr th theTolerance, true, SMDSAbs_Face); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".RotationSweepObject2DMakeGroups( " - << theObject << ", " - << theAxis << ", " - << theAngleInRadians << ", " - << theNbOfSteps << ", " - << theTolerance << " )"; + << theObject << ", " + << theAxis << ", " + << TVar( theAngleInRadians ) << ", " + << TVar( theNbOfSteps ) << ", " + << TVar( theTolerance ) << " )"; } return aGroups; } @@ -1799,49 +2441,42 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::extrusionSweep(const SMESH::long_array & theIDsOfElements, const SMESH::DirStruct & theStepVector, CORBA::Long theNbOfSteps, - const bool theMakeGroups, + bool theMakeGroups, const SMDSAbs_ElementType theElementType) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - try { -#ifdef NO_CAS_CATCH - OCC_CATCH_SIGNALS; -#endif - TIDSortedElemSet elements, copyElements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements, theElementType); + TIDSortedElemSet elements, copyElements; + arrayToSet(theIDsOfElements, getMeshDS(), elements, theElementType); + + const SMESH::PointStruct * P = &theStepVector.PS; + gp_Vec stepVec( P->x, P->y, P->z ); - const SMESH::PointStruct * P = &theStepVector.PS; - gp_Vec stepVec( P->x, P->y, P->z ); + TIDSortedElemSet* workElements = & elements; - TIDSortedElemSet* workElements = & elements; - TPreviewMesh tmpMesh( SMDSAbs_Face ); - SMESH_Mesh* mesh = 0; - - if ( myPreviewMode ) { - SMDSAbs_ElementType select = SMDSAbs_All, avoid = SMDSAbs_Volume; - tmpMesh.Copy( elements, copyElements, select, avoid ); - mesh = &tmpMesh; - workElements = & copyElements; - } - else { - mesh = myMesh; - } + SMDSAbs_ElementType aType = SMDSAbs_Face; + if (theElementType == SMDSAbs_Node) + { + aType = SMDSAbs_Edge; + } + if ( myIsPreviewMode ) { + SMDSAbs_ElementType select = SMDSAbs_All, avoid = SMDSAbs_Volume; + getPreviewMesh( aType )->Copy( elements, copyElements, select, avoid ); + workElements = & copyElements; + theMakeGroups = false; + } - TElemOfElemListMap aHystory; - ::SMESH_MeshEditor anEditor( mesh ); - ::SMESH_MeshEditor::PGroupIDs groupIds = - anEditor.ExtrusionSweep (*workElements, stepVec, theNbOfSteps, aHystory, theMakeGroups); + TElemOfElemListMap aHystory; + ::SMESH_MeshEditor::PGroupIDs groupIds = + getEditor().ExtrusionSweep (*workElements, stepVec, theNbOfSteps, aHystory, theMakeGroups); - myMesh->GetMeshDS()->Modified(); - storeResult(anEditor); + declareMeshModified( /*isReComputeSafe=*/true ); // does not influence Compute() - return theMakeGroups ? getGroups(groupIds.get()) : 0; + return theMakeGroups ? getGroups(groupIds.get()) : 0; - } catch(Standard_Failure) { - Handle(Standard_Failure) aFail = Standard_Failure::Caught(); - INFOS( "SMESH_MeshEditor_i::ExtrusionSweep fails - "<< aFail->GetMessageString() ); - } + SMESH_CATCH( SMESH::throwCorbaException ); return 0; } @@ -1853,14 +2488,31 @@ SMESH_MeshEditor_i::extrusionSweep(const SMESH::long_array & theIDsOfElements, void SMESH_MeshEditor_i::ExtrusionSweep(const SMESH::long_array & theIDsOfElements, const SMESH::DirStruct & theStepVector, CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) { extrusionSweep (theIDsOfElements, theStepVector, theNbOfSteps, false ); - if (!myPreviewMode) { + if (!myIsPreviewMode) { TPythonDump() << this << ".ExtrusionSweep( " - << theIDsOfElements << ", " << theStepVector <<", " << theNbOfSteps << " )"; + << theIDsOfElements << ", " << theStepVector <<", " << TVar(theNbOfSteps) << " )"; } } +//======================================================================= +//function : ExtrusionSweep0D +//purpose : +//======================================================================= + +void SMESH_MeshEditor_i::ExtrusionSweep0D(const SMESH::long_array & theIDsOfElements, + const SMESH::DirStruct & theStepVector, + CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) +{ + extrusionSweep (theIDsOfElements, theStepVector, theNbOfSteps, false, SMDSAbs_Node ); + if (!myIsPreviewMode) { + TPythonDump() << this << ".ExtrusionSweep0D( " + << theIDsOfElements << ", " << theStepVector <<", " << TVar(theNbOfSteps)<< " )"; + } +} //======================================================================= //function : ExtrusionSweepObject @@ -1870,15 +2522,34 @@ void SMESH_MeshEditor_i::ExtrusionSweep(const SMESH::long_array & theIDsOfElemen void SMESH_MeshEditor_i::ExtrusionSweepObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct & theStepVector, CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) { SMESH::long_array_var anElementsId = theObject->GetIDs(); extrusionSweep (anElementsId, theStepVector, theNbOfSteps, false ); - if (!myPreviewMode) { + if (!myIsPreviewMode) { TPythonDump() << this << ".ExtrusionSweepObject( " << theObject << ", " << theStepVector << ", " << theNbOfSteps << " )"; } } +//======================================================================= +//function : ExtrusionSweepObject0D +//purpose : +//======================================================================= + +void SMESH_MeshEditor_i::ExtrusionSweepObject0D(SMESH::SMESH_IDSource_ptr theObject, + const SMESH::DirStruct & theStepVector, + CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) +{ + SMESH::long_array_var anElementsId = theObject->GetIDs(); + extrusionSweep (anElementsId, theStepVector, theNbOfSteps, false, SMDSAbs_Node ); + if ( !myIsPreviewMode ) { + TPythonDump() << this << ".ExtrusionSweepObject0D( " + << theObject << ", " << theStepVector << ", " << TVar( theNbOfSteps ) << " )"; + } +} + //======================================================================= //function : ExtrusionSweepObject1D //purpose : @@ -1887,12 +2558,13 @@ void SMESH_MeshEditor_i::ExtrusionSweepObject(SMESH::SMESH_IDSource_ptr theObjec void SMESH_MeshEditor_i::ExtrusionSweepObject1D(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct & theStepVector, CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) { SMESH::long_array_var anElementsId = theObject->GetIDs(); extrusionSweep (anElementsId, theStepVector, theNbOfSteps, false, SMDSAbs_Edge ); - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << this << ".ExtrusionSweepObject1D( " - << theObject << ", " << theStepVector << ", " << theNbOfSteps << " )"; + << theObject << ", " << theStepVector << ", " << TVar( theNbOfSteps ) << " )"; } } @@ -1904,12 +2576,13 @@ void SMESH_MeshEditor_i::ExtrusionSweepObject1D(SMESH::SMESH_IDSource_ptr theObj void SMESH_MeshEditor_i::ExtrusionSweepObject2D(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct & theStepVector, CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) { SMESH::long_array_var anElementsId = theObject->GetIDs(); extrusionSweep (anElementsId, theStepVector, theNbOfSteps, false, SMDSAbs_Face ); - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << this << ".ExtrusionSweepObject2D( " - << theObject << ", " << theStepVector << ", " << theNbOfSteps << " )"; + << theObject << ", " << theStepVector << ", " << TVar( theNbOfSteps ) << " )"; } } @@ -1922,15 +2595,39 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::ExtrusionSweepMakeGroups(const SMESH::long_array& theIDsOfElements, const SMESH::DirStruct& theStepVector, CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() SMESH::ListOfGroups* aGroups = extrusionSweep(theIDsOfElements, theStepVector, theNbOfSteps, true); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".ExtrusionSweepMakeGroups( " << theIDsOfElements - << ", " << theStepVector <<", " << theNbOfSteps << " )"; + << ", " << theStepVector <<", " << TVar( theNbOfSteps ) << " )"; + } + return aGroups; +} + +//======================================================================= +//function : ExtrusionSweepMakeGroups0D +//purpose : +//======================================================================= + +SMESH::ListOfGroups* +SMESH_MeshEditor_i::ExtrusionSweepMakeGroups0D(const SMESH::long_array& theIDsOfElements, + const SMESH::DirStruct& theStepVector, + CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) +{ + TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() + + SMESH::ListOfGroups* aGroups = extrusionSweep(theIDsOfElements, theStepVector, theNbOfSteps, true,SMDSAbs_Node); + + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); + aPythonDump << this << ".ExtrusionSweepMakeGroups0D( " << theIDsOfElements + << ", " << theStepVector <<", " << TVar( theNbOfSteps ) << " )"; } return aGroups; } @@ -1944,20 +2641,45 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::ExtrusionSweepObjectMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct& theStepVector, CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() SMESH::long_array_var anElementsId = theObject->GetIDs(); SMESH::ListOfGroups * aGroups = extrusionSweep(anElementsId, theStepVector, theNbOfSteps, true); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".ExtrusionSweepObjectMakeGroups( " << theObject << ", " << theStepVector << ", " << theNbOfSteps << " )"; } return aGroups; } +//======================================================================= +//function : ExtrusionSweepObject0DMakeGroups +//purpose : +//======================================================================= + +SMESH::ListOfGroups* +SMESH_MeshEditor_i::ExtrusionSweepObject0DMakeGroups(SMESH::SMESH_IDSource_ptr theObject, + const SMESH::DirStruct& theStepVector, + CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) +{ + TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() + + SMESH::long_array_var anElementsId = theObject->GetIDs(); + SMESH::ListOfGroups * aGroups = extrusionSweep(anElementsId, theStepVector, + theNbOfSteps, true, SMDSAbs_Node); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); + aPythonDump << this << ".ExtrusionSweepObject0DMakeGroups( " << theObject + << ", " << theStepVector << ", " << TVar( theNbOfSteps ) << " )"; + } + return aGroups; +} + //======================================================================= //function : ExtrusionSweepObject1DMakeGroups //purpose : @@ -1967,16 +2689,17 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::ExtrusionSweepObject1DMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct& theStepVector, CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() SMESH::long_array_var anElementsId = theObject->GetIDs(); SMESH::ListOfGroups * aGroups = extrusionSweep(anElementsId, theStepVector, theNbOfSteps, true, SMDSAbs_Edge); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".ExtrusionSweepObject1DMakeGroups( " << theObject - << ", " << theStepVector << ", " << theNbOfSteps << " )"; + << ", " << theStepVector << ", " << TVar( theNbOfSteps ) << " )"; } return aGroups; } @@ -1990,16 +2713,17 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::ExtrusionSweepObject2DMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct& theStepVector, CORBA::Long theNbOfSteps) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() SMESH::long_array_var anElementsId = theObject->GetIDs(); SMESH::ListOfGroups * aGroups = extrusionSweep(anElementsId, theStepVector, theNbOfSteps, true, SMDSAbs_Face); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".ExtrusionSweepObject2DMakeGroups( " << theObject - << ", " << theStepVector << ", " << theNbOfSteps << " )"; + << ", " << theStepVector << ", " << TVar( theNbOfSteps ) << " )"; } return aGroups; } @@ -2017,23 +2741,28 @@ SMESH_MeshEditor_i::advancedExtrusion(const SMESH::long_array & theIDsOfElements CORBA::Long theExtrFlags, CORBA::Double theSewTolerance, const bool theMakeGroups) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); TIDSortedElemSet elements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements); + arrayToSet(theIDsOfElements, getMeshDS(), elements); const SMESH::PointStruct * P = &theStepVector.PS; gp_Vec stepVec( P->x, P->y, P->z ); - ::SMESH_MeshEditor anEditor( myMesh ); TElemOfElemListMap aHystory; ::SMESH_MeshEditor::PGroupIDs groupIds = - anEditor.ExtrusionSweep (elements, stepVec, theNbOfSteps, aHystory, - theMakeGroups, theExtrFlags, theSewTolerance); - storeResult(anEditor); + getEditor().ExtrusionSweep (elements, stepVec, theNbOfSteps, aHystory, + theMakeGroups, theExtrFlags, theSewTolerance); + + declareMeshModified( /*isReComputeSafe=*/true ); return theMakeGroups ? getGroups(groupIds.get()) : 0; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -2046,8 +2775,9 @@ void SMESH_MeshEditor_i::AdvancedExtrusion(const SMESH::long_array & theIDsOfEle CORBA::Long theNbOfSteps, CORBA::Long theExtrFlags, CORBA::Double theSewTolerance) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << "stepVector = " << theStepVector; TPythonDump() << this << ".AdvancedExtrusion(" << theIDsOfElements @@ -2074,8 +2804,9 @@ SMESH_MeshEditor_i::AdvancedExtrusionMakeGroups(const SMESH::long_array& theIDsO CORBA::Long theNbOfSteps, CORBA::Long theExtrFlags, CORBA::Double theSewTolerance) + throw (SALOME::SALOME_Exception) { - if (!myPreviewMode) { + if (!myIsPreviewMode) { TPythonDump() << "stepVector = " << theStepVector; } TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -2087,8 +2818,8 @@ SMESH_MeshEditor_i::AdvancedExtrusionMakeGroups(const SMESH::long_array& theIDsO theSewTolerance, true); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".AdvancedExtrusionMakeGroups(" << theIDsOfElements << ", stepVector, " @@ -2139,7 +2870,9 @@ SMESH_MeshEditor_i::extrusionAlongPath(const SMESH::long_array & theIDsOfEleme const bool theMakeGroups, SMESH::SMESH_MeshEditor::Extrusion_Error & theError, const SMDSAbs_ElementType theElementType) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; MESSAGE("extrusionAlongPath"); initData(); @@ -2164,7 +2897,7 @@ SMESH_MeshEditor_i::extrusionAlongPath(const SMESH::long_array & theIDsOfEleme } TIDSortedElemSet elements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements, theElementType); + arrayToSet(theIDsOfElements, getMeshDS(), elements, theElementType); list angles; for (int i = 0; i < theAngles.length(); i++) { @@ -2175,13 +2908,12 @@ SMESH_MeshEditor_i::extrusionAlongPath(const SMESH::long_array & theIDsOfEleme int nbOldGroups = myMesh->NbGroup(); - ::SMESH_MeshEditor anEditor( myMesh ); ::SMESH_MeshEditor::Extrusion_Error error = - anEditor.ExtrusionAlongTrack( elements, aSubMesh, nodeStart, + getEditor().ExtrusionAlongTrack( elements, aSubMesh, nodeStart, theHasAngles, angles, false, theHasRefPoint, refPnt, theMakeGroups ); - myMesh->GetMeshDS()->Modified(); - storeResult(anEditor); + + declareMeshModified( /*isReComputeSafe=*/true ); theError = convExtrError( error ); if ( theMakeGroups ) { @@ -2192,13 +2924,16 @@ SMESH_MeshEditor_i::extrusionAlongPath(const SMESH::long_array & theIDsOfEleme return getGroups( & groupIDs ); } return 0; -} + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} //======================================================================= //function : extrusionAlongPathX //purpose : //======================================================================= + SMESH::ListOfGroups* SMESH_MeshEditor_i::extrusionAlongPathX(const SMESH::long_array & IDsOfElements, SMESH::SMESH_IDSource_ptr Path, @@ -2208,10 +2943,12 @@ SMESH_MeshEditor_i::extrusionAlongPathX(const SMESH::long_array & IDsOfElements CORBA::Boolean LinearVariation, CORBA::Boolean HasRefPoint, const SMESH::PointStruct& RefPoint, - const bool MakeGroups, + bool MakeGroups, const SMDSAbs_ElementType ElementType, SMESH::SMESH_MeshEditor::Extrusion_Error & Error) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; SMESH::ListOfGroups* EmptyGr = new SMESH::ListOfGroups; initData(); @@ -2229,29 +2966,22 @@ SMESH_MeshEditor_i::extrusionAlongPathX(const SMESH::long_array & IDsOfElements } TIDSortedElemSet elements, copyElements; - arrayToSet(IDsOfElements, GetMeshDS(), elements, ElementType); + arrayToSet(IDsOfElements, getMeshDS(), elements, ElementType); TIDSortedElemSet* workElements = &elements; - TPreviewMesh tmpMesh( SMDSAbs_Face ); - SMESH_Mesh* mesh = 0; - if ( myPreviewMode ) + if ( myIsPreviewMode ) { SMDSAbs_ElementType select = SMDSAbs_All, avoid = SMDSAbs_Volume; - tmpMesh.Copy( elements, copyElements, select, avoid ); - mesh = &tmpMesh; + getPreviewMesh( SMDSAbs_Face )->Copy( elements, copyElements, select, avoid ); workElements = & copyElements; - } - else - { - mesh = myMesh; + MakeGroups = false; } - ::SMESH_MeshEditor anEditor( mesh ); ::SMESH_MeshEditor::Extrusion_Error error; - SMESH_Mesh_i* aMeshImp = SMESH::DownCast( Path ); - if(aMeshImp) { + if ( SMESH_Mesh_i* aMeshImp = SMESH::DownCast( Path )) + { // path as mesh SMDS_MeshNode* aNodeStart = (SMDS_MeshNode*)aMeshImp->GetImpl().GetMeshDS()->FindNode(NodeStart); @@ -2259,44 +2989,41 @@ SMESH_MeshEditor_i::extrusionAlongPathX(const SMESH::long_array & IDsOfElements Error = SMESH::SMESH_MeshEditor::EXTR_BAD_STARTING_NODE; return EmptyGr; } - error = anEditor.ExtrusionAlongTrack( *workElements, &(aMeshImp->GetImpl()), aNodeStart, - HasAngles, angles, LinearVariation, - HasRefPoint, refPnt, MakeGroups ); - myMesh->GetMeshDS()->Modified(); + error = getEditor().ExtrusionAlongTrack( *workElements, &(aMeshImp->GetImpl()), aNodeStart, + HasAngles, angles, LinearVariation, + HasRefPoint, refPnt, MakeGroups ); + declareMeshModified( /*isReComputeSafe=*/true ); } - else { - SMESH_subMesh_i* aSubMeshImp = SMESH::DownCast( Path ); - if(aSubMeshImp) { - // path as submesh - SMESH::SMESH_Mesh_ptr aPathMesh = aSubMeshImp->GetFather(); - aMeshImp = SMESH::DownCast( aPathMesh ); - SMDS_MeshNode* aNodeStart = - (SMDS_MeshNode*)aMeshImp->GetImpl().GetMeshDS()->FindNode(NodeStart); - if ( !aNodeStart ) { - Error = SMESH::SMESH_MeshEditor::EXTR_BAD_STARTING_NODE; - return EmptyGr; - } - SMESH_subMesh* aSubMesh = - aMeshImp->GetImpl().GetSubMeshContaining(aSubMeshImp->GetId()); - error = anEditor.ExtrusionAlongTrack( *workElements, aSubMesh, aNodeStart, - HasAngles, angles, LinearVariation, - HasRefPoint, refPnt, MakeGroups ); - myMesh->GetMeshDS()->Modified(); - } - else { - SMESH_Group_i* aGroupImp = SMESH::DownCast( Path ); - if(aGroupImp) { - // path as group of 1D elements - } - else { - // invalid path - Error = SMESH::SMESH_MeshEditor::EXTR_BAD_PATH_SHAPE; - return EmptyGr; - } + else if ( SMESH_subMesh_i* aSubMeshImp = SMESH::DownCast( Path )) + { + // path as submesh + SMESH::SMESH_Mesh_ptr aPathMesh = aSubMeshImp->GetFather(); + aMeshImp = SMESH::DownCast( aPathMesh ); + SMDS_MeshNode* aNodeStart = + (SMDS_MeshNode*)aMeshImp->GetImpl().GetMeshDS()->FindNode(NodeStart); + if ( !aNodeStart ) { + Error = SMESH::SMESH_MeshEditor::EXTR_BAD_STARTING_NODE; + return EmptyGr; } + SMESH_subMesh* aSubMesh = + aMeshImp->GetImpl().GetSubMeshContaining(aSubMeshImp->GetId()); + error = getEditor().ExtrusionAlongTrack( *workElements, aSubMesh, aNodeStart, + HasAngles, angles, LinearVariation, + HasRefPoint, refPnt, MakeGroups ); + declareMeshModified( /*isReComputeSafe=*/true ); + } + else if ( SMESH::DownCast( Path )) + { + // path as group of 1D elements + // ???????? + } + else + { + // invalid path + Error = SMESH::SMESH_MeshEditor::EXTR_BAD_PATH_SHAPE; + return EmptyGr; } - storeResult(anEditor); Error = convExtrError( error ); if ( MakeGroups ) { @@ -2307,13 +3034,16 @@ SMESH_MeshEditor_i::extrusionAlongPathX(const SMESH::long_array & IDsOfElements return getGroups( & groupIDs ); } return EmptyGr; -} + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} //======================================================================= //function : ExtrusionAlongPath //purpose : //======================================================================= + SMESH::SMESH_MeshEditor::Extrusion_Error SMESH_MeshEditor_i::ExtrusionAlongPath(const SMESH::long_array & theIDsOfElements, SMESH::SMESH_Mesh_ptr thePathMesh, @@ -2323,9 +3053,10 @@ SMESH_MeshEditor_i::ExtrusionAlongPath(const SMESH::long_array & theIDsOfEleme const SMESH::double_array & theAngles, CORBA::Boolean theHasRefPoint, const SMESH::PointStruct & theRefPoint) + throw (SALOME::SALOME_Exception) { MESSAGE("ExtrusionAlongPath"); - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << "error = " << this << ".ExtrusionAlongPath( " << theIDsOfElements << ", " << thePathMesh << ", " @@ -2357,6 +3088,7 @@ SMESH_MeshEditor_i::ExtrusionAlongPath(const SMESH::long_array & theIDsOfEleme //function : ExtrusionAlongPathObject //purpose : //======================================================================= + SMESH::SMESH_MeshEditor::Extrusion_Error SMESH_MeshEditor_i::ExtrusionAlongPathObject(SMESH::SMESH_IDSource_ptr theObject, SMESH::SMESH_Mesh_ptr thePathMesh, @@ -2366,8 +3098,9 @@ SMESH_MeshEditor_i::ExtrusionAlongPathObject(SMESH::SMESH_IDSource_ptr theObje const SMESH::double_array & theAngles, CORBA::Boolean theHasRefPoint, const SMESH::PointStruct & theRefPoint) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << "error = " << this << ".ExtrusionAlongPathObject( " << theObject << ", " << thePathMesh << ", " @@ -2400,6 +3133,7 @@ SMESH_MeshEditor_i::ExtrusionAlongPathObject(SMESH::SMESH_IDSource_ptr theObje //function : ExtrusionAlongPathObject1D //purpose : //======================================================================= + SMESH::SMESH_MeshEditor::Extrusion_Error SMESH_MeshEditor_i::ExtrusionAlongPathObject1D(SMESH::SMESH_IDSource_ptr theObject, SMESH::SMESH_Mesh_ptr thePathMesh, @@ -2409,8 +3143,9 @@ SMESH_MeshEditor_i::ExtrusionAlongPathObject1D(SMESH::SMESH_IDSource_ptr theOb const SMESH::double_array & theAngles, CORBA::Boolean theHasRefPoint, const SMESH::PointStruct & theRefPoint) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << "error = " << this << ".ExtrusionAlongPathObject1D( " << theObject << ", " << thePathMesh << ", " @@ -2444,6 +3179,7 @@ SMESH_MeshEditor_i::ExtrusionAlongPathObject1D(SMESH::SMESH_IDSource_ptr theOb //function : ExtrusionAlongPathObject2D //purpose : //======================================================================= + SMESH::SMESH_MeshEditor::Extrusion_Error SMESH_MeshEditor_i::ExtrusionAlongPathObject2D(SMESH::SMESH_IDSource_ptr theObject, SMESH::SMESH_Mesh_ptr thePathMesh, @@ -2453,8 +3189,9 @@ SMESH_MeshEditor_i::ExtrusionAlongPathObject2D(SMESH::SMESH_IDSource_ptr theOb const SMESH::double_array & theAngles, CORBA::Boolean theHasRefPoint, const SMESH::PointStruct & theRefPoint) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << "error = " << this << ".ExtrusionAlongPathObject2D( " << theObject << ", " << thePathMesh << ", " @@ -2489,6 +3226,7 @@ SMESH_MeshEditor_i::ExtrusionAlongPathObject2D(SMESH::SMESH_IDSource_ptr theOb //function : ExtrusionAlongPathMakeGroups //purpose : //======================================================================= + SMESH::ListOfGroups* SMESH_MeshEditor_i::ExtrusionAlongPathMakeGroups(const SMESH::long_array& theIDsOfElements, SMESH::SMESH_Mesh_ptr thePathMesh, @@ -2499,6 +3237,7 @@ SMESH_MeshEditor_i::ExtrusionAlongPathMakeGroups(const SMESH::long_array& theI CORBA::Boolean theHasRefPoint, const SMESH::PointStruct& theRefPoint, SMESH::SMESH_MeshEditor::Extrusion_Error& Error) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -2512,7 +3251,7 @@ SMESH_MeshEditor_i::ExtrusionAlongPathMakeGroups(const SMESH::long_array& theI theRefPoint, true, Error); - if (!myPreviewMode) { + if (!myIsPreviewMode) { bool isDumpGroups = aGroups && aGroups->length() > 0; if (isDumpGroups) aPythonDump << "(" << aGroups << ", error)"; @@ -2539,6 +3278,7 @@ SMESH_MeshEditor_i::ExtrusionAlongPathMakeGroups(const SMESH::long_array& theI //function : ExtrusionAlongPathObjectMakeGroups //purpose : //======================================================================= + SMESH::ListOfGroups* SMESH_MeshEditor_i:: ExtrusionAlongPathObjectMakeGroups(SMESH::SMESH_IDSource_ptr theObject, SMESH::SMESH_Mesh_ptr thePathMesh, @@ -2549,6 +3289,7 @@ ExtrusionAlongPathObjectMakeGroups(SMESH::SMESH_IDSource_ptr theObject, CORBA::Boolean theHasRefPoint, const SMESH::PointStruct& theRefPoint, SMESH::SMESH_MeshEditor::Extrusion_Error& Error) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -2564,7 +3305,7 @@ ExtrusionAlongPathObjectMakeGroups(SMESH::SMESH_IDSource_ptr theObject, true, Error); - if (!myPreviewMode) { + if (!myIsPreviewMode) { bool isDumpGroups = aGroups && aGroups->length() > 0; if (isDumpGroups) aPythonDump << "(" << aGroups << ", error)"; @@ -2591,6 +3332,7 @@ ExtrusionAlongPathObjectMakeGroups(SMESH::SMESH_IDSource_ptr theObject, //function : ExtrusionAlongPathObject1DMakeGroups //purpose : //======================================================================= + SMESH::ListOfGroups* SMESH_MeshEditor_i:: ExtrusionAlongPathObject1DMakeGroups(SMESH::SMESH_IDSource_ptr theObject, SMESH::SMESH_Mesh_ptr thePathMesh, @@ -2601,6 +3343,7 @@ ExtrusionAlongPathObject1DMakeGroups(SMESH::SMESH_IDSource_ptr theObject, CORBA::Boolean theHasRefPoint, const SMESH::PointStruct& theRefPoint, SMESH::SMESH_MeshEditor::Extrusion_Error& Error) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -2617,7 +3360,7 @@ ExtrusionAlongPathObject1DMakeGroups(SMESH::SMESH_IDSource_ptr theObject, Error, SMDSAbs_Edge); - if (!myPreviewMode) { + if (!myIsPreviewMode) { bool isDumpGroups = aGroups && aGroups->length() > 0; if (isDumpGroups) aPythonDump << "(" << aGroups << ", error)"; @@ -2644,6 +3387,7 @@ ExtrusionAlongPathObject1DMakeGroups(SMESH::SMESH_IDSource_ptr theObject, //function : ExtrusionAlongPathObject2DMakeGroups //purpose : //======================================================================= + SMESH::ListOfGroups* SMESH_MeshEditor_i:: ExtrusionAlongPathObject2DMakeGroups(SMESH::SMESH_IDSource_ptr theObject, SMESH::SMESH_Mesh_ptr thePathMesh, @@ -2654,6 +3398,7 @@ ExtrusionAlongPathObject2DMakeGroups(SMESH::SMESH_IDSource_ptr theObject, CORBA::Boolean theHasRefPoint, const SMESH::PointStruct& theRefPoint, SMESH::SMESH_MeshEditor::Extrusion_Error& Error) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -2670,7 +3415,7 @@ ExtrusionAlongPathObject2DMakeGroups(SMESH::SMESH_IDSource_ptr theObject, Error, SMDSAbs_Face); - if (!myPreviewMode) { + if (!myIsPreviewMode) { bool isDumpGroups = aGroups && aGroups->length() > 0; if (isDumpGroups) aPythonDump << "(" << aGroups << ", error)"; @@ -2693,11 +3438,11 @@ ExtrusionAlongPathObject2DMakeGroups(SMESH::SMESH_IDSource_ptr theObject, return aGroups; } - //======================================================================= //function : ExtrusionAlongPathObjX //purpose : //======================================================================= + SMESH::ListOfGroups* SMESH_MeshEditor_i:: ExtrusionAlongPathObjX(SMESH::SMESH_IDSource_ptr Object, SMESH::SMESH_IDSource_ptr Path, @@ -2710,6 +3455,7 @@ ExtrusionAlongPathObjX(SMESH::SMESH_IDSource_ptr Object, CORBA::Boolean MakeGroups, SMESH::ElementType ElemType, SMESH::SMESH_MeshEditor::Extrusion_Error& Error) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -2726,7 +3472,7 @@ ExtrusionAlongPathObjX(SMESH::SMESH_IDSource_ptr Object, (SMDSAbs_ElementType)ElemType, Error); - if (!myPreviewMode) { + if (!myIsPreviewMode) { bool isDumpGroups = aGroups && aGroups->length() > 0; if (isDumpGroups) aPythonDump << "(" << *aGroups << ", error)"; @@ -2734,28 +3480,28 @@ ExtrusionAlongPathObjX(SMESH::SMESH_IDSource_ptr Object, aPythonDump << "error"; aPythonDump << " = " << this << ".ExtrusionAlongPathObjX( " - << Object << ", " - << Path << ", " - << NodeStart << ", " - << HasAngles << ", " - << Angles << ", " + << Object << ", " + << Path << ", " + << NodeStart << ", " + << HasAngles << ", " + << TVar( Angles ) << ", " << LinearVariation << ", " - << HasRefPoint << ", " + << HasRefPoint << ", " << "SMESH.PointStruct( " - << ( HasRefPoint ? RefPoint.x : 0 ) << ", " - << ( HasRefPoint ? RefPoint.y : 0 ) << ", " - << ( HasRefPoint ? RefPoint.z : 0 ) << " ), " + << TVar( HasRefPoint ? RefPoint.x : 0 ) << ", " + << TVar( HasRefPoint ? RefPoint.y : 0 ) << ", " + << TVar( HasRefPoint ? RefPoint.z : 0 ) << " ), " << MakeGroups << ", " << ElemType << " )"; } return aGroups; } - //======================================================================= //function : ExtrusionAlongPathX //purpose : //======================================================================= + SMESH::ListOfGroups* SMESH_MeshEditor_i:: ExtrusionAlongPathX(const SMESH::long_array& IDsOfElements, SMESH::SMESH_IDSource_ptr Path, @@ -2768,6 +3514,7 @@ ExtrusionAlongPathX(const SMESH::long_array& IDsOfElements, CORBA::Boolean MakeGroups, SMESH::ElementType ElemType, SMESH::SMESH_MeshEditor::Extrusion_Error& Error) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -2783,7 +3530,7 @@ ExtrusionAlongPathX(const SMESH::long_array& IDsOfElements, (SMDSAbs_ElementType)ElemType, Error); - if (!myPreviewMode) { + if (!myIsPreviewMode) { bool isDumpGroups = aGroups && aGroups->length() > 0; if (isDumpGroups) aPythonDump << "(" << *aGroups << ", error)"; @@ -2791,24 +3538,23 @@ ExtrusionAlongPathX(const SMESH::long_array& IDsOfElements, aPythonDump <<"error"; aPythonDump << " = " << this << ".ExtrusionAlongPathX( " - << IDsOfElements << ", " - << Path << ", " - << NodeStart << ", " - << HasAngles << ", " - << Angles << ", " + << IDsOfElements << ", " + << Path << ", " + << NodeStart << ", " + << HasAngles << ", " + << TVar( Angles ) << ", " << LinearVariation << ", " - << HasRefPoint << ", " + << HasRefPoint << ", " << "SMESH.PointStruct( " - << ( HasRefPoint ? RefPoint.x : 0 ) << ", " - << ( HasRefPoint ? RefPoint.y : 0 ) << ", " - << ( HasRefPoint ? RefPoint.z : 0 ) << " ), " + << TVar( HasRefPoint ? RefPoint.x : 0 ) << ", " + << TVar( HasRefPoint ? RefPoint.y : 0 ) << ", " + << TVar( HasRefPoint ? RefPoint.z : 0 ) << " ), " << MakeGroups << ", " << ElemType << " )"; } return aGroups; } - //================================================================================ /*! * \brief Compute rotation angles for ExtrusionAlongPath as linear variation @@ -2880,7 +3626,6 @@ SMESH_MeshEditor_i::LinearAnglesVariation(SMESH::SMESH_Mesh_ptr thePathMes return aResult._retn(); } - //======================================================================= //function : mirror //purpose : @@ -2891,14 +3636,19 @@ SMESH_MeshEditor_i::mirror(TIDSortedElemSet & theElements, const SMESH::AxisStruct & theAxis, SMESH::SMESH_MeshEditor::MirrorType theMirrorType, CORBA::Boolean theCopy, - const bool theMakeGroups, + bool theMakeGroups, ::SMESH_Mesh* theTargetMesh) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); gp_Pnt P ( theAxis.x, theAxis.y, theAxis.z ); gp_Vec V ( theAxis.vx, theAxis.vy, theAxis.vz ); + if ( theTargetMesh ) + theCopy = false; + gp_Trsf aTrsf; switch ( theMirrorType ) { case SMESH::SMESH_MeshEditor::POINT: @@ -2911,36 +3661,41 @@ SMESH_MeshEditor_i::mirror(TIDSortedElemSet & theElements, aTrsf.SetMirror( gp_Ax2( P, V )); } - TIDSortedElemSet copyElements; - TPreviewMesh tmpMesh; - TIDSortedElemSet* workElements = 0; - SMESH_Mesh* mesh = 0; + TIDSortedElemSet copyElements; + TIDSortedElemSet* workElements = & theElements; - if ( myPreviewMode ) + if ( myIsPreviewMode ) { - tmpMesh.Copy( theElements, copyElements); - mesh = &tmpMesh; + TPreviewMesh * tmpMesh = getPreviewMesh(); + tmpMesh->Copy( theElements, copyElements); + if ( !theCopy && !theTargetMesh ) + { + TIDSortedElemSet elemsAround, elemsAroundCopy; + getElementsAround( theElements, getMeshDS(), elemsAround ); + tmpMesh->Copy( elemsAround, elemsAroundCopy); + } workElements = & copyElements; - } - else - { - mesh = myMesh; - workElements = & theElements; + theMakeGroups = false; } - ::SMESH_MeshEditor anEditor( mesh ); ::SMESH_MeshEditor::PGroupIDs groupIds = - anEditor.Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); + getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); - if(theCopy || myPreviewMode) - storeResult(anEditor); - else + if ( theCopy && !myIsPreviewMode) + { + if ( theTargetMesh ) { - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); + theTargetMesh->GetMeshDS()->Modified(); } - + else + { + declareMeshModified( /*isReComputeSafe=*/false ); + } + } return theMakeGroups ? getGroups(groupIds.get()) : 0; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -2952,18 +3707,19 @@ void SMESH_MeshEditor_i::Mirror(const SMESH::long_array & theIDsOfElem const SMESH::AxisStruct & theAxis, SMESH::SMESH_MeshEditor::MirrorType theMirrorType, CORBA::Boolean theCopy) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << this << ".Mirror( " - << theIDsOfElements << ", " - << theAxis << ", " + << theIDsOfElements << ", " + << theAxis << ", " << mirrorTypeName(theMirrorType) << ", " - << theCopy << " )"; + << theCopy << " )"; } if ( theIDsOfElements.length() > 0 ) { TIDSortedElemSet elements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements); + arrayToSet(theIDsOfElements, getMeshDS(), elements); mirror(elements, theAxis, theMirrorType, theCopy, false); } } @@ -2978,19 +3734,20 @@ void SMESH_MeshEditor_i::MirrorObject(SMESH::SMESH_IDSource_ptr theObj const SMESH::AxisStruct & theAxis, SMESH::SMESH_MeshEditor::MirrorType theMirrorType, CORBA::Boolean theCopy) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << this << ".MirrorObject( " - << theObject << ", " - << theAxis << ", " + << theObject << ", " + << theAxis << ", " << mirrorTypeName(theMirrorType) << ", " - << theCopy << " )"; + << theCopy << " )"; } TIDSortedElemSet elements; - bool emptyIfIsMesh = myPreviewMode ? false : true; + bool emptyIfIsMesh = myIsPreviewMode ? false : true; - if (idSourceToSet(theObject, GetMeshDS(), elements, SMDSAbs_All, emptyIfIsMesh)) + if (idSourceToSet(theObject, getMeshDS(), elements, SMDSAbs_All, emptyIfIsMesh)) mirror(elements, theAxis, theMirrorType, theCopy, false); } @@ -3003,6 +3760,7 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::MirrorMakeGroups(const SMESH::long_array& theIDsOfElements, const SMESH::AxisStruct& theMirror, SMESH::SMESH_MeshEditor::MirrorType theMirrorType) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -3010,14 +3768,14 @@ SMESH_MeshEditor_i::MirrorMakeGroups(const SMESH::long_array& theIDsO if ( theIDsOfElements.length() > 0 ) { TIDSortedElemSet elements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements); + arrayToSet(theIDsOfElements, getMeshDS(), elements); aGroups = mirror(elements, theMirror, theMirrorType, true, true); } - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".MirrorMakeGroups( " - << theIDsOfElements << ", " - << theMirror << ", " + << theIDsOfElements << ", " + << theMirror << ", " << mirrorTypeName(theMirrorType) << " )"; } return aGroups; @@ -3032,20 +3790,21 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::MirrorObjectMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::AxisStruct& theMirror, SMESH::SMESH_MeshEditor::MirrorType theMirrorType) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() SMESH::ListOfGroups * aGroups = 0; TIDSortedElemSet elements; - if ( idSourceToSet(theObject, GetMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) + if ( idSourceToSet(theObject, getMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) aGroups = mirror(elements, theMirror, theMirrorType, true, true); - if (!myPreviewMode) + if (!myIsPreviewMode) { - DumpGroupsList(aPythonDump,aGroups); + dumpGroupsList(aPythonDump,aGroups); aPythonDump << this << ".MirrorObjectMakeGroups( " - << theObject << ", " - << theMirror << ", " + << theObject << ", " + << theMirror << ", " << mirrorTypeName(theMirrorType) << " )"; } return aGroups; @@ -3062,6 +3821,7 @@ SMESH_MeshEditor_i::MirrorMakeMesh(const SMESH::long_array& theIDsOfE SMESH::SMESH_MeshEditor::MirrorType theMirrorType, CORBA::Boolean theCopyGroups, const char* theMeshName) + throw (SALOME::SALOME_Exception) { SMESH_Mesh_i* mesh_i; SMESH::SMESH_Mesh_var mesh; @@ -3075,24 +3835,24 @@ SMESH_MeshEditor_i::MirrorMakeMesh(const SMESH::long_array& theIDsOfE if (mesh_i && theIDsOfElements.length() > 0 ) { TIDSortedElemSet elements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements); + arrayToSet(theIDsOfElements, getMeshDS(), elements); mirror(elements, theMirror, theMirrorType, false, theCopyGroups, & mesh_i->GetImpl()); mesh_i->CreateGroupServants(); } - if (!myPreviewMode) { + if (!myIsPreviewMode) { pydump << mesh << " = " << this << ".MirrorMakeMesh( " - << theIDsOfElements << ", " - << theMirror << ", " + << theIDsOfElements << ", " + << theMirror << ", " << mirrorTypeName(theMirrorType) << ", " - << theCopyGroups << ", '" - << theMeshName << "' )"; + << theCopyGroups << ", '" + << theMeshName << "' )"; } } //dump "GetGroups" - if (!myPreviewMode && mesh_i) + if (!myIsPreviewMode && mesh_i) mesh_i->GetGroups(); return mesh._retn(); @@ -3109,6 +3869,7 @@ SMESH_MeshEditor_i::MirrorObjectMakeMesh(SMESH::SMESH_IDSource_ptr the SMESH::SMESH_MeshEditor::MirrorType theMirrorType, CORBA::Boolean theCopyGroups, const char* theMeshName) + throw (SALOME::SALOME_Exception) { SMESH_Mesh_i* mesh_i; SMESH::SMESH_Mesh_var mesh; @@ -3121,24 +3882,24 @@ SMESH_MeshEditor_i::MirrorObjectMakeMesh(SMESH::SMESH_IDSource_ptr the mesh_i = SMESH::DownCast( mesh ); TIDSortedElemSet elements; if ( mesh_i && - idSourceToSet(theObject, GetMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) + idSourceToSet(theObject, getMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) { mirror(elements, theMirror, theMirrorType, false, theCopyGroups, & mesh_i->GetImpl()); mesh_i->CreateGroupServants(); } - if (!myPreviewMode) { + if (!myIsPreviewMode) { pydump << mesh << " = " << this << ".MirrorObjectMakeMesh( " - << theObject << ", " - << theMirror << ", " + << theObject << ", " + << theMirror << ", " << mirrorTypeName(theMirrorType) << ", " - << theCopyGroups << ", '" - << theMeshName << "' )"; + << theCopyGroups << ", '" + << theMeshName << "' )"; } } //dump "GetGroups" - if (!myPreviewMode && mesh_i) + if (!myIsPreviewMode && mesh_i) mesh_i->GetGroups(); return mesh._retn(); @@ -3153,45 +3914,56 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::translate(TIDSortedElemSet & theElements, const SMESH::DirStruct & theVector, CORBA::Boolean theCopy, - const bool theMakeGroups, + bool theMakeGroups, ::SMESH_Mesh* theTargetMesh) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); + if ( theTargetMesh ) + theCopy = false; + gp_Trsf aTrsf; const SMESH::PointStruct * P = &theVector.PS; aTrsf.SetTranslation( gp_Vec( P->x, P->y, P->z )); - TIDSortedElemSet copyElements; - TPreviewMesh tmpMesh; - TIDSortedElemSet* workElements = 0; - SMESH_Mesh* mesh = 0; + TIDSortedElemSet copyElements; + TIDSortedElemSet* workElements = &theElements; - if ( myPreviewMode ) + if ( myIsPreviewMode ) { - tmpMesh.Copy( theElements, copyElements); - mesh = &tmpMesh; + TPreviewMesh * tmpMesh = getPreviewMesh(); + tmpMesh->Copy( theElements, copyElements); + if ( !theCopy && !theTargetMesh ) + { + TIDSortedElemSet elemsAround, elemsAroundCopy; + getElementsAround( theElements, getMeshDS(), elemsAround ); + tmpMesh->Copy( elemsAround, elemsAroundCopy); + } workElements = & copyElements; - } - else - { - mesh = myMesh; - workElements = & theElements; + theMakeGroups = false; } - ::SMESH_MeshEditor anEditor( mesh ); ::SMESH_MeshEditor::PGroupIDs groupIds = - anEditor.Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); + getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); - if(theCopy || myPreviewMode) - storeResult(anEditor); - else + if ( theCopy && !myIsPreviewMode ) + { + if ( theTargetMesh ) + { + theTargetMesh->GetMeshDS()->Modified(); + } + else { - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); + declareMeshModified( /*isReComputeSafe=*/false ); } + } return theMakeGroups ? getGroups(groupIds.get()) : 0; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -3202,16 +3974,17 @@ SMESH_MeshEditor_i::translate(TIDSortedElemSet & theElements, void SMESH_MeshEditor_i::Translate(const SMESH::long_array & theIDsOfElements, const SMESH::DirStruct & theVector, CORBA::Boolean theCopy) + throw (SALOME::SALOME_Exception) { - if (!myPreviewMode) { + if (!myIsPreviewMode) { TPythonDump() << this << ".Translate( " << theIDsOfElements << ", " - << theVector << ", " - << theCopy << " )"; + << theVector << ", " + << theCopy << " )"; } if (theIDsOfElements.length()) { TIDSortedElemSet elements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements); + arrayToSet(theIDsOfElements, getMeshDS(), elements); translate(elements, theVector, theCopy, false); } } @@ -3224,18 +3997,19 @@ void SMESH_MeshEditor_i::Translate(const SMESH::long_array & theIDsOfElements, void SMESH_MeshEditor_i::TranslateObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct & theVector, CORBA::Boolean theCopy) + throw (SALOME::SALOME_Exception) { - if (!myPreviewMode) { + if (!myIsPreviewMode) { TPythonDump() << this << ".TranslateObject( " << theObject << ", " << theVector << ", " - << theCopy << " )"; + << theCopy << " )"; } TIDSortedElemSet elements; - bool emptyIfIsMesh = myPreviewMode ? false : true; + bool emptyIfIsMesh = myIsPreviewMode ? false : true; - if (idSourceToSet(theObject, GetMeshDS(), elements, SMDSAbs_All, emptyIfIsMesh)) + if (idSourceToSet(theObject, getMeshDS(), elements, SMDSAbs_All, emptyIfIsMesh)) translate(elements, theVector, theCopy, false); } @@ -3247,20 +4021,21 @@ void SMESH_MeshEditor_i::TranslateObject(SMESH::SMESH_IDSource_ptr theObject, SMESH::ListOfGroups* SMESH_MeshEditor_i::TranslateMakeGroups(const SMESH::long_array& theIDsOfElements, const SMESH::DirStruct& theVector) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() SMESH::ListOfGroups * aGroups = 0; if (theIDsOfElements.length()) { TIDSortedElemSet elements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements); + arrayToSet(theIDsOfElements, getMeshDS(), elements); aGroups = translate(elements,theVector,true,true); } - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".TranslateMakeGroups( " << theIDsOfElements << ", " - << theVector << " )"; + << theVector << " )"; } return aGroups; } @@ -3273,16 +4048,17 @@ SMESH_MeshEditor_i::TranslateMakeGroups(const SMESH::long_array& theIDsOfElement SMESH::ListOfGroups* SMESH_MeshEditor_i::TranslateObjectMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct& theVector) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() SMESH::ListOfGroups * aGroups = 0; TIDSortedElemSet elements; - if (idSourceToSet(theObject, GetMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) + if (idSourceToSet(theObject, getMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) aGroups = translate(elements, theVector, true, true); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".TranslateObjectMakeGroups( " << theObject << ", " << theVector << " )"; @@ -3300,6 +4076,7 @@ SMESH_MeshEditor_i::TranslateMakeMesh(const SMESH::long_array& theIDsOfElements, const SMESH::DirStruct& theVector, CORBA::Boolean theCopyGroups, const char* theMeshName) + throw (SALOME::SALOME_Exception) { SMESH_Mesh_i* mesh_i; SMESH::SMESH_Mesh_var mesh; @@ -3315,22 +4092,22 @@ SMESH_MeshEditor_i::TranslateMakeMesh(const SMESH::long_array& theIDsOfElements, if ( mesh_i && theIDsOfElements.length() ) { TIDSortedElemSet elements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements); + arrayToSet(theIDsOfElements, getMeshDS(), elements); translate(elements, theVector, false, theCopyGroups, & mesh_i->GetImpl()); mesh_i->CreateGroupServants(); } - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { pydump << mesh << " = " << this << ".TranslateMakeMesh( " << theIDsOfElements << ", " - << theVector << ", " - << theCopyGroups << ", '" - << theMeshName << "' )"; + << theVector << ", " + << theCopyGroups << ", '" + << theMeshName << "' )"; } } //dump "GetGroups" - if (!myPreviewMode && mesh_i) + if (!myIsPreviewMode && mesh_i) mesh_i->GetGroups(); return mesh._retn(); @@ -3346,7 +4123,9 @@ SMESH_MeshEditor_i::TranslateObjectMakeMesh(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct& theVector, CORBA::Boolean theCopyGroups, const char* theMeshName) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; SMESH_Mesh_i* mesh_i; SMESH::SMESH_Mesh_var mesh; { // open new scope to dump "MakeMesh" command @@ -3358,25 +4137,28 @@ SMESH_MeshEditor_i::TranslateObjectMakeMesh(SMESH::SMESH_IDSource_ptr theObject, TIDSortedElemSet elements; if ( mesh_i && - idSourceToSet(theObject, GetMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) + idSourceToSet(theObject, getMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) { translate(elements, theVector,false, theCopyGroups, & mesh_i->GetImpl()); mesh_i->CreateGroupServants(); } - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { pydump << mesh << " = " << this << ".TranslateObjectMakeMesh( " - << theObject << ", " - << theVector << ", " + << theObject << ", " + << theVector << ", " << theCopyGroups << ", '" - << theMeshName << "' )"; + << theMeshName << "' )"; } } // dump "GetGroups" - if (!myPreviewMode && mesh_i) + if (!myIsPreviewMode && mesh_i) mesh_i->GetGroups(); return mesh._retn(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -3389,46 +4171,50 @@ SMESH_MeshEditor_i::rotate(TIDSortedElemSet & theElements, const SMESH::AxisStruct & theAxis, CORBA::Double theAngle, CORBA::Boolean theCopy, - const bool theMakeGroups, + bool theMakeGroups, ::SMESH_Mesh* theTargetMesh) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); + if ( theTargetMesh ) + theCopy = false; + gp_Pnt P ( theAxis.x, theAxis.y, theAxis.z ); gp_Vec V ( theAxis.vx, theAxis.vy, theAxis.vz ); gp_Trsf aTrsf; aTrsf.SetRotation( gp_Ax1( P, V ), theAngle); - TIDSortedElemSet copyElements; - TPreviewMesh tmpMesh; - TIDSortedElemSet* workElements = 0; - SMESH_Mesh* mesh = 0; - - if ( myPreviewMode ) { - tmpMesh.Copy( theElements, copyElements ); - mesh = &tmpMesh; + TIDSortedElemSet copyElements; + TIDSortedElemSet* workElements = &theElements; + if ( myIsPreviewMode ) { + TPreviewMesh * tmpMesh = getPreviewMesh(); + tmpMesh->Copy( theElements, copyElements ); + if ( !theCopy && !theTargetMesh ) + { + TIDSortedElemSet elemsAround, elemsAroundCopy; + getElementsAround( theElements, getMeshDS(), elemsAround ); + tmpMesh->Copy( elemsAround, elemsAroundCopy); + } workElements = ©Elements; - } - else - { - mesh = myMesh; - workElements=&theElements; + theMakeGroups = false; } - ::SMESH_MeshEditor anEditor( mesh ); ::SMESH_MeshEditor::PGroupIDs groupIds = - anEditor.Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); + getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); - if(theCopy || myPreviewMode) - storeResult(anEditor); - else - { - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); - } + if ( theCopy && !myIsPreviewMode) + { + if ( theTargetMesh ) theTargetMesh->GetMeshDS()->Modified(); + else declareMeshModified( /*isReComputeSafe=*/false ); + } return theMakeGroups ? getGroups(groupIds.get()) : 0; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -3440,18 +4226,19 @@ void SMESH_MeshEditor_i::Rotate(const SMESH::long_array & theIDsOfElements, const SMESH::AxisStruct & theAxis, CORBA::Double theAngle, CORBA::Boolean theCopy) + throw (SALOME::SALOME_Exception) { - if (!myPreviewMode) { + if (!myIsPreviewMode) { TPythonDump() << this << ".Rotate( " << theIDsOfElements << ", " - << theAxis << ", " - << theAngle << ", " - << theCopy << " )"; + << theAxis << ", " + << TVar( theAngle ) << ", " + << theCopy << " )"; } if (theIDsOfElements.length() > 0) { TIDSortedElemSet elements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements); + arrayToSet(theIDsOfElements, getMeshDS(), elements); rotate(elements,theAxis,theAngle,theCopy,false); } } @@ -3465,17 +4252,18 @@ void SMESH_MeshEditor_i::RotateObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::AxisStruct & theAxis, CORBA::Double theAngle, CORBA::Boolean theCopy) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << this << ".RotateObject( " - << theObject << ", " - << theAxis << ", " - << theAngle << ", " - << theCopy << " )"; + << theObject << ", " + << theAxis << ", " + << TVar( theAngle ) << ", " + << theCopy << " )"; } TIDSortedElemSet elements; - bool emptyIfIsMesh = myPreviewMode ? false : true; - if (idSourceToSet(theObject, GetMeshDS(), elements, SMDSAbs_All, emptyIfIsMesh)) + bool emptyIfIsMesh = myIsPreviewMode ? false : true; + if (idSourceToSet(theObject, getMeshDS(), elements, SMDSAbs_All, emptyIfIsMesh)) rotate(elements,theAxis,theAngle,theCopy,false); } @@ -3488,6 +4276,7 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::RotateMakeGroups(const SMESH::long_array& theIDsOfElements, const SMESH::AxisStruct& theAxis, CORBA::Double theAngle) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() @@ -3495,15 +4284,15 @@ SMESH_MeshEditor_i::RotateMakeGroups(const SMESH::long_array& theIDsOfElements, if (theIDsOfElements.length() > 0) { TIDSortedElemSet elements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements); + arrayToSet(theIDsOfElements, getMeshDS(), elements); aGroups = rotate(elements,theAxis,theAngle,true,true); } - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".RotateMakeGroups( " << theIDsOfElements << ", " - << theAxis << ", " - << theAngle << " )"; + << theAxis << ", " + << TVar( theAngle ) << " )"; } return aGroups; } @@ -3517,20 +4306,21 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::RotateObjectMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::AxisStruct& theAxis, CORBA::Double theAngle) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() SMESH::ListOfGroups * aGroups = 0; TIDSortedElemSet elements; - if (idSourceToSet(theObject, GetMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) + if (idSourceToSet(theObject, getMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) aGroups = rotate(elements, theAxis, theAngle, true, true); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".RotateObjectMakeGroups( " - << theObject << ", " - << theAxis << ", " - << theAngle << " )"; + << theObject << ", " + << theAxis << ", " + << TVar( theAngle ) << " )"; } return aGroups; } @@ -3546,7 +4336,9 @@ SMESH_MeshEditor_i::RotateMakeMesh(const SMESH::long_array& theIDsOfElements, CORBA::Double theAngleInRadians, CORBA::Boolean theCopyGroups, const char* theMeshName) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; SMESH::SMESH_Mesh_var mesh; SMESH_Mesh_i* mesh_i; @@ -3561,26 +4353,29 @@ SMESH_MeshEditor_i::RotateMakeMesh(const SMESH::long_array& theIDsOfElements, if ( mesh_i && theIDsOfElements.length() > 0 ) { TIDSortedElemSet elements; - arrayToSet(theIDsOfElements, GetMeshDS(), elements); + arrayToSet(theIDsOfElements, getMeshDS(), elements); rotate(elements, theAxis, theAngleInRadians, false, theCopyGroups, & mesh_i->GetImpl()); mesh_i->CreateGroupServants(); } - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { pydump << mesh << " = " << this << ".RotateMakeMesh( " - << theIDsOfElements << ", " - << theAxis << ", " - << theAngleInRadians << ", " - << theCopyGroups << ", '" - << theMeshName << "' )"; + << theIDsOfElements << ", " + << theAxis << ", " + << TVar( theAngleInRadians ) << ", " + << theCopyGroups << ", '" + << theMeshName << "' )"; } } // dump "GetGroups" - if (!myPreviewMode && mesh_i && theIDsOfElements.length() > 0 ) + if (!myIsPreviewMode && mesh_i && theIDsOfElements.length() > 0 ) mesh_i->GetGroups(); return mesh._retn(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -3594,7 +4389,9 @@ SMESH_MeshEditor_i::RotateObjectMakeMesh(SMESH::SMESH_IDSource_ptr theObject, CORBA::Double theAngleInRadians, CORBA::Boolean theCopyGroups, const char* theMeshName) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; SMESH::SMESH_Mesh_var mesh; SMESH_Mesh_i* mesh_i; @@ -3607,27 +4404,30 @@ SMESH_MeshEditor_i::RotateObjectMakeMesh(SMESH::SMESH_IDSource_ptr theObject, TIDSortedElemSet elements; if (mesh_i && - idSourceToSet(theObject, GetMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) + idSourceToSet(theObject, getMeshDS(), elements, SMDSAbs_All, /*emptyIfIsMesh=*/1)) { rotate(elements, theAxis, theAngleInRadians, false, theCopyGroups, & mesh_i->GetImpl()); mesh_i->CreateGroupServants(); } - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { pydump << mesh << " = " << this << ".RotateObjectMakeMesh( " - << theObject << ", " - << theAxis << ", " - << theAngleInRadians << ", " - << theCopyGroups << ", '" - << theMeshName << "' )"; + << theObject << ", " + << theAxis << ", " + << TVar( theAngleInRadians ) << ", " + << theCopyGroups << ", '" + << theMeshName << "' )"; } } // dump "GetGroups" - if (!myPreviewMode && mesh_i) + if (!myIsPreviewMode && mesh_i) mesh_i->GetGroups(); return mesh._retn(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -3640,59 +4440,64 @@ SMESH_MeshEditor_i::scale(SMESH::SMESH_IDSource_ptr theObject, const SMESH::PointStruct& thePoint, const SMESH::double_array& theScaleFact, CORBA::Boolean theCopy, - const bool theMakeGroups, + bool theMakeGroups, ::SMESH_Mesh* theTargetMesh) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); if ( theScaleFact.length() < 1 ) THROW_SALOME_CORBA_EXCEPTION("Scale factor not given", SALOME::BAD_PARAM); if ( theScaleFact.length() == 2 ) THROW_SALOME_CORBA_EXCEPTION("Invalid nb of scale factors : 2", SALOME::BAD_PARAM); + if ( theTargetMesh ) + theCopy = false; + TIDSortedElemSet elements; - bool emptyIfIsMesh = myPreviewMode ? false : true; - if ( !idSourceToSet(theObject, GetMeshDS(), elements, SMDSAbs_All, emptyIfIsMesh)) + bool emptyIfIsMesh = myIsPreviewMode ? false : true; + if ( !idSourceToSet(theObject, getMeshDS(), elements, SMDSAbs_All, emptyIfIsMesh)) return 0; - vector S(3); - S[0] = theScaleFact[0]; - S[1] = (theScaleFact.length() == 1) ? theScaleFact[0] : theScaleFact[1]; - S[2] = (theScaleFact.length() == 1) ? theScaleFact[0] : theScaleFact[2]; + double S[3] = { + theScaleFact[0], + (theScaleFact.length() == 1) ? theScaleFact[0] : theScaleFact[1], + (theScaleFact.length() == 1) ? theScaleFact[0] : theScaleFact[2], + }; double tol = std::numeric_limits::max(); gp_Trsf aTrsf; aTrsf.SetValues( S[0], 0, 0, thePoint.x * (1-S[0]), 0, S[1], 0, thePoint.y * (1-S[1]), 0, 0, S[2], thePoint.z * (1-S[2]), tol, tol); - TIDSortedElemSet copyElements; - TPreviewMesh tmpMesh; - TIDSortedElemSet* workElements = 0; - SMESH_Mesh* mesh = 0; - - if ( myPreviewMode ) + TIDSortedElemSet copyElements; + TIDSortedElemSet* workElements = &elements; + if ( myIsPreviewMode ) { - tmpMesh.Copy( elements, copyElements); - mesh = &tmpMesh; + TPreviewMesh * tmpMesh = getPreviewMesh(); + tmpMesh->Copy( elements, copyElements); + if ( !theCopy && !theTargetMesh ) + { + TIDSortedElemSet elemsAround, elemsAroundCopy; + getElementsAround( elements, getMeshDS(), elemsAround ); + tmpMesh->Copy( elemsAround, elemsAroundCopy); + } workElements = & copyElements; - } - else - { - mesh = myMesh; - workElements = & elements; + theMakeGroups = false; } - ::SMESH_MeshEditor anEditor( mesh ); ::SMESH_MeshEditor::PGroupIDs groupIds = - anEditor.Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); + getEditor().Transform (*workElements, aTrsf, theCopy, theMakeGroups, theTargetMesh); - if(theCopy || myPreviewMode ) - storeResult(anEditor); - else - { - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); - } + if ( theCopy && !myIsPreviewMode ) + { + if ( theTargetMesh ) theTargetMesh->GetMeshDS()->Modified(); + else declareMeshModified( /*isReComputeSafe=*/false ); + } return theMakeGroups ? getGroups(groupIds.get()) : 0; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -3704,14 +4509,14 @@ void SMESH_MeshEditor_i::Scale(SMESH::SMESH_IDSource_ptr theObject, const SMESH::PointStruct& thePoint, const SMESH::double_array& theScaleFact, CORBA::Boolean theCopy) + throw (SALOME::SALOME_Exception) { - if ( !myPreviewMode ) { + if ( !myIsPreviewMode ) { TPythonDump() << this << ".Scale( " - << theObject << ", " - << "SMESH.PointStruct( " << thePoint.x << ", " - << thePoint.y << ", " << thePoint.z << " ) ," - << theScaleFact << ", " - << theCopy << " )"; + << theObject << ", " + << thePoint << ", " + << TVar( theScaleFact ) << ", " + << theCopy << " )"; } scale(theObject, thePoint, theScaleFact, theCopy, false); } @@ -3726,17 +4531,17 @@ SMESH::ListOfGroups* SMESH_MeshEditor_i::ScaleMakeGroups(SMESH::SMESH_IDSource_ptr theObject, const SMESH::PointStruct& thePoint, const SMESH::double_array& theScaleFact) + throw (SALOME::SALOME_Exception) { TPythonDump aPythonDump; // it is here to prevent dump of GetGroups() SMESH::ListOfGroups * aGroups = scale(theObject, thePoint, theScaleFact, true, true); - if (!myPreviewMode) { - DumpGroupsList(aPythonDump, aGroups); + if (!myIsPreviewMode) { + dumpGroupsList(aPythonDump, aGroups); aPythonDump << this << ".Scale(" - << theObject << "," - << "SMESH.PointStruct(" <GetImpl()); mesh_i->CreateGroupServants(); } - if ( !myPreviewMode ) + if ( !myIsPreviewMode ) pydump << mesh << " = " << this << ".ScaleMakeMesh( " - << theObject << ", " - << "SMESH.PointStruct( " << thePoint.x << ", " - << thePoint.y << ", " << thePoint.z << " ) ," - << theScaleFact << ", " - << theCopyGroups << ", '" - << theMeshName << "' )"; + << theObject << ", " + << thePoint << ", " + << TVar( theScaleFact ) << ", " + << theCopyGroups << ", '" + << theMeshName << "' )"; } // dump "GetGroups" - if (!myPreviewMode && mesh_i) + if (!myIsPreviewMode && mesh_i) mesh_i->GetGroups(); return mesh._retn(); @@ -3793,13 +4598,14 @@ SMESH_MeshEditor_i::ScaleMakeMesh(SMESH::SMESH_IDSource_ptr theObject, void SMESH_MeshEditor_i::FindCoincidentNodes (CORBA::Double Tolerance, SMESH::array_of_long_array_out GroupsOfNodes) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); ::SMESH_MeshEditor::TListOfListOfNodes aListOfListOfNodes; - ::SMESH_MeshEditor anEditor( myMesh ); TIDSortedNodeSet nodes; // no input nodes - anEditor.FindCoincidentNodes( nodes, Tolerance, aListOfListOfNodes ); + getEditor().FindCoincidentNodes( nodes, Tolerance, aListOfListOfNodes ); GroupsOfNodes = new SMESH::array_of_long_array; GroupsOfNodes->length( aListOfListOfNodes.size() ); @@ -3814,25 +4620,29 @@ void SMESH_MeshEditor_i::FindCoincidentNodes (CORBA::Double Tol } TPythonDump() << "coincident_nodes = " << this << ".FindCoincidentNodes( " << Tolerance << " )"; + + SMESH_CATCH( SMESH::throwCorbaException ); } //======================================================================= //function : FindCoincidentNodesOnPart //purpose : //======================================================================= + void SMESH_MeshEditor_i::FindCoincidentNodesOnPart(SMESH::SMESH_IDSource_ptr theObject, CORBA::Double Tolerance, SMESH::array_of_long_array_out GroupsOfNodes) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); TIDSortedNodeSet nodes; - idSourceToNodeSet( theObject, GetMeshDS(), nodes ); + idSourceToNodeSet( theObject, getMeshDS(), nodes ); ::SMESH_MeshEditor::TListOfListOfNodes aListOfListOfNodes; - ::SMESH_MeshEditor anEditor( myMesh ); if(!nodes.empty()) - anEditor.FindCoincidentNodes( nodes, Tolerance, aListOfListOfNodes ); + getEditor().FindCoincidentNodes( nodes, Tolerance, aListOfListOfNodes ); GroupsOfNodes = new SMESH::array_of_long_array; GroupsOfNodes->length( aListOfListOfNodes.size() ); @@ -3849,6 +4659,8 @@ void SMESH_MeshEditor_i::FindCoincidentNodesOnPart(SMESH::SMESH_IDSource_ptr TPythonDump() << "coincident_nodes_on_part = " << this << ".FindCoincidentNodesOnPart( " <length( aListOfListOfNodes.size() ); @@ -3898,6 +4711,8 @@ FindCoincidentNodesOnPartBut(SMESH::SMESH_IDSource_ptr theObject, << theObject<<", " << theTolerance << ", " << theExceptSubMeshOrGroups << " )"; + + SMESH_CATCH( SMESH::throwCorbaException ); } //======================================================================= @@ -3906,10 +4721,12 @@ FindCoincidentNodesOnPartBut(SMESH::SMESH_IDSource_ptr theObject, //======================================================================= void SMESH_MeshEditor_i::MergeNodes (const SMESH::array_of_long_array& GroupsOfNodes) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - SMESHDS_Mesh* aMesh = GetMeshDS(); + SMESHDS_Mesh* aMesh = getMeshDS(); TPythonDump aTPythonDump; aTPythonDump << this << ".MergeNodes(["; @@ -3932,60 +4749,56 @@ void SMESH_MeshEditor_i::MergeNodes (const SMESH::array_of_long_array& GroupsOfN if ( i > 0 ) aTPythonDump << ", "; aTPythonDump << aNodeGroup; } - ::SMESH_MeshEditor anEditor( myMesh ); - anEditor.MergeNodes( aListOfListOfNodes ); + getEditor().MergeNodes( aListOfListOfNodes ); aTPythonDump << "])"; - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); + + declareMeshModified( /*isReComputeSafe=*/false ); + + SMESH_CATCH( SMESH::throwCorbaException ); } //======================================================================= //function : FindEqualElements //purpose : //======================================================================= + void SMESH_MeshEditor_i::FindEqualElements(SMESH::SMESH_IDSource_ptr theObject, SMESH::array_of_long_array_out GroupsOfElementsID) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); SMESH::SMESH_GroupBase_var group = SMESH::SMESH_GroupBase::_narrow(theObject); if ( !(!group->_is_nil() && group->GetType() == SMESH::NODE) ) { - typedef list TListOfIDs; - set elems; - SMESH::long_array_var aElementsId = theObject->GetIDs(); - SMESHDS_Mesh* aMesh = GetMeshDS(); - - for(int i = 0; i < aElementsId->length(); i++) { - CORBA::Long anID = aElementsId[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(anID); - if (elem) { - elems.insert(elem); - } - } + TIDSortedElemSet elems; + idSourceToSet( theObject, getMeshDS(), elems, SMDSAbs_All, /*emptyIfIsMesh=*/true); ::SMESH_MeshEditor::TListOfListOfElementsID aListOfListOfElementsID; - ::SMESH_MeshEditor anEditor( myMesh ); - anEditor.FindEqualElements( elems, aListOfListOfElementsID ); + getEditor().FindEqualElements( elems, aListOfListOfElementsID ); GroupsOfElementsID = new SMESH::array_of_long_array; GroupsOfElementsID->length( aListOfListOfElementsID.size() ); - ::SMESH_MeshEditor::TListOfListOfElementsID::iterator arraysIt = aListOfListOfElementsID.begin(); - for (CORBA::Long j = 0; arraysIt != aListOfListOfElementsID.end(); ++arraysIt, ++j) { + ::SMESH_MeshEditor::TListOfListOfElementsID::iterator arraysIt = + aListOfListOfElementsID.begin(); + for (CORBA::Long j = 0; arraysIt != aListOfListOfElementsID.end(); ++arraysIt, ++j) + { SMESH::long_array& aGroup = (*GroupsOfElementsID)[ j ]; - TListOfIDs& listOfIDs = *arraysIt; + list& listOfIDs = *arraysIt; aGroup.length( listOfIDs.size() ); - TListOfIDs::iterator idIt = listOfIDs.begin(); - for (int k = 0; idIt != listOfIDs.end(); ++idIt, ++k ) { + list::iterator idIt = listOfIDs.begin(); + for (int k = 0; idIt != listOfIDs.end(); ++idIt, ++k ) aGroup[ k ] = *idIt; - } } TPythonDump() << "equal_elements = " << this << ".FindEqualElements( " <GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); + getEditor().MergeElements(aListOfListOfElementsID); + + declareMeshModified( /*isReComputeSafe=*/true ); aTPythonDump << "] )"; + + SMESH_CATCH( SMESH::throwCorbaException ); } //======================================================================= @@ -4030,13 +4846,18 @@ void SMESH_MeshEditor_i::MergeElements(const SMESH::array_of_long_array& GroupsO //======================================================================= void SMESH_MeshEditor_i::MergeEqualElements() + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor anEditor( myMesh ); - anEditor.MergeEqualElements(); + getEditor().MergeEqualElements(); + + declareMeshModified( /*isReComputeSafe=*/true ); TPythonDump() << this << ".MergeEqualElements()"; + + SMESH_CATCH( SMESH::throwCorbaException ); } //============================================================================= @@ -4049,20 +4870,22 @@ CORBA::Boolean SMESH_MeshEditor_i::MoveNode(CORBA::Long NodeID, CORBA::Double x, CORBA::Double y, CORBA::Double z) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(/*deleteSearchers=*/false); - const SMDS_MeshNode * node = GetMeshDS()->FindNode( NodeID ); + const SMDS_MeshNode * node = getMeshDS()->FindNode( NodeID ); if ( !node ) return false; if ( theNodeSearcher ) theSearchersDeleter.Set( myMesh ); // remove theNodeSearcher if mesh is other - if ( myPreviewMode ) // make preview data + if ( myIsPreviewMode ) // make preview data { // in a preview mesh, make edges linked to a node - TPreviewMesh tmpMesh; + TPreviewMesh& tmpMesh = *getPreviewMesh(); TIDSortedElemSet linkedNodes; ::SMESH_MeshEditor::GetLinkedNodes( node, linkedNodes ); TIDSortedElemSet::iterator nIt = linkedNodes.begin(); @@ -4076,23 +4899,22 @@ CORBA::Boolean SMESH_MeshEditor_i::MoveNode(CORBA::Long NodeID, if ( nodeCpy1 ) tmpMesh.GetMeshDS()->MoveNode(nodeCpy1, x, y, z); // fill preview data - ::SMESH_MeshEditor anEditor( & tmpMesh ); - storeResult( anEditor ); } else if ( theNodeSearcher ) // move node and update theNodeSearcher data accordingly theNodeSearcher->MoveNode(node, gp_Pnt( x,y,z )); else - GetMeshDS()->MoveNode(node, x, y, z); + getMeshDS()->MoveNode(node, x, y, z); - if ( !myPreviewMode ) + if ( !myIsPreviewMode ) { // Update Python script TPythonDump() << "isDone = " << this << ".MoveNode( " - << NodeID << ", " << x << ", " << y << ", " << z << " )"; - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); + << NodeID << ", " << TVar(x) << ", " << TVar(y) << ", " << TVar(z) << " )"; + declareMeshModified( /*isReComputeSafe=*/false ); } + SMESH_CATCH( SMESH::throwCorbaException ); + return true; } @@ -4105,17 +4927,19 @@ CORBA::Boolean SMESH_MeshEditor_i::MoveNode(CORBA::Long NodeID, CORBA::Long SMESH_MeshEditor_i::FindNodeClosestTo(CORBA::Double x, CORBA::Double y, CORBA::Double z) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; theSearchersDeleter.Set( myMesh ); // remove theNodeSearcher if mesh is other if ( !theNodeSearcher ) { - ::SMESH_MeshEditor anEditor( myMesh ); - theNodeSearcher = anEditor.GetNodeSearcher(); + theNodeSearcher = myEditor.GetNodeSearcher(); } gp_Pnt p( x,y,z ); if ( const SMDS_MeshNode* node = theNodeSearcher->FindClosestTo( p )) return node->GetID(); + SMESH_CATCH( SMESH::throwCorbaException ); return 0; } @@ -4130,7 +4954,9 @@ CORBA::Long SMESH_MeshEditor_i::MoveClosestNodeToPoint(CORBA::Double x, CORBA::Double y, CORBA::Double z, CORBA::Long theNodeID) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; // We keep theNodeSearcher until any mesh modification: // 1) initData() deletes theNodeSearcher at any edition, // 2) TSearchersDeleter - at any mesh compute event and mesh change @@ -4140,22 +4966,21 @@ CORBA::Long SMESH_MeshEditor_i::MoveClosestNodeToPoint(CORBA::Double x, theSearchersDeleter.Set( myMesh ); // remove theNodeSearcher if mesh is other int nodeID = theNodeID; - const SMDS_MeshNode* node = GetMeshDS()->FindNode( nodeID ); + const SMDS_MeshNode* node = getMeshDS()->FindNode( nodeID ); if ( !node ) // preview moving node { if ( !theNodeSearcher ) { - ::SMESH_MeshEditor anEditor( myMesh ); - theNodeSearcher = anEditor.GetNodeSearcher(); + theNodeSearcher = myEditor.GetNodeSearcher(); } gp_Pnt p( x,y,z ); node = theNodeSearcher->FindClosestTo( p ); } if ( node ) { nodeID = node->GetID(); - if ( myPreviewMode ) // make preview data + if ( myIsPreviewMode ) // make preview data { // in a preview mesh, make edges linked to a node - TPreviewMesh tmpMesh; + TPreviewMesh tmpMesh = *getPreviewMesh(); TIDSortedElemSet linkedNodes; ::SMESH_MeshEditor::GetLinkedNodes( node, linkedNodes ); TIDSortedElemSet::iterator nIt = linkedNodes.begin(); @@ -4169,8 +4994,6 @@ CORBA::Long SMESH_MeshEditor_i::MoveClosestNodeToPoint(CORBA::Double x, if ( node ) tmpMesh.GetMeshDS()->MoveNode(node, x, y, z); // fill preview data - ::SMESH_MeshEditor anEditor( & tmpMesh ); - storeResult( anEditor ); } else if ( theNodeSearcher ) // move node and update theNodeSearcher data accordingly { @@ -4178,21 +5001,23 @@ CORBA::Long SMESH_MeshEditor_i::MoveClosestNodeToPoint(CORBA::Double x, } else { - GetMeshDS()->MoveNode(node, x, y, z); + getMeshDS()->MoveNode(node, x, y, z); } } - if ( !myPreviewMode ) + if ( !myIsPreviewMode ) { TPythonDump() << "nodeID = " << this << ".MoveClosestNodeToPoint( "<< x << ", " << y << ", " << z << ", " << nodeID << " )"; - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); + declareMeshModified( /*isReComputeSafe=*/false ); } return nodeID; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -4207,14 +5032,15 @@ SMESH::long_array* SMESH_MeshEditor_i::FindElementsByPoint(CORBA::Double x, CORBA::Double y, CORBA::Double z, SMESH::ElementType type) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; SMESH::long_array_var res = new SMESH::long_array; vector< const SMDS_MeshElement* > foundElems; theSearchersDeleter.Set( myMesh ); if ( !theElementSearcher ) { - ::SMESH_MeshEditor anEditor( myMesh ); - theElementSearcher = anEditor.GetElementSearcher(); + theElementSearcher = myEditor.GetElementSearcher(); } theElementSearcher->FindElementsByPoint( gp_Pnt( x,y,z ), SMDSAbs_ElementType( type ), @@ -4223,14 +5049,86 @@ SMESH::long_array* SMESH_MeshEditor_i::FindElementsByPoint(CORBA::Double x, for ( int i = 0; i < foundElems.size(); ++i ) res[i] = foundElems[i]->GetID(); - if ( !myPreviewMode ) // call from tui - TPythonDump() << res << " = " << this << ".FindElementsByPoint( " + if ( !myIsPreviewMode ) // call from tui + TPythonDump() << "res = " << this << ".FindElementsByPoint( " << x << ", " << y << ", " << z << ", " << type << " )"; return res._retn(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} + +//======================================================================= +//function : FindAmongElementsByPoint +//purpose : Searching among the given elements, return elements of given type +// where the given point is IN or ON. +// 'ALL' type means elements of any type excluding nodes +//======================================================================= + +SMESH::long_array* +SMESH_MeshEditor_i::FindAmongElementsByPoint(SMESH::SMESH_IDSource_ptr elementIDs, + CORBA::Double x, + CORBA::Double y, + CORBA::Double z, + SMESH::ElementType type) + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + SMESH::long_array_var res = new SMESH::long_array; + + SMESH::array_of_ElementType_var types = elementIDs->GetTypes(); + if ( types->length() == 1 && // a part contains only nodes or 0D elements + ( types[0] == SMESH::NODE || types[0] == SMESH::ELEM0D || types[0] == SMESH::BALL) && + type != types[0] ) // but search of elements of dim > 0 + return res._retn(); + + if ( SMESH::DownCast( elementIDs )) // elementIDs is the whole mesh + return FindElementsByPoint( x,y,z, type ); + + TIDSortedElemSet elements; // elems should live until FindElementsByPoint() finishes + + theSearchersDeleter.Set( myMesh, getPartIOR( elementIDs, type )); + if ( !theElementSearcher ) + { + // create a searcher from elementIDs + SMESH::SMESH_Mesh_var mesh = elementIDs->GetMesh(); + SMESHDS_Mesh* meshDS = SMESH::DownCast( mesh )->GetImpl().GetMeshDS(); + + if ( !idSourceToSet( elementIDs, meshDS, elements, + SMDSAbs_ElementType(type), /*emptyIfIsMesh=*/true)) + return res._retn(); + + typedef SMDS_SetIterator TIter; + SMDS_ElemIteratorPtr elemsIt( new TIter( elements.begin(), elements.end() )); + + theElementSearcher = myEditor.GetElementSearcher(elemsIt); + } + + vector< const SMDS_MeshElement* > foundElems; + + theElementSearcher->FindElementsByPoint( gp_Pnt( x,y,z ), + SMDSAbs_ElementType( type ), + foundElems); + res->length( foundElems.size() ); + for ( int i = 0; i < foundElems.size(); ++i ) + res[i] = foundElems[i]->GetID(); + + if ( !myIsPreviewMode ) // call from tui + TPythonDump() << "res = " << this << ".FindAmongElementsByPoint( " + << elementIDs << ", " + << x << ", " + << y << ", " + << z << ", " + << type << " )"; + + return res._retn(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -4242,13 +5140,17 @@ SMESH::long_array* SMESH_MeshEditor_i::FindElementsByPoint(CORBA::Double x, CORBA::Short SMESH_MeshEditor_i::GetPointState(CORBA::Double x, CORBA::Double y, CORBA::Double z) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; theSearchersDeleter.Set( myMesh ); if ( !theElementSearcher ) { - ::SMESH_MeshEditor anEditor( myMesh ); - theElementSearcher = anEditor.GetElementSearcher(); + theElementSearcher = myEditor.GetElementSearcher(); } return CORBA::Short( theElementSearcher->GetPointState( gp_Pnt( x,y,z ))); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //======================================================================= @@ -4289,10 +5191,12 @@ SMESH_MeshEditor_i::SewFreeBorders(CORBA::Long FirstNodeID1, CORBA::Long LastNodeID2, CORBA::Boolean CreatePolygons, CORBA::Boolean CreatePolyedrs) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - SMESHDS_Mesh* aMesh = GetMeshDS(); + SMESHDS_Mesh* aMesh = getMeshDS(); const SMDS_MeshNode* aBorderFirstNode = aMesh->FindNode( FirstNodeID1 ); const SMDS_MeshNode* aBorderSecondNode = aMesh->FindNode( SecondNodeID1 ); @@ -4320,9 +5224,8 @@ SMESH_MeshEditor_i::SewFreeBorders(CORBA::Long FirstNodeID1, << CreatePolygons<< ", " << CreatePolyedrs<< " )"; - ::SMESH_MeshEditor anEditor( myMesh ); SMESH::SMESH_MeshEditor::Sew_Error error = - convError( anEditor.SewFreeBorder (aBorderFirstNode, + convError( getEditor().SewFreeBorder (aBorderFirstNode, aBorderSecondNode, aBorderLastNode, aSide2FirstNode, @@ -4332,12 +5235,12 @@ SMESH_MeshEditor_i::SewFreeBorders(CORBA::Long FirstNodeID1, CreatePolygons, CreatePolyedrs) ); - storeResult(anEditor); - - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); + declareMeshModified( /*isReComputeSafe=*/false ); return error; + + SMESH_CATCH( SMESH::throwCorbaException ); + return SMESH::SMESH_MeshEditor::Sew_Error(0); } @@ -4352,10 +5255,12 @@ SMESH_MeshEditor_i::SewConformFreeBorders(CORBA::Long FirstNodeID1, CORBA::Long LastNodeID1, CORBA::Long FirstNodeID2, CORBA::Long SecondNodeID2) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - SMESHDS_Mesh* aMesh = GetMeshDS(); + SMESHDS_Mesh* aMesh = getMeshDS(); const SMDS_MeshNode* aBorderFirstNode = aMesh->FindNode( FirstNodeID1 ); const SMDS_MeshNode* aBorderSecondNode = aMesh->FindNode( SecondNodeID1 ); @@ -4379,9 +5284,8 @@ SMESH_MeshEditor_i::SewConformFreeBorders(CORBA::Long FirstNodeID1, << FirstNodeID2 << ", " << SecondNodeID2 << " )"; - ::SMESH_MeshEditor anEditor( myMesh ); SMESH::SMESH_MeshEditor::Sew_Error error = - convError( anEditor.SewFreeBorder (aBorderFirstNode, + convError( getEditor().SewFreeBorder (aBorderFirstNode, aBorderSecondNode, aBorderLastNode, aSide2FirstNode, @@ -4390,12 +5294,11 @@ SMESH_MeshEditor_i::SewConformFreeBorders(CORBA::Long FirstNodeID1, true, false, false) ); - storeResult(anEditor); - - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); - + declareMeshModified( /*isReComputeSafe=*/false ); return error; + + SMESH_CATCH( SMESH::throwCorbaException ); + return SMESH::SMESH_MeshEditor::Sew_Error(0); } @@ -4412,10 +5315,12 @@ SMESH_MeshEditor_i::SewBorderToSide(CORBA::Long FirstNodeIDOnFreeBorder, CORBA::Long LastNodeIDOnSide, CORBA::Boolean CreatePolygons, CORBA::Boolean CreatePolyedrs) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - SMESHDS_Mesh* aMesh = GetMeshDS(); + SMESHDS_Mesh* aMesh = getMeshDS(); const SMDS_MeshNode* aBorderFirstNode = aMesh->FindNode( FirstNodeIDOnFreeBorder ); const SMDS_MeshNode* aBorderSecondNode = aMesh->FindNode( SecondNodeIDOnFreeBorder ); @@ -4441,9 +5346,8 @@ SMESH_MeshEditor_i::SewBorderToSide(CORBA::Long FirstNodeIDOnFreeBorder, << CreatePolygons << ", " << CreatePolyedrs << ") "; - ::SMESH_MeshEditor anEditor( myMesh ); SMESH::SMESH_MeshEditor::Sew_Error error = - convError( anEditor.SewFreeBorder (aBorderFirstNode, + convError( getEditor().SewFreeBorder (aBorderFirstNode, aBorderSecondNode, aBorderLastNode, aSide2FirstNode, @@ -4453,12 +5357,11 @@ SMESH_MeshEditor_i::SewBorderToSide(CORBA::Long FirstNodeIDOnFreeBorder, CreatePolygons, CreatePolyedrs) ); - storeResult(anEditor); - - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); - + declareMeshModified( /*isReComputeSafe=*/false ); return error; + + SMESH_CATCH( SMESH::throwCorbaException ); + return SMESH::SMESH_MeshEditor::Sew_Error(0); } @@ -4474,10 +5377,12 @@ SMESH_MeshEditor_i::SewSideElements(const SMESH::long_array& IDsOfSide1Elements, CORBA::Long NodeID1OfSide2ToMerge, CORBA::Long NodeID2OfSide1ToMerge, CORBA::Long NodeID2OfSide2ToMerge) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - SMESHDS_Mesh* aMesh = GetMeshDS(); + SMESHDS_Mesh* aMesh = getMeshDS(); const SMDS_MeshNode* aFirstNode1ToMerge = aMesh->FindNode( NodeID1OfSide1ToMerge ); const SMDS_MeshNode* aFirstNode2ToMerge = aMesh->FindNode( NodeID1OfSide2ToMerge ); @@ -4503,20 +5408,18 @@ SMESH_MeshEditor_i::SewSideElements(const SMESH::long_array& IDsOfSide1Elements, << NodeID2OfSide1ToMerge << ", " << NodeID2OfSide2ToMerge << ")"; - ::SMESH_MeshEditor anEditor( myMesh ); SMESH::SMESH_MeshEditor::Sew_Error error = - convError( anEditor.SewSideElements (aSide1Elems, aSide2Elems, + convError( getEditor().SewSideElements (aSide1Elems, aSide2Elems, aFirstNode1ToMerge, aFirstNode2ToMerge, aSecondNode1ToMerge, aSecondNode2ToMerge)); - storeResult(anEditor); - - myMesh->GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); - + declareMeshModified( /*isReComputeSafe=*/false ); return error; + + SMESH_CATCH( SMESH::throwCorbaException ); + return SMESH::SMESH_MeshEditor::Sew_Error(0); } //================================================================================ @@ -4530,10 +5433,12 @@ SMESH_MeshEditor_i::SewSideElements(const SMESH::long_array& IDsOfSide1Elements, CORBA::Boolean SMESH_MeshEditor_i::ChangeElemNodes(CORBA::Long ide, const SMESH::long_array& newIDs) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - const SMDS_MeshElement* elem = GetMeshDS()->FindElement(ide); + const SMDS_MeshElement* elem = getMeshDS()->FindElement(ide); if(!elem) return false; int nbn = newIDs.length(); @@ -4541,7 +5446,7 @@ CORBA::Boolean SMESH_MeshEditor_i::ChangeElemNodes(CORBA::Long ide, vector aNodes(nbn); int nbn1=-1; for(; iFindNode(newIDs[i]); + const SMDS_MeshNode* aNode = getMeshDS()->FindNode(newIDs[i]); if(aNode) { nbn1++; aNodes[nbn1] = aNode; @@ -4551,178 +5456,133 @@ CORBA::Boolean SMESH_MeshEditor_i::ChangeElemNodes(CORBA::Long ide, << ide << ", " << newIDs << " )"; MESSAGE("ChangeElementNodes"); - bool res = GetMeshDS()->ChangeElementNodes( elem, & aNodes[0], nbn1+1 ); + bool res = getMeshDS()->ChangeElementNodes( elem, & aNodes[0], nbn1+1 ); - myMesh->GetMeshDS()->Modified(); - if ( res ) - myMesh->SetIsModified( true ); + declareMeshModified( /*isReComputeSafe=*/ !res ); return res; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } -//================================================================================ +//======================================================================= /*! - * \brief Update myLastCreated* or myPreviewData - * \param anEditor - it contains last modification results + * \brief Makes a part of the mesh quadratic or bi-quadratic */ -//================================================================================ +//======================================================================= -void SMESH_MeshEditor_i::storeResult(::SMESH_MeshEditor& anEditor) +void SMESH_MeshEditor_i::convertToQuadratic(CORBA::Boolean theForce3d, + CORBA::Boolean theToBiQuad, + SMESH::SMESH_IDSource_ptr theObject) + throw (SALOME::SALOME_Exception) { - if ( myPreviewMode ) { // --- MeshPreviewStruct filling --- - - list aNodesConnectivity; - typedef map TNodesMap; - TNodesMap nodesMap; - - TPreviewMesh * aPreviewMesh = dynamic_cast< TPreviewMesh* >( anEditor.GetMesh() ); - SMDSAbs_ElementType previewType = aPreviewMesh->myPreviewType; - - SMESHDS_Mesh* aMeshDS = anEditor.GetMeshDS(); - int nbEdges = aMeshDS->NbEdges(); - int nbFaces = aMeshDS->NbFaces(); - int nbVolum = aMeshDS->NbVolumes(); - switch ( previewType ) { - case SMDSAbs_Edge : nbFaces = nbVolum = 0; break; - case SMDSAbs_Face : nbEdges = nbVolum = 0; break; - case SMDSAbs_Volume: nbEdges = nbFaces = 0; break; - default:; - } - myPreviewData->nodesXYZ.length(aMeshDS->NbNodes()); - myPreviewData->elementTypes.length(nbEdges + nbFaces + nbVolum); - int i = 0, j = 0; - SMDS_ElemIteratorPtr itMeshElems = aMeshDS->elementsIterator(); - - while ( itMeshElems->more() ) { - const SMDS_MeshElement* aMeshElem = itMeshElems->next(); - if ( previewType != SMDSAbs_All && aMeshElem->GetType() != previewType ) - continue; + SMESH_TRY; + TIDSortedElemSet elems; + bool elemsOK; + if ( !( elemsOK = CORBA::is_nil( theObject ))) + elemsOK = idSourceToSet( theObject, getMeshDS(), elems, + SMDSAbs_All, /*emptyIfIsMesh=*/true ); + if ( elemsOK ) + { + if ( !elems.empty() && (*elems.begin())->GetType() == SMDSAbs_Node ) + THROW_SALOME_CORBA_EXCEPTION("Group of nodes is not allowed", SALOME::BAD_PARAM); - SMDS_ElemIteratorPtr itElemNodes = aMeshElem->nodesIterator(); - while ( itElemNodes->more() ) { - const SMDS_MeshNode* aMeshNode = - static_cast( itElemNodes->next() ); - int aNodeID = aMeshNode->GetID(); - TNodesMap::iterator anIter = nodesMap.find(aNodeID); - if ( anIter == nodesMap.end() ) { - // filling the nodes coordinates - myPreviewData->nodesXYZ[j].x = aMeshNode->X(); - myPreviewData->nodesXYZ[j].y = aMeshNode->Y(); - myPreviewData->nodesXYZ[j].z = aMeshNode->Z(); - anIter = nodesMap.insert( make_pair(aNodeID, j) ).first; - j++; - } - aNodesConnectivity.push_back(anIter->second); - } + if ( elems.empty() ) getEditor().ConvertToQuadratic(theForce3d, theToBiQuad); + else getEditor().ConvertToQuadratic(theForce3d, elems, theToBiQuad); - // filling the elements types - SMDSAbs_ElementType aType; - bool isPoly; - /*if (aMeshElem->GetType() == SMDSAbs_Volume) { - aType = SMDSAbs_Node; - isPoly = false; - } - else*/ { - aType = aMeshElem->GetType(); - isPoly = aMeshElem->IsPoly(); - } + declareMeshModified( /*isReComputeSafe=*/false ); + } - myPreviewData->elementTypes[i].SMDS_ElementType = (SMESH::ElementType) aType; - myPreviewData->elementTypes[i].isPoly = isPoly; - myPreviewData->elementTypes[i].nbNodesInElement = aMeshElem->NbNodes(); - i++; + SMESH_CATCH( SMESH::throwCorbaException ); +} - } - myPreviewData->nodesXYZ.length( j ); +//======================================================================= +//function : ConvertFromQuadratic +//purpose : +//======================================================================= - // filling the elements connectivities - list::iterator aConnIter = aNodesConnectivity.begin(); - myPreviewData->elementConnectivities.length(aNodesConnectivity.size()); - for( int i = 0; aConnIter != aNodesConnectivity.end(); aConnIter++, i++ ) - myPreviewData->elementConnectivities[i] = *aConnIter; +CORBA::Boolean SMESH_MeshEditor_i::ConvertFromQuadratic() + throw (SALOME::SALOME_Exception) +{ + CORBA::Boolean isDone = getEditor().ConvertFromQuadratic(); + TPythonDump() << this << ".ConvertFromQuadratic()"; + declareMeshModified( /*isReComputeSafe=*/!isDone ); + return isDone; +} - return; - } +//======================================================================= +//function : ConvertToQuadratic +//purpose : +//======================================================================= - { - // add new nodes into myLastCreatedNodes - const SMESH_SequenceOfElemPtr& aSeq = anEditor.GetLastCreatedNodes(); - myLastCreatedNodes->length(aSeq.Length()); - for(int i=0; iGetID(); - } - { - // add new elements into myLastCreatedElems - const SMESH_SequenceOfElemPtr& aSeq = anEditor.GetLastCreatedElems(); - myLastCreatedElems->length(aSeq.Length()); - for(int i=0; iGetID(); - } +void SMESH_MeshEditor_i::ConvertToQuadratic(CORBA::Boolean theForce3d) + throw (SALOME::SALOME_Exception) +{ + convertToQuadratic( theForce3d, false ); + TPythonDump() << this << ".ConvertToQuadratic("<GetMeshDS()->Modified(); - myMesh->SetIsModified( true ); -} + SMESH_TRY; + TPythonDump pyDump; + TIDSortedElemSet elems; + if ( idSourceToSet( theObject, getMeshDS(), elems, SMDSAbs_All, /*emptyIfIsMesh=*/true )) + { + if ( elems.empty() ) + { + ConvertFromQuadratic(); + } + else if ( (*elems.begin())->GetType() == SMDSAbs_Node ) + { + THROW_SALOME_CORBA_EXCEPTION("Group of nodes is not allowed", SALOME::BAD_PARAM); + } + else + { + getEditor().ConvertFromQuadratic(elems); + } + } + declareMeshModified( /*isReComputeSafe=*/false ); -//======================================================================= -//function : ConvertFromQuadratic -//purpose : -//======================================================================= + pyDump << this << ".ConvertFromQuadraticObject( "<GetMeshDS()->Modified(); - if ( isDone ) - myMesh->SetIsModified( true ); - return isDone; + SMESH_CATCH( SMESH::throwCorbaException ); } //======================================================================= @@ -4732,10 +5592,10 @@ CORBA::Boolean SMESH_MeshEditor_i::ConvertFromQuadratic() SMESH::SMESH_Mesh_ptr SMESH_MeshEditor_i::makeMesh(const char* theMeshName) { - SMESH_Gen_i* gen = SMESH_Gen_i::GetSMESHGen(); - SMESH::SMESH_Mesh_var mesh = gen->CreateEmptyMesh(); - SALOMEDS::Study_var study = gen->GetCurrentStudy(); - SALOMEDS::SObject_var meshSO = gen->ObjectToSObject( study, mesh ); + SMESH_Gen_i* gen = SMESH_Gen_i::GetSMESHGen(); + SMESH::SMESH_Mesh_var mesh = gen->CreateEmptyMesh(); + SALOMEDS::Study_var study = gen->GetCurrentStudy(); + SALOMEDS::SObject_wrap meshSO = gen->ObjectToSObject( study, mesh ); gen->SetName( meshSO, theMeshName, "Mesh" ); gen->SetPixMap( meshSO, "ICON_SMESH_TREE_MESH_IMPORTED"); @@ -4743,16 +5603,16 @@ SMESH::SMESH_Mesh_ptr SMESH_MeshEditor_i::makeMesh(const char* theMeshName) } //======================================================================= -//function : DumpGroupsList +//function : dumpGroupsList //purpose : //======================================================================= -void SMESH_MeshEditor_i::DumpGroupsList(TPythonDump & theDumpPython, + +void SMESH_MeshEditor_i::dumpGroupsList(TPythonDump & theDumpPython, const SMESH::ListOfGroups * theGroupList) { - bool isDumpGroupList = theGroupList && theGroupList->length() > 0; - if(isDumpGroupList) { + bool isDumpGroupList = ( theGroupList && theGroupList->length() > 0 ); + if ( isDumpGroupList ) theDumpPython << theGroupList << " = "; - } } //================================================================================ @@ -4762,6 +5622,7 @@ void SMESH_MeshEditor_i::DumpGroupsList(TPythonDump & theDumpPytho \return unique name */ //================================================================================ + string SMESH_MeshEditor_i::generateGroupName(const string& thePrefix) { SMESH::ListOfGroups_var groups = myMesh_i->GetGroups(); @@ -4773,24 +5634,16 @@ string SMESH_MeshEditor_i::generateGroupName(const string& thePrefix) if (CORBA::is_nil(aGroup)) continue; - groupNames.insert(aGroup->GetName()); + CORBA::String_var name = aGroup->GetName(); + groupNames.insert( name.in() ); } // Find new name string name = thePrefix; int index = 0; - while (!groupNames.insert(name).second) { - if (index == 0) { - name += "_1"; - } - else { - TCollection_AsciiString nbStr(index+1); - name.resize( name.rfind('_')+1 ); - name += nbStr.ToCString(); - } - ++index; - } + while (!groupNames.insert(name).second) + name = SMESH_Comment( thePrefix ) << "_" << index; return name; } @@ -4809,10 +5662,11 @@ string SMESH_MeshEditor_i::generateGroupName(const string& thePrefix) CORBA::Boolean SMESH_MeshEditor_i::DoubleNodes( const SMESH::long_array& theNodes, const SMESH::long_array& theModifiedElems ) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor aMeshEditor( myMesh ); list< int > aListOfNodes; int i, n; for ( i = 0, n = theNodes.length(); i < n; i++ ) @@ -4822,17 +5676,17 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodes( const SMESH::long_array& theNode for ( i = 0, n = theModifiedElems.length(); i < n; i++ ) aListOfElems.push_back( theModifiedElems[ i ] ); - bool aResult = aMeshEditor.DoubleNodes( aListOfNodes, aListOfElems ); + bool aResult = getEditor().DoubleNodes( aListOfNodes, aListOfElems ); - myMesh->GetMeshDS()->Modified(); - storeResult( aMeshEditor) ; - if ( aResult ) - myMesh->SetIsModified( true ); + declareMeshModified( /*isReComputeSafe=*/ !aResult ); // Update Python script TPythonDump() << this << ".DoubleNodes( " << theNodes << ", "<< theModifiedElems << " )"; return aResult; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ @@ -4848,7 +5702,9 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodes( const SMESH::long_array& theNode CORBA::Boolean SMESH_MeshEditor_i::DoubleNode( CORBA::Long theNodeId, const SMESH::long_array& theModifiedElems ) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; SMESH::long_array_var aNodes = new SMESH::long_array; aNodes->length( 1 ); aNodes[ 0 ] = theNodeId; @@ -4860,6 +5716,9 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNode( CORBA::Long theNodeI pyDump << this << ".DoubleNode( " << theNodeId << ", " << theModifiedElems << " )"; return done; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ @@ -4875,7 +5734,9 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNode( CORBA::Long theNodeI CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeGroup(SMESH::SMESH_GroupBase_ptr theNodes, SMESH::SMESH_GroupBase_ptr theModifiedElems ) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; if ( CORBA::is_nil( theNodes ) && theNodes->GetType() != SMESH::NODE ) return false; @@ -4896,8 +5757,12 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeGroup(SMESH::SMESH_GroupBase_ptr th pyDump << this << ".DoubleNodeGroup( " << theNodes << ", " << theModifiedElems << " )"; return done; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } +//================================================================================ /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements. * Works as DoubleNodeGroup(), but returns a new group with newly created nodes. @@ -4906,14 +5771,19 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeGroup(SMESH::SMESH_GroupBase_ptr th * \return a new group with newly created nodes * \sa DoubleNodeGroup() */ -SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeGroupNew( SMESH::SMESH_GroupBase_ptr theNodes, - SMESH::SMESH_GroupBase_ptr theModifiedElems ) -{ - if ( CORBA::is_nil( theNodes ) && theNodes->GetType() != SMESH::NODE ) - return false; +//================================================================================ +SMESH::SMESH_Group_ptr +SMESH_MeshEditor_i::DoubleNodeGroupNew( SMESH::SMESH_GroupBase_ptr theNodes, + SMESH::SMESH_GroupBase_ptr theModifiedElems ) + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; SMESH::SMESH_Group_var aNewGroup; + if ( CORBA::is_nil( theNodes ) && theNodes->GetType() != SMESH::NODE ) + return aNewGroup._retn(); + // Duplicate nodes SMESH::long_array_var aNodes = theNodes->GetListOfID(); SMESH::long_array_var aModifiedElems; @@ -4927,7 +5797,6 @@ SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeGroupNew( SMESH::SMESH_Grou TPythonDump pyDump; // suppress dump by the next line bool aResult = DoubleNodes( aNodes, aModifiedElems ); - if ( aResult ) { // Create group with newly created nodes @@ -4937,13 +5806,17 @@ SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeGroupNew( SMESH::SMESH_Grou string aNewName = generateGroupName(anUnindexedName + "_double"); aNewGroup = myMesh_i->CreateGroup(SMESH::NODE, aNewName.c_str()); aNewGroup->Add(anIds); + pyDump << aNewGroup << " = "; } } - pyDump << "createdNodes = " << this << ".DoubleNodeGroupNew( " << theNodes << ", " - << theModifiedElems << " )"; + pyDump << this << ".DoubleNodeGroupNew( " << theNodes << ", " + << theModifiedElems << " )"; return aNewGroup._retn(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ @@ -4959,11 +5832,11 @@ SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeGroupNew( SMESH::SMESH_Grou CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeGroups(const SMESH::ListOfGroups& theNodes, const SMESH::ListOfGroups& theModifiedElems ) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor aMeshEditor( myMesh ); - std::list< int > aNodes; int i, n, j, m; for ( i = 0, n = theNodes.length(); i < n; i++ ) @@ -4989,18 +5862,16 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeGroups(const SMESH::ListOfGroups& t } } - bool aResult = aMeshEditor.DoubleNodes( aNodes, anElems ); - - storeResult( aMeshEditor) ; - - myMesh->GetMeshDS()->Modified(); - if ( aResult ) - myMesh->SetIsModified( true ); + bool aResult = getEditor().DoubleNodes( aNodes, anElems ); + declareMeshModified( /*isReComputeSafe=*/false ); TPythonDump() << this << ".DoubleNodeGroups( " << theNodes << ", " << theModifiedElems << " )"; return aResult; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ @@ -5014,8 +5885,10 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeGroups(const SMESH::ListOfGroups& t */ //================================================================================ -SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeGroupsNew( const SMESH::ListOfGroups& theNodes, - const SMESH::ListOfGroups& theModifiedElems ) +SMESH::SMESH_Group_ptr +SMESH_MeshEditor_i::DoubleNodeGroupsNew( const SMESH::ListOfGroups& theNodes, + const SMESH::ListOfGroups& theModifiedElems ) + throw (SALOME::SALOME_Exception) { SMESH::SMESH_Group_var aNewGroup; @@ -5032,11 +5905,12 @@ SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeGroupsNew( const SMESH::Lis string aNewName = generateGroupName(anUnindexedName + "_double"); aNewGroup = myMesh_i->CreateGroup(SMESH::NODE, aNewName.c_str()); aNewGroup->Add(anIds); + pyDump << aNewGroup << " = "; } } - pyDump << "createdNodes = " << this << ".DoubleNodeGroupsNew( " << theNodes << ", " - << theModifiedElems << " )"; + pyDump << this << ".DoubleNodeGroupsNew( " << theNodes << ", " + << theModifiedElems << " )"; return aNewGroup._retn(); } @@ -5058,30 +5932,28 @@ SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeGroupsNew( const SMESH::Lis CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElem( const SMESH::long_array& theElems, const SMESH::long_array& theNodesNot, const SMESH::long_array& theAffectedElems ) - + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor aMeshEditor( myMesh ); - - SMESHDS_Mesh* aMeshDS = GetMeshDS(); + SMESHDS_Mesh* aMeshDS = getMeshDS(); TIDSortedElemSet anElems, aNodes, anAffected; arrayToSet(theElems, aMeshDS, anElems, SMDSAbs_All); arrayToSet(theNodesNot, aMeshDS, aNodes, SMDSAbs_Node); arrayToSet(theAffectedElems, aMeshDS, anAffected, SMDSAbs_All); - bool aResult = aMeshEditor.DoubleNodes( anElems, aNodes, anAffected ); - - storeResult( aMeshEditor) ; - - myMesh->GetMeshDS()->Modified(); - if ( aResult ) - myMesh->SetIsModified( true ); + bool aResult = getEditor().DoubleNodes( anElems, aNodes, anAffected ); // Update Python script TPythonDump() << this << ".DoubleNodeElem( " << theElems << ", " << theNodesNot << ", " << theAffectedElems << " )"; + + declareMeshModified( /*isReComputeSafe=*/false ); return aResult; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ @@ -5101,30 +5973,29 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElem( const SMESH::long_array& theE CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemInRegion ( const SMESH::long_array& theElems, const SMESH::long_array& theNodesNot, GEOM::GEOM_Object_ptr theShape ) - + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor aMeshEditor( myMesh ); - SMESHDS_Mesh* aMeshDS = GetMeshDS(); + SMESHDS_Mesh* aMeshDS = getMeshDS(); TIDSortedElemSet anElems, aNodes; arrayToSet(theElems, aMeshDS, anElems, SMDSAbs_All); arrayToSet(theNodesNot, aMeshDS, aNodes, SMDSAbs_Node); TopoDS_Shape aShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theShape ); - bool aResult = aMeshEditor.DoubleNodesInRegion( anElems, aNodes, aShape ); - - storeResult( aMeshEditor) ; - - myMesh->GetMeshDS()->Modified(); - if ( aResult ) - myMesh->SetIsModified( true ); + bool aResult = getEditor().DoubleNodesInRegion( anElems, aNodes, aShape ); // Update Python script TPythonDump() << "isDone = " << this << ".DoubleNodeElemInRegion( " << theElems << ", " << theNodesNot << ", " << theShape << " )"; + + declareMeshModified( /*isReComputeSafe=*/false ); return aResult; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ @@ -5139,37 +6010,39 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemInRegion ( const SMESH::long_ar */ //================================================================================ -CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemGroup(SMESH::SMESH_GroupBase_ptr theElems, - SMESH::SMESH_GroupBase_ptr theNodesNot, - SMESH::SMESH_GroupBase_ptr theAffectedElems) +CORBA::Boolean +SMESH_MeshEditor_i::DoubleNodeElemGroup(SMESH::SMESH_GroupBase_ptr theElems, + SMESH::SMESH_GroupBase_ptr theNodesNot, + SMESH::SMESH_GroupBase_ptr theAffectedElems) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; if ( CORBA::is_nil( theElems ) && theElems->GetType() == SMESH::NODE ) return false; initData(); - ::SMESH_MeshEditor aMeshEditor( myMesh ); - SMESHDS_Mesh* aMeshDS = GetMeshDS(); + SMESHDS_Mesh* aMeshDS = getMeshDS(); TIDSortedElemSet anElems, aNodes, anAffected; idSourceToSet( theElems, aMeshDS, anElems, SMDSAbs_All ); idSourceToSet( theNodesNot, aMeshDS, aNodes, SMDSAbs_Node ); idSourceToSet( theAffectedElems, aMeshDS, anAffected, SMDSAbs_All ); - bool aResult = aMeshEditor.DoubleNodes( anElems, aNodes, anAffected ); - - storeResult( aMeshEditor) ; - - myMesh->GetMeshDS()->Modified(); - if ( aResult ) - myMesh->SetIsModified( true ); + bool aResult = getEditor().DoubleNodes( anElems, aNodes, anAffected ); // Update Python script TPythonDump() << "isDone = " << this << ".DoubleNodeElemGroup( " << theElems << ", " << theNodesNot << ", " << theAffectedElems << " )"; + + declareMeshModified( /*isReComputeSafe=*/false ); return aResult; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } +//================================================================================ /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements * Works as DoubleNodeElemGroup(), but returns a new group with newly created elements. @@ -5180,48 +6053,115 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemGroup(SMESH::SMESH_GroupBase_pt * \return a new group with newly created elements * \sa DoubleNodeElemGroup() */ -SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeElemGroupNew(SMESH::SMESH_GroupBase_ptr theElems, - SMESH::SMESH_GroupBase_ptr theNodesNot, - SMESH::SMESH_GroupBase_ptr theAffectedElems) +//================================================================================ + +SMESH::SMESH_Group_ptr +SMESH_MeshEditor_i::DoubleNodeElemGroupNew(SMESH::SMESH_GroupBase_ptr theElems, + SMESH::SMESH_GroupBase_ptr theNodesNot, + SMESH::SMESH_GroupBase_ptr theAffectedElems) + throw (SALOME::SALOME_Exception) { - if ( CORBA::is_nil( theElems ) && theElems->GetType() == SMESH::NODE ) - return false; + TPythonDump pyDump; + SMESH::ListOfGroups_var twoGroups = DoubleNodeElemGroup2New( theElems, + theNodesNot, + theAffectedElems, + true, false ); + SMESH::SMESH_GroupBase_var baseGroup = twoGroups[0].in(); + SMESH::SMESH_Group_var elemGroup = SMESH::SMESH_Group::_narrow( baseGroup ); - SMESH::SMESH_Group_var aNewGroup; + pyDump << elemGroup << " = " << this << ".DoubleNodeElemGroupNew( " + << theElems << ", " + << theNodesNot << ", " + << theAffectedElems << " )"; + + return elemGroup._retn(); +} + +//================================================================================ +/*! + * \brief Creates a hole in a mesh by doubling the nodes of some particular elements + * Works as DoubleNodeElemGroup(), but returns a new group with newly created elements. + * \param theElems - group of of elements (edges or faces) to be replicated + * \param theNodesNot - group of nodes not to replicated + * \param theAffectedElems - group of elements to which the replicated nodes + * should be associated to. + * \return a new group with newly created elements + * \sa DoubleNodeElemGroup() + */ +//================================================================================ + +SMESH::ListOfGroups* +SMESH_MeshEditor_i::DoubleNodeElemGroup2New(SMESH::SMESH_GroupBase_ptr theElems, + SMESH::SMESH_GroupBase_ptr theNodesNot, + SMESH::SMESH_GroupBase_ptr theAffectedElems, + CORBA::Boolean theElemGroupNeeded, + CORBA::Boolean theNodeGroupNeeded) + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + SMESH::SMESH_Group_var aNewElemGroup, aNewNodeGroup; + SMESH::ListOfGroups_var aTwoGroups = new SMESH::ListOfGroups(); + aTwoGroups->length( 2 ); + + if ( CORBA::is_nil( theElems ) && theElems->GetType() == SMESH::NODE ) + return aTwoGroups._retn(); initData(); - ::SMESH_MeshEditor aMeshEditor( myMesh ); - SMESHDS_Mesh* aMeshDS = GetMeshDS(); + SMESHDS_Mesh* aMeshDS = getMeshDS(); TIDSortedElemSet anElems, aNodes, anAffected; idSourceToSet( theElems, aMeshDS, anElems, SMDSAbs_All ); idSourceToSet( theNodesNot, aMeshDS, aNodes, SMDSAbs_Node ); idSourceToSet( theAffectedElems, aMeshDS, anAffected, SMDSAbs_All ); - bool aResult = aMeshEditor.DoubleNodes( anElems, aNodes, anAffected ); + bool aResult = getEditor().DoubleNodes( anElems, aNodes, anAffected ); - storeResult( aMeshEditor) ; + declareMeshModified( /*isReComputeSafe=*/ !aResult ); - if ( aResult ) { - myMesh->SetIsModified( true ); + TPythonDump pyDump; + if ( aResult ) + { // Create group with newly created elements - SMESH::long_array_var anIds = GetLastCreatedElems(); - if (anIds->length() > 0) { + CORBA::String_var elemGroupName = theElems->GetName(); + string aNewName = generateGroupName( string(elemGroupName.in()) + "_double"); + if ( !getEditor().GetLastCreatedElems().IsEmpty() && theElemGroupNeeded ) + { + SMESH::long_array_var anIds = GetLastCreatedElems(); SMESH::ElementType aGroupType = myMesh_i->GetElementType(anIds[0], true); - string anUnindexedName (theElems->GetName()); - string aNewName = generateGroupName(anUnindexedName + "_double"); - aNewGroup = myMesh_i->CreateGroup(aGroupType, aNewName.c_str()); - aNewGroup->Add(anIds); + aNewElemGroup = myMesh_i->CreateGroup(aGroupType, aNewName.c_str()); + aNewElemGroup->Add(anIds); + } + if ( !getEditor().GetLastCreatedNodes().IsEmpty() && theNodeGroupNeeded ) + { + SMESH::long_array_var anIds = GetLastCreatedNodes(); + aNewNodeGroup = myMesh_i->CreateGroup(SMESH::NODE, aNewName.c_str()); + aNewNodeGroup->Add(anIds); } } // Update Python script - TPythonDump() << "createdElems = " << this << ".DoubleNodeElemGroupNew( " << theElems << ", " - << theNodesNot << ", " << theAffectedElems << " )"; - return aNewGroup._retn(); + + pyDump << "[ "; + if ( aNewElemGroup->_is_nil() ) pyDump << "nothing, "; + else pyDump << aNewElemGroup << ", "; + if ( aNewNodeGroup->_is_nil() ) pyDump << "nothing ] = "; + else pyDump << aNewNodeGroup << " ] = "; + + pyDump << this << ".DoubleNodeElemGroup2New( " << theElems << ", " + << theNodesNot << ", " + << theAffectedElems << ", " + << theElemGroupNeeded << ", " + << theNodeGroupNeeded <<" )"; + + aTwoGroups[0] = aNewElemGroup._retn(); + aTwoGroups[1] = aNewNodeGroup._retn(); + return aTwoGroups._retn(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ @@ -5237,49 +6177,47 @@ SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeElemGroupNew(SMESH::SMESH_G */ //================================================================================ -CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemGroupInRegion(SMESH::SMESH_GroupBase_ptr theElems, - SMESH::SMESH_GroupBase_ptr theNodesNot, - GEOM::GEOM_Object_ptr theShape ) - +CORBA::Boolean +SMESH_MeshEditor_i::DoubleNodeElemGroupInRegion(SMESH::SMESH_GroupBase_ptr theElems, + SMESH::SMESH_GroupBase_ptr theNodesNot, + GEOM::GEOM_Object_ptr theShape ) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; if ( CORBA::is_nil( theElems ) && theElems->GetType() == SMESH::NODE ) return false; initData(); - ::SMESH_MeshEditor aMeshEditor( myMesh ); - SMESHDS_Mesh* aMeshDS = GetMeshDS(); + SMESHDS_Mesh* aMeshDS = getMeshDS(); TIDSortedElemSet anElems, aNodes, anAffected; idSourceToSet( theElems, aMeshDS, anElems, SMDSAbs_All ); idSourceToSet( theNodesNot, aMeshDS, aNodes, SMDSAbs_Node ); TopoDS_Shape aShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theShape ); - bool aResult = aMeshEditor.DoubleNodesInRegion( anElems, aNodes, aShape ); + bool aResult = getEditor().DoubleNodesInRegion( anElems, aNodes, aShape ); - storeResult( aMeshEditor) ; - myMesh->GetMeshDS()->Modified(); - if ( aResult ) - myMesh->SetIsModified( true ); + declareMeshModified( /*isReComputeSafe=*/ !aResult ); // Update Python script TPythonDump() << "isDone = " << this << ".DoubleNodeElemGroupInRegion( " << theElems << ", " << theNodesNot << ", " << theShape << " )"; return aResult; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ /*! - \brief Creates a hole in a mesh by doubling the nodes of some particular elements - This method provided for convenience works as DoubleNodes() described above. - \param theElems - list of groups of elements (edges or faces) to be replicated - \param theNodesNot - list of groups of nodes not to replicated - \param theAffectedElems - group of elements to which the replicated nodes - should be associated to. - \return TRUE if operation has been completed successfully, FALSE otherwise - \sa DoubleNodeGroup(), DoubleNodes(), DoubleNodeElemGroupsNew() -*/ + * \brief Re-load elements from a list of groups into a TIDSortedElemSet + * \param [in] theGrpList - groups + * \param [in] theMeshDS - mesh + * \param [out] theElemSet - set of elements + * \param [in] theIsNodeGrp - is \a theGrpList includes goups of nodes + */ //================================================================================ static void listOfGroupToSet(const SMESH::ListOfGroups& theGrpList, @@ -5299,32 +6237,46 @@ static void listOfGroupToSet(const SMESH::ListOfGroups& theGrpList, } } -CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemGroups(const SMESH::ListOfGroups& theElems, - const SMESH::ListOfGroups& theNodesNot, - const SMESH::ListOfGroups& theAffectedElems) +//================================================================================ +/*! + \brief Creates a hole in a mesh by doubling the nodes of some particular elements. + This method provided for convenience works as DoubleNodes() described above. + \param theElems - list of groups of elements (edges or faces) to be replicated + \param theNodesNot - list of groups of nodes not to replicated + \param theAffectedElems - group of elements to which the replicated nodes + should be associated to. + \return TRUE if operation has been completed successfully, FALSE otherwise + \sa DoubleNodeGroup(), DoubleNodes(), DoubleNodeElemGroupsNew() +*/ +//================================================================================ + +CORBA::Boolean +SMESH_MeshEditor_i::DoubleNodeElemGroups(const SMESH::ListOfGroups& theElems, + const SMESH::ListOfGroups& theNodesNot, + const SMESH::ListOfGroups& theAffectedElems) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor aMeshEditor( myMesh ); - SMESHDS_Mesh* aMeshDS = GetMeshDS(); + SMESHDS_Mesh* aMeshDS = getMeshDS(); TIDSortedElemSet anElems, aNodes, anAffected; listOfGroupToSet(theElems, aMeshDS, anElems, false ); listOfGroupToSet(theNodesNot, aMeshDS, aNodes, true ); listOfGroupToSet(theAffectedElems, aMeshDS, anAffected, false ); - bool aResult = aMeshEditor.DoubleNodes( anElems, aNodes, anAffected ); - - storeResult( aMeshEditor) ; - - myMesh->GetMeshDS()->Modified(); - if ( aResult ) - myMesh->SetIsModified( true ); + bool aResult = getEditor().DoubleNodes( anElems, aNodes, anAffected ); // Update Python script TPythonDump() << "isDone = " << this << ".DoubleNodeElemGroups( " << &theElems << ", " << &theNodesNot << ", " << &theAffectedElems << " )"; + + declareMeshModified( /*isReComputeSafe=*/false ); return aResult; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ @@ -5340,45 +6292,108 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemGroups(const SMESH::ListOfGroup */ //================================================================================ -SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeElemGroupsNew(const SMESH::ListOfGroups& theElems, - const SMESH::ListOfGroups& theNodesNot, - const SMESH::ListOfGroups& theAffectedElems) +SMESH::SMESH_Group_ptr +SMESH_MeshEditor_i::DoubleNodeElemGroupsNew(const SMESH::ListOfGroups& theElems, + const SMESH::ListOfGroups& theNodesNot, + const SMESH::ListOfGroups& theAffectedElems) + throw (SALOME::SALOME_Exception) { - SMESH::SMESH_Group_var aNewGroup; + TPythonDump pyDump; + SMESH::ListOfGroups_var twoGroups = DoubleNodeElemGroups2New( theElems, + theNodesNot, + theAffectedElems, + true, false ); + SMESH::SMESH_GroupBase_var baseGroup = twoGroups[0].in(); + SMESH::SMESH_Group_var elemGroup = SMESH::SMESH_Group::_narrow( baseGroup ); + + pyDump << elemGroup << " = " << this << ".DoubleNodeElemGroupsNew( " + << theElems << ", " + << theNodesNot << ", " + << theAffectedElems << " )"; + + return elemGroup._retn(); +} + +//================================================================================ +/*! + * \brief Creates a hole in a mesh by doubling the nodes of some particular elements + * Works as DoubleNodeElemGroups(), but returns a new group with newly created elements. + \param theElems - list of groups of elements (edges or faces) to be replicated + \param theNodesNot - list of groups of nodes not to replicated + \param theAffectedElems - group of elements to which the replicated nodes + should be associated to. + * \return a new group with newly created elements + * \sa DoubleNodeElemGroups() + */ +//================================================================================ + +SMESH::ListOfGroups* +SMESH_MeshEditor_i::DoubleNodeElemGroups2New(const SMESH::ListOfGroups& theElems, + const SMESH::ListOfGroups& theNodesNot, + const SMESH::ListOfGroups& theAffectedElems, + CORBA::Boolean theElemGroupNeeded, + CORBA::Boolean theNodeGroupNeeded) + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + SMESH::SMESH_Group_var aNewElemGroup, aNewNodeGroup; + SMESH::ListOfGroups_var aTwoGroups = new SMESH::ListOfGroups(); + aTwoGroups->length( 2 ); initData(); - ::SMESH_MeshEditor aMeshEditor( myMesh ); - SMESHDS_Mesh* aMeshDS = GetMeshDS(); + SMESHDS_Mesh* aMeshDS = getMeshDS(); TIDSortedElemSet anElems, aNodes, anAffected; listOfGroupToSet(theElems, aMeshDS, anElems, false ); listOfGroupToSet(theNodesNot, aMeshDS, aNodes, true ); listOfGroupToSet(theAffectedElems, aMeshDS, anAffected, false ); - bool aResult = aMeshEditor.DoubleNodes( anElems, aNodes, anAffected ); + bool aResult = getEditor().DoubleNodes( anElems, aNodes, anAffected ); - storeResult( aMeshEditor) ; - - myMesh->GetMeshDS()->Modified(); - if ( aResult ) { - myMesh->SetIsModified( true ); + declareMeshModified( /*isReComputeSafe=*/ !aResult ); + TPythonDump pyDump; + if ( aResult ) + { // Create group with newly created elements - SMESH::long_array_var anIds = GetLastCreatedElems(); - if (anIds->length() > 0) { + CORBA::String_var elemGroupName = theElems[0]->GetName(); + string aNewName = generateGroupName( string(elemGroupName.in()) + "_double"); + if ( !getEditor().GetLastCreatedElems().IsEmpty() && theElemGroupNeeded ) + { + SMESH::long_array_var anIds = GetLastCreatedElems(); SMESH::ElementType aGroupType = myMesh_i->GetElementType(anIds[0], true); - string anUnindexedName (theElems[0]->GetName()); - string aNewName = generateGroupName(anUnindexedName + "_double"); - aNewGroup = myMesh_i->CreateGroup(aGroupType, aNewName.c_str()); - aNewGroup->Add(anIds); + aNewElemGroup = myMesh_i->CreateGroup(aGroupType, aNewName.c_str()); + aNewElemGroup->Add(anIds); + } + if ( !getEditor().GetLastCreatedNodes().IsEmpty() && theNodeGroupNeeded ) + { + SMESH::long_array_var anIds = GetLastCreatedNodes(); + aNewNodeGroup = myMesh_i->CreateGroup(SMESH::NODE, aNewName.c_str()); + aNewNodeGroup->Add(anIds); } } // Update Python script - TPythonDump() << "createdElems = " << this << ".DoubleNodeElemGroupsNew( " << &theElems << ", " - << &theNodesNot << ", " << &theAffectedElems << " )"; - return aNewGroup._retn(); + + pyDump << "[ "; + if ( aNewElemGroup->_is_nil() ) pyDump << "nothing, "; + else pyDump << aNewElemGroup << ", "; + if ( aNewNodeGroup->_is_nil() ) pyDump << "nothing ] = "; + else pyDump << aNewNodeGroup << " ] = "; + + pyDump << this << ".DoubleNodeElemGroups2New( " << &theElems << ", " + << &theNodesNot << ", " + << &theAffectedElems << ", " + << theElemGroupNeeded << ", " + << theNodeGroupNeeded << " )"; + + aTwoGroups[0] = aNewElemGroup._retn(); + aTwoGroups[1] = aNewNodeGroup._retn(); + return aTwoGroups._retn(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ @@ -5399,29 +6414,143 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemGroupsInRegion(const SMESH::ListOfGroups& theElems, const SMESH::ListOfGroups& theNodesNot, GEOM::GEOM_Object_ptr theShape ) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor aMeshEditor( myMesh ); - SMESHDS_Mesh* aMeshDS = GetMeshDS(); + SMESHDS_Mesh* aMeshDS = getMeshDS(); TIDSortedElemSet anElems, aNodes; listOfGroupToSet(theElems, aMeshDS, anElems,false ); listOfGroupToSet(theNodesNot, aMeshDS, aNodes, true ); TopoDS_Shape aShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theShape ); - bool aResult = aMeshEditor.DoubleNodesInRegion( anElems, aNodes, aShape ); - - storeResult( aMeshEditor) ; - - myMesh->GetMeshDS()->Modified(); - if ( aResult ) - myMesh->SetIsModified( true ); + bool aResult = getEditor().DoubleNodesInRegion( anElems, aNodes, aShape ); // Update Python script TPythonDump() << "isDone = " << this << ".DoubleNodeElemGroupsInRegion( " << &theElems << ", " << &theNodesNot << ", " << theShape << " )"; + + declareMeshModified( /*isReComputeSafe=*/ !aResult ); return aResult; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; +} + +//================================================================================ +/*! + \brief Identify the elements that will be affected by node duplication (actual + duplication is not performed. + This method is the first step of DoubleNodeElemGroupsInRegion. + \param theElems - list of groups of elements (edges or faces) to be replicated + \param theNodesNot - list of groups of nodes not to replicated + \param theShape - shape to detect affected elements (element which geometric center + located on or inside shape). + The replicated nodes should be associated to affected elements. + \return groups of affected elements + \sa DoubleNodeElemGroupsInRegion() +*/ +//================================================================================ +SMESH::ListOfGroups* +SMESH_MeshEditor_i::AffectedElemGroupsInRegion( const SMESH::ListOfGroups& theElems, + const SMESH::ListOfGroups& theNodesNot, + GEOM::GEOM_Object_ptr theShape ) + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + MESSAGE("AffectedElemGroupsInRegion"); + SMESH::ListOfGroups_var aListOfGroups = new SMESH::ListOfGroups(); + bool isEdgeGroup = false; + bool isFaceGroup = false; + bool isVolumeGroup = false; + SMESH::SMESH_Group_var aNewEdgeGroup = myMesh_i->CreateGroup(SMESH::EDGE, "affectedEdges"); + SMESH::SMESH_Group_var aNewFaceGroup = myMesh_i->CreateGroup(SMESH::FACE, "affectedFaces"); + SMESH::SMESH_Group_var aNewVolumeGroup = myMesh_i->CreateGroup(SMESH::VOLUME, "affectedVolumes"); + + initData(); + + ::SMESH_MeshEditor aMeshEditor(myMesh); + + SMESHDS_Mesh* aMeshDS = getMeshDS(); + TIDSortedElemSet anElems, aNodes; + listOfGroupToSet(theElems, aMeshDS, anElems, false); + listOfGroupToSet(theNodesNot, aMeshDS, aNodes, true); + + TopoDS_Shape aShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape(theShape); + TIDSortedElemSet anAffected; + bool aResult = aMeshEditor.AffectedElemGroupsInRegion(anElems, aNodes, aShape, anAffected); + + + declareMeshModified( /*isReComputeSafe=*/ !aResult ); + + TPythonDump pyDump; + if (aResult) + { + int lg = anAffected.size(); + MESSAGE("lg="<< lg); + SMESH::long_array_var volumeIds = new SMESH::long_array; + volumeIds->length(lg); + SMESH::long_array_var faceIds = new SMESH::long_array; + faceIds->length(lg); + SMESH::long_array_var edgeIds = new SMESH::long_array; + edgeIds->length(lg); + int ivol = 0; + int iface = 0; + int iedge = 0; + + TIDSortedElemSet::const_iterator eIt = anAffected.begin(); + for (; eIt != anAffected.end(); ++eIt) + { + const SMDS_MeshElement* anElem = *eIt; + if (!anElem) + continue; + int elemId = anElem->GetID(); + if (myMesh->GetElementType(elemId, true) == SMDSAbs_Volume) + volumeIds[ivol++] = elemId; + else if (myMesh->GetElementType(elemId, true) == SMDSAbs_Face) + faceIds[iface++] = elemId; + else if (myMesh->GetElementType(elemId, true) == SMDSAbs_Edge) + edgeIds[iedge++] = elemId; + } + volumeIds->length(ivol); + faceIds->length(iface); + edgeIds->length(iedge); + + aNewVolumeGroup->Add(volumeIds); + aNewFaceGroup->Add(faceIds); + aNewEdgeGroup->Add(edgeIds); + isVolumeGroup = (aNewVolumeGroup->Size() > 0); + isFaceGroup = (aNewFaceGroup->Size() > 0); + isEdgeGroup = (aNewEdgeGroup->Size() > 0); + } + + int nbGroups = 0; + if (isEdgeGroup) nbGroups++; + if (isFaceGroup) nbGroups++; + if (isVolumeGroup) nbGroups++; + aListOfGroups->length(nbGroups); + + int i = 0; + if (isEdgeGroup) aListOfGroups[i++] = aNewEdgeGroup._retn(); + if (isFaceGroup) aListOfGroups[i++] = aNewFaceGroup._retn(); + if (isVolumeGroup) aListOfGroups[i++] = aNewVolumeGroup._retn(); + + // Update Python script + + pyDump << "[ "; + if (isEdgeGroup) pyDump << aNewEdgeGroup << ", "; + if (isFaceGroup) pyDump << aNewFaceGroup << ", "; + if (isVolumeGroup) pyDump << aNewVolumeGroup << ", "; + pyDump << "] = "; + pyDump << this << ".AffectedElemGroupsInRegion( " + << &theElems << ", " << &theNodesNot << ", " << theShape << " )"; + + return aListOfGroups._retn(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; } //================================================================================ @@ -5433,38 +6562,48 @@ SMESH_MeshEditor_i::DoubleNodeElemGroupsInRegion(const SMESH::ListOfGroups& theE //================================================================================ CORBA::Boolean SMESH_MeshEditor_i::Make2DMeshFrom3D() + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); - ::SMESH_MeshEditor aMeshEditor( myMesh ); - bool aResult = aMeshEditor.Make2DMeshFrom3D(); - storeResult( aMeshEditor) ; - myMesh->GetMeshDS()->Modified(); + bool aResult = getEditor().Make2DMeshFrom3D(); + TPythonDump() << "isDone = " << this << ".Make2DMeshFrom3D()"; + + declareMeshModified( /*isReComputeSafe=*/ !aResult ); return aResult; + + SMESH_CATCH( SMESH::throwCorbaException ); + return false; } //================================================================================ /*! - * \brief Double nodes on shared faces between groups of volumes and create flat elements on demand. + * \brief Double nodes on shared faces between groups of volumes and create flat + * elements on demand. * The list of groups must describe a partition of the mesh volumes. * The nodes of the internal faces at the boundaries of the groups are doubled. * In option, the internal faces are replaced by flat elements. * Triangles are transformed in prisms, and quadrangles in hexahedrons. + * The flat elements are stored in groups of volumes. * @param theDomains - list of groups of volumes * @param createJointElems - if TRUE, create the elements * @return TRUE if operation has been completed successfully, FALSE otherwise */ //================================================================================ -CORBA::Boolean SMESH_MeshEditor_i::DoubleNodesOnGroupBoundaries( const SMESH::ListOfGroups& theDomains, - CORBA::Boolean createJointElems ) +CORBA::Boolean +SMESH_MeshEditor_i::DoubleNodesOnGroupBoundaries( const SMESH::ListOfGroups& theDomains, + CORBA::Boolean createJointElems ) + throw (SALOME::SALOME_Exception) { - initData(); + bool aResult = false; - ::SMESH_MeshEditor aMeshEditor( myMesh ); + SMESH_TRY; + initData(); - SMESHDS_Mesh* aMeshDS = GetMeshDS(); + SMESHDS_Mesh* aMeshDS = getMeshDS(); vector domains; domains.clear(); @@ -5472,8 +6611,10 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodesOnGroupBoundaries( const SMESH::Li for ( int i = 0, n = theDomains.length(); i < n; i++ ) { SMESH::SMESH_GroupBase_var aGrp = theDomains[ i ]; - if ( !CORBA::is_nil( aGrp ) && ( aGrp->GetType() != SMESH::NODE ) ) + if ( !CORBA::is_nil( aGrp ) /*&& ( aGrp->GetType() != SMESH::NODE )*/ ) { +// if ( aGrp->GetType() != SMESH::VOLUME ) +// THROW_SALOME_CORBA_EXCEPTION("Not a volume group", SALOME::BAD_PARAM); TIDSortedElemSet domain; domain.clear(); domains.push_back(domain); @@ -5482,15 +6623,128 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodesOnGroupBoundaries( const SMESH::Li } } - bool aResult = aMeshEditor.DoubleNodesOnGroupBoundaries( domains, createJointElems ); + aResult = getEditor().DoubleNodesOnGroupBoundaries( domains, createJointElems ); + // TODO publish the groups of flat elements in study - storeResult( aMeshEditor) ; - myMesh->GetMeshDS()->Modified(); + declareMeshModified( /*isReComputeSafe=*/ !aResult ); // Update Python script TPythonDump() << "isDone = " << this << ".DoubleNodesOnGroupBoundaries( " << &theDomains << ", " << createJointElems << " )"; + + SMESH_CATCH( SMESH::throwCorbaException ); + + return aResult; +} + +//================================================================================ +/*! + * \brief Double nodes on some external faces and create flat elements. + * Flat elements are mainly used by some types of mechanic calculations. + * + * Each group of the list must be constituted of faces. + * Triangles are transformed in prisms, and quadrangles in hexahedrons. + * @param theGroupsOfFaces - list of groups of faces + * @return TRUE if operation has been completed successfully, FALSE otherwise + */ +//================================================================================ + +CORBA::Boolean +SMESH_MeshEditor_i::CreateFlatElementsOnFacesGroups( const SMESH::ListOfGroups& theGroupsOfFaces ) + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + initData(); + + SMESHDS_Mesh* aMeshDS = getMeshDS(); + + vector faceGroups; + faceGroups.clear(); + + for ( int i = 0, n = theGroupsOfFaces.length(); i < n; i++ ) + { + SMESH::SMESH_GroupBase_var aGrp = theGroupsOfFaces[ i ]; + if ( !CORBA::is_nil( aGrp ) && ( aGrp->GetType() != SMESH::NODE ) ) + { + TIDSortedElemSet faceGroup; + faceGroup.clear(); + faceGroups.push_back(faceGroup); + SMESH::long_array_var anIDs = aGrp->GetIDs(); + arrayToSet( anIDs, aMeshDS, faceGroups[ i ], SMDSAbs_All ); + } + } + + bool aResult = getEditor().CreateFlatElementsOnFacesGroups( faceGroups ); + // TODO publish the groups of flat elements in study + + declareMeshModified( /*isReComputeSafe=*/ !aResult ); + + // Update Python script + TPythonDump() << this << ".CreateFlatElementsOnFacesGroups( " << &theGroupsOfFaces << " )"; return aResult; + + SMESH_CATCH( SMESH::throwCorbaException ); + return false; +} + +//================================================================================ +/*! + * \brief Identify all the elements around a geom shape, get the faces delimiting + * the hole. + * + * Build groups of volume to remove, groups of faces to replace on the skin of the + * object, groups of faces to remove inside the object, (idem edges). + * Build ordered list of nodes at the border of each group of faces to replace + * (to be used to build a geom subshape). + */ +//================================================================================ + +void SMESH_MeshEditor_i::CreateHoleSkin(CORBA::Double radius, + GEOM::GEOM_Object_ptr theShape, + const char* groupName, + const SMESH::double_array& theNodesCoords, + SMESH::array_of_long_array_out GroupsOfNodes) + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + + initData(); + std::vector > aListOfListOfNodes; + ::SMESH_MeshEditor aMeshEditor( myMesh ); + + theSearchersDeleter.Set( myMesh ); // remove theNodeSearcher if mesh is other + if ( !theNodeSearcher ) + theNodeSearcher = aMeshEditor.GetNodeSearcher(); + + vector nodesCoords; + for (int i = 0; i < theNodesCoords.length(); i++) + { + nodesCoords.push_back( theNodesCoords[i] ); + } + + TopoDS_Shape aShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( theShape ); + aMeshEditor.CreateHoleSkin(radius, aShape, theNodeSearcher, groupName, + nodesCoords, aListOfListOfNodes); + + GroupsOfNodes = new SMESH::array_of_long_array; + GroupsOfNodes->length( aListOfListOfNodes.size() ); + std::vector >::iterator llIt = aListOfListOfNodes.begin(); + for ( CORBA::Long i = 0; llIt != aListOfListOfNodes.end(); llIt++, i++ ) + { + vector& aListOfNodes = *llIt; + vector::iterator lIt = aListOfNodes.begin();; + SMESH::long_array& aGroup = (*GroupsOfNodes)[ i ]; + aGroup.length( aListOfNodes.size() ); + for ( int j = 0; lIt != aListOfNodes.end(); lIt++, j++ ) + aGroup[ j ] = (*lIt); + } + TPythonDump() << "lists_nodes = " << this << ".CreateHoleSkin( " + << radius << ", " + << theShape + << ", '" << groupName << "', " + << theNodesCoords << " )"; + + SMESH_CATCH( SMESH::throwCorbaException ); } // issue 20749 =================================================================== @@ -5518,14 +6772,15 @@ SMESH_MeshEditor_i::MakeBoundaryMesh(SMESH::SMESH_IDSource_ptr idSource, CORBA::Boolean toCopyElements, CORBA::Boolean toCopyExistingBondary, SMESH::SMESH_Group_out group) + throw (SALOME::SALOME_Exception) { + SMESH_TRY; initData(); if ( dim > SMESH::BND_1DFROM2D ) THROW_SALOME_CORBA_EXCEPTION("Invalid boundary dimension", SALOME::BAD_PARAM); - - SMESHDS_Mesh* aMeshDS = GetMeshDS(); + SMESHDS_Mesh* aMeshDS = getMeshDS(); SMESH::SMESH_Mesh_var mesh_var; SMESH::SMESH_Group_var group_var; @@ -5553,14 +6808,15 @@ SMESH_MeshEditor_i::MakeBoundaryMesh(SMESH::SMESH_IDSource_ptr idSource, } // do it - ::SMESH_MeshEditor aMeshEditor( myMesh ); - aMeshEditor.MakeBoundaryMesh( elements, + getEditor().MakeBoundaryMesh( elements, ::SMESH_MeshEditor::Bnd_Dimension(dim), smesh_group, smesh_mesh, toCopyElements, toCopyExistingBondary); - storeResult( aMeshEditor ); + + if ( smesh_mesh ) + smesh_mesh->GetMeshDS()->Modified(); } const char* dimName[] = { "BND_2DFROM3D", "BND_1DFROM3D", "BND_1DFROM2D" }; @@ -5584,4 +6840,165 @@ SMESH_MeshEditor_i::MakeBoundaryMesh(SMESH::SMESH_IDSource_ptr idSource, group = group_var._retn(); return mesh_var._retn(); + + SMESH_CATCH( SMESH::throwCorbaException ); + return SMESH::SMESH_Mesh::_nil(); +} + +//================================================================================ +/*! + * \brief Creates missing boundary elements + * \param dimension - defines type of boundary elements to create + * \param groupName - a name of group to store all boundary elements in, + * "" means not to create the group + * \param meshName - a name of a new mesh, which is a copy of the initial + * mesh + created boundary elements; "" means not to create the new mesh + * \param toCopyAll - if true, the whole initial mesh will be copied into + * the new mesh else only boundary elements will be copied into the new mesh + * \param groups - optional groups of elements to make boundary around + * \param mesh - returns the mesh where elements were added to + * \param group - returns the created group, if any + * \retval long - number of added boundary elements + */ +//================================================================================ + +CORBA::Long SMESH_MeshEditor_i::MakeBoundaryElements(SMESH::Bnd_Dimension dim, + const char* groupName, + const char* meshName, + CORBA::Boolean toCopyAll, + const SMESH::ListOfIDSources& groups, + SMESH::SMESH_Mesh_out mesh, + SMESH::SMESH_Group_out group) + throw (SALOME::SALOME_Exception) +{ + SMESH_TRY; + initData(); + + if ( dim > SMESH::BND_1DFROM2D ) + THROW_SALOME_CORBA_EXCEPTION("Invalid boundary dimension", SALOME::BAD_PARAM); + + // separate groups belonging to this and other mesh + SMESH::ListOfIDSources_var groupsOfThisMesh = new SMESH::ListOfIDSources; + SMESH::ListOfIDSources_var groupsOfOtherMesh = new SMESH::ListOfIDSources; + groupsOfThisMesh->length( groups.length() ); + groupsOfOtherMesh->length( groups.length() ); + int nbGroups = 0, nbGroupsOfOtherMesh = 0; + for ( int i = 0; i < groups.length(); ++i ) + { + SMESH::SMESH_Mesh_var m = groups[i]->GetMesh(); + if ( myMesh_i != SMESH::DownCast( m )) + groupsOfOtherMesh[ nbGroupsOfOtherMesh++ ] = groups[i]; + else + groupsOfThisMesh[ nbGroups++ ] = groups[i]; + if ( SMESH::DownCast( groups[i] )) + THROW_SALOME_CORBA_EXCEPTION("expect a group but recieve a mesh", SALOME::BAD_PARAM); + } + groupsOfThisMesh->length( nbGroups ); + groupsOfOtherMesh->length( nbGroupsOfOtherMesh ); + + int nbAdded = 0; + TPythonDump pyDump; + + if ( nbGroupsOfOtherMesh > 0 ) + { + // process groups belonging to another mesh + SMESH::SMESH_Mesh_var otherMesh = groupsOfOtherMesh[0]->GetMesh(); + SMESH::SMESH_MeshEditor_var editor = otherMesh->GetMeshEditor(); + nbAdded += editor->MakeBoundaryElements( dim, groupName, meshName, toCopyAll, + groupsOfOtherMesh, mesh, group ); + } + + SMESH::SMESH_Mesh_var mesh_var; + SMESH::SMESH_Group_var group_var; + + // get mesh to fill + mesh_var = SMESH::SMESH_Mesh::_duplicate( myMesh_i->_this() ); + const bool toCopyMesh = ( strlen( meshName ) > 0 ); + if ( toCopyMesh ) + { + if ( toCopyAll ) + mesh_var = SMESH_Gen_i::GetSMESHGen()->CopyMesh(mesh_var, + meshName, + /*toCopyGroups=*/false, + /*toKeepIDs=*/true); + else + mesh_var = makeMesh(meshName); + } + SMESH_Mesh_i* mesh_i = SMESH::DownCast( mesh_var ); + SMESH_Mesh* tgtMesh = &mesh_i->GetImpl(); + + // source mesh + SMESH_Mesh* srcMesh = ( toCopyMesh && !toCopyAll ) ? myMesh : tgtMesh; + SMESHDS_Mesh* srcMeshDS = srcMesh->GetMeshDS(); + + // group of boundary elements + SMESH_Group* smesh_group = 0; + SMDSAbs_ElementType elemType = (dim == SMESH::BND_2DFROM3D) ? SMDSAbs_Volume : SMDSAbs_Face; + if ( strlen(groupName) ) + { + SMESH::ElementType groupType = SMESH::ElementType( int(elemType)-1 ); + group_var = mesh_i->CreateGroup( groupType, groupName ); + if ( SMESH_GroupBase_i* group_i = SMESH::DownCast( group_var )) + smesh_group = group_i->GetSmeshGroup(); + } + + TIDSortedElemSet elements; + + if ( groups.length() > 0 ) + { + for ( int i = 0; i < nbGroups; ++i ) + { + elements.clear(); + if ( idSourceToSet( groupsOfThisMesh[i], srcMeshDS, elements, elemType,/*emptyIfIsMesh=*/0 )) + { + SMESH::Bnd_Dimension bdim = + ( elemType == SMDSAbs_Volume ) ? SMESH::BND_2DFROM3D : SMESH::BND_1DFROM2D; + nbAdded += getEditor().MakeBoundaryMesh( elements, + ::SMESH_MeshEditor::Bnd_Dimension(bdim), + smesh_group, + tgtMesh, + /*toCopyElements=*/false, + /*toCopyExistingBondary=*/srcMesh != tgtMesh, + /*toAddExistingBondary=*/true, + /*aroundElements=*/true); + } + } + } + else + { + nbAdded += getEditor().MakeBoundaryMesh( elements, + ::SMESH_MeshEditor::Bnd_Dimension(dim), + smesh_group, + tgtMesh, + /*toCopyElements=*/false, + /*toCopyExistingBondary=*/srcMesh != tgtMesh, + /*toAddExistingBondary=*/true); + } + tgtMesh->GetMeshDS()->Modified(); + + const char* dimName[] = { "BND_2DFROM3D", "BND_1DFROM3D", "BND_1DFROM2D" }; + + // result of MakeBoundaryElements() is a tuple (nb, mesh, group) + pyDump << "nbAdded, "; + if ( mesh_var->_is_nil() ) + pyDump << myMesh_i->_this() << ", "; + else + pyDump << mesh_var << ", "; + if ( group_var->_is_nil() ) + pyDump << "_NoneGroup = "; // assignment to None is forbiden + else + pyDump << group_var << " = "; + pyDump << this << ".MakeBoundaryElements( " + << "SMESH." << dimName[int(dim)] << ", " + << "'" << groupName << "', " + << "'" << meshName<< "', " + << toCopyAll << ", " + << groups << ")"; + + mesh = mesh_var._retn(); + group = group_var._retn(); + return nbAdded; + + SMESH_CATCH( SMESH::throwCorbaException ); + return 0; }