ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-27 17:30:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

52540: TC7.5.0: Renumbering Elements and Nodes does not work

Browse Source
This commit is contained in:
eap 2014-10-22 17:21:15 +04:00
parent add89bac19
commit 5b6af39e27
7 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/salome/examples/creating_meshes_ex08.py
View File

@ -32,8 +32,8 @@ newMesh = smesh.CopyMesh( mesh, "whole mesh copy")
# 2. copy a group of 2D elements along with groups # 2. copy a group of 2D elements along with groups
newMesh = smesh.CopyMesh( fGroup, "face group copy with groups",toCopyGroups=True) newMesh = smesh.CopyMesh( fGroup, "face group copy with groups",toCopyGroups=True)
# 3. copy a group of nodes with preseving their ids # 3. copy a group of nodes
newMesh = smesh.CopyMesh( nGroup, "node group copy", toKeepIDs=True) newMesh = smesh.CopyMesh( nGroup, "node group copy")
# 4. copy some faces # 4. copy some faces
faceIds = fGroup.GetIDs()[-10:] faceIds = fGroup.GetIDs()[-10:]

BIN
doc/salome/gui/SMESH/images/copy_mesh_dlg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 23 KiB

3
doc/salome/gui/SMESH/input/copy_mesh.doc
View File

@ -42,9 +42,6 @@ selection_filter_library_page "Selection filter library" page.</li>
<ul> <ul>
<li>activate <b>Generate groups</b> checkbox to copy the groups of <li>activate <b>Generate groups</b> checkbox to copy the groups of
elements of the source mesh to the newly created mesh.</li> elements of the source mesh to the newly created mesh.</li>
<li>activate <b>Preserve IDs of elements</b> checkbox to keep
the IDs of new nodes and elements the same as the IDs of source nodes
and elements.</li>
</ul> </ul>
</li> </li>

2
doc/salome/gui/SMESH/input/modifying_meshes.doc
View File

@ -12,8 +12,6 @@ nodes to polyhedrons at an arbitrary place in the mesh.</li>
elements (used in quadratic meshes) from quadratic nodes to quadratic polyhedrons at an arbitrary place in the mesh.</li> elements (used in quadratic meshes) from quadratic nodes to quadratic polyhedrons at an arbitrary place in the mesh.</li>
<li>\subpage removing_nodes_and_elements_page "Remove" any existing <li>\subpage removing_nodes_and_elements_page "Remove" any existing
mesh elements.</li> mesh elements.</li>
<li>\subpage renumbering_nodes_and_elements_page "Renumber" nodes and
elements of the mesh.</li>
<li>\subpage translation_page "Translate" in the indicated direction the mesh or some of <li>\subpage translation_page "Translate" in the indicated direction the mesh or some of
its elements.</li> its elements.</li>
<li>\subpage rotation_page "Rotate" by the indicated axis and angle <li>\subpage rotation_page "Rotate" by the indicated axis and angle

16
src/SMESHGUI/SMESHGUI.cxx
View File

