//
// SMESH SMESH_OctreeNode : Octree with Nodes set
// inherites global class SMESH_Octree
-// File : SMESH_OctreeNode.cxx
-// Created : Tue Jan 16 16:00:00 2007
-// Author : Nicolas Geimer & Aurélien Motteux (OCC)
-// Module : SMESH
//
+// File : SMESH_OctreeNode.cxx
+// Created : Tue Jan 16 16:00:00 2007
+// Author : Nicolas Geimer & Aurélien Motteux (OCC)
+// Module : SMESH
+
#include "SMESH_OctreeNode.hxx"
#include "SMDS_MeshNode.hxx"
// We need to compute the first bounding box via a special method
computeBoxForFather();
myNbNodes = myNodes.size();
- myIsLeaf = (myLevel == myMaxLevel)||(myNbNodes<=myMaxNbNodes)||(myMinBoxSize>=maxSize(myBox));
+ myIsLeaf = ((myLevel == myMaxLevel) ||
+ (myNbNodes <= myMaxNbNodes) ||
+ (maxSize(myBox) <= myMinBoxSize));
// All the children (Boxes and Data) are computed in Compute()
Compute();
}
return theOctree;
}
-
-
//======================================
/*!
* \brief Compute the first bounding box
*
- * We take the max/min coord of the nodes
+ * We take the max/min coord of the nodes
*/
//======================================
void SMESH_OctreeNode::computeBoxForFather()
{
- set<const SMDS_MeshNode*>::iterator it=myNodes.begin();
- for( ;it!=myNodes.end();it++){
+ set<const SMDS_MeshNode*>::iterator it = myNodes.begin();
+ for (; it != myNodes.end(); it++) {
const SMDS_MeshNode* n1 = *it;
gp_XYZ p1( n1->X(), n1->Y(), n1->Z() );
myBox->Add(p1);
* \retval bool - True if Node is in the box within precision
*/
//====================================================================================
-const bool SMESH_OctreeNode::isInside(const SMDS_MeshNode * Node, const double precision )
+const bool SMESH_OctreeNode::isInside (const SMDS_MeshNode * Node, const double precision)
{
- double X=Node->X();
- double Y=Node->Y();
- double Z=Node->Z();
+ double X = Node->X();
+ double Y = Node->Y();
+ double Z = Node->Z();
bool Out = 1 ;
- if (precision<=0.)
- return !(myBox->IsOut(gp_XYZ(X,Y,Z)));
+ if (precision <= 0.)
+ return !(myBox->IsOut(gp_XYZ(X,Y,Z)));
Bnd_B3d BoxWithPrecision;
getBox(BoxWithPrecision);
BoxWithPrecision.Enlarge(precision);
- Out=BoxWithPrecision.IsOut(gp_XYZ(X,Y,Z));
+ Out = BoxWithPrecision.IsOut(gp_XYZ(X,Y,Z));
return !(Out);
}
-
//================================================
/*!
* \brief Set the data of the children
gp_XYZ max = myBox->CornerMax();
gp_XYZ mid = (min + max)/2.;
- set<const SMDS_MeshNode*>::iterator it=myNodes.begin();
+ set<const SMDS_MeshNode*>::iterator it = myNodes.begin();
int ChildBoxNum;
- while( it!=myNodes.end())
+ while (it != myNodes.end())
{
const SMDS_MeshNode* n1 = *it;
- ChildBoxNum= (n1->X()>mid.X()) + (n1->Y()>mid.Y())*2 + (n1->Z()>mid.Z())*4;
+ ChildBoxNum = (n1->X() > mid.X()) + (n1->Y() > mid.Y())*2 + (n1->Z() > mid.Z())*4;
SMESH_OctreeNode* myChild = dynamic_cast<SMESH_OctreeNode*> (myChildren[ChildBoxNum]);
myChild->myNodes.insert(myChild->myNodes.end(),n1);
myNodes.erase( it );
- it=myNodes.begin();
+ it = myNodes.begin();
}
- for (int i = 0; i<8; i++)
+ for (int i = 0; i < 8; i++)
{
SMESH_OctreeNode* myChild = dynamic_cast<SMESH_OctreeNode*> (myChildren[i]);
myChild->myNbNodes = (myChild->myNodes).size();
- myChild->myIsLeaf = (myChild->myLevel == myMaxLevel)||(myChild->myNbNodes<=myMaxNbNodes)||(myMinBoxSize>=maxSize(myChild->myBox));
+ myChild->myIsLeaf = ((myChild->myLevel == myMaxLevel) ||
+ (myChild->myNbNodes <= myMaxNbNodes) ||
+ (maxSize(myChild->myBox) <= myMinBoxSize));
}
}
* \param Result - list of Nodes potentials to be near Node
*/
//====================================================================
-void SMESH_OctreeNode::NodesAround( const SMDS_MeshNode * Node,
- list<const SMDS_MeshNode*>* Result, const double precision)
+void SMESH_OctreeNode::NodesAround (const SMDS_MeshNode * Node,
+ list<const SMDS_MeshNode*>* Result,
+ const double precision)
{
if (isInside(Node,precision))
{
if (myIsLeaf)
{
- Result->insert( Result->end(), myNodes.begin(), myNodes.end() );
+ Result->insert(Result->end(), myNodes.begin(), myNodes.end());
}
else
{
- for(int i=0;i<8;i++)
+ for (int i = 0; i < 8; i++)
{
SMESH_OctreeNode* myChild = dynamic_cast<SMESH_OctreeNode*> (myChildren[i]);
- myChild->NodesAround( Node, Result, precision);
+ myChild->NodesAround(Node, Result, precision);
}
}
}
}
-
-
//=============================
/*!
* \brief Return in theGroupsOfNodes a list of group of nodes close to each other within theTolerance
- * Search for all the nodes in nodes
+ * Search for all the nodes in theSetOfNodes
* Static Method : no need to create an SMESH_OctreeNode
- * \param nodes - set of nodes we look at, modified during research
+ * \param theSetOfNodes - set of nodes we look at, modified during research
* \param theGroupsOfNodes - list of nodes closed to each other returned
* \param theTolerance - Precision used, default value is 0.00001
* \param maxLevel - Maximum level for SMESH_OctreeNode constructed, default value is -1 (Infinite)
* \param maxNbNodes - maximum Nodes in a Leaf of the SMESH_OctreeNode constructed, default value is 5
*/
//=============================
-void SMESH_OctreeNode::FindCoincidentNodes ( set<const SMDS_MeshNode*> nodes,
- list< list< const SMDS_MeshNode*> >* theGroupsOfNodes,
- const double theTolerance, const int maxLevel,
- const int maxNbNodes)
+void SMESH_OctreeNode::FindCoincidentNodes (set<const SMDS_MeshNode*> theSetOfNodes,
+ list< list< const SMDS_MeshNode*> >* theGroupsOfNodes,
+ const double theTolerance,
+ const int maxLevel,
+ const int maxNbNodes)
{
- SMESH_OctreeNode* theOctreeNode = new SMESH_OctreeNode(nodes, maxLevel, maxNbNodes, theTolerance);
- theOctreeNode->FindCoincidentNodes (&nodes, theTolerance, theGroupsOfNodes);
+ SMESH_OctreeNode* theOctreeNode = new SMESH_OctreeNode(theSetOfNodes, maxLevel, maxNbNodes, theTolerance);
+ theOctreeNode->FindCoincidentNodes (&theSetOfNodes, theTolerance, theGroupsOfNodes);
delete theOctreeNode;
}
-
//=============================
/*!
* \brief Return in theGroupsOfNodes a list of group of nodes close to each other within theTolerance
- * Search for all the nodes in nodes
- * \param nodes - set of nodes we look at, modified during research
+ * Search for all the nodes in theSetOfNodes
+ * \note The Octree itself is also modified by this method
+ * \param theSetOfNodes - set of nodes we look at, modified during research
* \param theTolerance - Precision used
* \param theGroupsOfNodes - list of nodes closed to each other returned
*/
//=============================
-void SMESH_OctreeNode::FindCoincidentNodes ( set<const SMDS_MeshNode*>* nodes,
- const double theTolerance,
+void SMESH_OctreeNode::FindCoincidentNodes ( set<const SMDS_MeshNode*>* theSetOfNodes,
+ const double theTolerance,
list< list< const SMDS_MeshNode*> >* theGroupsOfNodes)
{
- set<const SMDS_MeshNode*>::iterator it1 = nodes->begin();
+ set<const SMDS_MeshNode*>::iterator it1 = theSetOfNodes->begin();
list<const SMDS_MeshNode*>::iterator it2;
- while (it1 != nodes->end())
+ while (it1 != theSetOfNodes->end())
{
const SMDS_MeshNode * n1 = *it1;
- list<const SMDS_MeshNode*> ListofCoincidentNodes;// Initialize the lists via a declaration, it's enough
+ list<const SMDS_MeshNode*> ListOfCoincidentNodes;// Initialize the lists via a declaration, it's enough
list<const SMDS_MeshNode*> * groupPtr = 0;
- // Searching for Nodes around n1 and put them in ListofCoincidentNodes
- FindCoincidentNodes(n1, nodes, &ListofCoincidentNodes, theTolerance);
+ // Searching for Nodes around n1 and put them in ListofCoincidentNodes.
+ // Found nodes are also erased from theSetOfNodes
+ FindCoincidentNodes(n1, theSetOfNodes, &ListOfCoincidentNodes, theTolerance);
// We build a list {n1 + his neigbours} and add this list in theGroupsOfNodes
- for (it2=ListofCoincidentNodes.begin();it2 != ListofCoincidentNodes.end(); it2++)
+ for (it2 = ListOfCoincidentNodes.begin(); it2 != ListOfCoincidentNodes.end(); it2++)
{
const SMDS_MeshNode* n2 = *it2;
if ( !groupPtr )
groupPtr = & theGroupsOfNodes->back();
groupPtr->push_back( n1 );
}
- if(groupPtr->front()>n2)
+ if (groupPtr->front() > n2)
groupPtr->push_front( n2 );
else
groupPtr->push_back( n2 );
}
- if(groupPtr != 0)
+ if (groupPtr != 0)
groupPtr->sort();
- nodes->erase(it1);
- it1=nodes->begin();
+ theSetOfNodes->erase(it1);
+ it1 = theSetOfNodes->begin();
}
}
//======================================================================================
/*!
* \brief Return a list of nodes closed to Node and remove it from SetOfNodes
+ * \note The Octree itself is also modified by this method
* \param Node - We're searching the nodes next to him.
* \param SetOfNodes - set of nodes in which we erase the found nodes
* \param Result - list of nodes closed to Node
* \param precision - Precision used
*/
//======================================================================================
-void SMESH_OctreeNode::FindCoincidentNodes( const SMDS_MeshNode * Node,
+void SMESH_OctreeNode::FindCoincidentNodes (const SMDS_MeshNode * Node,
set<const SMDS_MeshNode*>* SetOfNodes,
list<const SMDS_MeshNode*>* Result,
const double precision)
// I'm only looking in the leaves, since all the nodes are stored there.
if (myIsLeaf)
{
- gp_Pnt p1( Node->X(), Node->Y(), Node->Z() );
+ gp_Pnt p1 (Node->X(), Node->Y(), Node->Z());
set<const SMDS_MeshNode*> myNodesCopy = myNodes;
set<const SMDS_MeshNode*>::iterator it = myNodesCopy.begin();
{
const SMDS_MeshNode* n2 = *it;
// We're only looking at nodes with a superior Id.
- if(Node->GetID() < n2->GetID())
+ // JFA: Why?
+ //if (Node->GetID() < n2->GetID())
+ if (Node->GetID() != n2->GetID()) // JFA: for bug 0020185
{
- gp_Pnt p2( n2->X(), n2->Y(), n2->Z() );
+ gp_Pnt p2 (n2->X(), n2->Y(), n2->Z());
// Distance optimized computation
squareBool = (p1.SquareDistance( p2 ) <= tol2);
- // If n2 inside the SquareDistance, we add it in Result and remove it from SetOfNodes and myNodes
- if(squareBool)
+ // If n2 inside the SquareDistance, we add it in Result and remove it from SetOfNodes and myNodes
+ if (squareBool)
{
Result->insert(Result->begin(), n2);
SetOfNodes->erase( n2 );
myNodes.erase( n2 );
}
}
- myNodesCopy.erase( it );
- it = myNodesCopy.begin();
+ //myNodesCopy.erase( it );
+ //it = myNodesCopy.begin();
+ it++;
}
-
+ if (Result->size() > 0)
+ myNodes.erase(Node); // JFA: for bug 0020185
}
else
{
// If I'm not a leaf, I'm going to see my children !
- for(int i = 0; i < 8; i++)
+ for (int i = 0; i < 8; i++)
{
SMESH_OctreeNode* myChild = dynamic_cast<SMESH_OctreeNode*> (myChildren[i]);
- myChild->FindCoincidentNodes(Node, SetOfNodes, Result, precision);
+ myChild->FindCoincidentNodes(Node, SetOfNodes, Result, precision);
}
}
}
* \brief Return iterator over children
*/
//================================================================================
-
SMESH_OctreeNodeIteratorPtr SMESH_OctreeNode::GetChildrenIterator()
{
return SMESH_OctreeNodeIteratorPtr
* \brief Return nodes iterator
*/
//================================================================================
-
SMDS_NodeIteratorPtr SMESH_OctreeNode::GetNodeIterator()
{
return SMDS_NodeIteratorPtr
