0028726: Quantity_NameOfColor should be replaced by Quantity_Color in function input...

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

diff --git a/src/AIS/AIS_PlaneTrihedron.cxx b/src/AIS/AIS_PlaneTrihedron.cxx
index 728520d..b2edcb4 100644 (file)
--- a/src/AIS/AIS_PlaneTrihedron.cxx
+++ b/src/AIS/AIS_PlaneTrihedron.cxx
@@ -23,7 +23,6 @@
 #include <AIS_PlaneTrihedron.hxx>
 #include <AIS_Point.hxx>
 #include <Aspect_TypeOfLine.hxx>
-#include <DsgPrs_DatumPrs.hxx>
 #include <DsgPrs_XYZAxisPresentation.hxx>
 #include <Geom_Axis1Placement.hxx>
 #include <Geom_Axis2Placement.hxx>
@@ -69,11 +68,10 @@ AIS_PlaneTrihedron::AIS_PlaneTrihedron(const Handle(Geom_Plane)& aPlane)
 //POP  Standard_Real aLength = UnitsAPI::CurrentFromLS (100. ,"LENGTH");
   Standard_Real aLength = UnitsAPI::AnyToLS (100. ,"mm");
   DA->SetAxisLength(aLength,aLength,aLength);
-  Quantity_NameOfColor col = Quantity_NOC_ROYALBLUE1;
-  DA->FirstAxisAspect()->SetColor(col);
-  DA->SecondAxisAspect()->SetColor(col);
-  DA->SetDrawFirstAndSecondAxis(Standard_True);
-  DA->SetDrawThirdAxis(Standard_False);
+  Quantity_Color col (Quantity_NOC_ROYALBLUE1);
+  DA->LineAspect(Prs3d_DP_XAxis)->SetColor(col);
+  DA->LineAspect(Prs3d_DP_YAxis)->SetColor(col);
+  DA->SetDrawDatumAxes(Prs3d_DA_XYAxis);
   myDrawer->SetDatumAspect(DA); // odl - specific is created because it is modified
   myShapes[0] = Position();
   myShapes[1] = XAxis();
@@ -146,7 +144,7 @@ void AIS_PlaneTrihedron::SetLength(const Standard_Real theLength) {
 }
 
 Standard_Real AIS_PlaneTrihedron::GetLength() const {
-  return myDrawer->DatumAspect()->FirstAxisLength();
+  return myDrawer->DatumAspect()->AxisLength(Prs3d_DP_XAxis);
 }
 
 //=======================================================================
@@ -160,7 +158,7 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
   aPresentation->SetDisplayPriority(5);
   // drawing axis in X direction
   gp_Pnt first, last;
-  Standard_Real value = myDrawer->DatumAspect()->FirstAxisLength();
+  Standard_Real value = myDrawer->DatumAspect()->AxisLength(Prs3d_DP_XAxis);
   gp_Dir xDir = myPlane->Position().Ax2().XDirection();
 
   gp_Pnt orig = myPlane->Position().Ax2().Location();
@@ -170,22 +168,22 @@ void AIS_PlaneTrihedron::Compute(const Handle(PrsMgr_PresentationManager3d)&,
   first.SetCoord( xo, yo, zo );
   last.SetCoord( xo + x * value, yo + y * value, zo + z * value );
   
-  DsgPrs_XYZAxisPresentation::Add( aPresentation, myDrawer->DatumAspect()->FirstAxisAspect(), myDrawer->ArrowAspect(), myDrawer->TextAspect(), xDir, value, myXLabel.ToCString(), first, last );
+  DsgPrs_XYZAxisPresentation::Add( aPresentation, myDrawer->DatumAspect()->LineAspect(Prs3d_DP_XAxis), myDrawer->ArrowAspect(), myDrawer->TextAspect(), xDir, value, myXLabel.ToCString(), first, last );
   
   // drawing axis in Y direction
-  value = myDrawer->DatumAspect()->SecondAxisLength();
+  value = myDrawer->DatumAspect()->AxisLength(Prs3d_DP_YAxis);
   gp_Dir yDir = myPlane->Position().Ax2().YDirection();
 
   yDir.Coord( x, y, z );
   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 );
+  DsgPrs_XYZAxisPresentation::Add( aPresentation, myDrawer->DatumAspect()->LineAspect(Prs3d_DP_XAxis), myDrawer->ArrowAspect(), myDrawer->TextAspect(), yDir, value, myYLabel.ToCString(), first, last );
 
   aPresentation->SetInfiniteState (Standard_True);
 }
 
 void AIS_PlaneTrihedron::Compute(const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTransformation, const Handle(Prs3d_Presentation)& aPresentation)
 {
-// Standard_NotImplemented::Raise("AIS_PlaneTrihedron::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
+// throw Standard_NotImplemented("AIS_PlaneTrihedron::Compute(const Handle(Prs3d_Projector)&, const Handle(Geom_Transformation)&, const Handle(Prs3d_Presentation)&)");
  PrsMgr_PresentableObject::Compute( aProjector , aTransformation , aPresentation) ;
 }
 
@@ -244,17 +242,12 @@ void AIS_PlaneTrihedron::ComputeSelection(const Handle(SelectMgr_Selection)& aSe
   }
 }
 
-void AIS_PlaneTrihedron::SetColor(const Quantity_NameOfColor aCol)
-{
-  SetColor(Quantity_Color(aCol));
-}
-
 void AIS_PlaneTrihedron::SetColor(const Quantity_Color &aCol)
 {
   hasOwnColor=Standard_True;
-  myOwnColor = aCol;
-  myDrawer->DatumAspect()->FirstAxisAspect()->SetColor(aCol);
-  myDrawer->DatumAspect()->SecondAxisAspect()->SetColor(aCol);
+  myDrawer->SetColor (aCol);
+  myDrawer->DatumAspect()->LineAspect(Prs3d_DP_XAxis)->SetColor(aCol);
+  myDrawer->DatumAspect()->LineAspect(Prs3d_DP_YAxis)->SetColor(aCol);
 }
 
 
@@ -275,12 +268,12 @@ void  ExtremityPoints(TColgp_Array1OfPnt& PP,const Handle(Geom_Plane)& myPlane,c
   gp_Ax2 theax(myPlane->Position().Ax2());
   PP(1) = theax.Location();
 
-  Standard_Real len = myDrawer->DatumAspect()->FirstAxisLength();
+  Standard_Real len = myDrawer->DatumAspect()->AxisLength(Prs3d_DP_XAxis);
   gp_Vec vec = theax.XDirection();
   vec *= len;
   PP(2) = PP(1).Translated(vec);
   
-  len = myDrawer->DatumAspect()->SecondAxisLength();
+  len = myDrawer->DatumAspect()->AxisLength(Prs3d_DP_YAxis);
   vec = theax.YDirection();
   vec *= len;
   PP(3) = PP(1).Translated(vec);