ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-11 16:19:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

23081: [CEA 1496] Control merge nodes behaviour: set fixed nodes

Browse Source 
Change dlg layout by request of http://salome.mantis.opencascade.com/view.php?id=23081#c20415
This commit is contained in:
eap 2015-09-24 19:17:33 +03:00
parent c2037920d0
commit 11bba48d41
25 changed files with 312 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/salome/gui/SMESH/images/mergeelems.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 27 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 13 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 43 KiB

After

Width:  |  Height:  |  Size: 40 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 28 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 9.8 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
doc/salome/gui/SMESH/images/sewing2.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
doc/salome/gui/SMESH/images/sewing3.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 31 KiB

BIN
doc/salome/gui/SMESH/images/sewing4.png Executable file → Normal file
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 28 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 34 KiB

92
doc/salome/gui/SMESH/input/merging_elements.doc
View File

@ -2,68 +2,62 @@
\page merging_elements_page Merging Elements
\n This functionality allows to merge coincident elements of a mesh
object selectable in the dialog box. Two elements are considered coincident if they are based on the same set of nodes.
\n This functionality allows to merge coincident elements of a
mesh. Two elements are considered coincident if they are based on the
same set of nodes.
\image html mergeelems_ico.png "Merge elements menu button"
<ol>
<li>Choose in the main menu \b Modification -> \b Transformation
-> <b>Merge elements</b> item. The following dialog box shall
appear:</li>
To merge elements choose in the main menu \b Modification -> \b Transformation
-> <b>Merge elements</b> item. The following dialog box shall
appear:
\image html mergeelems_auto.png
<br>
<ul>
<li>\b Name is the name of the mesh object whose elements will be
merged.</li>
<li>\b Automatic or \b Manual Mode allows choosing how the elements
are processed.
</ul>
<li><b>Automatic mode:</b>
In this dialog:
<ul>
<li>In the \b Automatic Mode the elements created on the same nodes
will be merged.</li>
</ul>
</li>
<li>\b Name is the name of the mesh object whose elements will be
merged.</li>
<li>\b Automatic or \b Manual Mode allows choosing how the elements
are processed. In the \b Automatic Mode all elements created on
the same nodes will be merged. In \b Manual mode you can adjust
groups of coincident elements detected by the program.
<li>If the \b Manual Mode is selected, additional controls are
available:
If the \b Manual Mode is selected, additional controls are
available:
\image html mergeelems.png
<br>
<ul>
<li>\b Detect button generates the list of coincident elements found
in the selected object.</li>
<li><b>Coincident elements</b> is a list of groups of elements for
merging. After the operation all elements of each group will
be united into one element. The first element of a group is kept and
the others are removed.
<ul>
<li>\b Remove button deletes the selected group from the list.</li>
<li>\b Add button adds to the list a group of elements selected in the
viewer with pressed "Shift" key.</li>
<li><b>Select all</b> check-box selects all groups.</li>
<li><b>Show double elements IDs</b> check-box shows/hides identifiers of
elements of the selected groups in the 3D viewer.</li>
</ul></li>
<li><b>Edit selected group</b> list allows editing the selected group:
<br><br>
\image html add.png
<center>adds to the group the elements selected in the viewer.</center>
<br>
\image html remove.png
<center>removes the selected elements from the group.</center>
<br>
\image html sort.png
<center>moves the selected element to the first position in the
group in order to keep it in the mesh.</center>
<br>
</li>
<li>To confirm your choice click \b Apply or <b>Apply and Close</b> button.</li>
<li>\b Detect button generates the list of coincident elements found
in the selected object.</li>
<li><b>Coincident elements</b> is a list of groups of elements for
merging. After the operation all elements of each group will
be united into one element. The first element of a group is kept and
the others are removed.
<li>\b Remove button deletes the selected group from the list.</li>
<li>\b Add button adds to the list a group of elements selected in the
viewer with pressed "Shift" key.</li>
<li><b>Select all</b> check-box selects all groups.</li>
<li><b>Show double elements IDs</b> check-box shows/hides identifiers of
elements of the selected groups in the 3D viewer.</li>
<li><b>Edit selected group of coincident elements</b> list allows
editing the selected group:
<br><br>
\image html add.png
<center>adds to the group the elements selected in the viewer.</center>
<br>
\image html remove.png
<center>removes the selected elements from the group.</center>
<br>
\image html sort.png
<center>moves the selected element to the first position in the
group in order to keep it in the mesh.</center>
<br>
</li>
</ul>
<li>To confirm your choice click \b Apply or <b>Apply and Close</b> button.</li>
</ul>
</ol>
In this picture you see a triangle which coincides with one of the
elements of the mesh. After we apply <b>Merge Elements</b> functionality, the

84
doc/salome/gui/SMESH/input/merging_nodes.doc
View File

