From 9ebc9bed479c89013d99186dd2bd755631e0b2a0 Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 9 Sep 2016 18:50:24 +0300 Subject: [PATCH] Regression SALOME_TESTS/Grids/smesh/mesh_BLSURF_01/B6 --- src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx | 2 +- src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx index 73ac532..655aa9c 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_BLSURF.cxx @@ -951,7 +951,7 @@ void BLSURFPlugin_BLSURF::SetParameters(const BLSURFPlugin_Hypothesis* hyp, if ( BLSURFPlugin_Hypothesis::HasPreCADOptions( hyp )) { - cadsurf_set_param(css, "use_precad", "yes" ); // for young versions + cadsurf_set_param(css, "use_precad", "yes" ); // for old versions } // PreProcessor (formerly PreCAD) -- commented params are preCADoptions (since 0023307) //set_param(css, "merge_edges", _precadMergeEdges ? "yes" : "no"); diff --git a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx index 745c227..5e8c8cd 100644 --- a/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx +++ b/src/BLSURFPlugin/BLSURFPlugin_Hypothesis.cxx @@ -749,7 +749,13 @@ bool BLSURFPlugin_Hypothesis::HasPreCADOptions(const BLSURFPlugin_Hypothesis* hy ToBool( hyp->GetPreCADOptionValue("remove_duplicate_cad_faces", &orDefault )) || ToBool( hyp->GetPreCADOptionValue("process_3d_topology" , &orDefault )) || ToBool( hyp->GetPreCADOption ("manifold_geometry") , &isOk ) || - hyp->GetPreCADOptionValue("sewing_tolerance", &orDefault ) != "5e-4*D" ); + hyp->GetPreCADOptionValue("sewing_tolerance", &orDefault ) != "5e-4*D" || + !hyp->_preCadFacesPeriodicityVector.empty() || + !hyp->_preCadEdgesPeriodicityVector.empty() || + !hyp->_facesPeriodicityVector.empty() || + !hyp->_edgesPeriodicityVector.empty() || + !hyp->_verticesPeriodicityVector.empty() || + hyp->GetTopology() != FromCAD ); } //============================================================================= -- 2.39.2