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 branch 'master' into pre/medCompatibility
[modules/smesh.git]
/
src
/
SMESHUtils
/
SMESH_Tree.hxx
diff --git
a/src/SMESHUtils/SMESH_Tree.hxx
b/src/SMESHUtils/SMESH_Tree.hxx
index 36d4124209ca08835bd4148ca63c4383f9c7a932..16ab6b80570d9e687f740690e584e8429ee8ffbf 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
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
@@
-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
@@
-98,6
+98,9
@@
protected:
// Allocate a bndbox according to childIndex. childIndex is zero based
virtual box_type* newChildBox(int childIndex) const = 0;
// Allocate a bndbox according to childIndex. childIndex is zero based
virtual box_type* newChildBox(int childIndex) const = 0;
+ // Change size of a box by a factor; each dimension changes independently of others
+ virtual void enlargeByFactor( box_type* box, double factor ) const = 0;
+
// Fill in data of the children
virtual void buildChildrenData() = 0;
// Fill in data of the children
virtual void buildChildrenData() = 0;
@@
-115,14
+118,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();
};
//===========================================================================
};
//===========================================================================
@@
-138,8
+141,8
@@
SMESH_Tree<BND_BOX,NB_CHILDREN>::SMESH_Tree (SMESH_TreeLimit* limit):
myFather(0),
myIsLeaf( false ),
myLimit( limit ),
myFather(0),
myIsLeaf( false ),
myLimit( limit ),
- my
Level
(0),
- my
Box
(0)
+ my
Box
(0),
+ my
Level
(0)
{
//if ( !myLimit ) myLimit = new SMESH_TreeLimit();
}
{
//if ( !myLimit ) myLimit = new SMESH_TreeLimit();
}
@@
-205,13
+208,13
@@
void SMESH_Tree<BND_BOX,NB_CHILDREN>::buildChildren()
myChildren = new SMESH_Tree*[NB_CHILDREN];
// get the whole model size
myChildren = new SMESH_Tree*[NB_CHILDREN];
// get the whole model size
- double rootSize = 0;
- {
- SMESH_Tree* root = this;
- while ( root->myLevel > 0 )
- root = root->myFather;
- rootSize = root->maxSize();
- }
+
//
double rootSize = 0;
+
//
{
+
//
SMESH_Tree* root = this;
+
//
while ( root->myLevel > 0 )
+
//
root = root->myFather;
+
//
rootSize = root->maxSize();
+
//
}
for (int i = 0; i < NB_CHILDREN; i++)
{
// The child is of the same type than its father (For instance, a SMESH_OctreeNode)
for (int i = 0; i < NB_CHILDREN; i++)
{
// The child is of the same type than its father (For instance, a SMESH_OctreeNode)
@@
-224,7
+227,7
@@
void SMESH_Tree<BND_BOX,NB_CHILDREN>::buildChildren()
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 );
-
myChildren[i]->myBox->Enlarge( rootSize *
1e-10 );
+
enlargeByFactor( myChildren[i]->myBox, 1. +
1e-10 );
if ( myLimit->myMinBoxSize > 0. && myChildren[i]->maxSize() <= myLimit->myMinBoxSize )
myChildren[i]->myIsLeaf = true;
}
if ( myLimit->myMinBoxSize > 0. && myChildren[i]->maxSize() <= myLimit->myMinBoxSize )
myChildren[i]->myIsLeaf = true;
}
@@
-265,14
+268,14
@@
int SMESH_Tree<BND_BOX,NB_CHILDREN>::getHeight(const bool full) const
if ( isLeaf() )
return 1;
if ( isLeaf() )
return 1;
- int heig
th
= 0;
+ int heig
ht
= 0;
for (int i = 0; i<NB_CHILDREN; i++)
{
int h = myChildren[i]->getHeight( false );
for (int i = 0; i<NB_CHILDREN; i++)
{
int h = myChildren[i]->getHeight( false );
- if ( h > heig
th
)
- heig
th
= h;
+ if ( h > heig
ht
)
+ heig
ht
= h;
}
}
- return heig
th
+ 1;
+ return heig
ht
+ 1;
}
#endif
}
#endif