Index: denali.qrc
===================================================================
diff -u -r364cf0959b78d4e86c7220fb878c5246c9d7d6bd -r1899a965b63d5b98745d4434391f556cdba6615b
--- denali.qrc (.../denali.qrc) (revision 364cf0959b78d4e86c7220fb878c5246c9d7d6bd)
+++ denali.qrc (.../denali.qrc) (revision 1899a965b63d5b98745d4434391f556cdba6615b)
@@ -32,6 +32,7 @@
sources/gui/qml/dialogs/NotificationDialog.qml
sources/gui/qml/dialogs/AlarmListDialog.qml
sources/gui/qml/dialogs/DiagnosticsDialog.qml
+ sources/gui/qml/dialogs/StatusDialog.qml
resources/images/Logo d.png
@@ -69,6 +70,10 @@
resources/images/chevron-left.png
resources/images/chevron-right.png
resources/images/DenaliDevice.png
+ resources/images/BTLogoNotConnected.png
+ resources/images/BTLogoConnected.png
+ resources/images/WifiLogoConnected.png
+ resources/images/WifiLogoNotConnected.png
sources/gui/qml/components/MainMenu.qml
@@ -145,6 +150,8 @@
sources/gui/qml/KeyboardItem.qml
sources/gui/qml/SDCProgressItem.qml
sources/gui/qml/USBProgressItem.qml
+ sources/gui/qml/BluetoothStatusIndicator.qml
+ sources/gui/qml/WifiStatusIndicator.qml
sources/gui/qml/plugins/virtualkeyboard/styles/denali/images/backspace.svg
Index: sources/bluetooth/BluetoothInterface.cpp
===================================================================
diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -r1899a965b63d5b98745d4434391f556cdba6615b
--- sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision a7c580f0998ee781c47314384f677249cea4c4b4)
+++ sources/bluetooth/BluetoothInterface.cpp (.../BluetoothInterface.cpp) (revision 1899a965b63d5b98745d4434391f556cdba6615b)
@@ -1233,9 +1233,20 @@
*/
void BluetoothInterface::interpretInformation()
{
+ QString vendorName;
+ QString modelNumberString;
for ( auto const &detail: _serviceDeviceInformation->characteristics()) {
+ switch(detail.uuid().toUInt32())
+ {
+ case QBluetoothUuid::ManufacturerNameString : vendorName = detail.value(); break;
+ case QBluetoothUuid::ModelNumberString : modelNumberString = detail.value(); break;
+ default:
+ break;
+ }
+
qDebug() << " ~~~~~ " << detail.name() << detail.uuid() << detail.value();
}
+ emit didDeviceInfoUpdated(vendorName, modelNumberString);
}
/*!
Index: sources/bluetooth/BluetoothInterface.h
===================================================================
diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -r1899a965b63d5b98745d4434391f556cdba6615b
--- sources/bluetooth/BluetoothInterface.h (.../BluetoothInterface.h) (revision a7c580f0998ee781c47314384f677249cea4c4b4)
+++ sources/bluetooth/BluetoothInterface.h (.../BluetoothInterface.h) (revision 1899a965b63d5b98745d4434391f556cdba6615b)
@@ -174,6 +174,7 @@
void didActionReceive (const UIBloodPressureData &vData);
void didDeviceChange (const BluetoothDeviceData &vDevice);
void didDeviceSelect (const BluetoothDeviceData &vDevice);
+ void didDeviceInfoUpdated (const QString &vVendorName, const QString &vModelName);
SAFE_CALL(doStart) // start the bluetooth adapter.
SAFE_CALL(doScan ) // scan for devices.
Index: sources/gui/qml/globals/Fonts.qml
===================================================================
diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -r1899a965b63d5b98745d4434391f556cdba6615b
--- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision a7c580f0998ee781c47314384f677249cea4c4b4)
+++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 1899a965b63d5b98745d4434391f556cdba6615b)
@@ -88,6 +88,7 @@
readonly property int fontPixelDebugTitle : 25
readonly property int fontPixelDebugText : 28
readonly property int fontPixelDebugLabel : 15
+ readonly property int fontPixelStatusDialogText : 15
readonly property string fontFamilyFixed : "Noto Sans CJK SC"
}
Index: sources/gui/qml/main.qml
===================================================================
diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -r1899a965b63d5b98745d4434391f556cdba6615b
--- sources/gui/qml/main.qml (.../main.qml) (revision a7c580f0998ee781c47314384f677249cea4c4b4)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 1899a965b63d5b98745d4434391f556cdba6615b)
@@ -297,21 +297,6 @@
font.pixelSize: 14
}
- Text { // TEST : Wireless IP
- color : Colors.textMain
- anchors {
- top : parent.top
- left : parent.left
- leftMargin : 325
- }
- horizontalAlignment : Text.Alignleft
- verticalAlignment : Text.AlignBottom
-
- height : 15
- text : "W:" + vNetwork.wirelessIP
- font.pixelSize: 15
- }
-
Text { // TEST : Ethernet IP
color : Colors.textMain
anchors {
@@ -327,21 +312,6 @@
font.pixelSize: 15
}
- Text { // TEST : BluetoothStatus
- color : Colors.textMain
- anchors {
- top : parent.top
- left : parent.left
- leftMargin : 615
- }
- horizontalAlignment : Text.Alignleft
- verticalAlignment : Text.AlignBottom
-
- height : 15
- text : "B:" + vBluetooth.pairedAddr
- font.pixelSize: 14
- }
-
Text { // TEST : The treatment vital dialog countdown time
color : Colors.textMain
anchors {
@@ -361,8 +331,10 @@
color : Colors.textMain
anchors {
top : parent.top
- left : parent.left
- leftMargin : 1080
+ topMargin : 10
+
+ right : parent.right
+ rightMargin : 75
}
horizontalAlignment : Text.Alignleft
verticalAlignment : Text.AlignBottom
@@ -376,8 +348,10 @@
color : Colors.textMain
anchors {
top : parent.top
- left : parent.left
- leftMargin : 1220
+ topMargin : 10
+
+ right : parent.right
+ rightMargin : 25
}
horizontalAlignment : Text.Alignleft
verticalAlignment : Text.AlignBottom
@@ -387,8 +361,32 @@
font.pixelSize: 14
}
+ WifiStatusIndicator { id: _wifiStatusIndicator
+ anchors {
+ top : parent.top
+ topMargin : 5
+
+ right : _bluetoothStatusIndicator.right
+ rightMargin : 50
+ }
+ }
+ BluetoothStatusIndicator { id: _bluetoothStatusIndicator
+ anchors {
+ top : parent.top
+ right : parent.right
+ topMargin : 5
+ rightMargin : 300
+ }
+ }
+
SDCProgressItem { id: _sdcProgressItem
// TODO: disable this later. this is only for diagnostic purpose.
+ anchors {
+ top : parent.top
+ right : parent.right
+ topMargin : 5
+ rightMargin : 250
+ }
onDoubleClicked : {
if ( _GuiView.dryDemoMode ) {
let dryDemoTempID = 99
Index: sources/view/settings/VBluetooth.cpp
===================================================================
diff -u -ra7c580f0998ee781c47314384f677249cea4c4b4 -r1899a965b63d5b98745d4434391f556cdba6615b
--- sources/view/settings/VBluetooth.cpp (.../VBluetooth.cpp) (revision a7c580f0998ee781c47314384f677249cea4c4b4)
+++ sources/view/settings/VBluetooth.cpp (.../VBluetooth.cpp) (revision 1899a965b63d5b98745d4434391f556cdba6615b)
@@ -38,8 +38,11 @@
this , SLOT( onStateChange (BluetoothData )));
connect(&_BluetoothInterface, SIGNAL(didDeviceChange(BluetoothDeviceData)),
this , SLOT( onDeviceChange(BluetoothDeviceData)));
+ connect(&_BluetoothInterface, SIGNAL(didDeviceInfoUpdated(QString, QString )),
+ this , SLOT( onDeviceInfoUpdated(QString, QString )));
connect(this , SIGNAL(didDeviceSelect(QString, QString )),
this , SLOT( onDeviceSelect(QString, QString )));
+
}
/*!
@@ -142,6 +145,7 @@
case MBluetooth::eIS_Device_Waiting : // Selected device connected and is in waiting mode for read.
pairedAddr(vData.deviceAddr);
pairedBatt(vData.deviceBatt);
+ pairedName(vData.deviceName);
scanEnabled(true);
break;
@@ -317,6 +321,18 @@
}
/*!
+ * \brief View::VBluetooth::onDeviceInfoUpdated
+ * \details Sets the vendor name and model name properties
+ * \param vVendorName - the vendor name associated with the remote device
+ * \param vModelName - the model string of the remote device
+ */
+void View::VBluetooth::onDeviceInfoUpdated(const QString &vVendorName, const QString &vModelName)
+{
+ pairedVendorName(vVendorName);
+ pairedModelName (vModelName );
+}
+
+/*!
* \brief View::VBluetooth::doScan
* \details calls the Bluetooth Interface scan to start discovering the Bluetooth devices.
*/