Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from V5_1_main branch 24/11/2010
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ComputeDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_ComputeDlg.h
b/src/SMESHGUI/SMESHGUI_ComputeDlg.h
index 5ec969cc7777b6f32c94c986415c05e935eb326d..ee268a4d4756896f33d182fe674f78e0fc5402f5 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ComputeDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_ComputeDlg.h
@@
-1,7
+1,4
@@
-// 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
+// Copyright (C) 2007-2010 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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-19,6
+16,7
@@
//
// 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, Open CASCADE S.A.S.
//
@@
-36,6
+34,7
@@
// Qt includes
#include <QMap>
// Qt includes
#include <QMap>
+#include <QList>
#include <QPointer>
#include <QGroupBox>
#include <QPointer>
#include <QGroupBox>
@@
-50,11
+49,10
@@
class QTableWidget;
class QLabel;
class QtxComboBox;
class SMESHGUI_ComputeDlg;
class QLabel;
class QtxComboBox;
class SMESHGUI_ComputeDlg;
+class SMESHGUI_MeshInfosBox;
class SMESHGUI_PrecomputeDlg;
class SMESHGUI_MeshEditPreview;
class SMESHGUI_PrecomputeDlg;
class SMESHGUI_MeshEditPreview;
-class SMESH::compute_error_array;
-
namespace SMESH
{
class TShapeDisplayer;
namespace SMESH
{
class TShapeDisplayer;
@@
-71,6
+69,8
@@
public:
SMESHGUI_BaseComputeOp();
virtual ~SMESHGUI_BaseComputeOp();
SMESHGUI_BaseComputeOp();
virtual ~SMESHGUI_BaseComputeOp();
+ SMESH::SMESH_Mesh_ptr getMesh();
+
protected:
virtual void startOperation();
virtual void stopOperation();
protected:
virtual void startOperation();
virtual void stopOperation();
@@
-78,12
+78,23
@@
protected:
SMESHGUI_ComputeDlg* computeDlg() const;
void computeMesh();
void showComputeResult( const bool,
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:
protected slots:
+ virtual bool onApply();
void onPreviewShape();
void onPublishShape();
void onShowBadMesh();
void onPreviewShape();
void onPublishShape();
void onShowBadMesh();
@@
-120,9
+131,10
@@
protected:
virtual void startOperation();
protected slots:
virtual void startOperation();
protected slots:
- virtual bool onApply();
};
};
+class SMESHGUI_MeshOrderMgr;
+
/*!
* \brief Operation to preview and compute a mesh and show computation errors
*/
/*!
* \brief Operation to preview and compute a mesh and show computation errors
*/
@@
-136,6
+148,12
@@
public:
virtual LightApp_Dialog* dlg() const;
virtual LightApp_Dialog* dlg() const;
+ /**
+ * \brief returns map of assigned algorithms modes
+ */
+ static void getAssignedAlgos(_PTR(SObject) theMesh,
+ QMap<int,int>& theModeMap);
+
protected:
virtual void startOperation();
virtual void stopOperation();
protected:
virtual void startOperation();
virtual void stopOperation();
@@
-144,64
+162,42
@@
protected:
virtual void initDialog();
protected slots:
virtual void initDialog();
protected slots:
- virtual bool onApply();
virtual void onCancel();
private slots:
void onPreview();
virtual void onCancel();
private slots:
void onPreview();
+ void onCompute();
private:
private:
+ //! private fields
QMap< int, int > myMapShapeId;
QPointer<LightApp_Dialog> myActiveDlg;
QPointer<SMESHGUI_PrecomputeDlg> myDlg;
SMESHGUI_MeshEditPreview* myPreviewDisplayer;
QMap< int, int > myMapShapeId;
QPointer<LightApp_Dialog> myActiveDlg;
QPointer<SMESHGUI_PrecomputeDlg> myDlg;
SMESHGUI_MeshEditPreview* myPreviewDisplayer;
+ //! fields for mesh order
+ typedef QList<int> TListOfInt;
+ typedef QList<TListOfInt> 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:
{
Q_OBJECT
public:
- SMESHGUI_MeshInfosBox( const bool, QWidget* );
+ SMESHGUI_EvaluateOp();
+ virtual ~SMESHGUI_EvaluateOp();
- v
oid SetInfoByMesh( SMESH::SMESH_Mesh_var )
;
+ v
irtual 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,11
+209,11
@@
class SMESHGUI_EXPORT SMESHGUI_ComputeDlg : public SMESHGUI_Dialog
Q_OBJECT
public:
Q_OBJECT
public:
- SMESHGUI_ComputeDlg( QWidget* );
+ SMESHGUI_ComputeDlg( QWidget*
, bool
);
virtual ~SMESHGUI_ComputeDlg();
protected:
virtual ~SMESHGUI_ComputeDlg();
protected:
- QFrame* createMainFrame( QWidget* );
+ QFrame* createMainFrame( QWidget*
, bool
);
QLabel* myMeshName;
QGroupBox* myMemoryLackGroup;
QLabel* myMeshName;
QGroupBox* myMemoryLackGroup;
@@
-236,6
+232,8
@@
protected:
friend class SMESHGUI_PrecomputeOp;
};
friend class SMESHGUI_PrecomputeOp;
};
+class SMESHGUI_MeshOrderBox;
+
/*!
* \brief Dialog to preview and compute a mesh and show computation errors
*/
/*!
* \brief Dialog to preview and compute a mesh and show computation errors
*/
@@
-250,14
+248,16
@@
public:
void setPreviewModes( const QList<int>& );
int getPreviewMode() const;
void setPreviewModes( const QList<int>& );
int getPreviewMode() const;
+
+ SMESHGUI_MeshOrderBox* getMeshOrderBox() const;
signals:
void preview();
private:
signals:
void preview();
private:
+ SMESHGUI_MeshOrderBox* myOrderBox;
QPushButton* myPreviewBtn;
QtxComboBox* myPreviewMode;
};
QPushButton* myPreviewBtn;
QtxComboBox* myPreviewMode;
};
-
#endif // SMESHGUI_COMPUTEDLG_H
#endif // SMESHGUI_COMPUTEDLG_H