X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ComputeDlg.h;h=d67709d3757c5e568067eb99b6038258ab95d94a;hb=a30b3a5fbf4d4fc4a9e86ed6d0ad5435cd931c52;hp=49aa2477c77ba31127699f7d1c66e54abd1565cd;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.h b/src/SMESHGUI/SMESHGUI_ComputeDlg.h index 49aa2477c..d67709d37 100644 --- a/src/SMESHGUI/SMESHGUI_ComputeDlg.h +++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -49,6 +49,7 @@ class QPushButton; class QTableWidget; class QLabel; class QtxComboBox; +class QProgressBar; class SMESHGUI_ComputeDlg; class SMESHGUI_MeshInfosBox; class SMESHGUI_PrecomputeDlg; @@ -99,6 +100,7 @@ protected slots: void onPreviewShape(); void onPublishShape(); void onShowBadMesh(); + void onGroupOfBadMesh(); void currentCellChanged(); private: @@ -226,6 +228,7 @@ protected: QPushButton* myShowBtn; QPushButton* myPublishBtn; QPushButton* myBadMeshBtn; + QPushButton* myBadMeshToGroupBtn; SMESHGUI_MeshInfosBox* myBriefInfo; SMESHGUI_MeshInfosBox* myFullInfo; @@ -271,20 +274,21 @@ class SMESHGUI_EXPORT SMESHGUI_ComputeDlg_QThread : public QThread Q_OBJECT public: - SMESHGUI_ComputeDlg_QThread(SMESH::SMESH_Gen_var gen, + SMESHGUI_ComputeDlg_QThread(SMESH::SMESH_Gen_var gen, SMESH::SMESH_Mesh_var mesh, GEOM::GEOM_Object_var mainShape); - bool result(); - void cancel(); - + bool result(); + void cancel(); + SMESH::SMESH_Mesh_var& getMesh() { return myMesh; } + protected: void run(); private: - SMESH::SMESH_Gen_var myGen; + SMESH::SMESH_Gen_var myGen; SMESH::SMESH_Mesh_var myMesh; GEOM::GEOM_Object_var myMainShape; - bool myResult; + bool myResult; }; /*! @@ -296,8 +300,8 @@ class SMESHGUI_EXPORT SMESHGUI_ComputeDlg_QThreadQDialog : public QDialog Q_OBJECT public: - SMESHGUI_ComputeDlg_QThreadQDialog(QWidget *parent, - SMESH::SMESH_Gen_var gen, + SMESHGUI_ComputeDlg_QThreadQDialog(QWidget * parent, + SMESH::SMESH_Gen_var gen, SMESH::SMESH_Mesh_var mesh, GEOM::GEOM_Object_var mainShape); bool result(); @@ -311,8 +315,11 @@ private slots: private: SMESHGUI_ComputeDlg_QThread qthread; - QPushButton *cancelButton; - + QPushButton * cancelButton; + QLabel * nbNodesLabel; + QLabel * nbElemsLabel; + QLabel * freeRAMLabel; + QProgressBar* progressBar; }; #endif // SMESHGUI_COMPUTEDLG_H