X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_ConvToQuadOp.h;h=d242fc7bf09db9f4159a37f2df5389ceaba4a34e;hp=9e2cbb1298941da564a5c71a40e91d11d112165f;hb=88141f757b048eaa5aae0be49faaf274448bbcaf;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6

diff --git a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
index 9e2cbb129..d242fc7bf 100644
--- a/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
+++ b/src/SMESHGUI/SMESHGUI_ConvToQuadOp.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  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
@@ -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
-// 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
@@ -37,13 +37,14 @@
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 
 class SMESHGUI_ConvToQuadDlg;
+class SMESHGUI_MeshEditPreview;
 
 class SMESHGUI_EXPORT SMESHGUI_ConvToQuadOp : public SMESHGUI_SelectionOp
 { 
   Q_OBJECT
 
 public:      
-  enum MeshType{ Comp = 0, Linear, Quadratic };
+  enum MeshDestinationType { Linear = 1, Quadratic = 2, BiQuadratic = 4 };
 
 public:
   SMESHGUI_ConvToQuadOp();
@@ -51,18 +52,21 @@ public:
   
   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;
-  MeshType                       ConsistMesh( const SMESH::SMESH_IDSource_var& ) const;
 
 protected slots:
   virtual bool                   onApply();
   void                           ConnectRadioButtons( int );
+  void                           onWarningWinFinished();
 
 private:
   SMESHGUI_ConvToQuadDlg*        myDlg;
+  SMESHGUI_MeshEditPreview*      myBadElemsPreview;
 };
 
 #endif // SMESHGUI_CONVTOQUADOP_H