From: eap <eap@opencascade.com>
Date: Mon, 21 Nov 2011 12:54:53 +0000 (+0000)
Subject: regression of smesh/imps/B6
X-Git-Tag: V6_4_0rc1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=92ea8bd266f6489778b2fc288e9d2eca08f21dd1;p=plugins%2Fnetgenplugin.git

regression of smesh/imps/B6
   Do not limit the min size if fineness is defined by user

+  int                  _fineness;
---

diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
index a32fc1d..20a6a6b 100644
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.cxx
@@ -119,6 +119,7 @@ NETGENPlugin_Mesher::NETGENPlugin_Mesher (SMESH_Mesh* mesh,
     _shape   (aShape),
     _isVolume(isVolume),
     _optimize(true),
+    _fineness(NETGENPlugin_Hypothesis::GetDefaultFineness()),
     _simpleHyp(NULL)
 {
   defaultParameters();
@@ -153,6 +154,7 @@ void NETGENPlugin_Mesher::defaultParameters()
     mparams.quad = 0;
   else
     mparams.quad = NETGENPlugin_Hypothesis_2D::GetDefaultQuadAllowed() ? 1 : 0;
+  _fineness = NETGENPlugin_Hypothesis::GetDefaultFineness();
 }
 
 //=============================================================================
@@ -212,6 +214,7 @@ void NETGENPlugin_Mesher::SetParameters(const NETGENPlugin_Hypothesis* hyp)
       mparams.quad = static_cast<const NETGENPlugin_Hypothesis_2D*>
         (hyp)->GetQuadAllowed() ? 1 : 0;
     _optimize = hyp->GetOptimize();
+    _fineness = hyp->GetFineness();
     _simpleHyp = NULL;
 
     SMESH_Gen_i* smeshGen_i = SMESH_Gen_i::GetSMESHGen();
@@ -1842,7 +1845,7 @@ bool NETGENPlugin_Mesher::Compute()
 
     if ( mparams.maxh == 0.0 )
       mparams.maxh = occgeo.boundingbox.Diam();
-    if ( _simpleHyp || mparams.minh == 0.0 )
+    if ( _simpleHyp || ( mparams.minh == 0.0 && _fineness != NETGENPlugin_Hypothesis::UserDefined))
       mparams.minh = GetDefaultMinSize( _shape, mparams.maxh );
 #ifdef NETGEN_NEW
     occgeo.face_maxh = mparams.maxh;
diff --git a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
index a32dc84..1a3b3bc 100644
--- a/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
+++ b/src/NETGENPlugin/NETGENPlugin_Mesher.hxx
@@ -136,6 +136,7 @@ class NETGENPLUGIN_EXPORT NETGENPlugin_Mesher
   const TopoDS_Shape&  _shape;
   bool                 _isVolume;
   bool                 _optimize;
+  int                  _fineness;
 
   const NETGENPlugin_SimpleHypothesis_2D * _simpleHyp;
   std::map< int, std::pair<int,int> >      _faceDescriptors;