X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ComputeDlg.h;h=230a264bc2f0f5df63fd93675472711d19e7d731;hb=f4c4faf3d9c1879d69e2c98cd2c78a31bfde7aff;hp=e8101a311d5913cb3b27dfd352b1e78d0f03100e;hpb=9ad61d350326b41cf1ed2c45b6a87184e366095d;p=modules%2Fsmesh.git diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.h b/src/SMESHGUI/SMESHGUI_ComputeDlg.h index e8101a311..230a264bc 100644 --- a/src/SMESHGUI/SMESHGUI_ComputeDlg.h +++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.h @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE // // 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. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -49,6 +49,7 @@ class QPushButton; class QTableWidget; class QLabel; class QtxComboBox; +class QProgressBar; class SMESHGUI_ComputeDlg; class SMESHGUI_MeshInfosBox; class SMESHGUI_PrecomputeDlg; @@ -71,6 +72,7 @@ public: virtual ~SMESHGUI_BaseComputeOp(); SMESH::SMESH_Mesh_ptr getMesh(); + virtual LightApp_Dialog* dlg() const; protected: virtual void startOperation(); @@ -85,7 +87,7 @@ protected: const QString& ); SMESHGUI_ComputeDlg* evaluateDlg() const; void evaluateMesh(); - void showEvaluateResult(const SMESH::long_array& theRes, + void showEvaluateResult(const SMESH::smIdType_array& theRes, const bool, const bool, SMESH::compute_error_array_var&, @@ -111,6 +113,7 @@ private: protected: SMESH::SMESH_Mesh_var myMesh; GEOM::GEOM_Object_var myMainShape; + GEOM::GEOM_Object_var myCurShape; SMESH::TShapeDisplayer* myTShapeDisplayer; SMESHGUI_MeshEditPreview* myBadMeshDisplayer; Handle(SALOME_InteractiveObject) myIObject; @@ -202,6 +205,20 @@ protected: protected slots: }; +/*! + * \brief Operation to show meshing errors + */ +class SMESHGUI_EXPORT SMESHGUI_ShowErrorsOp: public SMESHGUI_BaseComputeOp +{ + Q_OBJECT + +public: + SMESHGUI_ShowErrorsOp(); + +protected: + virtual void startOperation(); +}; + /*! * \brief Dialog to compute a mesh and show computation errors */ @@ -234,6 +251,7 @@ protected: friend class SMESHGUI_BaseComputeOp; friend class SMESHGUI_PrecomputeOp; + friend class SMESHGUI_ShowErrorsOp; }; class SMESHGUI_MeshOrderBox; @@ -318,6 +336,7 @@ private: QLabel * nbNodesLabel; QLabel * nbElemsLabel; QLabel * freeRAMLabel; + QProgressBar* progressBar; }; #endif // SMESHGUI_COMPUTEDLG_H