add aw navigation

[apps/navigation.git] / app / ProgressNextCross.qml

diff --git a/app/ProgressNextCross.qml b/app/ProgressNextCross.qml
old mode 100755 (executable)
new mode 100644 (file)
index 49765ce..d9e04a5
--- a/app/ProgressNextCross.qml
+++ b/app/ProgressNextCross.qml
@@ -1,86 +1,45 @@
 import QtQuick 2.0\r
 import QtQuick.Controls 1.5\r
+import QtQuick.Controls.Styles 1.4\r
 \r
 Item {\r
        id: progress_next_cross\r
 \r
-       function move() {\r
-               if(progress_next_cross.state == "0.1"){\r
-                       progress_next_cross.state = "0.2"\r
-               } else if(progress_next_cross.state == "0.2"){\r
-                       progress_next_cross.state = "0.3"\r
-               } else if(progress_next_cross.state == "0.3"){\r
-                       progress_next_cross.state = "0.4"\r
-               } else if(progress_next_cross.state == "0.4"){\r
-                       progress_next_cross.state = "0.5"\r
-               } else if(progress_next_cross.state == "0.5"){\r
-                       progress_next_cross.state = "0.6"\r
-               } else if(progress_next_cross.state == "0.6"){\r
-                       progress_next_cross.state = "0.7"\r
-               } else if(progress_next_cross.state == "0.7"){\r
-                       progress_next_cross.state = "0.8"\r
-               } else if(progress_next_cross.state == "0.8"){\r
-                       progress_next_cross.state = "0.9"\r
-               } else if(progress_next_cross.state == "0.9"){\r
-                       progress_next_cross.state = "1.0"\r
-               } else {\r
-                       progress_next_cross.state = "0.1"\r
-               }\r
+    visible: false\r
+\r
+    // val [Input]\r
+    //   distance to next cross. (unit = meter)\r
+    //   when over the ProgressBar.maximumValue/m, progress bar indicates max (same as ProgressBar.maximumValue/m)\r
+    function setProgress(val) {\r
+        if ( (0 < val) && (val < bar.maximumValue ) ) {\r
+            bar.value = val\r
+        }else if ( bar.maximumValue < val ){\r
+            bar.value = bar.maximumValue\r
+        }else{\r
+            bar.value = 0\r
+        }\r
        }\r
 \r
        ProgressBar {\r
                id: bar\r
                width: 25\r
                height: 100\r
-               orientation: 0\r
-               value: 0.7\r
+        orientation: Qt.Vertical\r
+        value: 0\r
+        minimumValue: 0\r
+        maximumValue: 300\r
 \r
-               MouseArea {\r
-                       anchors.fill: parent\r
-                       onClicked: { move() }\r
-               }\r
+        style: ProgressBarStyle {\r
+            progress: Rectangle {\r
+                color: "green"\r
+            }\r
+        }\r
        }\r
+    states: [\r
+        State {\r
+            name: "visible"; PropertyChanges { target: progress_next_cross; visible: true }},\r
+        State {\r
+            name: "invisible"; PropertyChanges { target: progress_next_cross; visible: false }}\r
+    ]\r
 \r
-       states: [\r
-               State {\r
-                       name: "0.1"\r
-                       PropertyChanges { target: bar; value: 0.1 }\r
-               },\r
-               State {\r
-                       name: "0.2"\r
-                       PropertyChanges { target: bar; value: 0.2 }\r
-               },\r
-               State {\r
-                       name: "0.3"\r
-                       PropertyChanges { target: bar; value: 0.3 }\r
-               },\r
-               State {\r
-                       name: "0.4"\r
-                       PropertyChanges { target: bar; value: 0.4 }\r
-               },\r
-               State {\r
-                       name: "0.5"\r
-                       PropertyChanges { target: bar; value: 0.5 }\r
-               },\r
-               State {\r
-                       name: "0.6"\r
-                       PropertyChanges { target: bar; value: 0.6 }\r
-               },\r
-               State {\r
-                       name: "0.7"\r
-                       PropertyChanges { target: bar; value: 0.7 }\r
-               },\r
-               State {\r
-                       name: "0.8"\r
-                       PropertyChanges { target: bar; value: 0.8 }\r
-               },\r
-               State {\r
-                       name: "0.9"\r
-                       PropertyChanges { target: bar; value: 0.9 }\r
-               },\r
-               State {\r
-                       name: "1.0"\r
-                       PropertyChanges { target: bar; value: 1.0 }\r
-               }\r
-       ]\r
 }\r