From c47c664214c09e8dc282e9594bf6ecc071c8da44 Mon Sep 17 00:00:00 2001 From: asanoaozora Date: Wed, 17 Jan 2018 17:28:10 +0100 Subject: GT-3532 Add a signal to inform of the end of map rotation --- api/franca/navigation/mapviewer/MapViewerControl.fidl | 16 +++++++++++++++- .../genivi_mapviewer_mapviewercontrol.cxx | 3 +++ .../session-server-plugin/genivi_mapviewer_session.cxx | 3 +++ .../genivi_positioning_enhancedposition.cxx | 3 +++ .../genivi_navigationcore_guidance.cxx | 3 +++ .../genivi_navigationcore_locationinput.cxx | 3 +++ .../genivi_navigationcore_mapmatchedposition.cxx | 3 +++ .../poicam-server-plugin/genivi_poiservice_cam_navit.cxx | 3 +++ .../genivi_navigationcore_routing.cxx | 3 +++ .../genivi_navigationcore_session.cxx | 3 +++ 10 files changed, 42 insertions(+), 1 deletion(-) diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl index d26575c..fff1dea 100755 --- a/api/franca/navigation/mapviewer/MapViewerControl.fidl +++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl @@ -2077,7 +2077,7 @@ interface MapViewerControl { } <** - @description : mapViewThemeChanged = This signal is emitted when the theme of a map view instance changes + @description : mapViewThemeChanged = This signal is emitted when the theme of a map view instance changed **> broadcast mapViewThemeChanged { out { @@ -2094,6 +2094,20 @@ interface MapViewerControl { } } + <** + @description : mapViewRotated = This signal is emitted when the rotation is achieved + This signal is meant for debugging purposes + **> + broadcast mapViewRotated { + out { + + <** + @description : mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value + **> + Handle mapViewInstanceHandle + } + } + <** @description : getSupportedMapViewThemes = This method retrieves the supported mapview themes **> diff --git a/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx b/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx index dd03d80..9fe4312 100644 --- a/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx +++ b/src/navigation/map-viewer/mapviewercontrol-server-plugin/genivi_mapviewer_mapviewercontrol.cxx @@ -23,6 +23,9 @@ * * @licence end@ */ +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include #include diff --git a/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx b/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx index 670e677..dc21fb0 100644 --- a/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx +++ b/src/navigation/map-viewer/session-server-plugin/genivi_mapviewer_session.cxx @@ -25,6 +25,9 @@ * * @licence end@ */ +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include #define USE_PLUGINS 1 diff --git a/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx b/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx index 44d7fbc..d1fcefa 100644 --- a/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx +++ b/src/navigation/navigation-core/enhancedposition-client-plugin/genivi_positioning_enhancedposition.cxx @@ -26,6 +26,9 @@ * @licence end@ */ +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include #include diff --git a/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx b/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx index 90b7f39..9f78e9d 100644 --- a/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx +++ b/src/navigation/navigation-core/guidance-server-plugin/genivi_navigationcore_guidance.cxx @@ -26,6 +26,9 @@ * * @licence end@ */ +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #if (SPEECH_ENABLED) diff --git a/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx b/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx index 472b7de..1b7aeb6 100644 --- a/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx +++ b/src/navigation/navigation-core/locationinput-server-plugin/genivi_navigationcore_locationinput.cxx @@ -25,6 +25,9 @@ * * @licence end@ */ +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include #define USE_PLUGINS 1 diff --git a/src/navigation/navigation-core/mapmatchedposition-server-plugin/genivi_navigationcore_mapmatchedposition.cxx b/src/navigation/navigation-core/mapmatchedposition-server-plugin/genivi_navigationcore_mapmatchedposition.cxx index 120a877..3f66d0a 100644 --- a/src/navigation/navigation-core/mapmatchedposition-server-plugin/genivi_navigationcore_mapmatchedposition.cxx +++ b/src/navigation/navigation-core/mapmatchedposition-server-plugin/genivi_navigationcore_mapmatchedposition.cxx @@ -25,6 +25,9 @@ * * @licence end@ */ +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include #define USE_PLUGINS 1 diff --git a/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx b/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx index 19c89b2..49d268c 100644 --- a/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx +++ b/src/navigation/navigation-core/poicam-server-plugin/genivi_poiservice_cam_navit.cxx @@ -26,6 +26,9 @@ * * @licence end@ */ +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include #define USE_PLUGINS 1 diff --git a/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx index a2189c8..39e2885 100644 --- a/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx +++ b/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx @@ -26,6 +26,9 @@ * * @licence end@ */ +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include #define USE_PLUGINS 1 diff --git a/src/navigation/navigation-core/session-server-plugin/genivi_navigationcore_session.cxx b/src/navigation/navigation-core/session-server-plugin/genivi_navigationcore_session.cxx index 53c742f..273aa58 100644 --- a/src/navigation/navigation-core/session-server-plugin/genivi_navigationcore_session.cxx +++ b/src/navigation/navigation-core/session-server-plugin/genivi_navigationcore_session.cxx @@ -25,6 +25,9 @@ * * @licence end@ */ +#ifndef DBUS_HAS_RECURSIVE_MUTEX +#define DBUS_HAS_RECURSIVE_MUTEX +#endif #include #include #define USE_PLUGINS 1 -- cgit v1.2.1