X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ComputeDlg.h;h=c7a6f0e7469c6ce9765a679c4f14f229dc89867a;hb=b6f1b3a4311f24679ba3c2898d99f5920776ee34;hp=5ea7a662b6229d9a046bb9ecc6f40e6752ed37f5;hpb=85b1cfc1f07d0b93d88803c6c0ccadf8f3349719;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.h b/src/SMESHGUI/SMESHGUI_ComputeDlg.h
index 5ea7a662b..c7a6f0e74 100644
--- a/src/SMESHGUI/SMESHGUI_ComputeDlg.h
+++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.h
@@ -1,4 +1,6 @@
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  Copyright (C) 2007-2008  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
 //
 //  This library is free software; you can redistribute it and/or
@@ -15,43 +17,43 @@
 //  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
-//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+// File   : SMESHGUI_ComputeDlg.h
+// Author : Edward AGAPOV, Open CASCADE S.A.S.
 //
-//  File   : SMESHGUI_ComputeDlg.h
-//  Author : Edward AGAPOV
-//  Module : SMESH
-
+#ifndef SMESHGUI_COMPUTEDLG_H
+#define SMESHGUI_COMPUTEDLG_H
 
-#ifndef SMESHGUI_ComputeDlg_H
-#define SMESHGUI_ComputeDlg_H
+// SMESH includes
+#include "SMESH_SMESHGUI.hxx"
 
 #include "SMESHGUI_Dialog.h"
-#include "SMESHGUI_SelectionOp.h"
+#include "SMESHGUI_Operation.h"
 
-#include "VTKViewer.h"
+// Qt includes
+#include <QGroupBox>
 
-#include "SALOMEconfig.h"
-#include CORBA_SERVER_HEADER(GEOM_Gen)
-
-#include <qgroupbox.h>
+// IDL includes
+#include <SALOMEconfig.h>
+#include CORBA_SERVER_HEADER(SMESH_Mesh)
 
 class QFrame;
 class QPushButton;
-class QTable;
+class QTableWidget;
 class QLabel;
 class SMESHGUI_ComputeDlg;
-class GEOM_Actor;
+class SMESHGUI_MeshEditPreview;
 
