Skip to content
Snippets Groups Projects
Commit b3a11fad authored by Pep Martí Saumell's avatar Pep Martí Saumell
Browse files

Review of the code style

Assign output variable of getPos
parent 11fad89f
No related branches found
No related tags found
2 merge requests!4Resolve "Enable Standard Point Positioning (SPP) computation",!2Resolve "Enable Standard Point Positioning (SPP) computation"
This commit is part of merge request !4. Comments created here will be created in the context of that merge request.
......@@ -129,7 +129,7 @@ namespace GNSSUtils
private:
// rtklib-like attribute to represent the different navigation msgs for a given epoch
nav_t _nav;
nav_t nav_;
// Private methods
......
......@@ -39,7 +39,7 @@ namespace GNSSUtils
private:
// Private objects
// rtklib-like attribute to represent the different observation msgs for a given epoch
std::vector<obsd_t> _obsVector;
std::vector<obsd_t> obs_vector_;
// Private methods
......
......@@ -11,6 +11,7 @@ namespace GNSSUtils
// Define navigation
nav_t nav = _navigation->getNavigation();
uniqnav(&nav);
// Define processing options
prcopt_t prcopt = prcopt_default;
......@@ -27,12 +28,12 @@ namespace GNSSUtils
prcopt.sbascorr = SBSOPT_FCORR;
// Define solution
sol_t solb={{0}};
_sol = {{0}};
// Define error msg
char msg[128]="";
int stat = pntpos(&(obs[0]), obs.size(), &nav, &prcopt, &solb, NULL, NULL, msg);
int stat = pntpos(&(obs[0]), obs.size(), &nav, &prcopt, &_sol, NULL, NULL, msg);
return stat;
}
......
......@@ -7,11 +7,11 @@ using namespace GNSSUtils;
Navigation::Navigation()
{
//_nav = (nav_t *) malloc(sizeof(nav_t));
allocateEphemeris();
allocateGLONASSEphemeris();
allocateSBASEphemeris();
allocateAlmanac();
// allocateEphemeris();
// allocateGLONASSEphemeris();
// allocateSBASEphemeris();
//
// allocateAlmanac();
}
Navigation::~Navigation()
......@@ -53,7 +53,7 @@ void Navigation::clearNavigation()
*/
}
void Navigation::setNavigation(nav_t nav)
void Navigation::setNavigation(nav_t _nav)
{
/*
allocateEphemeris();
......@@ -87,17 +87,17 @@ void Navigation::setNavigation(nav_t nav)
*/
_nav = nav;
nav_ = _nav;
}
const nav_t & Navigation::getNavigation() const
{
return _nav;
return nav_;
}
nav_t & Navigation::getNavigation()
{
return _nav;
return nav_;
}
......@@ -109,8 +109,8 @@ void Navigation::allocateEphemeris(int n_sat)
eph_t eph0 ={0,-1,-1};
int i;
_nav.eph = (eph_t *) malloc(sizeof(eph_t)*n_sat);
for (i=0;i<n_sat;i++) _nav.eph[i] = eph0;
nav_.eph = (eph_t *) malloc(sizeof(eph_t)*n_sat);
for (i=0;i<n_sat;i++) nav_.eph[i] = eph0;
/*
if (this->_nav->eph)
{
......@@ -145,7 +145,7 @@ void Navigation::allocateGLONASSEphemeris(int n_sat)
{
geph_t geph0={0,-1};
int i;
_nav.geph = (geph_t *)malloc(sizeof(geph_t)*n_sat);
nav_.geph = (geph_t *)malloc(sizeof(geph_t)*n_sat);
/*
for (i=0;i<NSATGLO ;i++) _nav.geph[i] = geph0;
......@@ -184,8 +184,8 @@ void Navigation::allocateSBASEphemeris(int n_sat)
seph_t seph0={0};
int i;
_nav.seph = (seph_t *)malloc(sizeof(seph_t)*n_sat);
for (i=0; i<n_sat; i++) _nav.seph[i] = seph0;
nav_.seph = (seph_t *)malloc(sizeof(seph_t)*n_sat);
for (i=0; i<n_sat; i++) nav_.seph[i] = seph0;
/*
if (this->_nav->seph)
{
......@@ -221,8 +221,8 @@ void Navigation::allocateAlmanac(int n_sat)
alm_t alm0 ={0,-1};
int i;
_nav.alm = (alm_t *)malloc(sizeof(alm_t)*n_sat);
for (i=0; i<n_sat; i++) _nav.alm[i] = alm0;
nav_.alm = (alm_t *)malloc(sizeof(alm_t)*n_sat);
for (i=0; i<n_sat; i++) nav_.alm[i] = alm0;
/*
if (this->_nav->alm)
{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment