0024002: Overall code and build procedure refactoring -- automatic

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

diff --git a/src/AIS/AIS_PlaneTrihedron.cxx b/src/AIS/AIS_PlaneTrihedron.cxx
index 2170e82..469fb70 100644 (file)
--- a/src/AIS/AIS_PlaneTrihedron.cxx
+++ b/src/AIS/AIS_PlaneTrihedron.cxx
@@ -14,47 +14,45 @@
 // Alternatively, this file may be used under the terms of Open CASCADE
 // commercial license or contractual agreement.
 
-//GER61351             //GG_171199     Enable to set an object RGB color instead a restricted object NameOfColor.
-
-#define OCC218                  //SAV using DsgPrs_XYZAxisPresentation to draw axes.
 // + X/YAxis() returns AIS_Line instead of AIS_Axis
 // + (-1) selection mode token into account 
 // (SAMTECH specific)
 
-#ifdef OCC218
-#include <DsgPrs_XYZAxisPresentation.hxx>
+#include <AIS_InteractiveObject.hxx>
 #include <AIS_Line.hxx>
-#include <Geom_Line.hxx>
-#endif
-
-#include <AIS_PlaneTrihedron.ixx>
-
+#include <AIS_PlaneTrihedron.hxx>
+#include <AIS_Point.hxx>
+#include <Aspect_TypeOfLine.hxx>
 #include <DsgPrs_DatumPrs.hxx>
-#include <SelectMgr_EntityOwner.hxx>
-#include <Select3D_SensitiveSegment.hxx>
-#include <Select3D_SensitivePoint.hxx>
+#include <DsgPrs_XYZAxisPresentation.hxx>
 #include <Geom_Axis1Placement.hxx>
 #include <Geom_Axis2Placement.hxx>
 #include <Geom_CartesianPoint.hxx>
+#include <Geom_Line.hxx>
+#include <Geom_Plane.hxx>
+#include <Geom_Transformation.hxx>
 #include <gp_Ax2.hxx>
 #include <gp_Pln.hxx>
 #include <gp_Pnt.hxx>
 #include <gp_Vec.hxx>
-#include <Prs3d_Drawer.hxx>
-#include <Prs3d_LineAspect.hxx>
-#include <Prs3d_DatumAspect.hxx>
+#include <Graphic3d_AspectFillArea3d.hxx>
 #include <Graphic3d_AspectLine3d.hxx>
-#include <Graphic3d_Structure.hxx>
 #include <Graphic3d_MaterialAspect.hxx>
-#include <Graphic3d_AspectFillArea3d.hxx>
-#include <Aspect_TypeOfLine.hxx>
-#include <AIS_Drawer.hxx>
-#include <UnitsAPI.hxx>
+#include <Graphic3d_Structure.hxx>
+#include <Prs3d_DatumAspect.hxx>
+#include <Prs3d_Drawer.hxx>
+#include <Prs3d_LineAspect.hxx>
+#include <Prs3d_Presentation.hxx>
+#include <Prs3d_Projector.hxx>
+#include <Quantity_Color.hxx>
+#include <Select3D_SensitivePoint.hxx>
+#include <Select3D_SensitiveSegment.hxx>
+#include <SelectMgr_EntityOwner.hxx>
+#include <SelectMgr_Selection.hxx>
+#include <Standard_Type.hxx>
 #include <TColgp_Array1OfPnt.hxx>
-
-#include <Select3D_SensitiveFace.hxx>
-
-#define OCC10
+#include <TCollection_AsciiString.hxx>
+#include <UnitsAPI.hxx>
 
 void  ExtremityPoints(TColgp_Array1OfPnt& PP,const Handle(Geom_Plane)& myPlane,const Handle(Prs3d_Drawer)& myDrawer);
 
@@ -79,10 +77,8 @@ AIS_PlaneTrihedron::AIS_PlaneTrihedron(const Handle(Geom_Plane)& aPlane)
   myShapes[1] = XAxis();
   myShapes[2] = YAxis();
 
-#ifdef OCC218
   myXLabel = TCollection_AsciiString( "X" );
   myYLabel = TCollection_AsciiString( "Y" );
-#endif
 }
 
 //=======================================================================
@@ -110,7 +106,6 @@ AIS_PlaneTrihedron::AIS_PlaneTrihedron(const Handle(Geom_Plane)& aPlane)
 //function : XAxis
 //purpose  : 
 //=======================================================================
-#ifdef OCC218
 Handle(AIS_Line) AIS_PlaneTrihedron::XAxis() const 
 {
   Handle(Geom_Line) aGLine = new Geom_Line(myPlane->Pln().XAxis());
@@ -118,21 +113,11 @@ Handle(AIS_Line) AIS_PlaneTrihedron::XAxis() const
   aLine->SetColor(Quantity_NOC_ROYALBLUE1);
   return aLine;
 }
