PreCAD

diff --git a/idl/BLSURFPlugin_Algorithm.idl b/idl/BLSURFPlugin_Algorithm.idl
index 83750ea5e7a71445825b2540901644d65b7dcf79..e5e62816df303d556eee45036069cb00e7c4f3c5 100644 (file)
--- a/idl/BLSURFPlugin_Algorithm.idl
+++ b/idl/BLSURFPlugin_Algorithm.idl
@@ -212,7 +212,7 @@ module BLSURFPlugin
     short GetVerbosity();
 
     /*!
-     * To optimize merges edges.
+     * To merges edges.
      */
     void SetPreCADMergeEdges(in boolean toMergeEdges);
     boolean GetPreCADMergeEdges();
@@ -230,8 +230,8 @@ module BLSURFPlugin
     boolean GetPreCADDiscardInput();
 
     /*!
-     * To help PreCAD treat some very dirty cases.
-     * If the treated object is manifold.
+     * Sets the length below which an edge is considered as nano 
+     * for the topology processing.
      */
     void SetPreCADEpsNano(in double epsNano);
     boolean GetPreCADEpsNano();

diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
index 340cc17295b23adb64f2bd93a761450e51106cea..191a186e568fa08c050b8608c40c85a857263d47 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx
@@ -696,7 +696,7 @@ void BLSURFPlugin_BLSURF::SetParameters(
   int _precadMergeEdges      = BLSURFPlugin_Hypothesis::GetDefaultPreCADMergeEdges();
   int _precadRemoveNanoEdges = BLSURFPlugin_Hypothesis::GetDefaultPreCADRemoveNanoEdges();
   int _precadDiscardInput    = BLSURFPlugin_Hypothesis::GetDefaultPreCADDiscardInput();
-  double _precadEpsNano      = BLSURFPlugin_Hypothesis::GetDefaultMinSize();
+  double _precadEpsNano      = BLSURFPlugin_Hypothesis::GetDefaultPreCADEpsNano();
 
 
   if (hyp) {

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
index 0daa17ae2e06091b7fe9c2040ab31d625add0606..d425913e7cf6b3492284222515ff15af0357e0a7 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx
@@ -58,7 +58,7 @@ BLSURFPlugin_Hypothesis::BLSURFPlugin_Hypothesis(int hypId, int studyId, SMESH_G
   _preCADMergeEdges(GetDefaultPreCADMergeEdges()),
   _preCADRemoveNanoEdges(GetDefaultPreCADRemoveNanoEdges()),
   _preCADDiscardInput(GetDefaultPreCADDiscardInput()),
-  _preCADEpsNano(GetDefaultMinSize()),
+  _preCADEpsNano(GetDefaultPreCADEpsNano()),
   _sizeMap(GetDefaultSizeMap()),
   _attractors(GetDefaultSizeMap()),
   _classAttractors(GetDefaultAttractorMap()),
@@ -1585,3 +1585,8 @@ bool BLSURFPlugin_Hypothesis::GetDefaultQuadAllowed() {
 bool BLSURFPlugin_Hypothesis::GetDefaultDecimesh() {
   return false;
 }
+
+//======================================================================
+double BLSURFPlugin_Hypothesis::GetDefaultPreCADEpsNano() {
+  return undefinedDouble(); //1e-4;
+}

diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
index b6ffd4b9d65dc7e3034b3ead0ce3c779c9b94b9b..f6bdec6ec0fdc7ca94d4a0a0983424908785a8ce 100644 (file)
--- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
+++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.hxx
@@ -286,10 +286,10 @@ public:
   static bool            GetDefaultDecimesh();
   static int             GetDefaultVerbosity() { return 10; }
   // PreCAD
-  static bool            GetDefaultPreCADMergeEdges() { return true; }
-  static bool            GetDefaultPreCADRemoveNanoEdges() { return true; }
+  static bool            GetDefaultPreCADMergeEdges() { return false; }
+  static bool            GetDefaultPreCADRemoveNanoEdges() { return false; }
   static bool            GetDefaultPreCADDiscardInput() { return false; }
-//   static double          GetDefaultPreCADEpsNano() { return undefinedDouble(); }
+  static double          GetDefaultPreCADEpsNano();
   
   static TSizeMap        GetDefaultSizeMap() { return TSizeMap();}
   static TAttractorMap   GetDefaultAttractorMap() { return TAttractorMap(); }

diff --git a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
index a3340949404162bf9ca66207a5685c60cdcd98b9..4f112e86183723d37ba2f5f5b18181e8fb6281c7 100644 (file)
--- a/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
+++ b/src/GUI/BLSURFPluginGUI_HypothesisCreator.cxx
@@ -777,10 +777,8 @@ QFrame* BLSURFPluginGUI_HypothesisCreator::buildFrame()
   myPreCADGroupBox->setEnabled(false);
   QGridLayout* aPreCADGroupLayout = new QGridLayout(myPreCADGroupBox);
   myPreCADMergeEdges = new QCheckBox(tr("BLSURF_PRECAD_MERGE_EDGES"),myPreCADGroupBox);
-  myPreCADMergeEdges->setChecked(true);
   aPreCADGroupLayout->addWidget(myPreCADMergeEdges,0,0,1,2);
   myPreCADRemoveNanoEdges = new QCheckBox(tr("BLSURF_PRECAD_REMOVE_NANO_EDGES"),myPreCADGroupBox);
-  myPreCADRemoveNanoEdges->setChecked(true);
   aPreCADGroupLayout->addWidget(myPreCADRemoveNanoEdges,1,0,1,2);
   myPreCADEpsNano = new SMESHGUI_SpinBox(myPreCADGroupBox);
   myPreCADEpsNano->RangeStepAndValidator(0, COORD_MAX, 10.0, "length_precision");