@ -18,54 +18,57 @@ then converted to the single node.
<ul>
<li>\b Name is the name of the mesh whose nodes will be merged.</li>
<li>\b Automatic or \b Manual mode allows choosing how the nodes are
processed.
processed. In \b Manual mode you can adjust groups of coincident nodes
detected by the program and/or select any nodes to be merged.</li>
<li>\b Tolerance is a maximum distance between nodes sufficient for
merging.</li>
<li>Activation of <b>No merge of corner and medium nodes of quadratic
cells</b> check-box prevents merging medium nodes of quadratic
elements with corner nodes. This check-box is enabled provided
that the selected mesh includes quadratic elements.</li>
<li><b>Exclude Groups</b> group box allows to ignore the nodes which
belong to the specified mesh groups.</li>
<li><b>Nodes to keep</b> group box allows to specify nodes to keep in
the mesh. (By default a node being the first in a group of
coincident nodes is kept.) It is possible to either select nodes in
the Viewer or select groups of any element type whose nodes will be
kept.
<ol>
<li><b>Exclude groups from detection</b> group allows to ignore the
nodes which belong to the specified mesh groups. This control is
active provided that the mesh includes groups.</li>
<li><b>Nodes to keep during the merge</b> group allows to specify
nodes to keep in the mesh. (By default a node being the first in a
group of coincident nodes is kept.) It is possible to either select
nodes in the Viewer or select groups of any element type whose nodes
will be kept.
<ul>
<li>\a Selection button activates selection of nodes to keep.</li>
<li><b>Node IDs</b> button activates selection of nodes in the
<li><b>Nodes</b> button activates selection of nodes in the
Viewer.</li>
<li><b>Groups and Sub-meshes</b> button activates selection of
<li><b>Groups and sub-meshes</b> button activates selection of
groups and sub-meshes.</li>
<li>\b Add button adds selected nodes or groups to the list.</li>
<li> Nodes or groups selected in the list can be removed using \b
Remove button.</li>
</ol>
</ul>
</li>
</ul>
<li><b>Automatic mode:</b>
<br>
<ul>
<li>In the \b Automatic Mode all Nodes within the indicated tolerance
will be merged. The nodes which belong to the groups specified in the
<b>Exclude Groups</b> will be not taken into account.</li>
<li>In the \b Automatic Mode all nodes within the indicated tolerance
will be merged. The nodes which belong to the groups specified in
<b>Exclude groups from detection</b> will NOT be taken into account.</li>
</ul>
</li><br>
<li> The \b Manual mode gives you full control of what the operation will do.
In this mode additional controls are available:
<ul>
<li>\b Detect button generates the list of coincident nodes for the given
\b Tolerance.</li>
<li><b>Coincident nodes</b> is a list of groups of nodes for
merging. After the operation all nodes of each group will
be united into one node. The first node of a group is kept and
the others are removed.
<li>\b Detect button generates the list of coincident nodes for the given
\b Tolerance.</li>
<li><b>Coincident nodes</b> is a list of groups of nodes for
merging. Upon \b Apply all nodes of each group will
be united into one node. The first node of a group is kept and
the others are removed. By default the first node has a lowest ID
within the group.
<ul>
<li>\b Remove button deletes the selected group from the list.</li>
<li>\b Add button adds to the list a group of nodes selected in the
viewer with pressed "Shift" key.</li>
viewer.</li>
<li><b>Select all</b> check-box selects all groups.</li>
<li><b>Show double nodes IDs</b> check-box shows/hides identifiers of
nodes of selected groups in the 3D viewer.</li>
@ -75,27 +78,32 @@ nodes of selected groups in the 3D viewer.</li>
\image html mergenodes.png
<br>
</li>
<li><b>Edit selected group</b> list allows editing the selected
group:
<br><br>
\image html add.png
<center>adds to the group the nodes selected in the viewer.</center>
<br>
\image html remove.png
<center>removes from the group the selected nodes.</center>
<br>
\image html sort.png
<center>moves the selected node to the first position in the
group in order to keep it in the mesh.</center><br>
</li>
<li><b>Edit selected group of coincident nodes</b> list allows
editing the selected group:
<br><br>
\image html add.png
<center>adds to the group the nodes selected in the viewer.</center>
<br>
\image html remove.png
<center>removes from the group the selected nodes.</center>
<br>
\image html sort.png
<center>moves the selected node to the first position in the
group in order to keep it in the mesh.</center><br>
</li>
</ul>
</li>
<li>To confirm your choice click \b Apply or <b>Apply and Close</b> button.</li>
</ol>
\image html merging_nodes1.png "The initial object"
\image html merging_nodes2.png "The object has been merged"
\image html merging_nodes1.png
<center> The initial object. Nodes 25, 26 and 5 are added to <b>Nodes
to keep during the merge</b> group.
</center>
<br>
\image html merging_nodes2.png
<center> The object has been merged
</center>
<br><b>See Also</b> a sample TUI Script of a
\ref tui_merging_nodes "Merge Nodes" operation.

2
src/OBJECT/SMESH_Object.cxx
View File

@ -570,7 +570,7 @@ vtkUnstructuredGrid* SMESH_VisualObjDef::GetUnstructuredGrid()
if ( !myLocalGrid && !GetMesh()->isCompacted() )
{
GetMesh()->compactMesh();
updateEntitiesFlags();
updateEntitiesFlags();
vtkUnstructuredGrid *theGrid = GetMesh()->getGrid();
myGrid->ShallowCopy(theGrid);
}

10
src/SMDS/SMDS_Mesh.cxx
View File

