X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_QuadrangleParams.hxx;h=6bf9c2a22ad96352822af9164beb19706f356f45;hb=2c8f4c513e0fed76a7f0331542e520e315740aa4;hp=47cfc74685f0413310dbc557fefa82048b1b3d92;hpb=5e7f07d3dab81c7fcc2b7a8d557d14c028075af6;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers/StdMeshers_QuadrangleParams.hxx b/src/StdMeshers/StdMeshers_QuadrangleParams.hxx
index 47cfc7468..6bf9c2a22 100644
--- a/src/StdMeshers/StdMeshers_QuadrangleParams.hxx
+++ b/src/StdMeshers/StdMeshers_QuadrangleParams.hxx
@@ -1,39 +1,43 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  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
+// 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.
 //
-//  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.
+// 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.
 //
-//  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.
+// 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
 //
-//  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
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SMESH SMESH : implementaion of SMESH idl descriptions
 //  File   : StdMeshers_QuadrangleParams.hxx
 //  Author : Sergey KUUL, OCC
 //  Module : SMESH
-//
+
 #ifndef _SMESH_QUADRANGLEPARAMS_HXX_
 #define _SMESH_QUADRANGLEPARAMS_HXX_
 
-
-
 #include "SMESH_StdMeshers.hxx"
 
 #include "SMESH_Hypothesis.hxx"
 #include "Utils_SALOME_Exception.hxx"
 
+enum StdMeshers_QuadType
+  {
+    QUAD_STANDARD,
+    QUAD_TRIANGLE_PREF,
+    QUAD_QUADRANGLE_PREF,
+    QUAD_QUADRANGLE_PREF_REVERSED,
+    QUAD_REDUCED,
+    QUAD_NB_TYPES
+  };
+
 class STDMESHERS_EXPORT StdMeshers_QuadrangleParams:
   public SMESH_Hypothesis
 {
@@ -41,13 +45,14 @@ public:
   StdMeshers_QuadrangleParams(int hypId, int studyId, SMESH_Gen* gen);
   virtual ~StdMeshers_QuadrangleParams();
 
-  void SetTriaVertex(int id);
-
-  void SetObjectEntry( const char* entry ) { _objEntry = entry; }
+  void SetTriaVertex (int id);
+  int GetTriaVertex() const { return _triaVertexID; }
 
+  void SetObjectEntry (const char* entry) { _objEntry = entry; }
   const char* GetObjectEntry() { return _objEntry.c_str(); }
 
-  int GetTriaVertex() const { return _triaVertexID; }
+  void SetQuadType (StdMeshers_QuadType type);
+  StdMeshers_QuadType GetQuadType() const { return _quadType; }
 
   virtual std::ostream & SaveTo(std::ostream & save);
   virtual std::istream & LoadFrom(std::istream & load);
@@ -73,8 +78,9 @@ public:
                                        const SMESH_Mesh* theMesh=0);
 
 protected:
-  int         _triaVertexID;
-  std::string _objEntry;
+  int                 _triaVertexID;
+  std::string         _objEntry;
+  StdMeshers_QuadType _quadType;
 };
 
 #endif