Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
23081: [CEA 1496] Control merge nodes behaviour: set fixed nodes
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_MergeDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_MergeDlg.h
b/src/SMESHGUI/SMESHGUI_MergeDlg.h
index 9ec0dcb23bdcdc029563b67df2cbae6faabd7587..754dde0f0e87f469bbd4902da377f2c914a36e68 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_MergeDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_MergeDlg.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-81,6
+81,8
@@
private:
void enterEvent( QEvent* ); /* mouse enter the QWidget */
void keyPressEvent( QKeyEvent* );
void onEditGroup();
void enterEvent( QEvent* ); /* mouse enter the QWidget */
void keyPressEvent( QKeyEvent* );
void onEditGroup();
+ bool isKeepNodesIDsSelection();
+ bool isNewKeepNodesGroup( const char* entry );
void FindGravityCenter( TColStd_MapOfInteger&,
std::list<gp_XYZ>& );
void FindGravityCenter( TColStd_MapOfInteger&,
std::list<gp_XYZ>& );
@@
-99,12
+101,13
@@
private:
SMESH::SMESH_IDSource_var mySubMeshOrGroup;
SMESH_Actor* myActor;
SUIT_SelectionFilter* myMeshOrSubMeshOrGroupFilter;
SMESH::SMESH_IDSource_var mySubMeshOrGroup;
SMESH_Actor* myActor;
SUIT_SelectionFilter* myMeshOrSubMeshOrGroupFilter;
+ SUIT_SelectionFilter* mySubMeshOrGroupFilter;
SMESH::TIdPreview* myIdPreview;
int myAction;
bool myIsBusy;
SMESH::TIdPreview* myIdPreview;
int myAction;
bool myIsBusy;
- int myTypeId;
+ int myTypeId;
// manual(1) or automatic(0)
// Widgets
QGroupBox* GroupConstructors;
// Widgets
QGroupBox* GroupConstructors;
@@
-125,11
+128,13
@@
private:
QWidget* GroupCoincidentWidget;
QLabel* TextLabelTolerance;
SMESHGUI_SpinBox* SpinBoxTolerance;
QWidget* GroupCoincidentWidget;
QLabel* TextLabelTolerance;
SMESHGUI_SpinBox* SpinBoxTolerance;
+ QCheckBox* SeparateCornersAndMedium;
QPushButton* DetectButton;
QListWidget* ListCoincident;
QPushButton* AddGroupButton;
QPushButton* RemoveGroupButton;
QCheckBox* SelectAllCB;
QPushButton* DetectButton;
QListWidget* ListCoincident;
QPushButton* AddGroupButton;
QPushButton* RemoveGroupButton;
QCheckBox* SelectAllCB;
+ QCheckBox* ShowIDs;
QGroupBox* GroupEdit;
QListWidget* ListEdit;
QGroupBox* GroupEdit;
QListWidget* ListEdit;
@@
-140,6
+145,12
@@
private:
QGroupBox* GroupExclude;
QListWidget* ListExclude;
QGroupBox* GroupExclude;
QListWidget* ListExclude;
+ QButtonGroup* KeepFromButGroup;
+ QPushButton* SelectKeepNodesButton;
+ QPushButton* AddKeepNodesButton;
+ QPushButton* RemoveKeepNodesButton;
+ QListWidget* KeepList;
+
QGroupBox* TypeBox;
QButtonGroup* GroupType;
QGroupBox* TypeBox;
QButtonGroup* GroupType;
@@
-157,6
+168,10
@@
protected slots:
void ClickOnHelp();
void updateControls();
void onDetect();
void ClickOnHelp();
void updateControls();
void onDetect();
+ void onAddKeepNode();
+ void onRemoveKeepNode();
+ void onSelectKeepNode();
+ void onKeepNodeSourceChanged(int);
void onAddGroup();
void onRemoveGroup();
void onSelectGroup();
void onAddGroup();
void onRemoveGroup();
void onSelectGroup();
@@
-170,6
+185,8
@@
protected slots:
void DeactivateActiveDialog();
void ActivateThisDialog();
void onTypeChanged(int);
void DeactivateActiveDialog();
void ActivateThisDialog();
void onTypeChanged(int);
+ void onOpenView();
+ void onCloseView();
};
#endif // SMESHGUI_MergeDlg_H
};
#endif // SMESHGUI_MergeDlg_H