Merge multi-study removal branch.

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

diff --git a/src/StdMeshers/StdMeshers_Adaptive1D.hxx b/src/StdMeshers/StdMeshers_Adaptive1D.hxx
index 200465026d651a1a0d9d26135507773a4bd558bf..39ea38e876d641d9d9f7d4f25a593708f0d77b13 100644 (file)
--- a/src/StdMeshers/StdMeshers_Adaptive1D.hxx
+++ b/src/StdMeshers/StdMeshers_Adaptive1D.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  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
@@ -37,7 +37,7 @@
 class STDMESHERS_EXPORT StdMeshers_Adaptive1D : public SMESH_Hypothesis
 {
  public:
-  StdMeshers_Adaptive1D(int hypId, int studyId, SMESH_Gen * gen);
+  StdMeshers_Adaptive1D(int hypId, SMESH_Gen * gen);
   ~StdMeshers_Adaptive1D();
 
   /*!
@@ -59,13 +59,6 @@ class STDMESHERS_EXPORT StdMeshers_Adaptive1D : public SMESH_Hypothesis
   void SetDeflection(double value) throw(SALOME_Exception);
   double GetDeflection() const { return myDeflection; }
   
-  /*!
-   * Sets <grading> parameter value,
-   * i.e. how much size of adjacent elements can differ
-   */
-  void SetGrading(double value) throw(SALOME_Exception);
-  double GetGrading() const { return myGrading; }
-
   virtual std::ostream & SaveTo(std::ostream & save);
   virtual std::istream & LoadFrom(std::istream & load);
 
@@ -90,7 +83,7 @@ class STDMESHERS_EXPORT StdMeshers_Adaptive1D : public SMESH_Hypothesis
 
 protected:
 
-  double myMinSize, myMaxSize, myDeflection, myGrading;
+  double myMinSize, myMaxSize, myDeflection;
   SMESH_Algo* myAlgo; // StdMeshers_AdaptiveAlgo_1D implemented in cxx file
 };