Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Pinoxchio
apollo
提交
da04f943
A
apollo
项目概览
Pinoxchio
/
apollo
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
apollo
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
da04f943
编写于
9月 05, 2017
作者:
S
siyangy
提交者:
Aaron Xiao
9月 05, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Dreamview: Fix lint error
上级
d8ea0bf1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
11 addition
and
14 deletion
+11
-14
modules/dreamview/backend/dreamview.cc
modules/dreamview/backend/dreamview.cc
+2
-0
modules/dreamview/backend/simulation_world/simulation_world_service.h
...mview/backend/simulation_world/simulation_world_service.h
+1
-1
modules/dreamview/backend/simulation_world/simulation_world_updater.cc
...view/backend/simulation_world/simulation_world_updater.cc
+8
-13
未找到文件。
modules/dreamview/backend/dreamview.cc
浏览文件 @
da04f943
...
...
@@ -16,6 +16,8 @@
#include "modules/dreamview/backend/dreamview.h"
#include <vector>
#include "modules/common/adapters/adapter_manager.h"
#include "modules/common/adapters/proto/adapter_config.pb.h"
#include "modules/common/configs/vehicle_config_helper.h"
...
...
modules/dreamview/backend/simulation_world/simulation_world_service.h
浏览文件 @
da04f943
...
...
@@ -106,7 +106,7 @@ class SimulationWorldService {
* @param msg the string to send to monitor
* @param log_level defined in modules/common/monitor/proto/monitor.proto
*/
void
PublishMessage
(
void
PublishM
onitorM
essage
(
apollo
::
common
::
monitor
::
MonitorMessageItem
::
LogLevel
log_level
,
const
std
::
string
&
msg
)
{
apollo
::
common
::
monitor
::
MonitorBuffer
buffer
(
&
monitor_
);
...
...
modules/dreamview/backend/simulation_world/simulation_world_updater.cc
浏览文件 @
da04f943
...
...
@@ -37,11 +37,9 @@ SimulationWorldUpdater::SimulationWorldUpdater(WebSocketHandler *websocket,
:
sim_world_service_
(
map_service
,
routing_from_file
),
map_service_
(
map_service
),
websocket_
(
websocket
)
{
// Initialize default end point
CHECK
(
apollo
::
common
::
util
::
GetProtoFromASCIIFile
(
apollo
::
hdmap
::
EndWayPointFile
(),
&
default_end_point_
));
apollo
::
hdmap
::
EndWayPointFile
(),
&
default_end_point_
));
websocket_
->
RegisterMessageHandler
(
"RetrieveMapData"
,
...
...
@@ -75,20 +73,17 @@ SimulationWorldUpdater::SimulationWorldUpdater(WebSocketHandler *websocket,
// publish message
if
(
succeed
)
{
sim_world_service_
.
PublishMessage
(
MonitorMessageItem
::
LogLevel
::
MonitorMessageItem_LogLevel_INFO
,
"Routing Request Sent"
);
sim_world_service_
.
PublishMonitorMessage
(
MonitorMessageItem
::
INFO
,
"Routing Request Sent"
);
}
else
{
sim_world_service_
.
PublishMessage
(
MonitorMessageItem
::
LogLevel
::
MonitorMessageItem_LogLevel_ERROR
,
"Failed to send routing request"
);
sim_world_service_
.
PublishMonitorMessage
(
MonitorMessageItem
::
ERROR
,
"Failed to send routing request"
);
}
});
}
bool
SimulationWorldUpdater
::
ConstructRoutingRequest
(
const
Json
&
json
,
RoutingRequest
*
routing_request
)
{
const
Json
&
json
,
RoutingRequest
*
routing_request
)
{
// set start point
auto
start
=
json
[
"start"
];
if
(
start
.
find
(
"x"
)
==
start
.
end
()
||
start
.
find
(
"y"
)
==
start
.
end
())
{
...
...
@@ -101,9 +96,9 @@ bool SimulationWorldUpdater::ConstructRoutingRequest(
// set way point(s) if any
auto
iter
=
json
.
find
(
"waypoint"
);
if
(
iter
!=
json
.
end
())
{
auto
*
waypoint
=
routing_request
->
mutable_waypoint
();
auto
*
waypoint
=
routing_request
->
mutable_waypoint
();
for
(
size_t
i
=
0
;
i
<
iter
->
size
();
++
i
)
{
auto
&
point
=
(
*
iter
)[
i
];
auto
&
point
=
(
*
iter
)[
i
];
if
(
!
map_service_
->
ConstructLaneWayPoint
(
point
[
"x"
],
point
[
"y"
],
waypoint
->
Add
()))
{
waypoint
->
RemoveLast
();
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录