add designsandbox/zheng_wenlong/hudspeed

15 files changed, 69 insertions, 21 deletions

diff --git a/app/Hudspeed.qml b/app/Hudspeed.qml
index 2b72e21..5fd9330 100644
--- a/app/Hudspeed.qml
+++ b/app/Hudspeed.qml
@@ -34,7 +34,21 @@ ApplicationWindow {
     property string request_str: ""
     property string status_str: ""
 	
-    property double speed_val: 0
+    property int speed_val: 0
+
+    property var speedImg: [
+        "qrc:/image/speed_0.png",
+        "qrc:/image/speed_1.png",
+        "qrc:/image/speed_2.png",
+        "qrc:/image/speed_3.png",
+        "qrc:/image/speed_4.png",
+        "qrc:/image/speed_5.png",
+        "qrc:/image/speed_6.png",
+        "qrc:/image/speed_7.png",
+        "qrc:/image/speed_8.png",
+        "qrc:/image/speed_9.png"
+    ]
+
 
     WebSocket {
         id: websocket
@@ -60,11 +74,11 @@ ApplicationWindow {
             if (message_json[0] === msgid_enu.event){
 
                 //get speed from low-can app
-				var property_name = message_json[2].event.split("/")[1]
+                var property_name = message_json[2].event.split("/")[1]
                 if(property_name === "messages.vehicle.average.speed") {
-                    speed_val = message_json[2].data.value
+                    speed_val = message_json[2].data.value.toFixed(0)
                     console.log ("speed_val: " + speed_val)
-                }     
+                }
             }
             else{
                 if (message_json[0] !== msgid_enu.retok) {
@@ -72,7 +86,7 @@ ApplicationWindow {
                     return
                 }
             }
-			/* refresh happen */
+            /* refresh happen */
         }
         active: true
     }
@@ -82,24 +96,45 @@ ApplicationWindow {
         websocket.sendTextMessage (request_str)
     }
 
+    background: Rectangle {
+        color: "#111111"
+    }
+
+    Image{
+        id: background
+        anchors.centerIn: parent
+        source: "qrc:/image/speed_blue_L.png"
+    }
+
+    Image{
+        id: backpoint
+        anchors.centerIn: parent
+        source: "qrc:/image/speed_meter.png"
+    }
+
+    Image{
+        id: unit
+        anchors.centerIn: parent
+        source: "qrc:/image/speed_meter_mph.png"
+    }
+
     Rectangle {
-        color: '#111111'
-        anchors.fill: parent
-        Label {
-            id: speed
-            anchors.left: parent.left
-            anchors.top: parent.top
-            text: speed_val.toFixed(0)
-	        font.pixelSize: parent.height*4/5
-            color: "white"
-        }
-        Label {
-            id: unit
-            anchors.right: parent.right
-            anchors.bottom: parent.bottom
-            text: 'MPH'
-            font.pixelSize: parent.height/5
+            color: "#111111"
         }
+    Image {
+        visible: (speed_val < 10) ? false : true
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.horizontalCenterOffset: 5
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.verticalCenterOffset: 25
+        source: (speed_val < 10) ? speedImg[0] : speedImg[(speed_val - speed_val%10)/10%10]
+    }
+    Image {
+        anchors.horizontalCenter: parent.horizontalCenter
+        anchors.horizontalCenterOffset: (speed_val < 10) ? 25 : 45
+        anchors.verticalCenter: parent.verticalCenter
+        anchors.verticalCenterOffset: 25
+        source: speedImg[speed_val%10]
     }
 }
 
diff --git a/app/hudspeed.qrc b/app/hudspeed.qrc
index 8ce5dd9..40a1df2 100644
--- a/app/hudspeed.qrc
+++ b/app/hudspeed.qrc
@@ -1,5 +1,18 @@
 <RCC>
     <qresource prefix="/">
         <file>Hudspeed.qml</file>
+        <file>image/speed_blue_L.png</file>
+        <file>image/speed_meter.png</file>
+        <file>image/speed_meter_mph.png</file>
+        <file>image/speed_0.png</file>
+        <file>image/speed_1.png</file>
+        <file>image/speed_2.png</file>
+        <file>image/speed_3.png</file>
+        <file>image/speed_4.png</file>
+        <file>image/speed_5.png</file>
+        <file>image/speed_6.png</file>
+        <file>image/speed_7.png</file>
+        <file>image/speed_8.png</file>
+        <file>image/speed_9.png</file>
     </qresource>
 </RCC>
diff --git a/app/image/speed_0.png b/app/image/speed_0.png
new file mode 100644
index 0000000..64abd4c
--- /dev/null
+++ b/app/image/speed_0.png
diff --git a/app/image/speed_1.png b/app/image/speed_1.png
new file mode 100644
index 0000000..d6fd76f
--- /dev/null
+++ b/app/image/speed_1.png
diff --git a/app/image/speed_2.png b/app/image/speed_2.png
new file mode 100644
index 0000000..444bef0
--- /dev/null
+++ b/app/image/speed_2.png
diff --git a/app/image/speed_3.png b/app/image/speed_3.png
new file mode 100644
index 0000000..da93f8b
--- /dev/null
+++ b/app/image/speed_3.png
diff --git a/app/image/speed_4.png b/app/image/speed_4.png
new file mode 100644
index 0000000..9172a49
--- /dev/null
+++ b/app/image/speed_4.png
diff --git a/app/image/speed_5.png b/app/image/speed_5.png
new file mode 100644
index 0000000..45fba50
--- /dev/null
+++ b/app/image/speed_5.png
diff --git a/app/image/speed_6.png b/app/image/speed_6.png
new file mode 100644
index 0000000..0ebca65
--- /dev/null
+++ b/app/image/speed_6.png
diff --git a/app/image/speed_7.png b/app/image/speed_7.png
new file mode 100644
index 0000000..e016343
--- /dev/null
+++ b/app/image/speed_7.png
diff --git a/app/image/speed_8.png b/app/image/speed_8.png
new file mode 100644
index 0000000..2a9be49
--- /dev/null
+++ b/app/image/speed_8.png
diff --git a/app/image/speed_9.png b/app/image/speed_9.png
new file mode 100644
index 0000000..cf72985
--- /dev/null
+++ b/app/image/speed_9.png
diff --git a/app/image/speed_blue_L.png b/app/image/speed_blue_L.png
new file mode 100644
index 0000000..fc5efec
--- /dev/null
+++ b/app/image/speed_blue_L.png
diff --git a/app/image/speed_meter.png b/app/image/speed_meter.png
new file mode 100644
index 0000000..62b6aab
--- /dev/null
+++ b/app/image/speed_meter.png
diff --git a/app/image/speed_meter_mph.png b/app/image/speed_meter_mph.png
new file mode 100644
index 0000000..06ef737
--- /dev/null
+++ b/app/image/speed_meter_mph.png