From bb5bfc4cd872517045d2fd1342b2593be8a0b04c Mon Sep 17 00:00:00 2001 From: asanoaozora Date: Fri, 7 Apr 2017 11:33:33 +0200 Subject: add some more logs to improve verbosity --- src/clone_and_build.sh | 2 +- src/hmi/qml/Core/NavigationAppHMIMenu.qml | 6 ------ src/hmi/qml/Core/genivi-capi.js | 32 +++++++++++++++++++++++++++++++ src/hmi/qml/Core/genivi-origin.js | 32 +++++++++++++++++++++++++++++++ src/hmi/qml/NavigationAppBrowseMap.qml | 4 ++-- src/hmi/qml/NavigationAppMain.qml | 2 +- src/hmi/qml/NavigationAppPOI.qml | 4 ++-- src/hmi/qml/NavigationAppSearch.qml | 22 ++++++++++----------- 8 files changed, 81 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/clone_and_build.sh b/src/clone_and_build.sh index 60744de..9ce8bd6 100755 --- a/src/clone_and_build.sh +++ b/src/clone_and_build.sh @@ -1,7 +1,7 @@ #!/bin/bash build_option="" -navigation_version='ef97f1a0866832f84f3f1780a407d6a98e24c8f2' +navigation_version='d475fb3b22d6dbc704f1208202f86a5393137537' positioning_version='9725fe1f553197042d6445997690d452a73490c0' navit_version='995cec54c8682fbabfb4f912b6156ce0b5b43436' diff --git a/src/hmi/qml/Core/NavigationAppHMIMenu.qml b/src/hmi/qml/Core/NavigationAppHMIMenu.qml index df02a21..b47a65a 100644 --- a/src/hmi/qml/Core/NavigationAppHMIMenu.qml +++ b/src/hmi/qml/Core/NavigationAppHMIMenu.qml @@ -146,7 +146,6 @@ Rectangle { Genivi.entrybackheapsize += 1; Genivi.entryback[Genivi.entrybackheapsize] = outmenu.pagefile; outmenu.state = "hidden"; - Genivi.hookContext(); container.load(inmenu); } @@ -155,16 +154,11 @@ Rectangle { var outmenu=Genivi.entryback[Genivi.entrybackheapsize]; Genivi.entrybackheapsize -= 1; menu.state="hidden"; - Genivi.hookContext(); container.load(outmenu); } function pageOpen(command) { - if(Genivi.verbose===true){ - console.log("page open") - } menu.state="hidden"; - Genivi.hookContext(); container.load(command); } diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js index bb50b91..69ad243 100644 --- a/src/hmi/qml/Core/genivi-capi.js +++ b/src/hmi/qml/Core/genivi-capi.js @@ -63,6 +63,38 @@ var route_calculated=false; var reroute_requested=false; var location_input_activated=true; +function setRouteCalculated(arg) +{ + route_calculated=arg; + if(verbose===true){ + console.log("Routing: ",route_calculated); + } +} + +function setGuidanceActivated(arg) +{ + guidance_activated=arg; + if(verbose===true){ + console.log(" Guidance: ",guidance_activated); + } +} + +function setLocationInputActivated(arg) +{ + location_input_activated=arg; + if(verbose===true){ + console.log("Location input: ",location_input_activated); + } +} + +function setRerouteRequested(arg) +{ + reroute_requested=arg; + if(verbose===true){ + console.log("Rerouting: ",reroute_requested); + } +} + var scaleList; var minZoomId; var maxZoomId; diff --git a/src/hmi/qml/Core/genivi-origin.js b/src/hmi/qml/Core/genivi-origin.js index 4a3a685..351ff5e 100644 --- a/src/hmi/qml/Core/genivi-origin.js +++ b/src/hmi/qml/Core/genivi-origin.js @@ -63,6 +63,38 @@ var route_calculated=false; var reroute_requested=false; var location_input_activated=true; +function setRouteCalculated(arg) +{ + route_calculated=arg; + if(verbose===true){ + console.log("Routing: ",route_calculated); + } +} + +function setGuidanceActivated(arg) +{ + guidance_activated=arg; + if(verbose===true){ + console.log(" Guidance: ",guidance_activated); + } +} + +function setLocationInputActivated(arg) +{ + location_input_activated=arg; + if(verbose===true){ + console.log("Location input: ",location_input_activated); + } +} + +function setRerouteRequested(arg) +{ + reroute_requested=arg; + if(verbose===true){ + console.log("Rerouting: ",reroute_requested); + } +} + var scaleList; var minZoomId; var maxZoomId; diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml index 55bde0e..1d7e384 100644 --- a/src/hmi/qml/NavigationAppBrowseMap.qml +++ b/src/hmi/qml/NavigationAppBrowseMap.qml @@ -64,7 +64,7 @@ NavigationAppHMIMenu { Genivi.hookSignal("guidanceStatusChanged"); if(args[1]===Genivi.NAVIGATIONCORE_ACTIVE) { - Genivi.guidance_activated = true; + Genivi.setGuidanceActivated(true); showGuidance(); showRoute(); if (Genivi.simulationMode===true) @@ -89,7 +89,7 @@ NavigationAppHMIMenu { else { visible=false; //no route calculated } - Genivi.guidance_activated = false; + Genivi.setGuidanceActivated(false); //Guidance inactive, so inform the trip computer Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,0,0); maneuverAdvice.text=Genivi.gettext("NoGuidance"); diff --git a/src/hmi/qml/NavigationAppMain.qml b/src/hmi/qml/NavigationAppMain.qml index 51e85d1..fcf6edb 100644 --- a/src/hmi/qml/NavigationAppMain.qml +++ b/src/hmi/qml/NavigationAppMain.qml @@ -108,7 +108,7 @@ NavigationAppHMIMenu { source:StyleSheet.select_navigation[Constants.SOURCE]; x:StyleSheet.select_navigation[Constants.X]; y:StyleSheet.select_navigation[Constants.Y]; width:StyleSheet.select_navigation[Constants.WIDTH]; height:StyleSheet.select_navigation[Constants.HEIGHT]; id:navigation; next:mapview; prev:quit; onClicked: { Genivi.preloadMode=true; - Genivi.route_calculated = false; + Genivi.setRouteCalculated(false); entryMenu("NavigationAppSearch",menu); } } diff --git a/src/hmi/qml/NavigationAppPOI.qml b/src/hmi/qml/NavigationAppPOI.qml index bf0423a..9b8ebd9 100644 --- a/src/hmi/qml/NavigationAppPOI.qml +++ b/src/hmi/qml/NavigationAppPOI.qml @@ -355,8 +355,8 @@ NavigationAppHMIMenu { onClicked: { disconnectSignals(); Genivi.data['destination']=Genivi.poi_data[Genivi.poi_id]; - Genivi.location_input_activated=false; - Genivi.reroute_requested=true; + Genivi.setLocationInputActivated(false); + Genivi.setRerouteRequested(true); Genivi.guidance_StopGuidance(dbusIf); pageOpen("NavigationAppSearch"); } diff --git a/src/hmi/qml/NavigationAppSearch.qml b/src/hmi/qml/NavigationAppSearch.qml index 926d720..0014c11 100644 --- a/src/hmi/qml/NavigationAppSearch.qml +++ b/src/hmi/qml/NavigationAppSearch.qml @@ -74,7 +74,7 @@ NavigationAppHMIMenu { Genivi.hookSignal("guidanceStatusChanged"); if(args[1]===Genivi.NAVIGATIONCORE_ACTIVE) { - Genivi.guidance_activated = true; + Genivi.setGuidanceActivated(true); guidanceActive(); //Guidance active, so inform the trip computer (refresh) Genivi.fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,1,50); @@ -92,7 +92,7 @@ NavigationAppHMIMenu { } } else { - Genivi.guidance_activated = false; + Genivi.setGuidanceActivated(false); guidanceInactive(); hideGuidance(); //Guidance inactive, so inform the trip computer @@ -308,7 +308,7 @@ NavigationAppHMIMenu { { //routeHandle 1, unfullfilledPreferences 3 Genivi.hookSignal("routeCalculationSuccessful"); - Genivi.route_calculated = true; + Genivi.setRouteCalculated(true); getRouteOverview(); // Give the route handle to the FSA @@ -328,7 +328,7 @@ NavigationAppHMIMenu { Genivi.hookSignal("routeCalculationFailed"); statusValue.text=Genivi.gettext("CalculatedRouteFailed"); - Genivi.route_calculated = false; + Genivi.setRouteCalculated(false); // Tell the FSA that there's no route available Genivi.fuelstopadvisor_ReleaseRouteHandle(dbusIf,Genivi.g_routing_handle); } @@ -338,7 +338,7 @@ NavigationAppHMIMenu { { Genivi.hookSignal("routeCalculationProgressUpdate"); statusValue.text=Genivi.gettext("CalculatedRouteInProgress"); - Genivi.route_calculated = false; + Genivi.setRouteCalculated(false); } property Item spellResultSignal; @@ -627,7 +627,7 @@ NavigationAppHMIMenu { function initKeyboard() { // when keyboard is activated, route is reset - Genivi.route_calculated=false; + Genivi.setRouteCalculated(false); hideRoute(); hideGuidance(); listArea.forceActiveFocus(); @@ -1085,7 +1085,7 @@ NavigationAppHMIMenu { id:calculate_curr; onClicked: { setAddress(); - Genivi.guidance_activated=false; + Genivi.setGuidanceActivated(false); launchRouteCalculation(); } disabled:!((vehicleLocated || Genivi.showroom ) && destinationValid && !(keyboardActivated)); @@ -1109,9 +1109,9 @@ NavigationAppHMIMenu { disabled: false; onClicked: { if(!Genivi.location_input_activated){ - Genivi.location_input_activated=true; - Genivi.guidance_activated=false; - Genivi.route_calculated=false; + Genivi.setLocationInputActivated(true); + Genivi.setGuidanceActivated(false); + Genivi.setRouteCalculated(false); Genivi.preloadMode=true; pageOpen(menu.pagefile); //reload page } @@ -1159,7 +1159,7 @@ NavigationAppHMIMenu { maneuverArea.model.clear(); if (Genivi.reroute_requested){ - Genivi.reroute_requested=false; + Genivi.setRerouteRequested(false); launchRouteCalculation(); //launch route calculation if(Genivi.location_input_activated){ showLocationInput(); -- cgit v1.2.1