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 branch 'OCCT780'
[modules/smesh.git]
/
src
/
SMESHGUI
/
SMESHGUI_ConvToQuadOp.h
diff --git
a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
index ba30b15e15b7b9b59f4dc8f433a85221a28dbf43..f8a90b41be5fa4aad3fd98bfd2793b660f4a7632 100644
(file)
--- a/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
+++ b/
src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
12 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, 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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-44,7
+44,7
@@
class SMESHGUI_EXPORT SMESHGUI_ConvToQuadOp : public SMESHGUI_SelectionOp
Q_OBJECT
public:
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();
@@
-52,11
+52,12
@@
public:
virtual LightApp_Dialog* dlg() const;
virtual LightApp_Dialog* dlg() const;
+ static MeshDestinationType DestinationMesh( const SMESH::SMESH_IDSource_var& ,
+ bool* isMixOrder = 0);
protected:
virtual void startOperation();
virtual void selectionDone();
virtual SUIT_SelectionFilter* createFilter( const int ) const;
protected:
virtual void startOperation();
virtual void selectionDone();
virtual SUIT_SelectionFilter* createFilter( const int ) const;
- MeshType ConsistMesh( const SMESH::SMESH_IDSource_var& ) const;
protected slots:
virtual bool onApply();
protected slots:
virtual bool onApply();