Regression of SALOME_TESTS/Grids/smesh/imps_09/K2

[modules/smesh.git] / src / StdMeshers / StdMeshers_Adaptive1D.hxx

diff --git a/src/StdMeshers/StdMeshers_Adaptive1D.hxx b/src/StdMeshers/StdMeshers_Adaptive1D.hxx
index be5e329bed90b1e14826b7138a382879728903e5..a6211808737ba44051c5eef788470c62e75cfe0e 100644 (file)
--- a/src/StdMeshers/StdMeshers_Adaptive1D.hxx
+++ b/src/StdMeshers/StdMeshers_Adaptive1D.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -31,8 +31,6 @@
 
 #include "Utils_SALOME_Exception.hxx"
 
-class StdMeshers_AdaptiveAlgo_1D;
-
 /*!
  * \brief Adaptive 1D hypothesis
  */
@@ -81,35 +79,12 @@ class STDMESHERS_EXPORT StdMeshers_Adaptive1D : public SMESH_Hypothesis
   /*!
    * \brief Returns an algorithm that works using this hypothesis
    */
-  StdMeshers_AdaptiveAlgo_1D* GetAlgo() const;
+  SMESH_Algo* GetAlgo() const;
 
 protected:
 
   double myMinSize, myMaxSize, myDeflection;
-  StdMeshers_AdaptiveAlgo_1D* myAlgo;
-};
-
-/*!
- * \brief Adaptive wire discertizator.
- * This algorithm is not used directly by via StdMeshers_Regular_1D
- */
-class StdMeshers_AdaptiveAlgo_1D : public StdMeshers_Regular_1D
-{
-public:
-
-  StdMeshers_AdaptiveAlgo_1D(int hypId, int studyId, SMESH_Gen* gen);
-
-  void SetHypothesis( const StdMeshers_Adaptive1D* hyp );
-
-  bool Compute(SMESH_Mesh & aMesh, const TopoDS_Shape & aShape,
-               double* progress, int* progressTic );
-  virtual bool Evaluate(SMESH_Mesh &         theMesh,
-                        const TopoDS_Shape & theShape,
-                        MapShapeNbElems&     theResMap);
-
-private:
-
-  const StdMeshers_Adaptive1D* myHyp;
+  SMESH_Algo* myAlgo; // StdMeshers_AdaptiveAlgo_1D implemented in cxx file
 };
 
 #endif