-namespace SMESH {
+namespace SMESH
+{
   class TShapeDisplayer;
 }
 
 /*!
  * \brief Operation to compute a mesh and show computation errors
  */
-class SMESHGUI_ComputeOp: public SMESHGUI_Operation
+class SMESHGUI_EXPORT SMESHGUI_ComputeOp: public SMESHGUI_Operation
 {
   Q_OBJECT
 
@@ -62,7 +64,6 @@ public:
   virtual LightApp_Dialog*       dlg() const;
 
 protected:
-
   virtual void                   startOperation();
   virtual void                   stopOperation();
 
@@ -70,47 +71,66 @@ protected slots:
   virtual bool                   onApply();
 
 private slots:
-
   void                           onPreviewShape();
   void                           onPublishShape();
+  void                           onShowBadMesh();
   void                           currentCellChanged();
 
 private:
+  QTableWidget*                  table();
 
-  QTable*                        table();
-
-  SMESHGUI_ComputeDlg*      myDlg;
+  SMESHGUI_ComputeDlg*           myDlg;
 
-  GEOM::GEOM_Object_var     myMainShape;
-  SMESH::TShapeDisplayer*   myTShapeDisplayer;
+  SMESH::SMESH_Mesh_var          myMesh;
+  GEOM::GEOM_Object_var          myMainShape;
+  SMESH::TShapeDisplayer*        myTShapeDisplayer;
+  SMESHGUI_MeshEditPreview*      myBadMeshDisplayer;
 };
 
 /*!
  * \brief Box showing mesh info
  */
 
-class SMESHGUI_MeshInfosBox : public QGroupBox
+class SMESHGUI_EXPORT SMESHGUI_MeshInfosBox : public QGroupBox
 {
   Q_OBJECT
+
 public:
+  SMESHGUI_MeshInfosBox( const bool, QWidget* );
 
-  SMESHGUI_MeshInfosBox(const bool full, QWidget* theParent);
-  void SetInfoByMesh(SMESH::SMESH_Mesh_var mesh);
+  void    SetInfoByMesh( SMESH::SMESH_Mesh_var );
 
 private:
-
   bool    myFull;
   QLabel* myNbNode;
-  QLabel* myNbEdge,  *myNbLinEdge,  *myNbQuadEdge;
-  QLabel* myNbTrai,  *myNbLinTrai,  *myNbQuadTrai;
-  QLabel* myNbQuad,  *myNbLinQuad,  *myNbQuadQuad;
-  QLabel* myNbFace,  *myNbLinFace,  *myNbQuadFace;
+  QLabel* myNbEdge;
+  QLabel* myNbLinEdge;
+  QLabel* myNbQuadEdge;
+  QLabel* myNbTrai;
+  QLabel* myNbLinTrai;
+  QLabel* myNbQuadTrai;
+  QLabel* myNbQuad;
+  QLabel* myNbLinQuad;
+  QLabel* myNbQuadQuad;
+  QLabel* myNbFace;
+  QLabel* myNbLinFace;
+  QLabel* myNbQuadFace;
   QLabel* myNbPolyg;
-  QLabel* myNbHexa,  *myNbLinHexa,  *myNbQuadHexa;
-  QLabel* myNbTetra, *myNbLinTetra, *myNbQuadTetra;
-  QLabel* myNbPyra,  *myNbLinPyra,  *myNbQuadPyra;
-  QLabel* myNbPrism, *myNbLinPrism, *myNbQuadPrism;
-  QLabel* myNbVolum, *myNbLinVolum, *myNbQuadVolum;
+  QLabel* myNbHexa;
+  QLabel* myNbLinHexa;
+  QLabel* myNbQuadHexa;
+  QLabel* myNbTetra;
+  QLabel* myNbLinTetra;
+  QLabel* myNbQuadTetra;
+  QLabel* myNbPyra;
+  QLabel* myNbLinPyra;
+  QLabel* myNbQuadPyra;
+  QLabel* myNbPrism;
+  QLabel* myNbLinPrism;
+  QLabel* myNbQuadPrism;
+  QLabel* myNbVolum;
+  QLabel* myNbLinVolum;
+  QLabel* myNbQuadVolum;
   QLabel* myNbPolyh;
 };
 
@@ -118,31 +138,30 @@ private:
  * \brief Dialog to compute a mesh and show computation errors
  */
 
-class SMESHGUI_ComputeDlg : public SMESHGUI_Dialog
+class SMESHGUI_EXPORT SMESHGUI_ComputeDlg : public SMESHGUI_Dialog
 {
   Q_OBJECT
 
 public:
-                               SMESHGUI_ComputeDlg();
+  SMESHGUI_ComputeDlg();
 
 private:
-
-  QFrame*                      createMainFrame   (QWidget*);
+  QFrame*                      createMainFrame( QWidget* );
 
   QLabel*                      myMeshName;
   QGroupBox*                   myMemoryLackGroup;
   QGroupBox*                   myCompErrorGroup;
   QGroupBox*                   myHypErrorGroup;
   QLabel*                      myHypErrorLabel;
-  QTable*                      myTable;
+  QTableWidget*                myTable;
   QPushButton*                 myShowBtn;
   QPushButton*                 myPublishBtn;
+  QPushButton*                 myBadMeshBtn;
 
   SMESHGUI_MeshInfosBox*       myBriefInfo;
   SMESHGUI_MeshInfosBox*       myFullInfo;
 
   friend class SMESHGUI_ComputeOp;
-
 };
 
-#endif
+#endif // SMESHGUI_COMPUTEDLG_H