Index: denali.pro.user =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- denali.pro.user (.../denali.pro.user) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ denali.pro.user (.../denali.pro.user) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/canbus/messagedispatcher.cpp =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/canbus/messagedispatcher.cpp (.../messagedispatcher.cpp) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -23,7 +23,7 @@ #include "frameinterface.h" #include "messageacknowmodel.h" -#define DEBUG_ACKBACK_HD_TO_UI +//#define DEBUG_ACKBACK_HD_TO_UI //#define DEBUG_OUT_OF_SYNC using namespace Can; @@ -95,7 +95,6 @@ connect(&_FrameInterface , SIGNAL(didFrameReceive (Can_Id , const QByteArray &)), this , SLOT( onFrameReceive (Can_Id , const QByteArray &))); - // From Message Acknow Model timer timeout. connect(&_MessageAcknowModel , SIGNAL(didFramesTransmit(Can_Id, Sequence, const FrameList &)), this , SLOT( onFramesTransmit(Can_Id, Sequence, const FrameList &))); Index: sources/gui/qml/components/ModalDialog.qml =================================================================== diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) +++ sources/gui/qml/components/ModalDialog.qml (.../ModalDialog.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -26,9 +26,7 @@ Dialog { id : _root property bool autoHide : false property int autoHideDuration : 1000 - property string notificationText : "" - // TEST : Debug Code property alias notification: _notification width : Variables.dialogWidth @@ -72,6 +70,6 @@ } NotificationBar { id: _notification - text: _root.notificationText + text: "" //_root.notificationText } } Index: sources/gui/qml/components/ProgressBarEx.qml =================================================================== diff -u -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e) +++ sources/gui/qml/components/ProgressBarEx.qml (.../ProgressBarEx.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -25,15 +25,15 @@ ProgressBar { id: _root signal extraClicked() - property alias valueEx : _progressRectEx.value + property alias valueEx : _progressRectEx.value // for convenience + property alias progressEx : _progressRectEx minimum : 0 maximum : 0 minText.visible : true maxText.visible : true - ProgressRect { id: _progressRectEx z : 0 // ProgressBarEx z order in the gui // to be ordred among the components of the parent (ProgressBar) Index: sources/gui/qml/components/TouchArea.qml =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/gui/qml/components/TouchArea.qml (.../TouchArea.qml) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/gui/qml/components/TouchArea.qml (.../TouchArea.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -31,10 +31,8 @@ property int titleLetterSpacing : 3 property bool isTouchable : true - property string notificationText : "" - property string notificationImageSource : "" + property alias notification : _notification - signal clicked() color: "transparent" @@ -81,12 +79,12 @@ imageAutoSize: true color: "transparent" anchors { - bottom: parent.bottom - left: parent.left - right: parent.right + bottom : parent.bottom + left : parent.left + right : parent.right } - imageSource : notificationImageSource - text : notificationText + imageSource : "" + text : "" textColor : "gray" textfontSize: 16 rowAnchors.centerIn: null Index: sources/gui/qml/globals/Fonts.qml =================================================================== diff -u -r670f257c9b88d3e5506eccaad111bec914102a72 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) +++ sources/gui/qml/globals/Fonts.qml (.../Fonts.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -61,6 +61,7 @@ readonly property int fontPixelUltrafiltrationAdjustmentNextButton : 26 readonly property int fontPixelUltrafiltrationAdjustmentConfirmButton : 26 readonly property int fontPixelUltrafiltrationAdjustmentConfirmTitle : 40 + readonly property int fontPixelUltrafiltrationAdjustmentEditValue : 46 } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -r7045fd6002bdeb28e23a7af6a708a852d522ad12 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision 7045fd6002bdeb28e23a7af6a708a852d522ad12) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -38,7 +38,7 @@ signal backClicked() onVisibleChanged: { - notificationText = ""; + notification.text = ""; } header: Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -44,7 +44,7 @@ accept() } else { _durationSlider .value = vTreatmentAdjustmentDuration.duration; - notificationText = vTreatmentAdjustmentDuration.text(); + notification.text = vTreatmentAdjustmentDuration.text(); } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -71,7 +71,7 @@ accept() } else { resetFlows() - notificationText = vTreatmentAdjustmentFlows.text(); + notification.text = vTreatmentAdjustmentFlows.text(); } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -49,19 +49,15 @@ } minimum : 0 maximum : 8000 - // TEST : it has to be bound to MeasUFVol to get the actual values from pumps - // but since we have none in testing code bound to the refUFVal which - // is the calculated/expected volume. - //// value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); - value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol.toFixed(2); + progressEx.maxText.visible: false + value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); valueEx : _adjustmentSlider.value } Slider { id: _adjustmentSlider // TODO : These two values shall get from a model - // TEST : These two values shall get from a model - property int minGapValue: 500 - property int maxGapValue: 500 + property int minGapValue: 0 // No gap for now. + property int maxGapValue: 0 // No gap for now. readonly property int minGapWidth: (minGapValue * _rangeProgressBar.width) / (_rangeProgressBar.maximum - _rangeProgressBar.minimum) readonly property int maxGapWidth: (maxGapValue * _rangeProgressBar.width) / (_rangeProgressBar.maximum - _rangeProgressBar.minimum) @@ -80,6 +76,20 @@ maximum : _rangeProgressBar.maximum - minGapValue } + Text { id: _textMaximum + visible : true + color : "white" + text : _adjustmentSlider.value + font { + pixelSize : Fonts.fontPixelUltrafiltrationAdjustmentEditValue + } + anchors { + horizontalCenter: parent.horizontalCenter + top : parent.top + topMargin : 150 + } + } + TouchRect { id: _nextButton width : 530 height : 95 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -46,12 +46,10 @@ horizontalCenter: parent.horizontalCenter } minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min.toFixed(2) - maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max.toFixed(2) - // TEST : it has to be bound to MeasUFVol to get the actual values from pumps - // but since we have none in testing code bound to the refUFVal which - // is the calculated/expected volume. - //// value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); - value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol.toFixed(2); + //maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max.toFixed(2) + // TODO : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) + maximum : vTreatmentAdjustmentDuration.adjustment ? vTreatmentAdjustmentDuration.ultrafiltration * 1000 : 600 // a constant Volume value for 1h treatment + value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); valueEx : 0 } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -ra549f50e0e5c26b3f2e75e4fdbded704fe21023e -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision a549f50e0e5c26b3f2e75e4fdbded704fe21023e) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -40,12 +40,10 @@ horizontalCenter: parent.horizontalCenter } minimum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Min.toFixed(2) - maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max.toFixed(2) - // TEST : it has to be bound to MeasUFVol to get the actual values from pumps - // but since we have none in testing code bound to the refUFVal which - // is the calculated/expected volume. - //// value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); - value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol.toFixed(2); + //maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max.toFixed(2) + // TODO : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) + maximum : vTreatmentAdjustmentDuration.adjustment ? vTreatmentAdjustmentDuration.ultrafiltration * 1000 : 600 // a constant Volume value for 1h treatment + value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); valueEx : 0 } Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -25,25 +25,18 @@ * \brief Treatment Screen Ultrafiltration section */ TouchArea { id: _root - clip: false - x : 0 - y : 0 + clip : false + + x : 0 + y : 0 width : 200 height : 200 + isTouchable : true title : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(mL)") - notificationImageSource: "qrc:/images/iPauseGray" - - Connections { target: vTreatmentUltrafiltrationState - onIsPausedChanged : { - if ( vTreatmentUltrafiltrationState.isPaused ) { - notificationText = qsTr("Ultrafiltration Paused") - _progressbarex.marker.color = "dimgray" - } else { - notificationText = "" - _progressbarex.marker.color = Colors.rangeMarker - } - } + notification { + imageSource: "qrc:/images/iPauseGray" + text : vTreatmentUltrafiltrationState.isPaused ? qsTr("Ultrafiltration Paused") : "" } Connections { target: vTreatmentAdjustmentDuration @@ -64,12 +57,9 @@ onProgressClicked : _root.clicked() onExtraClicked : _root.clicked() - // TEST : it has to be bound to MeasUFVol to get the actual values from pumps - // but since we have none in testing code bound to the refUFVal which - // is the calculated/expected volume. - //// value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); - value : vTreatmentUltrafiltration.ultrafiltration_RefUFVol.toFixed(2); - // TEST : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) - maximum : 600 // a constant Volume value for 1h treatment + value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol.toFixed(2); + // TODO : min/max should come from pre-treatment prescription parameters which we don't have now (2020/05/12) + maximum : vTreatmentAdjustmentDuration.adjustment ? vTreatmentAdjustmentDuration.ultrafiltration * 1000 : 600 // a constant Volume value for 1h treatment + marker.color :vTreatmentUltrafiltrationState.isPaused ? "dimgray" : Colors.rangeMarker } } Index: sources/model/mmodel.h =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/model/mmodel.h (.../mmodel.h) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/model/mmodel.h (.../mmodel.h) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -108,7 +108,7 @@ class MAdjustUltrafiltrationReq { public: - quint32 volume = 0; + float volume = 0; }; //--------------------------------------------------------------------------------// Index: sources/view/vtreatmentadjustmentultrafiltration.h =================================================================== diff -u -rb789046c096cfdddb39adcd3d5be1e129769aac6 -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/view/vtreatmentadjustmentultrafiltration.h (.../vtreatmentadjustmentultrafiltration.h) (revision b789046c096cfdddb39adcd3d5be1e129769aac6) +++ sources/view/vtreatmentadjustmentultrafiltration.h (.../vtreatmentadjustmentultrafiltration.h) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -45,7 +45,7 @@ // ----------- Adjust Ultrafiltration public slots: - void doAdjustment(quint32 vVolume) { + void doAdjustment(float vVolume) { MAdjustUltrafiltrationReq data; data.volume = vVolume; emit didAdjustment(data); Index: sources/view/vtreatmentultrafiltration.cpp =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -reb19475a6bf4ed7f6a16bc07eefc7813496620ef --- sources/view/vtreatmentultrafiltration.cpp (.../vtreatmentultrafiltration.cpp) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ sources/view/vtreatmentultrafiltration.cpp (.../vtreatmentultrafiltration.cpp) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) @@ -21,7 +21,12 @@ void VTreatmentUltrafiltration::onActionReceive(const OutletFlowData &vData) { ultrafiltration_RefUFVol ( vData.mRefUFVol ); - ultrafiltration_MeasUFVol ( vData.mMeasUFVol ); + + // TEST : it has to be bound to MeasUFVol to get the actual values from pumps + // but since we have none in testing code bound to the refUFVal which + // is the calculated/expected volume. + ultrafiltration_MeasUFVol ( vData.mRefUFVol ); //vData.mMeasUFVol ); + ultrafiltration_RotorSpeed ( vData.mRotorSpeed ); ultrafiltration_MotorSpeed ( vData.mMotorSpeed ); ultrafiltration_MotorCtlSpeed ( vData.mMotorCtlSpeed );