X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_QuadrangleParams.cxx;h=ed1682805d3dde6ca65e1685975ba99199e61869;hp=e45b4cf687f494d50191386feca5db2e70dcc9cb;hb=HEAD;hpb=7eda9ca931ed2a11cb5e4637e4ffe19f5c061115 diff --git a/src/StdMeshers/StdMeshers_QuadrangleParams.cxx b/src/StdMeshers/StdMeshers_QuadrangleParams.cxx index e45b4cf68..888b37083 100644 --- a/src/StdMeshers/StdMeshers_QuadrangleParams.cxx +++ b/src/StdMeshers/StdMeshers_QuadrangleParams.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2024 CEA, EDF, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -42,9 +42,9 @@ using namespace std; * */ //============================================================================= -StdMeshers_QuadrangleParams::StdMeshers_QuadrangleParams(int hypId, int studyId, +StdMeshers_QuadrangleParams::StdMeshers_QuadrangleParams(int hypId, SMESH_Gen * gen) - : SMESH_Hypothesis(hypId, studyId, gen) + : SMESH_Hypothesis(hypId, gen) { _name = "QuadrangleParams"; _param_algo_dim = 2; @@ -142,6 +142,10 @@ ostream & StdMeshers_QuadrangleParams::SaveTo(ostream & save) << " " << _enforcedPoints[i].Y() << " " << _enforcedPoints[i].Z(); + save << " " << _cornerVertices.size(); + for ( size_t i = 0; i < _cornerVertices.size(); ++i ) + save << " " << _cornerVertices[i]; + return save; } @@ -182,6 +186,17 @@ istream & StdMeshers_QuadrangleParams::LoadFrom(istream & load) else break; } + + if ( load >> nbP && nbP > 0 ) + { + int id; + _cornerVertices.reserve( nbP ); + while ( _cornerVertices.size() < _cornerVertices.capacity() ) + if ( load >> id ) + _cornerVertices.push_back( id ); + else + break; + } return load; } @@ -208,7 +223,7 @@ bool StdMeshers_QuadrangleParams::SetParametersByMesh(const SMESH_Mesh* theMesh, * \retval bool - true if parameter values have been successfully defined */ //================================================================================ -bool StdMeshers_QuadrangleParams::SetParametersByDefaults(const TDefaults& dflts, +bool StdMeshers_QuadrangleParams::SetParametersByDefaults(const TDefaults& /*dflts*/, const SMESH_Mesh* /*mesh*/) { return true;