diff options
Diffstat (limited to 'src')
17 files changed, 134 insertions, 66 deletions
diff --git a/src/clone_and_build.sh b/src/clone_and_build.sh index 73d0b16..8592441 100755 --- a/src/clone_and_build.sh +++ b/src/clone_and_build.sh @@ -1,9 +1,9 @@ #!/bin/bash build_option="" -navigation_version='c0aaaac03e49ba60c8bc5ed9ad87a25d8e84582d' -positioning_version='f341b4a2cb216d6204136794d33076170ab1bf80' -navit_version='72a9284980f0ff6b8dd3972c0c15b3945c94559c' +navigation_version='a10f7330d9806b96a6c9a7e1b19c04cd8a3a187c' +positioning_version='57345f36fa6095ecb6d7f7998a06abafbcd90a87' +navit_version='5607f355e77250cebd5326a7c7959eb07c12adc2' echo "version of navigation is: $navigation_version" echo "version of positioning is: $positioning_version" diff --git a/src/fuel-stop-advisor/fuel-stop-advisor.cpp b/src/fuel-stop-advisor/fuel-stop-advisor.cpp index 60e244e..4177028 100644 --- a/src/fuel-stop-advisor/fuel-stop-advisor.cpp +++ b/src/fuel-stop-advisor/fuel-stop-advisor.cpp @@ -96,12 +96,12 @@ class Properties }; class Routing -: public org::genivi::navigationcore::Routing_proxy, +: public org::genivi::navigation::navigationcore::Routing_proxy, public DBus::ObjectProxy { public: Routing(DBus::Connection &connection) - : DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigationcore.Routing") + : DBus::ObjectProxy(connection, "/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Routing") { } diff --git a/src/hmi/qml/Core/NavigationAppKeyboard.qml b/src/hmi/qml/Core/NavigationAppKeyboard.qml index 59b7826..8f5b6dd 100644 --- a/src/hmi/qml/Core/NavigationAppKeyboard.qml +++ b/src/hmi/qml/Core/NavigationAppKeyboard.qml @@ -24,14 +24,15 @@ * @licence end@ */ import QtQuick 2.1 +import "genivi.js" as Genivi; Item { id: keyboard; - property real wspc: keyboard.width/80; - property real hspc: keyboard.height/20; - property real w: (keyboard.width-wspc*7)/8+0.5; - property real h: keyboard.height/5 - property Item destination; + property real w: (keyboard.width*Genivi.kbdRowRatio)/(Genivi.kbdRows*(1+Genivi.kbdRowRatio)-1); + property real h: (keyboard.height*Genivi.kbdLineRatio)/(Genivi.kbdLines*(1+Genivi.kbdLineRatio)-1); + property real wspc: w/Genivi.kbdRowRatio; + property real hspc: h/Genivi.kbdLineRatio; + property Item destination; property Item layout; property string firstLayout; property string secondLayout: null; diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js index 5f8d8d4..67b5d72 100644 --- a/src/hmi/qml/Core/genivi-capi.js +++ b/src/hmi/qml/Core/genivi-capi.js @@ -59,6 +59,7 @@ var showroom=false; //showroom off by default var guidance_activated=false; var route_calculated=false; +var reroute_requested=false; var entryback = new Array; var entrybackheapsize=0; @@ -144,6 +145,12 @@ data['default_position']['alt']=19; historyOfLastEnteredLocationDepth=10; //max number of items into the history is set to historyOfLastEnteredLocationDepth-1 tripMode="TRIP_NUMBER1"; +//keyboard parameters +var kbdRows=8; //number of rows per line +var kbdRowRatio=4; //size of row spacing (ratio) +var kbdLines=4; //number of lines +var kbdLineRatio=4; //size of line spacing (ratio) + //dump functions for debug function dump2(prefix,index,args) { @@ -265,7 +272,7 @@ function mapviewer_message(par, iface, func, args) function poi_message(par, iface, func, args) { hookMethod(func); - return par.message("org.genivi.navigation.poiservice."+iface+".v4_0_"+iface,"/"+iface,"org.genivi.navigation.poiservice."+iface+".v4_0", func, args); + return par.message("org.genivi.navigation.poiservice."+iface+".v2_0_"+iface,"/"+iface,"org.genivi.navigation.poiservice."+iface+".v2_0", func, args); } // Send a message to demonstrator (basic) diff --git a/src/hmi/qml/Core/genivi-origin.js b/src/hmi/qml/Core/genivi-origin.js index 71ec084..76ca818 100644 --- a/src/hmi/qml/Core/genivi-origin.js +++ b/src/hmi/qml/Core/genivi-origin.js @@ -59,6 +59,7 @@ var showroom=false; //showroom off by default var guidance_activated=false; var route_calculated=false; +var reroute_requested=false; var entryback = new Array; var entrybackheapsize=0; @@ -144,6 +145,12 @@ data['default_position']['alt']=19; historyOfLastEnteredLocationDepth=10; //max number of items into the history is set to historyOfLastEnteredLocationDepth-1 tripMode="TRIP_NUMBER1"; +//keyboard parameters +var kbdRows=8; //number of rows per line +var kbdRowRatio=4; //size of row spacing (ratio) +var kbdLines=4; //number of lines +var kbdLineRatio=4; //size of line spacing (ratio) + //dump functions for debug function dump2(prefix,index,args) { @@ -251,21 +258,21 @@ function lm_message(par, func, args) function navigationcore_message(par, iface, func, args) { hookMethod(func); - return par.message("org.genivi.navigationcore."+iface,"/org/genivi/navigationcore","org.genivi.navigationcore."+iface, func, args); + return par.message("org.genivi.navigation.navigationcore."+iface,"/org/genivi/navigationcore","org.genivi.navigation.navigationcore."+iface, func, args); } // Send a message to mapviewer (basic) function mapviewer_message(par, iface, func, args) { hookMethod(func); - return par.message("org.genivi.mapviewer."+iface,"/org/genivi/mapviewer","org.genivi.mapviewer."+iface, func, args); + return par.message("org.genivi.navigation.mapviewer."+iface,"/org/genivi/mapviewer","org.genivi.navigation.mapviewer."+iface, func, args); } // Send a message to poiservice (basic) function poi_message(par, iface, func, args) { hookMethod(func); - return par.message("org.genivi.poiservice."+iface,"/org/genivi/poiservice/"+iface,"org.genivi.poiservice."+iface, func, args); + return par.message("org.genivi.navigation.poiservice."+iface,"/org/genivi/poiservice/"+iface,"org.genivi.navigation.poiservice."+iface, func, args); } // Send a message to demonstrator (basic) @@ -283,87 +290,87 @@ function hookSignal(arg) function connect_simulationStatusChangedSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition","SimulationStatusChanged",menu,"simulationStatusChanged"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.MapMatchedPosition","SimulationStatusChanged",menu,"simulationStatusChanged"); } function connect_simulationSpeedChangedSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition","SimulationSpeedChanged",menu,"simulationSpeedChanged"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.MapMatchedPosition","SimulationSpeedChanged",menu,"simulationSpeedChanged"); } function connect_searchStatusSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.LocationInput","SearchStatus",menu,"searchStatus"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.LocationInput","SearchStatus",menu,"searchStatus"); } function connect_searchResultListSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.LocationInput","SearchResultList",menu,"searchResultList"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.LocationInput","SearchResultList",menu,"searchResultList"); } function connect_spellResultSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.LocationInput","SpellResult",menu,"spellResult"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.LocationInput","SpellResult",menu,"spellResult"); } function connect_guidanceStatusChangedSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Guidance","GuidanceStatusChanged",menu,"guidanceStatusChanged"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Guidance","GuidanceStatusChanged",menu,"guidanceStatusChanged"); } function connect_guidanceWaypointReachedSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Guidance","WaypointReached",menu,"guidanceWaypointReached"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Guidance","WaypointReached",menu,"guidanceWaypointReached"); } function connect_guidanceManeuverChangedSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Guidance","ManeuverChanged",menu,"guidanceManeuverChanged"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Guidance","ManeuverChanged",menu,"guidanceManeuverChanged"); } function connect_guidancePositionOnRouteChangedSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Guidance","PositionOnRouteChanged",menu,"guidancePositionOnRouteChanged"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Guidance","PositionOnRouteChanged",menu,"guidancePositionOnRouteChanged"); } function connect_mapmatchedpositionPositionUpdateSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition","PositionUpdate",menu,"mapmatchedpositionPositionUpdate"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.MapMatchedPosition","PositionUpdate",menu,"mapmatchedpositionPositionUpdate"); } function connect_mapmatchedpositionAddressUpdateSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition","AddressUpdate",menu,"mapmatchedpositionAddressUpdate"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.MapMatchedPosition","AddressUpdate",menu,"mapmatchedpositionAddressUpdate"); } function connect_routeCalculationSuccessfulSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Routing","RouteCalculationSuccessful",menu,"routeCalculationSuccessful"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Routing","RouteCalculationSuccessful",menu,"routeCalculationSuccessful"); } function connect_routeCalculationFailedSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Routing","RouteCalculationFailed",menu,"routeCalculationFailed"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Routing","RouteCalculationFailed",menu,"routeCalculationFailed"); } function connect_routeCalculationProgressUpdateSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Routing","RouteCalculationProgressUpdate",menu,"routeCalculationProgressUpdate"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Routing","RouteCalculationProgressUpdate",menu,"routeCalculationProgressUpdate"); } function connect_currentSelectionCriterionSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.LocationInput","CurrentSelectionCriterion",menu,"currentSelectionCriterion"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.LocationInput","CurrentSelectionCriterion",menu,"currentSelectionCriterion"); } function connect_contentUpdatedSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.LocationInput","ContentUpdated",menu,"contentUpdated"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.LocationInput","ContentUpdated",menu,"contentUpdated"); } function connect_configurationChangedSignal(interface,menu) { - return interface.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.Configuration","ConfigurationChanged",menu,"configurationChanged"); + return interface.connect("","/org/genivi/navigationcore","org.genivi.navigation.navigationcore.Configuration","ConfigurationChanged",menu,"configurationChanged"); } function connect_tripDataUpdatedSignal(interface,menu) @@ -378,7 +385,7 @@ function connect_fuelStopAdvisorWarningSignal(interface,menu) function connect_mapViewScaleChangedSignal(interface,menu) { - return interface.connect("","/org/genivi/mapviewer","org.genivi.mapviewer.MapViewerControl","MapViewScaleChanged",menu,"mapViewScaleChanged"); + return interface.connect("","/org/genivi/mapviewer","org.genivi.navigation.mapviewer.MapViewerControl","MapViewScaleChanged",menu,"mapViewScaleChanged"); } //----------------- NavigationCore dbus messages ----------------- diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppMain.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppMain.xcf Binary files differindex 5011705..6646a7a 100755 --- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppMain.xcf +++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppMain.xcf diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppPOI.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppPOI.xcf Binary files differindex 94fdd35..504cf62 100644 --- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppPOI.xcf +++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppPOI.xcf diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSearch.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSearch.xcf Binary files differindex 483ee15..3f1fe32 100644 --- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSearch.xcf +++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSearch.xcf diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettings.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettings.xcf Binary files differindex b039512..92551dd 100644 --- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettings.xcf +++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettings.xcf diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsPreference.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsPreference.xcf Binary files differindex a15a2db..bb3b79e 100644 --- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsPreference.xcf +++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsPreference.xcf diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsSettingsLanguageAndUnits.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsSettingsLanguageAndUnits.xcf Binary files differindex a950bda..6189528 100644 --- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsSettingsLanguageAndUnits.xcf +++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppSettingsSettingsLanguageAndUnits.xcf diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf Binary files differindex 0fb21ff..d36b77b 100644 --- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf +++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppTripComputer.xcf diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/button-keyboard.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/button-keyboard.xcf Binary files differindex 23fdc4a..d17386f 100644 --- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/button-keyboard.xcf +++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/button-keyboard.xcf diff --git a/src/hmi/qml/Core/referenceHMI.tar.gz b/src/hmi/qml/Core/referenceHMI.tar.gz Binary files differindex 7528acb..898fed7 100644 --- a/src/hmi/qml/Core/referenceHMI.tar.gz +++ b/src/hmi/qml/Core/referenceHMI.tar.gz diff --git a/src/hmi/qml/NavigationAppPOI.qml b/src/hmi/qml/NavigationAppPOI.qml index e816767..fe2fd3b 100644 --- a/src/hmi/qml/NavigationAppPOI.qml +++ b/src/hmi/qml/NavigationAppPOI.qml @@ -43,11 +43,59 @@ NavigationAppHMIMenu { property int type_poi_bar: 65848 property int type_poi_fuel: 65834 property string poiCategoryName + property bool vehicleLocated: false + //------------------------------------------// + // Management of the DBus exchanges + //------------------------------------------// DBusIf { id: dbusIf } + property Item mapmatchedpositionPositionUpdateSignal; + function mapmatchedpositionPositionUpdate(args) + { + Genivi.hookSignal("mapmatchedpositionPositionUpdate"); + if(!Genivi.showroom) { + updateCurrentPosition(); + } + } + + function connectSignals() + { + mapmatchedpositionPositionUpdateSignal=Genivi.connect_mapmatchedpositionPositionUpdateSignal(dbusIf,menu); + } + + function disconnectSignals() + { + mapmatchedpositionPositionUpdateSignal.destroy(); + } + + function updateCurrentPosition() + { + var res=Genivi.mapmatchedposition_GetPosition(dbusIf); + var oklat=0; + var oklong=0; + for (var i=0;i<res[3].length;i+=4){ + if ((res[3][i+1]== Genivi.NAVIGATIONCORE_LATITUDE) && (res[3][i+3][3][1] != 0)){ + oklat=1; + Genivi.data['current_position']['lat']=res[3][i+3][3][1]; + } else { + if ((res[3][i+1]== Genivi.NAVIGATIONCORE_LONGITUDE) && (res[3][i+3][3][1] != 0)){ + oklong=1; + Genivi.data['current_position']['lon']=res[3][i+3][3][1]; + } else { + if (res[3][i+1]== Genivi.NAVIGATIONCORE_ALTITUDE){ + Genivi.data['current_position']['alt']=res[3][i+3][3][1]; + } + } + } + } + if ((oklat == 1) && (oklong == 1)) {vehicleLocated=true;} + else {vehicleLocated=false;} + select_search.update(); + } + function update() { selectedValue.text="See details of \nthe POI \nhere" @@ -224,21 +272,21 @@ NavigationAppHMIMenu { StdButton { source:StyleSheet.select_search[Constants.SOURCE]; x:StyleSheet.select_search[Constants.X]; y:StyleSheet.select_search[Constants.Y]; width:StyleSheet.select_search[Constants.WIDTH]; height:StyleSheet.select_search[Constants.HEIGHT]; id:select_search - onClicked: { + disabled:!(vehicleLocated || Genivi.showroom ); + onClicked: { var model=view.model; var ids=[]; - var position=Genivi.mapmatchedposition_GetPosition(dbusIf); var latitude=0; var longitude=0; - for (var i=0;i<position[3].length;i+=4){ - if ((position[3][i+1]== Genivi.NAVIGATIONCORE_LATITUDE) && (position[3][i+3][3][1] != 0)){ - latitude=position[3][i+3][3][1]; - } else { - if ((position[3][i+1]== Genivi.NAVIGATIONCORE_LONGITUDE) && (position[3][i+3][3][1] != 0)){ - longitude=position[3][i+3][3][1]; - } - } + + if(Genivi.showroom) { + latitude=Genivi.data['default_position']['lat']; + longitude=Genivi.data['default_position']['lon']; + }else{ + latitude=Genivi.data['current_position']['lat']; + longitude=Genivi.data['current_position']['lon']; } + if (!latitude && !longitude) { model.clear(); model.append({"name":"No position available"}); @@ -257,6 +305,7 @@ NavigationAppHMIMenu { attributeList[0]=0; var res=Genivi.poisearch_RequestResultList(dbusIf,Genivi.offset,Genivi.maxWindowSize,attributeList); var res_win=res[5]; + var i; for (i = 0 ; i < res_win.length ; i+=2) { var id=res_win[i+1][1]; ids.push(id); @@ -282,52 +331,54 @@ NavigationAppHMIMenu { } StdButton { source:StyleSheet.select_reroute[Constants.SOURCE]; x:StyleSheet.select_reroute[Constants.X]; y:StyleSheet.select_reroute[Constants.Y]; width:StyleSheet.select_reroute[Constants.WIDTH]; height:StyleSheet.select_reroute[Constants.HEIGHT]; - id:select_reroute; - + id:select_reroute; disabled:true; next:select_display_on_map; prev:select_search onClicked: { - var destination=Genivi.latlon_to_map(Genivi.poi_data[Genivi.poi_id]); - var position=""; - Genivi.routing_SetWaypoints(dbusIf,true,position,destination); - Genivi.data['calculate_route']=true; - Genivi.data['lat']=''; - Genivi.data['lon']=''; - if (Genivi.guidance_activated == true) - { - mapMenu(); - } - else { - pageOpen("NavigationAppSearch"); - } + disconnectSignals(); + Genivi.data['destination']=Genivi.poi_data[Genivi.poi_id]; + Genivi.reroute_requested=true; + pageOpen("NavigationAppSearch"); } } StdButton { source:StyleSheet.select_display_on_map[Constants.SOURCE]; x:StyleSheet.select_display_on_map[Constants.X]; y:StyleSheet.select_display_on_map[Constants.Y]; width:StyleSheet.select_display_on_map[Constants.WIDTH]; height:StyleSheet.select_display_on_map[Constants.HEIGHT]; - id:select_display_on_map; - - disabled:true; + id:select_display_on_map; + disabled:true; next:back; prev:select_reroute onClicked: { - var poi_data=Genivi.poi_data[Genivi.poi_id]; + disconnectSignals(); + var poi_data=Genivi.poi_data[Genivi.poi_id]; Genivi.data['position']['lat']=poi_data.lat; Genivi.data['position']['lon']=poi_data.lon; entryMenu("NavigationAppBrowseMap",menu); } } StdButton { + source:StyleSheet.settings[Constants.SOURCE]; x:StyleSheet.settings[Constants.X]; y:StyleSheet.settings[Constants.Y]; width:StyleSheet.settings[Constants.WIDTH]; height:StyleSheet.settings[Constants.HEIGHT]; + id:settings; next:back; prev:select_display_on_map; + disabled: false; + onClicked: { + disconnectSignals(); + entryMenu("NavigationAppSettings",menu); + } + } + StdButton { source:StyleSheet.back[Constants.SOURCE]; x:StyleSheet.back[Constants.X]; y:StyleSheet.back[Constants.Y]; width:StyleSheet.back[Constants.WIDTH]; height:StyleSheet.back[Constants.HEIGHT];textColor:StyleSheet.backText[Constants.TEXTCOLOR]; pixelSize:StyleSheet.backText[Constants.PIXELSIZE]; id:back; text: Genivi.gettext("Back"); disabled:false; next:select_search; prev:select_display_on_map; onClicked: { + disconnectSignals(); Genivi.preloadMode=true; leaveMenu(); } } } Component.onCompleted: { + connectSignals(); + var categoriesIdNameAndRadius=[]; var ret=Genivi.poisearch_GetAvailableCategories(dbusIf); var categories=ret[1]; @@ -346,5 +397,8 @@ NavigationAppHMIMenu { poiFrame.visible=true; update(); - } + if(!Genivi.showroom) { + updateCurrentPosition(); + } + } } diff --git a/src/hmi/qml/NavigationAppSearch.qml b/src/hmi/qml/NavigationAppSearch.qml index dd65d56..3b1f5a5 100644 --- a/src/hmi/qml/NavigationAppSearch.qml +++ b/src/hmi/qml/NavigationAppSearch.qml @@ -626,7 +626,6 @@ NavigationAppHMIMenu { prev_maneuver.disabled=false; next_maneuver.visible=true; next_maneuver.disabled=false; - Genivi.route_calculated=true; } function hideRoute() @@ -650,7 +649,6 @@ NavigationAppHMIMenu { prev_maneuver.disabled=true; next_maneuver.visible=false; next_maneuver.disabled=true; - Genivi.route_calculated=false; } @@ -1024,7 +1022,8 @@ NavigationAppHMIMenu { listArea.model.clear(); // clean lists routeArea.model.clear(); - if (Genivi.route_calculated) { + if (Genivi.route_calculated || Genivi.reroute_requested) { + Genivi.reroute_requested=false; launchRouteCalculation(); //relaunch route calculation to refresh data showRoute(); } diff --git a/src/run-capi b/src/run-capi index 61ea6a9..973b966 100755 --- a/src/run-capi +++ b/src/run-capi @@ -98,7 +98,7 @@ SRC_DIR=$CUR_DIR SCRIPT_DIR=$SRC_DIR/script HMI_QML_DIR=$SRC_DIR/hmi/qml -app=$HMI_QML_DIR/application.qml # hmi panel launched by default +app=$HMI_QML_DIR/NavigationApp.qml # hmi panel launched by default STYLE_SHEETS_GENERATED_INDICATOR=$HMI_QML_DIR/Core/style-sheets/the-style-sheets-have-been-generated-css.js REPLAYER_LOG_FILE=none export REPLAYER_LOG_FILE |