Index: Todos =================================================================== diff -u -ra09afcb23e479527eb2263474003b63955cd0e99 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- Todos (.../Todos) (revision a09afcb23e479527eb2263474003b63955cd0e99) +++ Todos (.../Todos) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -1,8 +1,4 @@ /* Ultrafiltration : // TODO : 1 - The Ultrafiltration State change shall have the rejection reason like other responses. - // TODO : 2 - Change mL => L (UI/HD/Messaging) - // TODO : 3 - HD Ultrafiltration Adjustment may need to give rate on duration option selection. - // It means there should be a rate value that is the rate if user wants to choose the duration option. - */ Index: denali.pro =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- denali.pro (.../denali.pro) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ denali.pro (.../denali.pro) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -45,6 +45,7 @@ sources/maintimer.h \ sources/model/mtreatmentadjustblooddialysateresponse.h \ sources/model/mtreatmentadjustdurationresponse.h \ + sources/model/mtreatmentadjustrequests.h \ sources/model/mtreatmentadjustultrafiltrationconfirmresponse.h \ sources/model/mtreatmentadjustultrafiltrationstateresponse.h \ sources/model/mtreatmentadjustultrafiltrationeditresponse.h \ @@ -73,7 +74,7 @@ sources/model/mtreatmenttime.h \ sources/view/vtreatmentadjustmentduration.h \ sources/view/vtreatmentadjustmentflows.h \ - sources/view/vtreatmentadjustmentsresponse.h \ + sources/view/vtreatmentadjustmentresponsebase.h \ sources/view/vtreatmentadjustmentultrafiltration.h \ sources/view/vtreatmentpressureocclusion.h \ sources/view/vtreatmentranges.h \ @@ -127,7 +128,7 @@ sources/view/vpoweroff.cpp \ sources/view/vtreatmentadjustmentduration.cpp \ sources/view/vtreatmentadjustmentflows.cpp \ - sources/view/vtreatmentadjustmentsresponse.cpp \ + sources/view/vtreatmentadjustmentresponsebase.cpp \ sources/view/vtreatmentadjustmentultrafiltration.cpp \ sources/view/vtreatmentbloodflow.cpp \ sources/view/vtreatmentdialysateflow.cpp \ Index: denali.pro.user =================================================================== diff -u -re3bc1f477a12964a70cc0f4aca234fc4fa847d9c -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- denali.pro.user (.../denali.pro.user) (revision e3bc1f477a12964a70cc0f4aca234fc4fa847d9c) +++ denali.pro.user (.../denali.pro.user) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -60,7 +60,20 @@ ProjectExplorer.Project.PluginSettings - + + + true + Builtin.Questionable + + true + Builtin.DefaultTidyAndClazy + 2 + + + + true + + ProjectExplorer.Project.Target.0 Index: sources/applicationcontroller.h =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/applicationcontroller.h (.../applicationcontroller.h) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/applicationcontroller.h (.../applicationcontroller.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -78,11 +78,6 @@ void onExportLog (); void onExport (); - void onAdjustment(const AdjustBloodDialysateRequestData &vData) { emit didAdjustment(vData); } - void onAdjustment(const AdjustDurationRequestData &vData) { emit didAdjustment(vData); } - void onAdjustment(const AdjustUltrafiltrationStateRequestData &vData) { emit didAdjustment(vData); } - void onAdjustment(const AdjustUltrafiltrationEditRequestData &vData) { emit didAdjustment(vData); } - void onAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData) { emit didAdjustment(vData); } ACTION_RECEIVE_MODEL_BRIDGE_DEFINITIONS @@ -96,10 +91,17 @@ void didExport (); - void didAdjustment(const AdjustBloodDialysateRequestData &vData); - void didAdjustment(const AdjustDurationRequestData &vData); - void didAdjustment(const AdjustUltrafiltrationStateRequestData &vData); - void didAdjustment(const AdjustUltrafiltrationEditRequestData &vData); - void didAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData); + +private slots: void onAdjustment(const AdjustBloodDialysateRequestData &vData) { emit didAdjustment(vData); } +signals: void didAdjustment(const AdjustBloodDialysateRequestData &vData); +private slots: void onAdjustment(const AdjustDurationRequestData &vData) { emit didAdjustment(vData); } +signals: void didAdjustment(const AdjustDurationRequestData &vData); +private slots: void onAdjustment(const AdjustUltrafiltrationStateRequestData &vData) { emit didAdjustment(vData); } +signals: void didAdjustment(const AdjustUltrafiltrationStateRequestData &vData); +private slots: void onAdjustment(const AdjustUltrafiltrationEditRequestData &vData) { emit didAdjustment(vData); } +signals: void didAdjustment(const AdjustUltrafiltrationEditRequestData &vData); +private slots: void onAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData) { emit didAdjustment(vData); } +signals: void didAdjustment(const AdjustUltrafiltrationConfirmRequestData &vData); + }; Index: sources/gui/guiglobals.h =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/guiglobals.h (.../guiglobals.h) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/gui/guiglobals.h (.../guiglobals.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -74,7 +74,6 @@ TreatmentState = 0x0F00, // 15 - String = 0xFFFE, Acknow = 0xFFFF, @@ -96,7 +95,6 @@ Timeout = 0x01, }; - Q_ENUM(GuiActionsType_Enum) Q_ENUM(GuiActionsData_Enum) @@ -106,8 +104,6 @@ #include "MsgDefs.h" Q_ENUM(Request_Reject_Reasons) - - }; // to be able to use the enum as signal/slot parameter Index: sources/gui/qml/components/TouchRect.qml =================================================================== diff -u -r524fee2471717bf627eae41c6a599c9b5f4fbe55 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision 524fee2471717bf627eae41c6a599c9b5f4fbe55) +++ sources/gui/qml/components/TouchRect.qml (.../TouchRect.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -73,7 +73,7 @@ radius : Variables.touchRectRadius color : backgroundColor border { - color: Colors.borderButton + color: borderColor width: Variables.borderWidth } Text { id: _text Index: sources/gui/qml/main.qml =================================================================== diff -u -r524fee2471717bf627eae41c6a599c9b5f4fbe55 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/main.qml (.../main.qml) (revision 524fee2471717bf627eae41c6a599c9b5f4fbe55) +++ sources/gui/qml/main.qml (.../main.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -35,7 +35,6 @@ import VTreatmentAdjustmentUltrafiltration 0.1; import VTreatmentUltrafiltrationConfirm 0.1; - // Qml imports import "qrc:/globals" import "qrc:/pages" Index: sources/gui/qml/pages/treatment/TreatmentStart.qml =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/gui/qml/pages/treatment/TreatmentStart.qml (.../TreatmentStart.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -73,6 +73,7 @@ } Line { x: 0; y: row2LineY; length: lineLength } TreatmentPressure { id: _pressureTouchArea + // TEST : these values are test values. arterialMinimum : -400 arterialLowerBound : -300 arterialUpperBound : 100 Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml =================================================================== diff -u -ra09afcb23e479527eb2263474003b63955cd0e99 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentBase.qml (.../TreatmentAdjustmentBase.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -32,7 +32,7 @@ property bool closeVisible: true property bool confirmVisible: true property bool backVisible: false - property bool pausedVisibile: false + property bool pausedVisible: false signal closeClicked() signal confirmClicked() @@ -75,7 +75,7 @@ } NotificationBar { id: _pausedNotification - visible : pausedVisibile && !notification.visible + visible : pausedVisible && !notification.visible text : qsTr("Ultrafiltration is paused.") imageSource: "qrc:/images/iPauseGray" } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -reb19475a6bf4ed7f6a16bc07eefc7813496620ef -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision eb19475a6bf4ed7f6a16bc07eefc7813496620ef) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -49,13 +49,13 @@ // reset the flow values to the current flow values function currentFlows() { - _bloodFlowSlider .value = vTreatmentBloodFlow. bloodFlow_FlowSetPoint + _bloodFlowSlider.value = vTreatmentBloodFlow. bloodFlow_FlowSetPoint _dialysateFlowSlider.value = vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint } // reset the flow values to the values of the adjustment response function resetFlows() { - _bloodFlowSlider .value = vTreatmentAdjustmentFlows. bloodFlow_FlowSetPoint; + _bloodFlowSlider.value = vTreatmentAdjustmentFlows. bloodFlow_FlowSetPoint; _dialysateFlowSlider.value = vTreatmentAdjustmentFlows.dialysateFlow_FlowSetPoint; } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml =================================================================== diff -u -re3bc1f477a12964a70cc0f4aca234fc4fa847d9c -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision e3bc1f477a12964a70cc0f4aca234fc4fa847d9c) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationConfirm.qml (.../TreatmentAdjustmentUltrafiltrationConfirm.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -38,18 +38,19 @@ property real ultrafiltrationRateDiff : 0.000 property real ultrafiltrationRateOld : 0.000 - property string ultrafiltrationRateUnit : qsTr("mL/min") - property string treatmentDurationUnit : qsTr("min") + property string ultrafiltrationVolumeUnit : qsTr("(L)") + property string ultrafiltrationRateUnit : qsTr("mL/min") + property string treatmentDurationUnit : qsTr("min") signal confirmRateClicked (int vVolume) signal confirmDurationClicked(int vVolume) - closeVisible : false + closeVisible : false confirmVisible : false - backVisible : true - pausedVisibile : true + backVisible : true + pausedVisible : true - titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(L)") + titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + ultrafiltrationVolumeUnit function reset() { _rateAdjustmentButton.selected = false Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -reb56ab40668e6915defb656d2859998626f75cff -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision eb56ab40668e6915defb656d2859998626f75cff) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -34,18 +34,20 @@ property real adjusted : _volumeSlider.value } + property string ultrafiltrationVolumeUnit : qsTr("(L)") + signal nextClicked(real vVolume) function reset() { _volumeSlider.value = _private.minimum } - closeVisible : false + closeVisible : false confirmVisible : false - backVisible : true - pausedVisibile : true + backVisible : true + pausedVisible : true - titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(L)") + titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + ultrafiltrationVolumeUnit ProgressBarEx { id: _rangeProgressBar width : Variables.ultrafiltrationProgressbarWidth Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationPaused.qml (.../TreatmentAdjustmentUltrafiltrationPaused.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -6,7 +6,7 @@ * IN PART OR IN WHOLE, \n * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. \n * - * \file TreatmentAdjustmentUltrafiltrationStart.qml + * \file TreatmentAdjustmentUltrafiltrationPaused.qml * \date 2020/05/11 * \author Behrouz NematiPour * @@ -33,13 +33,15 @@ property real value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol } + property string ultrafiltrationVolumeUnit : qsTr("(L)") + signal editClicked() signal resumeClicked() - confirmVisible: false - pausedVisibile: true + confirmVisible : false + pausedVisible : true - titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(L)") + titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + ultrafiltrationVolumeUnit ProgressBarEx { id: _progressbarex width : Variables.ultrafiltrationProgressbarWidth Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationStart.qml (.../TreatmentAdjustmentUltrafiltrationStart.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -33,11 +33,14 @@ property real value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol } + property string ultrafiltrationVolumeUnit : qsTr("(L)") + signal pauseClicked() confirmVisible: false - titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(L)") + titleText : qsTr("ULTRAFILTRATION VOLUME") + " " + ultrafiltrationVolumeUnit + ProgressBarEx { id: _progressbarex width : Variables.ultrafiltrationProgressbarWidth height : Variables.progressbarHeight Index: sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml =================================================================== diff -u -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) +++ sources/gui/qml/pages/treatment/sections/TreatmentFluid.qml (.../TreatmentFluid.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -67,24 +67,6 @@ value : 0 - // TEST begin : simulation code - // minimum : 0 // TEST : only test values - // maximum : 100 // TEST : only test values - // NumberAnimation on value { - // duration: 10000 - // from : _fluidProgressBar.minimum - // to : _fluidProgressBar.maximum - // //loops: Animation.Infinite - // onFinished: { - // _cumulativeValue.valueLast += _fluidProgressBar.value - // restart() - // } - // } - // onValueChanged: { - // _cumulativeValue.value = _cumulativeValue.valueLast + _fluidProgressBar.value - // } - // TEST end - Text { id: _fluidText anchors { left : parent.left Index: sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml =================================================================== diff -u -ra09afcb23e479527eb2263474003b63955cd0e99 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision a09afcb23e479527eb2263474003b63955cd0e99) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressure.qml (.../TreatmentPressure.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -26,21 +26,18 @@ * \brief Treatment Screen Pressure section */ TouchArea { id: _root - - // TEST : these values are test values. - property int arterialMinimum : -400 - property int arterialLowerBound : -300 - property int arterialUpperBound : 100 - property int arterialMaximum : 400 + property int arterialMinimum : 0 + property int arterialLowerBound : 0 + property int arterialUpperBound : 0 + property int arterialMaximum : 0 property alias arterilPressure : _arterialRangeBar.value - property int venousMinimum : -100 - property int venousLowerBound : -100 - property int venousUpperBound : 500 - property int venousMaximum : 800 + property int venousMinimum : 0 + property int venousLowerBound : 0 + property int venousUpperBound : 0 + property int venousMaximum : 0 property alias venusPressure : _venousRangeBar.value - clip: false x : 0 y : 0 Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -32,6 +32,8 @@ property real value : vTreatmentUltrafiltration.ultrafiltration_MeasUFVol } + property string ultrafiltrationVolumeUnit : qsTr("(L)") + clip : false x : 0 @@ -40,7 +42,7 @@ height : 200 isTouchable : true - title : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(L)") + title : qsTr("ULTRAFILTRATION VOLUME") + " " + ultrafiltrationVolumeUnit notification { imageSource: "qrc:/images/iPauseGray" text : vTreatmentUltrafiltrationState.isPaused ? qsTr("Ultrafiltration Paused") : "" Index: sources/model/mmodel.h =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/model/mmodel.h (.../mmodel.h) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/model/mmodel.h (.../mmodel.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -29,6 +29,7 @@ #include "mtreatmentadjustultrafiltrationstateresponse.h" #include "mtreatmentadjustultrafiltrationeditresponse.h" #include "mtreatmentadjustultrafiltrationconfirmresponse.h" +#include "mtreatmentadjustrequests.h" /*! * \brief Message interpretation instruction @@ -113,53 +114,7 @@ * The the only reason thy have been defined to help overloadding the adjusmtent methods * Otherwise the parameters are so tiny models. */ -namespace Model { -#include "HDDefs.h" - -class MAdjustBloodDialysateReq { -public: - quint32 bloodFlow = 0; - quint32 dialysateFlow = 0; -}; - -class MAdjustDurationReq { -public: - quint32 duratoin = 0; -}; - -class MAdjustUltrafiltrationStateReq { -public: - enum State{ - ePaused = 0, - eRunning = 1, - }; - State requestedState = ePaused; // the requested state. Initially it's running => paused. -}; - -class MAdjustUltrafiltrationReq { -public: - float volume = 0; -}; - -class MAdjustUltrafiltrationConfirmReq { -public: - enum Options : quint32 { - eDuration = UF_Adjustments::UF_ADJ_TREATMENT_TIME, - eRate = UF_Adjustments::UF_ADJ_UF_RATE, - }; - float volume = 0; - Options option = eDuration; -}; - -} - -typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; -typedef Model:: MAdjustDurationReq AdjustDurationRequestData; -typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; -typedef Model:: MAdjustUltrafiltrationReq AdjustUltrafiltrationEditRequestData; -typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; - //--------------------------------------------------------------------------------// //-------- Please add the model type to the lists below to register them ---------// //--------------------------------------------------------------------------------// Index: sources/model/mtreatmentadjustrequests.h =================================================================== diff -u --- sources/model/mtreatmentadjustrequests.h (revision 0) +++ sources/model/mtreatmentadjustrequests.h (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -0,0 +1,65 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, + * IN PART OR IN WHOLE, + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file mtreatmentadjustrequests.h + * \date 2020/06/08 + * \author Behrouz NematiPour + * + */ + +#pragma once + +// Qt +#include + +namespace Model { + +#include "HDDefs.h" + +class MAdjustBloodDialysateReq { +public: + quint32 bloodFlow = 0; + quint32 dialysateFlow = 0; +}; + +class MAdjustDurationReq { +public: + quint32 duratoin = 0; +}; + + class MAdjustUltrafiltrationStateReq { +public: + enum State{ + ePaused = 0, + eRunning = 1, + }; + State requestedState = ePaused; // the requested state. Initially it's running => paused. +}; + +class MAdjustUltrafiltrationReq { +public: + float volume = 0; +}; + + class MAdjustUltrafiltrationConfirmReq { +public: + enum Options : quint32 { + eDuration = UF_Adjustments::UF_ADJ_TREATMENT_TIME, + eRate = UF_Adjustments::UF_ADJ_UF_RATE, + }; + float volume = 0; + Options option = eDuration; +}; + +} + +typedef Model:: MAdjustBloodDialysateReq AdjustBloodDialysateRequestData; +typedef Model:: MAdjustDurationReq AdjustDurationRequestData; +typedef Model:: MAdjustUltrafiltrationStateReq AdjustUltrafiltrationStateRequestData; +typedef Model:: MAdjustUltrafiltrationReq AdjustUltrafiltrationEditRequestData; +typedef Model::MAdjustUltrafiltrationConfirmReq AdjustUltrafiltrationConfirmRequestData; Index: sources/view/vtreatmentadjustmentduration.h =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/view/vtreatmentadjustmentduration.h (.../vtreatmentadjustmentduration.h) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/view/vtreatmentadjustmentduration.h (.../vtreatmentadjustmentduration.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -16,11 +16,11 @@ #include // Project -#include "vtreatmentadjustmentsresponse.h" +#include "vtreatmentadjustmentresponsebase.h" namespace View { -class VTreatmentAdjustmentDuration : public VTreatmentAdjustmentsResponse +class VTreatmentAdjustmentDuration : public VTreatmentAdjustmentResponseBase { Q_OBJECT Index: sources/view/vtreatmentadjustmentflows.h =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/view/vtreatmentadjustmentflows.h (.../vtreatmentadjustmentflows.h) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/view/vtreatmentadjustmentflows.h (.../vtreatmentadjustmentflows.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -17,11 +17,11 @@ #include // Project -#include "vtreatmentadjustmentsresponse.h" +#include "vtreatmentadjustmentresponsebase.h" namespace View { -class VTreatmentAdjustmentFlows : public VTreatmentAdjustmentsResponse +class VTreatmentAdjustmentFlows : public VTreatmentAdjustmentResponseBase { Q_OBJECT // friends Index: sources/view/vtreatmentadjustmentresponsebase.cpp =================================================================== diff -u --- sources/view/vtreatmentadjustmentresponsebase.cpp (revision 0) +++ sources/view/vtreatmentadjustmentresponsebase.cpp (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -0,0 +1,52 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, + * IN PART OR IN WHOLE, + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file vtreatmentadjustmentresponsebase.cpp + * \date 3/29/2020 + * \author Behrouz NematiPour + * + */ +#include "vtreatmentadjustmentresponsebase.h" + +// Project +#include "guicontroller.h" + +VIEW_DEF_CLASS(VTreatmentAdjustmentResponseBase) +void VTreatmentAdjustmentResponseBase::initConnections() { } + + +/*! + * \brief VTreatmentAdjustmentResponseBase::reasonText + * \details this code is the place holder for the alarms description mapping + * since it is another feature + * it returns the enum name for now + * \param vEnum - The Rejection Reason enum + * \return String representation of the Rejection Reason enum name + */ +QString VTreatmentAdjustmentResponseBase::reasonText(GuiRequestReasons vEnum) +{ + // TEST : this code is the place holder for the alarms description mapping + // since it is another feature + // it returns the enum name for now + const QMetaObject *mo = qt_getEnumMetaObject(vEnum); + int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); + return mo->enumerator(enumIdx).valueToKey(vEnum); +} + +/*! + * \brief View::VTreatmentAdjustmentResponseBase::text + * \details The slot to ge the Reason Description + * \return Reason description as string + */ +QString View::VTreatmentAdjustmentResponseBase::text() +{ + QString text; + if (_adjustment_Reason != GuiRequestReasons::REQUEST_REJECT_REASON_NONE) + text = reasonText(static_cast(_adjustment_Reason)); + return text; +} Index: sources/view/vtreatmentadjustmentresponsebase.h =================================================================== diff -u --- sources/view/vtreatmentadjustmentresponsebase.h (revision 0) +++ sources/view/vtreatmentadjustmentresponsebase.h (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -0,0 +1,56 @@ +/*! + * + * Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. + * \copyright + * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, + * IN PART OR IN WHOLE, + * WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. + * + * \file vtreatmentadjustmentresponsebase.h + * \date 3/29/2020 + * \author Behrouz NematiPour + * + */ +#pragma once + +// Qt +#include + +// Project +#include "mmodel.h" +#include "vview.h" +#include "guiglobals.h" + +// forward diclations +class tst_views; + +// namespace +using namespace Gui; +namespace View { + +class VTreatmentAdjustmentResponseBase : public QObject +{ + + Q_OBJECT + + // friends + friend class ::tst_views; + + // coco begin validated: + // The adjustment_Reason property as quint32 is not used directly in GUI + // it will be used as QString text. + // has been manually tested that it works perfectly fine if used. + PROPERTY( quint32 , adjustment_Reason , 0) + // coco end + + PROPERTY( bool , adjustment_Accepted , 0) + + VIEW_DEC_CLASS(VTreatmentAdjustmentResponseBase) + +private: + QString reasonText (GuiRequestReasons vEnum); + +protected slots: + QString text(); +}; +} Fisheye: Tag f160ef9c259a75e8d6120ad962cda648e8f7a9b3 refers to a dead (removed) revision in file `sources/view/vtreatmentadjustmentsresponse.cpp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f160ef9c259a75e8d6120ad962cda648e8f7a9b3 refers to a dead (removed) revision in file `sources/view/vtreatmentadjustmentsresponse.h'. Fisheye: No comparison available. Pass `N' to diff? Index: sources/view/vtreatmentadjustmentultrafiltration.h =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/view/vtreatmentadjustmentultrafiltration.h (.../vtreatmentadjustmentultrafiltration.h) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/view/vtreatmentadjustmentultrafiltration.h (.../vtreatmentadjustmentultrafiltration.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -16,11 +16,11 @@ #include // Project -#include "vtreatmentadjustmentsresponse.h" +#include "vtreatmentadjustmentresponsebase.h" namespace View { -class VTreatmentAdjustmentUltrafiltration : public VTreatmentAdjustmentsResponse +class VTreatmentAdjustmentUltrafiltration : public VTreatmentAdjustmentResponseBase { Q_OBJECT Index: sources/view/vtreatmentultrafiltrationconfirm.h =================================================================== diff -u -r6616f7b9b88efffa42ab605833d296afb76d3cb1 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/view/vtreatmentultrafiltrationconfirm.h (.../vtreatmentultrafiltrationconfirm.h) (revision 6616f7b9b88efffa42ab605833d296afb76d3cb1) +++ sources/view/vtreatmentultrafiltrationconfirm.h (.../vtreatmentultrafiltrationconfirm.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -16,11 +16,11 @@ #include // Project -#include "vtreatmentadjustmentsresponse.h" +#include "vtreatmentadjustmentresponsebase.h" namespace View { -class VTreatmentUltrafiltrationConfirm : public VTreatmentAdjustmentsResponse +class VTreatmentUltrafiltrationConfirm : public VTreatmentAdjustmentResponseBase { Q_OBJECT Index: sources/view/vtreatmentultrafiltrationstate.cpp =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/view/vtreatmentultrafiltrationstate.cpp (.../vtreatmentultrafiltrationstate.cpp) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/view/vtreatmentultrafiltrationstate.cpp (.../vtreatmentultrafiltrationstate.cpp) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -60,7 +60,7 @@ QString View::VTreatmentUltrafiltrationState::text() { // if there is a reason (passed) it will be used - QString mText = VTreatmentAdjustmentsResponse::text(); + QString mText = VTreatmentAdjustmentResponseBase::text(); if (! mText.isEmpty()) return mText; // otherwise a general message will be created/passed. if (! adjustment_Accepted()) { Index: sources/view/vtreatmentultrafiltrationstate.h =================================================================== diff -u -r03de7d132838c54a23862809357c42102b6dab99 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/view/vtreatmentultrafiltrationstate.h (.../vtreatmentultrafiltrationstate.h) (revision 03de7d132838c54a23862809357c42102b6dab99) +++ sources/view/vtreatmentultrafiltrationstate.h (.../vtreatmentultrafiltrationstate.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -16,11 +16,11 @@ #include // Project -#include "vtreatmentadjustmentsresponse.h" +#include "vtreatmentadjustmentresponsebase.h" namespace View { -class VTreatmentUltrafiltrationState : public VTreatmentAdjustmentsResponse +class VTreatmentUltrafiltrationState : public VTreatmentAdjustmentResponseBase { Q_OBJECT Index: sources/view/vview.h =================================================================== diff -u -r524fee2471717bf627eae41c6a599c9b5f4fbe55 -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- sources/view/vview.h (.../vview.h) (revision 524fee2471717bf627eae41c6a599c9b5f4fbe55) +++ sources/view/vview.h (.../vview.h) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -77,10 +77,10 @@ VIEW_DEC_CLASS(vCLASS) \ VIEW_DEC_SLOT (vDATATYPE) //--------------------------------------------------------------------------------// -#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS, vDATATYPE) \ - using namespace View; \ - vCLASS::vCLASS(QObject *parent) : VTreatmentAdjustmentsResponse(parent) { \ - initConnections(); \ +#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS, vDATATYPE) \ + using namespace View; \ + vCLASS::vCLASS(QObject *parent) : VTreatmentAdjustmentResponseBase(parent) { \ + initConnections(); \ } //--------------------------------------------------------------------------------// Index: unittests/tst_views.cpp =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -rf160ef9c259a75e8d6120ad962cda648e8f7a9b3 --- unittests/tst_views.cpp (.../tst_views.cpp) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision f160ef9c259a75e8d6120ad962cda648e8f7a9b3) @@ -16,20 +16,20 @@ // Qt // Project -#include "vtreatmentadjustmentsresponse.h" +#include "vtreatmentadjustmentresponsebase.h" tst_views::tst_views(QObject *parent) : QObject(parent) { } void tst_views::VTreatmentAdjustmentsResponse_text_NoReason() { - View::VTreatmentAdjustmentsResponse v; + View::VTreatmentAdjustmentResponseBase v; v.adjustment_Reason(GuiRequestReasons::REQUEST_REJECT_REASON_NONE); QVERIFY(v.text().isEmpty()); } void tst_views::VTreatmentAdjustmentsResponse_text_WAReason() { - View::VTreatmentAdjustmentsResponse v; + View::VTreatmentAdjustmentResponseBase v; v.adjustment_Reason(GuiRequestReasons::REQUEST_REJECT_REASON_INVALID_TREATMENT_STATE); QVERIFY(! v.text().isEmpty()); }