From cc203f62c374a9c2daa29f1acea1a239024c6996 Mon Sep 17 00:00:00 2001 From: mzn Date: Mon, 30 Aug 2010 10:57:47 +0000 Subject: [PATCH] Fix for imp 0020876: EDF 1246 SMESH: DoubleNodes fonctions available in the GUI. --- doc/salome/gui/SMESH/images/duplicate01.png | Bin 0 -> 11580 bytes doc/salome/gui/SMESH/images/duplicate02.png | Bin 0 -> 13187 bytes .../gui/SMESH/images/duplicate_nodes.png | Bin 0 -> 1057 bytes .../gui/SMESH/input/double_nodes_page.doc | 67 ++ .../gui/SMESH/input/modifying_meshes.doc | 1 + .../SMESH/input/tui_transforming_meshes.doc | 69 +++ idl/SMESH_MeshEditor.idl | 31 +- resources/Makefile.am | 4 +- resources/mesh_duplicate_nodes.png | Bin 0 -> 914 bytes resources/mesh_duplicate_nodes_with_elem.png | Bin 0 -> 891 bytes src/SMESHGUI/Makefile.am | 3 + src/SMESHGUI/SMESHGUI.cxx | 24 +- src/SMESHGUI/SMESHGUI.h | 3 +- src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx | 580 ++++++++++++++++++ src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.h | 119 ++++ src/SMESHGUI/SMESH_images.ts | 8 + src/SMESHGUI/SMESH_msg_en.ts | 59 ++ src/SMESH_I/SMESH_MeshEditor_i.cxx | 141 +++++ src/SMESH_I/SMESH_MeshEditor_i.hxx | 27 + src/SMESH_SWIG/smeshDC.py | 22 + 20 files changed, 1152 insertions(+), 6 deletions(-) create mode 100644 doc/salome/gui/SMESH/images/duplicate01.png create mode 100644 doc/salome/gui/SMESH/images/duplicate02.png create mode 100644 doc/salome/gui/SMESH/images/duplicate_nodes.png create mode 100644 doc/salome/gui/SMESH/input/double_nodes_page.doc create mode 100644 resources/mesh_duplicate_nodes.png create mode 100644 resources/mesh_duplicate_nodes_with_elem.png create mode 100644 src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx create mode 100644 src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.h diff --git a/doc/salome/gui/SMESH/images/duplicate01.png b/doc/salome/gui/SMESH/images/duplicate01.png new file mode 100644 index 0000000000000000000000000000000000000000..b35c7785ff6261a26f708c54412a5a9687398292 GIT binary patch literal 11580 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 literal 0 HcmV?d00001 diff --git a/doc/salome/gui/SMESH/images/duplicate02.png b/doc/salome/gui/SMESH/images/duplicate02.png new file mode 100644 index 0000000000000000000000000000000000000000..1b5cfabc519f8a36d467d5f2ece088bdafbc4244 GIT binary patch literal 13187 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�p`p2u_>sfzfl23NGV>kJKj_z;nh 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 duplicate nodes: +
    +
  1. From the \b Modification menu choose \b Transformation -> \b Duplicate +\b Nodes item or click "Duplicate Nodes" button in the toolbar. +
    +\image html duplicate_nodes.png "Duplicate Nodes button" +
    2. +
  2. Check in the dialog box one of two radio buttons corresponding to +the type of nodes duplication operation you would like to perform.
    3. +
  3. Fill the other fields available in the dialog box (depends on the chosen + operation mode).
    4. +
  4. Click the \b Apply or Apply and Close button to perform the operation of nodes + duplication.
    5. +
+ +\n "Duplicate Nodes" dialog has two working modes: +
    +
  • \ref mode_without_elem_anchor "Without the duplication of border elements"
    • +
  • \ref mode_with_elem_anchor "With the duplication of border elements"
    • +
+ +
+\anchor mode_without_elem_anchor +

Without duplication of border elements

+ +In this mode the dialog looks like: + +\image html duplicate01.png + +Parameters to be defined in this mode: +
    +
  1. Group of nodes to duplicate (mandatory): these nodes will be duplicated.
    2. +
  2. Group of elements to replace nodes with new ones (optional): the duplicated nodes + will be associated with these elements.
    3. +
  3. Construct group with newly created nodes option (checked by default): + if checked - the group with just created nodes will be builded.
    4. +
+ +
+\anchor mode_with_elem_anchor +

With duplication of border elements

+ +In this mode the dialog looks like: + +\image html duplicate02.png + +Parameters to be defined in this mode: +
    +
  1. Group of elements to duplicate (mandatory): these elements will be duplicated.
    2. +
  2. Group of nodes at not to duplicate (optional): group of nodes at crack bottom + which will not be duplicated.
    3. +
  3. Group of elements to replace nodes with new ones (mandatory): the duplicated nodes + will be associated with these elements.
    4. +
  4. Construct group with newly created elements option (checked by default): + if checked - the group with just created elements will be builded.
    5. +
+ + +
See Also a sample TUI Script of a \ref tui_duplicate_nodes "Duplicate nodes" operation. + +*/ diff --git a/doc/salome/gui/SMESH/input/modifying_meshes.doc b/doc/salome/gui/SMESH/input/modifying_meshes.doc index b086cf915..8d5875a9c 100644 --- a/doc/salome/gui/SMESH/input/modifying_meshes.doc +++ b/doc/salome/gui/SMESH/input/modifying_meshes.doc @@ -45,6 +45,7 @@ of the selected node or edge.
  • Apply \subpage pattern_mapping_page "pattern mapping".
  • \subpage convert_to_from_quadratic_mesh_page "Convert regular mesh to quadratic", or vice versa.
    • +
  • Create \subpage double_nodes_page "double nodes".
  • \subpage make_2dmesh_from_3d_page "Create 2D mesh from 3D".
    • diff --git a/doc/salome/gui/SMESH/input/tui_transforming_meshes.doc b/doc/salome/gui/SMESH/input/tui_transforming_meshes.doc index c55b2a492..25f5a7ec8 100644 --- a/doc/salome/gui/SMESH/input/tui_transforming_meshes.doc +++ b/doc/salome/gui/SMESH/input/tui_transforming_meshes.doc @@ -350,4 +350,73 @@ mesh.Compute() mesh.SewSideElements([69, 70, 71, 72], [91, 92, 89, 90], 8, 38, 23, 58) \endcode +
    +\anchor tui_duplicate_nodes +

    Duplicate nodes

    + +\code +import salome +import smesh +import SMESH_test1 + +mesh = SMESH_test1.mesh + +# Compute mesh +mesh.Compute() + +# Without the duplication of border elements + +# Nodes to duplicate +nodes1 = mesh.CreateEmptyGroup( smesh.NODE, 'nodes1' ) +nodes1.Add( [ 289, 278, 302, 285 ] ) + +# Group of faces to replace nodes with new ones +faces1 = mesh.CreateEmptyGroup( smesh.FACE, 'faces1' ) +faces1.Add( [ 519, 556, 557 ] ) + +# Duplicate nodes +print "\nMesh before the first nodes duplication:" +print "Nodes : ", mesh.NbNodes() +print "Edges : ", mesh.NbEdges() +print "Triangles : ", mesh.NbTriangles() + +createdNodes = mesh.DoubleNodeGroupNew(nodes1, faces1) + +print "\nMesh after the first nodes duplication:" +print "Nodes : ", mesh.NbNodes() +print "Edges : ", mesh.NbEdges() +print "Triangles : ", mesh.NbTriangles() + +# With the duplication of border elements + +# Edges to duplicate +edges = mesh.CreateEmptyGroup( smesh.EDGE, 'edges' ) +edges.Add( [ 29, 30, 31 ] ) + +# Nodes not to duplicate +nodes2 = mesh.CreateEmptyGroup( smesh.NODE, 'nodes2' ) +nodes2.Add( [ 32, 5 ] ) + +# Group of faces to replace nodes with new ones +faces2 = mesh.CreateEmptyGroup( smesh.FACE, 'faces2' ) +faces2.Add( [ 576, 578, 580 ] ) + +# Duplicate nodes +print "\nMesh before the second nodes duplication:" +print "Nodes : ", mesh.NbNodes() +print "Edges : ", mesh.NbEdges() +print "Triangles : ", mesh.NbTriangles() + +mesh_editor = mesh.DoubleNodeElemGroupNew( edges, nodes2, faces2 ) + +print "\nMesh after the second nodes duplication:" +print "Nodes : ", mesh.NbNodes() +print "Edges : ", mesh.NbEdges() +print "Triangles : ", mesh.NbTriangles() + +# Update object browser +if salome.sg.hasDesktop(): + salome.sg.updateObjBrowser(0) +\endcode + */ diff --git a/idl/SMESH_MeshEditor.idl b/idl/SMESH_MeshEditor.idl index 0038beee7..2fc9ae303 100644 --- a/idl/SMESH_MeshEditor.idl +++ b/idl/SMESH_MeshEditor.idl @@ -784,11 +784,23 @@ module SMESH * \param theNodes - group of nodes to be doubled. * \param theModifiedElems - group of elements to be updated. * \return TRUE if operation has been completed successfully, FALSE otherwise - * \sa DoubleNode(), DoubleNodes(), DoubleNodeGroups() + * \sa DoubleNode(), DoubleNodes(), DoubleNodeGroups(), DoubleNodeGroupNew() */ boolean DoubleNodeGroup( in SMESH_GroupBase theNodes, in SMESH_GroupBase theModifiedElems ); + /*! + * \brief Creates a hole in a mesh by doubling the nodes of some particular elements. + * Works as DoubleNodeGroup() described above, but returns a new group with + * newly created nodes. + * \param theNodes - group of nodes to be doubled. + * \param theModifiedElems - group of elements to be updated. + * \return a new group with newly created nodes + * \sa DoubleNodeGroup() + */ + SMESH_Group DoubleNodeGroupNew( in SMESH_GroupBase theNodes, + in SMESH_GroupBase theModifiedElems ); + /*! \brief Creates a hole in a mesh by doubling the nodes of some particular elements This method provided for convenience works as DoubleNodes() described above. @@ -837,12 +849,27 @@ module SMESH * \param theAffectedElems - group of elements to which the replicated nodes * should be associated to. * \return TRUE if operation has been completed successfully, FALSE otherwise - * \sa DoubleNodes(), DoubleNodeGroups() + * \sa DoubleNodes(), DoubleNodeGroups(), DoubleNodeElemGroupNew() */ boolean DoubleNodeElemGroup( in SMESH_GroupBase theElems, in SMESH_GroupBase theNodesNot, in SMESH_GroupBase theAffectedElems ); + /*! + * \brief Creates a hole in a mesh by doubling the nodes of some particular elements. + * Works as DoubleNodeElemGroup() described above, but returns a new group with + * newly created elements. + * \param theElems - group of of elements (edges or faces) to be replicated + * \param theNodesNot - group of nodes not to replicated + * \param theAffectedElems - group of elements to which the replicated nodes + * should be associated to. + * \return a new group with newly created elements + * \sa DoubleNodeElemGroup() + */ + SMESH_Group DoubleNodeElemGroupNew( in SMESH_GroupBase theElems, + in SMESH_GroupBase theNodesNot, + in SMESH_GroupBase theAffectedElems ); + /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements * This method provided for convenience works as DoubleNodes() described above. diff --git a/resources/Makefile.am b/resources/Makefile.am index d3407f02e..ed3f5aff7 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -173,7 +173,9 @@ dist_salomeres_DATA = \ mesh_free_faces.png \ scale.png \ scale_along_axes.png \ - split_into_tetra.png + split_into_tetra.png \ + mesh_duplicate_nodes.png \ + mesh_duplicate_nodes_with_elem.png # VSR: little trick to avoid putting if SMESHCatalog.xml to the distribution archive nodist_salomeres_SCRIPTS = SMESHCatalog.xml diff --git a/resources/mesh_duplicate_nodes.png b/resources/mesh_duplicate_nodes.png new file mode 100644 index 0000000000000000000000000000000000000000..0f800f7a249893c0db7b4a2c6fd8075bf058f647 GIT binary patch literal 914 zcmV;D18w|?P)TvZr`pCdzNG8$Z(of`)iifL&qh)RQKtDP8WMX7CV(e#I4NFix0@wbY# zsc3&RYHL+AB_^fXB3hvfDOwsKwNixcgi^ZDT{5{pXU@+(pNmXF#*8kcFC4ymF7Ns7 z_n!MG5#dJaCT_4)xm=c}rY4k9WLbtW2CX$(YmR?0$@2SdRSOSH{!)>F7duf(;he)5 zLli~Cam@7eH0qVXFzM zqoYISjA@z@$1zh=Q)sRE?PAg}@`g?AhzMG1q9~$Lso=c_AlEf8%89quvUczrj1z`m zSjNWv7qB{EY5N0gIXF=_;p)e`cy9k`1US}zKkN6MN9&YNceJza_3z2~Z1zjm3&sbM zB*CN+&LlKK%36!hgdmWnDb_k%HAO^lR-@Y5+Qd1B)|#1_8LHJPB7%r;`I2rJdF5lb z9;N%e^JGC7 z?pZ?jp^H@G3ddi1h$nZS_&2bnwi=8M`Js zN3Ke-Sd?uCC*=8e&PhI>mqMW+eMhg*ck~K{LP1KUlDv8Hy1Y7mOWZnU=?eHZ&*|ALKp1*$M5sVKwFN6@VI>FV>W!|D% zTU#YfQ?e|p9~}rGP$(1@-BSpG5JH`QuBx3QSLNfLyLoosIjoKu+f(L=fe{e+_P{2# z9{RPe*=POB={_)tH3?ttUcs7OU*Sy3cZa(v_Z}f%8-EYe+2tHrHw+{Q;b1BCpEP)lFf72fJoISO4+1^Aq9fCDjNfV@tmLet2VrdYj=2Dx6w5+geN&hV} zw+K_($W?<{vDLIBDx-@KlQvj0BJeH{@us`|^L^jUnLppWUF_LqPkXkD@PXl-8J_o@ z_j%`0BErqYE!QUOXmvK|8NwA;>_@7 zdInEY^TNmd_p^0)fjmp0Ns{1d8LGRxTL8TG zXst=pl&PsHj4}LvIcq9;>-N=%2*wzaBw=P|h7bY(g$+X|IsMKiHog26)(ayqtYX`H zzu-(pOXqz}B|m=l90D90e1I(nE@6!3`0mwge)BsDA)kB61;K_$mStF-;BB_7V29$(Xl2;Lb~S67#K?=i+OJ3C9QRzpM(5&pPhno3^x=v{;mNYj)M!U7+l@YKHV z8GCgdy~7tVJ~HzB3byV432!wmoewva{LGh^$fGc_YbAY$E>lZqIPuCuJhAuma>kbW zTE@KpW$gbWdBetg77V?Z55T)$-;heBBCm~Kmpxt3EdZ~yMDg}{{R$N3}3U! ReUShF002ovPDHLkV1f*boofI9 literal 0 HcmV?d00001 diff --git a/src/SMESHGUI/Makefile.am b/src/SMESHGUI/Makefile.am index c96383c3e..031665392 100644 --- a/src/SMESHGUI/Makefile.am +++ b/src/SMESHGUI/Makefile.am @@ -71,6 +71,7 @@ salomeinclude_HEADERS = \ SMESHGUI_ScaleDlg.h \ SMESHGUI_SymmetryDlg.h \ SMESHGUI_SewingDlg.h \ + SMESHGUI_DuplicateNodesDlg.h \ SMESHGUI_EditMeshDlg.h \ SMESHGUI_MeshUtils.h \ SMESHGUI_CreatePolyhedralVolumeDlg.h \ @@ -134,6 +135,7 @@ dist_libSMESH_la_SOURCES = \ SMESHGUI_ScaleDlg.cxx \ SMESHGUI_SymmetryDlg.cxx \ SMESHGUI_SewingDlg.cxx \ + SMESHGUI_DuplicateNodesDlg.cxx \ SMESHGUI_EditMeshDlg.cxx \ SMESHGUI_Utils.cxx \ SMESHGUI_GEOMGenUtils.cxx \ @@ -203,6 +205,7 @@ MOC_FILES = \ SMESHGUI_ScaleDlg_moc.cxx \ SMESHGUI_SymmetryDlg_moc.cxx \ SMESHGUI_SewingDlg_moc.cxx \ + SMESHGUI_DuplicateNodesDlg_moc.cxx \ SMESHGUI_EditMeshDlg_moc.cxx \ SMESHGUI_CreatePolyhedralVolumeDlg_moc.cxx \ SMESHGUI_Operation_moc.cxx \ diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 088574558..ee07cc36f 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -71,6 +71,7 @@ #include "SMESHGUI_ScaleDlg.h" #include "SMESHGUI_TransparencyDlg.h" #include "SMESHGUI_WhatIsDlg.h" +#include "SMESHGUI_DuplicateNodesDlg.h" #include "SMESHGUI_Utils.h" #include "SMESHGUI_MeshUtils.h" @@ -2728,6 +2729,20 @@ bool SMESHGUI::OnGUIEvent( int theCommandID ) break; } + case 4069: // DUPLICATE NODES + { + if(checkLock(aStudy)) break; + if ( vtkwnd ) { + EmitSignalDeactivateDialog(); + ( new SMESHGUI_DuplicateNodesDlg( this ) )->show(); + } + else { + SUIT_MessageBox::warning(SMESHGUI::desktop(), + tr("SMESH_WRN_WARNING"), tr("SMESH_WRN_VIEWER_VTK")); + } + break; + } + case 5105: // Library of selection filters { static QList aTypes; @@ -2876,7 +2891,8 @@ void SMESHGUI::BuildPresentation( const Handle(SALOME_InteractiveObject) & theIO // function : createSMESHAction // purpose : //======================================================================= -void SMESHGUI::createSMESHAction( const int id, const QString& po_id, const QString& icon_id, const int key, const bool toggle ) +void SMESHGUI::createSMESHAction( const int id, const QString& po_id, const QString& icon_id, + const int key, const bool toggle, const QString& shortcutAction ) { QIcon icon; QWidget* parent = application()->desktop(); @@ -2893,7 +2909,8 @@ void SMESHGUI::createSMESHAction( const int id, const QString& po_id, const QStr menu = tr( QString( "MEN_%1" ).arg( po_id ).toLatin1().data() ), status_bar = tr( QString( "STB_%1" ).arg( po_id ).toLatin1().data() ); - createAction( id, tooltip, icon, menu, status_bar, key, parent, toggle, this, SLOT( OnGUIEvent() ) ); + createAction( id, tooltip, icon, menu, status_bar, key, parent, + toggle, this, SLOT( OnGUIEvent() ), shortcutAction ); } //======================================================================= @@ -3024,6 +3041,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createSMESHAction( 4066, "MERGE_ELEMENTS", "ICON_DLG_MERGE_ELEMENTS" ); createSMESHAction( 4067, "MESH_THROU_POINT","ICON_DLG_MOVE_NODE" ); createSMESHAction( 4068, "SCALE", "ICON_DLG_MESH_SCALE" ); + createSMESHAction( 4069, "DUPLICATE_NODES", "ICON_SMESH_DUPLICATE_NODES" ); createSMESHAction( 407, "INV", "ICON_DLG_MESH_DIAGONAL" ); createSMESHAction( 408, "UNION2", "ICON_UNION2TRI" ); createSMESHAction( 409, "ORIENT", "ICON_DLG_MESH_ORIENTATION" ); @@ -3197,6 +3215,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createMenu( 4065, transfId, -1 ); createMenu( 4066, transfId, -1 ); createMenu( 4068, transfId, -1 ); + createMenu( 4069, transfId, -1 ); createMenu( 4067,modifyId, -1 ); createMenu( 407, modifyId, -1 ); @@ -3297,6 +3316,7 @@ void SMESHGUI::initialize( CAM_Application* app ) createTool( 4065, addRemTb ); createTool( 4066, addRemTb ); createTool( 4068, addRemTb ); + createTool( 4069, addRemTb ); createTool( separator(), addRemTb ); createTool( 4067,modifyTb ); diff --git a/src/SMESHGUI/SMESHGUI.h b/src/SMESHGUI/SMESHGUI.h index 0099a20bd..d901ea68c 100644 --- a/src/SMESHGUI/SMESHGUI.h +++ b/src/SMESHGUI/SMESHGUI.h @@ -145,7 +145,8 @@ protected: const QString&, const QString& = QString(), const int = 0, - const bool = false ); + const bool = false, + const QString& = QString() ); void createPopupItem( const int, const QString&, const QString&, diff --git a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx new file mode 100644 index 000000000..c81732323 --- /dev/null +++ b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.cxx @@ -0,0 +1,580 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// SMESH SMESHGUI : GUI for SMESH component +// File : SMESHGUI_DuplicateNodesDlg.cxx +// Author : Michael ZORIN, Open CASCADE S.A.S. + +// SMESH includes +#include "SMESHGUI_DuplicateNodesDlg.h" + +#include "SMESHGUI.h" +#include "SMESHGUI_Utils.h" +#include "SMESHGUI_VTKUtils.h" + +#include + +// SALOME GUI includes +#include +#include +#include +#include +#include + +#include +#include + +#include + +#include +#include + +// Qt includes +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +// IDL includes +#include +#include CORBA_SERVER_HEADER(SMESH_MeshEditor) + +#define SPACING 6 +#define MARGIN 11 + + +/*! + \brief Constructor + \param theModule Mesh module instance +*/ +SMESHGUI_DuplicateNodesDlg::SMESHGUI_DuplicateNodesDlg( SMESHGUI* theModule ) + : QDialog( SMESH::GetDesktop( theModule ) ), + mySMESHGUI( theModule ), + mySelectionMgr( SMESH::GetSelectionMgr( theModule ) ) +{ + // Dialog attributes + setModal(false); + setAttribute(Qt::WA_DeleteOnClose, true); + setWindowTitle(tr("SMESH_DUPLICATE_TITLE")); + setSizeGripEnabled(true); + + // Icons for the dialog operation modes and selection button + SUIT_ResourceMgr* aResMgr = SMESH::GetResourceMgr( mySMESHGUI ); + QPixmap iconWithoutElem (aResMgr->loadPixmap("SMESH", tr("ICON_SMESH_DUPLICATE_NODES"))); + QPixmap iconWithElem (aResMgr->loadPixmap("SMESH", tr("ICON_SMESH_DUPLICATE_NODES_WITH_ELEM"))); + QPixmap iconSelect (aResMgr->loadPixmap("SMESH", tr("ICON_SELECT"))); + + // Main layout + QVBoxLayout* aMainLayout = new QVBoxLayout(this); + aMainLayout->setSpacing(SPACING); + aMainLayout->setMargin(MARGIN); + + // Operation modes selector + QGroupBox* aConstructorsBox = new QGroupBox(tr("DUPLICATION_MODE"), this); + myGroupConstructors = new QButtonGroup(this); + QHBoxLayout* aConstructorsBoxLayout = new QHBoxLayout(aConstructorsBox); + aConstructorsBoxLayout->setSpacing(SPACING); + aConstructorsBoxLayout->setMargin(MARGIN); + + QRadioButton* aRadioButton1 = new QRadioButton(aConstructorsBox); + aRadioButton1->setIcon(iconWithoutElem); + QRadioButton* aRadioButton2 = new QRadioButton(aConstructorsBox); + aRadioButton2->setIcon(iconWithElem); + + aConstructorsBoxLayout->addWidget(aRadioButton1); + aConstructorsBoxLayout->addWidget(aRadioButton2); + myGroupConstructors->addButton(aRadioButton1, 0); + myGroupConstructors->addButton(aRadioButton2, 1); + + // Arguments + myGroupArguments = new QGroupBox(this); + QGridLayout* aGroupArgumentsLayout = new QGridLayout(myGroupArguments); + aGroupArgumentsLayout->setSpacing(SPACING); + aGroupArgumentsLayout->setMargin(MARGIN); + + myTextLabel1 = new QLabel(myGroupArguments); + mySelectButton1 = new QPushButton(myGroupArguments); + mySelectButton1->setIcon(iconSelect); + myLineEdit1 = new QLineEdit(myGroupArguments); + myLineEdit1->setReadOnly(true); + + myTextLabel2 = new QLabel(myGroupArguments); + mySelectButton2 = new QPushButton(myGroupArguments); + mySelectButton2->setIcon(iconSelect); + myLineEdit2 = new QLineEdit(myGroupArguments); + myLineEdit2->setReadOnly(true); + + myTextLabel3 = new QLabel(myGroupArguments); + mySelectButton3 = new QPushButton(myGroupArguments); + mySelectButton3->setIcon(iconSelect); + myLineEdit3 = new QLineEdit(myGroupArguments); + myLineEdit3->setReadOnly(true); + + myCheckBoxNewGroup = new QCheckBox(tr("CONSTRUCT_NEW_GROUP_NODES"), myGroupArguments); + + aGroupArgumentsLayout->addWidget(myTextLabel1, 0, 0); + aGroupArgumentsLayout->addWidget(mySelectButton1, 0, 1); + aGroupArgumentsLayout->addWidget(myLineEdit1, 0, 2); + aGroupArgumentsLayout->addWidget(myTextLabel2, 1, 0); + aGroupArgumentsLayout->addWidget(mySelectButton2, 1, 1); + aGroupArgumentsLayout->addWidget(myLineEdit2, 1, 2); + aGroupArgumentsLayout->addWidget(myTextLabel3, 2, 0); + aGroupArgumentsLayout->addWidget(mySelectButton3, 2, 1); + aGroupArgumentsLayout->addWidget(myLineEdit3, 2, 2); + aGroupArgumentsLayout->addWidget(myCheckBoxNewGroup, 3, 0); + aGroupArgumentsLayout->setRowStretch(4, 1); + + // Buttons + QGroupBox* aGroupButtons = new QGroupBox(this); + QHBoxLayout* aGroupButtonsLayout = new QHBoxLayout(aGroupButtons); + aGroupButtonsLayout->setSpacing(SPACING); + aGroupButtonsLayout->setMargin(MARGIN); + + myButtonOk = new QPushButton(tr("SMESH_BUT_APPLY_AND_CLOSE"), aGroupButtons); + myButtonOk->setAutoDefault(true); + myButtonOk->setDefault(true); + myButtonApply = new QPushButton(tr("SMESH_BUT_APPLY"), aGroupButtons); + myButtonApply->setAutoDefault(true); + myButtonClose = new QPushButton(tr("SMESH_BUT_CLOSE"), aGroupButtons); + myButtonClose->setAutoDefault(true); + myButtonHelp = new QPushButton(tr("SMESH_BUT_HELP"), aGroupButtons); + myButtonHelp->setAutoDefault(true); + + aGroupButtonsLayout->addWidget(myButtonOk); + aGroupButtonsLayout->addSpacing(10); + aGroupButtonsLayout->addWidget(myButtonApply); + aGroupButtonsLayout->addSpacing(10); + aGroupButtonsLayout->addStretch(); + aGroupButtonsLayout->addWidget(myButtonClose); + aGroupButtonsLayout->addWidget(myButtonHelp); + + // Add mode selector, arguments and buttons to the main layout + aMainLayout->addWidget(aConstructorsBox); + aMainLayout->addWidget(myGroupArguments); + aMainLayout->addWidget(aGroupButtons); + + // Initialize the dialog + Init(); + + // Help file name + myHelpFileName = "double_nodes_page.html"; + + // Signals and slots connections + connect(myGroupConstructors, SIGNAL(buttonClicked(int)), SLOT(onConstructorsClicked(int))); + + connect(mySelectButton1, SIGNAL (clicked()), this, SLOT(onEditCurrentArgument())); + connect(mySelectButton2, SIGNAL (clicked()), this, SLOT(onEditCurrentArgument())); + connect(mySelectButton3, SIGNAL (clicked()), this, SLOT(onEditCurrentArgument())); + + connect(myButtonOk, SIGNAL(clicked()), this, SLOT(onOk())); + connect(myButtonClose, SIGNAL(clicked()), this, SLOT(onClose())); + connect(myButtonApply, SIGNAL(clicked()), this, SLOT(onApply())); + connect(myButtonHelp, SIGNAL(clicked()), this, SLOT(onHelp())); + + connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), SLOT(onSelectionChanged())); + + connect(mySMESHGUI, SIGNAL (SignalDeactivateActiveDialog()), this, SLOT(onDeactivate())); + connect(mySMESHGUI, SIGNAL (SignalCloseAllDialogs()), this, SLOT(onClose())); +} + +/*! + \brief Destructor +*/ +SMESHGUI_DuplicateNodesDlg::~SMESHGUI_DuplicateNodesDlg() +{ +} + +/*! + \brief Destructor +*/ +void SMESHGUI_DuplicateNodesDlg::Init() +{ + mySMESHGUI->SetActiveDialogBox((QDialog*)this); + + // Set initial parameters + myBusy = false; + myCurrentLineEdit = myLineEdit1; + + myGroup1 = SMESH::SMESH_GroupBase::_nil(); + myGroup2 = SMESH::SMESH_GroupBase::_nil(); + myGroup3 = SMESH::SMESH_GroupBase::_nil(); + + // Set selection mode + mySelectionMgr->installFilter(new SMESH_TypeFilter(GROUP)); + if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI )) + aViewWindow->SetSelectionMode(ActorSelection); + + // Set construction mode + int operationMode = myGroupConstructors->checkedId(); + if (operationMode < 0) { + // The dialog has been just displayed + operationMode = 0; + myGroupConstructors->button(0)->setChecked(true); + } + onConstructorsClicked(operationMode); +} + +/*! + \brief SLOT called to change the dialog operation mode. + \param constructorId id of the radio button in mode selector button group +*/ +void SMESHGUI_DuplicateNodesDlg::onConstructorsClicked (int constructorId) +{ + // Clear all fields + myLineEdit1->clear(); + myLineEdit2->clear(); + myLineEdit3->clear(); + + // Checkbox should be checked by default + myCheckBoxNewGroup->setChecked(true); + + // Set the first field as current + myCurrentLineEdit = myLineEdit1; + myCurrentLineEdit->setFocus(); + + switch (constructorId) { + case 0: + { + // Set text to the group of arguments and to the first two labels + myGroupArguments->setTitle(tr("DUPLICATION_WITHOUT_ELEMS")); + myTextLabel1->setText(tr("GROUP_NODES_TO_DUPLICATE")); + myTextLabel2->setText(tr("GROUP_NODES_TO_REPLACE")); + + // Set checkbox title + myCheckBoxNewGroup->setText(tr("CONSTRUCT_NEW_GROUP_NODES")); + + // Hide the third field + myTextLabel3->hide(); + mySelectButton3->hide(); + myLineEdit3->hide(); + + break; + } + case 1: + { + // Set text to the group of arguments and to all the labels + myGroupArguments->setTitle(tr("DUPLICATION_WITH_ELEMS")); + myTextLabel1->setText(tr("GROUP_ELEMS_TO_DUPLICATE")); + myTextLabel2->setText(tr("GROUP_NODES_NOT_DUPLICATE")); + myTextLabel3->setText(tr("GROUP_ELEMS_TO_REPLACE")); + + // Set checkbox title + myCheckBoxNewGroup->setText(tr("CONSTRUCT_NEW_GROUP_ELEMENTS")); + + // Show the third field + myTextLabel3->show(); + mySelectButton3->show(); + myLineEdit3->show(); + + break; + } + } + + // Process selection + onSelectionChanged(); +} + +/*! + \brief SLOT called to apply changes. +*/ +bool SMESHGUI_DuplicateNodesDlg::onApply() +{ + if (mySMESHGUI->isActiveStudyLocked() || !isValid()) + return false; + + myBusy = true; + + bool toCreateGroup = myCheckBoxNewGroup->isChecked(); + int operationMode = myGroupConstructors->checkedId(); + + // Apply changes + bool result = false; + SUIT_OverrideCursor aWaitCursor; + + try { + SMESH::SMESH_Mesh_ptr aMesh = myGroup1->GetMesh(); + SMESH::SMESH_MeshEditor_var aMeshEditor = aMesh->GetMeshEditor(); + + if (operationMode == 0) { + if (toCreateGroup) { + SMESH::SMESH_GroupBase_ptr aNewGroup = + aMeshEditor->DoubleNodeGroupNew(myGroup1, myGroup2); + if (!CORBA::is_nil(aNewGroup)) + result = true; + } + else + result = aMeshEditor->DoubleNodeGroup(myGroup1, myGroup2); + } + else { + if (toCreateGroup) { + SMESH::SMESH_GroupBase_ptr aNewGroup = + aMeshEditor->DoubleNodeElemGroupNew(myGroup1, myGroup2, myGroup3); + if (!CORBA::is_nil(aNewGroup)) + result = true; + } + else + result = aMeshEditor->DoubleNodeElemGroup(myGroup1, myGroup2, myGroup3); + } + } + catch (const SALOME::SALOME_Exception& S_ex) { + SalomeApp_Tools::QtCatchCorbaException(S_ex); + } + catch ( const std::exception& exc ) { + INFOS( "Follow exception was cought:\n\t" << exc.what() ); + } + catch (...){ + INFOS( "Unknown exception was cought !!!" ); + } + + if (!result) { + SUIT_MessageBox::warning(this, + tr("SMESH_WRN_WARNING"), + tr("SMESH_OPERATION_FAILED")); + myBusy = false; + return false; + } + + // Update GUI + mySelectionMgr->clearSelected(); + SMESH::UpdateView(); + SMESHGUI::Modified(); + mySMESHGUI->updateObjBrowser(true); + + // Reinitialize the dialog + Init(); + + return true; +} + +/*! + \brief SLOT called to apply changes and close the dialog. +*/ +void SMESHGUI_DuplicateNodesDlg::onOk() +{ + if (onApply()) + onClose(); +} + +/*! + \brief SLOT called to close the dialog. +*/ +void SMESHGUI_DuplicateNodesDlg::onClose() +{ + disconnect(mySelectionMgr, 0, this, 0); + disconnect(mySMESHGUI, 0, this, 0); + mySMESHGUI->ResetState(); + mySelectionMgr->clearFilters(); + reject(); +} + +/*! + \brief SLOT called when selection changed. +*/ +void SMESHGUI_DuplicateNodesDlg::onSelectionChanged() +{ + if (myBusy || !isEnabled()) return; + + // Try to get selected group + SALOME_ListIO aList; + mySelectionMgr->selectedObjects( aList ); + int aNbSel = aList.Extent(); + + SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_nil(); + if (aNbSel == 1) { + Handle(SALOME_InteractiveObject) IO = aList.First(); + aGroup = SMESH::IObjectToInterface(IO); + + // Check group type + if (!CORBA::is_nil(aGroup)) { + int operationMode = myGroupConstructors->checkedId(); + SMESH::ElementType aGroupType = aGroup->GetType(); + bool isTypeValid = true; + + if (operationMode == 0) { + if ( (myCurrentLineEdit == myLineEdit1 && aGroupType != SMESH::NODE) || + (myCurrentLineEdit == myLineEdit2 && aGroupType == SMESH::NODE) ) + isTypeValid = false; + } + else if (operationMode == 1) { + if ( (myCurrentLineEdit == myLineEdit1 && aGroupType != SMESH::EDGE && + aGroupType != SMESH::FACE) || + (myCurrentLineEdit == myLineEdit2 && aGroupType != SMESH::NODE) || + (myCurrentLineEdit == myLineEdit3 && aGroupType == SMESH::NODE) ) + isTypeValid = false; + } + + if (!isTypeValid) + aGroup = SMESH::SMESH_GroupBase::_nil(); + } + } + + // Clear current field + myCurrentLineEdit->clear(); + + // Set corresponding SMESH group + if (myCurrentLineEdit == myLineEdit1) { + myGroup1 = SMESH::SMESH_Group::_narrow(aGroup); + } + else if (myCurrentLineEdit == myLineEdit2) { + myGroup2 = SMESH::SMESH_Group::_narrow(aGroup); + } + else if (myCurrentLineEdit == myLineEdit3) { + myGroup3 = SMESH::SMESH_Group::_narrow(aGroup); + } + + // Set group name + if (!CORBA::is_nil(aGroup)) + myCurrentLineEdit->setText(aGroup->GetName()); + + // Enable/disable "Apply and Close" and "Apply" buttons + bool isDataValid = isValid(); + myButtonOk->setEnabled(isDataValid); + myButtonApply->setEnabled(isDataValid); +} + +/*! + \brief SLOT called when selection button clicked. +*/ +void SMESHGUI_DuplicateNodesDlg::onEditCurrentArgument() +{ + QPushButton* send = (QPushButton*)sender(); + + // Set current field for edition + if (send == mySelectButton1) { + myCurrentLineEdit = myLineEdit1; + } + else if (send == mySelectButton2) { + myCurrentLineEdit = myLineEdit2; + } + else if (send == mySelectButton3) { + myCurrentLineEdit = myLineEdit3; + } + + myCurrentLineEdit->setFocus(); + onSelectionChanged(); +} + +/*! + \brief Check if the input data is valid. + \return \c true id the data is valid +*/ +bool SMESHGUI_DuplicateNodesDlg::isValid() +{ + // Only first group (nodes/elemets to duplicate) is mandatory + bool isValid = !CORBA::is_nil(myGroup1); + + // First (elements to duplicate) and last groups should be defined in the second operation mode + if (isValid && myGroupConstructors->checkedId() == 1) + isValid = !CORBA::is_nil(myGroup3); + + return isValid; +} + + +/*! + \brief SLOT called when dialog shoud be deativated. +*/ +void SMESHGUI_DuplicateNodesDlg::onDeactivate() +{ + if (isEnabled()) { + mySelectionMgr->clearFilters(); + setEnabled(false); + mySMESHGUI->ResetState(); + mySMESHGUI->SetActiveDialogBox(0); + } +} + +/*! + \brief Receive dialog enter events. + Activates the dialog when the mouse cursor enters. + Reimplemented from QWidget class. +*/ +void SMESHGUI_DuplicateNodesDlg::enterEvent (QEvent*) +{ + if ( !isEnabled() ) { + mySMESHGUI->EmitSignalDeactivateDialog(); + setEnabled(true); + mySMESHGUI->SetActiveDialogBox((QDialog*)this); + + // Set selection mode + if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI )) + aViewWindow->SetSelectionMode(ActorSelection); + mySelectionMgr->installFilter(new SMESH_TypeFilter (GROUP)); + } +} + +/*! + \brief Receive close events. + Reimplemented from QWidget class. +*/ +void SMESHGUI_DuplicateNodesDlg::closeEvent (QCloseEvent*) +{ + onClose(); +} + +/*! + \brief Receive key press events. + Reimplemented from QWidget class. +*/ +void SMESHGUI_DuplicateNodesDlg::keyPressEvent( QKeyEvent* e ) +{ + QDialog::keyPressEvent( e ); + if ( e->isAccepted() ) + return; + + if ( e->key() == Qt::Key_F1 ) { + e->accept(); + onHelp(); + } +} + +/*! + \brief Show the dialog help page. +*/ +void SMESHGUI_DuplicateNodesDlg::onHelp() +{ + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) + app->onHelpContextModule(mySMESHGUI ? app->moduleName(mySMESHGUI->moduleName()) : QString(""), myHelpFileName); + else { + QString platform; +#ifdef WIN32 + platform = "winapplication"; +#else + platform = "application"; +#endif + SUIT_MessageBox::warning(this, tr("WRN_WARNING"), + tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", + platform)). + arg(myHelpFileName)); + } +} diff --git a/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.h b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.h new file mode 100644 index 000000000..974b7d7fa --- /dev/null +++ b/src/SMESHGUI/SMESHGUI_DuplicateNodesDlg.h @@ -0,0 +1,119 @@ +// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// + +// SMESH SMESHGUI : GUI for SMESH component +// File : SMESHGUI_DuplicateNodesDlg.h +// Author : Michael ZORIN, Open CASCADE S.A.S. +// +#ifndef SMESHGUI_DUPLICATENODESDLG_H +#define SMESHGUI_DUPLICATENODESDLG_H + +// SMESH includes +#include "SMESH_SMESHGUI.hxx" + +// Qt includes +#include + +// IDL includes +#include +#include CORBA_SERVER_HEADER(SMESH_Group) + +class QButtonGroup; +class QGroupBox; +class QLabel; +class QLineEdit; +class QPushButton; +class QCheckBox; + +class LightApp_SelectionMgr; + +class SMESHGUI; + +/*! + \class SMESHGUI_DuplicateNodesDlg + \brief Dialog for duplication of nodes. +*/ +class SMESHGUI_EXPORT SMESHGUI_DuplicateNodesDlg : public QDialog +{ + Q_OBJECT + +public: + SMESHGUI_DuplicateNodesDlg( SMESHGUI* ); + ~SMESHGUI_DuplicateNodesDlg(); + +private: + void Init(); + + bool isValid(); + + void closeEvent( QCloseEvent* ); + void enterEvent( QEvent* ); + void keyPressEvent( QKeyEvent* ); + +private slots: + void onConstructorsClicked( int ); + + void onOk(); + void onClose(); + bool onApply(); + void onHelp(); + + void onEditCurrentArgument(); + void onSelectionChanged(); + + void onDeactivate(); + +private: + QLineEdit* myCurrentLineEdit; + + QButtonGroup* myGroupConstructors; + + QGroupBox* myGroupArguments; + QLabel* myTextLabel1; + QLabel* myTextLabel2; + QLabel* myTextLabel3; + QPushButton* mySelectButton1; + QPushButton* mySelectButton2; + QPushButton* mySelectButton3; + QLineEdit* myLineEdit1; + QLineEdit* myLineEdit2; + QLineEdit* myLineEdit3; + QCheckBox* myCheckBoxNewGroup; + + QPushButton* myButtonOk; + QPushButton* myButtonApply; + QPushButton* myButtonClose; + QPushButton* myButtonHelp; + + SMESHGUI* mySMESHGUI; + LightApp_SelectionMgr* mySelectionMgr; + + SMESH::SMESH_GroupBase_var myGroup1; + SMESH::SMESH_GroupBase_var myGroup2; + SMESH::SMESH_GroupBase_var myGroup3; + + bool myBusy; + + QString myHelpFileName; +}; + +#endif // SMESHGUI_DUPLICATENODESDLG_H diff --git a/src/SMESHGUI/SMESH_images.ts b/src/SMESHGUI/SMESH_images.ts index 95a9c6881..c22f4e96e 100644 --- a/src/SMESHGUI/SMESH_images.ts +++ b/src/SMESHGUI/SMESH_images.ts @@ -385,6 +385,14 @@ ICON_DLG_SCALE_ALONG_AXES scale_along_axes.png + + ICON_SMESH_DUPLICATE_NODES + mesh_duplicate_nodes.png + + + ICON_SMESH_DUPLICATE_NODES_WITH_ELEM + mesh_duplicate_nodes_with_elem.png + ICON_SMESH_TREE_ALGO mesh_tree_algo.png diff --git a/src/SMESHGUI/SMESH_msg_en.ts b/src/SMESHGUI/SMESH_msg_en.ts index 00d0f4ca9..111042c82 100644 --- a/src/SMESHGUI/SMESH_msg_en.ts +++ b/src/SMESHGUI/SMESH_msg_en.ts @@ -650,6 +650,10 @@ MEN_SCALE Scale Transform + + MEN_DUPLICATE_NODES + Duplicate Nodes + MEN_TRANSF Transformation @@ -1949,6 +1953,10 @@ add the exported data to its contents? SMESH_SCALE_TITLE Scale Transform + + SMESH_DUPLICATE_TITLE + Duplicate Nodes + SMESH_SCALE Scale @@ -2553,6 +2561,10 @@ Consider saving your work before application crash STB_SCALE Scale Transform + + STB_DUPLICATE_NODES + Duplicate Nodes + STB_TRANSP Transparency @@ -3071,6 +3083,10 @@ Consider saving your work before application crash TOP_SCALE Scale Transform + + TOP_DUPLICATE_NODES + Duplicate Nodes + TOP_TRANSP Transparency @@ -5211,4 +5227,47 @@ It is impossible to read point coordinates from file No planes + + SMESHGUI_DuplicateNodesDlg + + DUPLICATION_MODE + Duplication mode + + + DUPLICATION_WITHOUT_ELEMS + Without duplication of border elements + + + GROUP_NODES_TO_DUPLICATE + Group of nodes to duplicate + + + GROUP_NODES_TO_REPLACE + Group of elements to replace nodes with new ones + + + DUPLICATION_WITH_ELEMS + With duplication of border elements + + + GROUP_ELEMS_TO_DUPLICATE + Group of elements to duplicate + + + GROUP_NODES_NOT_DUPLICATE + Group of nodes not to duplicate + + + GROUP_ELEMS_TO_REPLACE + Group of elements to replace nodes with new ones + + + CONSTRUCT_NEW_GROUP_NODES + Construct group with newly created nodes + + + CONSTRUCT_NEW_GROUP_ELEMENTS + Construct group with newly created elements + + diff --git a/src/SMESH_I/SMESH_MeshEditor_i.cxx b/src/SMESH_I/SMESH_MeshEditor_i.cxx index eefc4372c..6eda92776 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.cxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.cxx @@ -4469,6 +4469,46 @@ void SMESH_MeshEditor_i::DumpGroupsList(TPythonDump & theDumpPytho } } +//================================================================================ +/*! + \brief Generates the unique group name. + \param thePrefix name prefix + \return unique name +*/ +//================================================================================ +string SMESH_MeshEditor_i::generateGroupName(const string& thePrefix) +{ + SMESH::ListOfGroups_var groups = myMesh_i->GetGroups(); + set groupNames; + + // Get existing group names + for (int i = 0, nbGroups = groups->length(); i < nbGroups; i++ ) { + SMESH::SMESH_GroupBase_var aGroup = groups[i]; + if (CORBA::is_nil(aGroup)) + continue; + + groupNames.insert(aGroup->GetName()); + } + + // Find new name + string name = thePrefix; + int index = 0; + + while (!groupNames.insert(name).second) { + if (index == 0) { + name += "_1"; + } + else { + TCollection_AsciiString nbStr(index+1); + name.resize( name.rfind('_')+1 ); + name += nbStr.ToCString(); + } + ++index; + } + + return name; +} + //================================================================================ /*! \brief Creates a hole in a mesh by doubling the nodes of some particular elements @@ -4564,6 +4604,53 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeGroup( return done; } +/*! + * \brief Creates a hole in a mesh by doubling the nodes of some particular elements. + * Works as DoubleNodeGroup(), but returns a new group with newly created nodes. + * \param theNodes - group of nodes to be doubled. + * \param theModifiedElems - group of elements to be updated. + * \return a new group with newly created nodes + * \sa DoubleNodeGroup() + */ +SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeGroupNew( SMESH::SMESH_GroupBase_ptr theNodes, + SMESH::SMESH_GroupBase_ptr theModifiedElems ) +{ + if ( CORBA::is_nil( theNodes ) && theNodes->GetType() != SMESH::NODE ) + return false; + + SMESH::SMESH_Group_var aNewGroup; + + // Duplicate nodes + SMESH::long_array_var aNodes = theNodes->GetListOfID(); + SMESH::long_array_var aModifiedElems; + if ( !CORBA::is_nil( theModifiedElems ) ) + aModifiedElems = theModifiedElems->GetListOfID(); + else { + aModifiedElems = new SMESH::long_array; + aModifiedElems->length( 0 ); + } + + bool aResult = DoubleNodes( aNodes, aModifiedElems ); + + if ( aResult ) { + myMesh->SetIsModified( true ); + + // Create group with newly created nodes + SMESH::long_array_var anIds = GetLastCreatedNodes(); + if (anIds->length() > 0) { + string anUnindexedName (theNodes->GetName()); + string aNewName = generateGroupName(anUnindexedName + "_double"); + aNewGroup = myMesh_i->CreateGroup(SMESH::NODE, aNewName.c_str()); + aNewGroup->Add(anIds); + } + } + + // Update Python script + TPythonDump() << "createdNodes = " << this << ".DoubleNodeGroupNew( " << theNodes << ", " + << theModifiedElems << " )"; + return aNewGroup._retn(); +} + //================================================================================ /*! \brief Creates a hole in a mesh by doubling the nodes of some particular elements @@ -4756,6 +4843,60 @@ CORBA::Boolean SMESH_MeshEditor_i::DoubleNodeElemGroup(SMESH::SMESH_GroupBase_pt return aResult; } +/*! + * \brief Creates a hole in a mesh by doubling the nodes of some particular elements + * Works as DoubleNodeElemGroup(), but returns a new group with newly created elements. + * \param theElems - group of of elements (edges or faces) to be replicated + * \param theNodesNot - group of nodes not to replicated + * \param theAffectedElems - group of elements to which the replicated nodes + * should be associated to. + * \return a new group with newly created elements + * \sa DoubleNodeElemGroup() + */ +SMESH::SMESH_Group_ptr SMESH_MeshEditor_i::DoubleNodeElemGroupNew(SMESH::SMESH_GroupBase_ptr theElems, + SMESH::SMESH_GroupBase_ptr theNodesNot, + SMESH::SMESH_GroupBase_ptr theAffectedElems) +{ + if ( CORBA::is_nil( theElems ) && theElems->GetType() == SMESH::NODE ) + return false; + + SMESH::SMESH_Group_var aNewGroup; + + initData(); + + ::SMESH_MeshEditor aMeshEditor( myMesh ); + + SMESHDS_Mesh* aMeshDS = GetMeshDS(); + TIDSortedElemSet anElems, aNodes, anAffected; + groupToSet( theElems, aMeshDS, anElems, SMDSAbs_All ); + groupToSet( theNodesNot, aMeshDS, aNodes, SMDSAbs_Node ); + groupToSet( theAffectedElems, aMeshDS, anAffected, SMDSAbs_All ); + + + bool aResult = aMeshEditor.DoubleNodes( anElems, aNodes, anAffected ); + + storeResult( aMeshEditor) ; + + if ( aResult ) { + myMesh->SetIsModified( true ); + + // Create group with newly created elements + SMESH::long_array_var anIds = GetLastCreatedElems(); + if (anIds->length() > 0) { + SMESH::ElementType aGroupType = myMesh_i->GetElementType(anIds[0], true); + string anUnindexedName (theElems->GetName()); + string aNewName = generateGroupName(anUnindexedName + "_double"); + aNewGroup = myMesh_i->CreateGroup(aGroupType, aNewName.c_str()); + aNewGroup->Add(anIds); + } + } + + // Update Python script + TPythonDump() << "createdElems = " << this << ".DoubleNodeElemGroupNew( " << theElems << ", " + << theNodesNot << ", " << theAffectedElems << " )"; + return aNewGroup._retn(); +} + //================================================================================ /*! \brief Creates a hole in a mesh by doubling the nodes of some particular elements diff --git a/src/SMESH_I/SMESH_MeshEditor_i.hxx b/src/SMESH_I/SMESH_MeshEditor_i.hxx index f5bebdc0a..281394374 100644 --- a/src/SMESH_I/SMESH_MeshEditor_i.hxx +++ b/src/SMESH_I/SMESH_MeshEditor_i.hxx @@ -552,6 +552,17 @@ public: CORBA::Boolean DoubleNodeGroup( SMESH::SMESH_GroupBase_ptr theNodes, SMESH::SMESH_GroupBase_ptr theModifiedElems ); + /*! + * \brief Creates a hole in a mesh by doubling the nodes of some particular elements. + * Works as DoubleNodeGroup(), but returns a new group with newly created nodes. + * \param theNodes - group of nodes to be doubled. + * \param theModifiedElems - group of elements to be updated. + * \return a new group with newly created nodes + * \sa DoubleNodeGroup() + */ + SMESH::SMESH_Group_ptr DoubleNodeGroupNew( SMESH::SMESH_GroupBase_ptr theNodes, + SMESH::SMESH_GroupBase_ptr theModifiedElems ); + CORBA::Boolean DoubleNodeGroups( const SMESH::ListOfGroups& theNodes, const SMESH::ListOfGroups& theModifiedElems); @@ -596,6 +607,20 @@ public: CORBA::Boolean DoubleNodeElemGroup( SMESH::SMESH_GroupBase_ptr theElems, SMESH::SMESH_GroupBase_ptr theNodesNot, SMESH::SMESH_GroupBase_ptr theAffectedElems ); + + /*! + * \brief Creates a hole in a mesh by doubling the nodes of some particular elements + * Works as DoubleNodeElemGroup(), but returns a new group with newly created elements. + * \param theElems - group of of elements (edges or faces) to be replicated + * \param theNodesNot - group of nodes not to replicated + * \param theAffectedElems - group of elements to which the replicated nodes + * should be associated to. + * \return a new group with newly created elements + * \sa DoubleNodeElemGroup() + */ + SMESH::SMESH_Group_ptr DoubleNodeElemGroupNew( SMESH::SMESH_GroupBase_ptr theElems, + SMESH::SMESH_GroupBase_ptr theNodesNot, + SMESH::SMESH_GroupBase_ptr theAffectedElems ); /*! * \brief Creates a hole in a mesh by doubling the nodes of some particular elements @@ -737,6 +762,8 @@ public: void DumpGroupsList(SMESH::TPythonDump & theDumpPython, const SMESH::ListOfGroups * theGroupList); + string generateGroupName(const string& thePrefix); + private: //!< fields SMESH_Mesh_i* myMesh_i; diff --git a/src/SMESH_SWIG/smeshDC.py b/src/SMESH_SWIG/smeshDC.py index 5586b0d14..d8e0dde74 100644 --- a/src/SMESH_SWIG/smeshDC.py +++ b/src/SMESH_SWIG/smeshDC.py @@ -3694,6 +3694,16 @@ class Mesh: # @ingroup l2_modif_edit def DoubleNodeGroup(self, theNodes, theModifiedElems): return self.editor.DoubleNodeGroup(theNodes, theModifiedElems) + + ## Creates a hole in a mesh by doubling the nodes of some particular elements + # Works as DoubleNodeGroup() described above, but returns a new group with + # newly created nodes. + # @param theNodes group of nodes to be doubled + # @param theModifiedElems group of elements to be updated. + # @return a new group with newly created nodes + # @ingroup l2_modif_edit + def DoubleNodeGroupNew(self, theNodes, theModifiedElems): + return self.editor.DoubleNodeGroupNew(theNodes, theModifiedElems) ## Creates a hole in a mesh by doubling the nodes of some particular elements # This method provided for convenience works as DoubleNodes() described above. @@ -3736,6 +3746,18 @@ class Mesh: # @ingroup l2_modif_edit def DoubleNodeElemGroup(self, theElems, theNodesNot, theAffectedElems): return self.editor.DoubleNodeElemGroup(theElems, theNodesNot, theAffectedElems) + + ## Creates a hole in a mesh by doubling the nodes of some particular elements + # Works as DoubleNodeElemGroup() described above, but returns a new group with + # newly created elements. + # @param theElems - group of of elements (edges or faces) to be replicated + # @param theNodesNot - group of nodes not to replicated + # @param theAffectedElems - group of elements to which the replicated nodes + # should be associated to. + # @return a new group with newly created elements + # @ingroup l2_modif_edit + def DoubleNodeElemGroupNew(self, theElems, theNodesNot, theAffectedElems): + return self.editor.DoubleNodeElemGroupNew(theElems, theNodesNot, theAffectedElems) ## Creates a hole in a mesh by doubling the nodes of some particular elements # This method provided for convenience works as DoubleNodes() described above. -- 2.39.2