From ffb6ace33794fe9536339351b1fd57397c408222 Mon Sep 17 00:00:00 2001 From: PepMS <jmarti@iri.upc.edu> Date: Wed, 26 Jun 2019 12:59:32 +0200 Subject: [PATCH] Get Navigation --- include/navigation.h | 3 ++- src/gnss_utils.cpp | 4 ++-- src/navigation.cpp | 9 +++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/include/navigation.h b/include/navigation.h index 1a528af..a627ff8 100644 --- a/include/navigation.h +++ b/include/navigation.h @@ -28,7 +28,8 @@ namespace GNSSUtils void setNavigation(nav_t nav); - nav_t getNavigation(); + const nav_t & getNavigation() const; + nav_t & getNavigation(); /****************** Array memory management ******************/ diff --git a/src/gnss_utils.cpp b/src/gnss_utils.cpp index dfc94b6..ba54dbf 100644 --- a/src/gnss_utils.cpp +++ b/src/gnss_utils.cpp @@ -17,12 +17,12 @@ Receiver::~Receiver() const std::shared_ptr<GNSSUtils::Observations> Receiver::getObs() { - return obs_ptr_; + // return obs_ptr_; } const std::shared_ptr<GNSSUtils::Navigation> Receiver::getNav() { - return nav_ptr_; + // return nav_ptr_; } /* - Processing options - */ diff --git a/src/navigation.cpp b/src/navigation.cpp index 65cc8f1..e2a64f4 100644 --- a/src/navigation.cpp +++ b/src/navigation.cpp @@ -87,10 +87,15 @@ void Navigation::setNavigation(nav_t nav) */ - _nav = nav; + // _nav = nav; } -nav_t Navigation::getNavigation() +const nav_t & Navigation::getNavigation() const +{ + return _nav; +} + +nav_t & Navigation::getNavigation() { return _nav; } -- GitLab