From f3eb304d66ad752bf85bd042fa75b3e58fc19acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Wed, 9 Dec 2015 15:49:55 +0100 Subject: [PATCH] Caf: Added constructors/destructors to navigation policies --- Fwk/AppFwk/cafViewer/cafCadNavigation.cpp | 15 ++++++++++++++ Fwk/AppFwk/cafViewer/cafCadNavigation.h | 3 +++ Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp | 16 +++++++++++++++ Fwk/AppFwk/cafViewer/cafCeetronNavigation.h | 3 +++ .../cafViewer/cafCeetronPlusNavigation.cpp | 17 ++++++++++++++++ .../cafViewer/cafCeetronPlusNavigation.h | 3 +++ Fwk/AppFwk/cafViewer/cafNavigationPolicy.cpp | 17 ++++++++++++++++ Fwk/AppFwk/cafViewer/cafNavigationPolicy.h | 4 ++++ .../cafViewer/cafTrackBallBasedNavigation.cpp | 20 +++++++++++++++++-- .../cafViewer/cafTrackBallBasedNavigation.h | 3 +++ 10 files changed, 99 insertions(+), 2 deletions(-) diff --git a/Fwk/AppFwk/cafViewer/cafCadNavigation.cpp b/Fwk/AppFwk/cafViewer/cafCadNavigation.cpp index 7acd9d01da..3b10e34ab1 100644 --- a/Fwk/AppFwk/cafViewer/cafCadNavigation.cpp +++ b/Fwk/AppFwk/cafViewer/cafCadNavigation.cpp @@ -44,6 +44,21 @@ #include "cvfManipulatorTrackball.h" #include +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::CadNavigation::CadNavigation() +{ + +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::CadNavigation::~CadNavigation() +{ + +} //-------------------------------------------------------------------------------------------------- /// diff --git a/Fwk/AppFwk/cafViewer/cafCadNavigation.h b/Fwk/AppFwk/cafViewer/cafCadNavigation.h index 8285dfec87..fec86bc37c 100644 --- a/Fwk/AppFwk/cafViewer/cafCadNavigation.h +++ b/Fwk/AppFwk/cafViewer/cafCadNavigation.h @@ -44,6 +44,9 @@ namespace caf class CadNavigation : public TrackBallBasedNavigation { +public: + CadNavigation(); + virtual ~CadNavigation(); protected: virtual void init(); virtual bool handleInputEvent(QInputEvent* inputEvent); diff --git a/Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp b/Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp index 6796cdd391..8c0e152041 100644 --- a/Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp +++ b/Fwk/AppFwk/cafViewer/cafCeetronNavigation.cpp @@ -57,6 +57,22 @@ using cvf::ManipulatorTrackball; /// //================================================================================================== +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::CeetronNavigation::CeetronNavigation() +{ + +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::CeetronNavigation::~CeetronNavigation() +{ + +} + //-------------------------------------------------------------------------------------------------- /// Repositions and orients the camera to view the rotation point along the /// direction "alongDirection". The distance to the rotation point is maintained. diff --git a/Fwk/AppFwk/cafViewer/cafCeetronNavigation.h b/Fwk/AppFwk/cafViewer/cafCeetronNavigation.h index 5fbf9018bd..2eca8e0e20 100644 --- a/Fwk/AppFwk/cafViewer/cafCeetronNavigation.h +++ b/Fwk/AppFwk/cafViewer/cafCeetronNavigation.h @@ -48,6 +48,9 @@ namespace caf class CeetronNavigation : public NavigationPolicy { +public: + CeetronNavigation(); + virtual ~CeetronNavigation(); protected: // General navigation policy reimplememtation virtual void init(); diff --git a/Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.cpp b/Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.cpp index 700b473c8b..0ef728eef1 100644 --- a/Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.cpp +++ b/Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.cpp @@ -44,6 +44,23 @@ #include +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::CeetronPlusNavigation::CeetronPlusNavigation() +{ + +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::CeetronPlusNavigation::~CeetronPlusNavigation() +{ + +} + + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.h b/Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.h index 62d077a134..9e44dd6fd7 100644 --- a/Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.h +++ b/Fwk/AppFwk/cafViewer/cafCeetronPlusNavigation.h @@ -42,6 +42,9 @@ namespace caf class CeetronPlusNavigation : public TrackBallBasedNavigation { +public: + CeetronPlusNavigation(); + virtual ~CeetronPlusNavigation(); protected: virtual bool handleInputEvent(QInputEvent* inputEvent); }; diff --git a/Fwk/AppFwk/cafViewer/cafNavigationPolicy.cpp b/Fwk/AppFwk/cafViewer/cafNavigationPolicy.cpp index 996a13feac..b953a3d01a 100644 --- a/Fwk/AppFwk/cafViewer/cafNavigationPolicy.cpp +++ b/Fwk/AppFwk/cafViewer/cafNavigationPolicy.cpp @@ -39,6 +39,23 @@ #include "cafViewer.h" #include "cvfScene.h" + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::NavigationPolicy::NavigationPolicy() +{ + +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::NavigationPolicy::~NavigationPolicy() +{ + +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/Fwk/AppFwk/cafViewer/cafNavigationPolicy.h b/Fwk/AppFwk/cafViewer/cafNavigationPolicy.h index 79d699aa66..1b58c32119 100644 --- a/Fwk/AppFwk/cafViewer/cafNavigationPolicy.h +++ b/Fwk/AppFwk/cafViewer/cafNavigationPolicy.h @@ -55,6 +55,10 @@ namespace caf class NavigationPolicy : public cvf::Object { +public: + NavigationPolicy(); + virtual ~NavigationPolicy(); + friend class Viewer; public: // protected: // Should be protected but this friending does not work on gcc 4.1.2 diff --git a/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp b/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp index d23f92ee95..61cef22bda 100644 --- a/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp +++ b/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.cpp @@ -47,6 +47,24 @@ #include +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::TrackBallBasedNavigation::TrackBallBasedNavigation() +{ + +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +caf::TrackBallBasedNavigation::~TrackBallBasedNavigation() +{ + +} + + + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -298,5 +316,3 @@ void caf::TrackBallBasedNavigation::zoomAlongRay(cvf::Ray* ray, int delta) m_viewer->navigationPolicyUpdate(); } } - - diff --git a/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.h b/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.h index c0cc22a570..d4766276c7 100644 --- a/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.h +++ b/Fwk/AppFwk/cafViewer/cafTrackBallBasedNavigation.h @@ -47,6 +47,9 @@ namespace caf class TrackBallBasedNavigation: public NavigationPolicy { +public: + TrackBallBasedNavigation(); + virtual ~TrackBallBasedNavigation(); protected: // General navigation policy overrides virtual void init();