From 1ec17fb48a20decb28e7f259d7e7dab759148de1 Mon Sep 17 00:00:00 2001 From: kgv Date: Wed, 17 Apr 2019 14:58:35 +0300 Subject: [PATCH] 0030644: Coding - inline trivial methods of V3d_View class --- src/V3d/V3d_View.cxx | 66 -------------------------------------------- src/V3d/V3d_View.hxx | 20 ++++++++------ 2 files changed, 11 insertions(+), 75 deletions(-) diff --git a/src/V3d/V3d_View.cxx b/src/V3d/V3d_View.cxx index 067c91c9ce..af34004aa0 100644 --- a/src/V3d/V3d_View.cxx +++ b/src/V3d/V3d_View.cxx @@ -315,24 +315,6 @@ void V3d_View::SetAutoZFitMode (const Standard_Boolean theIsOn, myAutoZFitIsOn = theIsOn; } -// ======================================================================== -// function : AutoZFitMode -// purpose : -// ======================================================================== -Standard_Boolean V3d_View::AutoZFitMode() const -{ - return myAutoZFitIsOn; -} - -// ======================================================================== -// function : AutoZFitScaleFactor -// purpose : -// ======================================================================== -Standard_Real V3d_View::AutoZFitScaleFactor() const -{ - return myAutoZFitScaleFactor; -} - //============================================================================= //function : AutoZFit //purpose : @@ -1504,18 +1486,6 @@ void V3d_View::DepthFitAll(const Standard_Real Aspect, ImmediateUpdate(); } -//============================================================================= -//function : WindowFitAll -//purpose : -//============================================================================= -void V3d_View::WindowFitAll(const Standard_Integer Xmin, - const Standard_Integer Ymin, - const Standard_Integer Xmax, - const Standard_Integer Ymax) -{ - WindowFit(Xmin,Ymin,Xmax,Ymax); -} - //======================================================================= //function : WindowFit //purpose : @@ -2098,15 +2068,6 @@ void V3d_View::Eye(Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const Z = aCameraEye.Z(); } -//============================================================================= -//function : FocalReferencePoint -//purpose : -//============================================================================= -void V3d_View::FocalReferencePoint(Standard_Real& X, Standard_Real& Y,Standard_Real& Z) const -{ - Eye (X,Y,Z); -} - //============================================================================= //function : ProjReferenceAxe //purpose : @@ -2245,15 +2206,6 @@ V3d_TypeOfVisualization V3d_View::Visualization() const return static_cast (myView->VisualizationType()); } -//============================================================================= -//function : Viewer -//purpose : -//============================================================================= -Handle(V3d_Viewer) V3d_View::Viewer() const -{ - return MyViewer; -} - //============================================================================= //function : IfWindow //purpose : @@ -2263,15 +2215,6 @@ Standard_Boolean V3d_View::IfWindow() const return myView->IsDefined(); } -//============================================================================= -//function : Window -//purpose : -//============================================================================= -Handle(Aspect_Window) V3d_View::Window() const -{ - return MyWindow; -} - //============================================================================= //function : Type //purpose : @@ -2317,15 +2260,6 @@ Standard_Real V3d_View::Focale() const return aCamera->Distance() * 2.0 * Tan (aCamera->FOVy() * M_PI / 360.0); } -//============================================================================= -//function : View -//purpose : -//============================================================================= -Handle(Graphic3d_CView) V3d_View::View() const -{ - return myView; -} - //============================================================================= //function : screenAxis //purpose : diff --git a/src/V3d/V3d_View.hxx b/src/V3d/V3d_View.hxx index 0ecafb3b4a..9249d97787 100644 --- a/src/V3d/V3d_View.hxx +++ b/src/V3d/V3d_View.hxx @@ -179,10 +179,10 @@ public: Standard_EXPORT void SetAutoZFitMode (const Standard_Boolean theIsOn, const Standard_Real theScaleFactor = 1.0); //! returns TRUE if automatic z-fit mode is turned on. - Standard_EXPORT Standard_Boolean AutoZFitMode() const; + Standard_Boolean AutoZFitMode() const { return myAutoZFitIsOn; } //! returns scale factor parameter of automatic z-fit mode. - Standard_EXPORT Standard_Real AutoZFitScaleFactor() const; + Standard_Real AutoZFitScaleFactor() const { return myAutoZFitScaleFactor; } //! If automatic z-range fitting is turned on, adjusts Z-min and Z-max //! projection volume planes with call to ZFitAll. @@ -645,9 +645,8 @@ public: //! Returns the position of the eye. Standard_EXPORT void Eye (Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const; - //! Returns the position of point which emanating the - //! projections. - Standard_EXPORT void FocalReferencePoint (Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const; + //! Returns the position of point which emanating the projections. + void FocalReferencePoint (Standard_Real& X, Standard_Real& Y, Standard_Real& Z) const { Eye (X,Y,Z); } //! Returns the coordinate of the point (Xpix,Ypix) //! in the view (XP,YP,ZP), and the projection vector of the @@ -702,13 +701,13 @@ public: Standard_EXPORT Standard_Integer LightLimit() const; //! Returns the viewer in which the view has been created. - Standard_EXPORT Handle(V3d_Viewer) Viewer() const; + Handle(V3d_Viewer) Viewer() const { return MyViewer; } //! Returns True if MyView is associated with a window . Standard_EXPORT Standard_Boolean IfWindow() const; //! Returns the Aspect Window associated with the view. - Standard_EXPORT Handle(Aspect_Window) Window() const; + const Handle(Aspect_Window)& Window() const { return MyWindow; } //! Returns the Type of the View Standard_EXPORT V3d_TypeOfView Type() const; @@ -771,7 +770,7 @@ public: Standard_EXPORT Standard_Real Focale() const; //! Returns the associated Graphic3d view. - Standard_EXPORT Handle(Graphic3d_CView) View() const; + const Handle(Graphic3d_CView)& View() const { return myView; } //! Switches computed HLR mode in the view. Standard_EXPORT void SetComputedMode (const Standard_Boolean theMode); @@ -780,7 +779,10 @@ public: Standard_EXPORT Standard_Boolean ComputedMode() const; //! idem than WindowFit - Standard_EXPORT void WindowFitAll (const Standard_Integer Xmin, const Standard_Integer Ymin, const Standard_Integer Xmax, const Standard_Integer Ymax); + void WindowFitAll (const Standard_Integer Xmin, const Standard_Integer Ymin, const Standard_Integer Xmax, const Standard_Integer Ymax) + { + WindowFit (Xmin, Ymin, Xmax, Ymax); + } //! Transform camera eye, center and scale to fit in the passed bounding box specified in WCS. //! @param theCamera [in] the camera