aboutsummaryrefslogtreecommitdiffstats
path: root/app/BtnGuidance.qml
diff options
context:
space:
mode:
authorzheng_wenlong <wenlong_zheng@nexty-ele.com>2019-06-14 12:58:15 +0900
committerzheng_wenlong <wenlong_zheng@nexty-ele.com>2019-06-14 12:58:15 +0900
commit9a7c493a0b43643f9a6dfe6fbc414219c06b9f4f (patch)
tree9f905f8b8f25a88f308926943de5ffce4550869e /app/BtnGuidance.qml
parente90b4cf9358a39d6cde661e769e592800effef0c (diff)
fix bug for 0614
Diffstat (limited to 'app/BtnGuidance.qml')
-rw-r--r--app/BtnGuidance.qml30
1 files changed, 19 insertions, 11 deletions
diff --git a/app/BtnGuidance.qml b/app/BtnGuidance.qml
index 4860050..0e66a12 100644
--- a/app/BtnGuidance.qml
+++ b/app/BtnGuidance.qml
@@ -15,12 +15,16 @@ Item {
console.log("onSts_guideChanged")
switch(btn_guidance.sts_guide){
case 0:
-// positionTimer.stop();
+ if (root.st_demo_state === true){
+ positionTimer.stop();
+ }
break
case 1:
break
case 2:
-// positionTimer.start();
+ if (root.st_demo_state === true){
+ positionTimer.start();
+ }
break
default:
break
@@ -32,7 +36,9 @@ Item {
btn_guidance.sts_guide = 2
btn_guidance.state = "onGuide"
map.addStartPoint()
- root.do_startguidance()
+ if (root.st_demo_state === false){
+ root.do_startguidance()
+ }
}
function stopGuidance() {
@@ -65,16 +71,18 @@ Item {
btn_guidance.sts_guide = 0
btn_guidance.state = "Idle"
- root.do_cancelguidance()
+ if (root.st_demo_state === false){
+ root.do_cancelguidance()
+ }
}
-// Timer {
-// id: positionTimer
-// interval: fileOperation.getUpdateInterval();
-// running: false;
-// repeat: true
-// onTriggered: map.updatePositon()
-// }
+ Timer {
+ id: positionTimer
+ interval: fileOperation.getUpdateInterval();
+ running: false;
+ repeat: true
+ onTriggered: map.updateDemoPositon()
+ }
Button {
id: discard