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
[PY3] Fix some MRO issues
[modules/smesh.git]
/
src
/
SMDS
/
SMDS_VolumeTool.cxx
diff --git
a/src/SMDS/SMDS_VolumeTool.cxx
b/src/SMDS/SMDS_VolumeTool.cxx
index c0c506d9cc13ba79e607cbf392d6f612bd1cd4e2..d7dd7f826f6d2180446e8030667e976da1009946 100644
(file)
--- a/
src/SMDS/SMDS_VolumeTool.cxx
+++ b/
src/SMDS/SMDS_VolumeTool.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
5
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-425,11
+425,13
@@
struct SMDS_VolumeTool::SaveFacet
SaveFacet( SMDS_VolumeTool::Facet& facet ): myToRestore( facet )
{
mySaved = facet;
SaveFacet( SMDS_VolumeTool::Facet& facet ): myToRestore( facet )
{
mySaved = facet;
+ mySaved.myNodes.swap( facet.myNodes );
}
~SaveFacet()
{
if ( myToRestore.myIndex != mySaved.myIndex )
myToRestore = mySaved;
}
~SaveFacet()
{
if ( myToRestore.myIndex != mySaved.myIndex )
myToRestore = mySaved;
+ myToRestore.myNodes.swap( mySaved.myNodes );
}
};
}
};
@@
-843,7
+845,7
@@
bool SMDS_VolumeTool::GetBaryCenter(double & X, double & Y, double & Z) const
if ( !myVolume )
return false;
if ( !myVolume )
return false;
- for (
in
t i = 0; i < myVolumeNodes.size(); i++ ) {
+ for (
size_
t i = 0; i < myVolumeNodes.size(); i++ ) {
X += myVolumeNodes[ i ]->X();
Y += myVolumeNodes[ i ]->Y();
Z += myVolumeNodes[ i ]->Z();
X += myVolumeNodes[ i ]->X();
Y += myVolumeNodes[ i ]->Y();
Z += myVolumeNodes[ i ]->Z();
@@
-1390,7
+1392,7
@@
bool SMDS_VolumeTool::IsLinked (const SMDS_MeshNode* theNode1,
// find nodes indices
int i1 = -1, i2 = -1, nbFound = 0;
// find nodes indices
int i1 = -1, i2 = -1, nbFound = 0;
- for (
in
t i = 0; i < myVolumeNodes.size() && nbFound < 2; i++ )
+ for (
size_
t i = 0; i < myVolumeNodes.size() && nbFound < 2; i++ )
{
if ( myVolumeNodes[ i ] == theNode1 )
i1 = i, ++nbFound;
{
if ( myVolumeNodes[ i ] == theNode1 )
i1 = i, ++nbFound;
@@
-1418,7
+1420,7
@@
bool SMDS_VolumeTool::IsLinked (const int theNode1Index,
int minInd = min( theNode1Index, theNode2Index );
int maxInd = max( theNode1Index, theNode2Index );
int minInd = min( theNode1Index, theNode2Index );
int maxInd = max( theNode1Index, theNode2Index );
- if ( minInd < 0 || maxInd > myVolumeNodes.size() - 1 || maxInd == minInd )
+ if ( minInd < 0 || maxInd >
(int)
myVolumeNodes.size() - 1 || maxInd == minInd )
return false;
VolumeType type = GetVolumeType();
return false;
VolumeType type = GetVolumeType();
@@
-1535,7
+1537,7
@@
bool SMDS_VolumeTool::IsLinked (const int theNode1Index,
int SMDS_VolumeTool::GetNodeIndex(const SMDS_MeshNode* theNode) const
{
if ( myVolume ) {
int SMDS_VolumeTool::GetNodeIndex(const SMDS_MeshNode* theNode) const
{
if ( myVolume ) {
- for (
in
t i = 0; i < myVolumeNodes.size(); i++ ) {
+ for (
size_
t i = 0; i < myVolumeNodes.size(); i++ ) {
if ( myVolumeNodes[ i ] == theNode )
return i;
}
if ( myVolumeNodes[ i ] == theNode )
return i;
}
@@
-1596,8
+1598,8
@@
int SMDS_VolumeTool::GetAllExistingEdges(vector<const SMDS_MeshElement*> & edges
{
edges.clear();
edges.reserve( myVolumeNodes.size() * 2 );
{
edges.clear();
edges.reserve( myVolumeNodes.size() * 2 );
- for (
in
t i = 0; i < myVolumeNodes.size()-1; ++i ) {
- for (
in
t j = i + 1; j < myVolumeNodes.size(); ++j ) {
+ for (
size_
t i = 0; i < myVolumeNodes.size()-1; ++i ) {
+ for (
size_
t j = i + 1; j < myVolumeNodes.size(); ++j ) {
if ( IsLinked( i, j )) {
const SMDS_MeshElement* edge =
SMDS_Mesh::FindEdge( myVolumeNodes[i], myVolumeNodes[j] );
if ( IsLinked( i, j )) {
const SMDS_MeshElement* edge =
SMDS_Mesh::FindEdge( myVolumeNodes[i], myVolumeNodes[j] );