Index: denali.qrc
===================================================================
diff -u -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 -r174d5078531f9dfbe9cdc45274b852984bb72647
--- denali.qrc (.../denali.qrc) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387)
+++ denali.qrc (.../denali.qrc) (revision 174d5078531f9dfbe9cdc45274b852984bb72647)
@@ -6,6 +6,8 @@
sources/gui/qml/pages/SettingsStack.qml
sources/gui/qml/pages/SettingsHome.qml
sources/gui/qml/pages/ManagerHome.qml
+ sources/gui/qml/pages/TreatmentCreate.qml
+ sources/gui/qml/pages/TreatmentStart.qml
sources/gui/qml/dialogs/PowerOff.qml
@@ -25,6 +27,7 @@
sources/gui/qml/components/ScreenItem.qml
sources/gui/qml/components/StackItem.qml
sources/gui/qml/components/ModalDialog.qml
+ sources/gui/qml/components/BackButton.qml
qtquickcontrols2.conf
Index: scripts/run.sh
===================================================================
diff -u -r3b9a656e9672a3db74f14b476bf1df249f016805 -r174d5078531f9dfbe9cdc45274b852984bb72647
--- scripts/run.sh (.../run.sh) (revision 3b9a656e9672a3db74f14b476bf1df249f016805)
+++ scripts/run.sh (.../run.sh) (revision 174d5078531f9dfbe9cdc45274b852984bb72647)
@@ -1,3 +1,32 @@
+#!/bin/sh
+
+HOME=/home/root
+SDCARD_DEV=/dev/mmcblk1p1
+SDCARD_MNT=/media/sd-card/
+LOG_PATH=$SDCARD_MNT
+
+#setting up can interface
ip link set can0 up type can bitrate 250000
-/home/root/denali &
+if [ $? -eq 0 ]; then
+ echo ":: Can interface setup"
+fi
+#mounting sdcard
+mount $SDCARD_DEV $SDCARD_MNT
+if [ $? -eq 0 ]; then
+ echo ":: SD-Card found and mounted on $SDCARD_MNT"
+else
+ #setting the can log location
+ LOG_PATH=$HOME
+fi
+echo ":: Log location set to $LOG_PATH"
+
+#launching candump and setting the can log locations
+candump can0 1>$LOG_PATH/canmsg.log 2>$LOG_PATH/canmsg.err &
+if [ $? -eq 0 ]; then
+ echo ":: candump launched"
+fi
+
+#launching denali application
+$HOME/denali &
+
Index: scripts/setupSD.sh
===================================================================
diff -u -r3b9a656e9672a3db74f14b476bf1df249f016805 -r174d5078531f9dfbe9cdc45274b852984bb72647
--- scripts/setupSD.sh (.../setupSD.sh) (revision 3b9a656e9672a3db74f14b476bf1df249f016805)
+++ scripts/setupSD.sh (.../setupSD.sh) (revision 174d5078531f9dfbe9cdc45274b852984bb72647)
@@ -1,18 +1,25 @@
#!/bin/sh
IP=$1
-if [ "$1" = "" ]; then
- echo "Usage : $0 "
+if [ "$1" = "" ]; then
+ echo "Usage : $0 "
exit 1
fi
-scp ./run.sh root@$1://home/root/run.sh
-scp ../denali root@$1://home/root/denali
+DENALI=$2
+if [ "$2" = "" ]; then
+ echo "Usage : $0 "
+ DENALI=~/Project/tmp/build/denali-Qt_5_12_5_iMX8-Release/denali
+ #exit 2
+fi
-ssh root@$1 'appcontroller --make-default /home/root/run.sh'
+scp ./run.sh root@$IP://home/root/run.sh
+scp $DENALI root@$IP://home/root/denali
-ssh root@$1 'mkdir /etc/init.d'
-scp autostart root@$1://etc/init.d/autostart
-ssh root@$1 'update-rc.d autostart defaults'
+ssh root@$IP 'appcontroller --make-default /home/root/run.sh'
-ssh root@$1 'reboot'
+ssh root@$IP 'mkdir /etc/init.d'
+scp autostart root@$IP://etc/init.d/autostart
+ssh root@$IP '/usr/sbin/update-rc.d autostart defaults'
+
+ssh root@$IP '/sbin/reboot'
Index: sources/gui/qml/components/BackButton.qml
===================================================================
diff -u
--- sources/gui/qml/components/BackButton.qml (revision 0)
+++ sources/gui/qml/components/BackButton.qml (revision 174d5078531f9dfbe9cdc45274b852984bb72647)
@@ -0,0 +1,37 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright \n
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n
+ * IN PART OR IN WHOLE, \n
+ * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n
+ *
+ * \file BackButton.aml
+ * \date 2019/11/18
+ * \author Behrouz NematiPour
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+
+// Project
+// Qml imports
+import "qrc:/globals"
+
+/*!
+ * \brief Denali project Back Button
+ */
+TouchRect { id : backRect
+ signal pressed()
+
+ width : 115
+ height: 45
+ x : 25
+ y : 25
+ text.text: qsTr("Back")
+ button.onClicked: {
+ pressed()
+ }
+}
Index: sources/gui/qml/components/ScreenItem.qml
===================================================================
diff -u -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 -r174d5078531f9dfbe9cdc45274b852984bb72647
--- sources/gui/qml/components/ScreenItem.qml (.../ScreenItem.qml) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387)
+++ sources/gui/qml/components/ScreenItem.qml (.../ScreenItem.qml) (revision 174d5078531f9dfbe9cdc45274b852984bb72647)
@@ -24,9 +24,12 @@
* \brief Parent item for all the Screens
*/
Item { id: _root
- width : Variables.applicationWidth
- height: Variables.applicationHeight
+ property alias backgroundRect: _backgroundRect
+ visible: false
+ width : Variables.applicationWidth
+ height : Variables.applicationHeight
+
Rectangle { id: _backgroundRect
anchors.fill: parent
color: Colors.backgroundMain
Index: sources/gui/qml/components/StackItem.qml
===================================================================
diff -u -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 -r174d5078531f9dfbe9cdc45274b852984bb72647
--- sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387)
+++ sources/gui/qml/components/StackItem.qml (.../StackItem.qml) (revision 174d5078531f9dfbe9cdc45274b852984bb72647)
@@ -29,6 +29,13 @@
width : Variables.applicationWidth
height: Variables.applicationHeight
+ function pop () {
+ _stackView.pop()
+ }
+ function push (vScreen) {
+ _stackView.push(vScreen)
+ }
+
StackView { id : _stackView
initialItem : null
anchors.fill: parent
Index: sources/gui/qml/components/TouchRect.qml
===================================================================
diff -u -r5194f3afffb28dac90a7ca4153b6a0ca2f239387 -r174d5078531f9dfbe9cdc45274b852984bb72647
--- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 5194f3afffb28dac90a7ca4153b6a0ca2f239387)
+++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 174d5078531f9dfbe9cdc45274b852984bb72647)
@@ -31,7 +31,7 @@
width : Variables.touchRectWidth
height : Variables.touchRectHeight
radius : Variables.touchRectRadius
- color: "Transparent"
+ color : "Transparent"
border {
color: Colors.borderButton
width: Variables.borderWidth
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d -r174d5078531f9dfbe9cdc45274b852984bb72647
--- sources/gui/qml/main.qml (.../main.qml) (revision 9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 174d5078531f9dfbe9cdc45274b852984bb72647)
@@ -53,7 +53,6 @@
}
}
-
// ----- Follow the below Z order -----
// 1 - Screens
// 1 - 1
@@ -69,6 +68,9 @@
// 3 - Footer
MainMenu { id: _mainMenu
titles: [ qsTr("Treatment") , qsTr("Manager") , qsTr("Settings") ]
+ Component.onCompleted: {
+ _treatmentStack.visible = true
+ }
onItemPressed: {
_treatmentStack .visible = vIndex == 0;
_mansagerStack .visible = vIndex == 1;
Index: sources/gui/qml/pages/TreatmentCreate.qml
===================================================================
diff -u
--- sources/gui/qml/pages/TreatmentCreate.qml (revision 0)
+++ sources/gui/qml/pages/TreatmentCreate.qml (revision 174d5078531f9dfbe9cdc45274b852984bb72647)
@@ -0,0 +1,42 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright \n
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n
+ * IN PART OR IN WHOLE, \n
+ * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n
+ *
+ * \file ManagerHome.qml
+ * \date 2019/10/21
+ * \author Behrouz NematiPour
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+
+// Project
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+
+/*!
+ * \brief ManagerHome is the screen
+ * which is the default screen in the "Manager" stack
+ */
+ScreenItem { id: _root
+ signal backPressed()
+ BackButton { id : _backButton
+ onPressed: backPressed()
+ }
+
+ Column {
+ spacing: Variables.columnSpacing
+ anchors.centerIn: parent
+ TitleText { id: _titleText
+ width: parent.width
+ text: qsTr("Create Treatment Placeholder")
+ }
+ }
+}
Index: sources/gui/qml/pages/TreatmentHome.qml
===================================================================
diff -u -r9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d -r174d5078531f9dfbe9cdc45274b852984bb72647
--- sources/gui/qml/pages/TreatmentHome.qml (.../TreatmentHome.qml) (revision 9a3ee027dbc33f39ee7df2a9dc5a7897c6b1854d)
+++ sources/gui/qml/pages/TreatmentHome.qml (.../TreatmentHome.qml) (revision 174d5078531f9dfbe9cdc45274b852984bb72647)
@@ -33,7 +33,7 @@
property alias createTreatmentButton: _createTreatmentRect.button
// exported properties
- property int favoriteCount: 0
+ //
TouchRect { id : _poweroff
width: 150
@@ -50,6 +50,17 @@
}
}
+ TreatmentStart { id : _treatmentStart
+ onBackPressed: {
+ _treatmentStack.pop()
+ }
+ }
+ TreatmentCreate { id : _treatmentCreate
+ onBackPressed: {
+ _treatmentStack.pop()
+ }
+ }
+
// Definitions
Column {
spacing: Variables.columnSpacing
@@ -59,10 +70,16 @@
text: qsTr("Good Morning")
}
TouchRect { id : _startTreatmentRect
- text.text: qsTr("FAVORITE TREATMENT (%1)").arg(favoriteCount)
+ text.text: qsTr("START TREATMENT")
+ button.onClicked: {
+ _treatmentStack.push(_treatmentStart)
+ }
}
TouchRect { id : _createTreatmentRect
- text.text: qsTr("CUSTOM TREATMENT")
+ text.text: qsTr("CREATE TREATMENT")
+ button.onClicked: {
+ _treatmentStack.push(_treatmentCreate)
+ }
}
}
}
Index: sources/gui/qml/pages/TreatmentStart.qml
===================================================================
diff -u
--- sources/gui/qml/pages/TreatmentStart.qml (revision 0)
+++ sources/gui/qml/pages/TreatmentStart.qml (revision 174d5078531f9dfbe9cdc45274b852984bb72647)
@@ -0,0 +1,42 @@
+/*!
+ *
+ * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+ * \copyright \n
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, \n
+ * IN PART OR IN WHOLE, \n
+ * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n
+ *
+ * \file ManagerHome.qml
+ * \date 2019/10/21
+ * \author Behrouz NematiPour
+ *
+ */
+
+// Qt
+import QtQuick 2.12
+import QtQuick.Controls 2.12
+
+// Project
+// Qml imports
+import "qrc:/globals"
+import "qrc:/components"
+
+/*!
+ * \brief ManagerHome is the screen
+ * which is the default screen in the "Manager" stack
+ */
+ScreenItem { id: _root
+ signal backPressed()
+ BackButton { id : _backButton
+ onPressed: backPressed()
+ }
+
+ Column {
+ spacing: Variables.columnSpacing
+ anchors.centerIn: parent
+ TitleText { id: _titleText
+ width: parent.width
+ text: qsTr("Start Treatment Placeholder")
+ }
+ }
+}