@ -322,11 +322,11 @@ SMDS_BallElement* SMDS_Mesh::AddBallWithID(const SMDS_MeshNode * n, double diame
SMDS_BallElement *ball = myBallPool->getNew();
ball->init(n->getVtkId(), diameter, this);
if (!this->registerElement(ID,ball))
{
this->myGrid->GetCellTypesArray()->SetValue(ball->getVtkId(), VTK_EMPTY_CELL);
myBallPool->destroy(ball);
return 0;
}
{
this->myGrid->GetCellTypesArray()->SetValue(ball->getVtkId(), VTK_EMPTY_CELL);
myBallPool->destroy(ball);
return 0;
}
adjustmyCellsCapacity(ID);
myCells[ID] = ball;
myInfo.myNbBalls++;

14
src/SMDS/SMDS_Mesh0DElement.cxx
View File

@ -28,6 +28,8 @@
#include "SMDS_Mesh0DElement.hxx"
#include "SMDS_IteratorOfElements.hxx"
#include "SMDS_MeshNode.hxx"
#include "SMDS_Mesh.hxx"
#include "utilities.h"
using namespace std;
@ -143,7 +145,19 @@ bool SMDS_Mesh0DElement::ChangeNodes(const SMDS_MeshNode* nodes[], const int nbN
{
if ( nbNodes == 1 )
{
vtkUnstructuredGrid* grid = SMDS_Mesh::_meshList[myMeshId]->getGrid();
vtkIdType npts = 0;
vtkIdType* pts = 0;
grid->GetCellPoints(myVtkID, npts, pts);
if (nbNodes != npts)
{
MESSAGE("ChangeNodes problem: not the same number of nodes " << npts << " -> " << nbNodes);
return false;
}
myNode = nodes[0];
pts[0] = myNode->getVtkId();
SMDS_Mesh::_meshList[myMeshId]->setMyModified();
return true;
}
return false;

7
src/SMESH/SMESH_MeshEditor.cxx
View File

@ -7912,7 +7912,8 @@ void SMESH_MeshEditor::MergeNodes (TListOfListOfNodes & theGroupsOfNodes)
if ( isOk ) // the non-poly elem remains valid after sticking nodes
{
if ( nbNodes != nbUniqueNodes )
if ( nbNodes != nbUniqueNodes ||
!aMesh->ChangeElementNodes( elem, & curNodes[0], nbNodes ))
{
elemType.Init( elem ).SetID( elem->GetID() );
@ -7926,10 +7927,6 @@ void SMESH_MeshEditor::MergeNodes (TListOfListOfNodes & theGroupsOfNodes)
if ( elem != newElem )
ReplaceElemInGroups( elem, newElem, aMesh );
}
else
{
aMesh->ChangeElementNodes( elem, & curNodes[0], nbNodes );
}
}
else {
// Remove invalid regular element or invalid polygon

9
src/SMESHGUI/SMESHGUI_FilterDlg.cxx
View File

@ -3363,7 +3363,7 @@ bool SMESHGUI_FilterDlg::onApply()
insertFilterInViewer();
if (!myFilter[ aCurrType ]->GetPredicate()->_is_nil()) {
//
//
bool toFilter = (( SMESH::FindActorByObject( myMesh )) ||
( myInitSourceWgOnApply && mySourceWg ) ||
( mySourceGrp->checkedId() == Dialog && mySourceWg ));
@ -3372,6 +3372,9 @@ bool SMESHGUI_FilterDlg::onApply()
filterSource(aCurrType, aResultIds);
// select in viewer
selectInViewer(aCurrType, aResultIds);
// set ids to the dialog
if ( myInitSourceWgOnApply || mySourceGrp->checkedId() == Dialog )
setIdsToWg(mySourceWg, aResultIds);
}
}
@ -3675,10 +3678,6 @@ void SMESHGUI_FilterDlg::selectInViewer (const int theType, const QList<int>& th
// insert previously stored filter in viewer if necessary
if (!aFilter.IsNull())
SMESH::SetFilter(aFilter);
// set ids to the dialog
if (myInitSourceWgOnApply || mySourceGrp->checkedId() == Dialog)
setIdsToWg(mySourceWg, theIds);
}
//=======================================================================

263
src/SMESHGUI/SMESHGUI_MergeDlg.cxx
View File

@ -122,37 +122,35 @@ SMESHGUI_MergeDlg::SMESHGUI_MergeDlg (SMESHGUI* theModule, int theAction)
myIdPreview = new SMESHGUI_IdPreview(SMESH::GetViewWindow( mySMESHGUI ));
SUIT_ResourceMgr* aResMgr = SMESH::GetResourceMgr( mySMESHGUI );
QPixmap IconMergeNodes (aResMgr->loadPixmap("SMESH", tr("ICON_SMESH_MERGE_NODES")));
QPixmap IconMergeElems (aResMgr->loadPixmap("SMESH", tr("ICON_DLG_MERGE_ELEMENTS")));
// QPixmap IconMergeNodes (aResMgr->loadPixmap("SMESH", tr("ICON_SMESH_MERGE_NODES")));
// QPixmap IconMergeElems (aResMgr->loadPixmap("SMESH", tr("ICON_DLG_MERGE_ELEMENTS")));
QPixmap IconSelect (aResMgr->loadPixmap("SMESH", tr("ICON_SELECT")));
QPixmap IconAdd (aResMgr->loadPixmap("SMESH", tr("ICON_APPEND")));
QPixmap IconRemove (aResMgr->loadPixmap("SMESH", tr("ICON_REMOVE")));
setSizeGripEnabled(true);
QVBoxLayout* DlgLayout = new QVBoxLayout(this);
DlgLayout->setSpacing(SPACING);
DlgLayout->setMargin(MARGIN);
/***************************************************************/
GroupConstructors = new QGroupBox(myAction == MERGE_ELEMENTS ?
tr("SMESH_MERGE_ELEMENTS") :
tr("SMESH_MERGE_NODES"),
this);
// Controls to switch dialog behaviour (myTypeId)
QButtonGroup* ButtonGroup = new QButtonGroup(this);
QHBoxLayout* GroupConstructorsLayout = new QHBoxLayout(GroupConstructors);
GroupConstructorsLayout->setSpacing(SPACING);
GroupConstructorsLayout->setMargin(MARGIN);
TypeBox = new QGroupBox( tr("SMESH_MODE"), this );
GroupType = new QButtonGroup( this );
QHBoxLayout* aTypeBoxLayout = new QHBoxLayout( TypeBox );
aTypeBoxLayout->setMargin( MARGIN );
aTypeBoxLayout->setSpacing( SPACING );
RadioButton = new QRadioButton(GroupConstructors);
RadioButton->setIcon(myAction == MERGE_ELEMENTS ? IconMergeElems : IconMergeNodes);
RadioButton->setChecked(true);
GroupConstructorsLayout->addWidget(RadioButton);
ButtonGroup->addButton(RadioButton, 0);
QRadioButton* rb1 = new QRadioButton( tr( "SMESH_AUTOMATIC" ), TypeBox );
QRadioButton* rb2 = new QRadioButton( tr( "SMESH_MANUAL" ), TypeBox );
GroupType->addButton( rb1, 0 );
GroupType->addButton( rb2, 1 );
aTypeBoxLayout->addWidget( rb1 );
aTypeBoxLayout->addWidget( rb2 );
myTypeId = TYPE_AUTO;
/***************************************************************/
// Controls for mesh defining
GroupMesh = new QGroupBox(tr("SMESH_SELECT_WHOLE_MESH"), this);
QHBoxLayout* GroupMeshLayout = new QHBoxLayout(GroupMesh);
GroupMeshLayout->setSpacing(SPACING);
@ -168,46 +166,44 @@ SMESHGUI_MergeDlg::SMESHGUI_MergeDlg (SMESHGUI* theModule, int theAction)
GroupMeshLayout->addWidget(SelectMeshButton);
GroupMeshLayout->addWidget(LineEditMesh);
/***************************************************************/
// Controls for switch dialog behaviour (myTypeId)
TypeBox = new QGroupBox( tr( "SMESH_MODE" ), this );
GroupType = new QButtonGroup( this );
QHBoxLayout* aTypeBoxLayout = new QHBoxLayout( TypeBox );
aTypeBoxLayout->setMargin( MARGIN );
aTypeBoxLayout->setSpacing( SPACING );
QRadioButton* rb1 = new QRadioButton( tr( "SMESH_AUTOMATIC" ), TypeBox );
QRadioButton* rb2 = new QRadioButton( tr( "SMESH_MANUAL" ), TypeBox );
GroupType->addButton( rb1, 0 );
GroupType->addButton( rb2, 1 );
aTypeBoxLayout->addWidget( rb1 );
aTypeBoxLayout->addWidget( rb2 );
myTypeId = TYPE_AUTO;
/***************************************************************/
// Controls for coincident elements detecting
GroupCoincident = new QGroupBox(myAction == MERGE_ELEMENTS ?
tr("COINCIDENT_ELEMENTS") :
tr("COINCIDENT_NODES"),
GroupCoincident = new QGroupBox(myAction == MERGE_ELEMENTS ?
tr("COINCIDENT_ELEMENTS") :
tr("COINCIDENT_NODES"),
this);
QVBoxLayout* aCoincidentLayout = new QVBoxLayout(GroupCoincident);
QGridLayout* aCoincidentLayout = new QGridLayout(GroupCoincident);
aCoincidentLayout->setSpacing(SPACING);
aCoincidentLayout->setMargin(MARGIN);
if (myAction == MERGE_NODES) // case merge nodes
{
QWidget* foo = new QWidget(GroupCoincident);
TextLabelTolerance = new QLabel(tr("SMESH_TOLERANCE"), foo);
SpinBoxTolerance = new SMESHGUI_SpinBox(foo);
/***************************************************************/
// Node specific Controls: tolerance, ...
NodeSpecWidget = new QWidget( this );
QLabel* TextLabelTolerance = new QLabel(tr("SMESH_TOLERANCE"), NodeSpecWidget);
SpinBoxTolerance = new SMESHGUI_SpinBox( NodeSpecWidget );
SpinBoxTolerance->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
SeparateCornersAndMedium = new QCheckBox(tr("SEPARATE_CORNERS_AND_MEDIUM"), foo);
SeparateCornersAndMedium = new QCheckBox(tr("SEPARATE_CORNERS_AND_MEDIUM"), NodeSpecWidget );
SeparateCornersAndMedium->setEnabled( false );
GroupExclude = new QGroupBox(tr("EXCLUDE_GROUPS"), foo);
QGridLayout* NodeSpecLayout = new QGridLayout(NodeSpecWidget);
NodeSpecLayout->setSpacing(SPACING);
NodeSpecLayout->setMargin(0);
NodeSpecLayout->addWidget(TextLabelTolerance, 0, 0 );
NodeSpecLayout->addWidget(SpinBoxTolerance, 0, 1 );
NodeSpecLayout->addWidget(SeparateCornersAndMedium, 1, 0, 1, 2 );
/***************************************************************/
// Exclude groups
GroupExclude = new QGroupBox(tr("EXCLUDE_GROUPS"), this );
GroupExclude->setCheckable( true );
GroupExclude->setChecked( false );
ListExclude = new QListWidget( GroupExclude );
@ -216,11 +212,14 @@ SMESHGUI_MergeDlg::SMESHGUI_MergeDlg (SMESHGUI* theModule, int theAction)
GroupExcludeLayout->setMargin(MARGIN);
GroupExcludeLayout->addWidget(ListExclude);
QGroupBox* GroupKeep = new QGroupBox(tr("KEEP_NODES"), foo);
/***************************************************************/
// Nodes to keep
GroupKeep = new QGroupBox(tr("KEEP_NODES"), this);
SelectKeepNodesButton = new QPushButton( GroupKeep );
SelectKeepNodesButton->setIcon( IconSelect );
QLabel* selectLabel = new QLabel(tr("SELECT"));
QRadioButton* idsButton = new QRadioButton(tr("NODE_IDS"), GroupKeep);
QRadioButton* idsButton = new QRadioButton(tr("SMESH_NODES"), GroupKeep);
QRadioButton* groupButton = new QRadioButton(tr("GROUP_SUBMESH"), GroupKeep);
KeepFromButGroup = new QButtonGroup( this );
KeepFromButGroup->addButton( idsButton, 0 );
@ -238,19 +237,10 @@ SMESHGUI_MergeDlg::SMESHGUI_MergeDlg (SMESHGUI* theModule, int theAction)
GroupKeepLayout->addWidget( selectLabel, 0, 1 );
GroupKeepLayout->addWidget( idsButton, 0, 2 );
GroupKeepLayout->addWidget( groupButton, 0, 3, 1, 2 );
GroupKeepLayout->addWidget( KeepList, 1, 0, 2, 4 );
GroupKeepLayout->addWidget( KeepList, 1, 0, 3, 4 );
GroupKeepLayout->addWidget( AddKeepNodesButton, 1, 4, 1, 1 );
GroupKeepLayout->addWidget( RemoveKeepNodesButton, 2, 4, 1, 1 );
QGridLayout* fooLayout = new QGridLayout( foo );
fooLayout->setSpacing(SPACING);
fooLayout->setMargin(0);
fooLayout->addWidget(TextLabelTolerance, 0, 0 );
fooLayout->addWidget(SpinBoxTolerance, 0, 1 );
fooLayout->addWidget(SeparateCornersAndMedium, 1, 0 );
fooLayout->addWidget(GroupExclude, 2, 0, 1, 2 );
fooLayout->addWidget(GroupKeep, 3, 0, 1, 2 );
aCoincidentLayout->addWidget(foo);
GroupKeepLayout->setRowStretch(3, 5);
// Costruction of the logical filter
QList<SUIT_SelectionFilter*> aListOfFilters;
@ -260,7 +250,7 @@ SMESHGUI_MergeDlg::SMESHGUI_MergeDlg (SMESHGUI* theModule, int theAction)
new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR, /*takeOwnership=*/true);
}
else {
TextLabelTolerance = 0;
NodeSpecWidget = 0;
SpinBoxTolerance = 0;
GroupExclude = 0;
ListExclude = 0;
@ -272,35 +262,31 @@ SMESHGUI_MergeDlg::SMESHGUI_MergeDlg (SMESHGUI* theModule, int theAction)
mySubMeshOrGroupFilter = 0;
}
GroupCoincidentWidget = new QWidget(GroupCoincident);
QGridLayout* GroupCoincidentLayout = new QGridLayout(GroupCoincidentWidget);
GroupCoincidentLayout->setSpacing(SPACING);
GroupCoincidentLayout->setMargin(0);
ListCoincident = new QListWidget(GroupCoincidentWidget);
ListCoincident = new QListWidget(GroupCoincident);
ListCoincident->setSelectionMode(QListWidget::ExtendedSelection);
DetectButton = new QPushButton(tr("DETECT"), GroupCoincidentWidget);
AddGroupButton = new QPushButton(tr("SMESH_BUT_ADD"), GroupCoincidentWidget);
RemoveGroupButton = new QPushButton(tr("SMESH_BUT_REMOVE"), GroupCoincidentWidget);
DetectButton = new QPushButton(tr("DETECT"), GroupCoincident);
AddGroupButton = new QPushButton(tr("SMESH_BUT_ADD"), GroupCoincident);
RemoveGroupButton = new QPushButton(tr("SMESH_BUT_REMOVE"), GroupCoincident);
SelectAllCB = new QCheckBox(tr("SELECT_ALL"), GroupCoincidentWidget);
ShowIDs = new QCheckBox(myAction == MERGE_ELEMENTS ? tr("SHOW_ELEMS_IDS") : tr("SHOW_NODES_IDS"), GroupCoincidentWidget);
SelectAllCB = new QCheckBox(tr("SELECT_ALL"), GroupCoincident);
ShowIDs = new QCheckBox(myAction == MERGE_ELEMENTS ? tr("SHOW_ELEMS_IDS") : tr("SHOW_NODES_IDS"), GroupCoincident);
GroupCoincidentLayout->addWidget(ListCoincident, 0, 0, 4, 2);
GroupCoincidentLayout->addWidget(DetectButton, 0, 2);
GroupCoincidentLayout->addWidget(AddGroupButton, 2, 2);
GroupCoincidentLayout->addWidget(RemoveGroupButton, 3, 2);
GroupCoincidentLayout->addWidget(SelectAllCB, 4, 0);
GroupCoincidentLayout->addWidget(ShowIDs, 4, 1);
GroupCoincidentLayout->setRowMinimumHeight(1, 10);
GroupCoincidentLayout->setRowStretch(1, 5);
aCoincidentLayout->addWidget(GroupCoincidentWidget);
aCoincidentLayout->addWidget(ListCoincident, 0, 0, 4, 2);
aCoincidentLayout->addWidget(DetectButton, 0, 2);
aCoincidentLayout->addWidget(AddGroupButton, 2, 2);
aCoincidentLayout->addWidget(RemoveGroupButton, 3, 2);
aCoincidentLayout->addWidget(SelectAllCB, 4, 0);
aCoincidentLayout->addWidget(ShowIDs, 4, 1);
aCoincidentLayout->setRowMinimumHeight(1, 10);
aCoincidentLayout->setRowStretch(1, 5);
/***************************************************************/
// Controls for editing the selected group
GroupEdit = new QGroupBox(tr("EDIT_SELECTED_GROUP"), this);
GroupEdit = new QGroupBox(myAction == MERGE_NODES ?
tr("EDIT_SELECTED_NODE_GROUP") :
tr("EDIT_SELECTED_ELEM_GROUP"), this);
QGridLayout* GroupEditLayout = new QGridLayout(GroupEdit);
GroupEditLayout->setSpacing(SPACING);
GroupEditLayout->setMargin(MARGIN);
@ -349,16 +335,49 @@ SMESHGUI_MergeDlg::SMESHGUI_MergeDlg (SMESHGUI* theModule, int theAction)
GroupButtonsLayout->addWidget(buttonHelp);
/***************************************************************/
DlgLayout->addWidget(GroupConstructors);
DlgLayout->addWidget(GroupMesh);
DlgLayout->addWidget(TypeBox);
DlgLayout->addWidget(GroupCoincident);
DlgLayout->addWidget(GroupEdit);
DlgLayout->addWidget(GroupButtons);
if (myAction == MERGE_NODES)
{
QWidget* LeftWdg = new QWidget( this );
QVBoxLayout* LeftLayout = new QVBoxLayout(LeftWdg);
LeftLayout->setSpacing(SPACING);
LeftLayout->setMargin(0);
LeftLayout->addWidget(TypeBox);
LeftLayout->addWidget(GroupMesh);
LeftLayout->addWidget(NodeSpecWidget);
LeftLayout->addWidget(GroupCoincident);
LeftLayout->addStretch();
LeftLayout->addWidget(GroupButtons);
LeftLayout->setStretch( 3, 10 );
GroupCoincidentWidget->setVisible( myAction != MERGE_NODES );
GroupCoincident ->setVisible( myAction == MERGE_NODES );
//if GroupExclude->setVisible( myAction == MERGE_NODES );
QWidget* RightWdg = new QWidget( this );
QVBoxLayout* RightLayout = new QVBoxLayout(RightWdg);
RightLayout->setSpacing(SPACING);
RightLayout->setMargin(0);
RightLayout->addWidget(GroupExclude);
RightLayout->addWidget(GroupKeep);
RightLayout->addWidget(GroupEdit);
RightLayout->setStretch( 0, 4 );
RightLayout->setStretch( 1, 5 );
QHBoxLayout* DlgLayout = new QHBoxLayout(this);
DlgLayout->setSpacing(SPACING*2);
DlgLayout->setMargin(MARGIN);
DlgLayout->addWidget( LeftWdg );
DlgLayout->addWidget( RightWdg );
}
else
{
QVBoxLayout* DlgLayout = new QVBoxLayout(this);
DlgLayout->setSpacing(SPACING);
DlgLayout->setMargin(MARGIN);
DlgLayout->addWidget(TypeBox);
DlgLayout->addWidget(GroupMesh);
DlgLayout->addWidget(GroupCoincident);
DlgLayout->addWidget(GroupEdit);
DlgLayout->addWidget(GroupButtons);
}
GroupCoincident->hide();
GroupEdit->hide();
this->resize(10,10);
@ -388,8 +407,6 @@ void SMESHGUI_MergeDlg::Init()
SpinBoxTolerance->SetValue(1e-05);
}
RadioButton->setChecked(true);
GroupType->button(0)->setChecked(true);
myEditCurrentArgument = (QWidget*)LineEditMesh;
@ -581,7 +598,8 @@ bool SMESHGUI_MergeDlg::ClickOnApply()
SUIT_MessageBox::information(SMESHGUI::desktop(), tr("SMESH_INFORMATION"),
tr("SMESH_MERGED_ELEMENTS").arg(QString::number(ListCoincident->count()).toLatin1().data()));
}
nodesToKeep->length(0); // release before tmpIdSource calls UnRegister()
if ( & nodesToKeep.in() )
nodesToKeep->length(0); // release before tmpIdSource calls UnRegister()
}
catch(...) {
@ -808,6 +826,17 @@ void SMESHGUI_MergeDlg::onSelectGroup()
if( ListCoincident->count() != ListCoincident->selectedItems().count() )
SelectAllCB->setChecked( false );
if ( myEditCurrentArgument == (QWidget*)KeepList && KeepList &&
!isKeepNodesIDsSelection() )
{
// restore selection of nodes after selection of sub-meshes
mySelectionMgr->clearFilters();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode( NodeSelection );
SMESH::SetPointRepresentation( true );
myEditCurrentArgument = ListCoincident;
}
myEditCurrentArgument = (QWidget*)ListCoincident;
myIsBusy = true;
@ -904,6 +933,17 @@ void SMESHGUI_MergeDlg::onSelectElementFromGroup()
}
else
myIdPreview->SetPointsLabeled(false);
if ( myEditCurrentArgument == (QWidget*)KeepList && KeepList &&
!isKeepNodesIDsSelection() )
{
// restore selection of nodes after selection of sub-meshes
mySelectionMgr->clearFilters();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode( NodeSelection );
SMESH::SetPointRepresentation( true );
myEditCurrentArgument = ListCoincident;
}
}
//=================================================================================
@ -1082,6 +1122,7 @@ void SMESHGUI_MergeDlg::SetEditCurrentArgument()
}
else
{
SMESH::SetPointRepresentation( false );
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode( ActorSelection );
mySelectionMgr->installFilter( mySubMeshOrGroupFilter );
@ -1163,6 +1204,7 @@ void SMESHGUI_MergeDlg::SelectionIntoArgument()
myGroups.clear();
ListExclude->clear();
SMESH::ListOfGroups_var aListOfGroups = myMesh->GetGroups();
GroupExclude->setEnabled( aListOfGroups->length() > 0 );
for( int i = 0, n = aListOfGroups->length(); i < n; i++ ) {
SMESH::SMESH_GroupBase_var aGroup = aListOfGroups[i];
if ( !aGroup->_is_nil() ) { // && aGroup->GetType() == SMESH::NODE
@ -1241,13 +1283,17 @@ void SMESHGUI_MergeDlg::SelectionIntoArgument()
//=================================================================================
void SMESHGUI_MergeDlg::DeactivateActiveDialog()
{
if (GroupConstructors->isEnabled()) {
GroupConstructors->setEnabled(false);
if (TypeBox->isEnabled()) {
TypeBox->setEnabled(false);
GroupMesh->setEnabled(false);
GroupCoincident->setEnabled(false);
GroupEdit->setEnabled(false);
GroupButtons->setEnabled(false);
if (myAction == MERGE_NODES)
{
GroupExclude->setEnabled(false);
GroupKeep->setEnabled(false);
}
mySMESHGUI->ResetState();
mySMESHGUI->SetActiveDialogBox(0);
}
@ -1264,12 +1310,16 @@ void SMESHGUI_MergeDlg::ActivateThisDialog()
{
/* Emit a signal to deactivate the active dialog */
mySMESHGUI->EmitSignalDeactivateDialog();
GroupConstructors->setEnabled(true);
TypeBox->setEnabled(true);
GroupMesh->setEnabled(true);
GroupCoincident->setEnabled(true);
GroupEdit->setEnabled(true);
GroupButtons->setEnabled(true);
if (myAction == MERGE_NODES)
{
GroupExclude->setEnabled(false);
GroupKeep->setEnabled(false);
}
connect(mySelectionMgr, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
mySMESHGUI->SetActiveDialogBox((QDialog*)this);
@ -1282,7 +1332,7 @@ void SMESHGUI_MergeDlg::ActivateThisDialog()
//=================================================================================
void SMESHGUI_MergeDlg::enterEvent (QEvent*)
{
if ( !GroupConstructors->isEnabled() ) {
if ( !TypeBox->isEnabled() ) {
SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI );
if ( aViewWindow && !mySelector) {
mySelector = aViewWindow->GetSelector();
@ -1326,11 +1376,11 @@ void SMESHGUI_MergeDlg::onTypeChanged (int id)
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
aViewWindow->SetSelectionMode(ActorSelection);
mySelectionMgr->clearFilters();
if (myAction == MERGE_NODES)
GroupCoincidentWidget->hide();
else
GroupCoincident->hide();
GroupCoincident->hide();
GroupEdit->hide();
GroupMesh->hide(); // <--- a trick to make the dialog take a minimal size
GroupMesh->show();
break;
case TYPE_MANUAL: // manual
@ -1346,31 +1396,30 @@ void SMESHGUI_MergeDlg::onTypeChanged (int id)
if (aSmeshGroupFilter) aListOfFilters.append(aSmeshGroupFilter);
myMeshOrSubMeshOrGroupFilter =
new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR);
new SMESH_LogicalFilter (aListOfFilters, SMESH_LogicalFilter::LO_OR, true);
if (myAction == MERGE_NODES) {
GroupCoincidentWidget->show();
SMESH::SetPointRepresentation(true);
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
if( mySelector->IsSelectionEnabled() )
aViewWindow->SetSelectionMode(NodeSelection);
}
else {
GroupCoincident->show();
if ( SVTK_ViewWindow* aViewWindow = SMESH::GetViewWindow( mySMESHGUI ))
if( mySelector->IsSelectionEnabled() )
aViewWindow->SetSelectionMode(CellSelection);
}
GroupCoincident->show();
GroupEdit->show();
break;
}
SelectionIntoArgument();
updateControls();
qApp->processEvents();
updateGeometry();
resize(10,10);
SelectionIntoArgument();
}
//=======================================================================

10
src/SMESHGUI/SMESHGUI_MergeDlg.h
View File

@ -115,8 +115,6 @@ private:
int myTypeId; // manual(1) or automatic(0)
// Widgets
QGroupBox* GroupConstructors;
QRadioButton* RadioButton;
QGroupBox* GroupButtons;
QPushButton* buttonOk;
@ -129,11 +127,12 @@ private:
QPushButton* SelectMeshButton;
QLineEdit* LineEditMesh;
QGroupBox* GroupCoincident;
QWidget* GroupCoincidentWidget;
QLabel* TextLabelTolerance;
QWidget* NodeSpecWidget;
SMESHGUI_SpinBox* SpinBoxTolerance;
QCheckBox* SeparateCornersAndMedium;
QGroupBox* GroupCoincident;
//QWidget* GroupCoincidentWidget;
QPushButton* DetectButton;
QListWidget* ListCoincident;
QPushButton* AddGroupButton;
@ -150,6 +149,7 @@ private:
QGroupBox* GroupExclude;
QListWidget* ListExclude;
QGroupBox* GroupKeep;
QButtonGroup* KeepFromButGroup;
QPushButton* SelectKeepNodesButton;
QPushButton* AddKeepNodesButton;

8
src/SMESHGUI/SMESHGUI_RemoveElementsDlg.cxx
View File

@ -527,9 +527,11 @@ void SMESHGUI_RemoveElementsDlg::setFilters()
myFilterDlg = new SMESHGUI_FilterDlg( mySMESHGUI, SMESH::ALL );
QList<int> types;
if ( myMesh->NbEdges() ) types << SMESH::EDGE;
if ( myMesh->NbFaces() ) types << SMESH::FACE;
if ( myMesh->NbVolumes() ) types << SMESH::VOLUME;
if ( myMesh->NbEdges() ) types << SMESH::EDGE;
if ( myMesh->NbFaces() ) types << SMESH::FACE;
if ( myMesh->NbVolumes() ) types << SMESH::VOLUME;
if ( myMesh->NbBalls() ) types << SMESH::BALL;
if ( myMesh->Nb0DElements()) types << SMESH::ELEM0D;
myFilterDlg->Init( types );
myFilterDlg->SetSelection();

13
src/SMESHGUI/SMESHGUI_SewingDlg.cxx
View File

@ -44,6 +44,7 @@
// SALOME GUI includes
#include <LightApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SALOMEDSClient_Study.hxx>
#include <SALOME_ListIO.hxx>
#include <SUIT_Desktop.h>
#include <SUIT_MessageBox.h>
@ -282,7 +283,7 @@ SMESHGUI_SewingDlg::SMESHGUI_SewingDlg( SMESHGUI* theModule )
AutoSewCheck->setChecked( true );
// mesh
QGroupBox* GroupMesh = new QGroupBox(tr("SMESH_SELECT_WHOLE_MESH"), SewFreeBordersWidget);
QGroupBox* GroupMesh = new QGroupBox(tr("SMESH_MESH"), SewFreeBordersWidget);
QHBoxLayout* GroupMeshLayout = new QHBoxLayout(GroupMesh);
GroupMeshLayout->setSpacing(SPACING);
GroupMeshLayout->setMargin(MARGIN);
@ -453,8 +454,9 @@ SMESHGUI_SewingDlg::SMESHGUI_SewingDlg( SMESHGUI* theModule )
myHelpFileName = "sewing_meshes_page.html";
myActor = 0;
setDisplayMode();
myStoredEntityMode = 0;
setDisplayMode();
Init();
/* signals and slots connections */
@ -572,6 +574,8 @@ void SMESHGUI_SewingDlg::ConstructorsClicked (int constructorId)
CheckBoxPolyedrs->hide();
}
CheckBoxMerge->setVisible ( constructorId == 3 );
if (( !SubGroup1->isVisible() ) &&
( constructorId != 0 || ModeButGrp->checkedId() == MODE_MANUAL ))
{
@ -702,6 +706,8 @@ void SMESHGUI_SewingDlg::ConstructorsClicked (int constructorId)
void SMESHGUI_SewingDlg::setDisplayMode()
{
if ( myStoredEntityMode )
return;
myStoredEntityMode = 0;
myStoredRepresentation = -1;
@ -1640,7 +1646,8 @@ void SMESHGUI_SewingDlg::SelectionIntoArgument (bool isSelectionChanged)
if ( myEditCurrentArgument == LineEditMesh )
{
LineEditMesh->setText( IO->getName() );
if ( _PTR(SObject) meshSO = SMESH::FindSObject( myMesh ))
LineEditMesh->setText( meshSO->GetName().c_str() );
ListCoincident->clear();
if ( AutoSewCheck->isChecked() )
{

14
src/SMESHGUI/SMESH_msg_en.ts
View File

@ -5120,8 +5120,12 @@ Please select a group and try again</translation>
<translation>Detect</translation>
</message>
<message>
<source>EDIT_SELECTED_GROUP</source>
<translation>Edit selected group</translation>
<source>EDIT_SELECTED_NODE_GROUP</source>
<translation>Edit selected group of coincident nodes</translation>
</message>
<message>
<source>EDIT_SELECTED_ELEM_GROUP</source>
<translation>Edit selected group of coincident elements</translation>
</message>
<message>
<source>SELECT_ALL</source>
@ -5137,7 +5141,7 @@ Please select a group and try again</translation>
</message>
<message>
<source>EXCLUDE_GROUPS</source>
<translation>Exclude Groups</translation>
<translation>Exclude groups from detection</translation>
</message>
<message>
<source>SEPARATE_CORNERS_AND_MEDIUM</source>
@ -5145,11 +5149,11 @@ Please select a group and try again</translation>
</message>
<message>
<source>KEEP_NODES</source>
<translation>Nodes to keep</translation>
<translation>Nodes to keep during the merge</translation>
</message>
<message>
<source>GROUP_SUBMESH</source>
<translation>Groups and Sub-meshes</translation>
<translation>Groups and sub-meshes</translation>
</message>
<message>
<source>SELECT</source>

8
src/SMESHUtils/SMESH_MAT2d.cxx
View File

@ -47,7 +47,7 @@
#include <TopoDS_Wire.hxx>
#ifdef _DEBUG_
//#define _MYDEBUG_
#define _MYDEBUG_
#include "SMESH_File.hxx"
#include "SMESH_Comment.hxx"
#endif
@ -381,10 +381,10 @@ namespace
for ( size_t i = 0; i < bndSegs.size(); ++i )
{
if ( !bndSegs[i]._edge )
text << "# " << i << " NULL edge";
text << "# " << i << " NULL edge\n";
else if ( !bndSegs[i]._edge->vertex0() ||
!bndSegs[i]._edge->vertex1() )
text << "# " << i << " INFINITE edge";
text << "# " << i << " INFINITE edge\n";
else if ( addedEdges.insert( bndSegs[i]._edge ).second &&
addedEdges.insert( bndSegs[i]._edge->twin() ).second )
{
@ -407,7 +407,7 @@ namespace
}
text << "\n";
file.write( text.c_str(), text.size() );
cout << "Write " << fileName << endl;
cout << "execfile( '" << fileName << "')" << endl;
#endif
}

11
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -771,9 +771,14 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishGroup (SALOMEDS::Study_ptr theStudy
}
else if ( SMESH::DownCast< SMESH_Group_i* > ( theGroup ))
{
SMESH::array_of_ElementType_var allElemTypes = theMesh->GetTypes();
for ( size_t i =0; i < allElemTypes->length() && isEmpty; ++i )
isEmpty = ( allElemTypes[i] != theGroup->GetType() );
if ( theGroup->GetType() == SMESH::NODE )
isEmpty = ( theMesh->NbNodes() == 0 );
else
{
SMESH::array_of_ElementType_var allElemTypes = theMesh->GetTypes();
for ( size_t i =0; i < allElemTypes->length() && isEmpty; ++i )
isEmpty = ( allElemTypes[i] != theGroup->GetType() );
}
}
aGroupSO = publish (theStudy, theGroup, aRootSO, 0, pm[isEmpty].c_str() );
}