X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_MeshDlg.h;h=cf6b775c40c2c3162bbed305d54844cb7627761e;hp=4b909b3c8ea3819d5fcfdb1bc95ca2ab1a9f7e0d;hb=f31477795020e2cfc50d5b625579285c644a6a96;hpb=79b1ac2b6df9117f16f11d444b1f165d477a1813

diff --git a/src/SMESHGUI/SMESHGUI_MeshDlg.h b/src/SMESHGUI/SMESHGUI_MeshDlg.h
index 4b909b3c8..cf6b775c4 100644
--- a/src/SMESHGUI/SMESHGUI_MeshDlg.h
+++ b/src/SMESHGUI/SMESHGUI_MeshDlg.h
@@ -1,52 +1,47 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
-// 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.
+//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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.
 //
-/**
-*  SMESH SMESHGUI
-*
-*  Copyright (C) 2005  CEA/DEN, EDF R&D
-*
-*
-*
-*  File   : SMESHGUI_MeshDlg.h
-*  Author : Sergey LITONIN
-*  Module : SMESH
-*/
-
-
-#ifndef SMESHGUI_MeshDlg_H
-#define SMESHGUI_MeshDlg_H
+//  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
+//
+// SMESH SMESHGUI : GUI for SMESH component
+// File   : SMESHGUI_MeshDlg.h
+// Author : Sergey LITONIN, Open CASCADE S.A.S.
+//
+#ifndef SMESHGUI_MESHDLG_H
+#define SMESHGUI_MESHDLG_H
 
+// SMESH includes
 #include "SMESH_SMESHGUI.hxx"
 
 #include "SMESHGUI_Dialog.h"
-#include <qframe.h>
-#include <qstringlist.h>
-#include <qmap.h>
+
+// Qt includes
+#include <QFrame>
+#include <QStringList>
+#include <QMap>
 
 class SMESHGUI_MeshTab;
 class QTabWidget;
-class QLineEdit;
 class QComboBox;
 class QToolButton;
-class QString;
-class QPopupMenu;
+class QMenu;
+class QAction;
 
 /*!
  * \brief Dialog for mech creation or editing
@@ -65,7 +60,7 @@ public:
   enum Dimensions { Dim0D = 0, Dim1D, Dim2D, Dim3D };      
   
 public:
-  SMESHGUI_MeshDlg( const bool theToCreate, const bool theIsMesh );
+  SMESHGUI_MeshDlg( const bool, const bool );
   virtual ~SMESHGUI_MeshDlg();
   
   SMESHGUI_MeshTab*            tab( const int ) const;
@@ -76,26 +71,23 @@ public:
   void                         setGeomPopupEnabled( const bool );
   void                         disableTab(const int);
   void                         enableTab(const int);
-
+  bool                         isTabEnabled(const int) const;
+  int                          getActiveObject();
 
 signals:
-
   void                         hypoSet( const QString& );
   void                         geomSelectionByMesh( bool );
 
 private slots:  
-
-  void                         onHypoSetPopup( int );
-  void                         onHypoSetButton();
-  void                         onGeomPopup( int );
+  void                         onHypoSetPopup( QAction* );
+  void                         onGeomPopup( QAction* );
   void                         onGeomSelectionButton( bool );
 
 private:
-
-  QMap< int, SMESHGUI_MeshTab* > myTabs;
-  QTabWidget*                    myTabWg;
-  QPopupMenu*                    myHypoSetPopup;
-  QPopupMenu*                    myGeomPopup;
+  QMap<int, SMESHGUI_MeshTab*> myTabs;
+  QTabWidget*                  myTabWg;
+  QToolButton*                 myHypoSetButton;
+  QMenu*                       myGeomPopup;
 };
 
 /*!
@@ -129,31 +121,25 @@ public:
   void                         reset();
 
 signals:  
-
-  void                         createHyp( const int theHypType, const int theIndex );
+  void                         createHyp( const int, const int );
   //!< Emited when "Create hypothesis" button clicked
-  void                         editHyp( const int theHypType, const int theIndex );
+  void                         editHyp( const int, const int );
   //!< Emited when "Edit hypothesis" button clicked
-  void                         selectAlgo( const int theIndex );
+  void                         selectAlgo( const int );
   //!< Emited when an algorithm is selected
   
 private slots:  
-
   void                         onCreateHyp();  
   void                         onEditHyp();
   void                         onHyp( int );
-  void                         onPopupItem( int );
   
 private:  
+  QMap<int, QComboBox*>        myHyp;
+  QMap<int, QToolButton*>      myCreateHyp;
+  QMap<int, QToolButton*>      myEditHyp;
   
-  QMap< int, QComboBox* >      myHyp;
-  QMap< int, QToolButton* >    myCreateHyp;
-  QMap< int, QToolButton* >    myEditHyp;
-  
-  QMap< int, QStringList >     myAvailableHyps;
-  QMap< int, QStringList >     myExistingHyps;
-  
-  QPopupMenu*                  myPopup;
+  QMap<int, QStringList>       myAvailableHyps;
+  QMap<int, QStringList>       myExistingHyps;
 };
 
-#endif
+#endif // SMESHGUI_MESHDLG_H