From: jfa <jfa@opencascade.com>
Date: Fri, 22 Jan 2010 11:43:34 +0000 (+0000)
Subject: Mantis issue 0020662: MakeGlueFaces produces an invalid shape. A fix by PKV.
X-Git-Tag: PARAVIS_29012010~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5372961c3426846464ffd745d06f529b4962272e;p=modules%2Fgeom.git

Mantis issue 0020662: MakeGlueFaces produces an invalid shape. A fix by PKV.
---

diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx
index 800021259..bc68b3729 100755
--- a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx
+++ b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx
@@ -19,10 +19,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// File:        GEOMAlgo_Gluer.cxx
-// Created:     Sat Dec 04 12:45:53 2004
-// Author:      Peter KURNEV
-//              <peter@PREFEX>
+// File:	GEOMAlgo_Gluer.cxx
+// Created:	Sat Dec 04 12:45:53 2004
+// Author:	Peter KURNEV
+//		<peter@PREFEX>
 //
 #include <GEOMAlgo_Gluer.ixx>
 
@@ -87,10 +87,15 @@
 #include <GEOMAlgo_PassKeyShape.hxx>
 #include <GEOMAlgo_Tools.hxx>
 //
-
+//modified by NIZNHY-PKV Thu Jan 21 10:02:52 2010f
+#include <NMTDS_BndSphereTree.hxx>
+#include <NMTDS_BndSphere.hxx>
+#include <NMTDS_IndexedDataMapOfShapeBndSphere.hxx>
+//modified by NIZNHY-PKV Thu Jan 21 10:02:56 2010t
+//
 static 
   void GetSubShapes(const TopoDS_Shape& aS,
-                    TopTools_IndexedMapOfShape& aMSS);
+		    TopTools_IndexedMapOfShape& aMSS);
 
 //=======================================================================
 //function : GEOMAlgo_Gluer
@@ -138,6 +143,14 @@ void GEOMAlgo_Gluer::SetKeepNonSolids(const Standard_Boolean aFlag)
   myKeepNonSolids=aFlag;
 }
 //=======================================================================
+//function : KeepNonSolids
+//purpose  : 
+//=======================================================================
+//Standard_Boolean GEOMAlgo_Gluer::KeepNonSolids()const 
+//{
+//  return myKeepNonSolids;
+//}
+//=======================================================================
 //function : AloneShapes
 //purpose  : 
 //=======================================================================
@@ -186,6 +199,7 @@ void GEOMAlgo_Gluer::Perform()
     }
   }
 }
+
 //=======================================================================
 //function : MakeVertices
 //purpose  : 
@@ -195,6 +209,8 @@ void GEOMAlgo_Gluer::MakeVertices()
   myErrorStatus=0;
   //
   Standard_Integer j, i, aNbV, aNbVSD;
+  Standard_Real aTolV;
+  gp_Pnt aPV;
   TColStd_ListIteratorOfListOfInteger aIt;
   TopoDS_Shape aVF;
   TopoDS_Vertex aVnew;
@@ -203,12 +219,14 @@ void GEOMAlgo_Gluer::MakeVertices()
   TopTools_DataMapIteratorOfDataMapOfShapeListOfShape aItIm;
   TopTools_DataMapOfShapeListOfShape aMVV;
   GEOMAlgo_IndexedDataMapOfIntegerShape aMIS;
-  GEOMAlgo_IndexedDataMapOfShapeBox aMSB;
-  //
-  NMTDS_BoxBndTreeSelector aSelector;
-  NMTDS_BoxBndTree aBBTree;
-  NCollection_UBTreeFiller <Standard_Integer, Bnd_Box> aTreeFiller(aBBTree);
+  //modified by NIZNHY-PKV Thu Jan 21 10:03:07 2010f
+  //GEOMAlgo_IndexedDataMapOfShapeBox aMSB;
+  NMTDS_IndexedDataMapOfShapeBndSphere aMSB;
+  //modified by NIZNHY-PKV Thu Jan 21 10:03:10 2010t
   //
+  NMTDS_BndSphereTreeSelector aSelector;
+  NMTDS_BndSphereTree aBBTree;
+  NCollection_UBTreeFiller <Standard_Integer, NMTDS_BndSphere> aTreeFiller(aBBTree);
   //
   TopExp::MapShapes(myShape, TopAbs_VERTEX, aMV);
   aNbV=aMV.Extent();
