Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #20646 [CEA] Fix error in polyhedron per solid on pentahedron
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_QuadrangleParams.cxx
diff --git
a/src/StdMeshers/StdMeshers_QuadrangleParams.cxx
b/src/StdMeshers/StdMeshers_QuadrangleParams.cxx
index dc3e692e1ad7edc5c42cdc801a4a652e42f239f6..d3b5935d619c99f1b7a80cf6c71a06712f129414 100644
(file)
--- a/
src/StdMeshers/StdMeshers_QuadrangleParams.cxx
+++ b/
src/StdMeshers/StdMeshers_QuadrangleParams.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
20
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-142,6
+142,10
@@
ostream & StdMeshers_QuadrangleParams::SaveTo(ostream & save)
<< " " << _enforcedPoints[i].Y()
<< " " << _enforcedPoints[i].Z();
<< " " << _enforcedPoints[i].Y()
<< " " << _enforcedPoints[i].Z();
+ save << " " << _cornerVertices.size();
+ for ( size_t i = 0; i < _cornerVertices.size(); ++i )
+ save << " " << _cornerVertices[i];
+
return save;
}
return save;
}
@@
-182,6
+186,17
@@
istream & StdMeshers_QuadrangleParams::LoadFrom(istream & load)
else
break;
}
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;
}
return load;
}
@@
-208,7
+223,7
@@
bool StdMeshers_QuadrangleParams::SetParametersByMesh(const SMESH_Mesh* theMesh,
* \retval bool - true if parameter values have been successfully defined
*/
//================================================================================
* \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;
const SMESH_Mesh* /*mesh*/)
{
return true;