X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MergeDlg.h;h=86595b82a1295d217d3c22220855feaff6966215;hb=67909c435c61c79a648ca9beee02b77c68657e5b;hp=b003b3842f42006ad215816093742e201d3497f7;hpb=5c19bc1e1684ec6a466423361949ed7b60556968;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.h b/src/SMESHGUI/SMESHGUI_MergeDlg.h index b003b3842..86595b82a 100644 --- a/src/SMESHGUI/SMESHGUI_MergeDlg.h +++ b/src/SMESHGUI/SMESHGUI_MergeDlg.h @@ -38,25 +38,27 @@ // STL includes #include +#include // IDL includes #include #include CORBA_SERVER_HEADER(SMESH_Mesh) +class LightApp_SelectionMgr; +class QButtonGroup; +class QCheckBox; class QGroupBox; class QLabel; class QLineEdit; +class QListWidget; class QPushButton; class QRadioButton; -class QCheckBox; -class QListWidget; -class QButtonGroup; class SMESHGUI; +class SMESHGUI_IdPreview; class SMESHGUI_SpinBox; class SMESH_Actor; -class SVTK_Selector; -class LightApp_SelectionMgr; class SUIT_SelectionFilter; +class SVTK_Selector; class TColStd_MapOfInteger; namespace SMESH @@ -76,13 +78,18 @@ public: SMESHGUI_MergeDlg( SMESHGUI*, int ); ~SMESHGUI_MergeDlg(); + static QPixmap IconFirst(); + private: void Init(); void enterEvent( QEvent* ); /* mouse enter the QWidget */ void keyPressEvent( QKeyEvent* ); void onEditGroup(); + bool isKeepNodesIDsSelection(); + bool isNewKeepNodesGroup( const char* entry ); - void FindGravityCenter( TColStd_MapOfInteger&, + void FindGravityCenter( TColStd_MapOfInteger&, + std::vector& , std::list& ); // add the centers of gravity of ElemsIdMap elements to the GrCentersXYZ list @@ -99,16 +106,15 @@ private: SMESH::SMESH_IDSource_var mySubMeshOrGroup; SMESH_Actor* myActor; SUIT_SelectionFilter* myMeshOrSubMeshOrGroupFilter; + SUIT_SelectionFilter* mySubMeshOrGroupFilter; - SMESH::TIdPreview* myIdPreview; + SMESHGUI_IdPreview* myIdPreview; int myAction; bool myIsBusy; - int myTypeId; + int myTypeId; // manual(1) or automatic(0) // Widgets - QGroupBox* GroupConstructors; - QRadioButton* RadioButton; QGroupBox* GroupButtons; QPushButton* buttonOk; @@ -121,10 +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; @@ -141,6 +149,13 @@ private: QGroupBox* GroupExclude; QListWidget* ListExclude; + QGroupBox* GroupKeep; + QButtonGroup* KeepFromButGroup; + QPushButton* SelectKeepNodesButton; + QPushButton* AddKeepNodesButton; + QPushButton* RemoveKeepNodesButton; + QListWidget* KeepList; + QGroupBox* TypeBox; QButtonGroup* GroupType; @@ -158,6 +173,10 @@ protected slots: void ClickOnHelp(); void updateControls(); void onDetect(); + void onAddKeepNode(); + void onRemoveKeepNode(); + void onSelectKeepNode(); + void onKeepNodeSourceChanged(int); void onAddGroup(); void onRemoveGroup(); void onSelectGroup();