aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorzheng_wenlong <wenlong_zheng@nexty-ele.com>2019-05-31 13:02:40 +0900
committerzheng_wenlong <wenlong_zheng@nexty-ele.com>2019-05-31 13:02:40 +0900
commit59403c455a7ae2a5bd8d295aaf53a203d9a926e4 (patch)
tree9b03d7b87e1c4a3d832895c1060b176d7f0f22de /app
parentc8d0de473418fb0312876e22a18f0fbda54c4b38 (diff)
fix bug
Diffstat (limited to 'app')
-rw-r--r--app/ArrivedDesDialog.qml2
-rw-r--r--app/images/images.qrc1
-rw-r--r--app/main.cpp2
-rwxr-xr-xapp/navigation.qml2
4 files changed, 4 insertions, 3 deletions
diff --git a/app/ArrivedDesDialog.qml b/app/ArrivedDesDialog.qml
index e1ea5c4..d352b04 100644
--- a/app/ArrivedDesDialog.qml
+++ b/app/ArrivedDesDialog.qml
@@ -62,7 +62,7 @@ Rectangle {
spacing: 10
Image {
id: dsp_mark
- source: dsp_icon
+// source: dsp_icon
Layout.maximumHeight: 120
Layout.maximumWidth: 120
}
diff --git a/app/images/images.qrc b/app/images/images.qrc
index e710ac2..3cd9b1b 100644
--- a/app/images/images.qrc
+++ b/app/images/images.qrc
@@ -25,5 +25,6 @@
<file>MUTCD_RS-113.svg</file>
<file>posimark_r.png</file>
<file>position02.svg</file>
+ <file>DividingLine.svg</file>
</qresource>
</RCC>
diff --git a/app/main.cpp b/app/main.cpp
index 1e71ada..ea3c7a4 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
QLibHomeScreen* qhsHandler = new QLibHomeScreen();
qhsHandler->init(port, secret.toStdString().c_str());
qhsHandler->set_event_handler(QLibHomeScreen::Event_TapShortcut, [qwmHandler, myname](json_object *object){
- qDebug("Surface %s got tapShortcut\n", myname);
+ qDebug("Surface %s got tapShortcut\n", qPrintable(myname));
qwmHandler->activateWindow(myname);
});
// Load qml
diff --git a/app/navigation.qml b/app/navigation.qml
index 6b276b3..fe253cf 100755
--- a/app/navigation.qml
+++ b/app/navigation.qml
@@ -574,7 +574,7 @@ ApplicationWindow {
map.currentpostion = QtPositioning.coordinate(car_position_lat, car_position_lon)
car_accumulated_distance = 0
do_setdemorouteinfo(car_position_lat, car_position_lon,car_direction,car_accumulated_distance)
- do_setdemorouteinfo(car_direction,car_accumulated_distance)
+// do_setdemorouteinfo(car_direction,car_accumulated_distance)
routeQuery.clearWaypoints();