diff options
-rw-r--r-- | README | 12 | ||||
-rw-r--r-- | src/hmi/qml/Core/genivi.js | 2 | ||||
-rw-r--r-- | src/hmi/qml/Entry.qml | 5 | ||||
-rw-r--r-- | src/hmi/qml/FSA.qmlproject.user | 136 | ||||
-rw-r--r-- | src/hmi/qml/NavigationSearchAddress.qml | 42 | ||||
-rw-r--r-- | src/hmi/qml/NavigationSettings.qml | 58 | ||||
-rwxr-xr-x | src/script/run | 17 |
7 files changed, 104 insertions, 168 deletions
@@ -1,4 +1,4 @@ -Release date of the file: 25-07-2014 +Release date of the file: 30-07-2014 Status: to be completed Project: @@ -36,15 +36,19 @@ To get the code: git clone http://git.projects.genivi.org/lbs/navigation-application.git $WORKING-DIR -Important notice: HMI is running under Qt5 +Important notice: +HMI is running under Qt5 To check your version: qtchooser --print-env To select Qt5: export QT_SELECT=5 -Dependencies: (make all2 check/install the needed packages) +Default address for the application is using a list of address accessed in english, so you need to set the locale to en_US +export LANGUAGE=en_US + +Dependencies: (make all2 allows to check/install the needed packages) (to be completed) -cmake xsltproc libdbus-c++-dev libdbus-1-dev libdbus-c++-bin libsqlite3-dev libglibmm-2.4-dev sqlite3 xsltproc libboost-dev libjson0-dev libtool uuid-dev +cmake xsltproc libdbus-c++-dev libdbus-1-dev libdbus-c++-bin libsqlite3-dev libglibmm-2.4-dev sqlite3 xsltproc libboost-dev libjson0-dev libtool uuid-dev qtdeclarative5-quicklayouts-plugin qtdeclarative5-dialogs-plugin qtdeclarative5-controls-plugin qtdeclarative5-qtquick2-plugin qtdeclarative5-window-plugin libqt5declarative5 Build: diff --git a/src/hmi/qml/Core/genivi.js b/src/hmi/qml/Core/genivi.js index f3c972d..65ac777 100644 --- a/src/hmi/qml/Core/genivi.js +++ b/src/hmi/qml/Core/genivi.js @@ -102,7 +102,7 @@ var historyOfLastEnteredLocationOut=0; //first ouput //the default data below will be managed by the persistency component in the future address[NAVIGATIONCORE_COUNTRY]="Switzerland"; address[NAVIGATIONCORE_CITY]="Genève"; -address[NAVIGATIONCORE_STREET]=""; +address[NAVIGATIONCORE_STREET]="Rue de l'Avenir"; address[NAVIGATIONCORE_HOUSENUMBER]=""; historyOfLastEnteredLocationDepth=10; //max number of items into the history is set to historyOfLastEnteredLocationDepth-1 tripMode="TRIP_NUMBER1"; diff --git a/src/hmi/qml/Entry.qml b/src/hmi/qml/Entry.qml index 7025da5..b6c7fa3 100644 --- a/src/hmi/qml/Entry.qml +++ b/src/hmi/qml/Entry.qml @@ -49,7 +49,6 @@ HMIMenu { function searchStatus(args) { console.log("SearchStatus"); - Genivi.dump("",args); if (args[3] == Genivi.NAVIGATIONCORE_SEARCHING) { view.model.clear(); menu.text="Entry (Searching)"; @@ -86,7 +85,6 @@ HMIMenu { function spellResult(args) { - Genivi.dump("",args); if (args[0] == "uint32" && args[2] == "string" && args[4] == "string") { if (text.text.length < args[3].length) { extraspell=args[3].substr(text.text.length); @@ -94,10 +92,8 @@ HMIMenu { } keyboard.setactivekeys('\b'+args[5],true); - Genivi.dump("",args); } else { console.log("Unexpected result from SpellResult:"); - Genivi.dump("",args); } } @@ -168,6 +164,7 @@ HMIMenu { StdButton { id:back; text: "Back"; onClicked: { Genivi.entrydest=null; disconnectSignals(); + Genivi.entryselectedentry=0; pageOpen(Genivi.entryback); } next:view; prev:keyboard} } diff --git a/src/hmi/qml/FSA.qmlproject.user b/src/hmi/qml/FSA.qmlproject.user deleted file mode 100644 index f5742ab..0000000 --- a/src/hmi/qml/FSA.qmlproject.user +++ /dev/null @@ -1,136 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE QtCreatorProject> -<!-- Written by QtCreator 2.8.0, 2014-05-12T16:34:32. --> -<qtcreator> - <data> - <variable>ProjectExplorer.Project.ActiveTarget</variable> - <value type="int">0</value> - </data> - <data> - <variable>ProjectExplorer.Project.EditorSettings</variable> - <valuemap type="QVariantMap"> - <value type="bool" key="EditorConfiguration.AutoIndent">true</value> - <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value> - <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0"> - <value type="QString" key="language">Cpp</value> - <valuemap type="QVariantMap" key="value"> - <value type="QString" key="CurrentPreferences">CppGlobal</value> - </valuemap> - </valuemap> - <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1"> - <value type="QString" key="language">QmlJS</value> - <valuemap type="QVariantMap" key="value"> - <value type="QString" key="CurrentPreferences">QmlJSGlobal</value> - </valuemap> - </valuemap> - <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value> - <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value> - <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value> - <value type="int" key="EditorConfiguration.IndentSize">4</value> - <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value> - <value type="bool" key="EditorConfiguration.MouseNavigation">true</value> - <value type="int" key="EditorConfiguration.PaddingMode">1</value> - <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value> - <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value> - <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value> - <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value> - <value type="int" key="EditorConfiguration.TabSize">8</value> - <value type="bool" key="EditorConfiguration.UseGlobal">true</value> - <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value> - <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value> - <value type="bool" key="EditorConfiguration.cleanIndentation">true</value> - <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value> - <value type="bool" key="EditorConfiguration.inEntireDocument">false</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.PluginSettings</variable> - <valuemap type="QVariantMap"/> - </data> - <data> - <variable>ProjectExplorer.Project.Target.0</variable> - <valuemap type="QVariantMap"> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop-Qt in PATH</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop-Qt in PATH</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{d36db077-6275-46a2-a234-005200a77c0c}</value> - <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value> - <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value> - <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">0</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0"> - <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0"> - <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value> - </valuemap> - <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/> - <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0"> - <value type="bool" key="Analyzer.Project.UseGlobal">true</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value> - <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value> - <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value> - <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value> - <value type="int" key="Analyzer.Valgrind.NumCallers">25</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/> - <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value> - <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value> - <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds"> - <value type="int">0</value> - <value type="int">1</value> - <value type="int">2</value> - <value type="int">3</value> - <value type="int">4</value> - <value type="int">5</value> - <value type="int">6</value> - <value type="int">7</value> - <value type="int">8</value> - <value type="int">9</value> - <value type="int">10</value> - <value type="int">11</value> - <value type="int">12</value> - <value type="int">13</value> - <value type="int">14</value> - </valuelist> - <value type="int" key="PE.EnvironmentAspect.Base">0</value> - <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Viewer</value> - <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration</value> - <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value> - <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value> - <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value> - <value type="bool" key="RunConfiguration.UseCppDebugger">false</value> - <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value> - <value type="bool" key="RunConfiguration.UseMultiProcess">false</value> - <value type="bool" key="RunConfiguration.UseQmlDebugger">true</value> - <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value> - </valuemap> - <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value> - </valuemap> - </data> - <data> - <variable>ProjectExplorer.Project.TargetCount</variable> - <value type="int">1</value> - </data> - <data> - <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable> - <value type="QByteArray">{300dd684-2aab-49e1-8ae5-4c6f11acd1ce}</value> - </data> - <data> - <variable>ProjectExplorer.Project.Updater.FileVersion</variable> - <value type="int">14</value> - </data> -</qtcreator> diff --git a/src/hmi/qml/NavigationSearchAddress.qml b/src/hmi/qml/NavigationSearchAddress.qml index 3030c6e..e154198 100644 --- a/src/hmi/qml/NavigationSearchAddress.qml +++ b/src/hmi/qml/NavigationSearchAddress.qml @@ -56,22 +56,25 @@ HMIMenu { if (Genivi.address[Genivi.NAVIGATIONCORE_CITY] !== "") { cityValue.text=Genivi.address[Genivi.NAVIGATIONCORE_CITY]; - streetValue.disabled=false; accept(cityValue); + streetValue.disabled=false; + if (Genivi.address[Genivi.NAVIGATIONCORE_STREET] !== "") + { + streetValue.text=Genivi.address[Genivi.NAVIGATIONCORE_STREET]; + accept(streetValue); + numberValue.disabled=false; + } } } } function currentSelectionCriterion(args) { - console.log("CurrentSelectionCriterion"); - Genivi.dump("",args); + Genivi.dump("CurrentSelectionCriterion",args); } function searchStatus(args) { - console.log("SearchStatus"); - Genivi.dump("",args); if (args[3] == 2) menu.text="Search (Searching)"; else @@ -80,9 +83,7 @@ HMIMenu { function searchResultList(args) { - console.log("SearchResultList:"); - Genivi.dump("",args); - Genivi.locationinput_message(dbusIf,"SelectEntry",["uint16",0]); + Genivi.locationinput_message(dbusIf,"SelectEntry",["uint16",Genivi.entryselectedentry]); } function setContent(args) @@ -140,7 +141,6 @@ HMIMenu { function contentUpdated(args) { console.log("contentUpdated"); - Genivi.dump("",args); if (args[3]) { ok.disabled=false; } @@ -190,7 +190,7 @@ HMIMenu { connectSignals(); var res=Genivi.nav_message(dbusIf,"Session","GetVersion",[]); - Genivi.dump("",res); + console.log("Dbusif"); if (res[0] != "error") { console.log("NavigationCore Version "+res[1][1]+"."+res[1][3]+"."+res[1][5]+" "+res[1][7]); res=Genivi.nav_session(dbusIf); @@ -201,13 +201,25 @@ HMIMenu { if (Genivi.entryselectedentry) { Genivi.locationinput_message(dbusIf,"SelectEntry",["uint16",Genivi.entryselectedentry-1]); } - if (Genivi.entrydest == 'countryValue') accept(countryValue); - if (Genivi.entrydest == 'cityValue') accept(cityValue); - if (Genivi.entrydest == 'streetValue') accept(streetValue); - if (Genivi.entrydest == 'numberValue') accept(numberValue); + if (Genivi.entrydest == 'countryValue') + { + accept(countryValue); + } + if (Genivi.entrydest == 'cityValue') + { + accept(cityValue); + } + if (Genivi.entrydest == 'streetValue') + { + accept(streetValue); + } + if (Genivi.entrydest == 'numberValue') + { + accept(numberValue); + } Genivi.entrydest=null; } - } + } HMIBgImage { image:StyleSheet.navigation_search_by_address_menu_background[StyleSheet.SOURCE]; diff --git a/src/hmi/qml/NavigationSettings.qml b/src/hmi/qml/NavigationSettings.qml index 915b74e..2db09f0 100644 --- a/src/hmi/qml/NavigationSettings.qml +++ b/src/hmi/qml/NavigationSettings.qml @@ -38,6 +38,7 @@ HMIMenu { headlineBg: "blue" text: Genivi.gettext("NavigationSettings") property Item simulationStatusChangedSignal; + property Item simulationSpeedChangedSignal; next: back prev: back @@ -47,6 +48,52 @@ HMIMenu { property int speedValueSent: 0; + function simulationSpeedChanged(args) + { + console.log("SimulationSpeedChanged"); + if (args[0] == 'uint8') + { + if (args[1] == 0) { + speedValue.text="0"; + speedValueSent=0; + } + if (args[1] == 1) { + speedValue.text="1/4"; + speedValueSent=1; + } + if (args[1] == 2) { + speedValue.text="1/2"; + speedValueSent=2; + } + if (args[1] == 4) { + speedValue.text="1"; + speedValueSent=3; + } + if (args[1] == 8) { + speedValue.text="2"; + speedValueSent=4; + } + if (args[1] == 16) { + speedValue.text="4"; + speedValueSent=5; + } + if (args[1] == 32) { + speedValue.text="8"; + speedValueSent=6; + } + if (args[1] == 64) { + speedValue.text="16"; + speedValueSent=7; + } + } + else + { + console.log("Unexpected result from SimulationSpeedChanged:"); + Genivi.dump("",args); + } + + } + function simulationStatusChanged(args) { console.log("SimulationStatusChanged"); @@ -74,7 +121,7 @@ HMIMenu { simu_mode.setState("FREE"); } } else { - console.log("Unexpected result from GetSimulationStatus:"); + console.log("Unexpected result from SimulationStatusChanged:"); Genivi.dump("",args); } @@ -83,11 +130,13 @@ HMIMenu { function connectSignals() { simulationStatusChangedSignal=dbusIf.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition","SimulationStatusChanged",menu,"simulationStatusChanged"); + simulationSpeedChangedSignal=dbusIf.connect("","/org/genivi/navigationcore","org.genivi.navigationcore.MapMatchedPosition","SimulationSpeedChanged",menu,"simulationSpeedChanged"); } function disconnectSignals() { simulationStatusChangedSignal.destroy(); + simulationSpeedChangedSignal.destroy(); } @@ -236,9 +285,10 @@ HMIMenu { onClicked: { if (speedValueSent > 0) + { speedValueSent = speedValueSent-1; + } Genivi.mapmatch_message(dbusIf,"SetSimulationSpeed",["uint8",getDBusSpeedValue(speedValueSent)]); - update(); } } StdButton {source:StyleSheet.speed_up[StyleSheet.SOURCE]; x:StyleSheet.speed_up[StyleSheet.X]; y:StyleSheet.speed_up[StyleSheet.Y]; width:StyleSheet.speed_up[StyleSheet.WIDTH]; height:StyleSheet.speed_up[StyleSheet.HEIGHT]; @@ -246,9 +296,10 @@ HMIMenu { onClicked: { if (speedValueSent < 7) + { speedValueSent = speedValueSent+1; + } Genivi.mapmatch_message(dbusIf,"SetSimulationSpeed",["uint8",getDBusSpeedValue(speedValueSent)]); - update(); } } @@ -292,6 +343,7 @@ HMIMenu { } } } + StdButton { x:StyleSheet.play[StyleSheet.X]; y:StyleSheet.play[StyleSheet.Y]; width:StyleSheet.play[StyleSheet.WIDTH]; height:StyleSheet.play[StyleSheet.HEIGHT]; id:simu_mode; next:back; prev:back; explode:false; disabled:false; property int status: 0; diff --git a/src/script/run b/src/script/run index c5f842e..36cbfb2 100755 --- a/src/script/run +++ b/src/script/run @@ -34,17 +34,20 @@ function run local l=$log title="$1" shift + if [ "$1" = "-n" ] then shift x=0 l=0 fi + if [ "$1" = "-g" ] then shift g=0 fi + if [ "$x" = 1 ] then if [ "$g" = 1 ] @@ -189,6 +192,8 @@ set -e cd $BIN_DIR/automotive-message-broker run "Automotive Message Broker" ./ambd/ambd --config $SRC_DIR/genivilogreplayer/logreplayerconfig +wait_for_service org.automotive.message.broker / +sleep 2 if [ "$enhpos" = 1 ] then @@ -205,11 +210,13 @@ run "POI service" ./poi-server -f empty.db wait_for_service org.genivi.poiservice.POISearch /org/genivi/poiservice/POISearch cd $SRC_DIR/navigation-service*/src/navigation/script -run "Navit Plugins" -n ./run -b $BIN_DIR $plugin_args - -wait_for_service org.automotive.message.broker / -sleep 2 - +#we don't use the replayer used by the navigation core because we need a plugin for the application ! +if [ "$enhpos" = 1 ] +then + run "Navit Plugins" ./run -r -b $BIN_DIR $plugin_args +else + run "Navit Plugins" ./run -rn -b $BIN_DIR $plugin_args +fi run "Fuel Stop Advisor" $BIN_DIR/fuel-stop-advisor/fuel-stop-advisor if [ "$log" = 1 ] |