@@ -218,11 +236,15 @@ void GEOMAlgo_Gluer::MakeVertices()
   }
   //
   for (i=1; i<=aNbV; ++i) {
-    const TopoDS_Shape& aV=aMV(i);
-    Bnd_Box aBox;
+    NMTDS_BndSphere aBox;
     //
-    aBox.SetGap(myTol); 
-    BRepBndLib::Add(aV, aBox);
+    const TopoDS_Vertex& aV=*((TopoDS_Vertex*)&aMV(i));
+    aPV=BRep_Tool::Pnt(aV);
+    aTolV=BRep_Tool::Tolerance(aV);
+    //
+    aBox.SetGap(myTol);
+    aBox.SetCenter(aPV);
+    aBox.SetRadius(aTolV);
     //
     aTreeFiller.Add(i, aBox);
     //
@@ -235,7 +257,7 @@ void GEOMAlgo_Gluer::MakeVertices()
   //------------------------------
   // Chains
   for (i=1; i<=aNbV; ++i) {
-    const TopoDS_Shape& aV=aMV(i);
+    const TopoDS_Vertex& aV=*((TopoDS_Vertex*)&aMV(i));
     //
     if (aMVProcessed.Contains(aV)) {
       continue;
@@ -251,49 +273,53 @@ void GEOMAlgo_Gluer::MakeVertices()
       aNbIP=aMIP.Extent();
       aIt1.Initialize(aMIP);
       for(; aIt1.More(); aIt1.Next()) {
-        aIP=aIt1.Key();
-        if (aMIPC.Contains(aIP)) {
-          continue;
-        }
-        //
-        const TopoDS_Shape& aVP=aMIS.FindFromKey(aIP);
-        const Bnd_Box& aBoxVP=aMSB.FindFromKey(aVP);
-        //
-        aSelector.Clear();
-        aSelector.SetBox(aBoxVP);
-        //
-        aNbVSD=aBBTree.Select(aSelector);
-        if (!aNbVSD) {
-          continue;  // it must not be 
-        }
-        //
-        const TColStd_ListOfInteger& aLI=aSelector.Indices();
-        aIt.Initialize(aLI);
-        for (; aIt.More(); aIt.Next()) {
-          aIP1=aIt.Value();
-          if (aMIP.Contains(aIP1)) {
-            continue;
-          }
-          aMIP1.Add(aIP1);
-        } //for (; aIt.More(); aIt.Next()) {
+	aIP=aIt1.Key();
+	if (aMIPC.Contains(aIP)) {
+	  continue;
+	}
+	//
+	const TopoDS_Shape& aVP=aMIS.FindFromKey(aIP);
+	//modified by NIZNHY-PKV Thu Jan 21 10:04:09 2010f
+	const NMTDS_BndSphere& aBoxVP=aMSB.FindFromKey(aVP);
+	//const Bnd_Box& aBoxVP=aMSB.FindFromKey(aVP);
+	//modified by NIZNHY-PKV Thu Jan 21 10:04:11 2010t
+	//
+	aSelector.Clear();
+	aSelector.SetBox(aBoxVP);
+	//
+	aNbVSD=aBBTree.Select(aSelector);
+	if (!aNbVSD) {
+	  continue;  // it must not be 
+	}
+	//
+	const TColStd_ListOfInteger& aLI=aSelector.Indices();
+	//
+	aIt.Initialize(aLI);
+	for (; aIt.More(); aIt.Next()) {
+	  aIP1=aIt.Value();
+	  if (aMIP.Contains(aIP1)) {
+	    continue;
+	  }
+	  aMIP1.Add(aIP1);
+	} //for (; aIt.More(); aIt.Next()) {
       }//for(; aIt1.More(); aIt1.Next()) {
       //
       aNbIP1=aMIP1.Extent();
       if (!aNbIP1) {
-        break;
+	break;
       }
       //
       aIt1.Initialize(aMIP);
       for(; aIt1.More(); aIt1.Next()) {
-        aIP=aIt1.Key();
-        aMIPC.Add(aIP);
+	aIP=aIt1.Key();
+	aMIPC.Add(aIP);
       }
       //
       aMIP.Clear();
       aIt1.Initialize(aMIP1);
       for(; aIt1.More(); aIt1.Next()) {
-        aIP=aIt1.Key();
-        aMIP.Add(aIP);
+	aIP=aIt1.Key();
+	aMIP.Add(aIP);
       }
       aMIP1.Clear();
     }// while(1)
@@ -309,13 +335,13 @@ void GEOMAlgo_Gluer::MakeVertices()
     else { // SD vertices founded [ aMIPC ]
       aIt1.Initialize(aMIPC);
       for(j=0; aIt1.More(); aIt1.Next(), ++j) {
-        aIP=aIt1.Key();
-        const TopoDS_Shape& aVP=aMIS.FindFromKey(aIP);
-        if (!j) {
-          aVF=aVP;
-        }
-        aLVSD.Append(aVP);
-        aMVProcessed.Add(aVP);
+	aIP=aIt1.Key();
+	const TopoDS_Shape& aVP=aMIS.FindFromKey(aIP);
+	if (!j) {
+	  aVF=aVP;
+	}
+	aLVSD.Append(aVP);
+	aMVProcessed.Add(aVP);
       }
     }
     myImages.Bind(aVF, aLVSD);
@@ -326,7 +352,7 @@ void GEOMAlgo_Gluer::MakeVertices()
   aMV.Clear();
   aItIm.Initialize(myImages);
   for (; aItIm.More(); aItIm.Next()) {
-    const TopoDS_Shape& aV=aItIm.Key();
+    const TopoDS_Vertex& aV=*((TopoDS_Vertex*)&aItIm.Key());
     const TopTools_ListOfShape& aLVSD=aItIm.Value();
     aNbVSD=aLVSD.Extent();
     if (aNbVSD>1) {
@@ -360,7 +386,7 @@ void GEOMAlgo_Gluer::MakeVertices()
     for (; aItS.More(); aItS.Next()) {
       const TopoDS_Shape& aVSD=aItS.Value();
       if (!myOrigins.IsBound(aVSD)) {
-        myOrigins.Bind(aVSD, aV);
+	myOrigins.Bind(aVSD, aV);
       }
     }
   }
@@ -381,16 +407,13 @@ void GEOMAlgo_Gluer::MakeSubShapes (const TopoDS_Shape&  theShape,
   theMS.Add(theShape);
   //
   if (theShape.ShapeType() == TopAbs_COMPOUND ||
-      theShape.ShapeType() == TopAbs_COMPSOLID)
-  {
+      theShape.ShapeType() == TopAbs_COMPSOLID)  {
     TopoDS_Iterator It (theShape, Standard_True, Standard_True);
-    for (; It.More(); It.Next())
-    {
+    for (; It.More(); It.Next())    {
       MakeSubShapes(It.Value(), theMS, theResult);
     }
   }
-  else if (theShape.ShapeType() == TopAbs_SOLID)
-  {
+  else if (theShape.ShapeType() == TopAbs_SOLID)  {
     // build a solid
     TopoDS_Solid aNewSolid;
     TopExp_Explorer aExpS, aExp;
@@ -418,13 +441,10 @@ void GEOMAlgo_Gluer::MakeSubShapes (const TopoDS_Shape&  theShape,
     //
     aBB.Add(theResult, aNewSolid);
   }
-  else if (theShape.ShapeType() == TopAbs_WIRE)
-  {
-    if (myKeepNonSolids)
-    {
+  else if (theShape.ShapeType() == TopAbs_WIRE)  {
+    if (myKeepNonSolids)    {
       // just add image
-      if (!myOrigins.IsBound(theShape))
-      {
+      if (!myOrigins.IsBound(theShape))   {
         // build wire
         const TopoDS_Wire& aW=TopoDS::Wire(theShape);
         //
@@ -469,8 +489,7 @@ void GEOMAlgo_Gluer::MakeSubShapes (const TopoDS_Shape&  theShape,
   }
   else
   {
-    if (myKeepNonSolids)
-    {
+    if (myKeepNonSolids)    {
       // just add image
       const TopoDS_Shape& aShapeR = myOrigins.Find(theShape);
       aBB.Add(theResult, aShapeR);
@@ -532,12 +551,12 @@ void GEOMAlgo_Gluer::MakeShells()
       const TopoDS_Face& aF=TopoDS::Face(aExp.Current());
       aFR=TopoDS::Face(myOrigins.Find(aF));
       if (aFR.IsSame(aF)) {
-        aBB.Add(aNewShell, aF);
-        continue;
+	aBB.Add(aNewShell, aF);
+	continue;
       }
       bIsToReverse=IsToReverse(aFR, aF);
       if (bIsToReverse) {
-        aFR.Reverse();
+	aFR.Reverse();
       }
       aBB.Add(aNewShell, aFR);
     }
@@ -638,25 +657,25 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType)
     if (aNbSDF==1) {
       bHasNewSubShape=HasNewSubShape(aS1);
       if (!bHasNewSubShape) {
-        aNewShape=aS1;
-        aNewShape.Orientation(TopAbs_FORWARD);
+	aNewShape=aS1;
+	aNewShape.Orientation(TopAbs_FORWARD);
       }
     }
     //
     if (bHasNewSubShape) { 
       if (aType==TopAbs_FACE) {
-        TopoDS_Face aNewFace;
-        //
-        const TopoDS_Face& aF1=TopoDS::Face(aS1);
-        MakeFace(aF1, aNewFace);
-        aNewShape=aNewFace;
+	TopoDS_Face aNewFace;
+	//
+	const TopoDS_Face& aF1=TopoDS::Face(aS1);
+	MakeFace(aF1, aNewFace);
+	aNewShape=aNewFace;
       }
       else if (aType==TopAbs_EDGE) {
-        TopoDS_Edge aNewEdge;
-        //
-        const TopoDS_Edge& aE1=TopoDS::Edge(aS1);
-        MakeEdge(aE1, aNewEdge);
-        aNewShape=aNewEdge;
+	TopoDS_Edge aNewEdge;
+	//
+	const TopoDS_Edge& aE1=TopoDS::Edge(aS1);
+	MakeEdge(aE1, aNewEdge);
+	aNewShape=aNewEdge;
       }
     }
     //
@@ -666,7 +685,7 @@ void GEOMAlgo_Gluer::MakeShapes(const TopAbs_ShapeEnum aType)
     for (; aItS.More(); aItS.Next()) {
       const TopoDS_Shape& aFSD=aItS.Value();
       if (!myOrigins.IsBound(aFSD)) {
-        myOrigins.Bind(aFSD, aNewShape);
+	myOrigins.Bind(aFSD, aNewShape);
       }
     }
   }
@@ -706,12 +725,12 @@ void GEOMAlgo_Gluer::CheckResult()
     for (j=1; j<=aNbFS; ++j) {
       const TopoDS_Shape& aFS=aMFS(j);
       if (aMFR.Contains(aFS)) {
-        const TopTools_ListOfShape& aLSx=aMFR.FindFromKey(aFS);
-        aNbSx=aLSx.Extent();
-        if (aNbSx==2) {
-          bFound=!bFound;
-          break;
-        }
+	const TopTools_ListOfShape& aLSx=aMFR.FindFromKey(aFS);
+	aNbSx=aLSx.Extent();
+	if (aNbSx==2) {
+	  bFound=!bFound;
+	  break;
+	}
       }
     }
     //
@@ -773,7 +792,7 @@ void GEOMAlgo_Gluer::InnerTolerance()
 //purpose  : 
 //=======================================================================
 void GEOMAlgo_Gluer::FacePassKey(const TopoDS_Face& aF, 
-                                 GEOMAlgo_PassKeyShape& aPK)
+				 GEOMAlgo_PassKeyShape& aPK)
 {
   Standard_Integer i, aNbE;
   TopTools_ListOfShape aLE;
@@ -798,7 +817,7 @@ void GEOMAlgo_Gluer::FacePassKey(const TopoDS_Face& aF,
 //purpose  : 
 //=======================================================================
 void GEOMAlgo_Gluer::EdgePassKey(const TopoDS_Edge& aE, 
-                                 GEOMAlgo_PassKeyShape& aPK)
+				 GEOMAlgo_PassKeyShape& aPK)
 {
   TopoDS_Vertex aV1, aV2;
   //
@@ -817,7 +836,7 @@ void GEOMAlgo_Gluer::EdgePassKey(const TopoDS_Edge& aE,
 //purpose  : 
 //=======================================================================
 void GEOMAlgo_Gluer::MakeVertex(const TopTools_ListOfShape& aLV, 
-                                TopoDS_Vertex& aNewVertex)
+				TopoDS_Vertex& aNewVertex)
 {
   Standard_Integer aNbV;
   Standard_Real aTolV, aD, aDmax;
@@ -863,7 +882,7 @@ void GEOMAlgo_Gluer::MakeVertex(const TopTools_ListOfShape& aLV,
 //purpose  : 
 //=======================================================================
 void GEOMAlgo_Gluer::MakeEdge(const TopoDS_Edge& aE, 
-                              TopoDS_Edge& aNewEdge)
+			      TopoDS_Edge& aNewEdge)
 {
   myErrorStatus=0;
   //
@@ -917,7 +936,7 @@ void GEOMAlgo_Gluer::MakeEdge(const TopoDS_Edge& aE,
 //purpose  : 
 //=======================================================================
 void GEOMAlgo_Gluer::MakeFace(const TopoDS_Face& aF, 
-                              TopoDS_Face& aNewFace)
+			      TopoDS_Face& aNewFace)
 {
   myErrorStatus=0;
   //
@@ -953,20 +972,20 @@ void GEOMAlgo_Gluer::MakeFace(const TopoDS_Face& aF,
       //
       aER.Orientation(TopAbs_FORWARD);
       if (!BRep_Tool::Degenerated(aER)) {
-        // build p-curve
-        if (bIsUPeriodic) {
-          GEOMAlgo_Tools::RefinePCurveForEdgeOnFace(aER, aFFWD, aUMin, aUMax);
-        }
-        BOPTools_Tools2D::BuildPCurveForEdgeOnFace(aER, aFFWD);
-        
-        // orient image 
-        bIsToReverse=BOPTools_Tools3D::IsSplitToReverse1(aER, aE, myContext);
-        if (bIsToReverse) {
-          aER.Reverse();
-        }
+	// build p-curve
+	if (bIsUPeriodic) {
+	  GEOMAlgo_Tools::RefinePCurveForEdgeOnFace(aER, aFFWD, aUMin, aUMax);
+	}
+	BOPTools_Tools2D::BuildPCurveForEdgeOnFace(aER, aFFWD);
+	
+	// orient image 
+	bIsToReverse=BOPTools_Tools3D::IsSplitToReverse1(aER, aE, myContext);
+	if (bIsToReverse) {
+	  aER.Reverse();
+	}
       }
       else {
-        aER.Orientation(aE.Orientation());
+	aER.Orientation(aE.Orientation());
       }
       //
       aBB.Add(newWire, aER);
@@ -987,7 +1006,7 @@ void GEOMAlgo_Gluer::MakeFace(const TopoDS_Face& aF,
 //purpose  : 
 //=======================================================================
 Standard_Boolean GEOMAlgo_Gluer::IsToReverse(const TopoDS_Face& aFR,
-                                             const TopoDS_Face& aF)
+					     const TopoDS_Face& aF)
 {
   Standard_Boolean bRet;
   Standard_Real aT, aT1, aT2, aTR, aScPr;
@@ -1066,7 +1085,7 @@ Standard_Boolean GEOMAlgo_Gluer::HasNewSubShape(const TopoDS_Shape& aS)const
 //purpose  : 
 //=======================================================================
 void GetSubShapes(const TopoDS_Shape& aS,
-                  TopTools_IndexedMapOfShape& aMSS)
+		  TopTools_IndexedMapOfShape& aMSS)
 {
   Standard_Integer aR;
   TopAbs_ShapeEnum aType;
@@ -1105,7 +1124,7 @@ const TopTools_ListOfShape& GEOMAlgo_Gluer::Modified (const TopoDS_Shape& aS)
     if(myOrigins.IsBound(aS)) {
       const TopoDS_Shape& aSnew=myOrigins.Find(aS);
       if (!aSnew.IsSame(aS)) {
-        myGenerated.Append(aSnew);
+	myGenerated.Append(aSnew);
       }
     }
   }
@@ -1134,6 +1153,7 @@ Standard_Boolean GEOMAlgo_Gluer::IsDeleted (const TopoDS_Shape& aS)
   //
   return bRet;
 }
+
 //
 // ErrorStatus
 //
diff --git a/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
new file mode 100644
index 000000000..05d7db7d2
--- /dev/null
+++ b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
@@ -0,0 +1,74 @@
+// File generated by CPPExt (Transient)
+//
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
+//
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
+#ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_HeaderFile
+#define _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_HeaderFile
+
+#ifndef _Standard_Macro_HeaderFile
+#include <Standard_Macro.hxx>
+#endif
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+
+#ifndef _Handle_TCollection_MapNode_HeaderFile
+#include <Handle_TCollection_MapNode.hxx>
+#endif
+
+class Standard_Transient;
+class Handle_Standard_Type;
+class Handle(TCollection_MapNode);
+class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere;
+Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere);
+
+class Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere) : public Handle(TCollection_MapNode) {
+  public:
+    Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere)():Handle(TCollection_MapNode)() {} 
+    Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere)(const Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere)& aHandle) : Handle(TCollection_MapNode)(aHandle) 
+     {
+     }
+
+    Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere)(const NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere* anItem) : Handle(TCollection_MapNode)((TCollection_MapNode *)anItem) 
+     {
+     }
+
+    Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere)& operator=(const Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere)& aHandle)
+     {
+      Assign(aHandle.Access());
+      return *this;
+     }
+
+    Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere)& operator=(const NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere* anItem)
+     {
+      Assign((Standard_Transient *)anItem);
+      return *this;
+     }
+
+    NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere* operator->() const
+     {
+      return (NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere *)ControlAccess();
+     }
+
+//   Standard_EXPORT ~Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere)();
+ 
+   Standard_EXPORT static const Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere) DownCast(const Handle(Standard_Transient)& AnObject);
+};
+#endif
diff --git a/src/NMTDS/Makefile.am b/src/NMTDS/Makefile.am
index f2dcd7560..51e39d1b1 100644
--- a/src/NMTDS/Makefile.am
+++ b/src/NMTDS/Makefile.am
@@ -39,6 +39,7 @@ salomeinclude_HEADERS = \
 	Handle_NMTDS_ListNodeOfListOfPassKey.hxx \
 	Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx \
 	Handle_NMTDS_StdMapNodeOfMapOfPassKey.hxx \
+	Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx \
 	NMTDS_CArray1OfIndexRange.hxx \
 	NMTDS_DataMapIteratorOfDataMapOfIntegerMapOfInteger.hxx \
 	NMTDS_DataMapNodeOfDataMapOfIntegerMapOfInteger.hxx \
@@ -49,6 +50,8 @@ salomeinclude_HEADERS = \
 	NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx \
 	NMTDS_IndexedDataMapOfIntegerShape.hxx \
 	NMTDS_IndexedDataMapOfShapeBox.hxx \
+	NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx \
+	NMTDS_IndexedDataMapOfShapeBndSphere.hxx \
 	NMTDS_IndexRange.hxx \
 	NMTDS_IndexRange.ixx \
 	NMTDS_IndexRange.jxx \
@@ -101,6 +104,11 @@ salomeinclude_HEADERS = \
 	NMTDS_Tools.hxx \
 	NMTDS_Tools.ixx \
 	NMTDS_Tools.jxx \
+	NMTDS_BndSphere.hxx \
+	NMTDS_BndSphere.ixx \
+	NMTDS_BndSphere.jxx \
+	NMTDS_BndSphere.lxx \
+	NMTDS_BndSphereTree.hxx \
 	NMTDS_BoxBndTree.hxx
 
 # Libraries targets
@@ -117,6 +125,8 @@ dist_libNMTDS_la_SOURCES = \
 	NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx \
 	NMTDS_IndexedDataMapOfIntegerShape_0.cxx  \
 	NMTDS_IndexedDataMapOfShapeBox_0.cxx \
+	NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_0.cxx \
+	NMTDS_IndexedDataMapOfShapeBndSphere_0.cxx \
 	NMTDS_IndexRange.cxx \
 	NMTDS_InterfPool.cxx \
 	NMTDS_Iterator.cxx \
@@ -143,6 +153,8 @@ dist_libNMTDS_la_SOURCES = \
 	NMTDS_StdMapNodeOfMapOfPassKey_0.cxx \
 	NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx \
 	NMTDS_Tools.cxx \
+	NMTDS_BndSphere.cxx \
+	NMTDS_BndSphereTree.cxx \
 	NMTDS_BoxBndTree.cxx
 
 # additional information to compile and link file
@@ -158,6 +170,7 @@ libNMTDS_la_LDFLAGS  =		\
 # extra dist files
 CDL_FILES =				\
 	NMTDS.cdl			\
+	NMTDS_BndSphere.cdl		\
 	NMTDS_IndexRange.cdl		\
 	NMTDS_InterfPool.cdl		\
 	NMTDS_Iterator.cdl		\
diff --git a/src/NMTDS/NMTDS.cdl b/src/NMTDS/NMTDS.cdl
index bcee78278..74f5b61b5 100644
--- a/src/NMTDS/NMTDS.cdl
+++ b/src/NMTDS/NMTDS.cdl
@@ -30,6 +30,7 @@ package NMTDS
 uses   
     TCollection, 
     TColStd,
+    gp,
     Bnd,
     TopoDS, 
     TopAbs, 
@@ -52,21 +53,20 @@ is
     class ShapesDataStructure;
     class IndexRange;   
     
-    -- Modified to Add new classes Thu Sep 14 14:35:18 2006 
-    -- Contribution of Samtech www.samcef.com BEGIN 
     class Iterator; 
     
     class PassKey; 
     class PassKeyBoolean; 
     class PassKeyMapHasher; 
-    -- Contribution of Samtech www.samcef.com END  
     class PassKeyShape; 
     class PassKeyShapeMapHasher; 
-    --modified by NIZNHY-PKV Tue Feb  6 10:40:02 2007f 
     class IteratorCheckerSI; 
     class Tools; 
     class InterfPool; 
-    --modified by NIZNHY-PKV Tue Feb  6 10:40:04 2007t 
+    --modified by NIZNHY-PKV Thu Jan 21 09:46:48 2010f 
+    class BndSphere;
+    --modified by NIZNHY-PKV Thu Jan 21 09:46:53 2010t 
+    --     
     pointer PShapesDataStructure to ShapesDataStructure from NMTDS;
     pointer PIterator to Iterator from NMTDS;
     pointer PInterfPool to InterfPool from NMTDS;
@@ -82,8 +82,6 @@ is
 	    	    	    	    	IndexedDataMapOfShapeInteger from BooleanOperations, 
 					MapIntegerHasher from TColStd); 
     
-    -- Modified to Add new classes Thu Sep 14 14:35:18 2006 
-    -- Contribution of Samtech www.samcef.com BEGIN 
     class ListOfPassKey  instantiates 
 	List from TCollection(PassKey from NMTDS);  
      
@@ -97,9 +95,7 @@ is
     class MapOfPassKeyBoolean instantiates
     	Map from TCollection(PassKeyBoolean from NMTDS, 
     	    	    	     PassKeyMapHasher from NMTDS);   
-    -- Contribution of Samtech www.samcef.com END
 
---modified by NIZNHY-PKV Tue Oct 10 11:19:06 2006f 
     class IndexedDataMapOfShapeBox  
     	instantiates IndexedDataMap from TCollection   	(Shape from TopoDS,
 	    		    		         	 Box from Bnd,
@@ -113,7 +109,12 @@ is
     	instantiates DataMap from TCollection           (Integer from Standard, 
 	    	    	    	    	    	    	 MapOfInteger from TColStd, 
 							 MapIntegerHasher from TColStd); 
-
---modified by NIZNHY-PKV Tue Oct 10 11:19:08 2006t
- 
+    
+    --modified by NIZNHY-PKV Thu Jan 21 09:47:13 2010f 
+    class IndexedDataMapOfShapeBndSphere  
+    	instantiates IndexedDataMap from TCollection(Shape from TopoDS,
+	    		    		             BndSphere from NMTDS,
+    	    		    		             ShapeMapHasher from TopTools);
+    --modified by NIZNHY-PKV Thu Jan 21 09:47:26 2010 
+    
 end NMTDS;
diff --git a/src/NMTDS/NMTDS_BndSphere.cdl b/src/NMTDS/NMTDS_BndSphere.cdl
new file mode 100644
index 000000000..d644437fe
--- /dev/null
+++ b/src/NMTDS/NMTDS_BndSphere.cdl
@@ -0,0 +1,81 @@
+--  Copyright (C) 2007-2008  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
+--
+--  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.
+--
+--  This library is distributed in the hope that it will be useful,
+--  but WITHOUT ANY WARRANTY; without even the implied warranty of
+--  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+--  Lesser General Public License for more details.
+--
+--  You should have received a copy of the GNU Lesser General Public
+--  License along with this library; if not, write to the Free Software
+--  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+--
+--  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+-- 
+-- File:	NMTDS_BndSphere.cdl
+-- Created:	
+-- Author:	Peter KURNEV
+--		<pkv@irinox>
+
+
+class BndSphere from NMTDS 
+
+	---Purpose: 
+
+uses
+    Pnt from gp
+
+is 
+    Create 
+    	returns BndSphere from NMTDS; 
+    ---C++: alias "Standard_EXPORT virtual ~NMTDS_BndSphere();"  
+     
+    SetCenter(me:out; 
+    	    theP:Pnt from gp); 
+    ---C++: inline 
+     
+    Center(me) 
+    	returns Pnt from gp; 
+    ---C++:return const& 	
+    ---C++: inline 
+     
+    SetRadius(me:out; 
+    	    theR:Real from Standard);     
+    ---C++: inline 
+    
+    Radius(me) 
+    	returns Real from Standard; 
+    ---C++: inline 
+     
+    SetGap(me:out; 
+    	    theGap:Real from Standard);     
+    ---C++: inline
+
+    Gap(me) 
+    	returns Real from Standard; 
+    ---C++: inline
+
+    Add(me:out;  
+    	    theOther: BndSphere from NMTDS); 
+    ---C++: inline	     
+
+    IsOut(me;  
+    	    theOther: BndSphere from NMTDS)  
+    	returns Boolean from Standard;  
+
+    SquareExtent(me)  
+    	returns Real from Standard;
+    ---C++: inline
+fields 
+    myCenter: Pnt from gp is protected;   
+    myRadius: Real from Standard is protected;   
+    myGap   : Real from Standard is protected;   
+
+end BndSphere;
diff --git a/src/NMTDS/NMTDS_BndSphere.cxx b/src/NMTDS/NMTDS_BndSphere.cxx
new file mode 100644
index 000000000..17fb79601
--- /dev/null
+++ b/src/NMTDS/NMTDS_BndSphere.cxx
@@ -0,0 +1,60 @@
+//  Copyright (C) 2007-2008  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
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_BndSphere.cxx
+// Created:	
+// Author:	Peter KURNEV
+//		<pkv@irinox>
+
+
+#include <NMTDS_BndSphere.ixx>
+
+//=======================================================================
+//function : 
+//purpose  : 
+//=======================================================================
+  NMTDS_BndSphere::NMTDS_BndSphere()
+{
+  myCenter.SetCoord(0., 0., 0.);
+  myRadius=0.;
+  myGap=0.;
+}
+//=======================================================================
+//function : ~
+//purpose  : 
+//=======================================================================
+  NMTDS_BndSphere::~NMTDS_BndSphere()
+{
+}
+//=======================================================================
+//function : IsOut
+//purpose  : 
+//=======================================================================
+  Standard_Boolean NMTDS_BndSphere::IsOut(const NMTDS_BndSphere& theOther)const
+{
+  Standard_Real aD2, aT2;
+  //
+  aD2=myCenter.SquareDistance(theOther.myCenter);
+  aT2=myRadius+myGap+theOther.myRadius+theOther.myGap;
+  aT2=aT2*aT2;
+  //
+  return aD2>aT2;
+}
diff --git a/src/NMTDS/NMTDS_BndSphere.hxx b/src/NMTDS/NMTDS_BndSphere.hxx
new file mode 100644
index 000000000..a873c14d0
--- /dev/null
+++ b/src/NMTDS/NMTDS_BndSphere.hxx
@@ -0,0 +1,125 @@
+// File generated by CPPExt (Value)
+//
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
+//
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
+#ifndef _NMTDS_BndSphere_HeaderFile
+#define _NMTDS_BndSphere_HeaderFile
+
+#ifndef _gp_Pnt_HeaderFile
+#include <gp_Pnt.hxx>
+#endif
+#ifndef _Standard_Real_HeaderFile
+#include <Standard_Real.hxx>
+#endif
+#ifndef _Standard_Boolean_HeaderFile
+#include <Standard_Boolean.hxx>
+#endif
+class gp_Pnt;
+
+
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+#ifndef _Standard_Macro_HeaderFile
+#include <Standard_Macro.hxx>
+#endif
+
+
+class NMTDS_BndSphere  {
+
+public:
+
+    void* operator new(size_t,void* anAddress) 
+      {
+        return anAddress;
+      }
+    void* operator new(size_t size) 
+      { 
+        return Standard::Allocate(size); 
+      }
+    void  operator delete(void *anAddress) 
+      { 
+        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+      }
+ // Methods PUBLIC
+ // 
+
+
+Standard_EXPORT NMTDS_BndSphere();
+Standard_EXPORT virtual ~NMTDS_BndSphere();
+
+  void SetCenter(const gp_Pnt& theP) ;
+
+ const gp_Pnt& Center() const;
+
+  void SetRadius(const Standard_Real theR) ;
+
+  Standard_Real Radius() const;
+
+  void SetGap(const Standard_Real theGap) ;
+
+  Standard_Real Gap() const;
+
+  void Add(const NMTDS_BndSphere& theOther) ;
+
+
+Standard_EXPORT   Standard_Boolean IsOut(const NMTDS_BndSphere& theOther) const;
+
+  Standard_Real SquareExtent() const;
+
+
+
+
+
+protected:
+
+ // Methods PROTECTED
+ // 
+
+
+ // Fields PROTECTED
+ //
+gp_Pnt myCenter;
+Standard_Real myRadius;
+Standard_Real myGap;
+
+
+private: 
+
+ // Methods PRIVATE
+ // 
+
+
+ // Fields PRIVATE
+ //
+
+
+};
+
+
+#include <NMTDS_BndSphere.lxx>
+
+
+
+// other Inline functions and methods (like "C++: function call" methods)
+//
+
+
+#endif
diff --git a/src/NMTDS/NMTDS_BndSphere.ixx b/src/NMTDS/NMTDS_BndSphere.ixx
new file mode 100644
index 000000000..9925b37d9
--- /dev/null
+++ b/src/NMTDS/NMTDS_BndSphere.ixx
@@ -0,0 +1,26 @@
+// File generated by CPPExt (Value)
+//
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
+//
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
+#include <NMTDS_BndSphere.jxx>
+
+ 
+
+
diff --git a/src/NMTDS/NMTDS_BndSphere.jxx b/src/NMTDS/NMTDS_BndSphere.jxx
new file mode 100644
index 000000000..e1ee36054
--- /dev/null
+++ b/src/NMTDS/NMTDS_BndSphere.jxx
@@ -0,0 +1,6 @@
+#ifndef _gp_Pnt_HeaderFile
+#include <gp_Pnt.hxx>
+#endif
+#ifndef _NMTDS_BndSphere_HeaderFile
+#include <NMTDS_BndSphere.hxx>
+#endif
diff --git a/src/NMTDS/NMTDS_BndSphere.lxx b/src/NMTDS/NMTDS_BndSphere.lxx
new file mode 100644
index 000000000..c0c8c950c
--- /dev/null
+++ b/src/NMTDS/NMTDS_BndSphere.lxx
@@ -0,0 +1,111 @@
+//  Copyright (C) 2007-2008  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
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_BndSphere.lxx
+// Created:	
+// Author:	Peter KURNEV
+//		<pkv@irinox>
+
+
+//=======================================================================
+//function : SetCenter
+//purpose  : 
+//=======================================================================
+  inline void NMTDS_BndSphere::SetCenter(const gp_Pnt& theP)
+{
+  myCenter=theP;
+}
+//=======================================================================
+//function : Center
+//purpose  : 
+//=======================================================================
+  inline const gp_Pnt& NMTDS_BndSphere::Center()const
+{
+  return myCenter;
+}
+//=======================================================================
+//function : SetRadius
+//purpose  : 
+//=======================================================================
+  inline void NMTDS_BndSphere::SetRadius(const Standard_Real theR)
+{
+  myRadius=theR;
+}
+//=======================================================================
+//function : Radius
+//purpose  : 
+//=======================================================================
+  inline Standard_Real NMTDS_BndSphere::Radius()const
+{
+  return myRadius;
+}
+//=======================================================================
+//function : SetGap
+//purpose  : 
+//=======================================================================
+  inline void NMTDS_BndSphere::SetGap(const Standard_Real theGap)
+{
+  myGap=theGap;
+}
+//=======================================================================
+//function : Gap
+//purpose  : 
+//=======================================================================
+  inline Standard_Real NMTDS_BndSphere::Gap()const
+{
+  return myGap;
+}
+//=======================================================================
+//function : Add
+//purpose  : 
+//=======================================================================
+  inline void NMTDS_BndSphere::Add(const NMTDS_BndSphere& theOther)
+{
+  Standard_Real aTmax, aR, aT, aTOther;
+  gp_Pnt aPc;
+  //
+  aPc.SetXYZ(0.5*(myCenter.XYZ()+theOther.myCenter.XYZ()));
+  //
+  aR=aPc.Distance(myCenter);
+  //
+  aT=myRadius+myGap;
+  aTOther=theOther.myRadius+theOther.myGap;
+  aTmax=(aT>aTOther) ? aT: aTOther;
+  //
+  aR=aR+aTmax;
+  //
+  myCenter=aPc;
+  myRadius=aR;
+}
+//=======================================================================
+//function : SquareExtent
+//purpose  : 
+//=======================================================================
+  inline Standard_Real NMTDS_BndSphere::SquareExtent()const
+{
+  Standard_Real aD;
+  //
+  aD=myRadius+myGap;
+  aD=aD+aD;
+  aD=aD*aD;
+  //
+  return aD;
+}
diff --git a/src/NMTDS/NMTDS_BndSphereTree.cxx b/src/NMTDS/NMTDS_BndSphereTree.cxx
new file mode 100644
index 000000000..58ed299a8
--- /dev/null
+++ b/src/NMTDS/NMTDS_BndSphereTree.cxx
@@ -0,0 +1,91 @@
+//  Copyright (C) 2007-2008  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
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_BndSphereTree.cxx
+// Created:	
+// Author:	Peter KURNEV
+//		<pkv@irinox>
+//
+#include <NMTDS_BndSphereTree.hxx>
+//=======================================================================
+//function : 
+//purpose  : 
+//=======================================================================
+  NMTDS_BndSphereTreeSelector::NMTDS_BndSphereTreeSelector()
+{
+}
+//=======================================================================
+//function : ~
+//purpose  : 
+//=======================================================================
+  NMTDS_BndSphereTreeSelector::~NMTDS_BndSphereTreeSelector()
+{
+}
+//=======================================================================
+//function : Reject
+//purpose  : 
+//=======================================================================
+  Standard_Boolean NMTDS_BndSphereTreeSelector::Reject (const NMTDS_BndSphere& aBox) const
+{
+  Standard_Boolean bRet;
+  //
+  bRet=myBox.IsOut(aBox);
+  return bRet;
+}
+//=======================================================================
+//function : Accept
+//purpose  : 
+//=======================================================================
+  Standard_Boolean NMTDS_BndSphereTreeSelector::Accept (const Standard_Integer& aIndex)
+{
+  Standard_Boolean bRet=Standard_False;
+  //
+  if (myFence.Add(aIndex)) {
+    myIndices.Append(aIndex);
+    bRet=!bRet;
+  }
+  return bRet;
+}
+//=======================================================================
+//function : SetBox
+//purpose  : 
+//=======================================================================
+  void NMTDS_BndSphereTreeSelector::SetBox(const NMTDS_BndSphere& aBox)
+{
+  myBox=aBox;
+}
+//=======================================================================
+//function : Clear
+//purpose  : 
+//=======================================================================
+  void NMTDS_BndSphereTreeSelector::Clear()
+{
+  myFence.Clear();
+  myIndices.Clear();
+}
+//=======================================================================
+//function : Indices
+//purpose  : 
+//=======================================================================
+  const TColStd_ListOfInteger& NMTDS_BndSphereTreeSelector::Indices() const
+{
+  return myIndices;
+}
diff --git a/src/NMTDS/NMTDS_BndSphereTree.hxx b/src/NMTDS/NMTDS_BndSphereTree.hxx
new file mode 100644
index 000000000..ee107c0c2
--- /dev/null
+++ b/src/NMTDS/NMTDS_BndSphereTree.hxx
@@ -0,0 +1,55 @@
+//  Copyright (C) 2007-2008  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
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+// File:	NMTDS_BndSphereTree.hxx
+// Created:	
+// Author:	Peter KURNEV
+//		<pkv@irinox>
+//
+#ifndef NMTDS_BndSphereTree_HeaderFile
+#define NMTDS_BndSphereTree_HeaderFile
+
+#include <NCollection_UBTree.hxx>
+#include <NMTDS_BndSphere.hxx>
+#include <TColStd_MapOfInteger.hxx>
+#include <TColStd_ListOfInteger.hxx>
+
+typedef NCollection_UBTree <Standard_Integer , NMTDS_BndSphere> NMTDS_BndSphereTree;
+
+  class NMTDS_BndSphereTreeSelector : public NMTDS_BndSphereTree::Selector {
+    public:
+      Standard_EXPORT NMTDS_BndSphereTreeSelector();
+      Standard_EXPORT virtual Standard_Boolean Reject(const NMTDS_BndSphere&) const;
+      Standard_EXPORT virtual Standard_Boolean Accept(const Standard_Integer &);
+      Standard_EXPORT virtual ~NMTDS_BndSphereTreeSelector();
+      
+      Standard_EXPORT void Clear();
+      Standard_EXPORT void SetBox(const NMTDS_BndSphere&);
+      Standard_EXPORT const TColStd_ListOfInteger& Indices() const;
+
+    protected:
+      NMTDS_BndSphere  myBox;
+      TColStd_MapOfInteger  myFence;
+      TColStd_ListOfInteger myIndices;
+      
+  };
+
+#endif
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
new file mode 100644
index 000000000..713e28208
--- /dev/null
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx
@@ -0,0 +1,139 @@
+// File generated by CPPExt (Transient)
+//
+//
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
+//
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
+#ifndef _NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_HeaderFile
+#define _NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_HeaderFile
+
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+#ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_HeaderFile
+#include <Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx>
+#endif
+
+#ifndef _TopoDS_Shape_HeaderFile
+#include <TopoDS_Shape.hxx>
+#endif
+#ifndef _Standard_Integer_HeaderFile
+#include <Standard_Integer.hxx>
+#endif
+#ifndef _NMTDS_BndSphere_HeaderFile
+#include <NMTDS_BndSphere.hxx>
+#endif
+#ifndef _TCollection_MapNodePtr_HeaderFile
+#include <TCollection_MapNodePtr.hxx>
+#endif
+#ifndef _TCollection_MapNode_HeaderFile
+#include <TCollection_MapNode.hxx>
+#endif
+class TopoDS_Shape;
+class NMTDS_BndSphere;
+class TopTools_ShapeMapHasher;
+class NMTDS_IndexedDataMapOfShapeBndSphere;
+
+
+
+class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere : public TCollection_MapNode {
+
+public:
+ // Methods PUBLIC
+ // 
+
+NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere(const TopoDS_Shape& K1,const Standard_Integer K2,const NMTDS_BndSphere& I,const TCollection_MapNodePtr& n1,const TCollection_MapNodePtr& n2);
+
+  TopoDS_Shape& Key1() const;
+
+  Standard_Integer& Key2() const;
+
+  TCollection_MapNodePtr& Next2() const;
+
+  NMTDS_BndSphere& Value() const;
+//Standard_EXPORT ~NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere();
+
+
+
+
+ // Type management
+ //
+ Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
+ //Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
+
+protected:
+
+ // Methods PROTECTED
+ // 
+
+
+ // Fields PROTECTED
+ //
+
+
+private: 
+
+ // Methods PRIVATE
+ // 
+
+
+ // Fields PRIVATE
+ //
+TopoDS_Shape myKey1;
+Standard_Integer myKey2;
+NMTDS_BndSphere myValue;
+TCollection_MapNodePtr myNext2;
+
+
+};
+
+#define TheKey TopoDS_Shape
+#define TheKey_hxx <TopoDS_Shape.hxx>
+#define TheItem NMTDS_BndSphere
+#define TheItem_hxx <NMTDS_BndSphere.hxx>
+#define Hasher TopTools_ShapeMapHasher
+#define Hasher_hxx <TopTools_ShapeMapHasher.hxx>
+#define TCollection_IndexedDataMapNode NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere
+#define TCollection_IndexedDataMapNode_hxx <NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx>
+#define Handle_TCollection_IndexedDataMapNode Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere
+#define TCollection_IndexedDataMapNode_Type_() NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_Type_()
+#define TCollection_IndexedDataMap NMTDS_IndexedDataMapOfShapeBndSphere
+#define TCollection_IndexedDataMap_hxx <NMTDS_IndexedDataMapOfShapeBndSphere.hxx>
+
+#include <TCollection_IndexedDataMapNode.lxx>
+
+#undef TheKey
+#undef TheKey_hxx
+#undef TheItem
+#undef TheItem_hxx
+#undef Hasher
+#undef Hasher_hxx
+#undef TCollection_IndexedDataMapNode
+#undef TCollection_IndexedDataMapNode_hxx
+#undef Handle_TCollection_IndexedDataMapNode
+#undef TCollection_IndexedDataMapNode_Type_
+#undef TCollection_IndexedDataMap
+#undef TCollection_IndexedDataMap_hxx
+
+
+// other Inline functions and methods (like "C++: function call" methods)
+//
+
+
+#endif
diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_0.cxx
new file mode 100644
index 000000000..7ad94264b
--- /dev/null
+++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_0.cxx
@@ -0,0 +1,100 @@
+// File generated by CPPExt (Transient)
+//
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
+//
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
+#include <NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx>
+
+#ifndef _Standard_TypeMismatch_HeaderFile
+#include <Standard_TypeMismatch.hxx>
+#endif
+
+#ifndef _TopoDS_Shape_HeaderFile
+#include <TopoDS_Shape.hxx>
+#endif
+#ifndef _NMTDS_BndSphere_HeaderFile
+#include <NMTDS_BndSphere.hxx>
+#endif
+#ifndef _TopTools_ShapeMapHasher_HeaderFile
+#include <TopTools_ShapeMapHasher.hxx>
+#endif
+#ifndef _NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
+#include <NMTDS_IndexedDataMapOfShapeBndSphere.hxx>
+#endif
+//NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere::~NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere() {}
+ 
+
+
+Standard_EXPORT Handle_Standard_Type& NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_Type_()
+{
+
+    static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
+  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
+  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
+ 
+
+  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
+  static Handle_Standard_Type _aType = new Standard_Type("NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere",
+			                                 sizeof(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere),
+			                                 1,
+			                                 (Standard_Address)_Ancestors,
+			                                 (Standard_Address)NULL);
+
+  return _aType;
+}
+
+
+// DownCast method
+//   allow safe downcasting
+//
+const Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere) Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere)::DownCast(const Handle(Standard_Transient)& AnObject) 
+{
+  Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere) _anOtherObject;
+
+  if (!AnObject.IsNull()) {
+     if (AnObject->IsKind(STANDARD_TYPE(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere))) {
+       _anOtherObject = Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere)((Handle(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere)&)AnObject);
+     }
+  }
+
+  return _anOtherObject ;
+}
+const Handle(Standard_Type)& NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere::DynamicType() const 
+{ 
+  return STANDARD_TYPE(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere) ; 
+}
+//Standard_Boolean NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere::IsKind(const Handle(Standard_Type)& AType) const 
+//{ 
+//  return (STANDARD_TYPE(NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere) == AType || TCollection_MapNode::IsKind(AType)); 
+//}
+//Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere::~Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere() {}
+#define TheKey TopoDS_Shape
+#define TheKey_hxx <TopoDS_Shape.hxx>
+#define TheItem NMTDS_BndSphere
+#define TheItem_hxx <NMTDS_BndSphere.hxx>
+#define Hasher TopTools_ShapeMapHasher
+#define Hasher_hxx <TopTools_ShapeMapHasher.hxx>
+#define TCollection_IndexedDataMapNode NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere
+#define TCollection_IndexedDataMapNode_hxx <NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx>
+#define Handle_TCollection_IndexedDataMapNode Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere
+#define TCollection_IndexedDataMapNode_Type_() NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_Type_()
+#define TCollection_IndexedDataMap NMTDS_IndexedDataMapOfShapeBndSphere
+#define TCollection_IndexedDataMap_hxx <NMTDS_IndexedDataMapOfShapeBndSphere.hxx>
+#include <TCollection_IndexedDataMapNode.gxx>
+
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
new file mode 100644
index 000000000..fb62c36ec
--- /dev/null
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere.hxx
@@ -0,0 +1,172 @@
+// File generated by CPPExt (Value)
+//
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
+//
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
+#ifndef _NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
+#define _NMTDS_IndexedDataMapOfShapeBndSphere_HeaderFile
+
+#ifndef _TCollection_BasicMap_HeaderFile
+#include <TCollection_BasicMap.hxx>
+#endif
+#ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_HeaderFile
+#include <Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx>
+#endif
+#ifndef _Standard_Integer_HeaderFile
+#include <Standard_Integer.hxx>
+#endif
+#ifndef _Standard_Boolean_HeaderFile
+#include <Standard_Boolean.hxx>
+#endif
+class Standard_DomainError;
+class Standard_OutOfRange;
+class Standard_NoSuchObject;
+class TopoDS_Shape;
+class NMTDS_BndSphere;
+class TopTools_ShapeMapHasher;
+class NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere;
+
+
+#ifndef _Standard_HeaderFile
+#include <Standard.hxx>
+#endif
+#ifndef _Standard_Macro_HeaderFile
+#include <Standard_Macro.hxx>
+#endif
+
+
+class NMTDS_IndexedDataMapOfShapeBndSphere  : public TCollection_BasicMap {
+
+public:
+
+    void* operator new(size_t,void* anAddress) 
+      {
+        return anAddress;
+      }
+    void* operator new(size_t size) 
+      { 
+        return Standard::Allocate(size); 
+      }
+    void  operator delete(void *anAddress) 
+      { 
+        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+      }
+ // Methods PUBLIC
+ // 
+
+
+Standard_EXPORT NMTDS_IndexedDataMapOfShapeBndSphere(const Standard_Integer NbBuckets = 1);
+
+
+Standard_EXPORT   NMTDS_IndexedDataMapOfShapeBndSphere& Assign(const NMTDS_IndexedDataMapOfShapeBndSphere& Other) ;
+  NMTDS_IndexedDataMapOfShapeBndSphere& operator =(const NMTDS_IndexedDataMapOfShapeBndSphere& Other) 
+{
+  return Assign(Other);
+}
+
+
+
+Standard_EXPORT   void ReSize(const Standard_Integer NbBuckets) ;
+
+
+Standard_EXPORT   void Clear() ;
+~NMTDS_IndexedDataMapOfShapeBndSphere()
+{
+  Clear();
+}
+
+
+
+Standard_EXPORT   Standard_Integer Add(const TopoDS_Shape& K,const NMTDS_BndSphere& I) ;
+
+
+Standard_EXPORT   void Substitute(const Standard_Integer I,const TopoDS_Shape& K,const NMTDS_BndSphere& T) ;
+
+
+Standard_EXPORT   void RemoveLast() ;
+
+
+Standard_EXPORT   Standard_Boolean Contains(const TopoDS_Shape& K) const;
+
+
+Standard_EXPORT  const TopoDS_Shape& FindKey(const Standard_Integer I) const;
+
+
+Standard_EXPORT  const NMTDS_BndSphere& FindFromIndex(const Standard_Integer I) const;
+ const NMTDS_BndSphere& operator ()(const Standard_Integer I) const
+{
+  return FindFromIndex(I);
+}
+
+
+
+Standard_EXPORT   NMTDS_BndSphere& ChangeFromIndex(const Standard_Integer I) ;
+  NMTDS_BndSphere& operator ()(const Standard_Integer I) 
+{
+  return ChangeFromIndex(I);
+}
+
+
+
+Standard_EXPORT   Standard_Integer FindIndex(const TopoDS_Shape& K) const;
+
+
+Standard_EXPORT  const NMTDS_BndSphere& FindFromKey(const TopoDS_Shape& K) const;
+
+
+Standard_EXPORT   NMTDS_BndSphere& ChangeFromKey(const TopoDS_Shape& K) ;
+
+
+
+
+
+protected:
+
+ // Methods PROTECTED
+ // 
+
+
+ // Fields PROTECTED
+ //
+
+
+private: 
+
+ // Methods PRIVATE
+ // 
+
+
+Standard_EXPORT NMTDS_IndexedDataMapOfShapeBndSphere(const NMTDS_IndexedDataMapOfShapeBndSphere& Other);
+
+
+ // Fields PRIVATE
+ //
+
+
+};
+
+
+
+
+
+// other Inline functions and methods (like "C++: function call" methods)
+//
+
+
+#endif
diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere_0.cxx
new file mode 100644
index 000000000..07cdf48a1
--- /dev/null
+++ b/src/NMTDS/NMTDS_IndexedDataMapOfShapeBndSphere_0.cxx
@@ -0,0 +1,60 @@
+// File generated by CPPExt (Value)
+//
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
+//
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
+#include <NMTDS_IndexedDataMapOfShapeBndSphere.hxx>
+
+#ifndef _Standard_DomainError_HeaderFile
+#include <Standard_DomainError.hxx>
+#endif
+#ifndef _Standard_OutOfRange_HeaderFile
+#include <Standard_OutOfRange.hxx>
+#endif
+#ifndef _Standard_NoSuchObject_HeaderFile
+#include <Standard_NoSuchObject.hxx>
+#endif
+#ifndef _TopoDS_Shape_HeaderFile
+#include <TopoDS_Shape.hxx>
+#endif
+#ifndef _NMTDS_BndSphere_HeaderFile
+#include <NMTDS_BndSphere.hxx>
+#endif
+#ifndef _TopTools_ShapeMapHasher_HeaderFile
+#include <TopTools_ShapeMapHasher.hxx>
+#endif
+#ifndef _NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_HeaderFile
+#include <NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx>
+#endif
+ 
+
+#define TheKey TopoDS_Shape
+#define TheKey_hxx <TopoDS_Shape.hxx>
+#define TheItem NMTDS_BndSphere
+#define TheItem_hxx <NMTDS_BndSphere.hxx>
+#define Hasher TopTools_ShapeMapHasher
+#define Hasher_hxx <TopTools_ShapeMapHasher.hxx>
+#define TCollection_IndexedDataMapNode NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere
+#define TCollection_IndexedDataMapNode_hxx <NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere.hxx>
+#define Handle_TCollection_IndexedDataMapNode Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere
+#define TCollection_IndexedDataMapNode_Type_() NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBndSphere_Type_()
+#define TCollection_IndexedDataMap NMTDS_IndexedDataMapOfShapeBndSphere
+#define TCollection_IndexedDataMap_hxx <NMTDS_IndexedDataMapOfShapeBndSphere.hxx>
+#include <TCollection_IndexedDataMap.gxx>
+
diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx
index e601bd0a3..288eac185 100644
--- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx
@@ -1,24 +1,24 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// File generated by CPPExt (Value)
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
 //
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
 #include <NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
@@ -42,10 +42,10 @@
 #define TheKey_hxx <NMTDS_PassKeyBoolean.hxx>
 #define Hasher NMTDS_PassKeyMapHasher
 #define Hasher_hxx <NMTDS_PassKeyMapHasher.hxx>
-#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKeyBoolean
-#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
 #define TCollection_MapIterator NMTDS_MapIteratorOfMapOfPassKeyBoolean
 #define TCollection_MapIterator_hxx <NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx>
+#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKeyBoolean
+#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
 #define Handle_TCollection_StdMapNode Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean
 #define TCollection_StdMapNode_Type_() NMTDS_StdMapNodeOfMapOfPassKeyBoolean_Type_()
 #define TCollection_Map NMTDS_MapOfPassKeyBoolean
diff --git a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey_0.cxx b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey_0.cxx
index 611ca7092..2fcb60568 100644
--- a/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey_0.cxx
+++ b/src/NMTDS/NMTDS_MapIteratorOfMapOfPassKey_0.cxx
@@ -1,24 +1,24 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// File generated by CPPExt (Value)
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
 //
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
 #include <NMTDS_MapIteratorOfMapOfPassKey.hxx>
 
 #ifndef _Standard_NoSuchObject_HeaderFile
@@ -42,10 +42,10 @@
 #define TheKey_hxx <NMTDS_PassKey.hxx>
 #define Hasher NMTDS_PassKeyMapHasher
 #define Hasher_hxx <NMTDS_PassKeyMapHasher.hxx>
-#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKey
-#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
 #define TCollection_MapIterator NMTDS_MapIteratorOfMapOfPassKey
 #define TCollection_MapIterator_hxx <NMTDS_MapIteratorOfMapOfPassKey.hxx>
+#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKey
+#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
 #define Handle_TCollection_StdMapNode Handle_NMTDS_StdMapNodeOfMapOfPassKey
 #define TCollection_StdMapNode_Type_() NMTDS_StdMapNodeOfMapOfPassKey_Type_()
 #define TCollection_Map NMTDS_MapOfPassKey
diff --git a/src/NMTDS/NMTDS_MapOfPassKey.hxx b/src/NMTDS/NMTDS_MapOfPassKey.hxx
index e20be33a2..f029f40d9 100644
--- a/src/NMTDS/NMTDS_MapOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_MapOfPassKey.hxx
@@ -1,24 +1,24 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// File generated by CPPExt (Value)
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
 //
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
 #ifndef _NMTDS_MapOfPassKey_HeaderFile
 #define _NMTDS_MapOfPassKey_HeaderFile
 
@@ -37,8 +37,8 @@
 class Standard_DomainError;
 class NMTDS_PassKey;
 class NMTDS_PassKeyMapHasher;
-class NMTDS_StdMapNodeOfMapOfPassKey;
 class NMTDS_MapIteratorOfMapOfPassKey;
+class NMTDS_StdMapNodeOfMapOfPassKey;
 
 
 #ifndef _Standard_HeaderFile
diff --git a/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx
index d3fcfd8ed..5489e2870 100644
--- a/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_MapOfPassKeyBoolean.hxx
@@ -1,24 +1,24 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// File generated by CPPExt (Value)
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
 //
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
 #ifndef _NMTDS_MapOfPassKeyBoolean_HeaderFile
 #define _NMTDS_MapOfPassKeyBoolean_HeaderFile
 
@@ -37,8 +37,8 @@
 class Standard_DomainError;
 class NMTDS_PassKeyBoolean;
 class NMTDS_PassKeyMapHasher;
-class NMTDS_StdMapNodeOfMapOfPassKeyBoolean;
 class NMTDS_MapIteratorOfMapOfPassKeyBoolean;
+class NMTDS_StdMapNodeOfMapOfPassKeyBoolean;
 
 
 #ifndef _Standard_HeaderFile
diff --git a/src/NMTDS/NMTDS_MapOfPassKeyBoolean_0.cxx b/src/NMTDS/NMTDS_MapOfPassKeyBoolean_0.cxx
index 4eb82501e..c0df89075 100644
--- a/src/NMTDS/NMTDS_MapOfPassKeyBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_MapOfPassKeyBoolean_0.cxx
@@ -1,24 +1,24 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// File generated by CPPExt (Value)
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
 //
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
 #include <NMTDS_MapOfPassKeyBoolean.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
@@ -30,22 +30,22 @@
 #ifndef _NMTDS_PassKeyMapHasher_HeaderFile
 #include <NMTDS_PassKeyMapHasher.hxx>
 #endif
-#ifndef _NMTDS_StdMapNodeOfMapOfPassKeyBoolean_HeaderFile
-#include <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
-#endif
 #ifndef _NMTDS_MapIteratorOfMapOfPassKeyBoolean_HeaderFile
 #include <NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx>
 #endif
+#ifndef _NMTDS_StdMapNodeOfMapOfPassKeyBoolean_HeaderFile
+#include <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
+#endif
  
 
 #define TheKey NMTDS_PassKeyBoolean
 #define TheKey_hxx <NMTDS_PassKeyBoolean.hxx>
 #define Hasher NMTDS_PassKeyMapHasher
 #define Hasher_hxx <NMTDS_PassKeyMapHasher.hxx>
-#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKeyBoolean
-#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
 #define TCollection_MapIterator NMTDS_MapIteratorOfMapOfPassKeyBoolean
 #define TCollection_MapIterator_hxx <NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx>
+#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKeyBoolean
+#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
 #define Handle_TCollection_StdMapNode Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean
 #define TCollection_StdMapNode_Type_() NMTDS_StdMapNodeOfMapOfPassKeyBoolean_Type_()
 #define TCollection_Map NMTDS_MapOfPassKeyBoolean
diff --git a/src/NMTDS/NMTDS_MapOfPassKey_0.cxx b/src/NMTDS/NMTDS_MapOfPassKey_0.cxx
index 2a2a23e96..ac30e6311 100644
--- a/src/NMTDS/NMTDS_MapOfPassKey_0.cxx
+++ b/src/NMTDS/NMTDS_MapOfPassKey_0.cxx
@@ -1,24 +1,24 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// File generated by CPPExt (Value)
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
 //
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
 #include <NMTDS_MapOfPassKey.hxx>
 
 #ifndef _Standard_DomainError_HeaderFile
@@ -30,22 +30,22 @@
 #ifndef _NMTDS_PassKeyMapHasher_HeaderFile
 #include <NMTDS_PassKeyMapHasher.hxx>
 #endif
-#ifndef _NMTDS_StdMapNodeOfMapOfPassKey_HeaderFile
-#include <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
-#endif
 #ifndef _NMTDS_MapIteratorOfMapOfPassKey_HeaderFile
 #include <NMTDS_MapIteratorOfMapOfPassKey.hxx>
 #endif
+#ifndef _NMTDS_StdMapNodeOfMapOfPassKey_HeaderFile
+#include <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
+#endif
  
 
 #define TheKey NMTDS_PassKey
 #define TheKey_hxx <NMTDS_PassKey.hxx>
 #define Hasher NMTDS_PassKeyMapHasher
 #define Hasher_hxx <NMTDS_PassKeyMapHasher.hxx>
-#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKey
-#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
 #define TCollection_MapIterator NMTDS_MapIteratorOfMapOfPassKey
 #define TCollection_MapIterator_hxx <NMTDS_MapIteratorOfMapOfPassKey.hxx>
+#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKey
+#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
 #define Handle_TCollection_StdMapNode Handle_NMTDS_StdMapNodeOfMapOfPassKey
 #define TCollection_StdMapNode_Type_() NMTDS_StdMapNodeOfMapOfPassKey_Type_()
 #define TCollection_Map NMTDS_MapOfPassKey
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx
index 252f5b819..321fb4115 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey.hxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// File generated by CPPExt (Transient)
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
 //
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
 #ifndef _NMTDS_StdMapNodeOfMapOfPassKey_HeaderFile
 #define _NMTDS_StdMapNodeOfMapOfPassKey_HeaderFile
 
@@ -62,7 +63,7 @@ NMTDS_StdMapNodeOfMapOfPassKey(const NMTDS_PassKey& K,const TCollection_MapNodeP
  // Type management
  //
  Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- //Standard_EXPORT Standard_Boolean            IsKind(const Handle(Standard_Type)&) const;
+ //Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
 
 protected:
 
@@ -91,10 +92,10 @@ NMTDS_PassKey myKey;
 #define TheKey_hxx <NMTDS_PassKey.hxx>
 #define Hasher NMTDS_PassKeyMapHasher
 #define Hasher_hxx <NMTDS_PassKeyMapHasher.hxx>
-#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKey
-#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
 #define TCollection_MapIterator NMTDS_MapIteratorOfMapOfPassKey
 #define TCollection_MapIterator_hxx <NMTDS_MapIteratorOfMapOfPassKey.hxx>
+#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKey
+#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
 #define Handle_TCollection_StdMapNode Handle_NMTDS_StdMapNodeOfMapOfPassKey
 #define TCollection_StdMapNode_Type_() NMTDS_StdMapNodeOfMapOfPassKey_Type_()
 #define TCollection_Map NMTDS_MapOfPassKey
@@ -106,10 +107,10 @@ NMTDS_PassKey myKey;
 #undef TheKey_hxx
 #undef Hasher
 #undef Hasher_hxx
-#undef TCollection_StdMapNode
-#undef TCollection_StdMapNode_hxx
 #undef TCollection_MapIterator
 #undef TCollection_MapIterator_hxx
+#undef TCollection_StdMapNode
+#undef TCollection_StdMapNode_hxx
 #undef Handle_TCollection_StdMapNode
 #undef TCollection_StdMapNode_Type_
 #undef TCollection_Map
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
index f3f6ce73a..e9aaa4cec 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx
@@ -1,24 +1,25 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// File generated by CPPExt (Transient)
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
 //
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
 #ifndef _NMTDS_StdMapNodeOfMapOfPassKeyBoolean_HeaderFile
 #define _NMTDS_StdMapNodeOfMapOfPassKeyBoolean_HeaderFile
 
@@ -62,7 +63,7 @@ NMTDS_StdMapNodeOfMapOfPassKeyBoolean(const NMTDS_PassKeyBoolean& K,const TColle
  // Type management
  //
  Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- //Standard_EXPORT Standard_Boolean            IsKind(const Handle(Standard_Type)&) const;
+ //Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
 
 protected:
 
@@ -91,10 +92,10 @@ NMTDS_PassKeyBoolean myKey;
 #define TheKey_hxx <NMTDS_PassKeyBoolean.hxx>
 #define Hasher NMTDS_PassKeyMapHasher
 #define Hasher_hxx <NMTDS_PassKeyMapHasher.hxx>
-#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKeyBoolean
-#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
 #define TCollection_MapIterator NMTDS_MapIteratorOfMapOfPassKeyBoolean
 #define TCollection_MapIterator_hxx <NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx>
+#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKeyBoolean
+#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
 #define Handle_TCollection_StdMapNode Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean
 #define TCollection_StdMapNode_Type_() NMTDS_StdMapNodeOfMapOfPassKeyBoolean_Type_()
 #define TCollection_Map NMTDS_MapOfPassKeyBoolean
@@ -106,10 +107,10 @@ NMTDS_PassKeyBoolean myKey;
 #undef TheKey_hxx
 #undef Hasher
 #undef Hasher_hxx
-#undef TCollection_StdMapNode
-#undef TCollection_StdMapNode_hxx
 #undef TCollection_MapIterator
 #undef TCollection_MapIterator_hxx
+#undef TCollection_StdMapNode
+#undef TCollection_StdMapNode_hxx
 #undef Handle_TCollection_StdMapNode
 #undef TCollection_StdMapNode_Type_
 #undef TCollection_Map
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx
index 3d6f064d4..f88296951 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx
@@ -1,24 +1,24 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// File generated by CPPExt (Transient)
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
 //
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
 #include <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
@@ -51,10 +51,10 @@ Standard_EXPORT Handle_Standard_Type& NMTDS_StdMapNodeOfMapOfPassKeyBoolean_Type
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("NMTDS_StdMapNodeOfMapOfPassKeyBoolean",
-                                                         sizeof(NMTDS_StdMapNodeOfMapOfPassKeyBoolean),
-                                                         1,
-                                                         (Standard_Address)_Ancestors,
-                                                         (Standard_Address)NULL);
+			                                 sizeof(NMTDS_StdMapNodeOfMapOfPassKeyBoolean),
+			                                 1,
+			                                 (Standard_Address)_Ancestors,
+			                                 (Standard_Address)NULL);
 
   return _aType;
 }
@@ -88,10 +88,10 @@ const Handle(Standard_Type)& NMTDS_StdMapNodeOfMapOfPassKeyBoolean::DynamicType(
 #define TheKey_hxx <NMTDS_PassKeyBoolean.hxx>
 #define Hasher NMTDS_PassKeyMapHasher
 #define Hasher_hxx <NMTDS_PassKeyMapHasher.hxx>
-#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKeyBoolean
-#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
 #define TCollection_MapIterator NMTDS_MapIteratorOfMapOfPassKeyBoolean
 #define TCollection_MapIterator_hxx <NMTDS_MapIteratorOfMapOfPassKeyBoolean.hxx>
+#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKeyBoolean
+#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx>
 #define Handle_TCollection_StdMapNode Handle_NMTDS_StdMapNodeOfMapOfPassKeyBoolean
 #define TCollection_StdMapNode_Type_() NMTDS_StdMapNodeOfMapOfPassKeyBoolean_Type_()
 #define TCollection_Map NMTDS_MapOfPassKeyBoolean
diff --git a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey_0.cxx b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey_0.cxx
index cf567663d..f286e592d 100644
--- a/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey_0.cxx
+++ b/src/NMTDS/NMTDS_StdMapNodeOfMapOfPassKey_0.cxx
@@ -1,24 +1,24 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// File generated by CPPExt (Transient)
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  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.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//                     Copyright (C) 1991 - 2000 by  
+//                      Matra Datavision SA.  All rights reserved.
+//  
+//                     Copyright (C) 2001 - 2004 by
+//                     Open CASCADE SA.  All rights reserved.
+// 
+// This file is part of the Open CASCADE Technology software.
 //
+// This software may be distributed and/or modified under the terms and
+// conditions of the Open CASCADE Public License as defined by Open CASCADE SA
+// and appearing in the file LICENSE included in the packaging of this file.
+//  
+// This software is distributed on an "AS IS" basis, without warranty of any
+// kind, and Open CASCADE SA hereby disclaims all such warranties,
+// including without limitation, any warranties of merchantability, fitness
+// for a particular purpose or non-infringement. Please see the License for
+// the specific terms and conditions governing rights and limitations under the
+// License.
+
 #include <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
 
 #ifndef _Standard_TypeMismatch_HeaderFile
@@ -51,10 +51,10 @@ Standard_EXPORT Handle_Standard_Type& NMTDS_StdMapNodeOfMapOfPassKey_Type_()
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("NMTDS_StdMapNodeOfMapOfPassKey",
-                                                         sizeof(NMTDS_StdMapNodeOfMapOfPassKey),
-                                                         1,
-                                                         (Standard_Address)_Ancestors,
-                                                         (Standard_Address)NULL);
+			                                 sizeof(NMTDS_StdMapNodeOfMapOfPassKey),
+			                                 1,
+			                                 (Standard_Address)_Ancestors,
+			                                 (Standard_Address)NULL);
 
   return _aType;
 }
@@ -88,10 +88,10 @@ const Handle(Standard_Type)& NMTDS_StdMapNodeOfMapOfPassKey::DynamicType() const
 #define TheKey_hxx <NMTDS_PassKey.hxx>
 #define Hasher NMTDS_PassKeyMapHasher
 #define Hasher_hxx <NMTDS_PassKeyMapHasher.hxx>
-#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKey
-#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
 #define TCollection_MapIterator NMTDS_MapIteratorOfMapOfPassKey
 #define TCollection_MapIterator_hxx <NMTDS_MapIteratorOfMapOfPassKey.hxx>
+#define TCollection_StdMapNode NMTDS_StdMapNodeOfMapOfPassKey
+#define TCollection_StdMapNode_hxx <NMTDS_StdMapNodeOfMapOfPassKey.hxx>
 #define Handle_TCollection_StdMapNode Handle_NMTDS_StdMapNodeOfMapOfPassKey
 #define TCollection_StdMapNode_Type_() NMTDS_StdMapNodeOfMapOfPassKey_Type_()
 #define TCollection_Map NMTDS_MapOfPassKey