-// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021 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
// SMESH includes
#include "SMESH_SMESHGUI.hxx"
-// Qt includes
+// GUI and Qt includes
#include <QDialog>
+#include <SVTK_Hash.h>
// OCCT includes
#include <gp_XYZ.hxx>
//=================================================================================
class SMESHGUI_EXPORT SMESHGUI_MergeDlg : public QDialog
{
- Q_OBJECT;
+ Q_OBJECT
public:
SMESHGUI_MergeDlg( SMESHGUI*, int );
void enterEvent( QEvent* ); /* mouse enter the QWidget */
void keyPressEvent( QKeyEvent* );
void onEditGroup();
- bool isKeepNodesIDsSelection();
- bool isNewKeepNodesGroup( const char* entry );
+ bool isKeepIDsSelection();
+ bool isNewKeepGroup( const char* entry );
- void FindGravityCenter( TColStd_MapOfInteger&,
+ void FindGravityCenter( SVTK_TVtkIDsMap&,
std::vector<int>& ,
std::list<gp_XYZ>& );
// add the centers of gravity of ElemsIdMap elements to the GrCentersXYZ list
private:
typedef QList<SMESH::SMESH_GroupBase_var> GrpList;
- SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
- LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
- SVTK_Selector* mySelector;
+ SMESHGUI* mySMESHGUI; /* Current SMESHGUI object */
+ LightApp_SelectionMgr* mySelectionMgr; /* User shape selection */
+ SVTK_Selector* mySelector;
- QWidget* myEditCurrentArgument;
+ QWidget* myEditCurrentArgument;
- SMESH::SMESH_Mesh_var myMesh;
- SMESH::SMESH_IDSource_var mySubMeshOrGroup;
- SMESH_Actor* myActor;
- SUIT_SelectionFilter* myMeshOrSubMeshOrGroupFilter;
- SUIT_SelectionFilter* mySubMeshOrGroupFilter;
+ SMESH::SMESH_Mesh_var myMesh;
+ SMESH::ListOfIDSources_var mySubMeshOrGroups;
+ GrpList myGroups;
+ QString myEntry;
- SMESHGUI_IdPreview* myIdPreview;
+ SMESH_Actor* myActor;
+ SUIT_SelectionFilter* myMeshOrSubMeshOrGroupFilter;
+ SUIT_SelectionFilter* mySubMeshOrGroupFilter;
+
+ SMESHGUI_IdPreview* myIdPreview;
+ QString myHelpFileName;
+
+ int myAction;
+ bool myIsBusy;
+ int myTypeId; // manual(1) or automatic(0)
+
- int myAction;
- bool myIsBusy;
- int myTypeId; // manual(1) or automatic(0)
// Widgets
QWidget* NodeSpecWidget;
SMESHGUI_SpinBox* SpinBoxTolerance;
QCheckBox* SeparateCornersAndMedium;
+ QCheckBox* AvoidMakingHoles;
QGroupBox* GroupCoincident;
//QWidget* GroupCoincidentWidget;
QGroupBox* GroupKeep;
QButtonGroup* KeepFromButGroup;
- QPushButton* SelectKeepNodesButton;
- QPushButton* AddKeepNodesButton;
- QPushButton* RemoveKeepNodesButton;
+ QPushButton* SelectKeepButton;
+ QPushButton* AddKeepButton;
+ QPushButton* RemoveKeepButton;
QListWidget* KeepList;
QGroupBox* TypeBox;
QButtonGroup* GroupType;
-
- QString myHelpFileName;
-
- QString myEntry;
- GrpList myGroups;
protected slots:
virtual void reject();
void ClickOnHelp();
void updateControls();
void onDetect();
- void onAddKeepNode();
- void onRemoveKeepNode();
- void onSelectKeepNode();
- void onKeepNodeSourceChanged(int);
+ void onAddKeep();
+ void onRemoveKeep();
+ void onSelectKeep();
+ void onKeepSourceChanged(int);
void onAddGroup();
void onRemoveGroup();
void onSelectGroup();