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

[occt.git] / src / AIS / AIS_Axis.hxx

diff --git a/src/AIS/AIS_Axis.hxx b/src/AIS/AIS_Axis.hxx
index 11db6d5..2e52738 100644 (file)
--- a/src/AIS/AIS_Axis.hxx
+++ b/src/AIS/AIS_Axis.hxx
@@ -17,33 +17,16 @@
 #ifndef _AIS_Axis_HeaderFile
 #define _AIS_Axis_HeaderFile
 
-#include <Standard.hxx>
-#include <Standard_Type.hxx>
-
-#include <gp_Pnt.hxx>
+#include <AIS_InteractiveObject.hxx>
 #include <AIS_TypeOfAxis.hxx>
-#include <Standard_Boolean.hxx>
 #include <gp_Dir.hxx>
-#include <Standard_Real.hxx>
-#include <Standard_CString.hxx>
-#include <AIS_InteractiveObject.hxx>
-#include <Standard_Integer.hxx>
-#include <PrsMgr_PresentationManager3d.hxx>
+#include <gp_Pnt.hxx>
 #include <SelectMgr_Selection.hxx>
-#include <AIS_KindOfInteractive.hxx>
-#include <Quantity_NameOfColor.hxx>
+
 class Geom_Line;
+class Geom_Axis1Placement;
 class Geom_Axis2Placement;
 class Prs3d_LineAspect;
-class Geom_Axis1Placement;
-class Prs3d_Presentation;
-class Prs3d_Projector;
-class Geom_Transformation;
-class Quantity_Color;
-
-
-class AIS_Axis;
-DEFINE_STANDARD_HANDLE(AIS_Axis, AIS_InteractiveObject)
 
 //! Locates the x, y and z axes in an Interactive Object.
 //! These are used to orient it correctly in presentations
@@ -53,34 +36,30 @@ DEFINE_STANDARD_HANDLE(AIS_Axis, AIS_InteractiveObject)
 //! then situated relative to one of the axes of the view.
 class AIS_Axis : public AIS_InteractiveObject
 {
-
+  DEFINE_STANDARD_RTTIEXT(AIS_Axis, AIS_InteractiveObject)
 public:
 
-  
   //! Initializes the line aComponent
   Standard_EXPORT AIS_Axis(const Handle(Geom_Line)& aComponent);
-  
+
   //! initializes the axis2 position
   //! aComponent. The coordinate system used is right-handed.
   Standard_EXPORT AIS_Axis(const Handle(Geom_Axis2Placement)& aComponent, const AIS_TypeOfAxis anAxisType);
-  
+
   //! Initializes the axis1 position anAxis.
   Standard_EXPORT AIS_Axis(const Handle(Geom_Axis1Placement)& anAxis);
-  
 
   //! Returns the axis entity aComponent and identifies it
   //! as a component of a shape.
-    const Handle(Geom_Line)& Component() const;
-  
+  const Handle(Geom_Line)& Component() const { return myComponent; }
+
   //! Sets the coordinates of the lin aComponent.
   Standard_EXPORT void SetComponent (const Handle(Geom_Line)& aComponent);
-  
 
   //! Returns the position of axis2 and   positions it by
   //! identifying it as the x, y, or z axis and giving its
   //! direction in 3D space. The coordinate system used is right-handed.
-    const Handle(Geom_Axis2Placement)& Axis2Placement() const;
-  
+  const Handle(Geom_Axis2Placement)& Axis2Placement() const { return myAx2; }
 
   //! Allows you to provide settings for aComponent:the
   //! position and direction of an axis in 3D space. The
@@ -91,19 +70,17 @@ public:
   Standard_EXPORT void SetAxis1Placement (const Handle(Geom_Axis1Placement)& anAxis);
   
   //! Returns the type of axis.
-    AIS_TypeOfAxis TypeOfAxis() const;
-  
+  AIS_TypeOfAxis TypeOfAxis() const { return myTypeOfAxis; }
 
-  //! Constructs the entity aTypeAxis to stock information
+  //! Constructs the entity theTypeAxis to stock information
   //! concerning type of axis.
-    void SetTypeOfAxis (const AIS_TypeOfAxis aTypeAxis);
-  
+  void SetTypeOfAxis (const AIS_TypeOfAxis theTypeAxis) { myTypeOfAxis = theTypeAxis; }
 
   //! Returns a signature of 2 for axis datums. When you
   //! activate mode 2 by a signature, you pick AIS objects
   //! of type AIS_Axis.
-    Standard_Boolean IsXYZAxis() const;
-  
+  Standard_Boolean IsXYZAxis() const { return myIsXYZAxis; }
+
   //! Returns true if the interactive object accepts the display mode aMode.
   Standard_EXPORT Standard_Boolean AcceptDisplayMode (const Standard_Integer aMode) const Standard_OVERRIDE;
   
@@ -115,13 +92,11 @@ public:
   //! WARNING :<aTrsf> must be applied
   //! to the object to display before computation  !!!
   Standard_EXPORT virtual void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Geom_Transformation)& aTrsf, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
-  
-    virtual Standard_Integer Signature() const Standard_OVERRIDE;
-  
-    virtual AIS_KindOfInteractive Type() const Standard_OVERRIDE;
-  
-  Standard_EXPORT void SetColor (const Quantity_NameOfColor aColor) Standard_OVERRIDE;
-  
+
+  virtual Standard_Integer Signature() const Standard_OVERRIDE { return 2; }
+
+  virtual AIS_KindOfInteractive Type() const Standard_OVERRIDE { return AIS_KOI_Datum; }
+
   Standard_EXPORT void SetColor (const Quantity_Color& aColor) Standard_OVERRIDE;
   
   Standard_EXPORT void SetWidth (const Standard_Real aValue) Standard_OVERRIDE;
@@ -130,19 +105,8 @@ public:
   
   Standard_EXPORT void UnsetWidth() Standard_OVERRIDE;
 
-
-
-
-  DEFINE_STANDARD_RTTIEXT(AIS_Axis,AIS_InteractiveObject)
-
-protected:
-
-
-
-
 private:
 
-  
   Standard_EXPORT void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Handle(Prs3d_Presentation)& aPresentation, const Standard_Integer aMode = 0) Standard_OVERRIDE;
   
   Standard_EXPORT void Compute (const Handle(Prs3d_Projector)& aProjector, const Handle(Prs3d_Presentation)& aPresentation) Standard_OVERRIDE;
@@ -151,6 +115,8 @@ private:
   
   Standard_EXPORT void ComputeFields();
 
+private:
+
   Handle(Geom_Line) myComponent;
   Handle(Geom_Axis2Placement) myAx2;
   gp_Pnt myPfirst;
@@ -162,14 +128,8 @@ private:
   Standard_CString myText;
   Handle(Prs3d_LineAspect) myLineAspect;
 
-
 };
 
-
-#include <AIS_Axis.lxx>
-
-
-
-
+DEFINE_STANDARD_HANDLE(AIS_Axis, AIS_InteractiveObject)
 
 #endif // _AIS_Axis_HeaderFile