Index: sources/device/DeviceController.cpp =================================================================== diff -u -r124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4 -r74134f8b53c3b71dc91c67ed723db8c29d4d4e69 --- sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision 124c2e38e72a1a655d9d479c9c7a1cd8c5d5e6c4) +++ sources/device/DeviceController.cpp (.../DeviceController.cpp) (revision 74134f8b53c3b71dc91c67ed723db8c29d4d4e69) @@ -7,7 +7,7 @@ * * \file DeviceController.cpp * \author (last) Behrouz NematiPour - * \date (last) 31-Jan-2025 + * \date (last) 10-Feb-2025 * \author (original) Behrouz NematiPour * \date (original) 03-Jun-2021 * @@ -1038,8 +1038,9 @@ QFileInfo fileInfo(vFileName); QString filePath; QString fileBase(fileInfo.baseName()); - QString ext = _Logger.logFileNamePendingSubExt(); - QString fileSufx(fileInfo.completeSuffix().remove(ext)); + QString pendingExt = _Logger.logFileNamePendingSubExt(); + QString uploadExt = _Logger.logFileNameUploadedSubExt(); + QString fileSufx(fileInfo.completeSuffix().replace(pendingExt, uploadExt)); QString fileDest = QString("%1.%2").arg(fileBase, fileSufx); Logger::LogType logType = _Logger.logFileLogType(vFileName, filePath); Index: sources/gui/qml/compounds/BPHREntry.qml =================================================================== diff -u -r6e9dccd1109d9c8d4ee4b6a21260618969a1706b -r74134f8b53c3b71dc91c67ed723db8c29d4d4e69 --- sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 6e9dccd1109d9c8d4ee4b6a21260618969a1706b) +++ sources/gui/qml/compounds/BPHREntry.qml (.../BPHREntry.qml) (revision 74134f8b53c3b71dc91c67ed723db8c29d4d4e69) @@ -67,7 +67,6 @@ QtObject { id: _private property bool isBloodPressureCompareValid : (parseInt(_bloodPressureDiastolic.text) <= parseInt(_bloodPressureSystolic.text)) } - anchors.horizontalCenter: parent.horizontalCenter y : Qt.inputMethod.visible && _keyboard.visible ? _root.topMarginContent : ( ( _root.contentRectHeight - _container.height ) / 2 ) Behavior on y { NumberAnimation { duration: Variables.keybardAnimationDuration } } @@ -79,7 +78,7 @@ leftPadding : _root.titleIndent Row { spacing : 10 TextEntry { id : _bloodPressureSystolic - text : Variables.notSetVariable(vTreatmentVitals.systolic, 0) + text : _GuiView.dryDemoMode ? "140" : Variables.notSetVariable(vTreatmentVitals.systolic, 0) label.text : qsTr("Blood Pressure") label.width : _root.labelWidth validator : IntValidator { bottom: vTreatmentVitals.systolicMin; top : vTreatmentVitals.systolicMax } @@ -92,7 +91,7 @@ width : 10 } TextEntry { id : _bloodPressureDiastolic - text : Variables.notSetVariable(vTreatmentVitals.diastolic, 0) + text : _GuiView.dryDemoMode ? "90" : Variables.notSetVariable(vTreatmentVitals.diastolic, 0) label.width : 0 validator : IntValidator { bottom: vTreatmentVitals.diastolicMin; top : vTreatmentVitals.diastolicMax } onClicked : _root.clicked() @@ -106,7 +105,7 @@ } Row { spacing : 10 TextEntry { id : _heartRate - text : Variables.notSetVariable(vTreatmentVitals.heartRate, 0) + text : _GuiView.dryDemoMode ? "80" : Variables.notSetVariable(vTreatmentVitals.heartRate, 0) label.text : qsTr("Heart Rate") label.width : _root.labelWidth onClicked : _root.clicked() Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r51625aec73fca715ee12c3b82c6ea7e824851a64 -r74134f8b53c3b71dc91c67ed723db8c29d4d4e69 --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 51625aec73fca715ee12c3b82c6ea7e824851a64) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 74134f8b53c3b71dc91c67ed723db8c29d4d4e69) @@ -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/globals/Variables.qml =================================================================== diff -u -r95ae95f5ed982c3d6a3299c87df7ecb0dca703d1 -r74134f8b53c3b71dc91c67ed723db8c29d4d4e69 --- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 95ae95f5ed982c3d6a3299c87df7ecb0dca703d1) +++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 74134f8b53c3b71dc91c67ed723db8c29d4d4e69) @@ -6,8 +6,8 @@ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file Variables.qml - * \author (last) Behrouz NematiPour - * \date (last) 18-Sep-2023 + * \author (last) Dara Navaei + * \date (last) 09-Jun-2025 * \author (original) Behrouz NematiPour * \date (original) 09-Oct-2019 * Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml =================================================================== diff -u -r6e9dccd1109d9c8d4ee4b6a21260618969a1706b -r74134f8b53c3b71dc91c67ed723db8c29d4d4e69 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 6e9dccd1109d9c8d4ee4b6a21260618969a1706b) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentConnectionStack.qml (.../PreTreatmentConnectionStack.qml) (revision 74134f8b53c3b71dc91c67ed723db8c29d4d4e69) @@ -132,6 +132,11 @@ instructionBased : true } + Connections { target: vConfirm + function onIsUltrafiltChanged ( vValue ) { page( _preTreatmentUltrafiltration , vValue )} + function onIsConnectionChanged ( vValue ) { page( _preTreatmentPatientConnection , vValue )} + } + Connections { target: vPreTreatmentStates function onPatientConnectionChanged ( vValue ) { page( _preTreatmentVitals , vValue )} } Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml =================================================================== diff -u -r6e9dccd1109d9c8d4ee4b6a21260618969a1706b -r74134f8b53c3b71dc91c67ed723db8c29d4d4e69 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 6e9dccd1109d9c8d4ee4b6a21260618969a1706b) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 74134f8b53c3b71dc91c67ed723db8c29d4d4e69) @@ -29,9 +29,16 @@ PreTreatmentBase { id: _root objectName: "_PreTreatmentUltrafiltration" - property alias ufVolume : _volumeSlider.value + property alias ufVolume : _volumeSlider.value header.confirmEnabled: _volumeSlider.isActive + onVisibleChanged: { + /* + It is only for the dry-demo due to its independent flow. + Otherwise, won't needed in the normal designed user-flow. + */ + clear() + } function reset( vValue ) { if ( ! handleMinimum( vValue ) ) // if not handled go next @@ -95,7 +102,8 @@ top: parent.top topMargin: 425 } - isActive: false + // The UF is active by default if the dryDemoMode + isActive: _GuiView.dryDemoMode width : Variables.ultrafiltrationProgressbarWidth step : 0.100 stepSnap: true @@ -136,5 +144,4 @@ _volumeSlider.isActive = true } } - } Index: sources/view/confirm/VConfirm.cpp =================================================================== diff -u -r364084de84fda5151cc65fbcb7e94eff6542bd11 -r74134f8b53c3b71dc91c67ed723db8c29d4d4e69 --- sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision 364084de84fda5151cc65fbcb7e94eff6542bd11) +++ sources/view/confirm/VConfirm.cpp (.../VConfirm.cpp) (revision 74134f8b53c3b71dc91c67ed723db8c29d4d4e69) @@ -7,7 +7,7 @@ * * \file VConfirm.cpp * \author (last) Dara Navaei - * \date (last) 03-Apr-2025 + * \date (last) 18-Mar-2025 * \author (original) Behrouz NematiPour * \date (original) 30-Sep-2022 * Index: sources/view/confirm/VConfirm.h =================================================================== diff -u -r364084de84fda5151cc65fbcb7e94eff6542bd11 -r74134f8b53c3b71dc91c67ed723db8c29d4d4e69 --- sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision 364084de84fda5151cc65fbcb7e94eff6542bd11) +++ sources/view/confirm/VConfirm.h (.../VConfirm.h) (revision 74134f8b53c3b71dc91c67ed723db8c29d4d4e69) @@ -7,7 +7,7 @@ * * \file VConfirm.h * \author (last) Dara Navaei - * \date (last) 03-Apr-2025 + * \date (last) 18-Mar-2025 * \author (original) Behrouz NematiPour * \date (original) 30-Sep-2022 * Index: sources/wifi/WifiInterface.cpp =================================================================== diff -u -r6e9dccd1109d9c8d4ee4b6a21260618969a1706b -r74134f8b53c3b71dc91c67ed723db8c29d4d4e69 --- sources/wifi/WifiInterface.cpp (.../WifiInterface.cpp) (revision 6e9dccd1109d9c8d4ee4b6a21260618969a1706b) +++ sources/wifi/WifiInterface.cpp (.../WifiInterface.cpp) (revision 74134f8b53c3b71dc91c67ed723db8c29d4d4e69) @@ -256,7 +256,23 @@ LOG_DEBUG(QString("stderr: %1").arg(err)); _scanRunning = false; emit didScanStatusChanged(_scanRunning); - parseWifiScan(out); + QList networks = parseWifiScan(out); + + // A non-empty macAddress indicates UI is connected to a network + // if the network security type list is empty, this indicates that the connection + // was a result of a start-up reconnection. Traverse through discovered networks + // and update the security type list and signal strength info + if(!_network.macAddress().isEmpty() && _network.securityTypes().isEmpty()) { + foreach(WifiNetworkData network, networks){ + if(network.macAddress() == _network.macAddress()){ + // update the security and signal info + _network.securityTypes(network.securityTypes()); + _network.signalLevel(network.signalLevel()); + emit didConnectToNetwork(_network); + } + } + } + LOG_DEBUG("WiFi Scan Finished"); }