X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FSMESH_I%2FSMESH_MeshEditor_i.cxx;h=ff3eed5e8eedafd07c8b472ab3b852e5fee815d4;hb=92a7ef34a204f405f38c594c6f23792e18f4c682;hp=2c444819c7bbabe0ebd1f1af78b0a5bfd020426f;hpb=c38c10811a065cf5b13e8807ed71864d92ca7d80;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index 2c444819c..ff3eed5e8 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -1,23 +1,23 @@ // SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses // // Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -// -// See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -31,11 +31,13 @@ #include "SMDS_MeshEdge.hxx" #include "SMDS_MeshFace.hxx" #include "SMDS_MeshVolume.hxx" - +#include "SMDS_PolyhedralVolumeOfNodes.hxx" #include "SMESH_MeshEditor.hxx" - +#include "SMESH_subMeshEventListener.hxx" #include "SMESH_Gen_i.hxx" #include "SMESH_Filter_i.hxx" +#include "SMESH_PythonDump.hxx" +#include "CASCatch.hxx" #include "utilities.h" @@ -43,133 +45,309 @@ #include #include +#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100 +#define NO_CAS_CATCH +#endif + +#include + +#ifdef NO_CAS_CATCH +#include +#else +#include "CASCatch.hxx" +#endif + #include +#define cast2Node(elem) static_cast( elem ) + using namespace std; +using SMESH::TPythonDump; -//======================================================================= -//function : addAxis -//purpose : -//======================================================================= +namespace { -static TCollection_AsciiString& addAxis(TCollection_AsciiString& theStr, - const SMESH::AxisStruct & theAxis) -{ - theStr += "SMESH.AxisStruct( "; - theStr += TCollection_AsciiString( theAxis.x ) + ", "; - theStr += TCollection_AsciiString( theAxis.y ) + ", "; - theStr += TCollection_AsciiString( theAxis.z ) + ", "; - theStr += TCollection_AsciiString( theAxis.vx ) + ", "; - theStr += TCollection_AsciiString( theAxis.vy ) + ", "; - theStr += TCollection_AsciiString( theAxis.vz ) + " )"; - return theStr; + //============================================================================= + /*! + * \brief Mesh to apply modifications for preview purposes + */ + //============================================================================= + + struct TPreviewMesh: public SMESH_Mesh + { + SMDSAbs_ElementType myPreviewType; // type to show + //!< Constructor + TPreviewMesh(SMDSAbs_ElementType previewElements = SMDSAbs_All) { + _isShapeToMesh = _id =_studyId =_idDoc = 0; + _myMeshDS = new SMESHDS_Mesh( _id, true ); + myPreviewType = previewElements; + } + //!< Destructor + virtual ~TPreviewMesh() { delete _myMeshDS; } + //!< Copy a set of elements + void Copy(const TIDSortedElemSet & theElements, + TIDSortedElemSet& theCopyElements, + SMDSAbs_ElementType theSelectType = SMDSAbs_All, + SMDSAbs_ElementType theAvoidType = SMDSAbs_All) + { + // loop on theIDsOfElements + TIDSortedElemSet::const_iterator eIt = theElements.begin(); + for ( ; eIt != theElements.end(); ++eIt ) + { + const SMDS_MeshElement* anElem = *eIt; + if ( !anElem ) continue; + SMDSAbs_ElementType type = anElem->GetType(); + if ( type == theAvoidType || + ( theSelectType != SMDSAbs_All && type != theSelectType )) + continue; + + if ( const SMDS_MeshElement* anElemCopy = Copy( anElem )) + theCopyElements.insert( theCopyElements.end(), anElemCopy ); + } + } + //!< Copy an element + SMDS_MeshElement* Copy( const SMDS_MeshElement* anElem ) + { + // copy element nodes + int anElemNbNodes = anElem->NbNodes(); + vector< int > anElemNodesID( anElemNbNodes ) ; + SMDS_ElemIteratorPtr itElemNodes = anElem->nodesIterator(); + for ( int i = 0; itElemNodes->more(); i++) + { + const SMDS_MeshNode* anElemNode = cast2Node( itElemNodes->next() ); + Copy( anElemNode ); + anElemNodesID[i] = anElemNode->GetID(); + } + + // creates a corresponding element on copied nodes + SMDS_MeshElement* anElemCopy = 0; + if ( anElem->IsPoly() && anElem->GetType() == SMDSAbs_Volume ) + { + const SMDS_PolyhedralVolumeOfNodes* ph = + dynamic_cast (anElem); + if ( ph ) + anElemCopy = _myMeshDS->AddPolyhedralVolumeWithID + (anElemNodesID, ph->GetQuanities(),anElem->GetID()); + } + else { + anElemCopy = ::SMESH_MeshEditor(this).AddElement( anElemNodesID, + anElem->GetType(), + anElem->IsPoly() ); + } + return anElemCopy; + } + //!< Copy a node + SMDS_MeshNode* Copy( const SMDS_MeshNode* anElemNode ) + { + return _myMeshDS->AddNodeWithID(anElemNode->X(), anElemNode->Y(), anElemNode->Z(), + anElemNode->GetID()); + } + };// struct TPreviewMesh + + static SMESH_NodeSearcher * myNodeSearcher = 0; + + //============================================================================= + /*! + * \brief Deleter of myNodeSearcher at any compute event occured + */ + //============================================================================= + + struct TNodeSearcherDeleter : public SMESH_subMeshEventListener + { + SMESH_Mesh* myMesh; + //!< Constructor + TNodeSearcherDeleter(): SMESH_subMeshEventListener( false ), // won't be deleted by submesh + myMesh(0) {} + //!< Delete myNodeSearcher + static void Delete() + { + if ( myNodeSearcher ) { delete myNodeSearcher; myNodeSearcher = 0; } + } + typedef map < int, SMESH_subMesh * > TDependsOnMap; + //!< The meshod called by submesh: do my main job + void ProcessEvent(const int, const int eventType, SMESH_subMesh* sm, + SMESH_subMeshEventListenerData*,const SMESH_Hypothesis*) + { + if ( eventType == SMESH_subMesh::COMPUTE_EVENT ) { + Delete(); + Unset( sm->GetFather() ); + } + } + //!< set self on all submeshes and delete myNodeSearcher if other mesh is set + void Set(SMESH_Mesh* mesh) + { + if ( myMesh && myMesh != mesh ) { + Delete(); + Unset( myMesh ); + } + myMesh = mesh; + if ( SMESH_subMesh* myMainSubMesh = mesh->GetSubMeshContaining(1) ) { + const TDependsOnMap & subMeshes = myMainSubMesh->DependsOn(); + TDependsOnMap::const_iterator sm; + for (sm = subMeshes.begin(); sm != subMeshes.end(); sm++) + sm->second->SetEventListener( this, 0, sm->second ); + } + } + //!< delete self from all submeshes + void Unset(SMESH_Mesh* mesh) + { + if ( SMESH_subMesh* myMainSubMesh = mesh->GetSubMeshContaining(1) ) { + const TDependsOnMap & subMeshes = myMainSubMesh->DependsOn(); + TDependsOnMap::const_iterator sm; + for (sm = subMeshes.begin(); sm != subMeshes.end(); sm++) + sm->second->DeleteEventListener( this ); + } + } + }; } //============================================================================= /*! - * + * */ //============================================================================= -SMESH_MeshEditor_i::SMESH_MeshEditor_i(SMESH_Mesh* theMesh) +SMESH_MeshEditor_i::SMESH_MeshEditor_i(SMESH_Mesh* theMesh, bool isPreview) +{ + myMesh = theMesh; + myPreviewMode = isPreview; +} + +//================================================================================ +/*! + * \brief Destructor + */ +//================================================================================ + +SMESH_MeshEditor_i::~SMESH_MeshEditor_i() +{ +} + +//================================================================================ +/*! + * \brief Clear members + */ +//================================================================================ + +void SMESH_MeshEditor_i::initData() { - _myMesh = theMesh; -}; + if ( myPreviewMode ) { + myPreviewData = new SMESH::MeshPreviewStruct(); + } + else { + myLastCreatedElems = new SMESH::long_array(); + myLastCreatedNodes = new SMESH::long_array(); + TNodeSearcherDeleter::Delete(); + } +} //============================================================================= /*! - * + * */ //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::RemoveElements(const SMESH::long_array & IDsOfElements) { - ::SMESH_MeshEditor anEditor( _myMesh ); + initData(); + + ::SMESH_MeshEditor anEditor( myMesh ); list< int > IdList; for (int i = 0; i < IDsOfElements.length(); i++) IdList.push_back( IDsOfElements[i] ); // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.RemoveElements("); - SMESH_Gen_i::AddArray( str, IDsOfElements ) += ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = " << this << ".RemoveElements( " << IDsOfElements << " )"; #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"RemoveElements: \", isDone" ); + TPythonDump() << "print 'RemoveElements: ', isDone"; #endif // Remove Elements return anEditor.Remove( IdList, false ); -}; +} //============================================================================= /*! - * + * */ //============================================================================= -CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH:: - long_array & IDsOfNodes) +CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::long_array & IDsOfNodes) { - ::SMESH_MeshEditor anEditor( _myMesh ); + initData(); + + ::SMESH_MeshEditor anEditor( myMesh ); list< int > IdList; for (int i = 0; i < IDsOfNodes.length(); i++) IdList.push_back( IDsOfNodes[i] ); // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.RemoveNodes("); - SMESH_Gen_i::AddArray( str, IDsOfNodes ) += ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = " << this << ".RemoveNodes( " << IDsOfNodes << " )"; #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"RemoveNodes: \", isDone" ); + TPythonDump() << "print 'RemoveNodes: ', isDone"; #endif return anEditor.Remove( IdList, true ); -}; +} //============================================================================= /*! - * + * */ //============================================================================= -CORBA::Boolean SMESH_MeshEditor_i::AddEdge(const SMESH::long_array & IDsOfNodes) +CORBA::Long SMESH_MeshEditor_i::AddEdge(const SMESH::long_array & IDsOfNodes) { + initData(); + int NbNodes = IDsOfNodes.length(); + SMDS_MeshElement* elem = 0; if (NbNodes == 2) { CORBA::Long index1 = IDsOfNodes[0]; CORBA::Long index2 = IDsOfNodes[1]; - GetMeshDS()->AddEdge(GetMeshDS()->FindNode(index1), GetMeshDS()->FindNode(index2)); + elem = GetMeshDS()->AddEdge(GetMeshDS()->FindNode(index1), GetMeshDS()->FindNode(index2)); // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.AddEdge(["); - str += TCollection_AsciiString((int) index1) + ", "; - str += TCollection_AsciiString((int) index2) + " ])"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "edge = " << this << ".AddEdge([ " + << index1 << ", " << index2 <<" ])"; } - return true; + if (NbNodes == 3) { + 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)); + // Update Python script + TPythonDump() << "edgeID = " << this << ".AddEdge([ " + <GetID(); + + return 0; } //============================================================================= /*! - * + * */ //============================================================================= -CORBA::Boolean 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) { - GetMeshDS()->AddNode(x, y, z); + initData(); + + const SMDS_MeshNode* N = GetMeshDS()->AddNode(x, y, z); // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.AddNode("); - str += TCollection_AsciiString( x ) + ", "; - str += TCollection_AsciiString( y ) + ", "; - str += TCollection_AsciiString( z ) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "nodeID = " << this << ".AddNode( " + << x << ", " << y << ", " << z << " )"; - return true; + return N->GetID(); } //============================================================================= @@ -178,8 +356,10 @@ CORBA::Boolean SMESH_MeshEditor_i::AddNode(CORBA::Double x, */ //============================================================================= -CORBA::Boolean SMESH_MeshEditor_i::AddFace(const SMESH::long_array & IDsOfNodes) +CORBA::Long SMESH_MeshEditor_i::AddFace(const SMESH::long_array & IDsOfNodes) { + initData(); + int NbNodes = IDsOfNodes.length(); if (NbNodes < 3) { @@ -190,71 +370,120 @@ CORBA::Boolean SMESH_MeshEditor_i::AddFace(const SMESH::long_array & IDsOfNodes) for (int i = 0; i < NbNodes; i++) nodes[i] = GetMeshDS()->FindNode(IDsOfNodes[i]); - if (NbNodes == 3) - { - GetMeshDS()->AddFace(nodes[0], nodes[1], nodes[2]); + SMDS_MeshElement* elem = 0; + if (NbNodes == 3) { + elem = GetMeshDS()->AddFace(nodes[0], nodes[1], nodes[2]); } - else if (NbNodes == 4) - { - GetMeshDS()->AddFace(nodes[0], nodes[1], nodes[2], nodes[3]); + else if (NbNodes == 4) { + elem = GetMeshDS()->AddFace(nodes[0], nodes[1], nodes[2], nodes[3]); } - else - { - GetMeshDS()->AddPolygonalFace(nodes); + else if (NbNodes == 6) { + 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], + nodes[4], nodes[5], nodes[6], nodes[7]); + } + + // Update Python script + TPythonDump() << "faceID = " << this << ".AddFace( " << IDsOfNodes << " )"; + + if(elem) + return elem->GetID(); + + return 0; +} + +//============================================================================= +/*! + * AddPolygonalFace + */ +//============================================================================= +CORBA::Long SMESH_MeshEditor_i::AddPolygonalFace + (const SMESH::long_array & IDsOfNodes) +{ + initData(); + int NbNodes = IDsOfNodes.length(); + std::vector nodes (NbNodes); + for (int i = 0; i < NbNodes; i++) + nodes[i] = GetMeshDS()->FindNode(IDsOfNodes[i]); + + const SMDS_MeshElement* elem = GetMeshDS()->AddPolygonalFace(nodes); + // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.AddFace("); - SMESH_Gen_i::AddArray( str, IDsOfNodes ) += ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() <<"faceID = "<GetID(); + + return 0; +} //============================================================================= /*! - * + * */ //============================================================================= -CORBA::Boolean SMESH_MeshEditor_i::AddVolume(const SMESH:: - long_array & IDsOfNodes) +CORBA::Long SMESH_MeshEditor_i::AddVolume(const SMESH::long_array & IDsOfNodes) { + initData(); + int NbNodes = IDsOfNodes.length(); vector< const SMDS_MeshNode*> n(NbNodes); for(int i=0;iFindNode(IDsOfNodes[i]); + SMDS_MeshElement* elem = 0; switch(NbNodes) { - case 4:GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3]); break; - case 5:GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4]); break; - case 6:GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5]); break; - case 8:GetMeshDS()->AddVolume(n[0],n[1],n[2],n[3],n[4],n[5],n[6],n[7]); break; + 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], + 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], + 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], + 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; } + // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.AddVolume("); - SMESH_Gen_i::AddArray( str, IDsOfNodes ) += ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "volID = " << this << ".AddVolume( " << IDsOfNodes << " )"; #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"AddVolume: \", isDone" ); + TPythonDump() << "print 'AddVolume: ', volID"; #endif - - return true; -}; + + if(elem) + return elem->GetID(); + + return 0; +} //============================================================================= /*! * AddPolyhedralVolume */ //============================================================================= -CORBA::Boolean SMESH_MeshEditor_i::AddPolyhedralVolume +CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolume (const SMESH::long_array & IDsOfNodes, const SMESH::long_array & Quantities) { + initData(); + int NbNodes = IDsOfNodes.length(); std::vector n (NbNodes); for (int i = 0; i < NbNodes; i++) @@ -265,28 +494,31 @@ CORBA::Boolean SMESH_MeshEditor_i::AddPolyhedralVolume for (int j = 0; j < NbFaces; j++) q[j] = Quantities[j]; - GetMeshDS()->AddPolyhedralVolume(n, q); + const SMDS_MeshElement* elem = GetMeshDS()->AddPolyhedralVolume(n, q); // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.AddPolyhedralVolume("); - SMESH_Gen_i::AddArray( str, IDsOfNodes ) += ", "; - SMESH_Gen_i::AddArray( str, Quantities ) += ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "volID = " << this << ".AddPolyhedralVolume( " + << IDsOfNodes << ", " << Quantities << " )"; #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"AddPolyhedralVolume: \", isDone" ); + TPythonDump() << "print 'AddPolyhedralVolume: ', volID"; #endif - return true; -}; + if(elem) + return elem->GetID(); + + return 0; +} //============================================================================= /*! * AddPolyhedralVolumeByFaces */ //============================================================================= -CORBA::Boolean SMESH_MeshEditor_i::AddPolyhedralVolumeByFaces +CORBA::Long SMESH_MeshEditor_i::AddPolyhedralVolumeByFaces (const SMESH::long_array & IdsOfFaces) { + initData(); + int NbFaces = IdsOfFaces.length(); std::vector poly_nodes; std::vector quantities (NbFaces); @@ -301,22 +533,24 @@ CORBA::Boolean SMESH_MeshEditor_i::AddPolyhedralVolumeByFaces } } - GetMeshDS()->AddPolyhedralVolume(poly_nodes, quantities); + const SMDS_MeshElement* elem = GetMeshDS()->AddPolyhedralVolume(poly_nodes, quantities); // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.AddPolyhedralVolumeByFaces("); - SMESH_Gen_i::AddArray( str, IdsOfFaces ) += ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "volID = " << this << ".AddPolyhedralVolumeByFaces( " + << IdsOfFaces << " )"; #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"AddPolyhedralVolume: \", isDone" ); + TPythonDump() << "print 'AddPolyhedralVolume: ', volID"; #endif - return true; -}; + if(elem) + return elem->GetID(); + + return 0; +} //============================================================================= /*! - * + * */ //============================================================================= @@ -325,80 +559,85 @@ CORBA::Boolean SMESH_MeshEditor_i::MoveNode(CORBA::Long NodeID, CORBA::Double y, CORBA::Double z) { + initData(); + const SMDS_MeshNode * node = GetMeshDS()->FindNode( NodeID ); if ( !node ) return false; - + GetMeshDS()->MoveNode(node, x, y, z); // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.MoveNode("); - str += TCollection_AsciiString((Standard_Integer) NodeID) + ", "; - str += TCollection_AsciiString((Standard_Real) x) + ", "; - str += TCollection_AsciiString((Standard_Real) y) + ", "; - str += TCollection_AsciiString((Standard_Real) z) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = " << this << ".MoveNode( " + << NodeID << ", " << x << ", " << y << ", " << z << " )"; return true; } //============================================================================= /*! - * + * */ //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::InverseDiag(CORBA::Long NodeID1, CORBA::Long NodeID2) { + initData(); + const SMDS_MeshNode * n1 = GetMeshDS()->FindNode( NodeID1 ); const SMDS_MeshNode * n2 = GetMeshDS()->FindNode( NodeID2 ); if ( !n1 || !n2 ) return false; // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.InverseDiag("); - str += TCollection_AsciiString((Standard_Integer) NodeID1) + ", "; - str += TCollection_AsciiString((Standard_Integer) NodeID2) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = " << this << ".InverseDiag( " + << NodeID1 << ", " << NodeID2 << " )"; - ::SMESH_MeshEditor aMeshEditor( _myMesh ); + ::SMESH_MeshEditor aMeshEditor( myMesh ); return aMeshEditor.InverseDiag ( n1, n2 ); } //============================================================================= /*! - * + * */ //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::DeleteDiag(CORBA::Long NodeID1, CORBA::Long NodeID2) { + initData(); + const SMDS_MeshNode * n1 = GetMeshDS()->FindNode( NodeID1 ); const SMDS_MeshNode * n2 = GetMeshDS()->FindNode( NodeID2 ); if ( !n1 || !n2 ) return false; // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.DeleteDiag("); - str += TCollection_AsciiString((Standard_Integer) NodeID1) + ", "; - str += TCollection_AsciiString((Standard_Integer) NodeID2) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = " << this << ".DeleteDiag( " + << NodeID1 << ", " << NodeID2 << " )"; - ::SMESH_MeshEditor aMeshEditor( _myMesh ); - return aMeshEditor.DeleteDiag ( n1, n2 ); + ::SMESH_MeshEditor aMeshEditor( myMesh ); + + bool stat = aMeshEditor.DeleteDiag ( n1, n2 ); + + StoreResult(aMeshEditor); + + return stat; } //============================================================================= /*! - * + * */ //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::long_array & IDsOfElements) { - ::SMESH_MeshEditor anEditor( _myMesh ); + initData(); + + ::SMESH_MeshEditor anEditor( myMesh ); for (int i = 0; i < IDsOfElements.length(); i++) { CORBA::Long index = IDsOfElements[i]; @@ -407,9 +646,7 @@ CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::long_array & IDsOfEleme anEditor.Reorient( elem ); } // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.Reorient("); - SMESH_Gen_i::AddArray( str, IDsOfElements ) += ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = " << this << ".Reorient( " << IDsOfElements << " )"; return true; } @@ -417,12 +654,14 @@ CORBA::Boolean SMESH_MeshEditor_i::Reorient(const SMESH::long_array & IDsOfEleme //============================================================================= /*! - * + * */ //============================================================================= CORBA::Boolean SMESH_MeshEditor_i::ReorientObject(SMESH::SMESH_IDSource_ptr theObject) { + initData(); + SMESH::long_array_var anElementsId = theObject->GetIDs(); CORBA::Boolean isDone = Reorient(anElementsId); @@ -431,33 +670,53 @@ CORBA::Boolean SMESH_MeshEditor_i::ReorientObject(SMESH::SMESH_IDSource_ptr theO aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID()); // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.ReorientObject("); - SMESH_Gen_i::AddObject( str, theObject ) += ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = " << this << ".ReorientObject( " << theObject << " )"; return isDone; } +namespace +{ + //================================================================================ + /*! + * \brief function for conversion long_array to TIDSortedElemSet + * \param IDs - array of IDs + * \param aMesh - mesh + * \param aMap - collection to fill + * \param aType - element type + */ + //================================================================================ + + void ToMap(const SMESH::long_array & IDs, + const SMESHDS_Mesh* aMesh, + TIDSortedElemSet& aMap, + const SMDSAbs_ElementType aType = SMDSAbs_All ) + { + for (int i=0; iFindElement(ind); + if ( elem && ( aType == SMDSAbs_All || elem->GetType() == aType )) + aMap.insert( elem ); + } + } +} + //============================================================================= /*! - * + * */ //============================================================================= - -CORBA::Boolean - SMESH_MeshEditor_i::TriToQuad (const SMESH::long_array & IDsOfElements, - SMESH::NumericalFunctor_ptr Criterion, - CORBA::Double MaxAngle) +CORBA::Boolean SMESH_MeshEditor_i::TriToQuad (const SMESH::long_array & IDsOfElements, + SMESH::NumericalFunctor_ptr Criterion, + CORBA::Double MaxAngle) { - set faces; - for (int i = 0; i < IDsOfElements.length(); i++) - { - CORBA::Long index = IDsOfElements[i]; - const SMDS_MeshElement * elem = GetMeshDS()->FindElement(index); - if ( elem && elem->GetType() == SMDSAbs_Face) - faces.insert( elem ); - } - SMESH::NumericalFunctor_i* aNumericalFunctor = + initData(); + + SMESHDS_Mesh* aMesh = GetMeshDS(); + TIDSortedElemSet faces; + ToMap(IDsOfElements, aMesh, faces, SMDSAbs_Face); + + SMESH::NumericalFunctor_i* aNumericalFunctor = dynamic_cast( SMESH_Gen_i::GetServant( Criterion ).in() ); SMESH::Controls::NumericalFunctorPtr aCrit; if ( !aNumericalFunctor ) @@ -466,29 +725,33 @@ CORBA::Boolean aCrit = aNumericalFunctor->GetNumericalFunctor(); // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.TriToQuad("); - SMESH_Gen_i::AddArray( str, IDsOfElements ) += ", None, "; - str += (Standard_Real) MaxAngle; - SMESH_Gen_i::AddToCurrentPyScript( str + ")" ); + TPythonDump() << "isDone = " << this << ".TriToQuad( " + << IDsOfElements << ", " << aNumericalFunctor << ", " << MaxAngle << " )"; #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"TriToQuad: \", isDone" ); + TPythonDump() << "print 'TriToQuad: ', isDone"; #endif - ::SMESH_MeshEditor anEditor( _myMesh ); - return anEditor.TriToQuad( faces, aCrit, MaxAngle ); + ::SMESH_MeshEditor anEditor( myMesh ); + + bool stat = anEditor.TriToQuad( faces, aCrit, MaxAngle ); + + StoreResult(anEditor); + + return stat; } + //============================================================================= /*! - * + * */ //============================================================================= - -CORBA::Boolean - SMESH_MeshEditor_i::TriToQuadObject (SMESH::SMESH_IDSource_ptr theObject, - SMESH::NumericalFunctor_ptr Criterion, - CORBA::Double MaxAngle) +CORBA::Boolean SMESH_MeshEditor_i::TriToQuadObject (SMESH::SMESH_IDSource_ptr theObject, + SMESH::NumericalFunctor_ptr Criterion, + CORBA::Double MaxAngle) { + initData(); + SMESH::long_array_var anElementsId = theObject->GetIDs(); CORBA::Boolean isDone = TriToQuad(anElementsId, Criterion, MaxAngle); @@ -499,37 +762,35 @@ CORBA::Boolean aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID()); #endif + SMESH::NumericalFunctor_i* aNumericalFunctor = + SMESH::DownCast( Criterion ); + // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.TriToQuadObject("); - SMESH_Gen_i::AddObject( str, theObject ) += ", None, "; - str += (Standard_Real) MaxAngle; - SMESH_Gen_i::AddToCurrentPyScript( str + ")" ); + TPythonDump() << "isDone = " << this << ".TriToQuadObject(" + << theObject << ", " << aNumericalFunctor << ", " << MaxAngle << " )"; #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"TriToQuadObject: \", isDone" ); + TPythonDump() << "print 'TriToQuadObject: ', isDone"; #endif return isDone; } + //============================================================================= /*! - * + * */ //============================================================================= - -CORBA::Boolean - SMESH_MeshEditor_i::QuadToTri(const SMESH::long_array & IDsOfElements, - SMESH::NumericalFunctor_ptr Criterion) +CORBA::Boolean SMESH_MeshEditor_i::QuadToTri (const SMESH::long_array & IDsOfElements, + SMESH::NumericalFunctor_ptr Criterion) { - set faces; - for (int i = 0; i < IDsOfElements.length(); i++) - { - CORBA::Long index = IDsOfElements[i]; - const SMDS_MeshElement * elem = GetMeshDS()->FindElement(index); - if ( elem && elem->GetType() == SMDSAbs_Face) - faces.insert( elem ); - } - SMESH::NumericalFunctor_i* aNumericalFunctor = + initData(); + + SMESHDS_Mesh* aMesh = GetMeshDS(); + TIDSortedElemSet faces; + ToMap(IDsOfElements, aMesh, faces, SMDSAbs_Face); + + SMESH::NumericalFunctor_i* aNumericalFunctor = dynamic_cast( SMESH_Gen_i::GetServant( Criterion ).in() ); SMESH::Controls::NumericalFunctorPtr aCrit; if ( !aNumericalFunctor ) @@ -539,59 +800,93 @@ CORBA::Boolean // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.QuadToTri("); - SMESH_Gen_i::AddArray( str, IDsOfElements ) += ", None ), "; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = " << this << ".QuadToTri( " << IDsOfElements << ", " << aNumericalFunctor << " )"; #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"QuadToTri: \", isDone" ); + TPythonDump() << "print 'QuadToTri: ', isDone"; #endif - ::SMESH_MeshEditor anEditor( _myMesh ); - return anEditor.QuadToTri( faces, aCrit ); + ::SMESH_MeshEditor anEditor( myMesh ); + CORBA::Boolean stat = anEditor.QuadToTri( faces, aCrit ); + + StoreResult(anEditor); + + return stat; } + //============================================================================= /*! - * + * */ //============================================================================= - -CORBA::Boolean - SMESH_MeshEditor_i::SplitQuad(const SMESH::long_array & IDsOfElements, - CORBA::Boolean Diag13) +CORBA::Boolean SMESH_MeshEditor_i::QuadToTriObject (SMESH::SMESH_IDSource_ptr theObject, + SMESH::NumericalFunctor_ptr Criterion) { - set faces; - for (int i = 0; i < IDsOfElements.length(); i++) - { - CORBA::Long index = IDsOfElements[i]; - const SMDS_MeshElement * elem = GetMeshDS()->FindElement(index); - if ( elem && elem->GetType() == SMDSAbs_Face) - faces.insert( elem ); - } + initData(); + + SMESH::long_array_var anElementsId = theObject->GetIDs(); + CORBA::Boolean isDone = QuadToTri(anElementsId, Criterion); + + // Clear python line(s), created by QuadToTri() + SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); + aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID()); +#ifdef _DEBUG_ + aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID()); +#endif + + SMESH::NumericalFunctor_i* aNumericalFunctor = + SMESH::DownCast( Criterion ); // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.SplitQuad("); - SMESH_Gen_i::AddArray( str, IDsOfElements ) += ", "; - str += TCollection_AsciiString( Diag13 ); - SMESH_Gen_i::AddToCurrentPyScript( str + ")" ); + TPythonDump() << "isDone = " << this << ".QuadToTriObject( " << theObject << ", " << aNumericalFunctor << " )"; #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"SplitQuad: \", isDone" ); + TPythonDump() << "print 'QuadToTriObject: ', isDone"; #endif - ::SMESH_MeshEditor anEditor( _myMesh ); - return anEditor.QuadToTri( faces, Diag13 ); + return isDone; } + //============================================================================= /*! - * + * */ //============================================================================= +CORBA::Boolean SMESH_MeshEditor_i::SplitQuad (const SMESH::long_array & IDsOfElements, + CORBA::Boolean Diag13) +{ + initData(); -CORBA::Boolean - SMESH_MeshEditor_i::SplitQuadObject(SMESH::SMESH_IDSource_ptr theObject, - CORBA::Boolean Diag13) + SMESHDS_Mesh* aMesh = GetMeshDS(); + TIDSortedElemSet faces; + ToMap(IDsOfElements, aMesh, faces, SMDSAbs_Face); + + // Update Python script + TPythonDump() << "isDone = " << this << ".SplitQuad( " + << IDsOfElements << ", " << Diag13 << " )"; +#ifdef _DEBUG_ + TPythonDump() << "print 'SplitQuad: ', isDone"; +#endif + + ::SMESH_MeshEditor anEditor( myMesh ); + CORBA::Boolean stat = anEditor.QuadToTri( faces, Diag13 ); + + StoreResult(anEditor); + + return stat; +} + + +//============================================================================= +/*! + * + */ +//============================================================================= +CORBA::Boolean SMESH_MeshEditor_i::SplitQuadObject (SMESH::SMESH_IDSource_ptr theObject, + CORBA::Boolean Diag13) { + initData(); + SMESH::long_array_var anElementsId = theObject->GetIDs(); CORBA::Boolean isDone = SplitQuad(anElementsId, Diag13); @@ -603,20 +898,45 @@ CORBA::Boolean #endif // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor.SplitQuadObject("); - SMESH_Gen_i::AddObject( str, theObject ) += ", "; - str += TCollection_AsciiString( Diag13 ) + ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = " << this << ".SplitQuadObject( " + << theObject << ", " << Diag13 << " )"; #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"SplitQuadObject: \", isDone" ); + TPythonDump() << "print 'SplitQuadObject: ', isDone"; #endif return isDone; } + +//============================================================================= +/*! + * BestSplit + */ +//============================================================================= +CORBA::Long SMESH_MeshEditor_i::BestSplit (CORBA::Long IDOfQuad, + SMESH::NumericalFunctor_ptr Criterion) +{ + const SMDS_MeshElement* quad = GetMeshDS()->FindElement(IDOfQuad); + if (quad && quad->GetType() == SMDSAbs_Face && quad->NbNodes() == 4) + { + SMESH::NumericalFunctor_i* aNumericalFunctor = + dynamic_cast(SMESH_Gen_i::GetServant(Criterion).in()); + SMESH::Controls::NumericalFunctorPtr aCrit; + if (aNumericalFunctor) + aCrit = aNumericalFunctor->GetNumericalFunctor(); + else + aCrit.reset(new SMESH::Controls::AspectRatio()); + + ::SMESH_MeshEditor anEditor (myMesh); + return anEditor.BestSplit(quad, aCrit); + } + return -1; +} + + //======================================================================= //function : Smooth -//purpose : +//purpose : //======================================================================= CORBA::Boolean @@ -630,9 +950,10 @@ CORBA::Boolean MaxAspectRatio, Method, false ); } + //======================================================================= //function : SmoothParametric -//purpose : +//purpose : //======================================================================= CORBA::Boolean @@ -646,9 +967,10 @@ CORBA::Boolean MaxAspectRatio, Method, true ); } + //======================================================================= //function : SmoothObject -//purpose : +//purpose : //======================================================================= CORBA::Boolean @@ -662,9 +984,10 @@ CORBA::Boolean MaxAspectRatio, Method, false); } + //======================================================================= //function : SmoothParametricObject -//purpose : +//purpose : //======================================================================= CORBA::Boolean @@ -678,9 +1001,10 @@ CORBA::Boolean MaxAspectRatio, Method, true); } + //============================================================================= /*! - * + * */ //============================================================================= @@ -692,20 +1016,15 @@ CORBA::Boolean SMESH::SMESH_MeshEditor::Smooth_Method Method, bool IsParametric) { + initData(); + SMESHDS_Mesh* aMesh = GetMeshDS(); - set elements; - for (int i = 0; i < IDsOfElements.length(); i++) - { - CORBA::Long index = IDsOfElements[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(index); - if ( elem && elem->GetType() == SMDSAbs_Face) - elements.insert( elem ); - } + TIDSortedElemSet elements; + ToMap(IDsOfElements, aMesh, elements, SMDSAbs_Face); set fixedNodes; - for (int i = 0; i < IDsOfFixedNodes.length(); i++) - { + for (int i = 0; i < IDsOfFixedNodes.length(); i++) { CORBA::Long index = IDsOfFixedNodes[i]; const SMDS_MeshNode * node = aMesh->FindNode(index); if ( node ) @@ -715,46 +1034,44 @@ CORBA::Boolean if ( Method != SMESH::SMESH_MeshEditor::LAPLACIAN_SMOOTH ) method = ::SMESH_MeshEditor::CENTROIDAL; - ::SMESH_MeshEditor anEditor( _myMesh ); + ::SMESH_MeshEditor anEditor( myMesh ); anEditor.Smooth(elements, fixedNodes, method, MaxNbOfIterations, MaxAspectRatio, IsParametric ); + StoreResult(anEditor); + // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor."); - str += (char*) (IsParametric ? "SmoothParametric( " : "Smooth( "); - SMESH_Gen_i::AddArray( str, IDsOfElements ) += ", "; - SMESH_Gen_i::AddArray( str, IDsOfFixedNodes ) += ", "; - str += (Standard_Integer) MaxNbOfIterations; - str += ", "; - str += (Standard_Real) MaxAspectRatio; - if ( method == ::SMESH_MeshEditor::CENTROIDAL ) - str += ", SMESH.SMESH_MeshEditor.CENTROIDAL_SMOOTH, "; - else - str += ", SMESH.SMESH_MeshEditor.LAPLACIAN_SMOOTH, "; - str += IsParametric; - str += " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = " << this << "." + << (IsParametric ? "SmoothParametric( " : "Smooth( ") + << IDsOfElements << ", " << IDsOfFixedNodes << ", " + << MaxNbOfIterations << ", " << MaxAspectRatio << ", " + << "SMESH.SMESH_MeshEditor." + << ( Method == SMESH::SMESH_MeshEditor::CENTROIDAL_SMOOTH ? + "CENTROIDAL_SMOOTH )" : "LAPLACIAN_SMOOTH )"); #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"Smooth: \", isDone" ); + TPythonDump() << "print 'Smooth: ', isDone"; #endif return true; } + //============================================================================= /*! - * + * */ //============================================================================= CORBA::Boolean - SMESH_MeshEditor_i::smoothObject(SMESH::SMESH_IDSource_ptr theObject, - const SMESH::long_array & IDsOfFixedNodes, - CORBA::Long MaxNbOfIterations, - CORBA::Double MaxAspectRatio, - SMESH::SMESH_MeshEditor::Smooth_Method Method, - bool IsParametric) +SMESH_MeshEditor_i::smoothObject(SMESH::SMESH_IDSource_ptr theObject, + const SMESH::long_array & IDsOfFixedNodes, + CORBA::Long MaxNbOfIterations, + CORBA::Double MaxAspectRatio, + SMESH::SMESH_MeshEditor::Smooth_Method Method, + bool IsParametric) { + initData(); + SMESH::long_array_var anElementsId = theObject->GetIDs(); CORBA::Boolean isDone = smooth (anElementsId, IDsOfFixedNodes, MaxNbOfIterations, MaxAspectRatio, Method, IsParametric); @@ -767,58 +1084,54 @@ CORBA::Boolean #endif // Update Python script - TCollection_AsciiString str ("isDone = mesh_editor."); - str += (char*) (IsParametric ? "SmoothParametricObject( " : "SmoothObject( "); - SMESH_Gen_i::AddObject( str, theObject ) += ", "; - SMESH_Gen_i::AddArray( str, IDsOfFixedNodes ) += ", "; - str += (Standard_Integer) MaxNbOfIterations; - str += ", "; - str += (Standard_Real) MaxAspectRatio; - if ( Method == ::SMESH_MeshEditor::CENTROIDAL ) - str += ", SMESH.SMESH_MeshEditor.CENTROIDAL_SMOOTH, "; - else - str += ", SMESH.SMESH_MeshEditor.LAPLACIAN_SMOOTH, "; - str += IsParametric; - str += " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "isDone = " << this << "." + << (IsParametric ? "SmoothParametricObject( " : "SmoothObject( ") + << theObject << ", " << IDsOfFixedNodes << ", " + << MaxNbOfIterations << ", " << MaxAspectRatio << ", " + << "SMESH.SMESH_MeshEditor." + << ( Method == SMESH::SMESH_MeshEditor::CENTROIDAL_SMOOTH ? + "CENTROIDAL_SMOOTH )" : "LAPLACIAN_SMOOTH )"); #ifdef _DEBUG_ - SMESH_Gen_i::AddToCurrentPyScript( "print \"SmoothObject: \", isDone" ); + TPythonDump() << "print 'SmoothObject: ', isDone"; #endif return isDone; } + //============================================================================= /*! - * + * */ //============================================================================= void SMESH_MeshEditor_i::RenumberNodes() { // Update Python script - SMESH_Gen_i::AddToCurrentPyScript( "mesh_editor.RenumberNodes()" ); + TPythonDump() << this << ".RenumberNodes()"; GetMeshDS()->Renumber( true ); } + //============================================================================= /*! - * + * */ //============================================================================= void SMESH_MeshEditor_i::RenumberElements() { // Update Python script - SMESH_Gen_i::AddToCurrentPyScript( "mesh_editor.RenumberElements()" ); + TPythonDump() << this << ".RenumberElements()"; GetMeshDS()->Renumber( false ); } + //======================================================================= //function : RotationSweep -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::RotationSweep(const SMESH::long_array & theIDsOfElements, @@ -827,38 +1140,52 @@ void SMESH_MeshEditor_i::RotationSweep(const SMESH::long_array & theIDsOfElement CORBA::Long theNbOfSteps, CORBA::Double theTolerance) { - SMESHDS_Mesh* aMesh = GetMeshDS(); + initData(); + + TIDSortedElemSet inElements, copyElements; + ToMap(theIDsOfElements, GetMeshDS(), inElements); - set elements; - for (int i = 0; i < theIDsOfElements.length(); i++) + TIDSortedElemSet* workElements = & inElements; + TPreviewMesh tmpMesh( SMDSAbs_Face ); + SMESH_Mesh* mesh = 0; + bool makeWalls=true; + if ( myPreviewMode ) { - CORBA::Long index = theIDsOfElements[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(index); - if ( elem ) - elements.insert( elem ); + SMDSAbs_ElementType select = SMDSAbs_All, avoid = SMDSAbs_Volume; + tmpMesh.Copy( inElements, copyElements, select, avoid ); + mesh = &tmpMesh; + workElements = & copyElements; + //makeWalls = false; + } + else + { + mesh = myMesh; } - gp_Ax1 Ax1 (gp_Pnt( theAxis.x, theAxis.y, theAxis.z ), + + gp_Ax1 Ax1 (gp_Pnt( theAxis.x, theAxis.y, theAxis.z ), gp_Vec( theAxis.vx, theAxis.vy, theAxis.vz )); - ::SMESH_MeshEditor anEditor( _myMesh ); - anEditor.RotationSweep (elements, Ax1, theAngleInRadians, - theNbOfSteps, theTolerance); + ::SMESH_MeshEditor anEditor( mesh ); + anEditor.RotationSweep (*workElements, Ax1, theAngleInRadians, + theNbOfSteps, theTolerance, makeWalls); - // Update Python script - TCollection_AsciiString str = "axis = "; - addAxis( str, theAxis ); - SMESH_Gen_i::AddToCurrentPyScript( str ); - str = "mesh_editor.RotationSweep("; - SMESH_Gen_i::AddArray( str, theIDsOfElements ) += ", axis, "; - str += TCollection_AsciiString( theAngleInRadians ) + ", "; - str += TCollection_AsciiString( (int)theNbOfSteps ) + ", "; - str += TCollection_AsciiString( theTolerance ) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + StoreResult(anEditor); + + if ( !myPreviewMode ) { + // Update Python script + TPythonDump() << "axis = " << theAxis; + TPythonDump() << this << ".RotationSweep( " + << theIDsOfElements + << ", axis, " + << theAngleInRadians << ", " + << theNbOfSteps << ", " + << theTolerance << " )"; + } } //======================================================================= //function : RotationSweepObject -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::RotationSweepObject(SMESH::SMESH_IDSource_ptr theObject, @@ -867,6 +1194,8 @@ void SMESH_MeshEditor_i::RotationSweepObject(SMESH::SMESH_IDSource_ptr theObject CORBA::Long theNbOfSteps, CORBA::Double theTolerance) { + initData(); + SMESH::long_array_var anElementsId = theObject->GetIDs(); RotationSweep(anElementsId, theAxis, theAngleInRadians, theNbOfSteps, theTolerance); @@ -875,61 +1204,72 @@ void SMESH_MeshEditor_i::RotationSweepObject(SMESH::SMESH_IDSource_ptr theObject aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID()); // Update Python script - TCollection_AsciiString str ("mesh_editor.RotationSweepObject("); - SMESH_Gen_i::AddObject( str, theObject ) += ", axis, "; - str += TCollection_AsciiString( theAngleInRadians ) + ", "; - str += TCollection_AsciiString( (int)theNbOfSteps ) + ", "; - str += TCollection_AsciiString( theTolerance ) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << this << ".RotationSweepObject( " + << theObject + << ", axis, " + << theAngleInRadians << ", " + << theNbOfSteps << ", " + << theTolerance << " )"; } //======================================================================= //function : ExtrusionSweep -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::ExtrusionSweep(const SMESH::long_array & theIDsOfElements, const SMESH::DirStruct & theStepVector, CORBA::Long theNbOfSteps) { - SMESHDS_Mesh* aMesh = GetMeshDS(); + initData(); - set elements; - for (int i = 0; i < theIDsOfElements.length(); i++) - { - CORBA::Long index = theIDsOfElements[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(index); - if ( elem ) - elements.insert( elem ); - } - const SMESH::PointStruct * P = &theStepVector.PS; - gp_Vec stepVec( P->x, P->y, P->z ); +#ifdef NO_CAS_CATCH + try { + OCC_CATCH_SIGNALS; +#else + CASCatch_TRY { +#endif + SMESHDS_Mesh* aMesh = GetMeshDS(); - ::SMESH_MeshEditor anEditor( _myMesh ); - anEditor.ExtrusionSweep (elements, stepVec, theNbOfSteps); + TIDSortedElemSet elements; + ToMap(theIDsOfElements, aMesh, elements); - // Update Python script - TCollection_AsciiString str = "stepVector = SMESH.DirStruct( SMESH.PointStruct ( "; - str += (TCollection_AsciiString) stepVec.X() + ", "; - str += (TCollection_AsciiString) stepVec.Y() + ", "; - str += (TCollection_AsciiString) stepVec.Z() + " ))"; - SMESH_Gen_i::AddToCurrentPyScript( str ); - str = ("mesh_editor.ExtrusionSweep("); - SMESH_Gen_i::AddArray( str, theIDsOfElements ) += ", stepVector, "; - str += TCollection_AsciiString((int)theNbOfSteps) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + const SMESH::PointStruct * P = &theStepVector.PS; + gp_Vec stepVec( P->x, P->y, P->z ); + + TElemOfElemListMap aHystory; + ::SMESH_MeshEditor anEditor( myMesh ); + anEditor.ExtrusionSweep (elements, stepVec, theNbOfSteps, aHystory); + + StoreResult(anEditor); + + // Update Python script + TPythonDump() << "stepVector = " << theStepVector; + TPythonDump() << this << ".ExtrusionSweep( " + << theIDsOfElements << ", stepVector, " << theNbOfSteps << " )"; + +#ifdef NO_CAS_CATCH + } catch(Standard_Failure) { +#else + } CASCatch_CATCH(Standard_Failure) { +#endif + Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + INFOS( "SMESH_MeshEditor_i::ExtrusionSweep fails - "<< aFail->GetMessageString() ); + } } //======================================================================= //function : ExtrusionSweepObject -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::ExtrusionSweepObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct & theStepVector, CORBA::Long theNbOfSteps) { + initData(); + SMESH::long_array_var anElementsId = theObject->GetIDs(); ExtrusionSweep(anElementsId, theStepVector, theNbOfSteps); @@ -938,67 +1278,118 @@ void SMESH_MeshEditor_i::ExtrusionSweepObject(SMESH::SMESH_IDSource_ptr theObjec aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID()); // Update Python script - TCollection_AsciiString str ("mesh_editor.ExtrusionSweepObject("); - SMESH_Gen_i::AddObject( str, theObject ) += ", stepVector, "; - str += TCollection_AsciiString((int)theNbOfSteps) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << this << ".ExtrusionSweepObject( " + << theObject << ", stepVector, " << theNbOfSteps << " )"; } + //======================================================================= //function : ExtrusionSweepObject1D -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::ExtrusionSweepObject1D(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct & theStepVector, CORBA::Long theNbOfSteps) { + initData(); + SMESHDS_Mesh* aMesh = GetMeshDS(); SMESH::long_array_var allElementsId = theObject->GetIDs(); - set elements; - for (int i = 0; i < allElementsId->length(); i++) - { - CORBA::Long index = allElementsId[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(index); - if ( elem && elem->GetType() == SMDSAbs_Edge ) - elements.insert( elem ); - } + TIDSortedElemSet elements; + ToMap(allElementsId, aMesh, elements); + const SMESH::PointStruct * P = &theStepVector.PS; gp_Vec stepVec( P->x, P->y, P->z ); - ::SMESH_MeshEditor anEditor( _myMesh ); - anEditor.ExtrusionSweep (elements, stepVec, theNbOfSteps); + ::SMESH_MeshEditor anEditor( myMesh ); + //anEditor.ExtrusionSweep (elements, stepVec, theNbOfSteps); + TElemOfElemListMap aHystory; + anEditor.ExtrusionSweep (elements, stepVec, theNbOfSteps, aHystory); + + StoreResult(anEditor); + + // Update Python script + TPythonDump() << "stepVector = " << theStepVector; + TPythonDump() << this << ".ExtrusionSweepObject1D( " + << theObject << ", stepVector, " << theNbOfSteps << " )"; } //======================================================================= //function : ExtrusionSweepObject2D -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::ExtrusionSweepObject2D(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct & theStepVector, CORBA::Long theNbOfSteps) { + initData(); + SMESHDS_Mesh* aMesh = GetMeshDS(); SMESH::long_array_var allElementsId = theObject->GetIDs(); - set elements; - for (int i = 0; i < allElementsId->length(); i++) - { - CORBA::Long index = allElementsId[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(index); - if ( elem && elem->GetType() == SMDSAbs_Face ) - elements.insert( elem ); - } + TIDSortedElemSet elements; + ToMap(allElementsId, aMesh, elements); + + const SMESH::PointStruct * P = &theStepVector.PS; + gp_Vec stepVec( P->x, P->y, P->z ); + + ::SMESH_MeshEditor anEditor( myMesh ); + //anEditor.ExtrusionSweep (elements, stepVec, theNbOfSteps); + TElemOfElemListMap aHystory; + anEditor.ExtrusionSweep (elements, stepVec, theNbOfSteps, aHystory); + + StoreResult(anEditor); + + // Update Python script + TPythonDump() << "stepVector = " << theStepVector; + TPythonDump() << this << ".ExtrusionSweepObject2D( " + << theObject << ", stepVector, " << theNbOfSteps << " )"; +} + + +//======================================================================= +//function : AdvancedExtrusion +//purpose : +//======================================================================= + +void SMESH_MeshEditor_i::AdvancedExtrusion(const SMESH::long_array & theIDsOfElements, + const SMESH::DirStruct & theStepVector, + CORBA::Long theNbOfSteps, + CORBA::Long theExtrFlags, + CORBA::Double theSewTolerance) +{ + initData(); + + SMESHDS_Mesh* aMesh = GetMeshDS(); + + TIDSortedElemSet elements; + ToMap(theIDsOfElements, aMesh, elements); + const SMESH::PointStruct * P = &theStepVector.PS; gp_Vec stepVec( P->x, P->y, P->z ); - ::SMESH_MeshEditor anEditor( _myMesh ); - anEditor.ExtrusionSweep (elements, stepVec, theNbOfSteps); + ::SMESH_MeshEditor anEditor( myMesh ); + TElemOfElemListMap aHystory; + anEditor.ExtrusionSweep (elements, stepVec, theNbOfSteps, aHystory, + theExtrFlags, theSewTolerance); + + StoreResult(anEditor); + + // Update Python script + TPythonDump() << "stepVector = " << theStepVector; + TPythonDump() << this << ".AdvancedExtrusion(" + << theIDsOfElements + << ", stepVector, " + << theNbOfSteps << "," + << theExtrFlags << ", " + << theSewTolerance << " )"; } + #define RETCASE(enm) case ::SMESH_MeshEditor::enm: return SMESH::SMESH_MeshEditor::enm; static SMESH::SMESH_MeshEditor::Extrusion_Error convExtrError( const::SMESH_MeshEditor::Extrusion_Error e ) @@ -1017,7 +1408,7 @@ static SMESH::SMESH_MeshEditor::Extrusion_Error convExtrError( const::SMESH_Mesh //======================================================================= //function : ExtrusionAlongPath -//purpose : +//purpose : //======================================================================= SMESH::SMESH_MeshEditor::Extrusion_Error @@ -1030,6 +1421,8 @@ SMESH::SMESH_MeshEditor::Extrusion_Error CORBA::Boolean theHasRefPoint, const SMESH::PointStruct & theRefPoint) { + initData(); + SMESHDS_Mesh* aMesh = GetMeshDS(); if ( thePathMesh->_is_nil() || thePathShape->_is_nil() ) @@ -1039,65 +1432,71 @@ SMESH::SMESH_MeshEditor::Extrusion_Error TopoDS_Shape aShape = SMESH_Gen_i::GetSMESHGen()->GeomObjectToShape( thePathShape ); SMESH_subMesh* aSubMesh = aMeshImp->GetImpl().GetSubMesh( aShape ); - if ( !aSubMesh ) + if ( !aSubMesh || !aSubMesh->GetSubMeshDS()) return SMESH::SMESH_MeshEditor::EXTR_BAD_PATH_SHAPE; SMDS_MeshNode* nodeStart = (SMDS_MeshNode*)aMeshImp->GetImpl().GetMeshDS()->FindNode(theNodeStart); if ( !nodeStart ) return SMESH::SMESH_MeshEditor::EXTR_BAD_STARTING_NODE; - set elements; - for (int i = 0; i < theIDsOfElements.length(); i++) - { - CORBA::Long index = theIDsOfElements[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(index); - if ( elem ) - elements.insert( elem ); - } + TIDSortedElemSet elements; + ToMap(theIDsOfElements, aMesh, elements); list angles; - for (int i = 0; i < theAngles.length(); i++) - { + for (int i = 0; i < theAngles.length(); i++) { angles.push_back( theAngles[i] ); } gp_Pnt refPnt( theRefPoint.x, theRefPoint.y, theRefPoint.z ); // Update Python script - TCollection_AsciiString str = "refPoint = SMESH.PointStruct( "; - str += (TCollection_AsciiString) refPnt.X() + ", "; - str += (TCollection_AsciiString) refPnt.Y() + ", "; - str += (TCollection_AsciiString) refPnt.Z() + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); - str = ("error = mesh_editor.ExtrusionAlongPath("); - SMESH_Gen_i::AddArray ( str, theIDsOfElements ) += ", "; - SMESH_Gen_i::AddObject( str, thePathMesh ) += ", "; - SMESH_Gen_i::AddObject( str, thePathShape ) += ", "; - str += TCollection_AsciiString( (int)theNodeStart ) + ", "; - str += TCollection_AsciiString( (int)theHasAngles ) + ", "; - SMESH_Gen_i::AddArray ( str, theAngles ) += ", "; - str += (TCollection_AsciiString) theHasRefPoint + ", refPoint )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); - - ::SMESH_MeshEditor anEditor( _myMesh ); - return convExtrError( anEditor.ExtrusionAlongTrack( elements, aSubMesh, nodeStart, theHasAngles, angles, theHasRefPoint, refPnt ) ); + TPythonDump() << "rotAngles = " << theAngles; + + if ( theHasRefPoint ) + TPythonDump() << "refPoint = SMESH.PointStruct( " + << refPnt.X() << ", " + << refPnt.Y() << ", " + << refPnt.Z() << " )"; + else + TPythonDump() << "refPoint = SMESH.PointStruct( 0,0,0 )"; + + TPythonDump() << "error = " << this << ".ExtrusionAlongPath( " + << theIDsOfElements << ", " + << thePathMesh << ", " + << thePathShape << ", " + << theNodeStart << ", " + << theHasAngles << ", " + << "rotAngles" << ", " + << theHasRefPoint << ", refPoint )"; + + ::SMESH_MeshEditor anEditor( myMesh ); + SMESH::SMESH_MeshEditor::Extrusion_Error error = + convExtrError( anEditor.ExtrusionAlongTrack( elements, aSubMesh, nodeStart, + theHasAngles, angles, + theHasRefPoint, refPnt ) ); + + StoreResult(anEditor); + + return error; } //======================================================================= //function : ExtrusionAlongPathObject -//purpose : +//purpose : //======================================================================= SMESH::SMESH_MeshEditor::Extrusion_Error - SMESH_MeshEditor_i::ExtrusionAlongPathObject(SMESH::SMESH_IDSource_ptr theObject, - SMESH::SMESH_Mesh_ptr thePathMesh, - GEOM::GEOM_Object_ptr thePathShape, - CORBA::Long theNodeStart, - CORBA::Boolean theHasAngles, - const SMESH::double_array & theAngles, - CORBA::Boolean theHasRefPoint, - const SMESH::PointStruct & theRefPoint) +SMESH_MeshEditor_i::ExtrusionAlongPathObject(SMESH::SMESH_IDSource_ptr theObject, + SMESH::SMESH_Mesh_ptr thePathMesh, + GEOM::GEOM_Object_ptr thePathShape, + CORBA::Long theNodeStart, + CORBA::Boolean theHasAngles, + const SMESH::double_array & theAngles, + CORBA::Boolean theHasRefPoint, + const SMESH::PointStruct & theRefPoint) { + initData(); + SMESH::long_array_var anElementsId = theObject->GetIDs(); SMESH::SMESH_MeshEditor::Extrusion_Error error = ExtrusionAlongPath (anElementsId, thePathMesh, thePathShape, theNodeStart, @@ -1108,22 +1507,42 @@ SMESH::SMESH_MeshEditor::Extrusion_Error aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID()); // Update Python script - TCollection_AsciiString str ("error = mesh_editor.ExtrusionAlongPathObject("); - SMESH_Gen_i::AddObject( str, theObject ) += ", "; - SMESH_Gen_i::AddObject( str, thePathMesh ) += ", "; - SMESH_Gen_i::AddObject( str, thePathShape ) += ", "; - str += TCollection_AsciiString( (int)theNodeStart ) + ", "; - str += TCollection_AsciiString( theHasAngles ) + ", "; - SMESH_Gen_i::AddArray ( str, theAngles ) += ", "; - str += TCollection_AsciiString( theHasRefPoint ) + ", refPoint )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "rotAngles = " << theAngles; + TPythonDump() << "error = " << this << ".ExtrusionAlongPathObject( " + << theObject << ", " + << thePathMesh << ", " + << thePathShape << ", " + << theNodeStart << ", " + << theHasAngles << ", " + << "rotAngles" << ", " + << theHasRefPoint<<", refPoint )"; return error; } +//================================================================================ +/*! + * \brief Compute rotation angles for ExtrusionAlongPath as linear variation + * of given angles along path steps + * \param PathMesh mesh containing a 1D sub-mesh on the edge, along + * which proceeds the extrusion + * \param PathShape is shape(edge); as the mesh can be complex, the edge + * is used to define the sub-mesh for the path + */ +//================================================================================ + +SMESH::double_array* +SMESH_MeshEditor_i::LinearAnglesVariation(SMESH::SMESH_Mesh_ptr thePathMesh, + GEOM::GEOM_Object_ptr thePathShape, + const SMESH::double_array & theAngles) +{ + SMESH::double_array_var aResult = new SMESH::double_array(); + return aResult._retn(); +} + //======================================================================= //function : Mirror -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::Mirror(const SMESH::long_array & theIDsOfElements, @@ -1131,21 +1550,18 @@ void SMESH_MeshEditor_i::Mirror(const SMESH::long_array & theIDsOfElem SMESH::SMESH_MeshEditor::MirrorType theMirrorType, CORBA::Boolean theCopy) { + initData(); + SMESHDS_Mesh* aMesh = GetMeshDS(); - set elements; - for (int i = 0; i < theIDsOfElements.length(); i++) - { - CORBA::Long index = theIDsOfElements[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(index); - if ( elem ) - elements.insert( elem ); - } + TIDSortedElemSet elements; + ToMap(theIDsOfElements, aMesh, elements); + gp_Pnt P ( theAxis.x, theAxis.y, theAxis.z ); gp_Vec V ( theAxis.vx, theAxis.vy, theAxis.vz ); gp_Trsf aTrsf; - TCollection_AsciiString typeStr, copyStr( theCopy ); + TCollection_AsciiString typeStr; switch ( theMirrorType ) { case SMESH::SMESH_MeshEditor::POINT: aTrsf.SetMirror( P ); @@ -1161,20 +1577,24 @@ void SMESH_MeshEditor_i::Mirror(const SMESH::long_array & theIDsOfElem } // Update Python script - TCollection_AsciiString str ("mesh_editor.Mirror("); - SMESH_Gen_i::AddArray( str, theIDsOfElements ) += ", "; - addAxis( str, theAxis ) += ", "; - str += typeStr + ", "; - str += copyStr + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); - - ::SMESH_MeshEditor anEditor( _myMesh ); + TPythonDump() << this << ".Mirror( " + << theIDsOfElements << ", " + << theAxis << ", " + << typeStr << ", " + << theCopy << " )"; + + ::SMESH_MeshEditor anEditor( myMesh ); anEditor.Transform (elements, aTrsf, theCopy); + + if(theCopy) { + StoreResult(anEditor); + } } + //======================================================================= //function : MirrorObject -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::MirrorObject(SMESH::SMESH_IDSource_ptr theObject, @@ -1182,6 +1602,8 @@ void SMESH_MeshEditor_i::MirrorObject(SMESH::SMESH_IDSource_ptr theObj SMESH::SMESH_MeshEditor::MirrorType theMirrorType, CORBA::Boolean theCopy) { + initData(); + SMESH::long_array_var anElementsId = theObject->GetIDs(); Mirror(anElementsId, theAxis, theMirrorType, theCopy); @@ -1190,7 +1612,7 @@ void SMESH_MeshEditor_i::MirrorObject(SMESH::SMESH_IDSource_ptr theObj aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID()); // Update Python script - TCollection_AsciiString typeStr, copyStr( theCopy ); + TCollection_AsciiString typeStr; switch ( theMirrorType ) { case SMESH::SMESH_MeshEditor::POINT: typeStr = "SMESH.SMESH_MeshEditor.POINT"; @@ -1201,61 +1623,60 @@ void SMESH_MeshEditor_i::MirrorObject(SMESH::SMESH_IDSource_ptr theObj default: typeStr = "SMESH.SMESH_MeshEditor.PLANE"; } - - TCollection_AsciiString str ("mesh_editor.MirrorObject("); - SMESH_Gen_i::AddObject( str, theObject ) += ", "; - addAxis( str, theAxis ) += ", "; - str += typeStr + ", " + copyStr + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "axis = " << theAxis; + TPythonDump() << this << ".MirrorObject( " + << theObject << ", " + << "axis, " + << typeStr << ", " + << theCopy << " )"; } //======================================================================= //function : Translate -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::Translate(const SMESH::long_array & theIDsOfElements, const SMESH::DirStruct & theVector, CORBA::Boolean theCopy) { + initData(); + SMESHDS_Mesh* aMesh = GetMeshDS(); - set elements; - for (int i = 0; i < theIDsOfElements.length(); i++) - { - CORBA::Long index = theIDsOfElements[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(index); - if ( elem ) - elements.insert( elem ); - } + TIDSortedElemSet elements; + ToMap(theIDsOfElements, aMesh, elements); + gp_Trsf aTrsf; const SMESH::PointStruct * P = &theVector.PS; aTrsf.SetTranslation( gp_Vec( P->x, P->y, P->z )); - ::SMESH_MeshEditor anEditor( _myMesh ); + ::SMESH_MeshEditor anEditor( myMesh ); anEditor.Transform (elements, aTrsf, theCopy); + if(theCopy) { + StoreResult(anEditor); + } + // Update Python script - TCollection_AsciiString str = "vector = SMESH.DirStruct( SMESH.PointStruct ( "; - str += (TCollection_AsciiString) P->x + ", "; - str += (TCollection_AsciiString) P->y + ", "; - str += (TCollection_AsciiString) P->z + " ))"; - SMESH_Gen_i::AddToCurrentPyScript( str ); - str = ("mesh_editor.Translate("); - SMESH_Gen_i::AddArray( str, theIDsOfElements ) += ", vector, "; - str += (TCollection_AsciiString) theCopy + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "vector = " << theVector; + TPythonDump() << this << ".Translate( " + << theIDsOfElements + << ", vector, " + << theCopy << " )"; } //======================================================================= //function : TranslateObject -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::TranslateObject(SMESH::SMESH_IDSource_ptr theObject, const SMESH::DirStruct & theVector, CORBA::Boolean theCopy) { + initData(); + SMESH::long_array_var anElementsId = theObject->GetIDs(); Translate(anElementsId, theVector, theCopy); @@ -1264,15 +1685,15 @@ void SMESH_MeshEditor_i::TranslateObject(SMESH::SMESH_IDSource_ptr theObject, aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID()); // Update Python script - TCollection_AsciiString str ("mesh_editor.TranslateObject("); - SMESH_Gen_i::AddObject( str, theObject ) += ", vector, "; - str += TCollection_AsciiString( theCopy ) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << this << ".TranslateObject( " + << theObject + << ", vector, " + << theCopy << " )"; } //======================================================================= //function : Rotate -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::Rotate(const SMESH::long_array & theIDsOfElements, @@ -1280,39 +1701,38 @@ void SMESH_MeshEditor_i::Rotate(const SMESH::long_array & theIDsOfElements, CORBA::Double theAngle, CORBA::Boolean theCopy) { + initData(); + SMESHDS_Mesh* aMesh = GetMeshDS(); - set elements; - for (int i = 0; i < theIDsOfElements.length(); i++) - { - CORBA::Long index = theIDsOfElements[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(index); - if ( elem ) - elements.insert( elem ); - } + TIDSortedElemSet elements; + ToMap(theIDsOfElements, aMesh, elements); + 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); - - ::SMESH_MeshEditor anEditor( _myMesh ); + + ::SMESH_MeshEditor anEditor( myMesh ); anEditor.Transform (elements, aTrsf, theCopy); + if(theCopy) { + StoreResult(anEditor); + } + // Update Python script - TCollection_AsciiString str ("axis = "); - addAxis( str, theAxis ); - SMESH_Gen_i::AddToCurrentPyScript( str ); - str = ("mesh_editor.Rotate("); - SMESH_Gen_i::AddArray( str, theIDsOfElements ) += ", axis, "; - str += (TCollection_AsciiString) theAngle + ", "; - str += (TCollection_AsciiString) theCopy + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << "axis = " << theAxis; + TPythonDump() << this << ".Rotate( " + << theIDsOfElements + << ", axis, " + << theAngle << ", " + << theCopy << " )"; } //======================================================================= //function : RotateObject -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::RotateObject(SMESH::SMESH_IDSource_ptr theObject, @@ -1320,6 +1740,8 @@ void SMESH_MeshEditor_i::RotateObject(SMESH::SMESH_IDSource_ptr theObject, CORBA::Double theAngle, CORBA::Boolean theCopy) { + initData(); + SMESH::long_array_var anElementsId = theObject->GetIDs(); Rotate(anElementsId, theAxis, theAngle, theCopy); @@ -1328,31 +1750,89 @@ void SMESH_MeshEditor_i::RotateObject(SMESH::SMESH_IDSource_ptr theObject, aSMESHGen->RemoveLastFromPythonScript(aSMESHGen->GetCurrentStudyID()); // Update Python script - TCollection_AsciiString str ("mesh_editor.RotateObject("); - SMESH_Gen_i::AddObject( str, theObject ) += ", axis, "; - str += TCollection_AsciiString( theAngle ) + ", "; - str += TCollection_AsciiString( theCopy ) + " )"; - SMESH_Gen_i::AddToCurrentPyScript( str ); + TPythonDump() << this << ".RotateObject( " + << theObject + << ", axis, " + << theAngle << ", " + << theCopy << " )"; } //======================================================================= //function : FindCoincidentNodes -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::FindCoincidentNodes (CORBA::Double Tolerance, SMESH::array_of_long_array_out GroupsOfNodes) { + initData(); + ::SMESH_MeshEditor::TListOfListOfNodes aListOfListOfNodes; - ::SMESH_MeshEditor anEditor( _myMesh ); + ::SMESH_MeshEditor anEditor( myMesh ); set nodes; // no input nodes anEditor.FindCoincidentNodes( nodes, Tolerance, aListOfListOfNodes ); GroupsOfNodes = new SMESH::array_of_long_array; GroupsOfNodes->length( aListOfListOfNodes.size() ); ::SMESH_MeshEditor::TListOfListOfNodes::iterator llIt = aListOfListOfNodes.begin(); - for ( CORBA::Long i = 0; llIt != aListOfListOfNodes.end(); llIt++, i++ ) - { + for ( CORBA::Long i = 0; llIt != aListOfListOfNodes.end(); llIt++, i++ ) { + list< const SMDS_MeshNode* >& aListOfNodes = *llIt; + list< const SMDS_MeshNode* >::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)->GetID(); + } + // Update Python script + TPythonDump() << "coincident_nodes = " << this << ".FindCoincidentNodes( " + << Tolerance << " )"; +} + +//======================================================================= +//function : FindCoincidentNodesOnPart +//purpose : +//======================================================================= +void SMESH_MeshEditor_i::FindCoincidentNodesOnPart(SMESH::SMESH_IDSource_ptr theObject, + CORBA::Double Tolerance, + SMESH::array_of_long_array_out GroupsOfNodes) +{ + initData(); + SMESH::long_array_var aElementsId = theObject->GetIDs(); + + SMESHDS_Mesh* aMesh = GetMeshDS(); + set nodes; + + if ( !CORBA::is_nil(SMESH::SMESH_GroupBase::_narrow(theObject)) && + SMESH::SMESH_GroupBase::_narrow(theObject)->GetType() == SMESH::NODE) { + for(int i = 0; i < aElementsId->length(); i++) { + CORBA::Long ind = aElementsId[i]; + const SMDS_MeshNode * elem = aMesh->FindNode(ind); + if(elem) + nodes.insert(elem); + } + } + else { + for(int i = 0; i < aElementsId->length(); i++) { + CORBA::Long ind = aElementsId[i]; + const SMDS_MeshElement * elem = aMesh->FindElement(ind); + if(elem) { + SMDS_ElemIteratorPtr nIt = elem->nodesIterator(); + while ( nIt->more() ) + nodes.insert( nodes.end(),static_cast(nIt->next())); + } + } + } + + + ::SMESH_MeshEditor::TListOfListOfNodes aListOfListOfNodes; + ::SMESH_MeshEditor anEditor( myMesh ); + if(!nodes.empty()) + anEditor.FindCoincidentNodes( nodes, Tolerance, aListOfListOfNodes ); + + GroupsOfNodes = new SMESH::array_of_long_array; + GroupsOfNodes->length( aListOfListOfNodes.size() ); + ::SMESH_MeshEditor::TListOfListOfNodes::iterator llIt = aListOfListOfNodes.begin(); + for ( CORBA::Long i = 0; llIt != aListOfListOfNodes.end(); llIt++, i++ ) { list< const SMDS_MeshNode* >& aListOfNodes = *llIt; list< const SMDS_MeshNode* >::iterator lIt = aListOfNodes.begin();; SMESH::long_array& aGroup = GroupsOfNodes[ i ]; @@ -1360,18 +1840,25 @@ void SMESH_MeshEditor_i::FindCoincidentNodes (CORBA::Double Tol for ( int j = 0; lIt != aListOfNodes.end(); lIt++, j++ ) aGroup[ j ] = (*lIt)->GetID(); } + // Update Python script + TPythonDump() << "coincident_nodes_on_part = " << this << ".FindCoincidentNodesOnPart( " + < 0 ) - str += ","; - SMESH_Gen_i::AddArray( str, aNodeGroup ); + if ( i > 0 ) aTPythonDump << ", "; + aTPythonDump << aNodeGroup; } - ::SMESH_MeshEditor anEditor( _myMesh ); + ::SMESH_MeshEditor anEditor( myMesh ); anEditor.MergeNodes( aListOfListOfNodes ); // Update Python script - SMESH_Gen_i::AddToCurrentPyScript( str + "])" ); + aTPythonDump << "])"; +} + +//======================================================================= +//function : FindEqualElements +//purpose : +//======================================================================= +void SMESH_MeshEditor_i::FindEqualElements(SMESH::SMESH_IDSource_ptr theObject, + SMESH::array_of_long_array_out GroupsOfElementsID) +{ + initData(); + if ( !(!CORBA::is_nil(SMESH::SMESH_GroupBase::_narrow(theObject)) && + SMESH::SMESH_GroupBase::_narrow(theObject)->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); + } + } + + ::SMESH_MeshEditor::TListOfListOfElementsID aListOfListOfElementsID; + ::SMESH_MeshEditor anEditor( myMesh ); + anEditor.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::long_array& aGroup = GroupsOfElementsID[ j ]; + TListOfIDs& listOfIDs = *arraysIt; + aGroup.length( listOfIDs.size() ); + TListOfIDs::iterator idIt = listOfIDs.begin(); + for (int k = 0; idIt != listOfIDs.end(); ++idIt, ++k ) { + aGroup[ k ] = *idIt; + } + } + + // Update Python script + TPythonDump() << "equal_elements = " << this << ".FindEqualElements( " + <() ); + list< int >& aListOfElemsID = aListOfListOfElementsID.back(); + for ( int j = 0; j < anElemsIDGroup.length(); j++ ) { + CORBA::Long id = anElemsIDGroup[ j ]; + aListOfElemsID.push_back( id ); + } + if ( aListOfElemsID.size() < 2 ) + aListOfListOfElementsID.pop_back(); + if ( i > 0 ) aTPythonDump << ", "; + aTPythonDump << anElemsIDGroup; + } + + ::SMESH_MeshEditor anEditor( myMesh ); + anEditor.MergeElements(aListOfListOfElementsID); + + // Update Python script + aTPythonDump << "] )"; } //======================================================================= //function : MergeEqualElements -//purpose : +//purpose : //======================================================================= void SMESH_MeshEditor_i::MergeEqualElements() { - ::SMESH_MeshEditor anEditor( _myMesh ); + initData(); + + ::SMESH_MeshEditor anEditor( myMesh ); anEditor.MergeEqualElements(); // Update Python script - SMESH_Gen_i::AddToCurrentPyScript( "mesh_editor.MergeEqualElements()" ); + TPythonDump() << this << ".MergeEqualElements()"; +} + +//================================================================================ +/*! + * \brief If the given ID is a valid node ID (nodeID > 0), just move this node, else + * move the node closest to the point to point's location and return ID of the node + */ +//================================================================================ + +CORBA::Long SMESH_MeshEditor_i::MoveClosestNodeToPoint(CORBA::Double x, + CORBA::Double y, + CORBA::Double z, + CORBA::Long theNodeID) +{ + // We keep myNodeSearcher until any mesh modification: + // 1) initData() deletes myNodeSearcher at any edition, + // 2) TNodeSearcherDeleter - at any mesh compute event and mesh change + + initData(); + + int nodeID = theNodeID; + const SMDS_MeshNode* node = GetMeshDS()->FindNode( nodeID ); + if ( !node ) + { + static TNodeSearcherDeleter deleter; + deleter.Set( myMesh ); + if ( !myNodeSearcher ) { + ::SMESH_MeshEditor anEditor( myMesh ); + myNodeSearcher = anEditor.GetNodeSearcher(); + } + gp_Pnt p( x,y,z ); + node = myNodeSearcher->FindClosestTo( p ); + } + if ( node ) { + nodeID = node->GetID(); + if ( myPreviewMode ) // make preview data + { + // in a preview mesh, make edges linked to a node + TPreviewMesh tmpMesh; + TIDSortedElemSet linkedNodes; + ::SMESH_MeshEditor::GetLinkedNodes( node, linkedNodes ); + TIDSortedElemSet::iterator nIt = linkedNodes.begin(); + for ( ; nIt != linkedNodes.end(); ++nIt ) + { + SMDS_MeshEdge edge( node, cast2Node( *nIt )); + tmpMesh.Copy( &edge ); + } + // move copied node + node = tmpMesh.GetMeshDS()->FindNode( nodeID ); + if ( node ) + tmpMesh.GetMeshDS()->MoveNode(node, x, y, z); + // fill preview data + ::SMESH_MeshEditor anEditor( & tmpMesh ); + StoreResult( anEditor ); + } + else + { + GetMeshDS()->MoveNode(node, x, y, z); + } + } + + if ( !myPreviewMode ) { + // Update Python script + TPythonDump() << "nodeID = " << this + << ".MoveClosestNodeToPoint( "<< x << ", " << y << ", " << z << " )"; + } + + return nodeID; } //======================================================================= -//function : operator -//purpose : +//function : convError +//purpose : //======================================================================= #define RETCASE(enm) case ::SMESH_MeshEditor::enm: return SMESH::SMESH_MeshEditor::enm; @@ -1439,7 +2077,7 @@ static SMESH::SMESH_MeshEditor::Sew_Error convError( const::SMESH_MeshEditor::Se //======================================================================= //function : SewFreeBorders -//purpose : +//purpose : //======================================================================= SMESH::SMESH_MeshEditor::Sew_Error @@ -1452,6 +2090,8 @@ SMESH::SMESH_MeshEditor::Sew_Error CORBA::Boolean CreatePolygons, CORBA::Boolean CreatePolyedrs) { + initData(); + SMESHDS_Mesh* aMesh = GetMeshDS(); const SMDS_MeshNode* aBorderFirstNode = aMesh->FindNode( FirstNodeID1 ); @@ -1471,41 +2111,48 @@ SMESH::SMESH_MeshEditor::Sew_Error return SMESH::SMESH_MeshEditor::SEW_BORDER2_NOT_FOUND; // Update Python script - TCollection_AsciiString str ("error = mesh_editor.SewFreeBorders( "); - str += TCollection_AsciiString( (int) FirstNodeID1 ) + ", "; - str += TCollection_AsciiString( (int) SecondNodeID1 ) + ", "; - str += TCollection_AsciiString( (int) LastNodeID1 ) + ", "; - str += TCollection_AsciiString( (int) FirstNodeID2 ) + ", "; - str += TCollection_AsciiString( (int) SecondNodeID2 ) + ", "; - str += TCollection_AsciiString( (int) LastNodeID2 ) + ", "; - str += TCollection_AsciiString( CreatePolygons ) + ", "; - str += TCollection_AsciiString( CreatePolyedrs ) + ") "; - SMESH_Gen_i::AddToCurrentPyScript( str ); - - ::SMESH_MeshEditor anEditor( _myMesh ); - return convError( anEditor.SewFreeBorder (aBorderFirstNode, - aBorderSecondNode, - aBorderLastNode, - aSide2FirstNode, - aSide2SecondNode, - aSide2ThirdNode, - true, - CreatePolygons, - CreatePolyedrs) ); + TPythonDump() << "error = " << this << ".SewFreeBorders( " + << FirstNodeID1 << ", " + << SecondNodeID1 << ", " + << LastNodeID1 << ", " + << FirstNodeID2 << ", " + << SecondNodeID2 << ", " + << LastNodeID2 << ", " + << CreatePolygons<< ", " + << CreatePolyedrs<< " )"; + + ::SMESH_MeshEditor anEditor( myMesh ); + SMESH::SMESH_MeshEditor::Sew_Error error = + convError( anEditor.SewFreeBorder (aBorderFirstNode, + aBorderSecondNode, + aBorderLastNode, + aSide2FirstNode, + aSide2SecondNode, + aSide2ThirdNode, + true, + CreatePolygons, + CreatePolyedrs) ); + + StoreResult(anEditor); + + return error; } + //======================================================================= //function : SewConformFreeBorders -//purpose : +//purpose : //======================================================================= SMESH::SMESH_MeshEditor::Sew_Error - SMESH_MeshEditor_i::SewConformFreeBorders(CORBA::Long FirstNodeID1, - CORBA::Long SecondNodeID1, - CORBA::Long LastNodeID1, - CORBA::Long FirstNodeID2, - CORBA::Long SecondNodeID2) +SMESH_MeshEditor_i::SewConformFreeBorders(CORBA::Long FirstNodeID1, + CORBA::Long SecondNodeID1, + CORBA::Long LastNodeID1, + CORBA::Long FirstNodeID2, + CORBA::Long SecondNodeID2) { + initData(); + SMESHDS_Mesh* aMesh = GetMeshDS(); const SMDS_MeshNode* aBorderFirstNode = aMesh->FindNode( FirstNodeID1 ); @@ -1524,39 +2171,46 @@ SMESH::SMESH_MeshEditor::Sew_Error return SMESH::SMESH_MeshEditor::SEW_BORDER2_NOT_FOUND; // Update Python script - TCollection_AsciiString str ("error = mesh_editor.SewConformFreeBorders( "); - str += TCollection_AsciiString( (int) FirstNodeID1 ) + ", "; - str += TCollection_AsciiString( (int) SecondNodeID1 ) + ", "; - str += TCollection_AsciiString( (int) LastNodeID1 ) + ", "; - str += TCollection_AsciiString( (int) FirstNodeID2 ) + ", "; - str += TCollection_AsciiString( (int) SecondNodeID2 ) + ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); - - ::SMESH_MeshEditor anEditor( _myMesh ); - return convError( anEditor.SewFreeBorder (aBorderFirstNode, - aBorderSecondNode, - aBorderLastNode, - aSide2FirstNode, - aSide2SecondNode, - aSide2ThirdNode, - true, - false, false) ); + TPythonDump() << "error = " << this << ".SewConformFreeBorders( " + << FirstNodeID1 << ", " + << SecondNodeID1 << ", " + << LastNodeID1 << ", " + << FirstNodeID2 << ", " + << SecondNodeID2 << " )"; + + ::SMESH_MeshEditor anEditor( myMesh ); + SMESH::SMESH_MeshEditor::Sew_Error error = + convError( anEditor.SewFreeBorder (aBorderFirstNode, + aBorderSecondNode, + aBorderLastNode, + aSide2FirstNode, + aSide2SecondNode, + aSide2ThirdNode, + true, + false, false) ); + + StoreResult(anEditor); + + return error; } + //======================================================================= //function : SewBorderToSide -//purpose : +//purpose : //======================================================================= SMESH::SMESH_MeshEditor::Sew_Error - SMESH_MeshEditor_i::SewBorderToSide(CORBA::Long FirstNodeIDOnFreeBorder, - CORBA::Long SecondNodeIDOnFreeBorder, - CORBA::Long LastNodeIDOnFreeBorder, - CORBA::Long FirstNodeIDOnSide, - CORBA::Long LastNodeIDOnSide, - CORBA::Boolean CreatePolygons, - CORBA::Boolean CreatePolyedrs) +SMESH_MeshEditor_i::SewBorderToSide(CORBA::Long FirstNodeIDOnFreeBorder, + CORBA::Long SecondNodeIDOnFreeBorder, + CORBA::Long LastNodeIDOnFreeBorder, + CORBA::Long FirstNodeIDOnSide, + CORBA::Long LastNodeIDOnSide, + CORBA::Boolean CreatePolygons, + CORBA::Boolean CreatePolyedrs) { + initData(); + SMESHDS_Mesh* aMesh = GetMeshDS(); const SMDS_MeshNode* aBorderFirstNode = aMesh->FindNode( FirstNodeIDOnFreeBorder ); @@ -1575,41 +2229,48 @@ SMESH::SMESH_MeshEditor::Sew_Error return SMESH::SMESH_MeshEditor::SEW_BAD_SIDE_NODES; // Update Python script - TCollection_AsciiString str ("error = mesh_editor.SewBorderToSide( "); - str += TCollection_AsciiString( (int) FirstNodeIDOnFreeBorder ) + ", "; - str += TCollection_AsciiString( (int) SecondNodeIDOnFreeBorder ) + ", "; - str += TCollection_AsciiString( (int) LastNodeIDOnFreeBorder ) + ", "; - str += TCollection_AsciiString( (int) FirstNodeIDOnSide ) + ", "; - str += TCollection_AsciiString( (int) LastNodeIDOnSide ) + ", "; - str += TCollection_AsciiString( CreatePolygons ) + ", "; - str += TCollection_AsciiString( CreatePolyedrs ) + ") "; - SMESH_Gen_i::AddToCurrentPyScript( str ); - - ::SMESH_MeshEditor anEditor( _myMesh ); - return convError( anEditor.SewFreeBorder (aBorderFirstNode, - aBorderSecondNode, - aBorderLastNode, - aSide2FirstNode, - aSide2SecondNode, - aSide2ThirdNode, - false, - CreatePolygons, - CreatePolyedrs) ); + TPythonDump() << "error = " << this << ".SewBorderToSide( " + << FirstNodeIDOnFreeBorder << ", " + << SecondNodeIDOnFreeBorder << ", " + << LastNodeIDOnFreeBorder << ", " + << FirstNodeIDOnSide << ", " + << LastNodeIDOnSide << ", " + << CreatePolygons << ", " + << CreatePolyedrs << ") "; + + ::SMESH_MeshEditor anEditor( myMesh ); + SMESH::SMESH_MeshEditor::Sew_Error error = + convError( anEditor.SewFreeBorder (aBorderFirstNode, + aBorderSecondNode, + aBorderLastNode, + aSide2FirstNode, + aSide2SecondNode, + aSide2ThirdNode, + false, + CreatePolygons, + CreatePolyedrs) ); + + StoreResult(anEditor); + + return error; } + //======================================================================= //function : SewSideElements -//purpose : +//purpose : //======================================================================= SMESH::SMESH_MeshEditor::Sew_Error - SMESH_MeshEditor_i::SewSideElements(const SMESH::long_array& IDsOfSide1Elements, - const SMESH::long_array& IDsOfSide2Elements, - CORBA::Long NodeID1OfSide1ToMerge, - CORBA::Long NodeID1OfSide2ToMerge, - CORBA::Long NodeID2OfSide1ToMerge, - CORBA::Long NodeID2OfSide2ToMerge) +SMESH_MeshEditor_i::SewSideElements(const SMESH::long_array& IDsOfSide1Elements, + const SMESH::long_array& IDsOfSide2Elements, + CORBA::Long NodeID1OfSide1ToMerge, + CORBA::Long NodeID1OfSide2ToMerge, + CORBA::Long NodeID2OfSide1ToMerge, + CORBA::Long NodeID2OfSide2ToMerge) { + initData(); + SMESHDS_Mesh* aMesh = GetMeshDS(); const SMDS_MeshNode* aFirstNode1ToMerge = aMesh->FindNode( NodeID1OfSide1ToMerge ); @@ -1624,35 +2285,228 @@ SMESH::SMESH_MeshEditor::Sew_Error !aSecondNode2ToMerge) return SMESH::SMESH_MeshEditor::SEW_BAD_SIDE2_NODES; - set aSide1Elems, aSide2Elems; - for (int i = 0; i < IDsOfSide1Elements.length(); i++) + TIDSortedElemSet aSide1Elems, aSide2Elems; + ToMap(IDsOfSide1Elements, aMesh, aSide1Elems); + ToMap(IDsOfSide2Elements, aMesh, aSide2Elems); + + // Update Python script + TPythonDump() << "error = " << this << ".SewSideElements( " + << IDsOfSide1Elements << ", " + << IDsOfSide2Elements << ", " + << NodeID1OfSide1ToMerge << ", " + << NodeID1OfSide2ToMerge << ", " + << NodeID2OfSide1ToMerge << ", " + << NodeID2OfSide2ToMerge << ")"; + + ::SMESH_MeshEditor anEditor( myMesh ); + SMESH::SMESH_MeshEditor::Sew_Error error = + convError( anEditor.SewSideElements (aSide1Elems, aSide2Elems, + aFirstNode1ToMerge, + aFirstNode2ToMerge, + aSecondNode1ToMerge, + aSecondNode2ToMerge)); + + StoreResult(anEditor); + + return error; +} + +//================================================================================ +/*! + * \brief Set new nodes for given element + * \param ide - element id + * \param newIDs - new node ids + * \retval CORBA::Boolean - true if result is OK + */ +//================================================================================ + +CORBA::Boolean SMESH_MeshEditor_i::ChangeElemNodes(CORBA::Long ide, + const SMESH::long_array& newIDs) +{ + initData(); + + const SMDS_MeshElement* elem = GetMeshDS()->FindElement(ide); + if(!elem) return false; + + int nbn = newIDs.length(); + int i=0; + vector aNodes (nbn); + int nbn1=-1; + for(; iFindNode(newIDs[i]); + if(aNode) { + nbn1++; + aNodes[nbn1] = aNode; + } + } + // Update Python script + TPythonDump() << "isDone = " << this << ".ChangeElemNodes( " + << ide << ", " << newIDs << " )"; +#ifdef _DEBUG_ + TPythonDump() << "print 'ChangeElemNodes: ', isDone"; +#endif + + return GetMeshDS()->ChangeElementNodes( elem, &aNodes[0], nbn1+1 ); +} + +//================================================================================ +/*! + * \brief Update myLastCreated* or myPreviewData + * \param anEditor - it contains last modification results + */ +//================================================================================ + +void SMESH_MeshEditor_i::StoreResult(::SMESH_MeshEditor& anEditor) +{ + 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; + + 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; + bool isPoly; + /*if (aMeshElem->GetType() == SMDSAbs_Volume) { + aType = SMDSAbs_Node; + isPoly = false; + } + else*/ { + aType = aMeshElem->GetType(); + 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; + } + { - CORBA::Long index = IDsOfSide1Elements[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(index); - if ( elem ) - aSide1Elems.insert( elem ); + // add new nodes into myLastCreatedNodes + const SMESH_SequenceOfElemPtr& aSeq = anEditor.GetLastCreatedNodes(); + myLastCreatedNodes->length(aSeq.Length()); + for(int i=0; iGetID(); } - for (int i = 0; i < IDsOfSide2Elements.length(); i++) { - CORBA::Long index = IDsOfSide2Elements[i]; - const SMDS_MeshElement * elem = aMesh->FindElement(index); - if ( elem ) - aSide2Elems.insert( elem ); + // add new elements into myLastCreatedElems + const SMESH_SequenceOfElemPtr& aSeq = anEditor.GetLastCreatedElems(); + myLastCreatedElems->length(aSeq.Length()); + for(int i=0; iGetID(); } +} + +//================================================================================ +/*! + * Return data of mesh edition preview + */ +//================================================================================ + +SMESH::MeshPreviewStruct* SMESH_MeshEditor_i::GetPreviewData() +{ + return myPreviewData._retn(); +} + +//================================================================================ +/*! + * \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() +{ + return myLastCreatedNodes._retn(); +} + +//================================================================================ +/*! + * \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() +{ + return myLastCreatedElems._retn(); +} + +//======================================================================= +//function : ConvertToQuadratic +//purpose : +//======================================================================= + +void SMESH_MeshEditor_i::ConvertToQuadratic(CORBA::Boolean theForce3d) +{ + ::SMESH_MeshEditor anEditor( myMesh ); + anEditor.ConvertToQuadratic(theForce3d); + // Update Python script + TPythonDump() << this << ".ConvertToQuadratic( " << theForce3d << " )"; +} + +//======================================================================= +//function : ConvertFromQuadratic +//purpose : +//======================================================================= + +CORBA::Boolean SMESH_MeshEditor_i::ConvertFromQuadratic() +{ + ::SMESH_MeshEditor anEditor( myMesh ); + CORBA::Boolean isDone = anEditor.ConvertFromQuadratic(); // Update Python script - TCollection_AsciiString str ("error = mesh_editor.SewSideElements( "); - SMESH_Gen_i::AddArray( str, IDsOfSide1Elements ) += ", "; - SMESH_Gen_i::AddArray( str, IDsOfSide2Elements ) += ", "; - str += TCollection_AsciiString( (int) NodeID1OfSide1ToMerge ) + ", "; - str += TCollection_AsciiString( (int) NodeID1OfSide2ToMerge ) + ", "; - str += TCollection_AsciiString( (int) NodeID2OfSide1ToMerge ) + ", "; - str += TCollection_AsciiString( (int) NodeID2OfSide2ToMerge ) + ")"; - SMESH_Gen_i::AddToCurrentPyScript( str ); - - ::SMESH_MeshEditor anEditor( _myMesh ); - return convError( anEditor.SewSideElements (aSide1Elems, aSide2Elems, - aFirstNode1ToMerge, - aFirstNode2ToMerge, - aSecondNode1ToMerge, - aSecondNode2ToMerge)); + TPythonDump() << this << ".ConvertFromQuadratic()"; + return isDone; }