ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 09:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into gni/adaptation

Browse Source
This commit is contained in:
Gérald NICOLAS 2020-06-29 11:28:50 +02:00
commit 33ba300401
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMDS/SMDS_Mesh.cxx
View File

@ -831,6 +831,8 @@ SMDS_Mesh::AddPolygonalFaceWithID (const std::vector<const SMDS_MeshNode*> & nod
{ {
if ( NbFaces() % CHECKMEMORY_INTERVAL == 0 ) CheckMemory(); if ( NbFaces() % CHECKMEMORY_INTERVAL == 0 ) CheckMemory();
if ( nodes.empty() )
throw std::invalid_argument("Polygon without nodes is forbidden");
if ( SMDS_MeshCell* cell = myCellFactory->NewCell( ID )) if ( SMDS_MeshCell* cell = myCellFactory->NewCell( ID ))
{ {
cell->init( SMDSEntity_Polygon, nodes ); cell->init( SMDSEntity_Polygon, nodes );
@ -874,6 +876,8 @@ SMDS_Mesh::AddQuadPolygonalFaceWithID (const std::vector<const SMDS_MeshNode*> &
const int ID) const int ID)
{ {
if ( NbFaces() % CHECKMEMORY_INTERVAL == 0 ) CheckMemory(); if ( NbFaces() % CHECKMEMORY_INTERVAL == 0 ) CheckMemory();
if ( nodes.empty() )
throw std::invalid_argument("Polygon without nodes is forbidden");
if ( SMDS_MeshCell* cell = myCellFactory->NewCell( ID )) if ( SMDS_MeshCell* cell = myCellFactory->NewCell( ID ))
{ {
cell->init( SMDSEntity_Quad_Polygon, nodes ); cell->init( SMDSEntity_Quad_Polygon, nodes );

12
src/SMESH_I/SMESH_MeshEditor_i.cxx
View File

@ -1069,6 +1069,12 @@ CORBA::Long SMESH_MeshEditor_i::AddPolygonalFace (const SMESH::long_array & IDsO
if ( ! ( nodes[i] = getMeshDS()->FindNode( IDsOfNodes[i] ))) if ( ! ( nodes[i] = getMeshDS()->FindNode( IDsOfNodes[i] )))
return 0; return 0;
if ( NbNodes == 0 )
{
INFOS("Polygon without nodes is forbidden");
return 0;
}
const SMDS_MeshElement* elem = getMeshDS()->AddPolygonalFace(nodes); const SMDS_MeshElement* elem = getMeshDS()->AddPolygonalFace(nodes);
// Update Python script // Update Python script
@ -1098,6 +1104,12 @@ CORBA::Long SMESH_MeshEditor_i::AddQuadPolygonalFace (const SMESH::long_array &
for (int i = 0; i < NbNodes; i++) for (int i = 0; i < NbNodes; i++)
nodes[i] = getMeshDS()->FindNode(IDsOfNodes[i]); nodes[i] = getMeshDS()->FindNode(IDsOfNodes[i]);
if ( NbNodes == 0 )
{
INFOS("Polygon without nodes is forbidden");
return 0;
}
const SMDS_MeshElement* elem = getMeshDS()->AddQuadPolygonalFace(nodes); const SMDS_MeshElement* elem = getMeshDS()->AddQuadPolygonalFace(nodes);
// Update Python script // Update Python script