From 32a86c1f4a05aa4ec91a0a6852914e127438ea6a Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 7 Jul 2010 05:32:15 +0000 Subject: [PATCH] 0020742: EDF 1270 SMESH : Delete Group with contents and remove Orphan Nodes --- .../gui/SMESH/images/remove_nodes_icon.png | Bin 0 -> 720 bytes .../SMESH/images/remove_orphan_nodes_icon.png | Bin 0 -> 807 bytes .../gui/SMESH/images/removeorphannodes.png | Bin 0 -> 8075 bytes .../input/removing_nodes_and_elements.doc | 34 ++++++++++++-- .../gui/SMESH/input/tui_modifying_meshes.doc | 18 +++++++ idl/SMESH_MeshEditor.idl | 25 ++++++++++ resources/Makefile.am | 1 + resources/mesh_rem_orphan_nodes.png | Bin 0 -> 807 bytes src/SMESH/SMESH_MeshEditor.cxx | 8 ++-- src/SMESH/SMESH_MeshEditor.hxx | 2 +- src/SMESHGUI/SMESHGUI.cxx | 44 +++++++++++++++++- src/SMESHGUI/SMESH_images.ts | 4 ++ src/SMESHGUI/SMESH_msg_en.ts | 20 ++++++++ src/SMESH_I/SMESH_2smeshpy.cxx | 2 +- src/SMESH_I/SMESH_MeshEditor_i.cxx | 32 +++++++++++++ src/SMESH_I/SMESH_MeshEditor_i.hxx | 1 + src/SMESH_SWIG/smeshDC.py | 6 +++ 17 files changed, 186 insertions(+), 11 deletions(-) create mode 100644 doc/salome/gui/SMESH/images/remove_nodes_icon.png create mode 100644 doc/salome/gui/SMESH/images/remove_orphan_nodes_icon.png create mode 100644 doc/salome/gui/SMESH/images/removeorphannodes.png create mode 100644 resources/mesh_rem_orphan_nodes.png diff --git a/doc/salome/gui/SMESH/images/remove_nodes_icon.png b/doc/salome/gui/SMESH/images/remove_nodes_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0818837efc3dd4a7020118d2db74e6a3c2d5cc74 GIT binary patch literal 720 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®sKR1GXI-DHQJ5y>1-E$*0K! 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
  • \ref removing_nodes_anchor "Nodes"
    • +
  • \ref removing_orphan_nodes_anchor "Orphan Nodes"
  • \ref removing_elements_anchor "Elements"
  • \ref clear_mesh_anchor "Clear Mesh Data"
    • @@ -18,11 +19,11 @@
    1. Select your mesh in the Object Browser or in the 3D viewer.
      2. -
    2. From the Modification menu choose Remove and from the associated -submenu select the Remove nodes, or just click "Remove nodes" +
    3. From the Modification menu choose Remove and from the associated +submenu select the Nodes, or just click "Remove nodes" button in the toolbar. -\image html image88.gif +\image html remove_nodes_icon.png
      "Remove nodes" button
      The following dialog box will appear: @@ -46,6 +47,29 @@ about filters in the \ref selection_filter_library_page "Selection filter librar \note Be careful while removing nodes because if you remove a definite node of your mesh all adjacent elements will be also deleted. +
      +\anchor removing_orphan_nodes_anchor +

      Removing orphan nodes

      + +There is a quick way to remove all the orphan (free) nodes. + +To remove the orphan nodes: +
        +
      1. Select your mesh in the Object Browser or in the 3D viewer.
        2. + +
      2. From the Modification menu choose Remove and from the associated +submenu select the Orphan Nodes, or just click "Remove orphan nodes" +button in the toolbar. + +\image html remove_orphan_nodes_icon.png +
        "Remove orphan nodes" button
        + +The following Warning message box will appear: + +\image html removeorphannodes.png + +Confirm removing nodes by pressing "Yes" button. +
        \anchor removing_elements_anchor

        Removing elements

        @@ -54,8 +78,8 @@ node of your mesh all adjacent elements will be also deleted.
        1. Select your mesh in the Object Browser or in the 3D viewer.
          2. -
        2. From the \b Modification menu choose \b Remove and from the -associated submenu select the Remove elements, or just click +
        3. From the Modification menu choose Remove and from the +associated submenu select the Elements, or just click "Remove elements" button in the toolbar. \image html remove_elements_icon.png diff --git a/doc/salome/gui/SMESH/input/tui_modifying_meshes.doc b/doc/salome/gui/SMESH/input/tui_modifying_meshes.doc index 8eee4e048..fe0da8e61 100644 --- a/doc/salome/gui/SMESH/input/tui_modifying_meshes.doc +++ b/doc/salome/gui/SMESH/input/tui_modifying_meshes.doc @@ -281,6 +281,24 @@ if res == 1: print "Elements removing is OK!" else: print "KO Elements removing." \endcode +
          +\anchor tui_removing_orphan_nodes +

          Removing Orphan Nodes

          + +\code +import SMESH_mechanic + +mesh = SMESH_mechanic.mesh + +# add orphan nodes +mesh.AddNode(0,0,0) +mesh.AddNode(1,1,1) +# remove just created orphan nodes +res = mesh.RemoveOrphanNodes() +if res == 1: print "Removed %d nodes!" % res +else: print "KO nodes removing." +\endcode +
          \anchor tui_renumbering_nodes_and_elements

          Renumbering Nodes and Elements

          diff --git a/idl/SMESH_MeshEditor.idl b/idl/SMESH_MeshEditor.idl index 983b2f486..0038beee7 100644 --- a/idl/SMESH_MeshEditor.idl +++ b/idl/SMESH_MeshEditor.idl @@ -37,13 +37,38 @@ module SMESH { /*! * \brief Wrap a sequence of ids in a SMESH_IDSource + * \param IDsOfElements list of mesh elements identifiers + * \return new ID source object */ SMESH_IDSource MakeIDSource(in long_array IDsOfElements); + /*! + * \brief Remove mesh elements specified by their identifiers. + * \param IDsOfElements list of mesh elements identifiers + * \return \c true if elements are correctly removed or \c false otherwise + */ boolean RemoveElements(in long_array IDsOfElements); + /*! + * \brief Remove mesh nodes specified by their identifiers. + * \param IDsOfNodes list of mesh nodes identifiers + * \return \c true if nodes are correctly removed or \c false otherwise + */ boolean RemoveNodes(in long_array IDsOfNodes); + + /*! + * \brief Remove all orphan nodes. + * \return number of removed nodes + */ + long RemoveOrphanNodes(); + /*! + * \brief Add new node. + * \param x X coordinate of new node + * \param y Y coordinate of new node + * \param z Z coordinate of new node + * \return integer identifier of new node + */ long AddNode(in double x, in double y, in double z); /*! diff --git a/resources/Makefile.am b/resources/Makefile.am index 97f2c3b6f..d3407f02e 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -72,6 +72,7 @@ dist_salomeres_DATA = \ mesh_quad.png \ mesh_rem_element.png \ mesh_rem_node.png \ + mesh_rem_orphan_nodes.png \ mesh_shading.png \ mesh_shrink.png \ mesh_skew.png \ diff --git a/resources/mesh_rem_orphan_nodes.png b/resources/mesh_rem_orphan_nodes.png new file mode 100644 index 0000000000000000000000000000000000000000..16df2e592e703b91cdab01683cb9ff4ead85feeb GIT binary patch literal 807 zcmV+?1K9kDP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2igY) z5*ZM2FW5%_000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0007lNklij?9ygXA$qJJ zFCCIv5Iu!?=^!lSVGzotc3aI+s&#kVSy$QF*P)qhTwRr*|K;O-@4X-Y_kHg@iGNUg zd%Nfzena2oGxWcB$LFu}XbFStMh>ZXaamcJ05DBcDh2Btc+JqQ^IRQ#%lCMc%!bKY zcAe$O46afxWH}&!3TLjZtxfnI{DE~@Fk?N3VPw!gg&FDhQCwN*TM=A-Mr<+S(a0Ha136Qxi`| zuXFaq5jqDaNhg1z&3$0>Q4h+EdxVC2x8+m-$7DGm6eTR0o12AG)z#JFoAF!#;^OVc z0uU`%?%1)UxkIuX5RHwEqFA|HP5@&3{apcw3%*`EZYE5--D2A97Pd=S4hXN;y9t)b zWJD|$6H`-D0uUpw?%T1zk(@w)Q;UmsuCA)8Dw;~A$mjFux=tdIAQp?Uva*7vY54tq zTrL+44Smec4gmaZiUVXT>-BacNfMDr1YOrjCX=L6sRB$ & nodeIDs // Modify a compute state of sub-meshes which become empty //======================================================================= -bool SMESH_MeshEditor::Remove (const list< int >& theIDs, - const bool isNodes ) +int SMESH_MeshEditor::Remove (const list< int >& theIDs, + const bool isNodes ) { myLastCreatedElems.Clear(); myLastCreatedNodes.Clear(); @@ -260,6 +260,7 @@ bool SMESH_MeshEditor::Remove (const list< int >& theIDs, SMESHDS_Mesh* aMesh = GetMeshDS(); set< SMESH_subMesh *> smmap; + int removed = 0; list::const_iterator it = theIDs.begin(); for ( ; it != theIDs.end(); it++ ) { const SMDS_MeshElement * elem; @@ -296,6 +297,7 @@ bool SMESH_MeshEditor::Remove (const list< int >& theIDs, aMesh->RemoveNode( static_cast< const SMDS_MeshNode* >( elem )); else aMesh->RemoveElement( elem ); + removed++; } // Notify sub-meshes about modification @@ -309,7 +311,7 @@ bool SMESH_MeshEditor::Remove (const list< int >& theIDs, // if ( SMESH_subMesh * sm = GetMesh()->GetSubMeshContaining( 1 ) ) // sm->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE ); - return true; + return removed; } //======================================================================= diff --git a/src/SMESH/SMESH_MeshEditor.hxx b/src/SMESH/SMESH_MeshEditor.hxx index d9f4b5d28..ee8703ecc 100644 --- a/src/SMESH/SMESH_MeshEditor.hxx +++ b/src/SMESH/SMESH_MeshEditor.hxx @@ -171,7 +171,7 @@ public: const bool isPoly, const int ID = 0); - bool Remove (const std::list< int >& theElemIDs, const bool isNodes); + int Remove (const std::list< int >& theElemIDs, const bool isNodes); // Remove a node or an element. // Modify a compute state of sub-meshes which become empty diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index fe6d90e4c..d672484f3 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -286,7 +286,7 @@ // actually, the following condition can't be met (added for insurance) if( selected.Extent() == 0 || - selected.Extent() > 1 && theCommandID != 122 && theCommandID != 125 ) + ( selected.Extent() > 1 && theCommandID != 122 && theCommandID != 125 ) ) return; bool hasDuplicatedMeshNames = false; @@ -2566,6 +2566,44 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) updateObjBrowser(); break; } + case 4044: // REMOVE ORPHAN NODES + { + if(checkLock(aStudy)) break; + SALOME_ListIO selected; + if( LightApp_SelectionMgr *aSel = SMESHGUI::selectionMgr() ) + aSel->selectedObjects( selected ); + if ( selected.Extent() == 1 ) { + Handle(SALOME_InteractiveObject) anIO = selected.First(); + SMESH::SMESH_Mesh_var aMesh = SMESH::GetMeshByIO(anIO); + if ( !aMesh->_is_nil() ) { + bool confirm = SUIT_MessageBox::question( SMESHGUI::desktop(), + tr( "SMESH_WARNING" ), + tr( "REMOVE_ORPHAN_NODES_QUESTION"), + SUIT_MessageBox::Yes | + SUIT_MessageBox::No, + SUIT_MessageBox::No ) == SUIT_MessageBox::Yes; + if( confirm ) { + try { + SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor(); + int removed = aMeshEditor->RemoveOrphanNodes(); + SUIT_MessageBox::information(SMESHGUI::desktop(), + tr("SMESH_INFORMATION"), + tr("NB_NODES_REMOVED").arg(removed)); + if ( removed > 0 ) { + SMESH::UpdateView(); + SMESHGUI::Modified(); + } + } + catch (const SALOME::SALOME_Exception& S_ex) { + SalomeApp_Tools::QtCatchCorbaException(S_ex); + } + catch (...) { + } + } + } + } + break; + } case 4051: // RENUMBERING NODES { if(checkLock(aStudy)) break; @@ -2974,6 +3012,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createSMESHAction( 4032, "HEXA", "ICON_DLG_HEXAS" ); createSMESHAction( 4041, "REMOVE_NODES", "ICON_DLG_REM_NODE" ); createSMESHAction( 4042, "REMOVE_ELEMENTS", "ICON_DLG_REM_ELEMENT" ); + createSMESHAction( 4044, "REMOVE_ORPHAN_NODES", "ICON_DLG_REM_ORPHAN_NODES" ); createSMESHAction( 4043, "CLEAR_MESH" , "ICON_CLEAR_MESH" ); createSMESHAction( 4051, "RENUM_NODES", "ICON_DLG_RENUMBERING_NODES" ); createSMESHAction( 4052, "RENUM_ELEMENTS", "ICON_DLG_RENUMBERING_ELEMENTS" ); @@ -3144,6 +3183,8 @@ void SMESHGUI::initialize( CAM_Application* app ) createMenu( 4041, removeId, -1 ); createMenu( 4042, removeId, -1 ); + createMenu( 4044, removeId, -1 ); + createMenu( separator(), removeId, -1 ); createMenu( 4043, removeId, -1 ); createMenu( 4051, renumId, -1 ); @@ -3243,6 +3284,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createTool( separator(), addRemTb ); createTool( 4041, addRemTb ); createTool( 4042, addRemTb ); + createTool( 4044, addRemTb ); createTool( 4043, addRemTb ); createTool( separator(), addRemTb ); createTool( 4051, addRemTb ); diff --git a/src/SMESHGUI/SMESH_images.ts b/src/SMESHGUI/SMESH_images.ts index 22b3fd7e8..95a9c6881 100644 --- a/src/SMESHGUI/SMESH_images.ts +++ b/src/SMESHGUI/SMESH_images.ts @@ -205,6 +205,10 @@ ICON_DLG_REM_NODE mesh_rem_node.png + + ICON_DLG_REM_ORPHAN_NODES + mesh_rem_orphan_nodes.png + ICON_DLG_RENUMBERING_ELEMENTS mesh_renumbering_elements.png diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts index c7ddce707..00d0f4ca9 100644 --- a/src/SMESHGUI/SMESH_msg_en.ts +++ b/src/SMESHGUI/SMESH_msg_en.ts @@ -534,6 +534,10 @@ MEN_REMOVE_NODES Nodes + + MEN_REMOVE_ORPHAN_NODES + Orphan Nodes + MEN_RENAME Rename @@ -2457,6 +2461,10 @@ Consider saving your work before application crash STB_REMOVE_NODES Remove nodes + + STB_REMOVE_ORPHAN_NODES + Remove orphan nodes + STB_RENAME Rename @@ -2971,6 +2979,10 @@ Consider saving your work before application crash TOP_REMOVE_NODES Remove nodes + + TOP_REMOVE_ORPHAN_NODES + Remove orphan nodes + TOP_RENAME Rename @@ -3209,6 +3221,14 @@ Do you wish to re-compute the mesh totally to discard the modifications? Input value precision can be adjusted using '%1' parameter in Mesh module preferences. + + REMOVE_ORPHAN_NODES_QUESTION + Do you really want to remove all orphan nodes? + + + NB_NODES_REMOVED + Removed %1 node(s). + SMESHGUI diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx index 640f51191..76831c29c 100644 --- a/src/SMESH_I/SMESH_2smeshpy.cxx +++ b/src/SMESH_I/SMESH_2smeshpy.cxx @@ -1096,7 +1096,7 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand) static TStringSet sameMethods; if ( sameMethods.empty() ) { const char * names[] = { - "RemoveElements","RemoveNodes","AddNode","Add0DElement","AddEdge","AddFace","AddPolygonalFace", + "RemoveElements","RemoveNodes","RemoveOrphanNodes","AddNode","Add0DElement","AddEdge","AddFace","AddPolygonalFace", "AddVolume","AddPolyhedralVolume","AddPolyhedralVolumeByFaces","MoveNode", "MoveClosestNodeToPoint", "InverseDiag","DeleteDiag","Reorient","ReorientObject","TriToQuad","SplitQuad","SplitQuadObject", "BestSplit","Smooth","SmoothObject","SmoothParametric","SmoothParametricObject", diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index bde96521a..eefc4372c 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -39,6 +39,7 @@ #include "SMESH_subMesh_i.hxx" #include "SMESH_Group_i.hxx" #include "SMESH_PythonDump.hxx" +#include "SMESH_ControlsDef.hxx" #include "utilities.h" #include "Utils_ExceptHandlers.hxx" @@ -350,6 +351,37 @@ CORBA::Boolean SMESH_MeshEditor_i::RemoveNodes(const SMESH::long_array & IDsOfNo */ //============================================================================= +CORBA::Long SMESH_MeshEditor_i::RemoveOrphanNodes() +{ + initData(); + + ::SMESH_MeshEditor anEditor( myMesh ); + + // Update Python script + TPythonDump() << "nbRemoved = " << this << ".RemoveOrphanNodes()"; + + // Create filter to find all orphan nodes + SMESH::Controls::Filter::TIdSequence seq; + SMESH::Controls::PredicatePtr predicate( new SMESH::Controls::FreeNodes() ); + SMESH::Controls::Filter::GetElementsId( GetMeshDS(), predicate, seq ); + + // remove orphan nodes (if there are any) + list< int > IdList; + for ( int i = 0; i < seq.size(); i++ ) + IdList.push_back( seq[i] ); + + if ( IdList.size() ) + myMesh->SetIsModified( true ); + + return anEditor.Remove( IdList, true ); +} + +//============================================================================= +/*! + * + */ +//============================================================================= + CORBA::Long SMESH_MeshEditor_i::AddNode(CORBA::Double x, CORBA::Double y, CORBA::Double z) { diff --git a/src/SMESH_I/SMESH_MeshEditor_i.hxx b/src/SMESH_I/SMESH_MeshEditor_i.hxx index 046573b17..f5bebdc0a 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.hxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.hxx @@ -56,6 +56,7 @@ public: CORBA::Boolean RemoveElements(const SMESH::long_array & IDsOfElements); CORBA::Boolean RemoveNodes(const SMESH::long_array & IDsOfNodes); + CORBA::Long RemoveOrphanNodes(); /*! * Methods for creation new elements. diff --git a/src/SMESH_SWIG/smeshDC.py b/src/SMESH_SWIG/smeshDC.py index de8f32624..693b1c3a8 100644 --- a/src/SMESH_SWIG/smeshDC.py +++ b/src/SMESH_SWIG/smeshDC.py @@ -2160,6 +2160,12 @@ class Mesh: def RemoveNodes(self, IDsOfNodes): return self.editor.RemoveNodes(IDsOfNodes) + ## Removes all orphan (free) nodes from mesh + # @return number of the removed nodes + # @ingroup l2_modif_del + def RemoveOrphanNodes(self): + return self.editor.RemoveOrphanNodes() + ## Add a node to the mesh by coordinates # @return Id of the new node # @ingroup l2_modif_add -- 2.39.2