X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MergeDlg.h;h=6b087b631c41d110ce318bdf9ceee8a7dbe2fba6;hb=3fcd996c94995fd28d9a8b52495aebe30b3b9632;hp=86595b82a1295d217d3c22220855feaff6966215;hpb=11bba48d41633960431c5ead19671abae3cf1d98;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_MergeDlg.h b/src/SMESHGUI/SMESHGUI_MergeDlg.h index 86595b82a..6b087b631 100644 --- a/src/SMESHGUI/SMESHGUI_MergeDlg.h +++ b/src/SMESHGUI/SMESHGUI_MergeDlg.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -35,6 +35,7 @@ // OCCT includes #include +#include // STL includes #include @@ -59,7 +60,6 @@ class SMESHGUI_SpinBox; class SMESH_Actor; class SUIT_SelectionFilter; class SVTK_Selector; -class TColStd_MapOfInteger; namespace SMESH { @@ -130,6 +130,7 @@ private: QWidget* NodeSpecWidget; SMESHGUI_SpinBox* SpinBoxTolerance; QCheckBox* SeparateCornersAndMedium; + QCheckBox* AvoidMakingHoles; QGroupBox* GroupCoincident; //QWidget* GroupCoincidentWidget;