-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020 CEA/DEN, EDF R&D, OPEN CASCADE
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
*
*/
//=============================================================================
-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;
<< " " << _enforcedPoints[i].Y()
<< " " << _enforcedPoints[i].Z();
+ save << " " << _cornerVertices.size();
+ for ( size_t i = 0; i < _cornerVertices.size(); ++i )
+ save << " " << _cornerVertices[i];
+
return save;
}
istream & StdMeshers_QuadrangleParams::LoadFrom(istream & load)
{
bool isOK = true;
- isOK = (load >> _triaVertexID);
+ isOK = static_cast<bool>(load >> _triaVertexID);
if (!isOK)
load.clear(ios::badbit | load.rdstate());
- isOK = (load >> _objEntry);
+ isOK = static_cast<bool>(load >> _objEntry);
if (!isOK)
load.clear(ios::badbit | load.rdstate());
int type;
- isOK = (load >> type);
+ isOK = static_cast<bool>(load >> type);
if (isOK)
_quadType = StdMeshers_QuadType(type);
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;
}