Index: denali.pro.user =================================================================== diff -u -re591b135f821c1b1e13c2db8429dc63648c2452c -rec77306c5375f80f46e76940361c5e96064a0690 --- denali.pro.user (.../denali.pro.user) (revision e591b135f821c1b1e13c2db8429dc63648c2452c) +++ denali.pro.user (.../denali.pro.user) (revision ec77306c5375f80f46e76940361c5e96064a0690) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/canbus/messageinterpreter.h =================================================================== diff -u -r41eec18961c2861652405a80c9cad523c0475172 -rec77306c5375f80f46e76940361c5e96064a0690 --- sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision 41eec18961c2861652405a80c9cad523c0475172) +++ sources/canbus/messageinterpreter.h (.../messageinterpreter.h) (revision ec77306c5375f80f46e76940361c5e96064a0690) @@ -83,7 +83,7 @@ // ---- Load Cell Readings bool loadCellReadingsData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; - // ---- Load Cell Readings + // ---- canbus Fault Count bool canbusFaultCountData(const Message &vMessage, QVariantList &vData) __attribute_warn_unused_result__; // ---- Temperature Sensors Index: sources/gui/qml/pages/SettingsHome.qml =================================================================== diff -u -reece7acacf84e8cc34b830f6b5ab3f112823a905 -rec77306c5375f80f46e76940361c5e96064a0690 --- sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) +++ sources/gui/qml/pages/SettingsHome.qml (.../SettingsHome.qml) (revision ec77306c5375f80f46e76940361c5e96064a0690) @@ -221,7 +221,7 @@ } } - Column { id: _LoadCellReadingColumn + Column { id: _LoadCellReadingsColumn width : 150 spacing : 20 topPadding : 100 @@ -243,8 +243,9 @@ vLoadCellReadings.reservoir2Bkup .toFixed(2) ] Text { + objectName: "_LoadCellReadings" + index text: modelData - width: _LoadCellReadingColumn.width + width: _LoadCellReadingsColumn.width horizontalAlignment: Text.AlignRight color: Colors.textMain font.pixelSize: Fonts.fontPixelTitle @@ -282,6 +283,7 @@ vTemperatureSensors.trimmerHeaterInternal .toFixed(2) ] Text { + objectName: "_TemperatureSensors" + index text: modelData width: _TemperatureSensorsColumn.width horizontalAlignment: Text.AlignRight Index: sources/view/vtreatmentadjustmentultrafiltrationconfirm.h =================================================================== diff -u -r5734e6289c18ec3cfe4749de8e3a6043f98dbcff -rec77306c5375f80f46e76940361c5e96064a0690 --- sources/view/vtreatmentadjustmentultrafiltrationconfirm.h (.../vtreatmentadjustmentultrafiltrationconfirm.h) (revision 5734e6289c18ec3cfe4749de8e3a6043f98dbcff) +++ sources/view/vtreatmentadjustmentultrafiltrationconfirm.h (.../vtreatmentadjustmentultrafiltrationconfirm.h) (revision ec77306c5375f80f46e76940361c5e96064a0690) @@ -38,9 +38,12 @@ // Treatment Ultrafiltration data PROPERTY( float , volume , 0) + // coco begin validated: Manually validated + // Duration is not used since will be passed each second by TreatmentTime message PROPERTY( quint32 , duration , 0) + // Rate has not been decided to be used anywhere yet. PROPERTY( float , rate , 0) - + // coco end VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentUltrafiltrationConfirm, AdjustUltrafiltrationConfirmResponseData) public slots: Index: sources/view/vtreatmentultrafiltration.h =================================================================== diff -u -reece7acacf84e8cc34b830f6b5ab3f112823a905 -rec77306c5375f80f46e76940361c5e96064a0690 --- sources/view/vtreatmentultrafiltration.h (.../vtreatmentultrafiltration.h) (revision eece7acacf84e8cc34b830f6b5ab3f112823a905) +++ sources/view/vtreatmentultrafiltration.h (.../vtreatmentultrafiltration.h) (revision ec77306c5375f80f46e76940361c5e96064a0690) @@ -27,12 +27,14 @@ { Q_OBJECT + // coco begin validated : Manually validated PROPERTY( float, precision , 3) // Centralized Gui value : none model property // ~~~~~ Prescription values which we currently don't have. // TODO : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) PROPERTY( float, minimum , 0.000) PROPERTY( float, maximum , 0.600) // ~~~~~ + // coco end PROPERTY( float, ultrafiltration_RefUFVol , 0) PROPERTY( float, ultrafiltration_MeasUFVol , 0)