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 V6_main 06/03/2013
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ConvToQuadOp.h
diff --git
a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
index 9e2cbb1298941da564a5c71a40e91d11d112165f..8573bf49ea70f59e0f3dc6fdfb07bdfa06156aef 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
+++ b/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
@@
-37,13
+37,14
@@
#include CORBA_SERVER_HEADER(SMESH_Mesh)
class SMESHGUI_ConvToQuadDlg;
#include CORBA_SERVER_HEADER(SMESH_Mesh)
class SMESHGUI_ConvToQuadDlg;
+class SMESHGUI_MeshEditPreview;
class SMESHGUI_EXPORT SMESHGUI_ConvToQuadOp : public SMESHGUI_SelectionOp
{
Q_OBJECT
public:
class SMESHGUI_EXPORT SMESHGUI_ConvToQuadOp : public SMESHGUI_SelectionOp
{
Q_OBJECT
public:
- enum Mesh
Type{ Comp = 0, Linear, Quadratic
};
+ enum Mesh
DestinationType { Linear = 1, Quadratic = 2, BiQuadratic = 4
};
public:
SMESHGUI_ConvToQuadOp();
public:
SMESHGUI_ConvToQuadOp();
@@
-55,14
+56,17
@@
protected:
virtual void startOperation();
virtual void selectionDone();
virtual SUIT_SelectionFilter* createFilter( const int ) const;
virtual void startOperation();
virtual void selectionDone();
virtual SUIT_SelectionFilter* createFilter( const int ) const;
- MeshType ConsistMesh( const SMESH::SMESH_IDSource_var& ) const;
+ MeshDestinationType DestinationMesh( const SMESH::SMESH_IDSource_var& ,
+ bool* isMixOrder = 0) const;
protected slots:
virtual bool onApply();
void ConnectRadioButtons( int );
protected slots:
virtual bool onApply();
void ConnectRadioButtons( int );
+ void onWarningWinFinished();
private:
SMESHGUI_ConvToQuadDlg* myDlg;
private:
SMESHGUI_ConvToQuadDlg* myDlg;
+ SMESHGUI_MeshEditPreview* myBadElemsPreview;
};
#endif // SMESHGUI_CONVTOQUADOP_H
};
#endif // SMESHGUI_CONVTOQUADOP_H