-// SMESH SMESH : implementaion of SMESH idl descriptions
+// Copyright (C) 2007-2008 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
+//
+// 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.
//
-// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-// 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.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+// SMESH SMESH : implementaion of SMESH idl descriptions
// File : StdMeshers_NumberOfSegments.cxx
// Moved here from SMESH_NumberOfSegments.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
-// $Header$
-
+//
#include "StdMeshers_NumberOfSegments.hxx"
#include "StdMeshers_Distribution.hxx"
int studyId,
SMESH_Gen * gen)
: SMESH_Hypothesis(hypId, studyId, gen),
- _numberOfSegments(1),
+ _numberOfSegments(15),//issue 19923
_distrType(DT_Regular),
_scaleFactor(1.),
_convMode(1) //cut negative by default
#ifdef NO_CAS_CATCH
OCC_CATCH_SIGNALS;
#endif
- val = pow( 10.0, val );
+ val = pow( 10.0, val );
} catch(Standard_Failure) {
- Handle(Standard_Failure) aFail = Standard_Failure::Caught();
- throw SALOME_Exception( LOCALIZED( "invalid value"));
- return;
+ Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+ throw SALOME_Exception( LOCALIZED( "invalid value"));
+ return;
}
}
else if( _convMode==1 && val<0.0 )
if( !name.IsNull() )
{
if( name->GetName()!="t" )
- res = false;
+ res = false;
}
else
res = isCorrectArg( sub );
*/
//================================================================================
bool process( const TCollection_AsciiString& str, int convMode,
- bool& syntax, bool& args,
- bool& non_neg, bool& non_zero,
- bool& singulars, double& sing_point )
+ bool& syntax, bool& args,
+ bool& non_neg, bool& non_zero,
+ bool& singulars, double& sing_point )
{
+ // Set "C" numeric locale to save numbers correctly
+ std::string aCurLocale = setlocale(LC_NUMERIC, 0);
+ setlocale(LC_NUMERIC, "C");
+
bool parsed_ok = true;
Handle( ExprIntrp_GenExp ) myExpr;
try {
double t = double(i)/double(max), val;
if( !f.value( t, val ) )
{
- sing_point = t;
- singulars = true;
- break;
+ sing_point = t;
+ singulars = true;
+ break;
}
if( val<0 )
{
- non_neg = false;
- break;
+ non_neg = false;
+ break;
}
if( val>PRECISION )
- non_zero = true;
+ non_zero = true;
}
}
+
+ // Return previous locale
+ setlocale(LC_NUMERIC, aCurLocale.data());
+
return res && non_neg && non_zero && ( !singulars );
}
ostream & StdMeshers_NumberOfSegments::SaveTo(ostream & save)
{
+ int listSize = _edgeIDs.size();
save << _numberOfSegments << " " << (int)_distrType;
switch (_distrType)
{
if (_distrType == DT_TabFunc || _distrType == DT_ExprFunc)
save << " " << _convMode;
+
+ if ( _distrType != DT_Regular && listSize > 0 ) {
+ save << " " << listSize;
+ for ( int i = 0; i < listSize; i++ )
+ save << " " << _edgeIDs[i];
+ save << " " << _objEntry;
+ }
return save;
}
load.clear(ios::badbit | load.rdstate());
}
+ // load reversed edges IDs
+ int intVal;
+ isOK = (load >> intVal);
+ if ( isOK && _distrType != DT_Regular && intVal > 0 ) {
+ _edgeIDs.reserve( intVal );
+ for (int i = 0; i < _edgeIDs.capacity() && isOK; i++) {
+ isOK = (load >> intVal);
+ if ( isOK ) _edgeIDs.push_back( intVal );
+ }
+ isOK = (load >> _objEntry);
+ }
+
return load;
}
if ( nbEdges )
_numberOfSegments /= nbEdges;
+ if (_numberOfSegments == 0) _numberOfSegments = 1;
+
return nbEdges;
}
+//================================================================================
+/*!
+ * \brief Initialize my parameter values by default parameters.
+ * \retval bool - true if parameter values have been successfully defined
+ */
+//================================================================================
+
+bool StdMeshers_NumberOfSegments::SetParametersByDefaults(const TDefaults& dflts,
+ const SMESH_Mesh* /*theMesh*/)
+{
+ return (_numberOfSegments = dflts._nbSegments );
+}
+
+//=============================================================================
+/*!
+ *
+ */
+//=============================================================================
+
+void StdMeshers_NumberOfSegments::SetReversedEdges( std::vector<int>& ids )
+{
+ if ( ids != _edgeIDs ) {
+ _edgeIDs = ids;
+
+ NotifySubMeshesHypothesisModification();
+ }
+}
+
