23258: [CEA 1804] Do not merge the middle nodes of quadratic elements

Fix Python dump and compilation on Debian-7
This commit is contained in:
eap 2017-03-15 13:22:02 +03:00
parent ae0ca1f89f
commit 88d37b48bd
3 changed files with 2 additions and 4 deletions

View File

@ -63,7 +63,7 @@ class SMDS_EXPORT SMDS_VolumeTool
bool Set( const SMDS_MeshElement* theVolume, bool Set( const SMDS_MeshElement* theVolume,
const bool ignoreCentralNodes = true, const bool ignoreCentralNodes = true,
const std::vector<const SMDS_MeshNode*>* nodes = NULL); const std::vector<const SMDS_MeshNode*>* nodes = 0);
// Set volume. // Set volume.
// Return false if theVolume is not of type SMDSAbs_Volume. // Return false if theVolume is not of type SMDSAbs_Volume.
// ignoreCentralNodes makes skip nodes at face centers when returning // ignoreCentralNodes makes skip nodes at face centers when returning

View File

@ -480,7 +480,6 @@ SMESH::long_array* SMESH_GroupBase_i::GetListOfID()
if ( 0 < aSize && aSize < 100 ) // for comfortable testing ;) if ( 0 < aSize && aSize < 100 ) // for comfortable testing ;)
std::sort( &aRes[0], &aRes[0]+aSize ); std::sort( &aRes[0], &aRes[0]+aSize );
} }
MESSAGE("get list of IDs of a vague group");
return aRes._retn(); return aRes._retn();
} }
@ -673,7 +672,6 @@ void SMESH_GroupBase_i::SetColorNumber(CORBA::Long color)
aGroupDS->SetColorGroup(color); aGroupDS->SetColorGroup(color);
TPythonDump()<<SMESH::SMESH_GroupBase_var(_this())<<".SetColorNumber( "<<color<<" )"; TPythonDump()<<SMESH::SMESH_GroupBase_var(_this())<<".SetColorNumber( "<<color<<" )";
} }
MESSAGE("set color number of a group");
return ; return ;
} }

View File

@ -4206,7 +4206,7 @@ void SMESH_MeshEditor_i::MergeNodes (const SMESH::array_of_long_array& GroupsOfN
getEditor().MergeNodes( aListOfListOfNodes, AvoidMakingHoles ); getEditor().MergeNodes( aListOfListOfNodes, AvoidMakingHoles );
aTPythonDump << "], " << NodesToKeep << ")"; aTPythonDump << "], " << NodesToKeep << ", " << AvoidMakingHoles << ")";
declareMeshModified( /*isReComputeSafe=*/false ); declareMeshModified( /*isReComputeSafe=*/false );