Merge from V5_1_main branch 24/11/2010

[modules/multipr.git] / src / MULTIPRGUI / MULTIPR_GUI_Dlg.h

diff --git a/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h b/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h
index 2b0c7f86441069c340e7836e6bbc587baba7e052..adcb666abb80e9d5860ec7958bef690f0aed7dc8 100644 (file)
--- a/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h
+++ b/src/MULTIPRGUI/MULTIPR_GUI_Dlg.h
@@ -1,6 +1,24 @@
-// Project MULTIPR, IOLS WP1.2.1 - EDF/CS
-// Partitioning/decimation module for the SALOME v3.2 platform
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
+// Partitioning/decimation module for the SALOME v3.2 platform
+//
 /**
  * \file    MULTIPR_GUI_Dlg.h
  *
@@ -19,8 +37,8 @@
 // Includes section
 //*****************************************************************************
 
-#include <qdialog.h>
-#include <qprogressdialog.h>
+#include <QDialog>
+#include <QProgressDialog>
 
 #include "MULTIPR_ProgressCallback.hxx"
 
@@ -36,7 +54,7 @@ class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QSpacerItem;
-class QButtonGroup;
+class QGroupBox;
 class QLabel;
 class QComboBox;
 class QLineEdit;
@@ -63,10 +81,10 @@ public:
     MULTIPR_GUI_Partition1Dlg(MULTIPR_GUI* theModule);
     ~MULTIPR_GUI_Partition1Dlg();
 
-    QButtonGroup* buttonGroupProcess;
+    QGroupBox* groupBoxProcess;
     QPushButton* pushButtonCancel;
     QPushButton* pushButtonOK;
-    QButtonGroup* buttonGroupSelectMesh;
+    QGroupBox* groupBoxSelectMesh;
     QComboBox* comboBoxSelectMesh;
     QLabel* textLabelSelectMesh;
 
@@ -93,12 +111,12 @@ public:
     MULTIPR_GUI_Partition2Dlg(MULTIPR_GUI* theModule);
     ~MULTIPR_GUI_Partition2Dlg();
 
-    QButtonGroup* buttonGroupSplitParameters;
+    QGroupBox* groupBoxSplitParameters;
     QLabel* textLabelSelectNbParts;
     QLabel* textLabelSelectSplitter;
     QComboBox* comboBoxSelectSplitter;
     QSpinBox* spinBoxNbParts;
-    QButtonGroup* buttonGroupProcess;
+    QGroupBox* groupBoxProcess;
     QPushButton* pushButtonOK;
     QPushButton* pushButtonCancel;
 
@@ -124,15 +142,15 @@ public:
     MULTIPR_GUI_DecimateDlg(MULTIPR_GUI* theModule);
     ~MULTIPR_GUI_DecimateDlg();
 
-    QButtonGroup* buttonGroupSelectField;
+    QGroupBox* groupBoxSelectField;
     QLabel* textLabelSelectFieldName;
     QLabel* textLabelSelectFieldIteration;
     QComboBox* comboBoxSelectFieldIteration;
     QComboBox* comboBoxSelectFieldName;
-    QButtonGroup* buttonGroupSelectFilter;
+    QGroupBox* groupBoxSelectFilter;
     QLabel* textLabelSelectFilter;
     QComboBox* comboBoxSelectFilter;
-    QButtonGroup* buttonGroupParameters;
+    QGroupBox* groupBoxParameters;
     QLabel* textLabelTMed;
     QLabel* textLabelTLow;
     QLabel* textLabelRadius;
@@ -141,12 +159,12 @@ public:
     QLineEdit* lineEditTLow;
     QLineEdit* lineEditRadius;
     QSpinBox* spinBoxBoxing;
-    QButtonGroup* buttonGroupProcess;
+    QGroupBox* groupBoxProcess;
     QPushButton* pushButtonCancel;
     QPushButton* pushButtonOK;
     QPushButton* pushButtonThresholdAuto;
     QPushButton* pushButtonRadiusAuto;
-    QButtonGroup* infoGroup;
+    QGroupBox* infoGroup;
     QLabel* textLabelInfo;
     QLabel* textLabelInfoValue;