X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ComputeDlg.h;h=81a09f85760563b424a8353e8bb0f5aeffd1894a;hp=5ec969cc7777b6f32c94c986415c05e935eb326d;hb=88068fce89e10cb32b60ea51cae3440240d42e9f;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070;ds=sidebyside diff --git a/src/SMESHGUI/SMESHGUI_ComputeDlg.h b/src/SMESHGUI/SMESHGUI_ComputeDlg.h index 5ec969cc7..81a09f857 100644 --- a/src/SMESHGUI/SMESHGUI_ComputeDlg.h +++ b/src/SMESHGUI/SMESHGUI_ComputeDlg.h @@ -1,24 +1,22 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 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 +// 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 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. // -// 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 // -// 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // File : SMESHGUI_ComputeDlg.h // Author : Edward AGAPOV, Open CASCADE S.A.S. // @@ -36,8 +34,10 @@ // Qt includes #include +#include #include #include +#include // IDL includes #include @@ -50,11 +50,10 @@ class QTableWidget; class QLabel; class QtxComboBox; class SMESHGUI_ComputeDlg; +class SMESHGUI_MeshInfosBox; class SMESHGUI_PrecomputeDlg; class SMESHGUI_MeshEditPreview; -class SMESH::compute_error_array; - namespace SMESH { class TShapeDisplayer; @@ -71,6 +70,8 @@ public: SMESHGUI_BaseComputeOp(); virtual ~SMESHGUI_BaseComputeOp(); + SMESH::SMESH_Mesh_ptr getMesh(); + protected: virtual void startOperation(); virtual void stopOperation(); @@ -78,15 +79,27 @@ protected: SMESHGUI_ComputeDlg* computeDlg() const; void computeMesh(); void showComputeResult( const bool, - const bool, - SMESH::compute_error_array_var&, - const bool, - const QString& ); + const bool, + SMESH::compute_error_array_var&, + const bool, + const QString& ); + SMESHGUI_ComputeDlg* evaluateDlg() const; + void evaluateMesh(); + void showEvaluateResult(const SMESH::long_array& theRes, + const bool, + const bool, + SMESH::compute_error_array_var&, + const bool, + const QString&); + + virtual bool isValid( SUIT_Operation* theOp ) const; protected slots: + virtual bool onApply(); void onPreviewShape(); void onPublishShape(); void onShowBadMesh(); + void onGroupOfBadMesh(); void currentCellChanged(); private: @@ -120,9 +133,10 @@ protected: virtual void startOperation(); protected slots: - virtual bool onApply(); }; +class SMESHGUI_MeshOrderMgr; + /*! * \brief Operation to preview and compute a mesh and show computation errors */ @@ -136,6 +150,12 @@ public: virtual LightApp_Dialog* dlg() const; + /** + * \brief returns map of assigned algorithms modes + */ + static void getAssignedAlgos(_PTR(SObject) theMesh, + QMap& theModeMap); + protected: virtual void startOperation(); virtual void stopOperation(); @@ -144,64 +164,42 @@ protected: virtual void initDialog(); protected slots: - virtual bool onApply(); virtual void onCancel(); private slots: void onPreview(); + void onCompute(); private: + //! private fields QMap< int, int > myMapShapeId; QPointer myActiveDlg; QPointer myDlg; SMESHGUI_MeshEditPreview* myPreviewDisplayer; + //! fields for mesh order + typedef QList TListOfInt; + typedef QList TListOfListOfInt; + TListOfListOfInt myPrevOrder; + SMESHGUI_MeshOrderMgr* myOrderMgr; }; /*! - * \brief Box showing mesh info + * \brief Operation to evaluate a mesh and show result */ - -class SMESHGUI_EXPORT SMESHGUI_MeshInfosBox : public QGroupBox +class SMESHGUI_EXPORT SMESHGUI_EvaluateOp: public SMESHGUI_BaseComputeOp { Q_OBJECT public: - SMESHGUI_MeshInfosBox( const bool, QWidget* ); + SMESHGUI_EvaluateOp(); + virtual ~SMESHGUI_EvaluateOp(); - void SetInfoByMesh( SMESH::SMESH_Mesh_var ); + virtual LightApp_Dialog* dlg() const; -private: - bool myFull; - QLabel* myNbNode; - 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; - 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; +protected: + virtual void startOperation(); + +protected slots: }; /*! @@ -213,21 +211,23 @@ 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; QGroupBox* myCompErrorGroup; QGroupBox* myHypErrorGroup; QLabel* myHypErrorLabel; + QLabel* myWarningLabel; QTableWidget* myTable; QPushButton* myShowBtn; QPushButton* myPublishBtn; QPushButton* myBadMeshBtn; + QPushButton* myBadMeshToGroupBtn; SMESHGUI_MeshInfosBox* myBriefInfo; SMESHGUI_MeshInfosBox* myFullInfo; @@ -236,6 +236,8 @@ protected: friend class SMESHGUI_PrecomputeOp; }; +class SMESHGUI_MeshOrderBox; + /*! * \brief Dialog to preview and compute a mesh and show computation errors */ @@ -250,14 +252,71 @@ public: void setPreviewModes( const QList& ); int getPreviewMode() const; + + SMESHGUI_MeshOrderBox* getMeshOrderBox() const; signals: void preview(); private: + SMESHGUI_MeshOrderBox* myOrderBox; QPushButton* myPreviewBtn; QtxComboBox* myPreviewMode; }; +/*! + * \brief Thread to launch computation + */ + +class SMESHGUI_EXPORT SMESHGUI_ComputeDlg_QThread : public QThread +{ + Q_OBJECT + +public: + SMESHGUI_ComputeDlg_QThread(SMESH::SMESH_Gen_var gen, + SMESH::SMESH_Mesh_var mesh, + GEOM::GEOM_Object_var mainShape); + bool result(); + void cancel(); + SMESH::SMESH_Mesh_var& getMesh() { return myMesh; } + +protected: + void run(); + +private: + SMESH::SMESH_Gen_var myGen; + SMESH::SMESH_Mesh_var myMesh; + GEOM::GEOM_Object_var myMainShape; + bool myResult; +}; + +/*! + * \brief Dialog to display Cancel button + */ + +class SMESHGUI_EXPORT SMESHGUI_ComputeDlg_QThreadQDialog : public QDialog +{ + Q_OBJECT + +public: + SMESHGUI_ComputeDlg_QThreadQDialog(QWidget * parent, + SMESH::SMESH_Gen_var gen, + SMESH::SMESH_Mesh_var mesh, + GEOM::GEOM_Object_var mainShape); + bool result(); + +protected: + void timerEvent(QTimerEvent *timer); + void closeEvent(QCloseEvent *event); + +private slots: + void onCancel(); + +private: + SMESHGUI_ComputeDlg_QThread qthread; + QPushButton * cancelButton; + QLabel * nbNodesLabel; + QLabel * nbElemsLabel; +}; #endif // SMESHGUI_COMPUTEDLG_H