@ -3866,8 +3866,8 @@ void SMESHGUI::initialize( CAM_Application* app )
createSMESHAction( SMESHOp::OpRemoveOrphanNodes, "REMOVE_ORPHAN_NODES", "ICON_DLG_REM_ORPHAN_NODES" ); createSMESHAction( SMESHOp::OpRemoveOrphanNodes, "REMOVE_ORPHAN_NODES", "ICON_DLG_REM_ORPHAN_NODES" );
createSMESHAction( SMESHOp::OpClearMesh, "CLEAR_MESH", "ICON_CLEAR_MESH" ); createSMESHAction( SMESHOp::OpClearMesh, "CLEAR_MESH", "ICON_CLEAR_MESH" );
createSMESHAction( SMESHOp::OpRenumberingNodes, "RENUM_NODES", "ICON_DLG_RENUMBERING_NODES" ); //createSMESHAction( SMESHOp::OpRenumberingNodes, "RENUM_NODES", "ICON_DLG_RENUMBERING_NODES" );
createSMESHAction( SMESHOp::OpRenumberingElements, "RENUM_ELEMENTS", "ICON_DLG_RENUMBERING_ELEMENTS" ); //createSMESHAction( SMESHOp::OpRenumberingElements, "RENUM_ELEMENTS", "ICON_DLG_RENUMBERING_ELEMENTS" );
createSMESHAction( SMESHOp::OpTranslation, "TRANS", "ICON_SMESH_TRANSLATION_VECTOR" ); createSMESHAction( SMESHOp::OpTranslation, "TRANS", "ICON_SMESH_TRANSLATION_VECTOR" );
createSMESHAction( SMESHOp::OpRotation, "ROT", "ICON_DLG_MESH_ROTATION" ); createSMESHAction( SMESHOp::OpRotation, "ROT", "ICON_DLG_MESH_ROTATION" );
@ -3976,7 +3976,7 @@ void SMESHGUI::initialize( CAM_Application* app )
volumeId = createMenu( tr( "MEN_VOLUME_CTRL" ), ctrlId, -1, 10 ), volumeId = createMenu( tr( "MEN_VOLUME_CTRL" ), ctrlId, -1, 10 ),
addId = createMenu( tr( "MEN_ADD" ), modifyId, 402 ), addId = createMenu( tr( "MEN_ADD" ), modifyId, 402 ),
removeId = createMenu( tr( "MEN_REMOVE" ), modifyId, 403 ), removeId = createMenu( tr( "MEN_REMOVE" ), modifyId, 403 ),
renumId = createMenu( tr( "MEN_RENUM" ), modifyId, 404 ), //renumId = createMenu( tr( "MEN_RENUM" ), modifyId, 404 ),
transfId = createMenu( tr( "MEN_TRANSF" ), modifyId, 405 ), transfId = createMenu( tr( "MEN_TRANSF" ), modifyId, 405 ),
basicPropId = createMenu( tr( "MEN_BASIC_PROPERTIES" ), measureId, -1, 10 ); basicPropId = createMenu( tr( "MEN_BASIC_PROPERTIES" ), measureId, -1, 10 );
@ -4098,8 +4098,8 @@ void SMESHGUI::initialize( CAM_Application* app )
createMenu( separator(), removeId, -1 ); createMenu( separator(), removeId, -1 );
createMenu( SMESHOp::OpClearMesh, removeId, -1 ); createMenu( SMESHOp::OpClearMesh, removeId, -1 );
createMenu( SMESHOp::OpRenumberingNodes, renumId, -1 ); //createMenu( SMESHOp::OpRenumberingNodes, renumId, -1 );
createMenu( SMESHOp::OpRenumberingElements, renumId, -1 ); //createMenu( SMESHOp::OpRenumberingElements, renumId, -1 );
createMenu( SMESHOp::OpTranslation, transfId, -1 ); createMenu( SMESHOp::OpTranslation, transfId, -1 );
createMenu( SMESHOp::OpRotation, transfId, -1 ); createMenu( SMESHOp::OpRotation, transfId, -1 );
@ -4144,7 +4144,7 @@ void SMESHGUI::initialize( CAM_Application* app )
addElemTb = createTool( tr( "TB_ADD" ), QString( "SMESHAddElementToolbar" ) ), addElemTb = createTool( tr( "TB_ADD" ), QString( "SMESHAddElementToolbar" ) ),
addNonElemTb = createTool( tr( "TB_ADDNON" ), QString( "SMESHAddElementToolbar" ) ), addNonElemTb = createTool( tr( "TB_ADDNON" ), QString( "SMESHAddElementToolbar" ) ),
remTb = createTool( tr( "TB_REM" ), QString( "SMESHRemoveToolbar" ) ), remTb = createTool( tr( "TB_REM" ), QString( "SMESHRemoveToolbar" ) ),
renumbTb = createTool( tr( "TB_RENUMBER" ), QString( "SMESHRenumberingToolbar" ) ), //renumbTb = createTool( tr( "TB_RENUMBER" ), QString( "SMESHRenumberingToolbar" ) ),
transformTb = createTool( tr( "TB_TRANSFORM" ), QString( "SMESHTransformationToolbar" ) ), transformTb = createTool( tr( "TB_TRANSFORM" ), QString( "SMESHTransformationToolbar" ) ),
modifyTb = createTool( tr( "TB_MODIFY" ), QString( "SMESHModificationToolbar" ) ), modifyTb = createTool( tr( "TB_MODIFY" ), QString( "SMESHModificationToolbar" ) ),
measuremTb = createTool( tr( "TB_MEASUREM" ), QString( "SMESHMeasurementsToolbar" ) ), measuremTb = createTool( tr( "TB_MEASUREM" ), QString( "SMESHMeasurementsToolbar" ) ),
@ -4232,8 +4232,8 @@ void SMESHGUI::initialize( CAM_Application* app )
createTool( SMESHOp::OpRemoveOrphanNodes, remTb ); createTool( SMESHOp::OpRemoveOrphanNodes, remTb );
createTool( SMESHOp::OpClearMesh, remTb ); createTool( SMESHOp::OpClearMesh, remTb );
createTool( SMESHOp::OpRenumberingNodes, renumbTb ); //createTool( SMESHOp::OpRenumberingNodes, renumbTb );
createTool( SMESHOp::OpRenumberingElements, renumbTb ); //createTool( SMESHOp::OpRenumberingElements, renumbTb );
createTool( SMESHOp::OpTranslation, transformTb ); createTool( SMESHOp::OpTranslation, transformTb );
createTool( SMESHOp::OpRotation, transformTb ); createTool( SMESHOp::OpRotation, transformTb );

