some bug fixes of HMI and test script

10 files changed, 38 insertions, 36 deletions

diff --git a/src/hmi/qml/Core/NavigationAppKeyboard.qml b/src/hmi/qml/Core/NavigationAppKeyboard.qml
index 72e0cb9..119fe56 100644
--- a/src/hmi/qml/Core/NavigationAppKeyboard.qml
+++ b/src/hmi/qml/Core/NavigationAppKeyboard.qml
@@ -106,14 +106,14 @@ Item {
     {
         var keys;
         keys='\b'+'␣'+"ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        if(g_language==="eng"){
+        if(Genivi.g_language ==="eng"){
         }else{
-            if(g_language==="fra"){
+            if(Genivi.g_language==="fra"){
             }else{
-                if(g_language==="jpn"){
+                if(Genivi.g_language==="jpn"){
                     keys+="あかさたなはまやらわいきしちにひみりをうくすつぬふむゆるんえけせてねへめれ”おこそとのほもよろ°";
                 }else{
-                    if(g_language==="deu"){
+                    if(Genivi.g_language==="deu"){
                     }
                 }
             }
diff --git a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
index db3c406..7be59a8 100755
--- a/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.xcf
+++ b/src/hmi/qml/Core/gimp/gdp-theme/800x480/NavigationAppBrowseMapSettings.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
index cc23015..7d6d9a6 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
index 682d348..49ab7ed 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/referenceHMI.tar.gz b/src/hmi/qml/Core/referenceHMI.tar.gz
index f95e011..ae95026 100644
--- a/src/hmi/qml/Core/referenceHMI.tar.gz
+++ b/src/hmi/qml/Core/referenceHMI.tar.gz
diff --git a/src/hmi/qml/Core/translations/jpn_JPN.js b/src/hmi/qml/Core/translations/jpn_JPN.js
index 39b8855..ed3ed63 100644
--- a/src/hmi/qml/Core/translations/jpn_JPN.js
+++ b/src/hmi/qml/Core/translations/jpn_JPN.js
@@ -30,36 +30,36 @@ translations["Navigation"]="ナビ";
 translations["Mapview"]="地図";
 translations["Poi"]="地点";
 translations["Configuration"]="設定";
-translations["Trip"]="TRIP";
+translations["Trip"]="旅行";
 
 translations["Country"]="国";
 translations["City"]="町";
 translations["Street"]="道";
 translations["Number"]="番号";
 
-translations["RoutingPreferences"]="ROUTING PREFERENCES";
-translations["Ferries"]="FERRIES";
-translations["TollRoads"]="TOLL ROADS";
-translations["MotorWays"]="MOTORWAYS";
+translations["RoutingPreferences"]="ルートの設定";
+translations["Ferries"]="フェリー";
+translations["TollRoads"]="通行料";
+translations["MotorWays"]="高速道路";
 translations["CostModel"]="COST MODEL";
 translations["Shortest"]="SHORTEST";
 translations["Fastest"]="FASTEST";
 translations["Language"]="言語";
 translations["Units"]="ユニット";
 translations["Showroom"]="ショールーム";
-translations["Autoguidance"]="AUTOGUIDE";
-translations["Simulation"]="SIMULATION";
+translations["Autoguidance"]="自動ガイド";
+translations["Simulation"]="シミュレーション";
 
 translations["RouteDistance"]="距離";
 translations["RouteTime"]="時間";
 translations["Guidance"]="ガイダンス";
 translations["DisplayRoute"]="ルート";
 translations["StatusTitle"]="ステータス";
-translations["CalculatedRouteInProgress"]="CALCULATION IN PROGRESS";
-translations["CalculatedRouteFailed"]="CALCULATION FAILED";
-translations["CalculatedRouteSuccess"]="ROUTE AVAILABLE";
+translations["CalculatedRouteInProgress"]="進行中";
+translations["CalculatedRouteFailed"]="失敗した";
+translations["CalculatedRouteSuccess"]="成功した";
 
-translations["FSAWarning"]="Refill";
+translations["FSAWarning"]="補給";
 translations["NoGuidance"]="No guidance";
 translations["NoManeuver"]="No maneuver";
 
@@ -68,32 +68,30 @@ translations["North"]="北";
 translations["South"]="南";
 translations["East"]="東";
 translations["West"]="西";
-translations["CameraTilt"]="Tilt";
-translations["CameraHeight"]="Height";
+translations["CameraTilt"]="上下";
+translations["CameraHeight"]="高さ";
 translations["CameraDistance"]="Dist";
 translations["CameraPerspective3d"]="3d";
 translations["CameraPerspective2d"]="2d";
 translations["Split"]="Sp";
 translations["Join"]="Jo";
-translations["Day"]="Da";
-translations["Night"]="Ni";
+translations["Day"]="日";
+translations["Night"]="夜";
 
-translations["AvgSpeed"]="AVG SPEED";
-translations["AvgFuel"]="AVG FUEL";
+translations["AvgSpeed"]="時速";
+translations["AvgFuel"]="燃費";
 translations["Distance"]="距離";
-translations["FuelLevel"]="FUEL LEVEL";
-translations["TankDistance"]="TANK DISTANCE";
-translations["PredictiveTankDistance"]="PREDICTIVE\nTANK DISTANCE";
-translations["Reset"]="RESET";
+translations["FuelLevel"]="燃料";
+translations["TankDistance"]="走行距離";
+translations["PredictiveTankDistance"]="予報した\n走行距離";
+translations["Reset"]="リセット";
 
-translations["Selected"]="SELECTED";
+translations["Selected"]="選ばれた";
 
 translations["On"]="ON";
 translations["Off"]="OFF";
-translations["Back"]="BACK";
+translations["Back"]="戻る";
 translations["Cancel"]="キャンセル";
-translations["Quit"]="QUIT";
-
-
-translations["Element"]="NAME";
+translations["Quit"]="終了";
 
+translations["Element"]="場所";
diff --git a/src/hmi/qml/NavigationAppBrowseMap.qml b/src/hmi/qml/NavigationAppBrowseMap.qml
index 4a721b3..55bde0e 100644
--- a/src/hmi/qml/NavigationAppBrowseMap.qml
+++ b/src/hmi/qml/NavigationAppBrowseMap.qml
@@ -1551,7 +1551,7 @@ NavigationAppHMIMenu {
                     hideGuidance();
                     hideRoute();
                     hideSimulation();
-                    updateAddress();
+                    updateAddress(); //there's a pb of accuracy of SetPosition in mapmatchedposition
                 }
             }
             else {
@@ -1564,11 +1564,12 @@ NavigationAppHMIMenu {
                     hideGuidance();
                     hideRoute();
                     hideSimulation();
-                    updateAddress();
+                    updateAddress(); //there's a pb of accuracy of SetPosition in mapmatchedposition
                 }
             }
         }
         showZoom();
         initScale();
+        updateDayNight();
 	}
 }
diff --git a/src/hmi/qml/NavigationAppSearch.qml b/src/hmi/qml/NavigationAppSearch.qml
index 5399ee8..926d720 100644
--- a/src/hmi/qml/NavigationAppSearch.qml
+++ b/src/hmi/qml/NavigationAppSearch.qml
@@ -46,7 +46,7 @@ NavigationAppHMIMenu {
     property bool destinationValid: false
     property real routeListSegments: 1000
     property bool vehicleLocated: false
-    property real delayToGetManeuverList: 100
+    property real delayToGetManeuverList: 200 //in ms
 
     //------------------------------------------//
     // Miscellaneous
diff --git a/test/resource/low-tank-level.log b/test/resource/low-tank-level.log
index 173c30d..c0bd98e 100644
--- a/test/resource/low-tank-level.log
+++ b/test/resource/low-tank-level.log
@@ -7,7 +7,7 @@
 #vehicle speed 90 km/h so 2500 cm/1000 ms
 #engine speed 2000 RPM
 #ignition key ON (Not Applicable)
-#fuel level 15 l
+#fuel level 4 l
 #fuel consumption 5.4 l/h so 1500 µl/1000 ms (6 l/100)
 #step 1000 ms
 #totalodo is used for simulating distance step in cm
@@ -17,6 +17,6 @@
 1000,0$GVGNSP,1000,46.202038, 6.146845,0,0X03
 1000,0$GVSNSVEHSP,1000,90.00,0X01
 1000,0$GVVEHENGSPEED,2000,0X01
-1000,0$GVVEHFUELLEVEL,15,0X01
+1000,0$GVVEHFUELLEVEL,4,0X01
 1000,0$GVVEHFUELCONS,1500,0X01
 1000,0$GVVEHTOTALODO,2500,0x01
diff --git a/test/script/simulation-dashboard.py b/test/script/simulation-dashboard.py
index a569ae3..41470a2 100755
--- a/test/script/simulation-dashboard.py
+++ b/test/script/simulation-dashboard.py
@@ -114,6 +114,7 @@ def displayEngineSpeed(string):
 	logVerbose("EngineSpeed",string)
 
 def displayFuelLevel(string):
+	display('       ',FUEL_LEVEL_LOCATION,YELLOW,BLACK)
 	display(string,FUEL_LEVEL_LOCATION,YELLOW,BLACK)
 
 def displayFuelInstant(string):
@@ -138,9 +139,11 @@ def displayFuelStopAdvisorWarning(string):
 	display(string,FUEL_STOP_ADVISOR_WARNING_LOCATION,YELLOW,BLACK)
 
 def displayFuelStopAdvisorTankDistance(string):
+	display('       ',FUEL_STOP_ADVISOR_TANK_DISTANCE_LOCATION,YELLOW,BLACK)
 	display(string,FUEL_STOP_ADVISOR_TANK_DISTANCE_LOCATION,YELLOW,BLACK)
 
 def displayFuelStopAdvisorEnhancedTankDistance(string):
+	display('       ',FUEL_STOP_ADVISOR_ENHANCED_TANK_DISTANCE_LOCATION,YELLOW,BLACK)
 	display(string,FUEL_STOP_ADVISOR_ENHANCED_TANK_DISTANCE_LOCATION,YELLOW,BLACK)
 
 def refresh():