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
more orthography
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ConvToQuadOp.h
diff --git
a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
index bc862f97ba7b3dfffc44248aec9c1883ccca617d..f18c5810a9c59b6eeb761a3a26ffc0885f864da9 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
+++ b/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
@@
-1,50
+1,50
@@
-// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// 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
// 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
// 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
+// License as published by the Free Software Foundation; either
// version 2.1 of the License.
// 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
+//
+// 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.
//
// 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
+// 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
//
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-// See http://www.salome-platform.org/
+// See http://www.salome-platform.org/
or email : webmaster.salome@opencascade.com
//
//
-/**
-* SMESH SMESHGUI
-*
-* Copyright (C) 2005 CEA/DEN, EDF R&D
-*
-*
-*
-* File : SMESHGUI_ConvToQuadOp.h
-* Module : SMESHGUI
-*/
-#ifndef SMESHGUI_ConvToQuadOp_H
-#define SMESHGUI_ConvToQuadOp_H
+// SMESH SMESHGUI : GUI for SMESH component
+// File : SMESHGUI_ConvToQuadOp.h
+// Author : Open CASCADE S.A.S.
+//
+#ifndef SMESHGUI_CONVTOQUADOP_H
+#define SMESHGUI_CONVTOQUADOP_H
+
+// SMESH includes
+#include "SMESH_SMESHGUI.hxx"
-#include <SMESHGUI_SelectionOp.h>
-//#include <qstringlist.h>
+#include "SMESHGUI_SelectionOp.h"
+// IDL includes
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
class SMESHGUI_ConvToQuadDlg;
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
class SMESHGUI_ConvToQuadDlg;
+class SMESHGUI_MeshEditPreview;
-class SMESHGUI_ConvToQuadOp : public SMESHGUI_SelectionOp
+class SMESHGUI_
EXPORT SMESHGUI_
ConvToQuadOp : public SMESHGUI_SelectionOp
{
Q_OBJECT
public:
{
Q_OBJECT
public:
-
enum MeshType{ Comp = 0, Linear, Quadratic
};
+
enum MeshDestinationType { Linear = 1, Quadratic = 2, BiQuadratic = 4
};
public:
SMESHGUI_ConvToQuadOp();
public:
SMESHGUI_ConvToQuadOp();
@@
-56,15
+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_Mesh_var& ) const;
+ MeshDestinationType DestinationMesh( const SMESH::SMESH_IDSource_var& ,
+ bool* isMixOrder = 0) const;
protected slots:
virtual bool onApply();
protected slots:
virtual bool onApply();
- void ConnectRadioButtons( int);
+ void ConnectRadioButtons( int );
+ void onWarningWinFinished();
private:
SMESHGUI_ConvToQuadDlg* myDlg;
private:
SMESHGUI_ConvToQuadDlg* myDlg;
+ SMESHGUI_MeshEditPreview* myBadElemsPreview;
};
};
-#endif
-
+#endif // SMESHGUI_CONVTOQUADOP_H