5
src/SMESHGUI/SMESHGUI_CopyMeshDlg.cxx
View File

@ -166,9 +166,10 @@ SMESHGUI_CopyMeshDlg::SMESHGUI_CopyMeshDlg( SMESHGUI* theModule )
myCopyGroupsCheck = new QCheckBox(tr("SMESH_MAKE_GROUPS"), GroupArguments); myCopyGroupsCheck = new QCheckBox(tr("SMESH_MAKE_GROUPS"), GroupArguments);
myCopyGroupsCheck->setChecked(false); myCopyGroupsCheck->setChecked(false);
// CheckBox for keeping ids // CheckBox for keeping ids ( OBSOLETE )
myKeepIdsCheck = new QCheckBox(tr("SMESH_KEEP_IDS"), GroupArguments); myKeepIdsCheck = new QCheckBox(tr("SMESH_KEEP_IDS"), GroupArguments);
myKeepIdsCheck->setChecked(true); myKeepIdsCheck->setChecked(true);
myKeepIdsCheck->hide();
// layout // layout
GroupArgumentsLayout->addWidget(myTextLabelElements, 0, 0); GroupArgumentsLayout->addWidget(myTextLabelElements, 0, 0);
@ -178,7 +179,7 @@ SMESHGUI_CopyMeshDlg::SMESHGUI_CopyMeshDlg( SMESHGUI* theModule )
GroupArgumentsLayout->addWidget(meshNameLabel, 2, 0); GroupArgumentsLayout->addWidget(meshNameLabel, 2, 0);
GroupArgumentsLayout->addWidget(myMeshNameEdit, 2, 1, 1, 5); GroupArgumentsLayout->addWidget(myMeshNameEdit, 2, 1, 1, 5);
GroupArgumentsLayout->addWidget(myCopyGroupsCheck, 3, 0, 1, 6); GroupArgumentsLayout->addWidget(myCopyGroupsCheck, 3, 0, 1, 6);
GroupArgumentsLayout->addWidget(myKeepIdsCheck, 4, 0, 1, 6); // GroupArgumentsLayout->addWidget(myKeepIdsCheck, 4, 0, 1, 6);
/***************************************************************/ /***************************************************************/
GroupButtons = new QGroupBox(this); GroupButtons = new QGroupBox(this);

6
src/SMESH_SWIG/smeshBuilder.py
View File

@ -627,7 +627,7 @@ class smeshBuilder(object, SMESH._objref_SMESH_Gen):
# pass result of Mesh.GetIDSource( list_of_ids, type ) as meshPart # pass result of Mesh.GetIDSource( list_of_ids, type ) as meshPart
# @param meshName a name of the new mesh # @param meshName a name of the new mesh
# @param toCopyGroups to create in the new mesh groups the copied elements belongs to # @param toCopyGroups to create in the new mesh groups the copied elements belongs to
# @param toKeepIDs to preserve IDs of the copied elements or not # @param toKeepIDs to preserve order of the copied elements or not
# @return an instance of Mesh class # @return an instance of Mesh class
def CopyMesh( self, meshPart, meshName, toCopyGroups=False, toKeepIDs=False): def CopyMesh( self, meshPart, meshName, toCopyGroups=False, toKeepIDs=False):
if (isinstance( meshPart, Mesh )): if (isinstance( meshPart, Mesh )):
@ -3477,12 +3477,12 @@ class Mesh:
if mesh: mesh = self.smeshpyD.Mesh(mesh) if mesh: mesh = self.smeshpyD.Mesh(mesh)
return nb, mesh, group return nb, mesh, group
## Renumber mesh nodes ## Renumber mesh nodes (Obsolete, does nothing)
# @ingroup l2_modif_renumber # @ingroup l2_modif_renumber
def RenumberNodes(self): def RenumberNodes(self):
self.editor.RenumberNodes() self.editor.RenumberNodes()
## Renumber mesh elements ## Renumber mesh elements (Obsole, does nothing)
# @ingroup l2_modif_renumber # @ingroup l2_modif_renumber
def RenumberElements(self): def RenumberElements(self):
self.editor.RenumberElements() self.editor.RenumberElements()