X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ComputeDlg.h;h=c07e8674668ddc4dbfd5f9143283f7338a8cce31;hb=0d70483e9ff1cc11d2be56ec9a6358194c9649db;hp=5ec969cc7777b6f32c94c986415c05e935eb326d;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;p=modules%2Fsmesh.git

diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.h b/src/SMESHGUI/SMESHGUI_ComputeDlg.h
index 5ec969cc7..c07e86746 100644
--- a/src/SMESHGUI/SMESHGUI_ComputeDlg.h
+++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.h
@@ -51,6 +51,7 @@ class QLabel;
 class QtxComboBox;
 class SMESHGUI_ComputeDlg;
 class SMESHGUI_PrecomputeDlg;
+//class SMESHGUI_EvaluateDlg;
 class SMESHGUI_MeshEditPreview;
 
 class SMESH::compute_error_array;
@@ -82,8 +83,18 @@ protected:
 						    SMESH::compute_error_array_var&,
 						    const bool,
 						    const QString& );
+  //SMESHGUI_EvaluateDlg*          evaluateDlg() const;
+  SMESHGUI_ComputeDlg*           evaluateDlg() const;
+  void                           evaluateMesh();
+  void                           showEvaluateResult(std::vector<int> theVec,
+						    const bool,
+						    const bool,
+						    SMESH::compute_error_array_var&,
+						    const bool,
+						    const QString&);
     
 protected slots:
+  virtual bool                   onApply();
   void                           onPreviewShape();
   void                           onPublishShape();
   void                           onShowBadMesh();
@@ -94,6 +105,7 @@ private:
 
 private:
   QPointer<SMESHGUI_ComputeDlg>  myCompDlg;
+  //QPointer<SMESHGUI_EvaluateDlg> myEvalDlg;
 
 protected:
   SMESH::SMESH_Mesh_var            myMesh;
@@ -120,7 +132,6 @@ protected:
   virtual void                   startOperation();
 
 protected slots:
-  virtual bool                   onApply();
 };
 
 /*!
@@ -144,11 +155,11 @@ protected:
   virtual void                   initDialog();
 
 protected slots:
-  virtual bool                   onApply();
   virtual void                   onCancel();
 
 private slots:
   void                           onPreview();
+  void                           onCompute();
 
 private:
   QMap< int, int >               myMapShapeId;
@@ -157,6 +168,25 @@ private:
   SMESHGUI_MeshEditPreview*      myPreviewDisplayer;
 };
 
+/*!
+ * \brief Operation to evaluate a mesh and show result
+ */
+class SMESHGUI_EXPORT SMESHGUI_EvaluateOp: public SMESHGUI_BaseComputeOp
+{
+  Q_OBJECT
+
+public:
+  SMESHGUI_EvaluateOp();
+  virtual ~SMESHGUI_EvaluateOp();
+
+  virtual LightApp_Dialog*       dlg() const;
+
+protected:
+  virtual void                   startOperation();
+
+protected slots:
+};
+
 /*!
  * \brief Box showing mesh info
  */
@@ -170,6 +200,8 @@ public:
 
   void    SetInfoByMesh( SMESH::SMESH_Mesh_var );
 
+  void    SetInfoByEval( std::vector<int> theVec );
+
 private:
   bool    myFull;
   QLabel* myNbNode;
@@ -213,11 +245,11 @@ class SMESHGUI_EXPORT SMESHGUI_ComputeDlg : public SMESHGUI_Dialog
   Q_OBJECT
 
 public:
-  SMESHGUI_ComputeDlg( QWidget* );
+  SMESHGUI_ComputeDlg( QWidget*, bool );
   virtual ~SMESHGUI_ComputeDlg();
 
 protected:
-  QFrame*                      createMainFrame( QWidget* );
+  QFrame*                      createMainFrame( QWidget*, bool );
 
   QLabel*                      myMeshName;
   QGroupBox*                   myMemoryLackGroup;
@@ -260,4 +292,36 @@ private:
 };
 
 
+/*!
+ * \brief Dialog to evaluate a mesh and show result
+ */
+/*
+class SMESHGUI_EXPORT SMESHGUI_EvaluateDlg : public SMESHGUI_Dialog
+{
+  Q_OBJECT
+
+public:
+  SMESHGUI_EvaluateDlg( QWidget* );
+  virtual ~SMESHGUI_EvaluateDlg();
+
+protected:
+  QFrame*                      createMainFrame( QWidget* );
+
+  QLabel*                      myMeshName;
+  QGroupBox*                   myMemoryLackGroup;
+  QGroupBox*                   myCompErrorGroup;
+  QGroupBox*                   myHypErrorGroup;
+  QLabel*                      myHypErrorLabel;
+  QTableWidget*                myTable;
+  QPushButton*                 myShowBtn;
+  QPushButton*                 myPublishBtn;
+  QPushButton*                 myBadMeshBtn;
+
+  SMESHGUI_MeshInfosBox*       myBriefInfo;
+  SMESHGUI_MeshInfosBox*       myFullInfo;
+
+  friend class SMESHGUI_BaseComputeOp;
+};
+*/
+
 #endif // SMESHGUI_COMPUTEDLG_H