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 BR_phase16 branch (09/12/09)
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ComputeDlg.h
diff --git
a/src/SMESHGUI/SMESHGUI_ComputeDlg.h
b/src/SMESHGUI/SMESHGUI_ComputeDlg.h
index bc979d3fa4b273c7f66fcdd64bf5ea062700af9a..ab64b33e318766f35630ad8f9fab863faba1c9f1 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ComputeDlg.h
+++ b/
src/SMESHGUI/SMESHGUI_ComputeDlg.h
@@
-36,6
+36,7
@@
// Qt includes
#include <QMap>
// Qt includes
#include <QMap>
+#include <QList>
#include <QPointer>
#include <QGroupBox>
#include <QPointer>
#include <QGroupBox>
@@
-136,6
+137,8
@@
protected:
protected slots:
};
protected slots:
};
+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
*/
@@
-170,10
+173,16
@@
private slots:
void onCompute();
private:
void onCompute();
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;
};
/*!
};
/*!
@@
-227,6
+236,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
*/
@@
-241,11
+252,14
@@
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;
};