Merge branch 'V8_4_BR'

[modules/smesh.git] / src / DriverGMF / DriverGMF_Write.hxx

diff --git a/src/DriverGMF/DriverGMF_Write.hxx b/src/DriverGMF/DriverGMF_Write.hxx
index 83d86a83b92e4c84d2e385ee9ce2ef64cb386def..74331512c400e53807146277a8c16171a97c7572 100644 (file)
--- a/src/DriverGMF/DriverGMF_Write.hxx
+++ b/src/DriverGMF/DriverGMF_Write.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  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
@@ -32,26 +32,7 @@
 #include "Driver_SMESHDS_Mesh.h"
 #include "SMDSAbs_ElementType.hxx"
 #include "SMDS_ElemIterator.hxx"
-
-#include <gp_Pnt.hxx>
-
-/*!
- * \brief Class for storing control points for writing GMF size maps
- */
-class MESHDriverGMF_EXPORT Control_Pnt : public gp_Pnt
-{
-public:
-  Control_Pnt();
-  Control_Pnt(const gp_Pnt& aPnt, double theSize);
-  Control_Pnt(double x, double y, double z);
-  Control_Pnt(double x, double y, double z, double size);
-
-  double Size() const { return size; };
-  void SetSize( double theSize ) { size = theSize; };
-  
-private:
-  double size;
-};
+#include "SMESH_ControlPnt.hxx"
 
 /*!
  * \brief Driver Writing a mesh into a GMF file.
@@ -71,7 +52,7 @@ public:
   virtual Status Perform();
   
   // Size Maps
-  Status PerformSizeMap( const std::vector<Control_Pnt>& points );
+  Status PerformSizeMap( const std::vector<SMESHUtils::ControlPnt>& points );
   void SetSizeMapPrefix( std::string prefix )
   {
     myVerticesFile = prefix + ".mesh";