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
Merge remote branch 'origin/gdd/translations'
[modules/smesh.git]
/
src
/
SMESHUtils
/
SMESH_Tree.hxx
diff --git
a/src/SMESHUtils/SMESH_Tree.hxx
b/src/SMESHUtils/SMESH_Tree.hxx
index 61ee057f0975f7c7f9dbde090cc1551330691b51..eb7b2b864886bdf06190f7816b44535eb287da82 100644
(file)
--- a/
src/SMESHUtils/SMESH_Tree.hxx
+++ b/
src/SMESHUtils/SMESH_Tree.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
@@
-6,7
+6,7
@@
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-115,14
+115,14
@@
protected:
// Tree limit
const SMESH_TreeLimit* myLimit;
// Tree limit
const SMESH_TreeLimit* myLimit;
-private:
- // Build the children recursively
- void buildChildren();
+ // Bounding box of a tree
+ box_type* myBox;
// Level of the Tree
int myLevel;
// Level of the Tree
int myLevel;
- box_type* myBox;
+ // Build the children recursively
+ void buildChildren();
};
//===========================================================================
};
//===========================================================================
@@
-219,6
+219,8
@@
void SMESH_Tree<BND_BOX,NB_CHILDREN>::buildChildren()
myChildren[i] = newChild();
// and we assign to him its box.
myChildren[i]->myFather = this;
myChildren[i] = newChild();
// and we assign to him its box.
myChildren[i]->myFather = this;
+ if (myChildren[i]->myLimit)
+ delete myChildren[i]->myLimit;
myChildren[i]->myLimit = myLimit;
myChildren[i]->myLevel = myLevel + 1;
myChildren[i]->myBox = newChildBox( i );
myChildren[i]->myLimit = myLimit;
myChildren[i]->myLevel = myLevel + 1;
myChildren[i]->myBox = newChildBox( i );