0023776: Redesign of MFC samples after V2d viewer removing
authoraba <aba@opencascade.com>
Tue, 12 Mar 2013 05:19:35 +0000 (09:19 +0400)
committeraba <aba@opencascade.com>
Thu, 14 Mar 2013 13:49:18 +0000 (17:49 +0400)
212 files changed:
.gitignore
samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc10/Geometry.vcxproj.filters
samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj
samples/mfc/standard/01_Geometry/adm/win/vc11/Geometry.vcxproj.filters
samples/mfc/standard/01_Geometry/adm/win/vc8/Geometry.vcproj
samples/mfc/standard/01_Geometry/adm/win/vc9/Geometry.vcproj
samples/mfc/standard/01_Geometry/src/ChildFrm.cpp
samples/mfc/standard/01_Geometry/src/ChildFrm.h
samples/mfc/standard/01_Geometry/src/ChildFrm2d.cpp
samples/mfc/standard/01_Geometry/src/ChildFrm2d.h
samples/mfc/standard/01_Geometry/src/GeoAlgo_Sol.cxx
samples/mfc/standard/01_Geometry/src/GeoAlgo_Sol.hxx
samples/mfc/standard/01_Geometry/src/GeomSources.cpp
samples/mfc/standard/01_Geometry/src/GeomSources.h
samples/mfc/standard/01_Geometry/src/GeometryApp.cpp
samples/mfc/standard/01_Geometry/src/GeometryApp.h
samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp
samples/mfc/standard/01_Geometry/src/GeometryDoc.h
samples/mfc/standard/01_Geometry/src/GeometryView.cpp
samples/mfc/standard/01_Geometry/src/GeometryView.h
samples/mfc/standard/01_Geometry/src/GeometryView2D.cpp
samples/mfc/standard/01_Geometry/src/GeometryView2D.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_Curve.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_InteractiveContext.cpp [deleted file]
samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_InteractiveContext.h [deleted file]
samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_SensitiveCurve.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession2D_SensitiveCurve.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Curve.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Direction.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Point.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Surface.h
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.cpp
samples/mfc/standard/01_Geometry/src/ISession2D/ISession_Text.h
samples/mfc/standard/01_Geometry/src/MainFrm.cpp
samples/mfc/standard/01_Geometry/src/MainFrm.h
samples/mfc/standard/01_Geometry/src/StdAfx.h
samples/mfc/standard/02_Modeling/adm/win/vc10/Modeling.vcxproj
samples/mfc/standard/02_Modeling/adm/win/vc11/Modeling.vcxproj
samples/mfc/standard/02_Modeling/adm/win/vc8/Modeling.vcproj
samples/mfc/standard/02_Modeling/adm/win/vc9/Modeling.vcproj
samples/mfc/standard/02_Modeling/src/ModelingApp.cpp
samples/mfc/standard/02_Modeling/src/ModelingApp.h
samples/mfc/standard/02_Modeling/src/ModelingDoc.cpp
samples/mfc/standard/03_Viewer2d/README.txt [new file with mode: 0644]
samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj
samples/mfc/standard/03_Viewer2d/adm/win/vc10/Viewer2d.vcxproj.filters
samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj
samples/mfc/standard/03_Viewer2d/adm/win/vc11/Viewer2d.vcxproj.filters
samples/mfc/standard/03_Viewer2d/adm/win/vc8/Viewer2d.vcproj
samples/mfc/standard/03_Viewer2d/adm/win/vc9/Viewer2d.vcproj
samples/mfc/standard/03_Viewer2d/res/Viewer2d.aps
samples/mfc/standard/03_Viewer2d/res/Viewer2d.rc
samples/mfc/standard/03_Viewer2d/src/Properties/ColorNewColorCubeColorMapDialog.cpp [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/ColorNewColorCubeColorMapDialog.h [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/ColorNewColorRampColorMapDialog.cpp [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/ColorPropertyPage.cpp [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/ColorPropertyPage.h [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/FontPropertyPage.cpp [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/FontPropertyPage.h [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/MarkPropertyPage.cpp [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/MarkPropertyPage.h [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/PropertiesDialog.rc2 [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/PropertiesSheet.cpp [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/PropertiesSheet.h [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/TypePropertyPage.cpp [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/TypePropertyPage.h [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/WidthPropertyPage.cpp [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/WidthPropertyPage.h [deleted file]
samples/mfc/standard/03_Viewer2d/src/Properties/colornewcolorrampcolormapDialog.h [deleted file]
samples/mfc/standard/03_Viewer2d/src/StdAfx.h
samples/mfc/standard/03_Viewer2d/src/Viewer2dApp.cpp
samples/mfc/standard/03_Viewer2d/src/Viewer2dApp.h
samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.cpp
samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.h
samples/mfc/standard/04_Viewer3d/adm/win/vc10/Viewer3d.vcxproj
samples/mfc/standard/04_Viewer3d/adm/win/vc11/Viewer3d.vcxproj
samples/mfc/standard/04_Viewer3d/adm/win/vc8/Viewer3d.vcproj
samples/mfc/standard/04_Viewer3d/adm/win/vc9/Viewer3d.vcproj
samples/mfc/standard/04_Viewer3d/src/TexturesExt_Presentation.cpp
samples/mfc/standard/04_Viewer3d/src/Viewer3dApp.cpp
samples/mfc/standard/04_Viewer3d/src/Viewer3dApp.h
samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
samples/mfc/standard/05_ImportExport/adm/win/vc10/ImportExport.vcxproj
samples/mfc/standard/05_ImportExport/adm/win/vc11/ImportExport.vcxproj
samples/mfc/standard/05_ImportExport/adm/win/vc8/ImportExport.vcproj
samples/mfc/standard/05_ImportExport/adm/win/vc9/ImportExport.vcproj
samples/mfc/standard/05_ImportExport/src/ImportExportApp.cpp
samples/mfc/standard/05_ImportExport/src/ImportExportApp.h
samples/mfc/standard/06_Ocaf/adm/win/vc10/Ocaf.vcxproj
samples/mfc/standard/06_Ocaf/adm/win/vc11/Ocaf.vcxproj
samples/mfc/standard/06_Ocaf/adm/win/vc8/Ocaf.vcproj
samples/mfc/standard/06_Ocaf/adm/win/vc9/Ocaf.vcproj
samples/mfc/standard/06_Ocaf/src/OcafApp.cpp
samples/mfc/standard/06_Ocaf/src/OcafApp.h
samples/mfc/standard/07_Triangulation/adm/win/vc10/Triangulation.vcxproj
samples/mfc/standard/07_Triangulation/adm/win/vc11/Triangulation.vcxproj
samples/mfc/standard/07_Triangulation/adm/win/vc8/Triangulation.vcproj
samples/mfc/standard/07_Triangulation/adm/win/vc9/Triangulation.vcproj
samples/mfc/standard/07_Triangulation/src/Tesselate_Presentation.cpp
samples/mfc/standard/07_Triangulation/src/TriangulationApp.cpp
samples/mfc/standard/07_Triangulation/src/TriangulationApp.h
samples/mfc/standard/07_Triangulation/src/TriangulationDoc.cpp
samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj
samples/mfc/standard/08_HLR/adm/win/vc10/HLR.vcxproj.filters
samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj
samples/mfc/standard/08_HLR/adm/win/vc11/HLR.vcxproj.filters
samples/mfc/standard/08_HLR/adm/win/vc8/HLR.vcproj
samples/mfc/standard/08_HLR/adm/win/vc9/HLR.vcproj
samples/mfc/standard/08_HLR/res/HLR.APS
samples/mfc/standard/08_HLR/res/HLR.rc
samples/mfc/standard/08_HLR/src/HLRApp.cpp
samples/mfc/standard/08_HLR/src/HLRApp.h
samples/mfc/standard/08_HLR/src/HLRDoc.cpp
samples/mfc/standard/08_HLR/src/HLRDoc.h
samples/mfc/standard/08_HLR/src/HLRView2D.cpp
samples/mfc/standard/08_HLR/src/HLRView2D.h
samples/mfc/standard/08_HLR/src/Properties/ColorNewColorCubeColorMapDialog.cpp [deleted file]
samples/mfc/standard/08_HLR/src/Properties/ColorNewColorCubeColorMapDialog.h [deleted file]
samples/mfc/standard/08_HLR/src/Properties/ColorNewColorRampColorMapDialog.cpp [deleted file]
samples/mfc/standard/08_HLR/src/Properties/ColorPropertyPage.cpp [deleted file]
samples/mfc/standard/08_HLR/src/Properties/ColorPropertyPage.h [deleted file]
samples/mfc/standard/08_HLR/src/Properties/FontPropertyPage.cpp [deleted file]
samples/mfc/standard/08_HLR/src/Properties/FontPropertyPage.h [deleted file]
samples/mfc/standard/08_HLR/src/Properties/MarkPropertyPage.cpp [deleted file]
samples/mfc/standard/08_HLR/src/Properties/MarkPropertyPage.h [deleted file]
samples/mfc/standard/08_HLR/src/Properties/PropertiesDialog.rc2 [deleted file]
samples/mfc/standard/08_HLR/src/Properties/PropertiesSheet.cpp [deleted file]
samples/mfc/standard/08_HLR/src/Properties/PropertiesSheet.h [deleted file]
samples/mfc/standard/08_HLR/src/Properties/TypePropertyPage.cpp [deleted file]
samples/mfc/standard/08_HLR/src/Properties/TypePropertyPage.h [deleted file]
samples/mfc/standard/08_HLR/src/Properties/WidthPropertyPage.cpp [deleted file]
samples/mfc/standard/08_HLR/src/Properties/WidthPropertyPage.h [deleted file]
samples/mfc/standard/08_HLR/src/Properties/colornewcolorrampcolormapDialog.h [deleted file]
samples/mfc/standard/08_HLR/src/SelectionDialog.cpp
samples/mfc/standard/08_HLR/src/SelectionDialog.h
samples/mfc/standard/08_HLR/src/StdAfx.h
samples/mfc/standard/09_Animation/adm/win/vc10/Animation.vcxproj
samples/mfc/standard/09_Animation/adm/win/vc11/Animation.vcxproj
samples/mfc/standard/09_Animation/adm/win/vc8/Animation.vcproj
samples/mfc/standard/09_Animation/adm/win/vc9/Animation.vcproj
samples/mfc/standard/09_Animation/src/AnimationApp.cpp
samples/mfc/standard/09_Animation/src/AnimationApp.h
samples/mfc/standard/09_Animation/src/AnimationDoc.cpp
samples/mfc/standard/09_Animation/src/AnimationView3D.cpp
samples/mfc/standard/10_Convert/adm/win/vc10/Convert.vcxproj
samples/mfc/standard/10_Convert/adm/win/vc11/Convert.vcxproj
samples/mfc/standard/10_Convert/adm/win/vc8/Convert.vcproj
samples/mfc/standard/10_Convert/adm/win/vc9/Convert.vcproj
samples/mfc/standard/10_Convert/src/WNT/OCCDemo.cpp
samples/mfc/standard/10_Convert/src/WNT/OCCDemo.h
samples/mfc/standard/10_Convert/src/WNT/OCCDemoDoc.cpp
samples/mfc/standard/Common/ISession2D/ISession2D_InteractiveContext.cpp [deleted file]
samples/mfc/standard/Common/ISession2D/ISession2D_InteractiveContext.h [deleted file]
samples/mfc/standard/Common/ISession2D/ISession2D_ObjectOwner.cpp [deleted file]
samples/mfc/standard/Common/ISession2D/ISession2D_ObjectOwner.h [deleted file]
samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp
samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h
samples/mfc/standard/Common/ImportExport/ImportExport.cpp
samples/mfc/standard/Common/OCC_2dApp.cpp [deleted file]
samples/mfc/standard/Common/OCC_2dApp.h [deleted file]
samples/mfc/standard/Common/OCC_2dChildFrame.cpp
samples/mfc/standard/Common/OCC_2dDoc.cpp
samples/mfc/standard/Common/OCC_2dDoc.h
samples/mfc/standard/Common/OCC_2dView.cpp
samples/mfc/standard/Common/OCC_2dView.h
samples/mfc/standard/Common/OCC_3dApp.cpp [deleted file]
samples/mfc/standard/Common/OCC_3dApp.h [deleted file]
samples/mfc/standard/Common/OCC_3dBaseDoc.cpp
samples/mfc/standard/Common/OCC_3dBaseDoc.h
samples/mfc/standard/Common/OCC_3dChildFrame.cpp
samples/mfc/standard/Common/OCC_3dView.cpp
samples/mfc/standard/Common/OCC_3dView.h
samples/mfc/standard/Common/OCC_App.cpp [new file with mode: 0644]
samples/mfc/standard/Common/OCC_App.h [moved from samples/mfc/standard/Common/OCC_BaseApp.h with 67% similarity, mode: 0644]
samples/mfc/standard/Common/OCC_BaseApp.cpp [deleted file]
samples/mfc/standard/Common/OCC_BaseChildFrame.cpp
samples/mfc/standard/Common/OCC_BaseDoc.h
samples/mfc/standard/Common/OCC_MainFrame.cpp
samples/mfc/standard/Common/OCC_MainFrame.h
samples/mfc/standard/Common/Primitive/Sample2D_Curve.cpp [deleted file]
samples/mfc/standard/Common/Primitive/Sample2D_Curve.h [deleted file]
samples/mfc/standard/Common/Primitive/Sample2D_Face.cpp
samples/mfc/standard/Common/Primitive/Sample2D_Face.h
samples/mfc/standard/Common/Primitive/Sample2D_Image.cpp
samples/mfc/standard/Common/Primitive/Sample2D_Image.h
samples/mfc/standard/Common/Primitive/Sample2D_Line.cpp [deleted file]
samples/mfc/standard/Common/Primitive/Sample2D_Line.h [deleted file]
samples/mfc/standard/Common/Primitive/Sample2D_Markers.cpp
samples/mfc/standard/Common/Primitive/Sample2D_Markers.h
samples/mfc/standard/Common/Primitive/Sample2D_Rectagle.cpp [deleted file]
samples/mfc/standard/Common/Primitive/Sample2D_Rectangle.h [deleted file]
samples/mfc/standard/Common/Primitive/Sample2D_Text.cpp
samples/mfc/standard/Common/Primitive/Sample2D_Text.h
samples/mfc/standard/Common/Resource2D/CircularGrid.h
samples/mfc/standard/Common/Resource2D/RectangularGrid.h
samples/mfc/standard/Common/StdAfx.h
samples/mfc/standard/Common/User_Cylinder.cxx
samples/mfc/standard/Common/res/OCC_Resource.aps
samples/mfc/standard/Common/res/OCC_Resource.h
samples/mfc/standard/Common/res/OCC_Resource.rc
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj.filters
samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj
samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj.filters
samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj

index 5c04544..63daa70 100644 (file)
 win32
 win64
 
+# standard names of directories for objects and binaries for samples
+bin
+obj
+Debug
+Release
+
 # project files and artifacts
 /adm/msvc
 /adm/wnt
@@ -23,6 +29,7 @@ win64
 /adm/make
 /adm/cmake
 *.vcproj*user
+*.csproj*user
 *.ncb
 *.suo
 *.sdf
index aba0eca..b4385ec 100644 (file)
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc10\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc10\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win32\vc10\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../..\win64\vc10\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win64\vc10\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\ChildFrm.h" />
     <ClInclude Include="..\..\..\src\ChildFrm2d.h" />
-    <ClInclude Include="src\GeoAlgo_Sol.hxx" />
+    <ClInclude Include="..\..\..\src\GeoAlgo_Sol.hxx" />
     <ClInclude Include="..\..\..\src\GeometryApp.h" />
     <ClInclude Include="..\..\..\src\GeometryDoc.h" />
     <ClInclude Include="..\..\..\src\GeometryView.h" />
     <ClInclude Include="..\..\..\src\GeometryView2D.h" />
     <ClInclude Include="..\..\..\src\GeomSources.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession2D_Curve.h" />
-    <ClInclude Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Curve.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Direction.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h" />
     <ClInclude Include="..\..\..\src\MainFrm.h" />
-    <ClInclude Include="res\resource.h" />
+    <ClInclude Include="..\..\..\res\resource.h" />
     <ClInclude Include="..\..\..\src\StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
index ac4ea16..812b3b1 100644 (file)
@@ -54,9 +54,6 @@
     <ClCompile Include="..\..\..\src\ISession2D\ISession2D_Curve.cpp">
       <Filter>Source Files\ISession2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp">
-      <Filter>Source Files\ISession2d</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp">
       <Filter>Source Files\ISession2d</Filter>
     </ClCompile>
@@ -88,7 +85,7 @@
     <ClInclude Include="..\..\..\src\ChildFrm2d.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\GeoAlgo_Sol.hxx">
+    <ClInclude Include="..\..\..\src\GeoAlgo_Sol.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\GeometryApp.h">
     <ClInclude Include="..\..\..\src\ISession2D\ISession2D_Curve.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\MainFrm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="res\resource.h">
+    <ClInclude Include="..\..\..\res\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\StdAfx.h">
index 84f33eb..3684974 100644 (file)
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\lib;$(CSF_OPT_LIB32);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win64\vc11\bin/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\lib;$(CSF_OPT_LIB64);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../../win32\vc11\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win32\vc11\libd;$(CSF_OPT_LIB32D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <Culture>0x0409</Culture>
     </ResourceCompile>
     <Link>
-      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV2d.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>TKVrml.lib;TKStl.lib;TKBrep.lib;TKIGES.lib;TKShHealing.lib;TKStep.lib;TKXSBase.lib;TKShapeSchema.lib;FWOSPlugin.lib;PTKernel.lib;TKBool.lib;TKCAF.lib;TKCDF.lib;TKernel.lib;TKFeat.lib;TKFillet.lib;TKG2d.lib;TKG3d.lib;TKGeomAlgo.lib;TKGeomBase.lib;TKHLR.lib;TKMath.lib;TKOffset.lib;TKPCAF.lib;TKPrim.lib;TKPShape.lib;TKService.lib;TKTopAlgo.lib;TKV3d.lib;mfcsample.lib;TKMesh.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>../../../..\win64\vc11\bind/Geometry.exe</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <AdditionalLibraryDirectories>..\..\..\..\win64\vc11\libd;$(CSF_OPT_LIB64D);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp">
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Disabled</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">EnableFastChecks</BasicRuntimeChecks>
-      <BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</BrowseInformation>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp">
       <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\ChildFrm.h" />
     <ClInclude Include="..\..\..\src\ChildFrm2d.h" />
-    <ClInclude Include="src\GeoAlgo_Sol.hxx" />
+    <ClInclude Include="..\..\..\src\GeoAlgo_Sol.hxx" />
     <ClInclude Include="..\..\..\src\GeometryApp.h" />
     <ClInclude Include="..\..\..\src\GeometryDoc.h" />
     <ClInclude Include="..\..\..\src\GeometryView.h" />
     <ClInclude Include="..\..\..\src\GeometryView2D.h" />
     <ClInclude Include="..\..\..\src\GeomSources.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession2D_Curve.h" />
-    <ClInclude Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Curve.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Direction.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Surface.h" />
     <ClInclude Include="..\..\..\src\ISession2D\ISession_Text.h" />
     <ClInclude Include="..\..\..\src\MainFrm.h" />
-    <ClInclude Include="res\resource.h" />
+    <ClInclude Include="..\..\..\res\resource.h" />
     <ClInclude Include="..\..\..\src\StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
index ac4ea16..812b3b1 100644 (file)
@@ -54,9 +54,6 @@
     <ClCompile Include="..\..\..\src\ISession2D\ISession2D_Curve.cpp">
       <Filter>Source Files\ISession2d</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp">
-      <Filter>Source Files\ISession2d</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp">
       <Filter>Source Files\ISession2d</Filter>
     </ClCompile>
@@ -88,7 +85,7 @@
     <ClInclude Include="..\..\..\src\ChildFrm2d.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\GeoAlgo_Sol.hxx">
+    <ClInclude Include="..\..\..\src\GeoAlgo_Sol.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\GeometryApp.h">
     <ClInclude Include="..\..\..\src\ISession2D\ISession2D_Curve.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\MainFrm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="res\resource.h">
+    <ClInclude Include="..\..\..\res\resource.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\src\StdAfx.h">
index 2bb157a..234bba3 100644 (file)
@@ -81,7 +81,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
+                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
                                OutputFile="../../../..\win32\vc8\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
+                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
                                OutputFile="../../../..\win64\vc8\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
+                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
                                OutputFile="../../../..\win32\vc8\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
+                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
                                OutputFile="../../../..\\win64\vc8\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
                                        </FileConfiguration>
                                </File>
                                <File
-                                       RelativePath="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp"
-                                       >
-                                       <FileConfiguration
-                                               Name="Release|Win32"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       Optimization="2"
-                                                       AdditionalIncludeDirectories=""
-                                                       PreprocessorDefinitions=""
-                                               />
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Release|x64"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       Optimization="2"
-                                                       AdditionalIncludeDirectories=""
-                                                       PreprocessorDefinitions=""
-                                               />
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Debug|Win32"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       Optimization="0"
-                                                       AdditionalIncludeDirectories=""
-                                                       PreprocessorDefinitions=""
-                                                       BasicRuntimeChecks="3"
-                                                       BrowseInformation="1"
-                                               />
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Debug|x64"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       Optimization="0"
-                                                       AdditionalIncludeDirectories=""
-                                                       PreprocessorDefinitions=""
-                                                       BasicRuntimeChecks="3"
-                                                       BrowseInformation="1"
-                                               />
-                                       </FileConfiguration>
-                               </File>
-                               <File
                                        RelativePath="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp"
                                        >
                                        <FileConfiguration
                                >
                        </File>
                        <File
-                               RelativePath=".\src\GeoAlgo_Sol.hxx"
+                               RelativePath="..\..\..\src\GeoAlgo_Sol.hxx"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="res\resource.h"
+                               RelativePath="..\..\..\res\resource.h"
                                >
                        </File>
                        <File
index e5b45fd..966d5fb 100644 (file)
@@ -82,7 +82,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
+                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
                                OutputFile="../../../..\win32\vc9\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
+                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
                                OutputFile="../../../..\win64\vc9\bin/Geometry.exe"
                                LinkIncremental="1"
                                SuppressStartupBanner="true"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
+                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
                                OutputFile="../../../..\win32\vc9\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
                        />
                        <Tool
                                Name="VCLinkerTool"
-                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV2d.lib TKV3d.lib mfcsample.lib TKMesh.lib"
+                               AdditionalDependencies="TKVrml.lib TKStl.lib TKBrep.lib TKIGES.lib TKShHealing.lib TKStep.lib TKXSBase.lib TKShapeSchema.lib FWOSPlugin.lib PTKernel.lib TKBool.lib TKCAF.lib TKCDF.lib TKernel.lib TKFeat.lib TKFillet.lib TKG2d.lib TKG3d.lib TKGeomAlgo.lib TKGeomBase.lib TKHLR.lib TKMath.lib TKOffset.lib TKPCAF.lib TKPrim.lib TKPShape.lib TKService.lib TKTopAlgo.lib TKV3d.lib mfcsample.lib TKMesh.lib"
                                OutputFile="../../../..\\win64\vc9\bind/Geometry.exe"
                                LinkIncremental="2"
                                SuppressStartupBanner="true"
                                        </FileConfiguration>
                                </File>
                                <File
-                                       RelativePath="..\..\..\src\ISession2D\ISession2D_InteractiveContext.cpp"
-                                       >
-                                       <FileConfiguration
-                                               Name="Release|Win32"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       Optimization="2"
-                                                       AdditionalIncludeDirectories=""
-                                                       PreprocessorDefinitions=""
-                                               />
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Release|x64"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       Optimization="2"
-                                                       AdditionalIncludeDirectories=""
-                                                       PreprocessorDefinitions=""
-                                               />
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Debug|Win32"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       Optimization="0"
-                                                       AdditionalIncludeDirectories=""
-                                                       PreprocessorDefinitions=""
-                                                       BasicRuntimeChecks="3"
-                                                       BrowseInformation="1"
-                                               />
-                                       </FileConfiguration>
-                                       <FileConfiguration
-                                               Name="Debug|x64"
-                                               >
-                                               <Tool
-                                                       Name="VCCLCompilerTool"
-                                                       Optimization="0"
-                                                       AdditionalIncludeDirectories=""
-                                                       PreprocessorDefinitions=""
-                                                       BasicRuntimeChecks="3"
-                                                       BrowseInformation="1"
-                                               />
-                                       </FileConfiguration>
-                               </File>
-                               <File
                                        RelativePath="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.cpp"
                                        >
                                        <FileConfiguration
                                >
                        </File>
                        <File
-                               RelativePath=".\src\GeoAlgo_Sol.hxx"
+                               RelativePath="..\..\..\src\GeoAlgo_Sol.hxx"
                                >
                        </File>
                        <File
                                >
                        </File>
                        <File
-                               RelativePath="..\..\..\src\ISession2D\ISession2D_InteractiveContext.h"
-                               >
-                       </File>
-                       <File
                                RelativePath="..\..\..\src\ISession2D\ISession2D_SensitiveCurve.h"
                                >
                        </File>
                                >
                        </File>
                        <File
-                               RelativePath="res\resource.h"
+                               RelativePath="..\..\..\res\resource.h"
                                >
                        </File>
                        <File
index dc640db..237dbe5 100755 (executable)
@@ -12,9 +12,9 @@
 IMPLEMENT_DYNCREATE(CChildFrame, CMDIChildWnd)
 
 BEGIN_MESSAGE_MAP(CChildFrame, CMDIChildWnd)
-       //{{AFX_MSG_MAP(CChildFrame)
-       ON_WM_CREATE()
-       //}}AFX_MSG_MAP
+  //{{AFX_MSG_MAP(CChildFrame)
+  ON_WM_CREATE()
+  //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 /////////////////////////////////////////////////////////////////////////////
@@ -22,8 +22,8 @@ END_MESSAGE_MAP()
 
 CChildFrame::CChildFrame()
 {
-       // TODO: add member initialization code here
-       
+  // TODO: add member initialization code here
+
 }
 
 CChildFrame::~CChildFrame()
@@ -36,61 +36,59 @@ CChildFrame::~CChildFrame()
 #ifdef _DEBUG
 void CChildFrame::AssertValid() const
 {
-       CMDIChildWnd::AssertValid();
+  CMDIChildWnd::AssertValid();
 }
 
 void CChildFrame::Dump(CDumpContext& dc) const
 {
-       CMDIChildWnd::Dump(dc);
+  CMDIChildWnd::Dump(dc);
 }
 
 #endif //_DEBUG
 
 void CChildFrame::ActivateFrame(int nCmdShow) 
 {
-       // TODO: Add your specialized code here and/or call the base class
-       
-       static BOOL first=true;
-       if(first){
-               first=false;
-               CMDIChildWnd::ActivateFrame(SW_SHOWMAXIMIZED);
-               return;
-       }
-/*
-       POSITION pos=AfxGetApp()->GetFirstDocTemplatePosition();
-       CDocTemplate* DocT=AfxGetApp()->GetNextDocTemplate(pos);
-       POSITION p=DocT->GetFirstDocPosition();
-       DocT->GetNextDoc(p);
-       if(p==NULL)
-               nCmdShow = SW_SHOWMAXIMIZED;      
-*/
-       CMDIChildWnd::ActivateFrame(nCmdShow);
+  // TODO: Add your specialized code here and/or call the base class
+
+  static BOOL first=true;
+  if(first){
+    first=false;
+    CMDIChildWnd::ActivateFrame(SW_SHOWMAXIMIZED);
+    return;
+  }
+  /*
+  POSITION pos=AfxGetApp()->GetFirstDocTemplatePosition();
+  CDocTemplate* DocT=AfxGetApp()->GetNextDocTemplate(pos);
+  POSITION p=DocT->GetFirstDocPosition();
+  DocT->GetNextDoc(p);
+  if(p==NULL)
+  nCmdShow = SW_SHOWMAXIMIZED;      
+  */
+  CMDIChildWnd::ActivateFrame(nCmdShow);
 }
 
 int CChildFrame::OnCreate(LPCREATESTRUCT lpCreateStruct) 
 {
-       if (CMDIChildWnd::OnCreate(lpCreateStruct) == -1)
-               return -1;
-       
-       if (!m_wndToolBar.Create(this) || !m_wndToolBar.LoadToolBar(IDR_3dCHILDFRAME))
-       {
-               TRACE0("Failed to create toolbar\n");
-               return -1; // fail to create
-       }
-
-       m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
-       m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
-       EnableDocking(CBRS_ALIGN_ANY);
-       DockControlBar(&m_wndToolBar);
-
-       return 0;
-}
+  if (CMDIChildWnd::OnCreate(lpCreateStruct) == -1)
+    return -1;
 
+  if (!m_wndToolBar.Create(this) || !m_wndToolBar.LoadToolBar(IDR_3dCHILDFRAME))
+  {
+    TRACE0("Failed to create toolbar\n");
+    return -1; // fail to create
+  }
 
+  m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() | CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
+  m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
+  EnableDocking(CBRS_ALIGN_ANY);
+  DockControlBar(&m_wndToolBar);
+
+  return 0;
+}
 
 BOOL CChildFrame::DestroyWindow() 
 {
-       // TODO: Add your specialized code here and/or call the base class
-       
-       return CMDIChildWnd::DestroyWindow();
+  // TODO: Add your specialized code here and/or call the base class
+
+  return CMDIChildWnd::DestroyWindow();
 }
index 596852c..85b38d5 100755 (executable)
@@ -8,32 +8,32 @@
 
 class CChildFrame : public OCC_BaseChildFrame
 {
-       DECLARE_DYNCREATE(CChildFrame)
+  DECLARE_DYNCREATE(CChildFrame)
 public:
-       CChildFrame();
+  CChildFrame();
 
-// Overrides
-       // ClassWizard generated virtual function overrides
-       //{{AFX_VIRTUAL(CChildFrame)
-       public:
-       virtual void ActivateFrame(int nCmdShow = -1);
-       virtual BOOL DestroyWindow();
-       //}}AFX_VIRTUAL
+  // Overrides
+  // ClassWizard generated virtual function overrides
+  //{{AFX_VIRTUAL(CChildFrame)
+public:
+  virtual void ActivateFrame(int nCmdShow = -1);
+  virtual BOOL DestroyWindow();
+  //}}AFX_VIRTUAL
 
-// Implementation
+  // Implementation
 public:
-       virtual ~CChildFrame();
+  virtual ~CChildFrame();
 #ifdef _DEBUG
-       virtual void AssertValid() const;
-       virtual void Dump(CDumpContext& dc) const;
+  virtual void AssertValid() const;
+  virtual void Dump(CDumpContext& dc) const;
 #endif
 
-// Generated message map functions
+  // Generated message map functions
 protected:
-       //{{AFX_MSG(CChildFrame)
-       afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
-       //}}AFX_MSG
-       DECLARE_MESSAGE_MAP()
+  //{{AFX_MSG(CChildFrame)
+  afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
+  //}}AFX_MSG
+  DECLARE_MESSAGE_MAP()
 };
 
 /////////////////////////////////////////////////////////////////////////////
index 16b773d..a26eecb 100755 (executable)
@@ -1,25 +1,23 @@
 // ChildFrm2D.cpp : implementation of the CChildFrame2D class/
 
 #include "stdafx.h"
-
 #include "ChildFrm2d.h"
-
 #include "GeometryApp.h"
 
 IMPLEMENT_DYNCREATE(CChildFrame2D, CMDIChildWnd)
 
 BEGIN_MESSAGE_MAP(CChildFrame2D, CMDIChildWnd)
-       //{{AFX_MSG_MAP(CChildFrame2D)
-       ON_WM_CREATE()
-       //}}AFX_MSG_MAP
+  //{{AFX_MSG_MAP(CChildFrame2D)
+  ON_WM_CREATE()
+  //}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
 static UINT indicators[] =
 {
-       ID_SEPARATOR,           // status line indicator
-       ID_INDICATOR_CAPS,
-       ID_INDICATOR_NUM,
-       ID_INDICATOR_SCRL,
+  ID_SEPARATOR,           // status line indicator
+  ID_INDICATOR_CAPS,
+  ID_INDICATOR_NUM,
+  ID_INDICATOR_SCRL,
 };
 
 
@@ -28,8 +26,8 @@ static UINT indicators[] =
 
 CChildFrame2D::CChildFrame2D()
 {
-       // TODO: add member initialization code here
-       
+  // TODO: add member initialization code here
+
 }
 
 CChildFrame2D::~CChildFrame2D()
@@ -42,12 +40,12 @@ CChildFrame2D::~CChildFrame2D()
 #ifdef _DEBUG
 void CChildFrame2D::AssertValid() const
 {
-       CMDIChildWnd::AssertValid();
+  CMDIChildWnd::AssertValid();
 }
 
 void CChildFrame2D::Dump(CDumpContext& dc) const
 {
-       CMDIChildWnd::Dump(dc);
+  CMDIChildWnd::Dump(dc);
 }
 
 #endif //_DEBUG
@@ -57,35 +55,35 @@ void CChildFrame2D::Dump(CDumpContext& dc) const
 
 int CChildFrame2D::OnCreate(LPCREATESTRUCT lpCreateStruct) 
 {
-       
-       if (CMDIChildWnd::OnCreate(lpCreateStruct) == -1)
-               return -1;
-       
-       if (!m_wndToolBar.Create(this) ||
-               !m_wndToolBar.LoadToolBar(IDR_2dCHILDFRAME))
-       {
-               TRACE0("Failed to create toolbar\n");
-               return -1;      // fail to create
-       }
-
-       // TODO: Remove this if you don't want tool tips or a resizeable toolbar
-       m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() |
-               CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
-
-       // TODO: Delete these three lines if you don't want the toolbar to
-       //  be dockable
-       m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
-       EnableDocking(CBRS_ALIGN_ANY);
-       DockControlBar(&m_wndToolBar);
-       
-       return 0;
+
+  if (CMDIChildWnd::OnCreate(lpCreateStruct) == -1)
+    return -1;
+
+  if (!m_wndToolBar.Create(this) ||
+    !m_wndToolBar.LoadToolBar(IDR_2dCHILDFRAME))
+  {
+    TRACE0("Failed to create toolbar\n");
+    return -1;      // fail to create
+  }
+
+  // TODO: Remove this if you don't want tool tips or a resizeable toolbar
+  m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() |
+    CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
+
+  // TODO: Delete these three lines if you don't want the toolbar to
+  //  be dockable
+  m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
+  EnableDocking(CBRS_ALIGN_ANY);
+  DockControlBar(&m_wndToolBar);
+
+  return 0;
 
 }
 
 
 void CChildFrame2D::ActivateFrame(int nCmdShow) 
 {
-       // TODO: Add your specialized code here and/or call the base class
-       
-       CMDIChildWnd::ActivateFrame(nCmdShow);
+  // TODO: Add your specialized code here and/or call the base class
+
+  CMDIChildWnd::ActivateFrame(nCmdShow);
 }
index 2cf26c6..525912f 100755 (executable)
@@ -8,38 +8,38 @@
 
 class CChildFrame2D : public OCC_BaseChildFrame
 {
-       DECLARE_DYNCREATE(CChildFrame2D)
+  DECLARE_DYNCREATE(CChildFrame2D)
 public:
-       CChildFrame2D();
+  CChildFrame2D();
 
-// Attributes
+  // Attributes
 public:
 
-// Operations
+  // Operations
 public:
 
-// Overrides
-       // ClassWizard generated virtual function overrides
-       //{{AFX_VIRTUAL(CChildFrame2D)
-       public:
-       virtual void ActivateFrame(int nCmdShow = -1);
-       //}}AFX_VIRTUAL
+  // Overrides
+  // ClassWizard generated virtual function overrides
+  //{{AFX_VIRTUAL(CChildFrame2D)
+public:
+  virtual void ActivateFrame(int nCmdShow = -1);
+  //}}AFX_VIRTUAL
 
-// Implementation
+  // Implementation
 public:
-       virtual ~CChildFrame2D();
+  virtual ~CChildFrame2D();
 #ifdef _DEBUG
-       virtual void AssertValid() const;
-       virtual void Dump(CDumpContext& dc) const;
+  virtual void AssertValid() const;
+  virtual void Dump(CDumpContext& dc) const;
 #endif
 
-// Generated message map functions
+  // Generated message map functions
 protected:
-       //CToolBar m_wndToolBar;
-       //{{AFX_MSG(CChildFrame2D)
-       afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
-       //}}AFX_MSG
-       DECLARE_MESSAGE_MAP()
+  //CToolBar m_wndToolBar;
+  //{{AFX_MSG(CChildFrame2D)
+  afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
+  //}}AFX_MSG
+  DECLARE_MESSAGE_MAP()
 };
 
 /////////////////////////////////////////////////////////////////////////////
index 48dd6c4..a7e3552 100755 (executable)
@@ -34,7 +34,7 @@
 //=============================================================================
 GeoAlgo_Sol::GeoAlgo_Sol():myIsDone(Standard_False)
 {
-       
+
 }
 
 
@@ -115,7 +115,6 @@ void GeoAlgo_Sol::Build(const TColgp_SequenceOfXYZ& seqOfXYZ)
 //=============================================================================
 Handle(Geom_BSplineSurface) GeoAlgo_Sol::Surface() const
 {
-
   return myGround;
 }
 
@@ -139,15 +138,15 @@ Standard_Boolean GeoAlgo_Sol::IsDone() const
 //=============================================================================
 Handle(Geom_BSplineSurface) GeoAlgo_Sol::Read(const Standard_CString aGroundName)
 {
-// This methods read a file of points ans build a surface using plate algorithm
+  // This methods read a file of points ans build a surface using plate algorithm
 
   myIsDone = Standard_True;
   Standard_Integer nbPnt=0;
 
-// Read points from the file
+  // Read points from the file
   filebuf fic;
   istream in(&fic);
-  
+
   if (!fic.open(aGroundName,ios::in)){
     cout << " impossible to open a file : "<<aGroundName<<endl;
     myIsDone = Standard_False;
@@ -159,9 +158,9 @@ Handle(Geom_BSplineSurface) GeoAlgo_Sol::Read(const Standard_CString aGroundName
   Standard_Real x,y,z;
   while (!in.fail()|| !in.eof()){
     if (in >> x && in >> y && in >> z){
-         pntXYZ.SetX(x);
-         pntXYZ.SetY(y);
-         pntXYZ.SetZ(z);
+      pntXYZ.SetX(x);
+      pntXYZ.SetY(y);
+      pntXYZ.SetZ(z);
       nbPnt++;
       seqOfXYZ.Append(pntXYZ);
     }
@@ -169,12 +168,4 @@ Handle(Geom_BSplineSurface) GeoAlgo_Sol::Read(const Standard_CString aGroundName
   fic.close();
   Build(seqOfXYZ);
   return myGround;
-
 }
-
-
-
-
-
-
-
index b14e8f5..334300e 100755 (executable)
@@ -33,32 +33,19 @@ class Geom_BSplineSurface;
 #include <Standard_Macro.hxx>
 #endif
 
-class GeoAlgo_Sol  {
+class GeoAlgo_Sol
+{
 
 public:
 
  // Methods PUBLIC
  // 
-Standard_EXPORT GeoAlgo_Sol();
-Standard_EXPORT GeoAlgo_Sol(const Standard_CString aGroundName);
-Standard_EXPORT   void Build(const Standard_CString aGroundName) ;
-Standard_EXPORT   void Build(const TColgp_SequenceOfXYZ& aSeqofPoints) ;
-Standard_EXPORT   Handle_Geom_BSplineSurface Surface() const;
-Standard_EXPORT   Standard_Boolean IsDone() const;
-
-
-
-
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-
+  Standard_EXPORT GeoAlgo_Sol();
+  Standard_EXPORT GeoAlgo_Sol(const Standard_CString aGroundName);
+  Standard_EXPORT void Build(const Standard_CString aGroundName) ;
+  Standard_EXPORT void Build(const TColgp_SequenceOfXYZ& aSeqofPoints) ;
+  Standard_EXPORT Handle_Geom_BSplineSurface Surface() const;
+  Standard_EXPORT Standard_Boolean IsDone() const;
 
 private: 
 
@@ -66,14 +53,11 @@ private:
  // 
 Standard_EXPORT   Handle_Geom_BSplineSurface Read(const Standard_CString aGroundName) ;
 
-
-
  // Fields PRIVATE
  //
 Handle_Geom_BSplineSurface myGround;
 Standard_Boolean myIsDone;
 
-
 };
 
 
index 12b8f81..6ac43ba 100755 (executable)
@@ -6,7 +6,6 @@
 #include "GeomSources.h"
 #include "GeometryApp.h"
 #include "MainFrm.h"
-//#include "Geom_Axis2Placement.hxx"
 
 GeomSources::GeomSources()
 {
@@ -15,47 +14,43 @@ GeomSources::GeomSources()
 GeomSources::~GeomSources()
 {
 }
-
-
 void GeomSources::PreProcess(CGeometryDoc* aDoc,DisplayType aDisplayType)
 {
-    if (aDisplayType == No2D3D )
-    {   
-      aDoc->GetAISContext()->EraseAll(Standard_False);
-         aDoc->Put3DOnTop(); 
-    }
-
-    if (aDisplayType == a2DNo3D)
-    { 
-      aDoc->GetISessionContext()->EraseAll();
-         aDoc->Put2DOnTop();
-    }
-
-    if (aDisplayType != No2D3D && aDisplayType != a2D3D)
-    {  
-      aDoc->Minimize3D();
-    }
-
-    if (aDisplayType != a2DNo3D && aDisplayType != a2D3D)
-    {  
-      aDoc->Minimize2D();
-    }
-
-    if (aDisplayType == a2D3D)
-    {
-      aDoc->GetAISContext()->EraseAll(Standard_False);
-      aDoc->GetISessionContext()->EraseAll();
-      aDoc->Put3DOnTop(false); 
-      aDoc->Put2DOnTop(false);
-
-        // both on top
-        // send the message Title Horizontaly to the child of doc main frame
-      CGeometryApp* TheAppli = (CGeometryApp*)AfxGetApp();
-      CMainFrame* TheMainFrame= (CMainFrame*)TheAppli->m_pMainWnd;
-         ::SendMessage(TheMainFrame->m_hWndMDIClient, WM_MDITILE, 0, 0);
-    }
-
-    //aDoc->myCResultDialog.Empty();
+  if (aDisplayType == No2D3D )
+  {   
+    aDoc->GetAISContext()->EraseAll(Standard_False);
+    aDoc->Put3DOnTop(); 
+  }
+
+  if (aDisplayType == a2DNo3D)
+  { 
+    aDoc->GetISessionContext()->EraseAll();
+    aDoc->Put2DOnTop();
+  }
+
+  if (aDisplayType != No2D3D && aDisplayType != a2D3D)
+  {  
+    aDoc->Minimize3D();
+  }
+
+  if (aDisplayType != a2DNo3D && aDisplayType != a2D3D)
+  {  
+    aDoc->Minimize2D();
+  }
+
+  if (aDisplayType == a2D3D)
+  {
+    aDoc->GetAISContext()->EraseAll(Standard_False);
+    aDoc->GetISessionContext()->EraseAll();
+    aDoc->Put3DOnTop(false); 
+    aDoc->Put2DOnTop(false);
+
+    // both on top
+    // send the message Title Horizontaly to the child of doc main frame
+    CGeometryApp* TheAppli = (CGeometryApp*)AfxGetApp();
+    CMainFrame* TheMainFrame= (CMainFrame*)TheAppli->m_pMainWnd;
+    ::SendMessage(TheMainFrame->m_hWndMDIClient, WM_MDITILE, 0, 0);
+  }
 }
 
 void GeomSources::PostProcess(CGeometryDoc* aDoc,
@@ -65,52 +60,48 @@ void GeomSources::PostProcess(CGeometryDoc* aDoc,
                                                          Quantity_Coefficient Coef /* = -1 */
                                                          /* double Zoom = -1 */)
 {
-    if (aDisplayType == No2D3D || aDisplayType == a2D3D)
-    {   
-      aDoc->Fit3DViews(Coef);
-      //if (Zoom != -1)    aDoc->Set3DViewsZoom(Zoom);
-    }
+  if (aDisplayType == No2D3D || aDisplayType == a2D3D)
+  {   
+    aDoc->Fit3DViews(Coef);
+  }
 
-    if (aDisplayType == a2DNo3D || aDisplayType == a2D3D)
-    { 
-      aDoc->Fit2DViews();  
-      //if (Zoom != -1) MessageBox(0,"Set 2D Zoom Not Yet Implemented","CasCade Error",MB_ICONERROR);// aDoc->Set2DViewsZoom(Zoom);
-    }
+  if (aDisplayType == a2DNo3D || aDisplayType == a2D3D)
+  { 
+    aDoc->Fit2DViews();  
+  }
 
-        TCollection_AsciiString Message("Results are ");
+  TCollection_AsciiString Message("Results are ");
 
   switch (aDisplayType)
   {
-    case No2DNo3D: Message = "All results are in this box \n";
+  case No2DNo3D: Message = "All results are in this box \n";
     break;
-    case No2D3D:   Message += "only in 3D \n";
+  case No2D3D:   Message += "only in 3D \n";
     break;
-    case a2DNo3D:   Message += "only in 2d \n";
+  case a2DNo3D:   Message += "only in 2d \n";
     break;
-    case a2D3D:     Message += "in both 2D and 3D \n";
+  case a2D3D:     Message += "in both 2D and 3D \n";
     break;
-    }   
-    Message += "====================================\n";
-    Message += aString;
- //   MessageBox(0,Message.ToCString(),aTitle,MB_OK);
-    //aDoc->myCResultDialog.ShowWindow(SW_RESTORE);
+  }   
+  Message += "====================================\n";
+  Message += aString;
 
-    CString text(Message.ToCString());
-       aDoc->myCResultDialog.SetText(text);
+  CString text(Message.ToCString());
+  aDoc->myCResultDialog.SetText(text);
 
-    CString s;
-    if (! s.LoadString( anID ))
-      AfxMessageBox("Error Loading String: ");
+  CString s;
+  if (! s.LoadString( anID ))
+    AfxMessageBox("Error Loading String: ");
 
-    CString Title = s.Left( s.Find( '\n' ));
+  CString Title = s.Left( s.Find( '\n' ));
 
-    aDoc->myCResultDialog.SetTitle(Title);
-    aDoc->SetTitle(Title);
+  aDoc->myCResultDialog.SetTitle(Title);
+  aDoc->SetTitle(Title);
 }
 
 void GeomSources::AddSeparator(CGeometryDoc* aDoc,TCollection_AsciiString& aMessage)
 {
-    aMessage+= "------------------------------------------------------------------------\n";
+  aMessage+= "------------------------------------------------------------------------\n";
 }
 void GeomSources::DisplayPoint(CGeometryDoc* aDoc,
                           gp_Pnt2d& aPoint,
@@ -120,11 +111,11 @@ void GeomSources::DisplayPoint(CGeometryDoc* aDoc,
                           Standard_Real anYoffset,
                           Standard_Real TextScale)
 {
-    Handle(ISession_Point) aGraphicPoint = new ISession_Point(aPoint);
-    aDoc->GetISessionContext()->Display(aGraphicPoint,UpdateViewer);
-    Handle(ISession_Text)  aGraphicText = new ISession_Text(aText,aPoint.X()+anXoffset,aPoint.Y()+anYoffset);
-    aGraphicText->SetScale  (TextScale);
-    aDoc->GetISessionContext()->Display(aGraphicText,UpdateViewer);
+  Handle(ISession_Point) aGraphicPoint = new ISession_Point(aPoint);
+  aDoc->GetISessionContext()->Display(aGraphicPoint,UpdateViewer);
+  Handle(ISession_Text)  aGraphicText = new ISession_Text(aText,aPoint.X()+anXoffset,aPoint.Y()+anYoffset);
+  aGraphicText->SetScale  (TextScale);
+  aDoc->GetISessionContext()->Display(aGraphicText,UpdateViewer);
 }
 
 void GeomSources::DisplayPoint(CGeometryDoc* aDoc,
@@ -136,11 +127,11 @@ void GeomSources::DisplayPoint(CGeometryDoc* aDoc,
                           Standard_Real aZoffset,
                           Standard_Real TextScale)
 {
-    Handle(ISession_Point) aGraphicPoint = new ISession_Point(aPoint);
-    aDoc->GetAISContext()->Display(aGraphicPoint,UpdateViewer);
-    Handle(ISession_Text)  aGraphicText = new ISession_Text(aText,aPoint.X()+anXoffset,aPoint.Y()+anYoffset,aPoint.Z()+aZoffset);
-    aGraphicText->SetScale  (TextScale);
-    aDoc->GetAISContext()->Display(aGraphicText,UpdateViewer);
+  Handle(ISession_Point) aGraphicPoint = new ISession_Point(aPoint);
+  aDoc->GetAISContext()->Display(aGraphicPoint,UpdateViewer);
+  Handle(ISession_Text)  aGraphicText = new ISession_Text(aText,aPoint.X()+anXoffset,aPoint.Y()+anYoffset,aPoint.Z()+aZoffset);
+  aGraphicText->SetScale  (TextScale);
+  aDoc->GetAISContext()->Display(aGraphicText,UpdateViewer);
 }
 
 void GeomSources::DisplayCurve(CGeometryDoc* aDoc,
@@ -148,9 +139,9 @@ void GeomSources::DisplayCurve(CGeometryDoc* aDoc,
                           Standard_Integer aColorIndex,
                           Standard_Boolean UpdateViewer)
 {
-    Handle(ISession2D_Curve) aGraphicCurve = new ISession2D_Curve(aCurve);
-    aGraphicCurve->SetColorIndex(aColorIndex) ;
-    aDoc->GetISessionContext()->Display(aGraphicCurve,UpdateViewer);
+  Handle(ISession2D_Curve) aGraphicCurve = new ISession2D_Curve(aCurve);
+  aGraphicCurve->SetColorIndex(aColorIndex) ;
+  aDoc->GetISessionContext()->Display(aGraphicCurve,UpdateViewer);
 }
 
 void GeomSources::DisplayCurveAndCurvature(CGeometryDoc* aDoc,
@@ -158,11 +149,11 @@ void GeomSources::DisplayCurveAndCurvature(CGeometryDoc* aDoc,
                           Standard_Integer aColorIndex,
                           Standard_Boolean UpdateViewer)
 {
-    Handle(ISession2D_Curve) aGraphicCurve = new ISession2D_Curve(aCurve);
-    aGraphicCurve->SetDisplayCurbure(Standard_True) ;
-    aGraphicCurve->SetDiscretisation(20);
-    aGraphicCurve->SetColorIndex(aColorIndex) ;
-    aDoc->GetISessionContext()->Display(aGraphicCurve,UpdateViewer);
+  Handle(ISession2D_Curve) aGraphicCurve = new ISession2D_Curve(aCurve);
+  aGraphicCurve->SetDisplayCurbure(Standard_True) ;
+  aGraphicCurve->SetDiscretisation(20);
+  aGraphicCurve->SetColorIndex(aColorIndex) ;
+  aDoc->GetISessionContext()->Display(aGraphicCurve,UpdateViewer);
 }
 
 void GeomSources::DisplayCurve(CGeometryDoc* aDoc,
@@ -170,10 +161,10 @@ void GeomSources::DisplayCurve(CGeometryDoc* aDoc,
                           Quantity_NameOfColor aNameOfColor, 
                           Standard_Boolean UpdateViewer)
 {
-    Handle(ISession_Curve) aGraphicCurve = new ISession_Curve(aCurve);
-    aDoc->GetAISContext()->SetColor(aGraphicCurve,aNameOfColor, Standard_False);
-    aGraphicCurve->Attributes()->LineAspect()->SetColor(aNameOfColor);
-    aDoc->GetAISContext()->Display(aGraphicCurve,UpdateViewer);
+  Handle(ISession_Curve) aGraphicCurve = new ISession_Curve(aCurve);
+  aDoc->GetAISContext()->SetColor(aGraphicCurve,aNameOfColor, Standard_False);
+  aGraphicCurve->Attributes()->LineAspect()->SetColor(aNameOfColor);
+  aDoc->GetAISContext()->Display(aGraphicCurve,UpdateViewer);
 }
 
 void GeomSources::DisplayCurve(CGeometryDoc* aDoc,
@@ -192,20 +183,20 @@ void GeomSources::DisplaySurface(CGeometryDoc* aDoc,
                           Quantity_NameOfColor aNameOfColor, 
                           Standard_Boolean UpdateViewer)
 {
-    Handle(ISession_Surface) aGraphicalSurface = new ISession_Surface(aSurface);
-    aDoc->GetAISContext()->SetColor(aGraphicalSurface,aNameOfColor, Standard_False);
-    aGraphicalSurface->Attributes()->FreeBoundaryAspect()->SetColor(aNameOfColor);
-    aGraphicalSurface->Attributes()->UIsoAspect()->SetColor(aNameOfColor);
-    aGraphicalSurface->Attributes()->VIsoAspect()->SetColor(aNameOfColor);
-    aDoc->GetAISContext()->Display(aGraphicalSurface,UpdateViewer);
+  Handle(ISession_Surface) aGraphicalSurface = new ISession_Surface(aSurface);
+  aDoc->GetAISContext()->SetColor(aGraphicalSurface,aNameOfColor, Standard_False);
+  aGraphicalSurface->Attributes()->FreeBoundaryAspect()->SetColor(aNameOfColor);
+  aGraphicalSurface->Attributes()->UIsoAspect()->SetColor(aNameOfColor);
+  aGraphicalSurface->Attributes()->VIsoAspect()->SetColor(aNameOfColor);
+  aDoc->GetAISContext()->Display(aGraphicalSurface,UpdateViewer);
 }
 
 void GeomSources::DisplaySurface(CGeometryDoc* aDoc,
                           Handle(Geom_Surface) aSurface,
                           Standard_Boolean UpdateViewer)
 {
-    Handle(ISession_Surface) aGraphicalSurface = new ISession_Surface(aSurface);
-    aDoc->GetAISContext()->Display(aGraphicalSurface,UpdateViewer);
+  Handle(ISession_Surface) aGraphicalSurface = new ISession_Surface(aSurface);
+  aDoc->GetAISContext()->Display(aGraphicalSurface,UpdateViewer);
 }
 
 // Function name       : GeomSources::gpTest1
@@ -216,34 +207,33 @@ void GeomSources::gpTest1(CGeometryDoc* aDoc)
 {
   DisplayType TheDisplayType = No2D3D;
   PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                        
-gp_XYZ A(1,2,3);                        
-gp_XYZ B(2,2,2);                        
-gp_XYZ C(3,2,3);                        
-Standard_Real result = A.DotCross(B,C); 
+  //==============================================================
+
+  gp_XYZ A(1,2,3);                        
+  gp_XYZ B(2,2,2);                        
+  gp_XYZ C(3,2,3);                        
+  Standard_Real result = A.DotCross(B,C); 
                                         
 //==============================================================
-    TCollection_AsciiString Message ("\
+  TCollection_AsciiString Message ("\
                                         \n\
 gp_XYZ A(1,2,3);                        \n\
 gp_XYZ B(2,2,2);                        \n\
 gp_XYZ C(3,2,3);                        \n\
 Standard_Real result = A.DotCross(B,C); \n\
                                         \n");
-    AddSeparator(aDoc,Message);
+  AddSeparator(aDoc,Message);
 //--------------------------------------------------------------
     DisplayPoint(aDoc,gp_Pnt(A),"A (1,2,3)",false,0.1);
     DisplayPoint(aDoc,gp_Pnt(B),"B (2,2,2)",false,0.1);
     DisplayPoint(aDoc,gp_Pnt(C),"C (3,2,3)", false,0.1);
 
 // to add a numeric value in a TCollectionAsciiString  
-       TCollection_AsciiString Message2 (result);
+  TCollection_AsciiString Message2 (result);
     
-       Message+= " result = ";
-    Message+= Message2;
-
-    PostProcess(aDoc,ID_BUTTON_Test_1,TheDisplayType,Message.ToCString());
+  Message+= " result = ";
+  Message+= Message2;
+  PostProcess(aDoc,ID_BUTTON_Test_1,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest2
@@ -256,17 +246,17 @@ void GeomSources::gpTest2(CGeometryDoc* aDoc)
   PreProcess(aDoc,TheDisplayType);
 //==============================================================
                    
-gp_Pnt P1(1,2,3);  
+  gp_Pnt P1(1,2,3);  
                    
 //==============================================================
-TCollection_AsciiString Message ("\
+  TCollection_AsciiString Message ("\
                   \n\
 gp_Pnt P1(1,2,3); \n\
                   \n");
-AddSeparator(aDoc,Message);
+  AddSeparator(aDoc,Message);
 //--------------------------------------------------------------
-DisplayPoint(aDoc,P1,"P1 (1,2,3)",false,0.5);
-PostProcess(aDoc,ID_BUTTON_Test_2,TheDisplayType,Message.ToCString(),1.0);
+  DisplayPoint(aDoc,P1,"P1 (1,2,3)",false,0.5);
+  PostProcess(aDoc,ID_BUTTON_Test_2,TheDisplayType,Message.ToCString(),1.0);
 }
 
 
@@ -276,24 +266,23 @@ PostProcess(aDoc,ID_BUTTON_Test_2,TheDisplayType,Message.ToCString(),1.0);
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest3(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
 //==============================================================
                   
-gp_XYZ A(1,2,3);  
-gp_Pnt P2(A);     
+  gp_XYZ A(1,2,3);  
+  gp_Pnt P2(A);     
                   
 //==============================================================
-    TCollection_AsciiString Message ("\
+  TCollection_AsciiString Message ("\
                    \n\
 gp_XYZ A(1,2,3);   \n\
 gp_Pnt P2(A);      \n\
                    \n");
-AddSeparator(aDoc,Message);
+  AddSeparator(aDoc,Message);
 //--------------------------------------------------------------
-DisplayPoint(aDoc,P2,"P2 (1,2,3)",false,0.5);
-
-PostProcess(aDoc,ID_BUTTON_Test_3,TheDisplayType,Message.ToCString(),1.0 /*0.02*/);
+  DisplayPoint(aDoc,P2,"P2 (1,2,3)",false,0.5);
+  PostProcess(aDoc,ID_BUTTON_Test_3,TheDisplayType,Message.ToCString(),1.0 /*0.02*/);
 }
 
 
@@ -303,14 +292,14 @@ PostProcess(aDoc,ID_BUTTON_Test_3,TheDisplayType,Message.ToCString(),1.0 /*0.02*
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest4(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
 //==============================================================
                                               
-gp_Pnt P3 = gp::Origin();                     
-Standard_Real TheX = P3.X();
-Standard_Real TheY = P3.Y();
-Standard_Real TheZ = P3.Z();
+  gp_Pnt P3 = gp::Origin();                     
+  Standard_Real TheX = P3.X();
+  Standard_Real TheY = P3.Y();
+  Standard_Real TheZ = P3.Z();
   
                                               
 //==============================================================
@@ -321,23 +310,23 @@ Standard_Real TheX = P3.X();   \n\
 Standard_Real TheY = P3.Y();   \n\
 Standard_Real TheZ = P3.Z();   \n\
                                \n");
-AddSeparator(aDoc,Message);
+  AddSeparator(aDoc,Message);
 //--------------------------------------------------------------
-DisplayPoint(aDoc,P3,"P3 = gp::Origin()",false,0.5);
-
-TCollection_AsciiString Message2 (TheX);
-TCollection_AsciiString Message3 (TheY);
-TCollection_AsciiString Message4 (TheZ);
-           
-       Message += " TheX = ";
-       Message += Message2;
-    Message += " TheY = "; 
-       Message += Message3;
-    Message += " TheZ = "; 
-       Message4 = TheZ;
-       Message += Message4;
-
-PostProcess(aDoc,ID_BUTTON_Test_4,TheDisplayType,Message.ToCString(),1.0 /*0.02*/);
+  DisplayPoint(aDoc,P3,"P3 = gp::Origin()",false,0.5);
+
+  TCollection_AsciiString Message2 (TheX);
+  TCollection_AsciiString Message3 (TheY);
+  TCollection_AsciiString Message4 (TheZ);
+
+  Message += " TheX = ";
+  Message += Message2;
+  Message += " TheY = "; 
+  Message += Message3;
+  Message += " TheZ = "; 
+  Message4 = TheZ;
+  Message += Message4;
+
+  PostProcess(aDoc,ID_BUTTON_Test_4,TheDisplayType,Message.ToCString(),1.0 /*0.02*/);
 }
 
 
@@ -347,19 +336,19 @@ PostProcess(aDoc,ID_BUTTON_Test_4,TheDisplayType,Message.ToCString(),1.0 /*0.02*
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest5(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
 //==============================================================
                                
-gp_Pnt P1(1,2,3);              
-gp_Pnt P2(3,4,5);              
-gp_Pnt PB = P1;                
-Standard_Real alpha = 3;       
-Standard_Real beta = 7;        
-PB.BaryCenter(alpha,P2,beta);  
+  gp_Pnt P1(1,2,3);              
+  gp_Pnt P2(3,4,5);              
+  gp_Pnt PB = P1;                
+  Standard_Real alpha = 3;       
+  Standard_Real beta = 7;        
+  PB.BaryCenter(alpha,P2,beta);  
                                
 //==============================================================
-    TCollection_AsciiString Message ("\
+  TCollection_AsciiString Message ("\
                                  \n\
 gp_Pnt P1(1,2,3);                \n\
 gp_Pnt P2(3,4,5);                \n\
@@ -369,27 +358,25 @@ Standard_Real beta = 7;          \n\
 PB.BaryCenter(alpha,P2,beta);    \n\
                                  \n");
 
-    AddSeparator(aDoc,Message);
+  AddSeparator(aDoc,Message);
 //--------------------------------------------------------------
 
-    DisplayPoint(aDoc,P1,"P1",false,0.2);
-    DisplayPoint(aDoc,P2,"P2",false,0.2);
-    DisplayPoint(aDoc,PB,"PB = barycenter ( 3 * P1 , 7 * P2) ",false,0.2);
-
-    TCollection_AsciiString Message2 (PB.X());
-       TCollection_AsciiString Message3 (PB.Y());
-       TCollection_AsciiString Message4 (PB.Z());
-
-       
-       
-       Message += " PB ( ";
-       Message += Message2; 
-       Message += " , ";
-    Message += Message3; 
-       Message += " , ";
-    Message += Message4; 
-       Message += " ); ";
-    PostProcess(aDoc,ID_BUTTON_Test_5,TheDisplayType,Message.ToCString());
+  DisplayPoint(aDoc,P1,"P1",false,0.2);
+  DisplayPoint(aDoc,P2,"P2",false,0.2);
+  DisplayPoint(aDoc,PB,"PB = barycenter ( 3 * P1 , 7 * P2) ",false,0.2);
+
+  TCollection_AsciiString Message2 (PB.X());
+  TCollection_AsciiString Message3 (PB.Y());
+  TCollection_AsciiString Message4 (PB.Z());
+
+  Message += " PB ( ";
+  Message += Message2; 
+  Message += " , ";
+  Message += Message3; 
+  Message += " , ";
+  Message += Message4; 
+  Message += " ); ";
+  PostProcess(aDoc,ID_BUTTON_Test_5,TheDisplayType,Message.ToCString());
 }
 
 
@@ -399,43 +386,45 @@ PB.BaryCenter(alpha,P2,beta);    \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest6(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
 //==============================================================
                                                                  
 //  Compute a 3d point P as BaryCenter of an array of point
-gp_Pnt P1(0,0,5);                                                
-gp_Pnt P2(1,2,3);                                                
-gp_Pnt P3(2,3,-2);                                                
-gp_Pnt P4(4,3,5);                                                
-gp_Pnt P5(5,5,4);                                                
-TColgp_Array1OfPnt array (1,5); // sizing array                  
-array.SetValue(1,P1);                                            
-array.SetValue(2,P2);                                            
-array.SetValue(3,P3);                                            
-array.SetValue(4,P4);                                            
-array.SetValue(5,P5);                                            
-                                                                 
-Standard_Real Tolerance = 8; // ajout de la tolerance            
-GProp_PEquation PE (array,Tolerance);                            
-                                                                 
-gp_Pnt P; // P declaration                                    
-Standard_Boolean IsPoint;                                        
-
-if (PE.IsPoint()){
-       IsPoint = true;                                
+  gp_Pnt P1(0,0,5);
+  gp_Pnt P2(1,2,3);
+  gp_Pnt P3(2,3,-2);
+  gp_Pnt P4(4,3,5);
+  gp_Pnt P5(5,5,4);                                                
+  TColgp_Array1OfPnt array (1,5); // sizing array                  
+  array.SetValue(1,P1);
+  array.SetValue(2,P2);
+  array.SetValue(3,P3);
+  array.SetValue(4,P4);
+  array.SetValue(5,P5);
+
+  Standard_Real Tolerance = 8; // ajout de la tolerance            
+  GProp_PEquation PE (array,Tolerance);
+
+  gp_Pnt P; // P declaration
+  Standard_Boolean IsPoint;
+
+  if (PE.IsPoint())
+  {
+    IsPoint = true;
     P = PE .Point();
-       }                              
-else { 
-       IsPoint = false;  
-       }                     
-
-if (PE.IsLinear()){ /*... */ }  
-if (PE.IsPlanar()){ /*... */ }   
-if (PE.IsSpace()) { /*... */ }     
+  }
+  else 
+  { 
+    IsPoint = false;
+  }                     
+
+  if (PE.IsLinear()){ /*... */ }
+  if (PE.IsPlanar()){ /*... */ }
+  if (PE.IsSpace()) { /*... */ }
                                                                  
 //==============================================================
-    TCollection_AsciiString Message ("\
+  TCollection_AsciiString Message ("\
                                                                  \n\
                                                                  \n\
 //  Compute a 3d point P as BaryCenter of an array of point      \n\
@@ -463,39 +452,55 @@ if (PE.IsLinear()){ /*... */ }                                   \n\
 if (PE.IsPlanar()){ /*... */ }                                   \n\
 if (PE.IsSpace()) { /*... */ }                                   \n\
                                                                  \n");
-    AddSeparator(aDoc,Message);
+  AddSeparator(aDoc,Message);
     //--------------------------------------------------------------
 
-    TCollection_AsciiString PointName("P");
+  TCollection_AsciiString PointName("P");
     
 
        for(Standard_Integer i= array.Lower();i <= array.Upper(); i++)
-    {
-           
-               TCollection_AsciiString TheString (i);
-               TheString = PointName+ TheString;
-               DisplayPoint(aDoc,array(i),TheString.ToCString(),false,0.5);
-    }
-
-    DisplayPoint(aDoc,P,"P",false,0.5);
-       TCollection_AsciiString Message2 (P.X());
-       TCollection_AsciiString Message3 (P.Y());
-       TCollection_AsciiString Message4 (P.Z());
-
+  { 
+    TCollection_AsciiString TheString (i);
+    TheString = PointName+ TheString;
+    DisplayPoint(aDoc,array(i),TheString.ToCString(),false,0.5);
+  }
+
+  DisplayPoint(aDoc,P,"P",false,0.5);
+  TCollection_AsciiString Message2 (P.X());
+  TCollection_AsciiString Message3 (P.Y());
+  TCollection_AsciiString Message4 (P.Z());
+
+  Message += " IsPoint = ";
+  if (IsPoint) 
+  {
+    Message += "True   -->  ";
+    Message += " P ( ";
 
-     Message += " IsPoint = ";  if (IsPoint) {
-     Message += "True   -->  ";
-     Message += " P ( ";
-     
-        Message += Message2; Message += " , ";
-     Message += Message3; Message += " , ";
-     Message += Message4; Message += " ); \n";
-    
-       
-       }  else Message += "False\n";
-    Message += " IsLinear = ";  if (PE.IsLinear()) Message += "True \n";  else Message += "False\n";
-    Message += " IsPlanar = ";  if (PE.IsPlanar()) Message += "True \n";  else Message += "False\n";
-    Message += " IsSpace = ";   if (PE.IsSpace() ) Message += "True \n";  else Message += "False\n";
+    Message += Message2; Message += " , ";
+    Message += Message3; Message += " , ";
+    Message += Message4; Message += " ); \n";
+       }  
+  else 
+    Message += "False\n";
+
+  Message += " IsLinear = ";  
+  if (PE.IsLinear()) 
+    Message += "True \n"; 
+  else
+    Message += "False\n";
+
+  Message += " IsPlanar = ";
+  if (PE.IsPlanar())
+    Message += "True \n";
+  else
+    Message += "False\n";
+
+  Message += " IsSpace = ";
+  if
+    (PE.IsSpace())
+    Message += "True \n";
+  else
+    Message += "False\n";
 
     PostProcess(aDoc,ID_BUTTON_Test_6,TheDisplayType,Message.ToCString());
 }
@@ -506,29 +511,29 @@ if (PE.IsSpace()) { /*... */ }                                   \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest7(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
 //==============================================================
                                            
-gp_Pnt2d P1(0,5);                                       
-gp_Pnt2d P2(5.5,1);                                     
-gp_Pnt2d P3(-2,2);                                      
-                                                        
-Handle(Geom2d_TrimmedCurve) C =                         
+  gp_Pnt2d P1(0,5);                                       
+  gp_Pnt2d P2(5.5,1);                                     
+  gp_Pnt2d P3(-2,2);                                      
+
+  Handle(Geom2d_TrimmedCurve) C =                         
     GCE2d_MakeArcOfCircle (P1,P2,P3).Value();           
 
-Standard_Real FirstParameter = C->FirstParameter();
-Standard_Real LastParameter = C->LastParameter();
-Standard_Real MiddleParameter = (FirstParameter+LastParameter)/2;
-Standard_Real param = MiddleParameter; //in radians    
+  Standard_Real FirstParameter = C->FirstParameter();
+  Standard_Real LastParameter = C->LastParameter();
+  Standard_Real MiddleParameter = (FirstParameter+LastParameter)/2;
+  Standard_Real param = MiddleParameter; //in radians    
 
-gp_Pnt2d P;                                             
-gp_Vec2d V;                                             
-C->D1(param,P,V);                          
+  gp_Pnt2d P;                                             
+  gp_Vec2d V;                                             
+  C->D1(param,P,V);                          
 // we recover point P and the vector V     
                                            
 //==============================================================
-    TCollection_AsciiString Message ("\
+  TCollection_AsciiString Message ("\
                                                     \n\
                                                     \n\
 gp_Pnt2d P1(0,5);                                   \n\
@@ -549,17 +554,16 @@ gp_Vec2d V;                                         \n\
 C->D1(param,P,V);                                   \n\
 // we recover point P and the vector V              \n\
                                                     \n");
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-
-    DisplayCurve(aDoc,C);
-    Handle(ISession_Direction) aDirection = new ISession_Direction(P,V);
-    aDoc->GetISessionContext()->Display(aDirection, Standard_False);
+  DisplayCurve(aDoc,C);
+  Handle(ISession_Direction) aDirection = new ISession_Direction(P,V);
+  aDoc->GetISessionContext()->Display(aDirection, Standard_False);
 
-    DisplayPoint(aDoc,P,"P",false,0.5);
+  DisplayPoint(aDoc,P,"P",false,0.5);
 
-    PostProcess(aDoc,ID_BUTTON_Test_7,TheDisplayType,Message.ToCString());
+  PostProcess(aDoc,ID_BUTTON_Test_7,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest8
@@ -568,22 +572,22 @@ C->D1(param,P,V);                                   \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest8(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
 //==============================================================
                                                    
-Standard_Real radius = 5;                          
-Handle(Geom2d_Circle) C =                          
+  Standard_Real radius = 5;                          
+  Handle(Geom2d_Circle) C =                          
     new Geom2d_Circle(gp::OX2d(),radius);          
-Standard_Real param = 1.2*M_PI;                      
-Geom2dLProp_CLProps2d CLP                          
+  Standard_Real param = 1.2*M_PI;                      
+  Geom2dLProp_CLProps2d CLP                          
     (C,param,2,Precision::PConfusion());           
-    gp_Dir2d D;                                    
-CLP.Tangent(D);                                    
+  gp_Dir2d D;                                    
+  CLP.Tangent(D);                                    
 // D is the Tangent direction at parameter 1.2*PI  
                                                    
 //==============================================================
-    TCollection_AsciiString Message (" \
+  TCollection_AsciiString Message (" \
                                                    \n\
 Standard_Real radius = 5;                          \n\
 Handle(Geom2d_Circle) C =                          \n\
@@ -595,26 +599,22 @@ Geom2dLProp_CLProps2d CLP                          \n\
 CLP.Tangent(D);                                    \n\
 // D is the Tangent direction at parameter 1.2*PI  \n\
                                                    \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-    Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(C);
-    aDoc->GetISessionContext()->Display(aCurve,Standard_False);
-    Handle(ISession_Direction) aDirection = new ISession_Direction(gp_Pnt2d(0,0),D,2);
-    aDoc->GetISessionContext()->Display(aDirection,Standard_False);
-       
-       TCollection_AsciiString Message2 (D.X());
-       TCollection_AsciiString Message3 (D.Y());
-       
-
-     
-       Message += " D ( ";
-     Message += Message2; Message += " , ";
-     Message += Message3; Message += " ); \n";
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
+  Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(C);
+  aDoc->GetISessionContext()->Display(aCurve,Standard_False);
+  Handle(ISession_Direction) aDirection = new ISession_Direction(gp_Pnt2d(0,0),D,2);
+  aDoc->GetISessionContext()->Display(aDirection,Standard_False);
 
-    PostProcess(aDoc,ID_BUTTON_Test_8,TheDisplayType,Message.ToCString());
-}
+  TCollection_AsciiString Message2 (D.X());
+  TCollection_AsciiString Message3 (D.Y());
 
+  Message += " D ( ";
+  Message += Message2; Message += " , ";
+  Message += Message3; Message += " ); \n";
 
+  PostProcess(aDoc,ID_BUTTON_Test_8,TheDisplayType,Message.ToCString());
+}
 
 // Function name       : GeomSources::gpTest9
 // Description     : 
@@ -622,26 +622,27 @@ CLP.Tangent(D);                                    \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest9(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-    //==============================================================
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
                                                              
-Standard_Real radius = 5;                                    
-Handle(Geom2d_Circle) C =                                    
+  Standard_Real radius = 5;                                    
+  Handle(Geom2d_Circle) C =                                    
     new Geom2d_Circle(gp::OX2d(),radius);                    
-Geom2dAdaptor_Curve GAC (C);                                 
-Standard_Real startparam = 10*M_PI/180;                                
-Standard_Real abscissa = 45*M_PI/180;                                  
-gp_Pnt2d P1;
-C->D0(startparam,P1);                                                
-// abscissa is the distance along the curve from startparam  
-GCPnts_AbscissaPoint AP (GAC, abscissa, startparam);         
-gp_Pnt2d P2;                                                  
-if (AP.IsDone()){C->D0(AP.Parameter(),P2);}                   
-// P is now correctly set                                    
-                                                             
-    //==============================================================
-    TCollection_AsciiString Message (" \n\
+  Geom2dAdaptor_Curve GAC (C);                                 
+  Standard_Real startparam = 10*M_PI/180;                                
+  Standard_Real abscissa = 45*M_PI/180;                                  
+  gp_Pnt2d P1;
+  C->D0(startparam,P1);                                                
+  // abscissa is the distance along the curve from startparam  
+  GCPnts_AbscissaPoint AP (GAC, abscissa, startparam);         
+  gp_Pnt2d P2;                                                  
+  if (AP.IsDone()){C->D0(AP.Parameter(),P2);}                   
+  // P is now correctly set                                    
+
+  //==============================================================
+  TCollection_AsciiString Message (" \n\
                                                              \n\
                                                              \n\
 Standard_Real radius = 5;                                    \n\
@@ -659,31 +660,29 @@ if (AP.IsDone()){C->D0(AP.Parameter(),P2);}                   \n\
 // P is now correctly set                                    \n\
                                                              \n\
                                                              \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-    Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(C);
-    aDoc->GetISessionContext()->Display(aCurve,Standard_False);
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
+  Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(C);
+  aDoc->GetISessionContext()->Display(aCurve,Standard_False);
 
-    DisplayPoint(aDoc,P1,"P1");
-if (AP.IsDone())    DisplayPoint(aDoc,P2,"P2");
-       
-       TCollection_AsciiString Message2 (P1.X());
-       TCollection_AsciiString Message3 (P1.Y());
-       
-       TCollection_AsciiString Message4 (P2.X());
-       TCollection_AsciiString Message5 (P2.Y());
-       
+  DisplayPoint(aDoc,P1,"P1");
+  if (AP.IsDone())    DisplayPoint(aDoc,P2,"P2");
 
-     Message += " P1 ( ";
-     Message += Message2; Message += " , ";
-     Message += Message3; Message += " ); \n";
+  TCollection_AsciiString Message2 (P1.X());
+  TCollection_AsciiString Message3 (P1.Y());
 
-     Message += " P2 ( ";
-     Message += Message4; Message += " , ";
-     Message += Message5; Message += " ); \n";
-    PostProcess(aDoc,ID_BUTTON_Test_9,TheDisplayType,Message.ToCString());
-}
+  TCollection_AsciiString Message4 (P2.X());
+  TCollection_AsciiString Message5 (P2.Y());
+
+  Message += " P1 ( ";
+  Message += Message2; Message += " , ";
+  Message += Message3; Message += " ); \n";
 
+  Message += " P2 ( ";
+  Message += Message4; Message += " , ";
+  Message += Message5; Message += " ); \n";
+  PostProcess(aDoc,ID_BUTTON_Test_9,TheDisplayType,Message.ToCString());
+}
 
 // Function name       : GeomSources::gpTest10
 // Description     : 
@@ -691,34 +690,34 @@ if (AP.IsDone())    DisplayPoint(aDoc,P2,"P2");
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest10(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
                                                         
-gp_Pnt2d P;                                             
-Standard_Real radius = 5;                               
-Handle(Geom2d_Circle) C =                               
-    new Geom2d_Circle(gp::OX2d(),radius);               
-Geom2dAdaptor_Curve GAC (C);                            
-Standard_Real abscissa = 3;                             
-GCPnts_UniformAbscissa UA (GAC,abscissa);               
-TColgp_SequenceOfPnt2d aSequence;                       
-if (UA.IsDone())                                        
+  gp_Pnt2d P;
+  Standard_Real radius = 5;
+  Handle(Geom2d_Circle) C =
+    new Geom2d_Circle(gp::OX2d(),radius);
+  Geom2dAdaptor_Curve GAC (C);
+  Standard_Real abscissa = 3;
+  GCPnts_UniformAbscissa UA (GAC,abscissa);
+  TColgp_SequenceOfPnt2d aSequence;
+  if (UA.IsDone())
   {                                                     
-    Standard_Real N = UA.NbPoints();                    
-    Standard_Integer count = 1;                         
-    for(;count<=N;count++)                              
-     {                                                  
-        C->D0(UA.Parameter(count),P);                   
-        Standard_Real Parameter = UA.Parameter(count);  
-        // append P in a Sequence                       
-        aSequence.Append(P);                            
+    Standard_Real N = UA.NbPoints();
+    Standard_Integer count = 1;
+    for(;count<=N;count++)
+    {                                                  
+      C->D0(UA.Parameter(count),P);
+      Standard_Real Parameter = UA.Parameter(count);
+      // append P in a Sequence
+      aSequence.Append(P);
     }                                                   
-}                                                       
-Standard_Real Abscissa  = UA.Abscissa();                
+  }                                                       
+  Standard_Real Abscissa  = UA.Abscissa();                
                                                         
-//==============================================================
-    TCollection_AsciiString Message (" \
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                         \n\
 gp_Pnt2d P;                                             \n\
 Standard_Real radius = 5;                               \n\
@@ -742,38 +741,40 @@ if (UA.IsDone())                                        \n\
 }                                                       \n\
 Standard_Real Abscissa  = UA.Abscissa();                \n\
                                                         \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-    Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(C);
-    aDoc->GetISessionContext()->Display(aCurve,Standard_False);
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
+  Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(C);
+  aDoc->GetISessionContext()->Display(aCurve,Standard_False);
 
-    TCollection_AsciiString aString;
-    for (Standard_Integer i=1;i<= aSequence.Length();i++)
-    {
-     
-       TCollection_AsciiString Message2 (i);
-       TCollection_AsciiString Message3 (UA.Parameter(i));
-
-       aString = "P";
-       aString += Message2; 
-       aString +=": Parameter : "; 
-       aString += Message3;
-     
-       //   First and Last texts are displayed with an Y offset, point 4 is upper
-     Standard_Real YOffset = -0.3;
-     YOffset +=  0.2 * ( i == 1 ) ;
-     YOffset +=  0.4 * ( i == 4 ) ;
-     YOffset += -0.2 * ( i == aSequence.Length() ); 
-
-     DisplayPoint(aDoc,aSequence(i),aString.ToCString(),false,0.5,YOffset,0.04);
-    }
-    
-       TCollection_AsciiString Message3 (Abscissa);
+  TCollection_AsciiString aString;
+  for (Standard_Integer i=1;i<= aSequence.Length();i++)
+  {
 
-       Message += "Abscissa  = "; Message += Message3; Message += " \n";
-    PostProcess(aDoc,ID_BUTTON_Test_10,TheDisplayType,Message.ToCString());
-}
+    TCollection_AsciiString Message2 (i);
+    TCollection_AsciiString Message3 (UA.Parameter(i));
+
+    aString = "P";
+    aString += Message2; 
+    aString +=": Parameter : "; 
+    aString += Message3;
+
+    //   First and Last texts are displayed with an Y offset, point 4 is upper
+    Standard_Real YOffset = -0.3;
+    YOffset +=  0.2 * ( i == 1 );
+    YOffset +=  0.4 * ( i == 4 );
+    YOffset += -0.2 * ( i == aSequence.Length() ); 
+
+    DisplayPoint(aDoc,aSequence(i),aString.ToCString(),false,0.5,YOffset,0.04);
+  }
+
+  TCollection_AsciiString Message3 (Abscissa);
 
+  Message += "Abscissa  = ";
+  Message += Message3;
+  Message += " \n";
+
+  PostProcess(aDoc,ID_BUTTON_Test_10,TheDisplayType,Message.ToCString());
+}
 
 // Function name       : GeomSources::gpTest11
 // Description     : 
@@ -781,17 +782,17 @@ Standard_Real Abscissa  = UA.Abscissa();                \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest11(CGeometryDoc* aDoc)
 {
-   DisplayType TheDisplayType = No2D3D;
-   PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                          
-Standard_Real radius = 5;                                 
-Handle(Geom_SphericalSurface) SP =                        
-    new Geom_SphericalSurface(gp_Ax3(gp::XOY()),radius);  
-Standard_Real u = 2;                                      
-Standard_Real v = 3;                                      
-gp_Pnt P = SP->Value(u,v);                                
-                                                          
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+                 
+  Standard_Real radius = 5;
+  Handle(Geom_SphericalSurface) SP =
+    new Geom_SphericalSurface(gp_Ax3(gp::XOY()),radius);
+  Standard_Real u = 2;
+  Standard_Real v = 3;
+  gp_Pnt P = SP->Value(u,v);                
+                       
 //==============================================================
     TCollection_AsciiString Message (" \
                                                           \n\
@@ -802,51 +803,52 @@ Standard_Real u = 2;                                      \n\
 Standard_Real v = 3;                                      \n\
 gp_Pnt P = SP->Value(u,v);                                \n\
                                                           \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
-    DisplaySurface(aDoc,SP);
-    DisplayPoint(aDoc,P,"P",false,0.5);
-       TCollection_AsciiString Message2 (P.X());
-       TCollection_AsciiString Message3 (P.Y());
+  DisplaySurface(aDoc,SP);
+  DisplayPoint(aDoc,P,"P",false,0.5);
+  TCollection_AsciiString Message2 (P.X());
+  TCollection_AsciiString Message3 (P.Y());
        
+  Message += " P ( ";
+  Message += Message2; 
+  Message += " , ";
+  Message += Message3; 
+  Message += " ); \n";
 
-    Message += " P ( ";
-    Message += Message2; 
-       Message += " , ";
-    Message += Message3; 
-       Message += " ); \n";
-    PostProcess(aDoc,ID_BUTTON_Test_11,TheDisplayType,Message.ToCString());
+  PostProcess(aDoc,ID_BUTTON_Test_11,TheDisplayType,Message.ToCString());
 }
 
-
 // Function name       : GeomSources::gpTest12
 // Description     : 
 // Return type         : void 
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest12(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                            
-gp_Pnt N,Q,P(1,2,3);                                        
-Standard_Real distance, radius = 5;                         
-Handle(Geom_Circle) C = new Geom_Circle(gp::XOY(),radius);  
-GeomAPI_ProjectPointOnCurve PPC (P,C);                      
-N = PPC.NearestPoint();                                     
-Standard_Integer NbResults = PPC.NbPoints();                
-                                                            
-if(NbResults>0){                                            
-    for(Standard_Integer i = 1;i<=NbResults;i++){           
-      Q = PPC.Point(i);                                     
-      distance = PPC.Distance(i);                           
-        // do something with Q or distance here             
-      }                                                     
- }                                                          
-                                                            
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+
+  gp_Pnt N,Q,P(1,2,3);
+  Standard_Real distance, radius = 5;
+  Handle(Geom_Circle) C = new Geom_Circle(gp::XOY(),radius);
+  GeomAPI_ProjectPointOnCurve PPC (P,C);
+  N = PPC.NearestPoint();
+  Standard_Integer NbResults = PPC.NbPoints();
+
+  if(NbResults>0)
+  {
+    for(Standard_Integer i = 1;i<=NbResults;i++)
+    {
+      Q = PPC.Point(i);
+      distance = PPC.Distance(i);
+      // do something with Q or distance here
+    }
+  }                                                          
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                             \n\
 gp_Pnt N,Q,P(1,2,3);                                        \n\
 Standard_Real distance, radius = 5;                         \n\
@@ -866,37 +868,36 @@ if(NbResults>0){                                            \n\
     AddSeparator(aDoc,Message);
 //--------------------------------------------------------------
 
-    TCollection_AsciiString aString;
+  TCollection_AsciiString aString;
 
-    DisplayPoint(aDoc,P,"P",false,0.5);
-       
-       TCollection_AsciiString Message2 (PPC.LowerDistance());
+  DisplayPoint(aDoc,P,"P",false,0.5);
 
-    aString = "N : at Distance : "; 
-       aString += Message2;
-    
-       DisplayPoint(aDoc,N,aString.ToCString(),false,0.5,0,-0.5);
-
-    DisplayCurve(aDoc,C,false);
-
-       if(NbResults>0){
-               for(Standard_Integer i = 1;i<=NbResults;i++){
-               
-               
-               Q = PPC.Point(i);
-               distance = PPC.Distance(i);     
-        TCollection_AsciiString Message3 (i);
-               TCollection_AsciiString Message4 (distance);
-
-        aString = "Q";
-               aString += Message3; 
-               aString +=": at Distance : "; 
-               aString += Message4;
-        DisplayPoint(aDoc,Q,aString.ToCString(),false,0.5);
-               }
-       }
-
-    PostProcess(aDoc,ID_BUTTON_Test_12,TheDisplayType,Message.ToCString());
+  TCollection_AsciiString Message2 (PPC.LowerDistance());
+
+  aString = "N : at Distance : "; 
+  aString += Message2;
+
+  DisplayPoint(aDoc,N,aString.ToCString(),false,0.5,0,-0.5);
+  DisplayCurve(aDoc,C,false);
+
+  if(NbResults>0)
+  {
+    for(Standard_Integer i = 1;i<=NbResults;i++)
+    {
+      Q = PPC.Point(i);
+      distance = PPC.Distance(i);      
+      TCollection_AsciiString Message3 (i);
+      TCollection_AsciiString Message4 (distance);
+
+      aString = "Q";
+      aString += Message3; 
+      aString +=": at Distance : "; 
+      aString += Message4;
+      DisplayPoint(aDoc,Q,aString.ToCString(),false,0.5);
+    }
+  }
+
+  PostProcess(aDoc,ID_BUTTON_Test_12,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest13
@@ -905,26 +906,29 @@ if(NbResults>0){                                            \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest13(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                          
-gp_Pnt N,Q,P(7,8,9);                                      
-Standard_Real distance, radius = 5;                       
-Handle(Geom_SphericalSurface) SP =                        
-    new Geom_SphericalSurface(gp_Ax3(gp::XOY()),radius);  
-GeomAPI_ProjectPointOnSurf PPS(P,SP);                     
-N = PPS.NearestPoint();                                   
-Standard_Integer NbResults = PPS.NbPoints();              
-if(NbResults>0){                                          
-    for(Standard_Integer i = 1;i<=NbResults;i++){         
-    Q = PPS.Point(i);                                     
-    distance = PPS.Distance(i);                           
-    // do something with Q or distance here               
-    }                                                     
-}                                                         
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
+        
+  gp_Pnt N,Q,P(7,8,9);
+  Standard_Real distance, radius = 5;
+  Handle(Geom_SphericalSurface) SP =
+    new Geom_SphericalSurface(gp_Ax3(gp::XOY()),radius);
+  GeomAPI_ProjectPointOnSurf PPS(P,SP);
+  N = PPS.NearestPoint();
+  Standard_Integer NbResults = PPS.NbPoints();
+  if(NbResults>0)
+  {
+    for(Standard_Integer i = 1;i<=NbResults;i++)
+    {
+      Q = PPS.Point(i);
+      distance = PPS.Distance(i);
+      // do something with Q or distance here
+    }
+  }                                                         
                                                           
-//==============================================================
+  //==============================================================
     TCollection_AsciiString Message (" \
                                                           \n\
 gp_Pnt N,Q,P(7,8,9);                                      \n\
@@ -942,43 +946,42 @@ if(NbResults>0){                                          \n\
     }                                                     \n\
 }                                                         \n\
                                                           \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-    TCollection_AsciiString aString;
-
-    DisplayPoint(aDoc,P,"P",false,0.5);
-       TCollection_AsciiString Message2 (PPS.LowerDistance());
-
-    aString = "N  : at Distance : "; aString += Message2;
-    DisplayPoint(aDoc,N,aString.ToCString(),false,0.5,0,-0.6);
-
-
-
-    Handle(ISession_Surface) aSurface = new ISession_Surface(SP);
-       Handle (AIS_Drawer) CurDrawer = aSurface->Attributes();
-    CurDrawer->UIsoAspect()->SetNumber(10);
-    CurDrawer->VIsoAspect()->SetNumber(10);
-    aDoc->GetAISContext()->SetLocalAttributes(aSurface, CurDrawer);
-    aDoc->GetAISContext()->Display(aSurface, Standard_False);
-
-       if(NbResults>0){
-               for(Standard_Integer i = 1;i<=NbResults;i++){
-               
-               Q = PPS.Point(i);
-               distance = PPS.Distance(i);     
-        TCollection_AsciiString Message3 (i);
-               TCollection_AsciiString Message4 (distance);
-
-        aString = "Q";
-               aString += Message3; 
-               aString +=": at Distance : "; 
-               aString += Message4;
-       
-               DisplayPoint(aDoc,Q,aString.ToCString(),false,0.5);                     
-               }
-       }
-
-   PostProcess(aDoc,ID_BUTTON_Test_13,TheDisplayType,Message.ToCString());
+ AddSeparator(aDoc,Message);
+ //--------------------------------------------------------------
+ TCollection_AsciiString aString;
+
+ DisplayPoint(aDoc,P,"P",false,0.5);
+ TCollection_AsciiString Message2 (PPS.LowerDistance());
+
+ aString = "N  : at Distance : "; aString += Message2;
+ DisplayPoint(aDoc,N,aString.ToCString(),false,0.5,0,-0.6);
+
+ Handle(ISession_Surface) aSurface = new ISession_Surface(SP);
+ Handle (AIS_Drawer) CurDrawer = aSurface->Attributes();
+ CurDrawer->UIsoAspect()->SetNumber(10);
+ CurDrawer->VIsoAspect()->SetNumber(10);
+ aDoc->GetAISContext()->SetLocalAttributes(aSurface, CurDrawer);
+ aDoc->GetAISContext()->Display(aSurface, Standard_False);
+
+ if(NbResults>0)
+ {
+   for(Standard_Integer i = 1;i<=NbResults;i++)
+   {
+
+     Q = PPS.Point(i);
+     distance = PPS.Distance(i);       
+     TCollection_AsciiString Message3 (i);
+     TCollection_AsciiString Message4 (distance);
+
+     aString = "Q";
+     aString += Message3; 
+     aString +=": at Distance : "; 
+     aString += Message4;
+
+     DisplayPoint(aDoc,Q,aString.ToCString(),false,0.5);                       
+   }
+ }
+ PostProcess(aDoc,ID_BUTTON_Test_13,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest14
@@ -987,30 +990,30 @@ if(NbResults>0){                                          \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest14(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
                                                           
-gp_Pnt P; 
-gp_Ax3 theAxe(gp::XOY());
-gp_Pln PL(theAxe);                            
-Standard_Real MinorRadius = 5;                            
-Standard_Real MajorRadius = 8;                            
-gp_Elips EL (gp::YOZ(),MajorRadius,MinorRadius);          
-IntAna_IntConicQuad ICQ                                   
+  gp_Pnt P; 
+  gp_Ax3 theAxe(gp::XOY());
+  gp_Pln PL(theAxe);                            
+  Standard_Real MinorRadius = 5;                            
+  Standard_Real MajorRadius = 8;                            
+  gp_Elips EL (gp::YOZ(),MajorRadius,MinorRadius);          
+  IntAna_IntConicQuad ICQ                                   
     (EL,PL,Precision::Angular(),Precision::Confusion());  
-if (ICQ.IsDone()){                                        
+  if (ICQ.IsDone()){                                        
     Standard_Integer NbResults = ICQ.NbPoints();          
     if (NbResults>0){                                     
-    for(Standard_Integer i = 1;i<=NbResults;i++){         
+      for(Standard_Integer i = 1;i<=NbResults;i++){         
         P = ICQ.Point(i);                                 
         // do something with P here                       
-        }                                                 
-   }                                                      
-}                                                         
+      }                                                 
+    }                                                      
+  }                                                         
                                                           
-//==============================================================
-    TCollection_AsciiString Message (" \
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                           \n\
 gp_Pnt P;                                                 \n\
 gp_Pln PL (gp_Ax3(gp::XOY()));                            \n\
@@ -1029,35 +1032,37 @@ if (ICQ.IsDone()){                                        \n\
    }                                                      \n\
 }                                                         \n\
                                                           \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+ AddSeparator(aDoc,Message);
+ //--------------------------------------------------------------
 
-    Handle(Geom_Plane) aPlane = GC_MakePlane(PL).Value();
-    Handle(Geom_RectangularTrimmedSurface) aSurface= new Geom_RectangularTrimmedSurface(aPlane,-8.,8.,-12.,12.);
-        
-    DisplaySurface(aDoc,aSurface);
+ Handle(Geom_Plane) aPlane = GC_MakePlane(PL).Value();
+ Handle(Geom_RectangularTrimmedSurface) aSurface= new Geom_RectangularTrimmedSurface(aPlane,-8.,8.,-12.,12.);
 
+ DisplaySurface(aDoc,aSurface);
 
-    Handle(Geom_Ellipse) anEllips = GC_MakeEllipse(EL).Value();
-    DisplayCurve(aDoc,anEllips,false);
+ Handle(Geom_Ellipse) anEllips = GC_MakeEllipse(EL).Value();
+ DisplayCurve(aDoc,anEllips,false);
 
-    TCollection_AsciiString aString;
+ TCollection_AsciiString aString;
 
-       if (ICQ.IsDone()){
-               Standard_Integer NbResults = ICQ.NbPoints();
-               if (NbResults>0){
-               for(Standard_Integer i = 1;i<=NbResults;i++){
-                       
-                       TCollection_AsciiString Message2(i);
-                       
-                       P = ICQ.Point(i);
-            aString = "P";aString += Message2; 
-            DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
-                       }
-                  }
-               }
+ if (ICQ.IsDone())
+ {
+   Standard_Integer NbResults = ICQ.NbPoints();
+   if (NbResults>0)
+   {
+     for(Standard_Integer i = 1;i<=NbResults;i++)
+     {
 
-    PostProcess(aDoc,ID_BUTTON_Test_14,TheDisplayType,Message.ToCString());
+       TCollection_AsciiString Message2(i);
+
+       P = ICQ.Point(i);
+       aString = "P";aString += Message2; 
+       DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
+     }
+   }
+ }
+
+ PostProcess(aDoc,ID_BUTTON_Test_14,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest15
@@ -1066,18 +1071,18 @@ if (ICQ.IsDone()){                                        \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest15(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                     
-gp_Pnt P1(1,2,3);    
-gp_Pnt P1Copy = P1;  
-gp_Pnt P2(5,4,6);    
-gp_Trsf TRSF;        
-TRSF.SetMirror(P2);  
-P1Copy.Transform(TRSF);  
-                     
-//==============================================================
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+  gp_Pnt P1(1,2,3);    
+  gp_Pnt P1Copy = P1;  
+  gp_Pnt P2(5,4,6);    
+  gp_Trsf TRSF;        
+  TRSF.SetMirror(P2);  
+  P1Copy.Transform(TRSF);  
+
+  //==============================================================
     TCollection_AsciiString Message (" \
                          \n\
 gp_Pnt P1(1,2,3);        \n\
@@ -1087,41 +1092,40 @@ gp_Trsf TRSF;            \n\
 TRSF.SetMirror(P2);      \n\
 P1Copy.Transform(TRSF);  \n\
                          \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+ AddSeparator(aDoc,Message);
+ //--------------------------------------------------------------
 
-    DisplayPoint(aDoc,P1Copy,"P1Copy",false,0.5);
-    DisplayPoint(aDoc,P1,"P1",false,0.5);
-    DisplayPoint(aDoc,P2,"P2",false,0.5);
+ DisplayPoint(aDoc,P1Copy,"P1Copy",false,0.5);
+ DisplayPoint(aDoc,P1,"P1",false,0.5);
+ DisplayPoint(aDoc,P2,"P2",false,0.5);
 
-    PostProcess(aDoc,ID_BUTTON_Test_15,TheDisplayType,Message.ToCString());
+ PostProcess(aDoc,ID_BUTTON_Test_15,TheDisplayType,Message.ToCString());
 }
 
-
 // Function name       : GeomSources::gpTest16
 // Description     : 
 // Return type         : void 
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest16(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
 //==============================================================
                                          
-gp_Pnt P1(1,2,3);                        
-gp_Pnt P2(5,4,6);                        
-gp_Vec V1 (P1,P2);                       
-                                         
-gp_Pnt P3(10,4,7);                       
-gp_Pnt P4(2,0,1);                        
-gp_Vec V2 (P3,P4);                       
-                                         
-Standard_Boolean result =                
-V1.IsOpposite(V2,Precision::Angular());  
-// result should be true                 
+  gp_Pnt P1(1,2,3);                        
+  gp_Pnt P2(5,4,6);                        
+  gp_Vec V1 (P1,P2);                       
+
+  gp_Pnt P3(10,4,7);                       
+  gp_Pnt P4(2,0,1);                        
+  gp_Vec V2 (P3,P4);                       
+
+  Standard_Boolean result =                
+    V1.IsOpposite(V2,Precision::Angular());  
+  // result should be true                 
                                          
 //==============================================================
-    TCollection_AsciiString Message (" \
+  TCollection_AsciiString Message (" \
                                          \n\
 gp_Pnt P1(1,2,3);                        \n\
 gp_Pnt P2(5,4,6);                        \n\
@@ -1135,24 +1139,24 @@ Standard_Boolean result =                \n\
 V1.IsOpposite(V2,Precision::Angular());  \n\
 // result should be true                 \n\
                                          \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+ AddSeparator(aDoc,Message);
+ //--------------------------------------------------------------
 
-    DisplayPoint(aDoc,P1,"P1",false,0.5);
-    DisplayPoint(aDoc,P2,"P2",false,0.5);
-    DisplayPoint(aDoc,P3,"P3",false,0.5);
-    DisplayPoint(aDoc,P4,"P4",false,0.5);
+ DisplayPoint(aDoc,P1,"P1",false,0.5);
+ DisplayPoint(aDoc,P2,"P2",false,0.5);
+ DisplayPoint(aDoc,P3,"P3",false,0.5);
+ DisplayPoint(aDoc,P4,"P4",false,0.5);
 
-    Handle(ISession_Direction) aDirection1 = new ISession_Direction(P1,V1);
-    aDoc->GetAISContext()->Display(aDirection1, Standard_False);
+ Handle(ISession_Direction) aDirection1 = new ISession_Direction(P1,V1);
+ aDoc->GetAISContext()->Display(aDirection1, Standard_False);
 
-    Handle(ISession_Direction) aDirection2 = new ISession_Direction(P3,V2);
-    aDoc->GetAISContext()->Display(aDirection2, Standard_False);
+ Handle(ISession_Direction) aDirection2 = new ISession_Direction(P3,V2);
+ aDoc->GetAISContext()->Display(aDirection2, Standard_False);
 
-    Message += "result = ";
-    if (result) Message += "True \n"; else Message += "False \n";
+ Message += "result = ";
+ if (result) Message += "True \n"; else Message += "False \n";
 
-    PostProcess(aDoc,ID_BUTTON_Test_16,TheDisplayType,Message.ToCString());
+ PostProcess(aDoc,ID_BUTTON_Test_16,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest17
@@ -1161,45 +1165,45 @@ V1.IsOpposite(V2,Precision::Angular());  \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest17(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                 
-gp_Dir D1(1,2,3);                                
-gp_Dir D2(3,4,5);                                
-Standard_Real ang = D1.Angle(D2);                
-// the result is in radians in the range [0,PI]  
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+
+  gp_Dir D1(1,2,3);
+  gp_Dir D2(3,4,5);
+  Standard_Real ang = D1.Angle(D2);
+  // the result is in radians in the range [0,PI]  
                                                  
-//==============================================================
-    TCollection_AsciiString Message (" \
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                  \n\
 gp_Dir D1(1,2,3);                                \n\
 gp_Dir D2(3,4,5);                                \n\
 Standard_Real ang = D1.Angle(D2);                \n\
 // the result is in radians in the range [0,PI]  \n\
                                                  \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
-    Handle(ISession_Direction) aDirection1 = new ISession_Direction(gp_Pnt(0,0,0),D1,3);
-    aDoc->GetAISContext()->Display(aDirection1, Standard_False);
+  Handle(ISession_Direction) aDirection1 = new ISession_Direction(gp_Pnt(0,0,0),D1,3);
+  aDoc->GetAISContext()->Display(aDirection1, Standard_False);
 
-    Handle(ISession_Direction) aDirection2 = new ISession_Direction(gp_Pnt(0,0,0),D2,3);
-    aDoc->GetAISContext()->Display(aDirection2, Standard_False);
-    
-    cout<<" D1.Angle(D2) : "<<ang<<endl;
+  Handle(ISession_Direction) aDirection2 = new ISession_Direction(gp_Pnt(0,0,0),D2,3);
+  aDoc->GetAISContext()->Display(aDirection2, Standard_False);
 
-    TCollection_AsciiString Message2 (ang);
-       TCollection_AsciiString Message3 (ang/M_PI/180);
-       
-       Message += " ang =  "; 
-       Message += Message2; 
-       Message += "   radian \n";
-    Message += " ang/PI180 =  "; 
-       Message += Message3; 
-       Message += "   degree \n";
-
-    PostProcess(aDoc,ID_BUTTON_Test_17,TheDisplayType,Message.ToCString());
+  cout<<" D1.Angle(D2) : "<<ang<<endl;
+
+  TCollection_AsciiString Message2 (ang);
+  TCollection_AsciiString Message3 (ang/M_PI/180);
+
+  Message += " ang =  "; 
+  Message += Message2; 
+  Message += "   radian \n";
+  Message += " ang/PI180 =  "; 
+  Message += Message3; 
+  Message += "   degree \n";
+
+  PostProcess(aDoc,ID_BUTTON_Test_17,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest18
@@ -1208,20 +1212,20 @@ Standard_Real ang = D1.Angle(D2);                \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest18(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                          
-gp_Pnt2d P(2,3);                          
-gp_Dir2d D(4,5);                          
-gp_Ax22d A(P,D);                          
-gp_Parab2d Para(A,6);                     
-// P is the vertex point                  
-// P and D give the axis of symmetry      
-// 6 is the focal length of the parabola  
-                                          
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+
+  gp_Pnt2d P(2,3);
+  gp_Dir2d D(4,5);
+  gp_Ax22d A(P,D);
+  gp_Parab2d Para(A,6);
+  // P is the vertex point                  
+  // P and D give the axis of symmetry      
+  // 6 is the focal length of the parabola
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                           \n\
 gp_Pnt2d P(2,3);                          \n\
 gp_Dir2d D(4,5);                          \n\
@@ -1231,22 +1235,22 @@ gp_Parab2d Para(A,6);                     \n\
 // P and D give the axis of symmetry      \n\
 // 6 is the focal length of the parabola  \n\
                                           \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-
-    DisplayPoint(aDoc,P,"P",false,0.5,0,3);
-
-    Handle(ISession_Direction) aDirection = new ISession_Direction(P,D,200);
-    aDoc->GetISessionContext()->Display(aDirection,Standard_False);
-    Handle(Geom2d_Parabola) aParabola = GCE2d_MakeParabola(Para);
-    Handle(Geom2d_TrimmedCurve) aTrimmedCurve = new Geom2d_TrimmedCurve(aParabola,-100,100);
-    Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aTrimmedCurve);
-    //aCurve->SetColorIndex(3);
-    aDoc->GetISessionContext()->Display(aCurve, Standard_False);  
-
-    Message += " The entity A of type gp_Ax22d is not displayable \n ";
-    Message += " The entity D of type gp_Dir2d is displayed as a vector \n    ( mean with a length != 1 ) \n ";
-    PostProcess(aDoc,ID_BUTTON_Test_18,TheDisplayType,Message.ToCString());
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
+
+  DisplayPoint(aDoc,P,"P",false,0.5,0,3);
+
+  Handle(ISession_Direction) aDirection = new ISession_Direction(P,D,200);
+  aDoc->GetISessionContext()->Display(aDirection,Standard_False);
+  Handle(Geom2d_Parabola) aParabola = GCE2d_MakeParabola(Para);
+  Handle(Geom2d_TrimmedCurve) aTrimmedCurve = new Geom2d_TrimmedCurve(aParabola,-100,100);
+  Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aTrimmedCurve);
+  //aCurve->SetColorIndex(3);
+  aDoc->GetISessionContext()->Display(aCurve, Standard_False);  
+
+  Message += " The entity A of type gp_Ax22d is not displayable \n ";
+  Message += " The entity D of type gp_Dir2d is displayed as a vector \n    ( mean with a length != 1 ) \n ";
+  PostProcess(aDoc,ID_BUTTON_Test_18,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest19
@@ -1255,29 +1259,29 @@ gp_Parab2d Para(A,6);                     \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest19(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                            
-gp_Pnt P1(2,3,4);                           
-gp_Dir D(4,5,6);                            
-gp_Ax3 A(P1,D);                              
-Standard_Boolean IsDirectA = A.Direct();    
-                                            
-gp_Dir AXDirection = A.XDirection() ;       
-gp_Dir AYDirection = A.YDirection() ;       
-                                            
-gp_Pnt P2(5,3,4);                           
-gp_Ax3 A2(P2,D);                            
-A2.YReverse();                              
-// axis3 is now left handed                 
-Standard_Boolean IsDirectA2 = A2.Direct();  
-                                            
-gp_Dir A2XDirection = A2.XDirection() ;     
-gp_Dir A2YDirection = A2.YDirection() ;     
-                                            
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+  
+  gp_Pnt P1(2,3,4);                           
+  gp_Dir D(4,5,6);                            
+  gp_Ax3 A(P1,D);                              
+  Standard_Boolean IsDirectA = A.Direct();    
+
+  gp_Dir AXDirection = A.XDirection() ;       
+  gp_Dir AYDirection = A.YDirection() ;       
+
+  gp_Pnt P2(5,3,4);                           
+  gp_Ax3 A2(P2,D);                            
+  A2.YReverse();                              
+  // axis3 is now left handed                 
+  Standard_Boolean IsDirectA2 = A2.Direct();  
+              
+  gp_Dir A2XDirection = A2.XDirection() ;
+  gp_Dir A2YDirection = A2.YDirection() ;
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                             \n\
 gp_Pnt P1(2,3,4);                           \n\
 gp_Dir D(4,5,6);                            \n\
@@ -1296,38 +1300,44 @@ Standard_Boolean IsDirectA2 = A2.Direct();  \n\
 gp_Dir A2XDirection = A2.XDirection() ;     \n\
 gp_Dir A2YDirection = A2.YDirection() ;     \n\
                                             \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-
-    DisplayPoint(aDoc,P1,"P1",false,0.1);
-    Handle(ISession_Direction) aDirection = new ISession_Direction(P1,D,2);
-    aDoc->GetAISContext()->Display(aDirection, Standard_False);
-
-    Handle(ISession_Direction) aDirection2 = new ISession_Direction(P1,AXDirection,2);
-    aDirection2->SetText(TCollection_ExtendedString("A.XDirection"));
-    aDoc->GetAISContext()->Display(aDirection2, Standard_False);
-    Handle(ISession_Direction) aDirection3 = new ISession_Direction(P1,AYDirection,2);
-    aDirection3->SetText(TCollection_ExtendedString("A.YDirection"));
-    aDoc->GetAISContext()->Display(aDirection3, Standard_False);
-
-    DisplayPoint(aDoc,P2,"P2",false,0.1);
-    Handle(ISession_Direction) aDirection4 = new ISession_Direction(P2,D,2);
-    aDoc->GetAISContext()->Display(aDirection4, Standard_False);
-
-    Handle(ISession_Direction) aDirection5 = new ISession_Direction(P2,A2XDirection,2);
-    aDirection5->SetText(TCollection_ExtendedString("A2 XDirection"));
-    aDoc->GetAISContext()->Display(aDirection5, Standard_False);
-    Handle(ISession_Direction) aDirection6 = new ISession_Direction(P2,A2YDirection,2);
-    aDirection6->SetText(TCollection_ExtendedString("A2 YDirection"));
-    aDoc->GetAISContext()->Display(aDirection6, Standard_False);
-
-    Message += "IsDirectA = ";
-    if (IsDirectA) Message += "True = Right Handed \n"; else Message += "False = Left Handed \n";
-
-    Message += "IsDirectA2 = ";
-    if (IsDirectA2) Message += "True = Right Handed \n"; else Message += "False = Left Handed  \n";
-
-    PostProcess(aDoc,ID_BUTTON_Test_19,TheDisplayType,Message.ToCString());
+ AddSeparator(aDoc,Message);
+ //--------------------------------------------------------------
+
+ DisplayPoint(aDoc,P1,"P1",false,0.1);
+ Handle(ISession_Direction) aDirection = new ISession_Direction(P1,D,2);
+ aDoc->GetAISContext()->Display(aDirection, Standard_False);
+
+ Handle(ISession_Direction) aDirection2 = new ISession_Direction(P1,AXDirection,2);
+ aDirection2->SetText(TCollection_ExtendedString("A.XDirection"));
+ aDoc->GetAISContext()->Display(aDirection2, Standard_False);
+ Handle(ISession_Direction) aDirection3 = new ISession_Direction(P1,AYDirection,2);
+ aDirection3->SetText(TCollection_ExtendedString("A.YDirection"));
+ aDoc->GetAISContext()->Display(aDirection3, Standard_False);
+
+ DisplayPoint(aDoc,P2,"P2",false,0.1);
+ Handle(ISession_Direction) aDirection4 = new ISession_Direction(P2,D,2);
+ aDoc->GetAISContext()->Display(aDirection4, Standard_False);
+
+ Handle(ISession_Direction) aDirection5 = new ISession_Direction(P2,A2XDirection,2);
+ aDirection5->SetText(TCollection_ExtendedString("A2 XDirection"));
+ aDoc->GetAISContext()->Display(aDirection5, Standard_False);
+ Handle(ISession_Direction) aDirection6 = new ISession_Direction(P2,A2YDirection,2);
+ aDirection6->SetText(TCollection_ExtendedString("A2 YDirection"));
+ aDoc->GetAISContext()->Display(aDirection6, Standard_False);
+
+ Message += "IsDirectA = ";
+ if(IsDirectA)
+   Message += "True = Right Handed \n";
+ else
+   Message += "False = Left Handed \n";
+
+ Message += "IsDirectA2 = ";
+ if(IsDirectA2)
+   Message += "True = Right Handed \n";
+ else
+   Message += "False = Left Handed  \n";
+
+ PostProcess(aDoc,ID_BUTTON_Test_19,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest20
@@ -1336,44 +1346,44 @@ gp_Dir A2YDirection = A2.YDirection() ;     \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest20(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                                     
-TColgp_Array1OfPnt2d array (1,5); // sizing array                    
-array.SetValue(1,gp_Pnt2d (0,0));                                    
-array.SetValue(2,gp_Pnt2d (1,2));                                    
-array.SetValue(3,gp_Pnt2d (2,3));                                    
-array.SetValue(4,gp_Pnt2d (4,3));                                    
-array.SetValue(5,gp_Pnt2d (5,5));                                    
-Handle(Geom2d_BSplineCurve) SPL1 =                                   
-    Geom2dAPI_PointsToBSpline(array);                                
-                                                                     
-Handle(TColgp_HArray1OfPnt2d) harray =                               
-    new TColgp_HArray1OfPnt2d (1,5); // sizing harray                
-harray->SetValue(1,gp_Pnt2d (7+ 0,0));                               
-harray->SetValue(2,gp_Pnt2d (7+ 1,2));                               
-harray->SetValue(3,gp_Pnt2d (7+ 2,3));                               
-harray->SetValue(4,gp_Pnt2d (7+ 4,3));                               
-harray->SetValue(5,gp_Pnt2d (7+ 5,5));                                                                                            
-Geom2dAPI_Interpolate anInterpolation(harray,Standard_False,0.01);   
-anInterpolation.Perform();                                           
-Handle(Geom2d_BSplineCurve) SPL2 = anInterpolation.Curve();          
-                                                                     
-Handle(TColgp_HArray1OfPnt2d) harray2 =                              
-    new TColgp_HArray1OfPnt2d (1,5); // sizing harray                
-harray2->SetValue(1,gp_Pnt2d (11+ 0,0));                             
-harray2->SetValue(2,gp_Pnt2d (11+ 1,2));                             
-harray2->SetValue(3,gp_Pnt2d (11+ 2,3));                             
-harray2->SetValue(4,gp_Pnt2d (11+ 4,3));                             
-harray2->SetValue(5,gp_Pnt2d (11+ 5,5));                             
-Geom2dAPI_Interpolate anInterpolation2(harray2,Standard_True,0.01);  
-anInterpolation2.Perform();                                          
-Handle(Geom2d_BSplineCurve) SPL3 = anInterpolation2.Curve();         
-// redefined C++ operator allows these assignments                   
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+
+  TColgp_Array1OfPnt2d array (1,5); // sizing array                    
+  array.SetValue(1,gp_Pnt2d (0,0));
+  array.SetValue(2,gp_Pnt2d (1,2));
+  array.SetValue(3,gp_Pnt2d (2,3));
+  array.SetValue(4,gp_Pnt2d (4,3));
+  array.SetValue(5,gp_Pnt2d (5,5));
+  Handle(Geom2d_BSplineCurve) SPL1 =
+    Geom2dAPI_PointsToBSpline(array);
                                                                      
-//==============================================================
-    TCollection_AsciiString Message (" \
+  Handle(TColgp_HArray1OfPnt2d) harray =
+    new TColgp_HArray1OfPnt2d (1,5); // sizing harray
+  harray->SetValue(1,gp_Pnt2d (7+ 0,0));
+  harray->SetValue(2,gp_Pnt2d (7+ 1,2));
+  harray->SetValue(3,gp_Pnt2d (7+ 2,3));
+  harray->SetValue(4,gp_Pnt2d (7+ 4,3));
+  harray->SetValue(5,gp_Pnt2d (7+ 5,5));
+  Geom2dAPI_Interpolate anInterpolation(harray,Standard_False,0.01);
+  anInterpolation.Perform();
+  Handle(Geom2d_BSplineCurve) SPL2 = anInterpolation.Curve();
+
+  Handle(TColgp_HArray1OfPnt2d) harray2 =
+    new TColgp_HArray1OfPnt2d (1,5); // sizing harray
+  harray2->SetValue(1,gp_Pnt2d (11+ 0,0));
+  harray2->SetValue(2,gp_Pnt2d (11+ 1,2));
+  harray2->SetValue(3,gp_Pnt2d (11+ 2,3));
+  harray2->SetValue(4,gp_Pnt2d (11+ 4,3));
+  harray2->SetValue(5,gp_Pnt2d (11+ 5,5));
+  Geom2dAPI_Interpolate anInterpolation2(harray2,Standard_True,0.01);
+  anInterpolation2.Perform();
+  Handle(Geom2d_BSplineCurve) SPL3 = anInterpolation2.Curve();
+  // redefined C++ operator allows these assignments
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                                      \n\
 TColgp_Array1OfPnt2d array (1,5); // sizing array                    \n\
 array.SetValue(1,gp_Pnt2d (0,0));                                    \n\
@@ -1397,7 +1407,7 @@ Handle(Geom2d_BSplineCurve) SPL2 = anInterpolation.Curve();          \n\
                                                                      \n\
 Handle(TColgp_HArray1OfPnt2d) harray2 =                              \n\
     new TColgp_HArray1OfPnt2d (1,5); // sizing harray                \n");
-    Message += "\
+  Message += "\
 harray2->SetValue(1,gp_Pnt2d (11+ 0,0));                             \n\
 harray2->SetValue(2,gp_Pnt2d (11+ 1,2));                             \n\
 harray2->SetValue(3,gp_Pnt2d (11+ 2,3));                             \n\
@@ -1408,83 +1418,87 @@ anInterpolation2.Perform();                                          \n\
 Handle(Geom2d_BSplineCurve) SPL3 = anInterpolation2.Curve();         \n\
 // redefined C++ operator allows these assignments                   \n\
                                                                      \n";
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-    TCollection_AsciiString aString;
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
+  TCollection_AsciiString aString;
        Standard_Integer i;
-    for(i = array.Lower();i<=array.Upper();i++){
-               gp_Pnt2d P = array(i);
-        TCollection_AsciiString Message2 (i);
-               aString = "array ";aString += Message2; 
-        DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
-               }
-    for( int i = harray->Lower();i<=harray->Upper();i++){
-               gp_Pnt2d P = harray->Value(i);
-        TCollection_AsciiString Message2 (i);
-               aString = "harray ";aString += Message2; 
-        DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
-               }
-    for( i = harray2->Lower();i<=harray2->Upper();i++){
-               gp_Pnt2d P = harray2->Value(i);
-               TCollection_AsciiString Message2 (i);
-        aString = "harray2 ";aString += Message2; 
-        DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
-               }
-
-    if (!SPL1.IsNull())
-    { 
-      Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(SPL1);
-      aCurve->SetColorIndex(3);
-      aDoc->GetISessionContext()->Display(aCurve, Standard_False);
-    }
-    else
-      MessageBox(0,"SPL1.IsNull()","CasCade Error",MB_ICONERROR);
-    
-    if (!SPL2.IsNull())
-    {
-      Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(SPL2);
-      aCurve2->SetColorIndex(5);
-      aDoc->GetISessionContext()->Display(aCurve2, Standard_False);  
-    }
-    else
-      MessageBox(0,"SPL2.IsNull()","CasCade Error",MB_ICONERROR);
-
-    if (!SPL3.IsNull())
-    {
-      Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(SPL3);
-      aCurve2->SetColorIndex(6);
-      aDoc->GetISessionContext()->Display(aCurve2, Standard_False);  
-    }
-    else
-      MessageBox(0,"SPL3.IsNull()","CasCade Error",MB_ICONERROR);
+  for(i = array.Lower();i<=array.Upper();i++)
+  {
+    gp_Pnt2d P = array(i);
+    TCollection_AsciiString Message2 (i);
+    aString = "array ";aString += Message2;
+    DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
+  }
+  for( int i = harray->Lower();i<=harray->Upper();i++)
+  {
+    gp_Pnt2d P = harray->Value(i);
+    TCollection_AsciiString Message2 (i);
+    aString = "harray ";aString += Message2; 
+    DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
+  }
+  for( i = harray2->Lower();i<=harray2->Upper();i++)
+  {
+    gp_Pnt2d P = harray2->Value(i);
+    TCollection_AsciiString Message2 (i);
+    aString = "harray2 ";aString += Message2; 
+    DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
+  }
+
+  if (!SPL1.IsNull())
+  { 
+    Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(SPL1);
+    aCurve->SetColorIndex(3);
+    aDoc->GetISessionContext()->Display(aCurve, Standard_False);
+  }
+  else
+    MessageBox(0,"SPL1.IsNull()","CasCade Error",MB_ICONERROR);
 
-    Message += " SPL1  is Red  \n";
-    Message += " SPL2  is Blue \n";   
-    Message += " SPL3  is Yellow \n";   
+  if (!SPL2.IsNull())
+  {
+    Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(SPL2);
+    aCurve2->SetColorIndex(5);
+    aDoc->GetISessionContext()->Display(aCurve2, Standard_False);  
+  }
+  else
+    MessageBox(0,"SPL2.IsNull()","CasCade Error",MB_ICONERROR);
 
-    PostProcess(aDoc,ID_BUTTON_Test_20,TheDisplayType,Message.ToCString());
+  if (!SPL3.IsNull())
+  {
+    Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(SPL3);
+    aCurve2->SetColorIndex(6);
+    aDoc->GetISessionContext()->Display(aCurve2, Standard_False);  
+  }
+  else
+    MessageBox(0,"SPL3.IsNull()","CasCade Error",MB_ICONERROR);
+
+  Message += " SPL1  is Red  \n";
+  Message += " SPL2  is Blue \n";   
+  Message += " SPL3  is Yellow \n";   
+
+  PostProcess(aDoc,ID_BUTTON_Test_20,TheDisplayType,Message.ToCString());
 }
 
 void GeomSources::gpTest21(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                            
-gp_Pnt2d P1(-184, 101);                     
-gp_Pnt2d P2(20 ,84);                        
-Standard_Real aheight = 1;                  
-FairCurve_Batten B (P1,P2,aheight);         
-B.SetAngle1(22*M_PI/180);                      
-B.SetAngle2(44*M_PI/180);                      
-FairCurve_AnalysisCode anAnalysisCode;      
-B.Compute(anAnalysisCode);                  
-Handle(Geom2d_BSplineCurve) C = B.Curve();  
-                                            
-//==============================================================
-    TCollection_AsciiString Message (" \
-                                            \n\
-gp_Pnt2d P1(-184, 101);                     \n\
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
+
+  gp_Pnt2d P1(-184, 101);
+  gp_Pnt2d P2(20 ,84);
+  Standard_Real aheight = 1;
+  FairCurve_Batten B (P1,P2,aheight);
+  B.SetAngle1(22*M_PI/180);
+  B.SetAngle2(44*M_PI/180);
+  FairCurve_AnalysisCode anAnalysisCode;
+  B.Compute(anAnalysisCode);
+  Handle(Geom2d_BSplineCurve) C = B.Curve();
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
+                                            \n\
+gp_Pnt2d P1(-184, 101);                     \n\
 gp_Pnt2d P2(20 ,84);                        \n\
 Standard_Real aheight = 1;                  \n\
 FairCurve_Batten B (P1,P2,aheight);         \n\
@@ -1494,34 +1508,35 @@ FairCurve_AnalysisCode anAnalysisCode;      \n\
 B.Compute(anAnalysisCode);                  \n\
 Handle(Geom2d_BSplineCurve) C = B.Curve();  \n\
                                             \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
-    DisplayCurveAndCurvature(aDoc,C,6,Standard_False);               
+  DisplayCurveAndCurvature(aDoc,C,6,Standard_False);               
 
-    PostProcess(aDoc,ID_BUTTON_Test_21,TheDisplayType,Message.ToCString());
+  PostProcess(aDoc,ID_BUTTON_Test_21,TheDisplayType,Message.ToCString());
 }
 
 void GeomSources::gpTest22(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                
-gp_Pnt2d P1(-184, 41);                          
-gp_Pnt2d P2(20 ,24);                            
-Standard_Real aheight = 1;                      
-FairCurve_MinimalVariation MV (P1,P2,aheight);  
-MV.SetAngle1(22*M_PI/180);                         
-MV.SetAngle2(44*M_PI/180);                         
-                                                
-FairCurve_AnalysisCode anAnalysisCode;          
-MV.Compute(anAnalysisCode);                     
-                                                
-Handle(Geom2d_BSplineCurve) C = MV.Curve();     
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
                                                 
-//==============================================================
-    TCollection_AsciiString Message (" \
+  gp_Pnt2d P1(-184, 41);                          
+  gp_Pnt2d P2(20 ,24);                            
+  Standard_Real aheight = 1;                      
+  FairCurve_MinimalVariation MV (P1,P2,aheight);  
+  MV.SetAngle1(22*M_PI/180);                         
+  MV.SetAngle2(44*M_PI/180);                         
+
+  FairCurve_AnalysisCode anAnalysisCode;          
+  MV.Compute(anAnalysisCode);                     
+
+  Handle(Geom2d_BSplineCurve) C = MV.Curve();     
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                 \n\
 gp_Pnt2d P1(-184, 41);                          \n\
 gp_Pnt2d P2(20 ,24);                            \n\
@@ -1535,42 +1550,40 @@ MV.Compute(anAnalysisCode);                     \n\
                                                 \n\
 Handle(Geom2d_BSplineCurve) C = MV.Curve();     \n\
                                                 \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
-    DisplayCurveAndCurvature(aDoc,C,7,Standard_False);                   
-    DisplayPoint(aDoc,P1,"P1",false,0.5);
-    DisplayPoint(aDoc,P2,"P2",false,0.5);
+  DisplayCurveAndCurvature(aDoc,C,7,Standard_False);                   
+  DisplayPoint(aDoc,P1,"P1",false,0.5);
+  DisplayPoint(aDoc,P2,"P2",false,0.5);
 
-    PostProcess(aDoc,ID_BUTTON_Test_22,TheDisplayType,Message.ToCString());
+  PostProcess(aDoc,ID_BUTTON_Test_22,TheDisplayType,Message.ToCString());
 }
 
-
 // Function name       : GeomSources::gpTest23
 // Description     : 
 // Return type         : void 
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest23(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                               
-Standard_Real major = 12;                                               
-Standard_Real minor = 4;                                                
-gp_Ax2d axis = gp::OX2d();                                              
-Handle(Geom2d_Ellipse) E = GCE2d_MakeEllipse (axis,major,minor);        
-                   
-Handle(Geom2d_TrimmedCurve) TC = new Geom2d_TrimmedCurve(E,-1,2);
-       
-// The segment goes in the direction Vfrom P1  
-// to the point projected on this line by P2   
-// In the example (0,6).                       
-Handle(Geom2d_BSplineCurve) SPL =              
-    Geom2dConvert::CurveToBSplineCurve(TC);    
-                                               
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+
+  Standard_Real major = 12;                                               
+  Standard_Real minor = 4;                                                
+  gp_Ax2d axis = gp::OX2d();                                              
+  Handle(Geom2d_Ellipse) E = GCE2d_MakeEllipse (axis,major,minor);
+  Handle(Geom2d_TrimmedCurve) TC = new Geom2d_TrimmedCurve(E,-1,2);
+
+  // The segment goes in the direction Vfrom P1  
+  // to the point projected on this line by P2   
+  // In the example (0,6).
+  Handle(Geom2d_BSplineCurve) SPL =
+    Geom2dConvert::CurveToBSplineCurve(TC);
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                                    \n\
 Standard_Real major = 12;                                          \n\
 Standard_Real minor = 4;                                           \n\
@@ -1585,61 +1598,59 @@ Handle(Geom2d_TrimmedCurve) TC = new Geom2d_TrimmedCurve(E,-1,2);  \n\
 Handle(Geom2d_BSplineCurve) SPL =                                  \n\
     Geom2dConvert::CurveToBSplineCurve(TC);                        \n\
                                                                    \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
-    Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(E);
-    aCurve->SetColorIndex(3); // Red
-    aCurve->SetTypeOfLine(Aspect_TOL_DOTDASH);
-    aDoc->GetISessionContext()->Display(aCurve, Standard_False);
+  Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(E);
+  aCurve->SetColorIndex(3); // Red
+  aCurve->SetTypeOfLine(Aspect_TOL_DOTDASH);
+  aDoc->GetISessionContext()->Display(aCurve, Standard_False);
 
-    Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(SPL);
-    aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
+  Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(SPL);
+  aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
 
-    PostProcess(aDoc,ID_BUTTON_Test_23,TheDisplayType,Message.ToCString());
+  PostProcess(aDoc,ID_BUTTON_Test_23,TheDisplayType,Message.ToCString());
 }
 
-
-
 // Function name       : GeomSources::gpTest24
 // Description     : 
 // Return type         : void 
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest24(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                        
-Standard_Real radius = 5;                               
-gp_Ax2d ax2d(gp_Pnt2d(2,3),gp_Dir2d(1,0));              
-                                                        
-Handle(Geom2d_Circle) circ2d =                          
-    new Geom2d_Circle(ax2d,radius);                     
-                                                        
-gp_Ax2d circ2dXAxis = circ2d->XAxis();                  
-                                                        
-// create a 3D curve in a given plane                   
-Handle(Geom_Curve) C3D =                                
-    GeomAPI::To3d(circ2d,gp_Pln(gp_Ax3(gp::XOY())));    
-Handle(Geom_Circle) C3DCircle =                         
-   Handle(Geom_Circle)::DownCast(C3D);                  
-                                                        
-gp_Ax1 C3DCircleXAxis = C3DCircle->XAxis();             
-                                                        
-// project it to a 2D curve in another plane            
-                                                        
-gp_Pln ProjectionPlane(gp_Pnt(1,1,0),gp_Dir( 1,1,1 ));  
-                                                        
-Handle(Geom2d_Curve) C2D =                              
-    GeomAPI::To2d(C3D,ProjectionPlane);                 
-                                                        
-Handle(Geom2d_Circle) C2DCircle =                       
-  Handle(Geom2d_Circle)::DownCast(C2D);                 
-gp_Ax2d C2DCircleXAxis = C2DCircle->XAxis();            
-                                                        
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = a2D3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+  
+  Standard_Real radius = 5;
+  gp_Ax2d ax2d(gp_Pnt2d(2,3),gp_Dir2d(1,0));
+
+  Handle(Geom2d_Circle) circ2d =
+    new Geom2d_Circle(ax2d,radius);
+
+  gp_Ax2d circ2dXAxis = circ2d->XAxis();
+
+  // create a 3D curve in a given plane
+  Handle(Geom_Curve) C3D =
+    GeomAPI::To3d(circ2d,gp_Pln(gp_Ax3(gp::XOY())));
+  Handle(Geom_Circle) C3DCircle =
+    Handle(Geom_Circle)::DownCast(C3D);
+
+  gp_Ax1 C3DCircleXAxis = C3DCircle->XAxis();
+
+  // project it to a 2D curve in another plane
+
+  gp_Pln ProjectionPlane(gp_Pnt(1,1,0),gp_Dir( 1,1,1 ));
+
+  Handle(Geom2d_Curve) C2D =
+    GeomAPI::To2d(C3D,ProjectionPlane);
+
+  Handle(Geom2d_Circle) C2DCircle =
+    Handle(Geom2d_Circle)::DownCast(C2D);
+  gp_Ax2d C2DCircleXAxis = C2DCircle->XAxis();
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                         \n\
 Standard_Real radius = 5;                               \n\
 gp_Ax2d ax2d(gp_Pnt2d(2,3),gp_Dir2d(1,0));              \n\
@@ -1668,90 +1679,90 @@ Handle(Geom2d_Circle) C2DCircle =                       \n\
   Handle(Geom2d_Circle)::DownCast(C2D);                 \n\
 gp_Ax2d C2DCircleXAxis = C2DCircle->XAxis();            \n\
                                                         \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-    Handle(Geom_Plane) aPlane = GC_MakePlane(gp_Pln(gp_Ax3(gp::XOY()))).Value();
-    Handle(Geom_RectangularTrimmedSurface) aSurface= new Geom_RectangularTrimmedSurface(aPlane,-8.,8.,-12.,12.);   
-    DisplaySurface(aDoc,aSurface);
-
-    Handle(Geom_Plane) aProjectionPlane = GC_MakePlane(ProjectionPlane).Value();
-    Handle(Geom_RectangularTrimmedSurface) aProjectionPlaneSurface=
-        new Geom_RectangularTrimmedSurface(aProjectionPlane,-8.,8.,-12.,12.);
-        
-    DisplaySurface(aDoc,aProjectionPlaneSurface);
-
-    Standard_CString aC3DEntityTypeName = C3D->DynamicType()->Name();        
-    Standard_CString aC2DEntityTypeName = C2D->DynamicType()->Name();        
-
-    Message += " C3D->DynamicType()->Name() = ";
-    Message += aC3DEntityTypeName; Message += " \n";
-    Message += " C2D->DynamicType()->Name() = ";
-    Message += aC2DEntityTypeName; Message += " \n";
-
-    DisplayCurve(aDoc,circ2d,4,false);
-    DisplayCurve(aDoc,C3D,false);
-    DisplayCurve(aDoc,C2D,5,false);
-
-    Handle(ISession_Direction) aC3DCircleXAxisDirection = new ISession_Direction((gp_Pnt)C3DCircleXAxis.Location(),
-                                                                                 (gp_Dir)C3DCircleXAxis.Direction(),
-                                                                                 5.2);
-    aDoc->GetAISContext()->Display(aC3DCircleXAxisDirection, Standard_False);
-
-    Handle(ISession_Direction) acirc2dXAxisDirection = new ISession_Direction((gp_Pnt2d)circ2dXAxis.Location(),
-                                                                              (gp_Dir2d)circ2dXAxis.Direction(),
-                                                                              5.2);
-    aDoc->GetISessionContext()->Display(acirc2dXAxisDirection, Standard_False);
-
-    Handle(ISession_Direction) aC2DCircleXAxisDirection = new ISession_Direction((gp_Pnt2d)C2DCircleXAxis.Location(),
-                                                                              (gp_Dir2d)C2DCircleXAxis.Direction(),
-                                                                              5.2);
-    aDoc->GetISessionContext()->Display(aC2DCircleXAxisDirection, Standard_False);
-
-
-    PostProcess(aDoc,ID_BUTTON_Test_24,TheDisplayType,Message.ToCString());
+ AddSeparator(aDoc,Message);
+ //--------------------------------------------------------------
+ Handle(Geom_Plane) aPlane = GC_MakePlane(gp_Pln(gp_Ax3(gp::XOY()))).Value();
+ Handle(Geom_RectangularTrimmedSurface) aSurface= new Geom_RectangularTrimmedSurface(aPlane,-8.,8.,-12.,12.);   
+ DisplaySurface(aDoc,aSurface);
+
+ Handle(Geom_Plane) aProjectionPlane = GC_MakePlane(ProjectionPlane).Value();
+ Handle(Geom_RectangularTrimmedSurface) aProjectionPlaneSurface=
+   new Geom_RectangularTrimmedSurface(aProjectionPlane,-8.,8.,-12.,12.);
+
+ DisplaySurface(aDoc,aProjectionPlaneSurface);
+
+ Standard_CString aC3DEntityTypeName = C3D->DynamicType()->Name();        
+ Standard_CString aC2DEntityTypeName = C2D->DynamicType()->Name();        
+
+ Message += " C3D->DynamicType()->Name() = ";
+ Message += aC3DEntityTypeName; Message += " \n";
+ Message += " C2D->DynamicType()->Name() = ";
+ Message += aC2DEntityTypeName; Message += " \n";
+
+ DisplayCurve(aDoc,circ2d,4,false);
+ DisplayCurve(aDoc,C3D,false);
+ DisplayCurve(aDoc,C2D,5,false);
+
+ Handle(ISession_Direction) aC3DCircleXAxisDirection = new ISession_Direction((gp_Pnt)C3DCircleXAxis.Location(),
+   (gp_Dir)C3DCircleXAxis.Direction(),
+   5.2);
+ aDoc->GetAISContext()->Display(aC3DCircleXAxisDirection, Standard_False);
+
+ Handle(ISession_Direction) acirc2dXAxisDirection = new ISession_Direction((gp_Pnt2d)circ2dXAxis.Location(),
+   (gp_Dir2d)circ2dXAxis.Direction(),
+   5.2);
+ aDoc->GetISessionContext()->Display(acirc2dXAxisDirection, Standard_False);
+
+ Handle(ISession_Direction) aC2DCircleXAxisDirection = new ISession_Direction((gp_Pnt2d)C2DCircleXAxis.Location(),
+   (gp_Dir2d)C2DCircleXAxis.Direction(),
+   5.2);
+ aDoc->GetISessionContext()->Display(aC2DCircleXAxisDirection, Standard_False);
+
+ PostProcess(aDoc,ID_BUTTON_Test_24,TheDisplayType,Message.ToCString());
 }
 
-
 // Function name       : GeomSources::gpTest25
 // Description     : 
 // Return type         : void 
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest25(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                                    
-Handle(TColgp_HArray1OfPnt2d) harray =                              
-    new TColgp_HArray1OfPnt2d (1,5); // sizing harray               
-harray->SetValue(1,gp_Pnt2d (0,0));                                 
-harray->SetValue(2,gp_Pnt2d (-3,1));                                
-harray->SetValue(3,gp_Pnt2d (-2,5));                                
-harray->SetValue(4,gp_Pnt2d (2,9));                                 
-harray->SetValue(5,gp_Pnt2d (-4,14));                               
-                                                                    
-Geom2dAPI_Interpolate anInterpolation(harray,Standard_False,0.01);  
-anInterpolation.Perform();                                          
-Handle(Geom2d_BSplineCurve) SPL = anInterpolation.Curve();          
-                                                                    
-gp_Pnt2d P1(-1,-2);                                                 
-gp_Pnt2d P2(0,15);                                                  
-gp_Dir2d V1 = gp::DY2d();                                           
-Handle(Geom2d_TrimmedCurve) TC1=                                    
-    GCE2d_MakeSegment(P1,V1,P2);                                    
-                                                                    
-Standard_Real tolerance = Precision::Confusion();                   
-Geom2dAPI_InterCurveCurve ICC (SPL,TC1,tolerance);                  
-Standard_Integer NbPoints =ICC.NbPoints();                          
-gp_Pnt2d PK;                                                        
-for (Standard_Integer k = 1;k<=NbPoints;k++)                        
-  {                                                                 
-    PK = ICC.Point(k);                                              
-    // do something with each intersection point                    
-  }                                                                 
-                                                                    
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
+
+  Handle(TColgp_HArray1OfPnt2d) harray =
+    new TColgp_HArray1OfPnt2d (1,5); // sizing harray
+  harray->SetValue(1,gp_Pnt2d (0,0));
+  harray->SetValue(2,gp_Pnt2d (-3,1));
+  harray->SetValue(3,gp_Pnt2d (-2,5));
+  harray->SetValue(4,gp_Pnt2d (2,9));
+  harray->SetValue(5,gp_Pnt2d (-4,14));
+
+Geom2dAPI_Interpolate anInterpolation(harray,Standard_False,0.01);
+anInterpolation.Perform();
+Handle(Geom2d_BSplineCurve) SPL = anInterpolation.Curve();
+
+gp_Pnt2d P1(-1,-2);
+gp_Pnt2d P2(0,15);
+gp_Dir2d V1 = gp::DY2d();
+Handle(Geom2d_TrimmedCurve) TC1 =
+    GCE2d_MakeSegment(P1,V1,P2);
+
+Standard_Real tolerance = Precision::Confusion();
+Geom2dAPI_InterCurveCurve ICC (SPL,TC1,tolerance);
+Standard_Integer NbPoints =ICC.NbPoints();
+gp_Pnt2d PK;
+
+for (Standard_Integer k = 1;k<=NbPoints;k++)
+{                                                                 
+  PK = ICC.Point(k);                                              
+  // do something with each intersection point                    
+}                                                                 
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                                     \n\
 Handle(TColgp_HArray1OfPnt2d) harray =                              \n\
     new TColgp_HArray1OfPnt2d (1,5); // sizing harray               \n\
@@ -1781,38 +1792,38 @@ for (Standard_Integer k = 1;k<=NbPoints;k++)                        \n\
     // do something with each intersection point                    \n\
   }                                                                 \n\
                                                                     \n");
-    AddSeparator(aDoc,Message);
-   //--------------------------------------------------------------
-
-    Handle(ISession2D_Curve) aCurve1 = new ISession2D_Curve(SPL);
-    aCurve1->SetDisplayPole(Standard_False);
-    aDoc->GetISessionContext()->Display(aCurve1, Standard_False);
-    Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(TC1);
-    aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
-
-    TCollection_AsciiString aString;
-       for (Standard_Integer i = 1;i<=NbPoints;i++)
-       {
-               PK = ICC.Point(i);
-               // do something with each intersection point
-        TCollection_AsciiString Message2 (i);
-               TCollection_AsciiString Message3 (PK.X());
-               TCollection_AsciiString Message4 (PK.Y());
-               aString = "PK_";
-               aString += Message2; 
-        
-               DisplayPoint(aDoc,PK,aString.ToCString(),false,0.5);
-        
-               Message += "PK_"; 
-               Message += Message2; 
-               Message += " ( ";
-        Message += Message3; 
-               Message += " , "; 
-        Message += Message4; 
-               Message += " )\n"; 
-       }
-
-   PostProcess(aDoc,ID_BUTTON_Test_25,TheDisplayType,Message.ToCString());
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
+
+  Handle(ISession2D_Curve) aCurve1 = new ISession2D_Curve(SPL);
+  aCurve1->SetDisplayPole(Standard_False);
+  aDoc->GetISessionContext()->Display(aCurve1, Standard_False);
+  Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(TC1);
+  aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
+
+  TCollection_AsciiString aString;
+  for (Standard_Integer i = 1;i<=NbPoints;i++)
+  {
+    PK = ICC.Point(i);
+    // do something with each intersection point
+    TCollection_AsciiString Message2 (i);
+    TCollection_AsciiString Message3 (PK.X());
+    TCollection_AsciiString Message4 (PK.Y());
+    aString = "PK_";
+    aString += Message2; 
+
+    DisplayPoint(aDoc,PK,aString.ToCString(),false,0.5);
+
+    Message += "PK_"; 
+    Message += Message2; 
+    Message += " ( ";
+    Message += Message3; 
+    Message += " , "; 
+    Message += Message4; 
+    Message += " )\n"; 
+  }
+
+  PostProcess(aDoc,ID_BUTTON_Test_25,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest26
@@ -1821,46 +1832,50 @@ for (Standard_Integer k = 1;k<=NbPoints;k++)                        \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest26(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                                      
-//----------- Build TC1 -----------------------                       
-gp_Pnt2d P1(0,0);  gp_Pnt2d P2(2,6);                                  
-gp_Dir2d V1 = gp::DY2d();                                             
-Handle(Geom2d_TrimmedCurve) TC1 =  GCE2d_MakeSegment(P1,V1,P2);       
-Standard_Real FP1 = TC1->FirstParameter();                            
-Standard_Real LP1 = TC1->LastParameter();                             
-//----------- Build TC2 -----------------------                       
-gp_Pnt2d P3(-9,6.5);       gp_Dir2d V2 = gp::DX2d();                    
-Handle(Geom2d_TrimmedCurve) TC2 = GCE2d_MakeSegment(P3,V2,P2);        
-Standard_Real FP2 = TC1->FirstParameter();                            
-Standard_Real LP2 = TC1->LastParameter();                             
-//----------- Extrema TC1 / TC2 ---------------                       
-Geom2dAPI_ExtremaCurveCurve ECC (TC1,TC2, FP1,LP1, FP2,LP2);          
-Standard_Real shortestdistance =-1;                                   
-if (ECC.NbExtrema() != 0)  shortestdistance = ECC.LowerDistance();    
-//----------- Build SPL1 ----------------------                       
-TColgp_Array1OfPnt2d array (1,5); // sizing array                     
-array.SetValue(1,gp_Pnt2d (-4,0)); array.SetValue(2,gp_Pnt2d (-7,2)); 
-array.SetValue(3,gp_Pnt2d (-6,3)); array.SetValue(4,gp_Pnt2d (-4,3)); 
-array.SetValue(5,gp_Pnt2d (-3,5));                                    
-Handle(Geom2d_BSplineCurve) SPL1 = Geom2dAPI_PointsToBSpline(array);  
-Standard_Real FPSPL1 = SPL1->FirstParameter();                        
-Standard_Real LPSPL1 = SPL1->LastParameter();                         
-//----------- Extrema TC1 / SPL1  -------------                       
-Geom2dAPI_ExtremaCurveCurve ECC2 (TC1,SPL1, FP1,LP1, FPSPL1,LPSPL1);  
-Standard_Real SPL1shortestdistance =-1;                               
-if (ECC2.NbExtrema()!=0) SPL1shortestdistance = ECC2.LowerDistance(); 
-Standard_Integer NbExtrema = ECC2.NbExtrema();                        
-TColgp_Array2OfPnt2d aSolutionArray(1,NbExtrema,1,2);                 
-for(int i=1;i <= NbExtrema; i++)   {                                  
-    gp_Pnt2d P1,P2;                                                   
-    ECC2.Points(i,P1,P2);                                             
-    aSolutionArray(i,1) = P1;  aSolutionArray(i,2) = P2; }            
-                                                                      
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
+
+  //----------- Build TC1 -----------------------
+  gp_Pnt2d P1(0,0);  gp_Pnt2d P2(2,6);
+  gp_Dir2d V1 = gp::DY2d();
+  Handle(Geom2d_TrimmedCurve) TC1 =  GCE2d_MakeSegment(P1,V1,P2);
+  Standard_Real FP1 = TC1->FirstParameter();
+  Standard_Real LP1 = TC1->LastParameter();
+  //----------- Build TC2 -----------------------
+  gp_Pnt2d P3(-9,6.5);       gp_Dir2d V2 = gp::DX2d();
+  Handle(Geom2d_TrimmedCurve) TC2 = GCE2d_MakeSegment(P3,V2,P2);
+  Standard_Real FP2 = TC1->FirstParameter();
+  Standard_Real LP2 = TC1->LastParameter();
+  //----------- Extrema TC1 / TC2 ---------------
+  Geom2dAPI_ExtremaCurveCurve ECC (TC1,TC2, FP1,LP1, FP2,LP2);
+  Standard_Real shortestdistance =-1;
+  if (ECC.NbExtrema() != 0)  shortestdistance = ECC.LowerDistance();
+  //----------- Build SPL1 ---------------------- 
+  TColgp_Array1OfPnt2d array (1,5); // sizing array
+  array.SetValue(1,gp_Pnt2d (-4,0)); array.SetValue(2,gp_Pnt2d (-7,2));
+  array.SetValue(3,gp_Pnt2d (-6,3)); array.SetValue(4,gp_Pnt2d (-4,3));
+  array.SetValue(5,gp_Pnt2d (-3,5));
+  Handle(Geom2d_BSplineCurve) SPL1 = Geom2dAPI_PointsToBSpline(array);
+  Standard_Real FPSPL1 = SPL1->FirstParameter();
+  Standard_Real LPSPL1 = SPL1->LastParameter();
+  //----------- Extrema TC1 / SPL1  -------------                       
+  Geom2dAPI_ExtremaCurveCurve ECC2 (TC1,SPL1, FP1,LP1, FPSPL1,LPSPL1);
+  Standard_Real SPL1shortestdistance =-1;
+  if (ECC2.NbExtrema()!=0) SPL1shortestdistance = ECC2.LowerDistance();
+  Standard_Integer NbExtrema = ECC2.NbExtrema();
+  TColgp_Array2OfPnt2d aSolutionArray(1,NbExtrema,1,2);
+  for(int i=1;i <= NbExtrema; i++)
+  {                                  
+    gp_Pnt2d P1,P2;
+    ECC2.Points(i,P1,P2);
+    aSolutionArray(i,1) = P1;
+    aSolutionArray(i,2) = P2;
+  }            
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
 //----------- Build TC1 -----------------------                       \n\
 gp_Pnt2d P1(0,0);  gp_Pnt2d P2(2,6);                                  \n\
 gp_Dir2d V1 = gp::DY2d();                                             \n\
@@ -1895,60 +1910,66 @@ for(int i=1;i <= NbExtrema; i++)   {                                  \n\
     gp_Pnt2d P1,P2;                                                   \n\
     ECC2.Points(i,P1,P2);                                             \n\
     aSolutionArray(i,1) = P1;  aSolutionArray(i,2) = P2; }            \n";
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-
-    TCollection_AsciiString aString;
-    for(int i = array.Lower();i<=array.Upper();i++){
-               TCollection_AsciiString Message2 (i);
-               gp_Pnt2d P = array(i);
-        aString = "array ";
-               aString += Message2; 
-        DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
-               }
-
-    if (!SPL1.IsNull())
-    { 
-      Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(SPL1);
-      aCurve->SetDisplayPole(Standard_False);
-      aCurve->SetColorIndex(3);
-      aDoc->GetISessionContext()->Display(aCurve, Standard_False);
-    }
-    else
-      MessageBox(0,"SPL1.IsNull()","CasCade Error",MB_ICONERROR);
-
-    Handle(ISession2D_Curve) aCurve1 = new ISession2D_Curve(TC1);
-    aCurve1->SetColorIndex(6);
-    aDoc->GetISessionContext()->Display(aCurve1, Standard_False);
-    Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(TC2);
-    aCurve2->SetColorIndex(5);
-    aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
-
-
-    for(int i=1;i <= NbExtrema; i++)
-    {
-        gp_Pnt2d P1 =aSolutionArray(i,1);
-        
-               TCollection_AsciiString Message2 (i);
-               aString = "P1_";
-               aString += Message2; 
-        DisplayPoint(aDoc,P1,aString.ToCString(),false,0.7*i);
-
-        gp_Pnt2d P2 = aSolutionArray(i,2);
-        
-        Handle(Geom2d_TrimmedCurve) SolutionCurve =            
-               GCE2d_MakeSegment(P1,P2);             
-        Handle(ISession2D_Curve) aSolutionCurve = new ISession2D_Curve(SolutionCurve);
-        aDoc->GetISessionContext()->Display(aSolutionCurve, Standard_False);
-    }
-
-    Message += "TC1 is  Yellow ,TC2 is  Blue ,SPL1 is Red \n";
-    Message += "ECC.NbExtrema()  = "; Message += ECC.NbExtrema();
-    Message += "    shortestdistance = "; Message+= shortestdistance; Message += "\n";
-    Message += "ECC2.NbExtrema() = "; Message += NbExtrema;
-    Message += "    SPL1shortestdistance = "; Message+= SPL1shortestdistance; Message += "\n";
-
-    PostProcess(aDoc,ID_BUTTON_Test_26,TheDisplayType,Message.ToCString());
+ AddSeparator(aDoc,Message);
+ //--------------------------------------------------------------
+
+ TCollection_AsciiString aString;
+ for(int i = array.Lower();i<=array.Upper();i++)
+ {
+   TCollection_AsciiString Message2 (i);
+   gp_Pnt2d P = array(i);
+   aString = "array ";
+   aString += Message2; 
+   DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
+ }
+
+ if (!SPL1.IsNull())
+ { 
+   Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(SPL1);
+   aCurve->SetDisplayPole(Standard_False);
+   aCurve->SetColorIndex(3);
+   aDoc->GetISessionContext()->Display(aCurve, Standard_False);
+ }
+ else
+   MessageBox(0,"SPL1.IsNull()","CasCade Error",MB_ICONERROR);
+
+ Handle(ISession2D_Curve) aCurve1 = new ISession2D_Curve(TC1);
+ aCurve1->SetColorIndex(6);
+ aDoc->GetISessionContext()->Display(aCurve1, Standard_False);
+ Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(TC2);
+ aCurve2->SetColorIndex(5);
+ aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
+
+ for(int i=1;i <= NbExtrema; i++)
+ {
+   gp_Pnt2d P1 =aSolutionArray(i,1);
+
+   TCollection_AsciiString Message2 (i);
+   aString = "P1_";
+   aString += Message2; 
+   DisplayPoint(aDoc,P1,aString.ToCString(),false,0.7*i);
+
+   gp_Pnt2d P2 = aSolutionArray(i,2);
+
+   Handle(Geom2d_TrimmedCurve) SolutionCurve =
+     GCE2d_MakeSegment(P1,P2);
+   Handle(ISession2D_Curve) aSolutionCurve = new ISession2D_Curve(SolutionCurve);
+   aDoc->GetISessionContext()->Display(aSolutionCurve, Standard_False);
+ }
+
+ Message += "TC1 is  Yellow ,TC2 is  Blue ,SPL1 is Red \n";
+ Message += "ECC.NbExtrema()  = ";
+ Message += ECC.NbExtrema();
+ Message += "    shortestdistance = ";
+ Message+= shortestdistance;
+ Message += "\n";
+ Message += "ECC2.NbExtrema() = ";
+ Message += NbExtrema;
+ Message += "    SPL1shortestdistance = ";
+ Message+= SPL1shortestdistance;
+ Message += "\n";
+
+ PostProcess(aDoc,ID_BUTTON_Test_26,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest27
@@ -1957,28 +1978,27 @@ for(int i=1;i <= NbExtrema; i++)   {                                  \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest27(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                                       
-TColgp_Array1OfPnt2d array (1,5); // sizing array                      
-array.SetValue(1,gp_Pnt2d (-4,0)); array.SetValue(2,gp_Pnt2d (-7,2));  
-array.SetValue(3,gp_Pnt2d (-6,3)); array.SetValue(4,gp_Pnt2d (-4,3));  
-array.SetValue(5,gp_Pnt2d (-3,5));                                     
-Handle(Geom2d_BSplineCurve) SPL1 = Geom2dAPI_PointsToBSpline(array);   
-                                                                       
-Standard_Real dist = 1;                                                
-Handle(Geom2d_OffsetCurve) OC =                                        
-       new Geom2d_OffsetCurve(SPL1,dist);                              
-Standard_Boolean result = OC->IsCN(2);                                 
-                                                                       
-Standard_Real dist2 = 1.5;                                             
-Handle(Geom2d_OffsetCurve) OC2 =                                       
-       new Geom2d_OffsetCurve(SPL1,dist2);                             
-Standard_Boolean result2 = OC2->IsCN(2);                               
-                                                                       
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+
+  TColgp_Array1OfPnt2d array (1,5); // sizing array
+  array.SetValue(1,gp_Pnt2d (-4,0)); array.SetValue(2,gp_Pnt2d (-7,2));
+  array.SetValue(3,gp_Pnt2d (-6,3)); array.SetValue(4,gp_Pnt2d (-4,3));
+  array.SetValue(5,gp_Pnt2d (-3,5));
+  Handle(Geom2d_BSplineCurve) SPL1 = Geom2dAPI_PointsToBSpline(array);
+
+  Standard_Real dist = 1;
+  Handle(Geom2d_OffsetCurve) OC =
+    new Geom2d_OffsetCurve(SPL1,dist);
+  Standard_Boolean result = OC->IsCN(2);
+  Standard_Real dist2 = 1.5;
+  Handle(Geom2d_OffsetCurve) OC2 =
+    new Geom2d_OffsetCurve(SPL1,dist2);
+  Standard_Boolean result2 = OC2->IsCN(2);
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                                        \n\
 TColgp_Array1OfPnt2d array (1,5); // sizing array                      \n\
 array.SetValue(1,gp_Pnt2d (-4,0)); array.SetValue(2,gp_Pnt2d (-7,2));  \n\
@@ -1996,29 +2016,33 @@ Handle(Geom2d_OffsetCurve) OC2 =                                       \n\
        new Geom2d_OffsetCurve(SPL1,dist2);                             \n\
 Standard_Boolean result2 = OC2->IsCN(2);                               \n\
                                                                        \n");
-    AddSeparator(aDoc,Message);
-//--------------------------------------------------------------
-    Handle(ISession2D_Curve) aCurve1 = new ISession2D_Curve(SPL1);
-    aCurve1->SetColorIndex(6);
-    aDoc->GetISessionContext()->Display(aCurve1, Standard_False);
-    Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(OC);
-    aCurve2->SetColorIndex(5);
-    aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
-    Handle(ISession2D_Curve) aCurve3 = new ISession2D_Curve(OC2);
-    aCurve3->SetColorIndex(3);
-    aDoc->GetISessionContext()->Display(aCurve3, Standard_False);
-
-
-    Message += "SPL1 is Yellow \n";
-    Message += "OC   is Blue \n";
-    Message += "OC2  is Red \n\n";
-       Message += "  Warning, Continuity is not guaranteed :  \n ";
-       if(result)    Message += " result  = True  \n";
-    else          Message += " result  = False \n";
-       if(result2)   Message += " result2 = True  \n";
-    else          Message += " result2 = False \n";
-
-    PostProcess(aDoc,ID_BUTTON_Test_27,TheDisplayType,Message.ToCString());
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
+  Handle(ISession2D_Curve) aCurve1 = new ISession2D_Curve(SPL1);
+  aCurve1->SetColorIndex(6);
+  aDoc->GetISessionContext()->Display(aCurve1, Standard_False);
+  Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(OC);
+  aCurve2->SetColorIndex(5);
+  aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
+  Handle(ISession2D_Curve) aCurve3 = new ISession2D_Curve(OC2);
+  aCurve3->SetColorIndex(3);
+  aDoc->GetISessionContext()->Display(aCurve3, Standard_False);
+
+
+  Message += "SPL1 is Yellow \n";
+  Message += "OC   is Blue \n";
+  Message += "OC2  is Red \n\n";
+  Message += "  Warning, Continuity is not guaranteed :  \n ";
+  if(result)
+    Message += " result  = True  \n";
+  else
+    Message += " result  = False \n";
+  if(result2)
+    Message += " result2 = True  \n";
+  else
+    Message += " result2 = False \n";
+
+  PostProcess(aDoc,ID_BUTTON_Test_27,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest28
@@ -2027,34 +2051,34 @@ Standard_Boolean result2 = OC2->IsCN(2);                               \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest28(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                      
-gp_Pnt2d P1(1,2);                     
-gp_Pnt2d P2(4,5);                     
-gp_Lin2d L = gce_MakeLin2d(P1,P2);    
-// assignment by overloaded operator  
-                                      
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+
+  gp_Pnt2d P1(1,2);
+  gp_Pnt2d P2(4,5);
+  gp_Lin2d L = gce_MakeLin2d(P1,P2);
+  // assignment by overloaded operator  
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                       \n\
 gp_Pnt2d P1(1,2);                     \n\
 gp_Pnt2d P2(4,5);                     \n\
 gp_Lin2d L = gce_MakeLin2d(P1,P2);    \n\
 // assignment by overloaded operator  \n\
                                       \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-    
-    DisplayPoint(aDoc,P1,"P1",false,0.5);
-    DisplayPoint(aDoc,P2,"P2",false,0.5);
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
-    Handle(Geom2d_TrimmedCurve) aLine = GCE2d_MakeSegment(L,-3,8);
-    Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aLine);
-    aDoc->GetISessionContext()->Display(aCurve, Standard_False);
+  DisplayPoint(aDoc,P1,"P1",false,0.5);
+  DisplayPoint(aDoc,P2,"P2",false,0.5);
 
-    PostProcess(aDoc,ID_BUTTON_Test_28,TheDisplayType,Message.ToCString());
+  Handle(Geom2d_TrimmedCurve) aLine = GCE2d_MakeSegment(L,-3,8);
+  Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aLine);
+  aDoc->GetISessionContext()->Display(aCurve, Standard_False);
+
+  PostProcess(aDoc,ID_BUTTON_Test_28,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest29
@@ -2063,21 +2087,22 @@ gp_Lin2d L = gce_MakeLin2d(P1,P2);    \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest29(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                             
-gp_Pnt2d P1(1,2);            
-gp_Pnt2d P2(4,5);            
-gp_Lin2d L;                  
-GccAna_Pnt2dBisec B(P1,P2);  
-if (B.IsDone())              
-    {                        
-    L = B.ThisSolution();    
-    }                        
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
                              
-//==============================================================
-    TCollection_AsciiString Message (" \
+  gp_Pnt2d P1(1,2);
+  gp_Pnt2d P2(4,5);
+  gp_Lin2d L;
+  GccAna_Pnt2dBisec B(P1,P2);
+  if (B.IsDone())
+  {
+    L = B.ThisSolution();
+  }
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                              \n\
 gp_Pnt2d P1(1,2);            \n\
 gp_Pnt2d P2(4,5);            \n\
@@ -2088,22 +2113,22 @@ if (B.IsDone())              \n\
     L = B.ThisSolution();    \n\
     }                        \n\
                              \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
-    DisplayPoint(aDoc,P1,"P1",false,0.5);
-    DisplayPoint(aDoc,P2,"P2",false,0.5);
+  DisplayPoint(aDoc,P1,"P1",false,0.5);
+  DisplayPoint(aDoc,P2,"P2",false,0.5);
 
-       if (B.IsDone())
-         {
-        Handle(Geom2d_TrimmedCurve) aLine = GCE2d_MakeSegment(L,-8,8);
-        Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aLine);
-        aDoc->GetISessionContext()->Display(aCurve, Standard_False);
-      }
+  if (B.IsDone())
+  {
+    Handle(Geom2d_TrimmedCurve) aLine = GCE2d_MakeSegment(L,-8,8);
+    Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aLine);
+    aDoc->GetISessionContext()->Display(aCurve, Standard_False);
+  }
 
-       if (B.IsDone()) Message += " \n   B Is Done   ";
-    else            Message += " \n   B Is not Done    ";
-    PostProcess(aDoc,ID_BUTTON_Test_29,TheDisplayType,Message.ToCString());
+  if (B.IsDone()) Message += " \n   B Is Done   ";
+  else            Message += " \n   B Is not Done    ";
+  PostProcess(aDoc,ID_BUTTON_Test_29,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest30
@@ -2112,30 +2137,31 @@ if (B.IsDone())              \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest30(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType =a2DNo3D ;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                     
-gp_Pnt2d P1 (2,3);                                   
-gp_Pnt2d P2 (4,4);                                   
-gp_Pnt2d P3 (6,7);                                   
-gp_Pnt2d P4 (10,10);                                 
-gp_Circ2d C = gce_MakeCirc2d (P1,P2,P3);             
-GccEnt_QualifiedCirc QC = GccEnt::Outside(C);        
-GccAna_Lin2d2Tan LT (QC,P4,Precision::Confusion());  
-Standard_Integer NbSol;                              
-if (LT.IsDone())                                     
-  {                                                  
-      NbSol = LT.NbSolutions();                      
-      for(Standard_Integer k=1; k<=NbSol; k++)       
-        {                                            
-         gp_Lin2d L = LT.ThisSolution(k);            
-          // do something with L                     
-        }                                            
-  }                                                  
-                                                     
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType =a2DNo3D ;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
+
+  gp_Pnt2d P1 (2,3);
+  gp_Pnt2d P2 (4,4);
+  gp_Pnt2d P3 (6,7);
+  gp_Pnt2d P4 (10,10);
+  gp_Circ2d C = gce_MakeCirc2d (P1,P2,P3);
+  GccEnt_QualifiedCirc QC = GccEnt::Outside(C);
+  GccAna_Lin2d2Tan LT (QC,P4,Precision::Confusion());
+  Standard_Integer NbSol;
+  if (LT.IsDone())
+  {
+    NbSol = LT.NbSolutions();
+    for(Standard_Integer k=1; k<=NbSol; k++)
+    {
+      gp_Lin2d L = LT.ThisSolution(k);
+      // do something with L
+    }
+  }
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                      \n\
 gp_Pnt2d P1 (2,3);                                   \n\
 gp_Pnt2d P2 (4,4);                                   \n\
@@ -2155,39 +2181,38 @@ if (LT.IsDone())                                     \n\
         }                                            \n\
   }                                                  \n\
                                                      \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
-    DisplayPoint(aDoc,P1,"P1",false,0.5,-1,0.1);
-    DisplayPoint(aDoc,P2,"P2",false,0.5,-0.7,0.1);
-    DisplayPoint(aDoc,P3,"P3",false,0.5,-0.5,0.1);
-    DisplayPoint(aDoc,P4,"P4",false,0.5,0,0.1);
-        
-    Handle(Geom2d_Circle) aCircle = new Geom2d_Circle(C);
-    Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aCircle);
-    aCurve->SetColorIndex(5);
-    aDoc->GetISessionContext()->Display(aCurve, Standard_False);
+  DisplayPoint(aDoc,P1,"P1",false,0.5,-1,0.1);
+  DisplayPoint(aDoc,P2,"P2",false,0.5,-0.7,0.1);
+  DisplayPoint(aDoc,P3,"P3",false,0.5,-0.5,0.1);
+  DisplayPoint(aDoc,P4,"P4",false,0.5,0,0.1);
 
-       if (LT.IsDone())
-               {
-                 Standard_Integer NbSol = LT.NbSolutions();
-                 for(Standard_Integer k=1; k<=NbSol; k++)
-                       {
-                         gp_Lin2d L = LT.ThisSolution(k);
-              Handle(Geom2d_TrimmedCurve) aLine = GCE2d_MakeSegment(L,-10,20);
-              Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aLine);
-              aDoc->GetISessionContext()->Display(aCurve, Standard_False);
-                       }
-               }
-    Message += " C is Blue \n\n";
-    Message += "LT.IsDone() = "; 
-    if (LT.IsDone())  Message += "True \n"; else Message += "False \n";
-    TCollection_AsciiString Message2 (NbSol);
-       Message += "NbSol       = "; Message += Message2      ; Message += "\n";
-
-    PostProcess(aDoc,ID_BUTTON_Test_30,TheDisplayType,Message.ToCString());
-}
+  Handle(Geom2d_Circle) aCircle = new Geom2d_Circle(C);
+  Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aCircle);
+  aCurve->SetColorIndex(5);
+  aDoc->GetISessionContext()->Display(aCurve, Standard_False);
 
+  if (LT.IsDone())
+  {
+    Standard_Integer NbSol = LT.NbSolutions();
+    for(Standard_Integer k=1; k<=NbSol; k++)
+    {
+      gp_Lin2d L = LT.ThisSolution(k);
+      Handle(Geom2d_TrimmedCurve) aLine = GCE2d_MakeSegment(L,-10,20);
+      Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aLine);
+      aDoc->GetISessionContext()->Display(aCurve, Standard_False);
+    }
+  }
+  Message += " C is Blue \n\n";
+  Message += "LT.IsDone() = "; 
+  if (LT.IsDone())  Message += "True \n"; else Message += "False \n";
+  TCollection_AsciiString Message2 (NbSol);
+  Message += "NbSol       = "; Message += Message2      ; Message += "\n";
+
+  PostProcess(aDoc,ID_BUTTON_Test_30,TheDisplayType,Message.ToCString());
+}
 
 // Function name       : GeomSources::gpTest31
 // Description     : 
@@ -2195,41 +2220,42 @@ if (LT.IsDone())                                     \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest31(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                                              
-gp_Pnt2d P1 (9,6);                                                            
-gp_Pnt2d P2 (10,4);                                                           
-gp_Pnt2d P3 (6,7);                                                            
-gp_Circ2d C = gce_MakeCirc2d (P1,P2,P3);                                      
-GccEnt_QualifiedCirc QC = GccEnt::Outside(C);                                 
-gp_Pnt2d P4 (-2,7);                                                           
-gp_Pnt2d P5 (12,-3);                                                          
-gp_Lin2d L = GccAna_Lin2d2Tan(P4,P5,Precision::Confusion()).ThisSolution(1);  
-GccEnt_QualifiedLin QL = GccEnt::Unqualified(L);                              
-Standard_Real radius = 2;                                                     
-GccAna_Circ2d2TanRad TR (QC,QL,radius,Precision::Confusion());                
-Standard_Real parsol,pararg;                                                  
-gp_Pnt2d tangentpoint1,tangentpoint2;                                         
-gp_Circ2d circ;                                                               
-if (TR.IsDone())                                                              
-    {                                                                         
-      Standard_Integer NbSol = TR.NbSolutions();                              
-      for (Standard_Integer k=1; k<=NbSol; k++)                               
-        {                                                                     
-          circ = TR.ThisSolution(k);                                          
-          // find the solution circle                                         
-          TR.Tangency1(k,parsol,pararg,tangentpoint1);                        
-          // find the first tangent point                                     
-          TR.Tangency2(k,parsol,pararg,tangentpoint2);                        
-          // find the second tangent point                                    
-        }                                                                     
-    }                                                                         
-                                                                              
-//==============================================================
-    TCollection_AsciiString Message;
-Message = "\
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
+
+gp_Pnt2d P1 (9,6);
+gp_Pnt2d P2 (10,4);
+gp_Pnt2d P3 (6,7);
+gp_Circ2d C = gce_MakeCirc2d (P1,P2,P3);
+GccEnt_QualifiedCirc QC = GccEnt::Outside(C);
+gp_Pnt2d P4 (-2,7);
+gp_Pnt2d P5 (12,-3);
+gp_Lin2d L = GccAna_Lin2d2Tan(P4,P5,Precision::Confusion()).ThisSolution(1);
+GccEnt_QualifiedLin QL = GccEnt::Unqualified(L);
+Standard_Real radius = 2;
+GccAna_Circ2d2TanRad TR (QC,QL,radius,Precision::Confusion());
+Standard_Real parsol,pararg;
+gp_Pnt2d tangentpoint1,tangentpoint2;
+gp_Circ2d circ;
+if (TR.IsDone())
+{
+  Standard_Integer NbSol = TR.NbSolutions();
+  for (Standard_Integer k=1; k<=NbSol; k++)
+  {
+    circ = TR.ThisSolution(k);
+    // find the solution circle
+    TR.Tangency1(k,parsol,pararg,tangentpoint1);
+    // find the first tangent point
+    TR.Tangency2(k,parsol,pararg,tangentpoint2);
+    // find the second tangent point
+  }
+}
+
+  //==============================================================
+  TCollection_AsciiString Message;
+  Message = "\
                                                                               \n\
 gp_Pnt2d P1 (9,6);                                                            \n\
 gp_Pnt2d P2 (10,4);                                                           \n\
@@ -2250,7 +2276,7 @@ if (TR.IsDone())                                                              \n
       Standard_Integer NbSol = TR.NbSolutions();                              \n\
       for (Standard_Integer k=1; k<=NbSol; k++)                               \n\
         {                                                                     \n";
-        Message += "\
+  Message += "\
           circ = TR.ThisSolution(k);                                          \n\
           // find the solution circle                                         \n\
           TR.Tangency1(k,parsol,pararg,tangentpoint1);                        \n\
@@ -2260,46 +2286,47 @@ if (TR.IsDone())                                                              \n
         }                                                                     \n\
     }                                                                         \n\
                                                                               \n";
-    AddSeparator(aDoc,Message);
-//--------------------------------------------------------------
-    DisplayPoint(aDoc,P1,"P1",false,0.3);
-    DisplayPoint(aDoc,P2,"P2",false,0.3);
-    DisplayPoint(aDoc,P3,"P3",false,0.3);
-    DisplayPoint(aDoc,P4,"P4",false,0.3);
-    DisplayPoint(aDoc,P5,"P5",false,0.3);
-
-    Handle(Geom2d_Circle) aCircle = new Geom2d_Circle(C);
-    Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aCircle);
-    aCurve->SetColorIndex(3);
+  AddSeparator(aDoc,Message);
+
+  //--------------------------------------------------------------
+  DisplayPoint(aDoc,P1,"P1",false,0.3);
+  DisplayPoint(aDoc,P2,"P2",false,0.3);
+  DisplayPoint(aDoc,P3,"P3",false,0.3);
+  DisplayPoint(aDoc,P4,"P4",false,0.3);
+  DisplayPoint(aDoc,P5,"P5",false,0.3);
+
+  Handle(Geom2d_Circle) aCircle = new Geom2d_Circle(C);
+  Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aCircle);
+  aCurve->SetColorIndex(3);
+
+  aDoc->GetISessionContext()->Display(aCurve, Standard_False);
+  Handle(Geom2d_TrimmedCurve) aLine = GCE2d_MakeSegment(L,-2,20);
+  Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(aLine);
+  aCurve2->SetColorIndex(5);
+  aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
+
+  if (TR.IsDone())
+  {
+    Standard_Integer NbSol = TR.NbSolutions();
+    for (Standard_Integer k=1; k<=NbSol; k++)
+    {
+      circ = TR.ThisSolution(k);
+      Handle(Geom2d_Circle) aCircle = new Geom2d_Circle(circ);
+      Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aCircle);
+      aDoc->GetISessionContext()->Display(aCurve, Standard_False);
 
-    aDoc->GetISessionContext()->Display(aCurve, Standard_False);
-    Handle(Geom2d_TrimmedCurve) aLine = GCE2d_MakeSegment(L,-2,20);
-    Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(aLine);
-    aCurve2->SetColorIndex(5);
-    aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
-
-       if (TR.IsDone())
-               {
-                 Standard_Integer NbSol = TR.NbSolutions();
-                 for (Standard_Integer k=1; k<=NbSol; k++)
-                       {
-                         circ = TR.ThisSolution(k);
-              Handle(Geom2d_Circle) aCircle = new Geom2d_Circle(circ);
-              Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(aCircle);
-              aDoc->GetISessionContext()->Display(aCurve, Standard_False);
-
-                         // find the solution circle
-                         TR.Tangency1(k,parsol,pararg,tangentpoint1);
-                         // find the first tangent point                                                                        
-              TR.Tangency2(k,parsol,pararg,tangentpoint2);
-                         // find the second tangent point
-              DisplayPoint(aDoc,tangentpoint1,"tangentpoint1",false,0.3);
-              DisplayPoint(aDoc,tangentpoint2,"tangentpoint2",false,0.3);
-                       }
-               }
-    Message += "C is Red \n";
-    Message += "L is Blue \n";
-    PostProcess(aDoc,ID_BUTTON_Test_31,TheDisplayType,Message.ToCString());
+      // find the solution circle
+      TR.Tangency1(k,parsol,pararg,tangentpoint1);
+      // find the first tangent point                                                                   
+      TR.Tangency2(k,parsol,pararg,tangentpoint2);
+      // find the second tangent point
+      DisplayPoint(aDoc,tangentpoint1,"tangentpoint1",false,0.3);
+      DisplayPoint(aDoc,tangentpoint2,"tangentpoint2",false,0.3);
+    }
+  }
+  Message += "C is Red \n";
+  Message += "L is Blue \n";
+  PostProcess(aDoc,ID_BUTTON_Test_31,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest32
@@ -2308,18 +2335,19 @@ if (TR.IsDone())                                                              \n
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest32(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = a2DNo3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                                        
-Standard_Real major = 12;                                               
-Standard_Real minor = 4;                                                
-gp_Ax2d axis = gp::OX2d();                                              
-gp_Elips2d EE(axis,major,minor);;                                           
-Handle(Geom2d_TrimmedCurve) arc = GCE2d_MakeArcOfEllipse(EE,0.0,M_PI/4);  
-                                                                        
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = a2DNo3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
+
+  Standard_Real major = 12;
+  Standard_Real minor = 4;
+  gp_Ax2d axis = gp::OX2d();
+  gp_Elips2d EE(axis,major,minor);
+  Handle(Geom2d_TrimmedCurve) arc = GCE2d_MakeArcOfEllipse(EE,0.0,M_PI/4);
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                                         \n\
 Standard_Real major = 12;                                               \n\
 Standard_Real minor = 4;                                                \n\
@@ -2327,19 +2355,20 @@ gp_Ax2d axis = gp::OX2d();                                              \n\
 gp_Elips2d EE(axis,major,minor);                                        \n\
 Handle(Geom2d_TrimmedCurve) arc = GCE2d_MakeArcOfEllipse(EE,0.0,PI/4);  \n\
                                                                         \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-    Handle(Geom2d_Curve) E = GCE2d_MakeEllipse(EE);
-    Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(E);
-    aCurve->SetColorIndex(3);
-    aCurve->SetTypeOfLine(Aspect_TOL_DOTDASH);
-    //SetWidthOfLine                 
-    aDoc->GetISessionContext()->Display(aCurve, Standard_False);
-    Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(arc);
-    aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
-       TCollection_AsciiString Message2 (M_PI);
-    Message += " PI = ";Message+= Message2;
-    PostProcess(aDoc,ID_BUTTON_Test_32,TheDisplayType,Message.ToCString());
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
+  Handle(Geom2d_Curve) E = GCE2d_MakeEllipse(EE);
+  Handle(ISession2D_Curve) aCurve = new ISession2D_Curve(E);
+  aCurve->SetColorIndex(3);
+  aCurve->SetTypeOfLine(Aspect_TOL_DOTDASH);
+  //SetWidthOfLine                 
+  aDoc->GetISessionContext()->Display(aCurve, Standard_False);
+  Handle(ISession2D_Curve) aCurve2 = new ISession2D_Curve(arc);
+  aDoc->GetISessionContext()->Display(aCurve2, Standard_False);
+  TCollection_AsciiString Message2 (M_PI);
+  Message += " PI = ";Message+= Message2;
+
+  PostProcess(aDoc,ID_BUTTON_Test_32,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest33
@@ -2348,42 +2377,43 @@ Handle(Geom2d_TrimmedCurve) arc = GCE2d_MakeArcOfEllipse(EE,0.0,PI/4);  \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest33(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                                                        
-gp_Pnt P1(0,0,1);                                                                       
-gp_Pnt P2(1,2,2);                                                                       
-gp_Pnt P3(2,3,3);                                                                       
-gp_Pnt P4(4,3,4);                                                                       
-gp_Pnt P5(5,5,5);                                                                       
-TColgp_Array1OfPnt array (1,5); // sizing array                                         
-array.SetValue(1,P1);                                                                   
-array.SetValue(2,P2);                                                                   
-array.SetValue(3,P3);                                                                   
-array.SetValue(4,P4);                                                                   
-array.SetValue(5,P5);                                                                   
-Handle(TColgp_HArray1OfPnt) harray =                                                    
-    new TColgp_HArray1OfPnt (1,5); // sizing harray                                     
-harray->SetValue(1,P1.Translated(gp_Vec(4,0,0)));                                       
-harray->SetValue(2,P2.Translated(gp_Vec(4,0,0)));                                       
-harray->SetValue(3,P3.Translated(gp_Vec(4,0,0)));                                       
-harray->SetValue(4,P4.Translated(gp_Vec(4,0,0)));                                       
-harray->SetValue(5,P5.Translated(gp_Vec(4,0,0)));                                       
-Handle(Geom_BSplineCurve) SPL1 =                                                        
-    GeomAPI_PointsToBSpline(array).Curve();                                             
-                                                                                        
-GeomAPI_Interpolate anInterpolation(harray,Standard_False,Precision::Approximation());  
-anInterpolation.Perform();                                                              
-                                                                                        
-Handle(Geom_BSplineCurve) SPL2;                                                         
-if (anInterpolation.IsDone())                                                           
-       SPL2 = anInterpolation.Curve();                                                  
-else                                                                                    
-   MessageBox(0,"The Interpolation is Not done","CasCade Warning",MB_ICONWARNING);      
-                                                                                        
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
+
+  gp_Pnt P1(0,0,1);
+  gp_Pnt P2(1,2,2);
+  gp_Pnt P3(2,3,3);
+  gp_Pnt P4(4,3,4);
+  gp_Pnt P5(5,5,5);
+  TColgp_Array1OfPnt array (1,5); // sizing array
+  array.SetValue(1,P1);
+  array.SetValue(2,P2);
+  array.SetValue(3,P3);
+  array.SetValue(4,P4);
+  array.SetValue(5,P5);
+  Handle(TColgp_HArray1OfPnt) harray =
+    new TColgp_HArray1OfPnt (1,5); // sizing harray
+  harray->SetValue(1,P1.Translated(gp_Vec(4,0,0)));
+  harray->SetValue(2,P2.Translated(gp_Vec(4,0,0)));
+  harray->SetValue(3,P3.Translated(gp_Vec(4,0,0)));
+  harray->SetValue(4,P4.Translated(gp_Vec(4,0,0)));
+  harray->SetValue(5,P5.Translated(gp_Vec(4,0,0)));
+  Handle(Geom_BSplineCurve) SPL1 =
+    GeomAPI_PointsToBSpline(array).Curve();
+
+  GeomAPI_Interpolate anInterpolation(harray,Standard_False,Precision::Approximation());
+  anInterpolation.Perform();
+
+  Handle(Geom_BSplineCurve) SPL2;
+  if (anInterpolation.IsDone())
+    SPL2 = anInterpolation.Curve();
+  else
+    MessageBox(0,"The Interpolation is Not done","CasCade Warning",MB_ICONWARNING);
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                                                         \n\
 gp_Pnt P1(0,0,1);                                                                       \n\
 gp_Pnt P2(1,2,2);                                                                       \n\
@@ -2405,7 +2435,7 @@ harray->SetValue(4,P4.Translated(gp_Vec(4,0,0)));
 harray->SetValue(5,P5.Translated(gp_Vec(4,0,0)));                                       \n\
 Handle(Geom_BSplineCurve) SPL1 =                                                        \n\
     GeomAPI_PointsToBSpline(array).Curve();                                             \n");
-    Message += "\
+ Message += "\
                                                                                         \n\
 GeomAPI_Interpolate anInterpolation(harray,Standard_False,Precision::Approximation());  \n\
 anInterpolation.Perform();                                                              \n\
@@ -2416,36 +2446,41 @@ if (anInterpolation.IsDone())
 else                                                                                    \n\
    MessageBox(0,\"The Interpolation is Not done\",\"CasCade Warning\",MB_ICONWARNING);  \n\
                                                                                         \n";
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-    TCollection_AsciiString aString;
-    for(Standard_Integer i = array.Lower();i<=array.Upper();i++){
-               
-               TCollection_AsciiString Message2 (i);
-               gp_Pnt P = array(i);
-        
-               aString = "P";
-               aString += Message2; 
-        if (i == 1) aString += " (array)  ";
-        DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);\
-        
-               aString = "P";
-               aString += Message2; 
-        if (i == 1) aString += " (harray)  ";
-        DisplayPoint(aDoc,P.Translated(gp_Vec(4,0,0)),aString.ToCString(),false,0.5);\
-        
-               }
+  AddSeparator(aDoc,Message);
 
-    Handle(ISession_Curve) aCurve = new ISession_Curve(SPL1);
-    aDoc->GetAISContext()->SetDisplayMode(aCurve,1);
-    aDoc->GetAISContext()->Display(aCurve, Standard_False);
+  //--------------------------------------------------------------
 
-    if (anInterpolation.IsDone()) {
-        Handle(ISession_Curve) aCurve2 = new ISession_Curve(SPL2);
-        aDoc->GetAISContext()->SetDisplayMode(aCurve2,1);
-        aDoc->GetAISContext()->Display(aCurve2, Standard_False);
-    }
-    PostProcess(aDoc,ID_BUTTON_Test_33,TheDisplayType,Message.ToCString());
+  TCollection_AsciiString aString;
+  for(Standard_Integer i = array.Lower();i<=array.Upper();i++)
+  {
+
+    TCollection_AsciiString Message2 (i);
+    gp_Pnt P = array(i);
+
+    aString = "P";
+    aString += Message2; 
+    if (i == 1) aString += " (array)  ";
+    DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);\
+
+      aString = "P";
+    aString += Message2; 
+    if (i == 1) aString += " (harray)  ";
+    DisplayPoint(aDoc,P.Translated(gp_Vec(4,0,0)),aString.ToCString(),false,0.5);\
+
+  }
+
+  Handle(ISession_Curve) aCurve = new ISession_Curve(SPL1);
+  aDoc->GetAISContext()->SetDisplayMode(aCurve,1);
+  aDoc->GetAISContext()->Display(aCurve, Standard_False);
+
+  if (anInterpolation.IsDone())
+  {
+    Handle(ISession_Curve) aCurve2 = new ISession_Curve(SPL2);
+    aDoc->GetAISContext()->SetDisplayMode(aCurve2,1);
+    aDoc->GetAISContext()->Display(aCurve2, Standard_False);
+  }
+
+  PostProcess(aDoc,ID_BUTTON_Test_33,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest34
@@ -2454,27 +2489,34 @@ else
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest34(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                                 
-TColgp_Array1OfPnt array (1,5); // sizing array                  
-array.SetValue(1,gp_Pnt(0,0,1));                                 
-array.SetValue(2,gp_Pnt(1,2,2));                                 
-array.SetValue(3,gp_Pnt(2,3,3));                                 
-array.SetValue(4,gp_Pnt(4,4,4));                                 
-array.SetValue(5,gp_Pnt(5,5,5));                                 
-                                                                 
-GProp_PEquation PE (array,1.5 );                                 
-                                                                 
-if (PE.IsPoint()){ /* ... */  }     
-gp_Lin L;                                                        
-if (PE.IsLinear()) {  L = PE.Line();    }                      
-if (PE.IsPlanar()){ /* ... */  }     
-if (PE.IsSpace()) { /* ... */  }     
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
+
+  TColgp_Array1OfPnt array (1,5); // sizing array
+  array.SetValue(1,gp_Pnt(0,0,1));
+  array.SetValue(2,gp_Pnt(1,2,2));
+  array.SetValue(3,gp_Pnt(2,3,3));
+  array.SetValue(4,gp_Pnt(4,4,4));
+  array.SetValue(5,gp_Pnt(5,5,5));
+
+  GProp_PEquation PE (array,1.5 );
+
+  if (PE.IsPoint())
+  {/* ... */}
+  gp_Lin L;
+  if (PE.IsLinear())
+  {
+    L = PE.Line();
+  }
+  if (PE.IsPlanar())
+  {/* ... */}
+  if (PE.IsSpace())
+  {/* ... */}
                                                                  
-//==============================================================
-    TCollection_AsciiString Message (" \
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                 \n\
 TColgp_Array1OfPnt array (1,5); // sizing array \n\
 array.SetValue(1,gp_Pnt(0,0,1));                \n\
@@ -2491,35 +2533,49 @@ if (PE.IsLinear()) {  L = PE.Line();    }       \n\
 if (PE.IsPlanar()){ /* ... */  }                \n\
 if (PE.IsSpace()) { /* ... */  }                \n\
                                                 \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-    TCollection_AsciiString aString;
-    for(Standard_Integer i = array.Lower();i<=array.Upper();i++){
-               TCollection_AsciiString Message2 (i);
-               gp_Pnt P = array(i);
-        
-               aString = "P";
-               aString += Message2; 
-        DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
-               }
-
-    Message += " PE.IsPoint()  = ";  if (PE.IsPoint()) Message += "True \n";  else Message += "False\n";
-
-       if (PE.IsLinear()) { 
-         Message += " PE.IsLinear() = True \n";
-         L = PE.Line();
-         Handle(Geom_Line) aLine = new Geom_Line(L);
-         Handle(Geom_TrimmedCurve) aTrimmedCurve = new Geom_TrimmedCurve(aLine,-10,10);
-         Handle(ISession_Curve) aCurve = new ISession_Curve(aTrimmedCurve);
-         aDoc->GetAISContext()->Display(aCurve, Standard_False);
-    }
-    else
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
+  TCollection_AsciiString aString;
+  for(Standard_Integer i = array.Lower();i<=array.Upper();i++)
+  {
+    TCollection_AsciiString Message2 (i);
+    gp_Pnt P = array(i);
+
+    aString = "P";
+    aString += Message2; 
+    DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
+  }
+
+  Message += " PE.IsPoint()  = ";
+  if (PE.IsPoint())
+    Message += "True \n";
+  else
+    Message += "False\n";
+
+  if (PE.IsLinear()) { 
+    Message += " PE.IsLinear() = True \n";
+    L = PE.Line();
+    Handle(Geom_Line) aLine = new Geom_Line(L);
+    Handle(Geom_TrimmedCurve) aTrimmedCurve = new Geom_TrimmedCurve(aLine,-10,10);
+    Handle(ISession_Curve) aCurve = new ISession_Curve(aTrimmedCurve);
+    aDoc->GetAISContext()->Display(aCurve, Standard_False);
+  }
+  else
     Message += "PE.IsLinear() = False \n";
 
-    Message += " PE.IsPlanar() = ";  if (PE.IsPlanar()) Message += "True \n";  else Message += "False\n";
-    Message += " PE.IsSpace() = ";   if (PE.IsSpace() ) Message += "True \n";  else Message += "False\n";
+  Message += " PE.IsPlanar() = ";
+  if (PE.IsPlanar())
+    Message += "True \n";
+  else
+    Message += "False\n";
+
+  Message += " PE.IsSpace() = ";
+  if (PE.IsSpace())
+    Message += "True \n";
+  else
+    Message += "False\n";
 
-    PostProcess(aDoc,ID_BUTTON_Test_34,TheDisplayType,Message.ToCString());
+  PostProcess(aDoc,ID_BUTTON_Test_34,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest35
@@ -2528,43 +2584,44 @@ if (PE.IsSpace()) { /* ... */  }                \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest35(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                            
-gp_Pnt P1(-5,-5,0);                                         
-gp_Pnt P2(9,9,9);                                          
-Handle(Geom_Curve) aCurve = GC_MakeSegment(P1,P2).Value();  
-gp_Pnt P3(3,0,0);                                           
-gp_Pnt P4(3,0,10);                                          
-Standard_Real radius1 = 3;                                  
-Standard_Real radius2 = 2;                                  
-Handle(Geom_Surface) aSurface =                             
-    GC_MakeConicalSurface(P3,P4,radius1,radius2).Value();   
-GeomAPI_IntCS CS (aCurve,aSurface);                         
-Handle(Geom_Curve) segment;                                 
-                                                            
-Standard_Integer NbSeg;                                     
-Standard_Integer NbPoints;                                  
-if(CS.IsDone())                                             
-    {                                                       
-      NbSeg = CS.NbSegments();                              
-      for (Standard_Integer k=1; k<=NbSeg; k++)             
-        {                                                   
-          segment = CS.Segment(k);                          
-         // do something with the segment                   
-        }                                                   
-                                                            
-      NbPoints = CS.NbPoints();                             
-      for (int k=1; k<=NbPoints; k++)                           
-        {                                                   
-          gp_Pnt aPoint=CS.Point(k);                        
-          // do something with the point                    
-        }                                                   
-    }                                                       
-                                                            
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+
+  //==============================================================
+
+  gp_Pnt P1(-5,-5,0);
+  gp_Pnt P2(9,9,9);
+  Handle(Geom_Curve) aCurve = GC_MakeSegment(P1,P2).Value();
+  gp_Pnt P3(3,0,0);
+  gp_Pnt P4(3,0,10);
+  Standard_Real radius1 = 3;
+  Standard_Real radius2 = 2;
+  Handle(Geom_Surface) aSurface =
+      GC_MakeConicalSurface(P3,P4,radius1,radius2).Value();
+  GeomAPI_IntCS CS (aCurve,aSurface);
+  Handle(Geom_Curve) segment;
+
+  Standard_Integer NbSeg;
+  Standard_Integer NbPoints;
+  if(CS.IsDone())
+  {
+    NbSeg = CS.NbSegments();
+    for (Standard_Integer k=1; k<=NbSeg; k++)
+    {
+      segment = CS.Segment(k);
+      // do something with the segment
+    }
+
+    NbPoints = CS.NbPoints();
+    for (int k=1; k<=NbPoints; k++)
+    {
+      gp_Pnt aPoint=CS.Point(k);
+      // do something with the point
+    }
+  }
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                             \n\
 gp_Pnt P1(-5,-5,0);                                         \n\
 gp_Pnt P2(9,9,9);                                           \n\
@@ -2597,46 +2654,47 @@ if(CS.IsDone())                                             \n\
         }                                                   \n\
     }                                                       \n\
                                                             \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+  AddSeparator(aDoc,Message);
+
+  //--------------------------------------------------------------
  
-    Handle(ISession_Curve) aCurve2 = new ISession_Curve(aCurve);
-    aDoc->GetAISContext()->Display(aCurve2, Standard_False);
+  Handle(ISession_Curve) aCurve2 = new ISession_Curve(aCurve);
+  aDoc->GetAISContext()->Display(aCurve2, Standard_False);
 
-    Handle(Geom_RectangularTrimmedSurface) aTrimmedSurface= new Geom_RectangularTrimmedSurface(aSurface,-50.,50.,false);
-
-    DisplaySurface(aDoc,aTrimmedSurface);
-
-    TCollection_AsciiString aString;
-       Standard_Integer k;
-    if(CS.IsDone())
-               {
-                 Standard_Integer NbSeg = CS.NbSegments();
-                 for (k=1; k<=NbSeg; k++)
-                       {
-                         TCollection_AsciiString Message2 (k);
-                         segment = CS.Segment(k);
-              aString = "S_";aString += Message2;
-              Handle(ISession_Curve) aCurve = new ISession_Curve(segment);
-              aDoc->GetAISContext()->Display(aCurve, Standard_False);
-                       }
-        
-      for ( k=1; k<=NbPoints; k++)              
-        {                                                   
-             TCollection_AsciiString Message2 (k);
-                 gp_Pnt aPoint=CS.Point(k);
-          aString = "P_";aString += Message2; 
-          DisplayPoint(aDoc,aPoint,aString.ToCString(),false,0.5);
-          // do something with the point            
-        }                                                  
-       }
-       TCollection_AsciiString Message2 (NbSeg);
-       TCollection_AsciiString Message3 (NbPoints);
-
-    Message += "NbSeg       = "; Message += Message2      ; Message += "\n";
-    Message += "NbPoints  = "; Message += Message3      ; Message += "\n";
-
-    PostProcess(aDoc,ID_BUTTON_Test_35,TheDisplayType,Message.ToCString());
+  Handle(Geom_RectangularTrimmedSurface) aTrimmedSurface= new Geom_RectangularTrimmedSurface(aSurface,-50.,50.,false);
+
+  DisplaySurface(aDoc,aTrimmedSurface);
+
+  TCollection_AsciiString aString;
+  Standard_Integer k;
+  if(CS.IsDone())
+  {
+    Standard_Integer NbSeg = CS.NbSegments();
+    for (k=1; k<=NbSeg; k++)
+    {
+      TCollection_AsciiString Message2 (k);
+      segment = CS.Segment(k);
+      aString = "S_";aString += Message2;
+      Handle(ISession_Curve) aCurve = new ISession_Curve(segment);
+      aDoc->GetAISContext()->Display(aCurve, Standard_False);
+    }
+
+    for ( k=1; k<=NbPoints; k++)
+    {
+      TCollection_AsciiString Message2 (k);
+      gp_Pnt aPoint=CS.Point(k);
+      aString = "P_";aString += Message2;
+      DisplayPoint(aDoc,aPoint,aString.ToCString(),false,0.5);
+      // do something with the point
+    }
+  }
+  TCollection_AsciiString Message2 (NbSeg);
+  TCollection_AsciiString Message3 (NbPoints);
+
+  Message += "NbSeg       = "; Message += Message2      ; Message += "\n";
+  Message += "NbPoints  = "; Message += Message3      ; Message += "\n";
+
+  PostProcess(aDoc,ID_BUTTON_Test_35,TheDisplayType,Message.ToCString());
 }
 
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -2647,38 +2705,38 @@ if(CS.IsDone())                                             \n\
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest36(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
 //==============================================================
-                                                                                    
-gp_Pnt centre (5,5,0);  gp_Pnt axispoint (9,9,0);                                   
-Standard_Real radius = 3;                                                           
-Handle(Geom_Circle) circle =                                                        
-    GC_MakeCircle(centre,axispoint,radius);                                         
-                                                                                    
-Handle(Geom_Geometry) aRotatedEntity  = circle->Rotated(gp::OZ(),M_PI/4);             
-Standard_CString aRotatedEntityTypeName = aRotatedEntity->DynamicType()->Name();        
-                                                                                    
-Handle(Geom_Geometry) aMirroredEntity = aRotatedEntity->Mirrored(gp::ZOX());        
-Standard_CString aMirroredEntityTypeName = aMirroredEntity->DynamicType()->Name();      
-                                                                                    
-gp_Pnt scalepoint (4,8,0);                                                          
-Standard_Real scalefactor = 0.2;                                                    
-Handle(Geom_Geometry) aScaledEntity =                                               
-     aMirroredEntity->Scaled(scalepoint, scalefactor);                              
-Standard_CString aScaledEntityTypeName = aScaledEntity->DynamicType()->Name();          
-                                                                                    
-Handle (Geom_Transformation) GT =   GC_MakeTranslation  (centre, scalepoint);       
-gp_Trsf TR = GT->Trsf();                                                            
-                                                                                    
-gp_Vec aTranslationVector(TR.TranslationPart ());                                   
-Handle(Geom_Geometry) aTranslatedEntity =                                           
-       aScaledEntity->Translated(  aTranslationVector  );                           
-Standard_CString aTranslatedEntityTypeName = aTranslatedEntity->DynamicType()->Name();  
-                                                                                    
-gp_Mat matrix = TR.HVectorialPart();                                                
-Standard_Real value = matrix.Determinant();                                         
-                                                                                    
+
+  gp_Pnt centre (5,5,0); gp_Pnt axispoint (9,9,0);
+  Standard_Real radius = 3;
+  Handle(Geom_Circle) circle =
+  GC_MakeCircle(centre,axispoint,radius);
+
+  Handle(Geom_Geometry) aRotatedEntity = circle->Rotated(gp::OZ(),M_PI/4);
+  Standard_CString aRotatedEntityTypeName = aRotatedEntity->DynamicType()->Name();
+
+  Handle(Geom_Geometry) aMirroredEntity = aRotatedEntity->Mirrored(gp::ZOX());
+  Standard_CString aMirroredEntityTypeName = aMirroredEntity->DynamicType()->Name();
+
+  gp_Pnt scalepoint (4,8,0);
+  Standard_Real scalefactor = 0.2;
+  Handle(Geom_Geometry) aScaledEntity =
+  aMirroredEntity->Scaled(scalepoint, scalefactor);
+  Standard_CString aScaledEntityTypeName = aScaledEntity->DynamicType()->Name();
+
+  Handle (Geom_Transformation) GT = GC_MakeTranslation (centre, scalepoint);
+  gp_Trsf TR = GT->Trsf();
+
+  gp_Vec aTranslationVector(TR.TranslationPart ());
+  Handle(Geom_Geometry) aTranslatedEntity =
+  aScaledEntity->Translated( aTranslationVector );
+  Standard_CString aTranslatedEntityTypeName = aTranslatedEntity->DynamicType()->Name();
+
+  gp_Mat matrix = TR.HVectorialPart();
+  Standard_Real value = matrix.Determinant();
+
 //==============================================================
     TCollection_AsciiString Message (" \
                                                                                         \n\
@@ -2711,50 +2769,48 @@ Standard_CString aTranslatedEntityTypeName = aTranslatedEntity->DynamicType()->N
 gp_Mat matrix = TR.HVectorialPart();                                                    \n\
 Standard_Real value = matrix.Determinant();                                             \n\
                                                                                         \n";
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-
-    DisplayPoint(aDoc,centre,"centre",false,0.5);
-    DisplayPoint(aDoc,axispoint,"axispoint",false,0.5);
-    DisplayPoint(aDoc,scalepoint,"scalepoint",false,0.5);
-
-    DisplayCurve(aDoc,circle, Quantity_NOC_RED,false);
-    DisplayCurve(aDoc,Handle(Geom_Curve)::DownCast(aRotatedEntity),Quantity_NOC_PEACHPUFF, false);
-    DisplayCurve(aDoc,Handle(Geom_Curve)::DownCast(aMirroredEntity), Quantity_NOC_YELLOWGREEN,false);
-    DisplayCurve(aDoc,Handle(Geom_Curve)::DownCast(aScaledEntity), Quantity_NOC_GREEN,false);
-    DisplayCurve(aDoc,Handle(Geom_Curve)::DownCast(aTranslatedEntity),Quantity_NOC_WHITE,false);
-
-       TCollection_AsciiString Message0 (M_PI);        
-    Message += " PI = ";
-       Message+= Message0; 
-       Message += "\n";
-    Message += " circle is Red;  aRotatedEntity is Peach; aMirroredEntity is Yellow Green\n";
-    Message += " aScaleEntity is Green; aTranslatedEntity is White\n\n";
-
-   
-       TCollection_AsciiString Message2 (aTranslationVector.X());
-       TCollection_AsciiString Message3 (aTranslationVector.Y());
-       TCollection_AsciiString Message4 (aTranslationVector.Z());
-       Message += " aTranslationVector ( "; 
-    Message += Message2; Message += " , ";
-    Message += Message3; Message += " , ";
-    Message += Message4; Message += " ); \n";
-        
-       TCollection_AsciiString Message5 (value);
-    Message += " value = ";Message+= Message5; Message += "\n";
-       
-       TCollection_AsciiString Message6 (aRotatedEntityTypeName);
-       TCollection_AsciiString Message7 (aMirroredEntityTypeName);
-       TCollection_AsciiString Message8 (aScaledEntityTypeName);
-    TCollection_AsciiString Message9 (aTranslatedEntityTypeName);
-
-       Message += " aRotatedEntityTypeName     = ";Message+= Message6; Message += "\n";
-    Message += " aMirroredEntityTypeName     = ";Message+= Message7; Message += "\n";
-    Message += " aScaledEntityTypeName       = ";Message+= Message8; Message += "\n";
-    Message += " aTranslatedEntityTypeName  = ";Message+= Message9; Message += "\n";
-
-
-   PostProcess(aDoc,ID_BUTTON_Test_36,TheDisplayType,Message.ToCString());
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
+
+  DisplayPoint(aDoc,centre,"centre",false,0.5);
+  DisplayPoint(aDoc,axispoint,"axispoint",false,0.5);
+  DisplayPoint(aDoc,scalepoint,"scalepoint",false,0.5);
+
+  DisplayCurve(aDoc,circle, Quantity_NOC_RED,false);
+  DisplayCurve(aDoc,Handle(Geom_Curve)::DownCast(aRotatedEntity),Quantity_NOC_PEACHPUFF, false);
+  DisplayCurve(aDoc,Handle(Geom_Curve)::DownCast(aMirroredEntity), Quantity_NOC_YELLOWGREEN,false);
+  DisplayCurve(aDoc,Handle(Geom_Curve)::DownCast(aScaledEntity), Quantity_NOC_GREEN,false);
+  DisplayCurve(aDoc,Handle(Geom_Curve)::DownCast(aTranslatedEntity),Quantity_NOC_WHITE,false);
+
+  TCollection_AsciiString Message0 (M_PI);
+  Message += " PI = ";
+  Message+= Message0;
+  Message += "\n";
+  Message += " circle is Red; aRotatedEntity is Peach; aMirroredEntity is Yellow Green\n";
+  Message += " aScaleEntity is Green; aTranslatedEntity is White\n\n";
+
+  TCollection_AsciiString Message2 (aTranslationVector.X());
+  TCollection_AsciiString Message3 (aTranslationVector.Y());
+  TCollection_AsciiString Message4 (aTranslationVector.Z());
+  Message += " aTranslationVector ( ";
+  Message += Message2; Message += " , ";
+  Message += Message3; Message += " , ";
+  Message += Message4; Message += " ); \n";
+
+  TCollection_AsciiString Message5 (value);
+  Message += " value = ";Message+= Message5; Message += "\n";
+
+  TCollection_AsciiString Message6 (aRotatedEntityTypeName);
+  TCollection_AsciiString Message7 (aMirroredEntityTypeName);
+  TCollection_AsciiString Message8 (aScaledEntityTypeName);
+  TCollection_AsciiString Message9 (aTranslatedEntityTypeName);
+
+  Message += " aRotatedEntityTypeName = ";Message+= Message6; Message += "\n";
+  Message += " aMirroredEntityTypeName = ";Message+= Message7; Message += "\n";
+  Message += " aScaledEntityTypeName = ";Message+= Message8; Message += "\n";
+  Message += " aTranslatedEntityTypeName = ";Message+= Message9; Message += "\n";
+
+  PostProcess(aDoc,ID_BUTTON_Test_36,TheDisplayType,Message.ToCString());
 }
 
 // Function name       : GeomSources::gpTest37
@@ -2763,29 +2819,29 @@ Standard_Real value = matrix.Determinant();
 // Argument         : CGeometryDoc* aDoc
 void GeomSources::gpTest37(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                                 
-TColgp_Array1OfPnt anArrayofPnt (1,5); // sizing array           
-anArrayofPnt.SetValue(1,gp_Pnt(0,0,1));                          
-anArrayofPnt.SetValue(2,gp_Pnt(1,2,2));                          
-anArrayofPnt.SetValue(3,gp_Pnt(2,3,3));                          
-anArrayofPnt.SetValue(4,gp_Pnt(4,3,4));                          
-anArrayofPnt.SetValue(5,gp_Pnt(5,5,5));                          
-                                                                 
-Standard_Real Tolerance = 1;                
-                                                                 
-gp_Pln P;                                                        
-GProp_PEquation PE (anArrayofPnt,Tolerance);                     
-if (PE.IsPlanar()) { P = PE.Plane();}                            
-                                                                 
-if (PE.IsPoint())  { /* ... */  }     
-if (PE.IsLinear()) { /* ... */  }     
-if (PE.IsPlanar()) { P = PE.Plane();}                                             
-if (PE.IsSpace())  { /* ... */  }     
-                                                                 
-//==============================================================
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+
+  TColgp_Array1OfPnt anArrayofPnt (1,5); // sizing array
+  anArrayofPnt.SetValue(1,gp_Pnt(0,0,1));
+  anArrayofPnt.SetValue(2,gp_Pnt(1,2,2));
+  anArrayofPnt.SetValue(3,gp_Pnt(2,3,3));
+  anArrayofPnt.SetValue(4,gp_Pnt(4,3,4));
+  anArrayofPnt.SetValue(5,gp_Pnt(5,5,5));
+
+  Standard_Real Tolerance = 1;
+
+  gp_Pln P;
+  GProp_PEquation PE (anArrayofPnt,Tolerance);
+  if (PE.IsPlanar()) { P = PE.Plane();}
+
+  if (PE.IsPoint()) { /* ... */ }
+  if (PE.IsLinear()) { /* ... */ }
+  if (PE.IsPlanar()) { P = PE.Plane();}
+  if (PE.IsSpace()) { /* ... */ }
+
+  //==============================================================
     TCollection_AsciiString Message (" \
                                                                  \n\
 TColgp_Array1OfPnt anArrayofPnt (1,5); // sizing array           \n\
@@ -2806,72 +2862,72 @@ if (PE.IsLinear()) { /* ... */  }                                \n\
 if (PE.IsPlanar()) { P = PE.Plane();}                            \n\
 if (PE.IsSpace())  { /* ... */  }                                \n\
                                                                  \n");
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-
-    TCollection_AsciiString aString;
-    for(Standard_Integer i = anArrayofPnt.Lower();i<=anArrayofPnt.Upper();i++){
-               TCollection_AsciiString Message2(i);
-               gp_Pnt P = anArrayofPnt(i);
-        aString = "P";aString += Message2; 
-        DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
-               }
-
-    Message += " PE.IsPoint()  = ";  if (PE.IsPoint()) Message += "True \n";  else Message += "False\n";
-    Message += " PE.IsLinear() = ";  if (PE.IsLinear()) Message += "True \n";  else Message += "False\n";
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
+
+  TCollection_AsciiString aString;
+  for(Standard_Integer i = anArrayofPnt.Lower();i<=anArrayofPnt.Upper();i++){
+    TCollection_AsciiString Message2(i);
+    gp_Pnt P = anArrayofPnt(i);
+    aString = "P";aString += Message2; 
+    DisplayPoint(aDoc,P,aString.ToCString(),false,0.5);
+  }
+
+  Message += " PE.IsPoint()  = ";  if (PE.IsPoint()) Message += "True \n";  else Message += "False\n";
+  Message += " PE.IsLinear() = ";  if (PE.IsLinear()) Message += "True \n";  else Message += "False\n";
+
+  if (PE.IsPlanar()) { 
+    Message +=  " PE.IsPlanar() = True \n";
+    P = PE.Plane();
+    Handle(Geom_Plane) aPlane = new Geom_Plane(P);
+    Handle(Geom_RectangularTrimmedSurface) aSurface= new Geom_RectangularTrimmedSurface(aPlane,-4.,4.,-4.,4.);
 
-       if (PE.IsPlanar()) { 
-         Message +=  " PE.IsPlanar() = True \n";
-         P = PE.Plane();
-         Handle(Geom_Plane) aPlane = new Geom_Plane(P);
-         Handle(Geom_RectangularTrimmedSurface) aSurface= new Geom_RectangularTrimmedSurface(aPlane,-4.,4.,-4.,4.);
-
-         DisplaySurface(aDoc,aSurface);
+    DisplaySurface(aDoc,aSurface);
 
-    }
-    else
+  }
+  else
     Message += " PE.IsPlanar() = False \n";
 
-    Message += " PE.IsSpace() = ";   if (PE.IsSpace() ) Message += "True \n";  else Message += "False\n";
+  Message += " PE.IsSpace() = ";   if (PE.IsSpace() ) Message += "True \n";  else Message += "False\n";
 
-    PostProcess(aDoc,ID_BUTTON_Test_37,TheDisplayType,Message.ToCString());
+  PostProcess(aDoc,ID_BUTTON_Test_37,TheDisplayType,Message.ToCString());
 }
 
 void GeomSources::gpTest38(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                              
-TColgp_Array1OfPnt array1 (1,5); // sizing array                                      
-array1.SetValue(1,gp_Pnt (-4,0,2 )); array1.SetValue(2,gp_Pnt (-7,2,2 ));             
-array1.SetValue(3,gp_Pnt (-6,3,1 )); array1.SetValue(4,gp_Pnt (-4,3,-1));             
-array1.SetValue(5,gp_Pnt (-3,5,-2));                                                  
-Handle(Geom_BSplineCurve) SPL1 = GeomAPI_PointsToBSpline(array1).Curve();             
-                                                                                      
-TColgp_Array1OfPnt array2 (1,5); // sizing array                                      
-array2.SetValue(1,gp_Pnt (-4,0, 2)); array2.SetValue(2,gp_Pnt (-2,2,0 ));             
-array2.SetValue(3,gp_Pnt (2 ,3,-1)); array2.SetValue(4,gp_Pnt (3 ,7,-2));             
-array2.SetValue(5,gp_Pnt (4 ,9,-1));                                                  
-Handle(Geom_BSplineCurve) SPL2 = GeomAPI_PointsToBSpline(array2).Curve();             
-                                                                                      
-GeomFill_FillingStyle Type = GeomFill_StretchStyle;                                   
-GeomFill_BSplineCurves aGeomFill1(SPL1,SPL2,Type);                                    
-Handle(Geom_BSplineSurface)    aBSplineSurface1 = aGeomFill1.Surface();               
-                                                                                      
-Type = GeomFill_CoonsStyle;                                                           
-GeomFill_BSplineCurves aGeomFill2(                                                    
-        Handle(Geom_BSplineCurve)::DownCast(SPL1->Translated(gp_Vec(10,0,0))),        
-        Handle(Geom_BSplineCurve)::DownCast(SPL2->Translated(gp_Vec(10,0,0))),Type);  
-Handle(Geom_BSplineSurface)    aBSplineSurface2 = aGeomFill2.Surface();               
-Type = GeomFill_CurvedStyle;                                                          
-GeomFill_BSplineCurves aGeomFill3(                                                    
-        Handle(Geom_BSplineCurve)::DownCast(SPL1->Translated(gp_Vec(20,0,0))),        
-        Handle(Geom_BSplineCurve)::DownCast(SPL2->Translated(gp_Vec(20,0,0))),Type);  
-Handle(Geom_BSplineSurface)    aBSplineSurface3 = aGeomFill3.Surface();               
-                                                                                      
-//==============================================================
-    TCollection_AsciiString Message (" \
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+
+  TColgp_Array1OfPnt array1 (1,5); // sizing array
+  array1.SetValue(1,gp_Pnt (-4,0,2 )); array1.SetValue(2,gp_Pnt (-7,2,2 ));
+  array1.SetValue(3,gp_Pnt (-6,3,1 )); array1.SetValue(4,gp_Pnt (-4,3,-1));
+  array1.SetValue(5,gp_Pnt (-3,5,-2));
+  Handle(Geom_BSplineCurve) SPL1 = GeomAPI_PointsToBSpline(array1).Curve();
+
+  TColgp_Array1OfPnt array2 (1,5); // sizing array
+  array2.SetValue(1,gp_Pnt (-4,0, 2)); array2.SetValue(2,gp_Pnt (-2,2,0 ));
+  array2.SetValue(3,gp_Pnt (2 ,3,-1)); array2.SetValue(4,gp_Pnt (3 ,7,-2));
+  array2.SetValue(5,gp_Pnt (4 ,9,-1));
+  Handle(Geom_BSplineCurve) SPL2 = GeomAPI_PointsToBSpline(array2).Curve();
+
+  GeomFill_FillingStyle Type = GeomFill_StretchStyle;
+  GeomFill_BSplineCurves aGeomFill1(SPL1,SPL2,Type);
+  Handle(Geom_BSplineSurface) aBSplineSurface1 = aGeomFill1.Surface();
+
+  Type = GeomFill_CoonsStyle;
+  GeomFill_BSplineCurves aGeomFill2(
+  Handle(Geom_BSplineCurve)::DownCast(SPL1->Translated(gp_Vec(10,0,0))),
+  Handle(Geom_BSplineCurve)::DownCast(SPL2->Translated(gp_Vec(10,0,0))),Type);
+  Handle(Geom_BSplineSurface) aBSplineSurface2 = aGeomFill2.Surface();
+  Type = GeomFill_CurvedStyle;
+  GeomFill_BSplineCurves aGeomFill3(
+  Handle(Geom_BSplineCurve)::DownCast(SPL1->Translated(gp_Vec(20,0,0))),
+  Handle(Geom_BSplineCurve)::DownCast(SPL2->Translated(gp_Vec(20,0,0))),Type);
+  Handle(Geom_BSplineSurface) aBSplineSurface3 = aGeomFill3.Surface();
+
+  //==============================================================
+  TCollection_AsciiString Message (" \
                                                                                       \n\
 TColgp_Array1OfPnt array1 (1,5); // sizing array                                      \n\
 array1.SetValue(1,gp_Pnt (-4,0,2 )); array1.SetValue(2,gp_Pnt (-7,2,2 ));             \n\
@@ -2901,79 +2957,79 @@ GeomFill_BSplineCurves aGeomFill3(
         Handle(Geom_BSplineCurve)::DownCast(SPL2->Translated(gp_Vec(20,0,0))),Type);  \n\
 Handle(Geom_BSplineSurface)    aBSplineSurface3 = aGeomFill3.Surface();               \n\
                                                                                       \n";
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
-    // Trace des frontieres.  -> FreeBoundaryAspect
-    // Trace des isoparametriques.  --> UIsoAspect()
-    
-    DisplaySurface(aDoc,aBSplineSurface1,Quantity_NOC_YELLOW);
-    DisplaySurface(aDoc,aBSplineSurface2,Quantity_NOC_SALMON);
-    DisplaySurface(aDoc,aBSplineSurface3,Quantity_NOC_HOTPINK);
+  // Trace des frontieres.  -> FreeBoundaryAspect
+  // Trace des isoparametriques.  --> UIsoAspect()
 
-    for (int i=0;i<=2;i++)
-    {
-        DisplayCurve(aDoc,Handle(Geom_BSplineCurve)::DownCast(SPL1->Translated(gp_Vec(i*10,0,0))), Quantity_NOC_RED,false);
-        DisplayCurve(aDoc,Handle(Geom_BSplineCurve)::DownCast(SPL2->Translated(gp_Vec(i*10,0,0))), Quantity_NOC_GREEN,false);
-    }
+  DisplaySurface(aDoc,aBSplineSurface1,Quantity_NOC_YELLOW);
+  DisplaySurface(aDoc,aBSplineSurface2,Quantity_NOC_SALMON);
+  DisplaySurface(aDoc,aBSplineSurface3,Quantity_NOC_HOTPINK);
+
+  for (int i=0;i<=2;i++)
+  {
+    DisplayCurve(aDoc,Handle(Geom_BSplineCurve)::DownCast(SPL1->Translated(gp_Vec(i*10,0,0))), Quantity_NOC_RED,false);
+    DisplayCurve(aDoc,Handle(Geom_BSplineCurve)::DownCast(SPL2->Translated(gp_Vec(i*10,0,0))), Quantity_NOC_GREEN,false);
+  }
 
-    Message += "SPL1                      is Red; \n";
-    Message += "SPL2                      is Green; \n";
-    Message += "aBSplineSurface1  is Yellow;       ( GeomFill_StretchStyle )\n";   
-    Message += "aBSplineSurface2  is Salmon;     ( GeomFill_CoonsStyle ) \n";
-    Message += "aBSplineSurface3  is Hot pink;   ( GeomFill_CurvedStyle ) \n";
+  Message += "SPL1                      is Red; \n";
+  Message += "SPL2                      is Green; \n";
+  Message += "aBSplineSurface1  is Yellow;       ( GeomFill_StretchStyle )\n";   
+  Message += "aBSplineSurface2  is Salmon;     ( GeomFill_CoonsStyle ) \n";
+  Message += "aBSplineSurface3  is Hot pink;   ( GeomFill_CurvedStyle ) \n";
 
-    PostProcess(aDoc,ID_BUTTON_Test_38,TheDisplayType,Message.ToCString());
+  PostProcess(aDoc,ID_BUTTON_Test_38,TheDisplayType,Message.ToCString());
 }
 void GeomSources::gpTest39(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                                 
-TColgp_Array1OfPnt array1 (1,5); // sizing array                                      
-array1.SetValue(1,gp_Pnt (-4,0,2 )); 
-array1.SetValue(2,gp_Pnt (-5,1,0 ));             
-array1.SetValue(3,gp_Pnt (-6,2,-2 )); 
-array1.SetValue(4,gp_Pnt (-5,4,-7));             
-array1.SetValue(5,gp_Pnt (-3,5,-12));                                                  
-                                                                                      
-TColgp_Array1OfPnt array2 (1,5); // sizing array                                      
-array2.SetValue(1,gp_Pnt (-4,0, 2)); 
-array2.SetValue(2,gp_Pnt (-3,2,1 ));             
-array2.SetValue(3,gp_Pnt (-1,5,0)); 
-array2.SetValue(4,gp_Pnt (2 ,7,-1));             
-array2.SetValue(5,gp_Pnt (4 ,9,-1));                                                  
-                                                                                      
-TColgp_Array1OfPnt array3 (1,4); // sizing array                                      
-array3.SetValue(1,gp_Pnt (-3,5, -12)); 
-array3.SetValue(2,gp_Pnt (-2,6,-7 ));             
-array3.SetValue(3,gp_Pnt (0 ,8,-3)); 
-array3.SetValue(4,gp_Pnt (4 ,9,-1));  
-           
-Handle(Geom_BSplineCurve) SPL1 = GeomAPI_PointsToBSpline(array1).Curve();             
-Handle(Geom_BSplineCurve) SPL2 = GeomAPI_PointsToBSpline(array2).Curve();             
-Handle(Geom_BSplineCurve) SPL3 = GeomAPI_PointsToBSpline(array3).Curve();             
-                                                                                      
-Handle(GeomAdaptor_HCurve) SPL1Adaptor = new GeomAdaptor_HCurve(SPL1);                     
-Handle(GeomFill_SimpleBound) B1 =                                                          
-   new GeomFill_SimpleBound(SPL1Adaptor,Precision::Approximation(),Precision::Angular());  
-Handle(GeomAdaptor_HCurve) SPL2Adaptor = new GeomAdaptor_HCurve(SPL2);                     
-Handle(GeomFill_SimpleBound) B2 =                                                          
-   new GeomFill_SimpleBound(SPL2Adaptor,Precision::Approximation(),Precision::Angular());  
-Handle(GeomAdaptor_HCurve) SPL3Adaptor = new GeomAdaptor_HCurve(SPL3);                     
-Handle(GeomFill_SimpleBound) B3 =                                                          
-   new GeomFill_SimpleBound(SPL3Adaptor,Precision::Approximation(),Precision::Angular());  
-Standard_Boolean NoCheck= Standard_False;                                                  
-                                                                                           
-Standard_Integer MaxDeg = 8;                                                               
-Standard_Integer MaxSeg = 2;                                                               
-GeomFill_ConstrainedFilling aConstrainedFilling(MaxDeg, MaxSeg);                           
-                                                                                           
-aConstrainedFilling.Init(B1,B2,B3,NoCheck);                                                
-                                                                                           
-Handle(Geom_BSplineSurface) aBSplineSurface = aConstrainedFilling.Surface();               
-                                                                                           
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+
+  TColgp_Array1OfPnt array1 (1,5); // sizing array
+  array1.SetValue(1,gp_Pnt (-4,0,2 ));
+  array1.SetValue(2,gp_Pnt (-5,1,0 ));
+  array1.SetValue(3,gp_Pnt (-6,2,-2 ));
+  array1.SetValue(4,gp_Pnt (-5,4,-7));
+  array1.SetValue(5,gp_Pnt (-3,5,-12));
+
+  TColgp_Array1OfPnt array2 (1,5); // sizing array
+  array2.SetValue(1,gp_Pnt (-4,0, 2));
+  array2.SetValue(2,gp_Pnt (-3,2,1 ));
+  array2.SetValue(3,gp_Pnt (-1,5,0));
+  array2.SetValue(4,gp_Pnt (2 ,7,-1));
+  array2.SetValue(5,gp_Pnt (4 ,9,-1));
+
+  TColgp_Array1OfPnt array3 (1,4); // sizing array
+  array3.SetValue(1,gp_Pnt (-3,5, -12));
+  array3.SetValue(2,gp_Pnt (-2,6,-7 ));
+  array3.SetValue(3,gp_Pnt (0 ,8,-3));
+  array3.SetValue(4,gp_Pnt (4 ,9,-1));
+
+  Handle(Geom_BSplineCurve) SPL1 = GeomAPI_PointsToBSpline(array1).Curve();
+  Handle(Geom_BSplineCurve) SPL2 = GeomAPI_PointsToBSpline(array2).Curve();
+  Handle(Geom_BSplineCurve) SPL3 = GeomAPI_PointsToBSpline(array3).Curve();
+
+  Handle(GeomAdaptor_HCurve) SPL1Adaptor = new GeomAdaptor_HCurve(SPL1);
+  Handle(GeomFill_SimpleBound) B1 =
+  new GeomFill_SimpleBound(SPL1Adaptor,Precision::Approximation(),Precision::Angular());
+  Handle(GeomAdaptor_HCurve) SPL2Adaptor = new GeomAdaptor_HCurve(SPL2);
+  Handle(GeomFill_SimpleBound) B2 =
+  new GeomFill_SimpleBound(SPL2Adaptor,Precision::Approximation(),Precision::Angular());
+  Handle(GeomAdaptor_HCurve) SPL3Adaptor = new GeomAdaptor_HCurve(SPL3);
+  Handle(GeomFill_SimpleBound) B3 =
+  new GeomFill_SimpleBound(SPL3Adaptor,Precision::Approximation(),Precision::Angular());
+  Standard_Boolean NoCheck= Standard_False;
+
+  Standard_Integer MaxDeg = 8;
+  Standard_Integer MaxSeg = 2;
+  GeomFill_ConstrainedFilling aConstrainedFilling(MaxDeg, MaxSeg);
+
+  aConstrainedFilling.Init(B1,B2,B3,NoCheck);
+
+  Handle(Geom_BSplineSurface) aBSplineSurface = aConstrainedFilling.Surface();
+
 //==============================================================
     TCollection_AsciiString Message (" \
                                                                                            \n\
@@ -3003,74 +3059,72 @@ aConstrainedFilling.Init(B1,B2,B3,NoCheck);
                                                                                            \n\
 Handle(Geom_BSplineSurface) aBSplineSurface = aConstrainedFilling.Surface();               \n\
                                                                                            \n";
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
-
-    TCollection_AsciiString aString;
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
-    DisplaySurface(aDoc,aBSplineSurface,Quantity_NOC_YELLOW);
+  TCollection_AsciiString aString;
 
-    DisplayCurve(aDoc,SPL1,Quantity_NOC_RED ,false);
-    DisplayCurve(aDoc,SPL2,Quantity_NOC_GREEN ,false);
-    DisplayCurve(aDoc,SPL3,Quantity_NOC_BLUE1 ,false);
+  DisplaySurface(aDoc,aBSplineSurface,Quantity_NOC_YELLOW);
+  DisplayCurve(aDoc,SPL1,Quantity_NOC_RED ,false);
+  DisplayCurve(aDoc,SPL2,Quantity_NOC_GREEN ,false);
+  DisplayCurve(aDoc,SPL3,Quantity_NOC_BLUE1 ,false);
 
-    Message += "SPL1                      is Red; \n";
-    Message += "SPL2                      is Green; \n";
-    Message += "SPL3                      is Blue; \n";
+  Message += "SPL1                      is Red; \n";
+  Message += "SPL2                      is Green; \n";
+  Message += "SPL3                      is Blue; \n";
 
-    Message += "aBSplineSurface  is Yellow; \n";   
+  Message += "aBSplineSurface  is Yellow; \n";   
 
-
-    PostProcess(aDoc,ID_BUTTON_Test_39,TheDisplayType,Message.ToCString());
+  PostProcess(aDoc,ID_BUTTON_Test_39,TheDisplayType,Message.ToCString());
 }
 
 void GeomSources::gpTest40(CGeometryDoc* aDoc)
 {
-    DisplayType TheDisplayType = No2D3D;
-    PreProcess(aDoc,TheDisplayType);
-//==============================================================
-                                                                   
-TColgp_Array1OfPnt array1 (1,5); // sizing array                   
-array1.SetValue(1,gp_Pnt (-4,0,2 ));                               
-array1.SetValue(2,gp_Pnt (-5,1,0 ));                               
-array1.SetValue(3,gp_Pnt (-6,2,-2 ));                              
-array1.SetValue(4,gp_Pnt (-5,4,-7));                               
-array1.SetValue(5,gp_Pnt (-3,5,-12));                              
-                                                                   
-Handle(Geom_BSplineCurve) SPL1 =                                   
-    GeomAPI_PointsToBSpline(array1).Curve();                       
-                                                                   
-GeomFill_Pipe aPipe(SPL1,1);                                       
-aPipe.Perform();                                                   
-Handle(Geom_Surface) aSurface= aPipe.Surface();                    
-Standard_CString aSurfaceEntityTypeName="Not Computed";            
-if (!aSurface.IsNull())                                            
-   aSurfaceEntityTypeName = aSurface->DynamicType()->Name();       
-                                                                   
-Handle(Geom_Ellipse) E = GC_MakeEllipse( gp::XOY() ,3,1).Value();  
-GeomFill_Pipe aPipe2(SPL1,E);                                      
-aPipe2.Perform();                                                  
-Handle(Geom_Surface) aSurface2= aPipe2.Surface();                  
-Standard_CString aSurfaceEntityTypeName2="Not Computed";           
-if (!aSurface2.IsNull())  {                                        
-    aSurfaceEntityTypeName2 = aSurface2->DynamicType()->Name();    
-    aSurface2->Translate(gp_Vec(5,0,0));  }                        
-                                                                   
-Handle(Geom_TrimmedCurve) TC1 =                                    
-    GC_MakeSegment(gp_Pnt(1,1,1),gp_Pnt(5,5,5));                   
-Handle(Geom_TrimmedCurve) TC2 =                                    
-    GC_MakeSegment(gp_Pnt(1,1,0),gp_Pnt(4,5,6));                   
-GeomFill_Pipe aPipe3(SPL1,TC1,TC2);                                
-aPipe3.Perform();                                                  
-Handle(Geom_Surface) aSurface3 = aPipe3.Surface();                 
-Standard_CString aSurfaceEntityTypeName3="Not Computed";           
-if (!aSurface3.IsNull())                                           
-  {                                                                
-    aSurfaceEntityTypeName3 = aSurface3->DynamicType()->Name();    
-        aSurface3->Translate(gp_Vec(10,0,0));                      
-  }                                                                
-                                                                   
-//==============================================================
+  DisplayType TheDisplayType = No2D3D;
+  PreProcess(aDoc,TheDisplayType);
+  //==============================================================
+
+  TColgp_Array1OfPnt array1 (1,5); // sizing array
+  array1.SetValue(1,gp_Pnt (-4,0,2 ));
+  array1.SetValue(2,gp_Pnt (-5,1,0 ));
+  array1.SetValue(3,gp_Pnt (-6,2,-2 ));
+  array1.SetValue(4,gp_Pnt (-5,4,-7));
+  array1.SetValue(5,gp_Pnt (-3,5,-12));
+
+  Handle(Geom_BSplineCurve) SPL1 =
+  GeomAPI_PointsToBSpline(array1).Curve();
+
+  GeomFill_Pipe aPipe(SPL1,1);
+  aPipe.Perform();
+  Handle(Geom_Surface) aSurface= aPipe.Surface();
+  Standard_CString aSurfaceEntityTypeName="Not Computed";
+  if (!aSurface.IsNull())
+  aSurfaceEntityTypeName = aSurface->DynamicType()->Name();
+
+  Handle(Geom_Ellipse) E = GC_MakeEllipse( gp::XOY() ,3,1).Value();
+  GeomFill_Pipe aPipe2(SPL1,E);
+  aPipe2.Perform();
+  Handle(Geom_Surface) aSurface2= aPipe2.Surface();
+  Standard_CString aSurfaceEntityTypeName2="Not Computed";
+  if (!aSurface2.IsNull()) {
+  aSurfaceEntityTypeName2 = aSurface2->DynamicType()->Name();
+  aSurface2->Translate(gp_Vec(5,0,0)); }
+
+  Handle(Geom_TrimmedCurve) TC1 =
+  GC_MakeSegment(gp_Pnt(1,1,1),gp_Pnt(5,5,5));
+  Handle(Geom_TrimmedCurve) TC2 =
+  GC_MakeSegment(gp_Pnt(1,1,0),gp_Pnt(4,5,6));
+  GeomFill_Pipe aPipe3(SPL1,TC1,TC2);
+  aPipe3.Perform();
+  Handle(Geom_Surface) aSurface3 = aPipe3.Surface();
+  Standard_CString aSurfaceEntityTypeName3="Not Computed";
+  if (!aSurface3.IsNull())
+  {
+  aSurfaceEntityTypeName3 = aSurface3->DynamicType()->Name();
+  aSurface3->Translate(gp_Vec(10,0,0));
+  }
+
+  //==============================================================
     TCollection_AsciiString Message (" \
                                                                    \n\
                                                                    \n\
@@ -3115,67 +3169,66 @@ if (!aSurface3.IsNull())                                           \n\
         aSurface3->Translate(gp_Vec(10,0,0));                      \n\
   }                                                                \n\
                                                                  \n";
-    AddSeparator(aDoc,Message);
-    //--------------------------------------------------------------
+  AddSeparator(aDoc,Message);
+  //--------------------------------------------------------------
 
+  if (!aSurface.IsNull())
+  {
+    DisplaySurface(aDoc,aSurface,Quantity_NOC_YELLOW);
+  }
+  if (!aSurface2.IsNull())
+  {
+    DisplaySurface(aDoc,aSurface2,Quantity_NOC_YELLOW);
+  }
+  if (!aSurface3.IsNull())
+  {
+    DisplaySurface(aDoc,aSurface3,Quantity_NOC_YELLOW);
+  }
 
-    if (!aSurface.IsNull())
-    {
-        DisplaySurface(aDoc,aSurface,Quantity_NOC_YELLOW);
-    }
-    if (!aSurface2.IsNull())
-    {
-        DisplaySurface(aDoc,aSurface2,Quantity_NOC_YELLOW);
-    }
-    if (!aSurface3.IsNull())
-    {
-        DisplaySurface(aDoc,aSurface3,Quantity_NOC_YELLOW);
-    }
+  DisplayCurve(aDoc,SPL1,Quantity_NOC_RED ,false);
 
-    DisplayCurve(aDoc,SPL1,Quantity_NOC_RED ,false);
+  Message += "SPL1                      is Red; \n";
 
-    Message += "SPL1                      is Red; \n";
 
-    
-       TCollection_AsciiString Message2(aSurfaceEntityTypeName);
-       TCollection_AsciiString Message3(aSurfaceEntityTypeName2);
-       TCollection_AsciiString Message4(aSurfaceEntityTypeName3);
-       
-       Message += " aSurfaceEntityTypeName     = ";Message+= Message2; Message += "\n";
-    Message += " aSurfaceEntityTypeName2     = ";Message+= Message3; Message += "\n";
-    Message += " aSurfaceEntityTypeName3&