0024002: Overall code and build procedure refactoring -- automatic

[occt.git] / src / AIS / AIS_Chamf3dDimension.cxx

diff --git a/src/AIS/AIS_Chamf3dDimension.cxx b/src/AIS/AIS_Chamf3dDimension.cxx
index 7e97558..58adb7a 100644 (file)
--- a/src/AIS/AIS_Chamf3dDimension.cxx
+++ b/src/AIS/AIS_Chamf3dDimension.cxx
@@ -14,52 +14,40 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-#define BUC60915        //GG 05/06/01 Enable to compute the requested arrow size
-//                      if any in all dimensions.
-
-#include <Standard_NotImplemented.hxx>
-
-#include <AIS_Chamf3dDimension.ixx>
-
-#include <DsgPrs_Chamf2dPresentation.hxx>
-
-#include <Prs3d_ArrowAspect.hxx>
-#include <Prs3d_DimensionAspect.hxx>
-#include <Prs3d_Drawer.hxx>
-
-#include <SelectMgr_EntityOwner.hxx>
-#include <Select3D_SensitiveSegment.hxx>
-
-#include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TopoDS_Edge.hxx>
-
-#include <TopAbs_Orientation.hxx>
 
+#include <AIS.hxx>
+#include <AIS_Chamf3dDimension.hxx>
 #include <Bnd_Box.hxx>
+#include <BRepAdaptor_Surface.hxx>
 #include <BRepBndLib.hxx>
-
+#include <BRepTools_WireExplorer.hxx>
+#include <DsgPrs_Chamf2dPresentation.hxx>
+#include <ElCLib.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_Transformation.hxx>
 #include <gp_Dir.hxx>
 #include <gp_Pln.hxx>
+#include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
-
-#include <Geom_Line.hxx>
-
-#include <ElCLib.hxx>
-
 #include <Precision.hxx>
-
-#include <TCollection_AsciiString.hxx>
-#include <TCollection_ExtendedString.hxx>
-
-#include <BRepTools_WireExplorer.hxx>
-
-#include <AIS.hxx>
-#include <AIS_Drawer.hxx>
-
-#include <BRepAdaptor_Surface.hxx>
 #include <ProjLib.hxx>
+#include <Prs3d_ArrowAspect.hxx>
+#include <Prs3d_DimensionAspect.hxx>
+#include <Prs3d_Drawer.hxx>
+#include <Prs3d_Presentation.hxx>
+#include <Prs3d_Projector.hxx>
 #include <Select3D_SensitiveBox.hxx>
+#include <Select3D_SensitiveSegment.hxx>
+#include <SelectMgr_EntityOwner.hxx>
+#include <SelectMgr_Selection.hxx>
+#include <Standard_NotImplemented.hxx>
+#include <Standard_Type.hxx>
+#include <TCollection_AsciiString.hxx>
+#include <TCollection_ExtendedString.hxx>
+#include <TopAbs_Orientation.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Edge.hxx>
+#include <TopoDS_Shape.hxx>
 
 //=======================================================================
 //function : Constructor
@@ -95,11 +83,7 @@ AIS_Chamf3dDimension::AIS_Chamf3dDimension(const TopoDS_Shape& aFShape,
   myText = aText;
   myPosition = aPosition;
   mySymbolPrs = aSymbolPrs;
-#ifdef BUC60915
   SetArrowSize( anArrowSize );
-#else
-  myArrowSize = anArrowSize;
-#endif
   myAutomaticPosition = Standard_False;
 }
 
@@ -172,9 +156,7 @@ void AIS_Chamf3dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
   //Calcul de la boite englobante du component pour
   //determiner la taille de la fleche
   //-------------------------------------------------
-#ifdef BUC60915
   if( !myArrowSizeIsDefined ) {
-#endif
     Standard_Real arrsize = myArrowSize;
     if ( (myVal/4) < arrsize)
       arrsize = myVal/4;
@@ -182,13 +164,9 @@ void AIS_Chamf3dDimension::Compute(const Handle(PrsMgr_PresentationManager3d)& ,
       arrsize = 30.;
     else if (arrsize < 8.)
       arrsize = 8.;
-#ifdef BUC60915
     myArrowSize = arrsize;
   }
   arr->SetLength(myArrowSize);
-#else
-  arr->SetLength(arrsize);
-#endif
   
   //Calcul de la presentation
   DsgPrs_Chamf2dPresentation::Add(aPresentation,
@@ -212,9 +190,9 @@ void AIS_Chamf3dDimension::Compute(const Handle(Prs3d_Projector)& aProjector,
  PrsMgr_PresentableObject::Compute( aProjector , aPresentation ) ;
 }
 
-void AIS_Chamf3dDimension::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation)
+void AIS_Chamf3dDimension::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
 {
-// Standard_NotImplemented::Raise("AIS_Chamf3dDimension::Compute(const Handle_Prs3d_Projector&, const Handle_Geom_Transformation&, const Handle_Prs3d_Presentation&)");
+// Standard_NotImplemented::Raise("AIS_Chamf3dDimension::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
   PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation ) ;
 }