-#else
-Handle(AIS_Axis) AIS_PlaneTrihedron::XAxis() const 
-{
-  Handle(Geom_Axis1Placement) anAx1 = new Geom_Axis1Placement(myPlane->Pln().XAxis());
-  Handle(AIS_Axis) anAxis = new AIS_Axis (anAx1);
-  anAxis->SetTypeOfAxis(AIS_TOAX_XAxis);
-  return anAxis;
-}
-#endif
 
 //=======================================================================
 //function : YAxis
 //purpose  : 
 //=======================================================================
-#ifdef OCC218
 Handle(AIS_Line) AIS_PlaneTrihedron::YAxis() const 
 {
   Handle(Geom_Line) aGLine = new Geom_Line(myPlane->Pln().YAxis());
@@ -140,15 +125,6 @@ Handle(AIS_Line) AIS_PlaneTrihedron::YAxis() const
   aLine->SetColor(Quantity_NOC_ROYALBLUE1);
   return aLine;
 }
-#else
-Handle(AIS_Axis) AIS_PlaneTrihedron::YAxis() const 
-{
-  Handle(Geom_Axis1Placement) anAx1 = new Geom_Axis1Placement(myPlane->Pln().YAxis());
-  Handle(AIS_Axis) anAxis = new AIS_Axis (anAx1);
-  anAxis->SetTypeOfAxis(AIS_TOAX_YAxis);
-  return anAxis;
-}
-#endif
 
 //=======================================================================
 //function : Position
@@ -162,7 +138,6 @@ Handle(AIS_Point) AIS_PlaneTrihedron::Position() const
   return aPt;
 }
 
-#ifdef OCC10
 void AIS_PlaneTrihedron::SetLength(const Standard_Real theLength) {
   myDrawer->DatumAspect()->SetAxisLength(theLength, theLength, theLength);
   SetToUpdate();
@@ -171,7 +146,6 @@ void AIS_PlaneTrihedron::SetLength(const Standard_Real theLength) {
 Standard_Real AIS_PlaneTrihedron::GetLength() const {
   return myDrawer->DatumAspect()->FirstAxisLength();
 }
-#endif
 
 //=======================================================================
 //function : Compute
@@ -183,9 +157,6 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
 {
   aPresentation->Clear();
   aPresentation->SetDisplayPriority(5);
-#ifndef OCC218
-  DsgPrs_DatumPrs::Add(aPresentation,myPlane->Position().Ax2(),myDrawer);
-#else
   // drawing axis in X direction
   gp_Pnt first, last;
   Standard_Real value = myDrawer->DatumAspect()->FirstAxisLength();
@@ -208,7 +179,6 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
   last.SetCoord( xo + x * value, yo + y * value, zo + z * value );
   DsgPrs_XYZAxisPresentation::Add( aPresentation, myDrawer->DatumAspect()->FirstAxisAspect(), myDrawer->ArrowAspect(), myDrawer->TextAspect(), yDir, value, myYLabel.ToCString(), first, last );
 
-#endif
   aPresentation->SetInfiniteState (Standard_True);
 }
 
@@ -247,7 +217,8 @@ void AIS_PlaneTrihedron::ComputeSelection(const Handle(SelectMgr_Selection)& aSe
   case 1:
     {  //origine
       Prior = 8;
-      eown= new SelectMgr_EntityOwner(myShapes[0],Prior);
+      const Handle(SelectMgr_SelectableObject)& anObj = myShapes[0]; // to avoid ambiguity
+      eown= new SelectMgr_EntityOwner(anObj,Prior);
       aSelection->Add(new Select3D_SensitivePoint(eown,myPlane->Location()));
 
       break;
@@ -256,20 +227,19 @@ void AIS_PlaneTrihedron::ComputeSelection(const Handle(SelectMgr_Selection)& aSe
     { //axes ... priorite 7
       Prior = 7;
       for (Standard_Integer i=1; i<=2;i++){
-       eown= new SelectMgr_EntityOwner(myShapes[i],Prior);
+        const Handle(SelectMgr_SelectableObject)& anObj = myShapes[i]; // to avoid ambiguity
+       eown= new SelectMgr_EntityOwner(anObj,Prior);
        aSelection->Add(new Select3D_SensitiveSegment(eown,PP(1),PP(i+1)));
 
       }
       break;
     }
-#ifdef OCC218
   case -1:
     {
       Prior = 5;
       aSelection->Clear();
       break;
     }
-#endif
   }
 }