X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=app%2FHVAC.qml;h=1a3916724fdb9b2ca189e5b17c468e776bebba4a;hb=611a430a2457eed24cee182c073189653c55a793;hp=c375f2fdda107f48775bd0fef17edc6f3d6e9144;hpb=997ff3705532f62bd5b8948b2d00ffc1fffe6b7c;p=apps%2Fhvac.git

diff --git a/app/HVAC.qml b/app/HVAC.qml
index c375f2f..1a39167 100644
--- a/app/HVAC.qml
+++ b/app/HVAC.qml
@@ -17,143 +17,154 @@
 import QtQuick 2.6
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.0
+import QtQuick.Window 2.11
 import AGL.Demo.Controls 1.0
 import Translator 1.0
-import 'api' as API
 
 ApplicationWindow {
     id: root
 
-    Translator {
-        id: translator
-//        language: 'ja_JP'
-    }
+    width: container.width * container.scale
+    height: container.height * container.scale
 
-    API.Binding {
-        id: binding
-        url: bindingAddress
-        onFanSpeedChanged: fanSpeedSlider.value = fanSpeed
-    }
+	Translator {
+		id: translator
+		language: "en_US"
+	}
 
-    ColumnLayout {
-        anchors.fill: parent
-        anchors.topMargin: width / 10
-        anchors.bottomMargin: width / 10
-        RowLayout {
-            Layout.fillHeight: true
-            Layout.alignment: Qt.AlignHCenter
-            Image {
-                source: './images/HMI_HVAC_Fan_Icon.svg'
-            }
-            Item {
-                width: root.width * 0.8
-                Slider {
-                    id: fanSpeedSlider
-                    anchors.left: parent.left
-                    anchors.right: parent.right
-                    anchors.verticalCenter: parent.verticalCenter
-                    from: 0.0
-                    to: 255.0
-                    stepSize: 1.0
-                    onValueChanged: {
-                        binding.fanSpeed = value
-                    }
-                }
-                Label {
-                    anchors.left: fanSpeedSlider.left
-                    anchors.top: fanSpeedSlider.bottom
-                    font.pixelSize: 32
-                    text: translator.translate(qsTr('FAN SPEED'), translator.language)
-                }
-            }
-        }
-        RowLayout {
-            Layout.fillHeight: true
-            Layout.fillWidth: true
-            Layout.alignment: Layout.Center
-            spacing: 20
-            ColumnLayout {
-                Layout.fillWidth: true
-                spacing: 20
-                SeatHeatButton {
-                    id: leftSeat
-                    side: 'Left'
-                }
-                HeatDegree {
-                    onCurrentItemChanged: {
-                        console.log("Left Temp changed",degree)
-                        binding.leftTemperature = degree
-                    }
-                }
-            }
-            ColumnLayout {
-                Layout.fillWidth: true
-                spacing: 20
-                ToggleButton {
-                    onImage: './images/HMI_HVAC_Active.svg'
-                    offImage: './images/HMI_HVAC_Inactive.svg'
-                    Label {
-                        anchors.centerIn: parent
-                        color: parent.checked ? '#00ADDC' : '#848286'
-                        text: translator.translate(qsTr('A/C'), translator.language)
-                        font.pixelSize: parent.height / 3
-                    }
-                    onCheckedChanged: {
-                        console.debug('A/C', checked)
-                    }
-                }
-                ToggleButton {
-                    onImage: './images/HMI_HVAC_Active.svg'
-                    offImage: './images/HMI_HVAC_Inactive.svg'
-                    Label {
-                        anchors.centerIn: parent
-                        color: parent.checked ? '#00ADDC' : '#848286'
-                        text: translator.translate(qsTr('AUTO'), translator.language)
-                        font.pixelSize: parent.height / 3
-                    }
-                    onCheckedChanged: {
-                        console.debug('AUTO', checked)
-                    }
-                }
-                ToggleButton {
-                    onImage: './images/HMI_HVAC_Circulation_Active.svg'
-                    offImage: './images/HMI_HVAC_Circulation_Inactive.svg'
-                    onCheckedChanged: {
-                        console.debug('Circulation', checked)
-                    }
-                }
-            }
+	Connections {
+		target: hvac
+		onFanSpeedChanged: fanSpeedSlider.value = fanSpeed
+		onLanguageChanged: translator.language = language
+	}
 
-            ColumnLayout {
-                Layout.fillWidth: true
-                spacing: 20
-                SeatHeatButton {
-                    id: rightSeat
-                    side: 'Right'
-                }
-                HeatDegree {
-                    onCurrentItemChanged: {
-                        console.log("Right Temp changed",degree)
-                        binding.rightTemperature = degree
-                    }
-                }
-            }
-        }
+    Item {
+        id: container
+        anchors.centerIn: parent
+        width: Screen.width
+        height: Screen.height
+        scale: 1
 
-        RowLayout {
-            Layout.fillHeight: true
-            Layout.alignment: Qt.AlignHCenter
-            spacing: root.width / 20
-            Repeater {
-                model: ['AirDown', 'AirUp', 'AirRight', 'Rear', 'Front']
-                ToggleButton {
-                    onImage: './images/HMI_HVAC_%1_Active.svg'.arg(model.modelData)
-                    offImage: './images/HMI_HVAC_%1_Inactive.svg'.arg(model.modelData)
-                    onCheckedChanged: {
-                        console.debug(model.modelData, checked)
-                    }
-                }
-            }
-        }
-    }
+	ColumnLayout {
+		anchors.fill: parent
+		anchors.topMargin: width / 10
+		anchors.bottomMargin: width / 10
+		RowLayout {
+			Layout.fillHeight: true
+			Layout.alignment: Qt.AlignHCenter
+			Image {
+				source: './images/HMI_HVAC_Fan_Icon.svg'
+			}
+			Item {
+				width: container.width * 0.8
+				Slider {
+					id: fanSpeedSlider
+					anchors.left: parent.left
+					anchors.right: parent.right
+					anchors.verticalCenter: parent.verticalCenter
+					from: 0.0
+					to: 255.0
+					stepSize: 1.0
+					onValueChanged: {
+						hvac.fanSpeed = value
+					}
+				}
+				Label {
+					anchors.left: fanSpeedSlider.left
+					anchors.top: fanSpeedSlider.bottom
+					font.pixelSize: 32
+					text: translator.translate(qsTr('FAN SPEED'), translator.language)
+				}
+			}
+		}
+		RowLayout {
+			Layout.fillHeight: true
+			Layout.fillWidth: true
+			Layout.alignment: Layout.Center
+			spacing: 20
+			ColumnLayout {
+				Layout.fillWidth: true
+				spacing: 20
+				SeatHeatButton {
+					id: leftSeat
+					side: 'Left'
+				}
+				HeatDegree {
+					onCurrentItemChanged: {
+						console.log("Left Temp changed",degree)
+						hvac.leftTemperature = degree
+					}
+				}
+			}
+			ColumnLayout {
+				Layout.fillWidth: true
+				spacing: 20
+				ToggleButton {
+					onImage: './images/HMI_HVAC_Active.svg'
+					offImage: './images/HMI_HVAC_Inactive.svg'
+					Label {
+						anchors.centerIn: parent
+						color: parent.checked ? '#00ADDC' : '#848286'
+						text: translator.translate(qsTr('A/C'), translator.language)
+						font.pixelSize: parent.height / 3
+					}
+					onCheckedChanged: {
+						console.debug('A/C', checked)
+					}
+				}
+				ToggleButton {
+					onImage: './images/HMI_HVAC_Active.svg'
+					offImage: './images/HMI_HVAC_Inactive.svg'
+					Label {
+						anchors.centerIn: parent
+						color: parent.checked ? '#00ADDC' : '#848286'
+						text: translator.translate(qsTr('AUTO'), translator.language)
+						font.pixelSize: parent.height / 3
+					}
+					onCheckedChanged: {
+						console.debug('AUTO', checked)
+					}
+				}
+				ToggleButton {
+					onImage: './images/HMI_HVAC_Circulation_Active.svg'
+					offImage: './images/HMI_HVAC_Circulation_Inactive.svg'
+					onCheckedChanged: {
+						console.debug('Circulation', checked)
+					}
+				}
+			}
+
+			ColumnLayout {
+				Layout.fillWidth: true
+				spacing: 20
+				SeatHeatButton {
+					id: rightSeat
+					side: 'Right'
+				}
+				HeatDegree {
+					onCurrentItemChanged: {
+						console.log("Right Temp changed",degree)
+						hvac.rightTemperature = degree
+					}
+				}
+			}
+		}
+
+		RowLayout {
+			Layout.fillHeight: true
+			Layout.alignment: Qt.AlignHCenter
+			spacing: root.width / 20
+			Repeater {
+				model: ['AirDown', 'AirUp', 'AirRight', 'Rear', 'Front']
+				ToggleButton {
+					onImage: './images/HMI_HVAC_%1_Active.svg'.arg(model.modelData)
+					offImage: './images/HMI_HVAC_%1_Inactive.svg'.arg(model.modelData)
+					onCheckedChanged: {
+						console.debug(model.modelData, checked)
+					}
+				}
+			}
+		}
+	}
+}
 }