Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
J
jfx_rvfusion_cx
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ChenKun
jfx_rvfusion_cx
Commits
68973037
Commit
68973037
authored
Jan 08, 2024
by
jfx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix heading calcu
parent
1757bc22
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
fconfig.h
incl/fconfig.h
+2
-1
ffobj.cpp
src/ffobj.cpp
+2
-1
No files found.
incl/fconfig.h
View file @
68973037
...
...
@@ -5,6 +5,7 @@
#include "single_ton.hpp"
#include <ros/ros.h>
#include <yaml-cpp/yaml.h>
#include "falgo.h"
using
namespace
std
;
...
...
@@ -100,7 +101,7 @@ public:
to
.
lon
=
vec
[
4
];
to
.
lat
=
vec
[
5
];
double
direct
=
jfx
::
GetDirectionXS
(
from
.
lon
,
from
.
lat
,
to
.
lon
,
to
.
lat
)
+
1
.
26
;
double
direct
=
FusionAlgo
::
geoGetHeading
(
from
.
lon
,
from
.
lat
,
to
.
lon
,
to
.
lat
)
+
1
.
26
;
direct
=
direct
>
360
?
(
direct
-
360
)
:
direct
;
if
(
vec
.
size
()
==
6
)
{
from
.
heading
=
to
.
heading
=
direct
;
...
...
src/ffobj.cpp
View file @
68973037
...
...
@@ -2,6 +2,7 @@
#include "ffobj.h"
#include "gaussian.h"
#include <ros/ros.h>
#include "falgo.h"
void
FusionObject
::
setTObj
(
TOBJPtr
&
tObjPtr
)
{
...
...
@@ -110,7 +111,7 @@ double FusionObject::getHeading(double curLon, double curLat)
int
pos
=
mFusionHisData
.
size
()
>
5
?
mFusionHisData
.
size
()
-
5
:
0
;
STObjTrajPoint
&
hisPoint
=
mFusionHisData
[
pos
];
mHeading
=
jfx
::
GetDirectionXS
(
hisPoint
.
lon
,
hisPoint
.
lat
,
curLon
,
curLat
);
mHeading
=
FusionAlgo
::
geoGetHeading
(
hisPoint
.
lon
,
hisPoint
.
lat
,
curLon
,
curLat
);
mLastCalcuHeadingLon
=
curLon
;
mLastCalcuHeadingLat
=
curLat
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment