Index: denali.pro =================================================================== diff -u -r7045fd6002bdeb28e23a7af6a708a852d522ad12 -r016578b44e879b89bd42dda7763ed50e67d7e64c --- denali.pro (.../denali.pro) (revision 7045fd6002bdeb28e23a7af6a708a852d522ad12) +++ denali.pro (.../denali.pro) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -66,6 +66,8 @@ sources/model/mtreatmentflows.h \ sources/model/mtreatmentoutletflow.h \ sources/model/mtreatmenttime.h \ + sources/view/vtreatmentadjustmentduration.h \ + sources/view/vtreatmentadjustmentflows.h \ sources/view/vtreatmentadjustmentsresponse.h \ sources/view/vtreatmentpressureocclusion.h \ sources/view/vtreatmentranges.h \ @@ -112,6 +114,8 @@ sources/model/mtreatmenttime.cpp \ sources/model/malarmstatus.cpp \ sources/view/vpoweroff.cpp \ + sources/view/vtreatmentadjustmentduration.cpp \ + sources/view/vtreatmentadjustmentflows.cpp \ sources/view/vtreatmentadjustmentsresponse.cpp \ sources/view/vtreatmentbloodflow.cpp \ sources/view/vtreatmentdialysateflow.cpp \ Index: denali.pro.user =================================================================== diff -u -r670f257c9b88d3e5506eccaad111bec914102a72 -r016578b44e879b89bd42dda7763ed50e67d7e64c --- denali.pro.user (.../denali.pro.user) (revision 670f257c9b88d3e5506eccaad111bec914102a72) +++ denali.pro.user (.../denali.pro.user) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/guiglobals.cpp =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r016578b44e879b89bd42dda7763ed50e67d7e64c --- sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ sources/gui/guiglobals.cpp (.../guiglobals.cpp) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -24,7 +24,18 @@ #include "mmodel.h" #include "vview.h" -using namespace View; +#include "vtreatmentbloodflow.h" +#include "vtreatmentdialysateflow.h" +#include "vtreatmentultrafiltration.h" +#include "vtreatmentpressureocclusion.h" +#include "vtreatmenttime.h" +#include "vtreatmentranges.h" +#include "valarmstatus.h" +#include "vpoweroff.h" + +#include "vtreatmentadjustmentduration.h" +#include "vtreatmentadjustmentflows.h" + namespace Gui { QQuickView *_viewer = nullptr; Index: sources/gui/qml/main.qml =================================================================== diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -r016578b44e879b89bd42dda7763ed50e67d7e64c --- sources/gui/qml/main.qml (.../main.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) +++ sources/gui/qml/main.qml (.../main.qml) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -61,14 +61,17 @@ // TODO : When Testing data on Setting screen is removed // This needs to be moved into the TreatmentFlows.qml -import VTreatmentAdjustmentsResponse 0.1; import VTreatmentBloodFlow 0.1; import VTreatmentDialysateFlow 0.1; import VTreatmentUltrafiltration 0.1; import VTreatmentTime 0.1; import VAlarmStatus 0.1; import VPowerOff 0.1; +import VTreatmentAdjustmentDuration 0.1; +import VTreatmentAdjustmentFlows 0.1; + + // Qml imports import "qrc:/globals" import "qrc:/pages" @@ -102,34 +105,16 @@ // TODO : When Testing data on Setting screen is removed // This needs to be moved into the Treatment______.qml - VTreatmentAdjustmentsResponse { id: vTreatmentAdjustmentsResponse } - VTreatmentBloodFlow { id: vTreatmentBloodFlow } - VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } - VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } - VTreatmentTime { id: vTreatmentTime } - VAlarmStatus { id: vAlarmStatus } - VPowerOff { id: vPowerOff - onPoweroffTriggered: { - switch (vpoweroff) { - case GuiActions.Command: - _powerOffDialog.open() - break; + VTreatmentAdjustmentDuration { id: vTreatmentAdjustmentDuration } + VTreatmentAdjustmentFlows { id: vTreatmentAdjustmentFlows } - case GuiActions.Timeout: - _powerOffDialog.close() - break; + VTreatmentBloodFlow { id: vTreatmentBloodFlow } + VTreatmentDialysateFlow { id: vTreatmentDialysateFlow } + VTreatmentUltrafiltration { id: vTreatmentUltrafiltration } + VTreatmentTime { id: vTreatmentTime } + VAlarmStatus { id: vAlarmStatus } + VPowerOff { id: vPowerOff } - case GuiActions.Rejected: - _autoHideInfo.showDialog( - qsTr("Cannot shutdown during 'Treatment'"), // '%1').arg() - 2000 // notifies user and hides the dialog - ) - break; - - } - } - } - // ----- Follow the below Z order ----- // 1 - Screens // 1 - 1 @@ -186,4 +171,26 @@ text: Qt.application.version font.pixelSize: 14 } + + Connections { target: vPowerOff + onPoweroffTriggered: { + switch (vpoweroff) { + case GuiActions.Command: + _powerOffDialog.open() + break; + + case GuiActions.Timeout: + _powerOffDialog.close() + break; + + case GuiActions.Rejected: + _autoHideInfo.showDialog( + qsTr("Cannot shutdown during 'Treatment'"), // '%1').arg() + 2000 // notifies user and hides the dialog + ) + break; + + } + } + } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml =================================================================== diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -r016578b44e879b89bd42dda7763ed50e67d7e64c --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentDuration.qml (.../TreatmentAdjustmentDuration.qml) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -38,13 +38,13 @@ titleText: qsTr("TREATMENT DURATION") - Connections { target: vTreatmentAdjustmentsResponse + Connections { target: vTreatmentAdjustmentDuration onAdjustmentDurationTriggered: { - if ( vTreatmentAdjustmentsResponse.adjustment_Accepted ) { + if ( vTreatmentAdjustmentDuration.adjustment_Accepted ) { accept() } else { - _durationSlider .value = vTreatmentAdjustmentsResponse.duration; - notificationText = vTreatmentAdjustmentsResponse.text(); + _durationSlider .value = vTreatmentAdjustmentDuration.duration; + notificationText = vTreatmentAdjustmentDuration.text(); } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -r95c671ab7037af055db551456a719ff67bf10262 -r016578b44e879b89bd42dda7763ed50e67d7e64c --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 95c671ab7037af055db551456a719ff67bf10262) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -49,14 +49,14 @@ dialysateFlowRateValue = vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint } - Connections { target: vTreatmentAdjustmentsResponse + Connections { target: vTreatmentAdjustmentFlows onAdjustmentFlowTriggered: { - if ( vTreatmentAdjustmentsResponse.adjustment_Accepted ) { + if ( vTreatmentAdjustmentFlows.adjustment_Accepted ) { accept() } else { - _bloodFlowSlider .value = vTreatmentAdjustmentsResponse. bloodFlow_FlowSetPoint; - _dialysateFlowSlider.value = vTreatmentAdjustmentsResponse.dialysateFlow_FlowSetPoint; - notificationText = vTreatmentAdjustmentsResponse.text(); + _bloodFlowSlider .value = vTreatmentAdjustmentFlows. bloodFlow_FlowSetPoint; + _dialysateFlowSlider.value = vTreatmentAdjustmentFlows.dialysateFlow_FlowSetPoint; + notificationText = vTreatmentAdjustmentFlows.text(); } } } Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml =================================================================== diff -u -r670f257c9b88d3e5506eccaad111bec914102a72 -r016578b44e879b89bd42dda7763ed50e67d7e64c --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 670f257c9b88d3e5506eccaad111bec914102a72) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentUltrafiltrationEdit.qml (.../TreatmentAdjustmentUltrafiltrationEdit.qml) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -47,7 +47,7 @@ topMargin: 250 horizontalCenter: parent.horizontalCenter } - minimum : 0 + 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 @@ -73,15 +73,16 @@ } bgColor: "#0c2135" - width : _rangeProgressBar.width - _rangeProgressBar.progressWidth - ( maxGapWidth + minGapWidth ) - x : _rangeProgressBar.x + _rangeProgressBar.progressWidth + minGapWidth + width : _rangeProgressBar.width - maxGapWidth - minGapWidth - _rangeProgressBar.progressWidth + x : _rangeProgressBar.x + minGapWidth + _rangeProgressBar.progressWidth + minimum : _rangeProgressBar.value + minGapValue maximum : _rangeProgressBar.maximum - minGapValue } TouchRect { id: _nextButton - width: 530 - height: 95 + width : 530 + height : 95 anchors { top: parent.top topMargin: 460 @@ -92,8 +93,10 @@ text { text: qsTr("NEXT") - font.weight: Font.DemiBold - font.pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentNextButton + font { + weight : Font .DemiBold + pixelSize: Fonts.fontPixelUltrafiltrationAdjustmentNextButton + } } onClicked: nextClicked() } Index: sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml =================================================================== diff -u -r17f0906011de9c97c0950c1ba0ea627a1411bc2e -r016578b44e879b89bd42dda7763ed50e67d7e64c --- sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 17f0906011de9c97c0950c1ba0ea627a1411bc2e) +++ sources/gui/qml/pages/treatment/sections/TreatmentUltrafiltration.qml (.../TreatmentUltrafiltration.qml) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -34,10 +34,10 @@ orientation : TouchArea.Orientation.Vertical title : qsTr("ULTRAFILTRATION VOLUME") + " " + qsTr("(mL)") - Connections { target: vTreatmentAdjustmentsResponse + Connections { target: vTreatmentAdjustmentDuration onAdjustmentDurationTriggered: { // FIXME : HD units should be consistent(mL or L) but here is Litre - _progressbarex.maximum = vTreatmentAdjustmentsResponse.ultrafiltration * 1000 + _progressbarex.maximum = vTreatmentAdjustmentDuration.ultrafiltration * 1000 } } Index: sources/main.h =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r016578b44e879b89bd42dda7763ed50e67d7e64c --- sources/main.h (.../main.h) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ sources/main.h (.../main.h) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -49,6 +49,7 @@ #define DEBUG_PROPERTY_CHANGED(vVARIABLE) //qDebug() << "#" << #vVARIABLE << v##vVARIABLE; //--------------------------------------------------------------------------------// #define PROPERTY_SLOT( vTYPE , vVARIABLE ) \ + protected : \ void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ static bool init = false; \ if ( !init || _##vVARIABLE != v##vVARIABLE ) { \ @@ -60,6 +61,7 @@ } //--------------------------------------------------------------------------------// #define TRIGGER_SLOT( vTYPE , vVARIABLE ) \ + protected: \ void vVARIABLE ( const vTYPE & v##vVARIABLE ) { \ DEBUG_PROPERTY_CHANGED(vVARIABLE) \ _##vVARIABLE = v##vVARIABLE; \ Index: sources/view/vtreatmentadjustmentduration.cpp =================================================================== diff -u --- sources/view/vtreatmentadjustmentduration.cpp (revision 0) +++ sources/view/vtreatmentadjustmentduration.cpp (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -0,0 +1,31 @@ +/*! + * + * 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 vtreatmentadjustmentduration.cpp + * \date 5/18/2020 + * \author Behrouz NematiPour + * + */ +#include "vtreatmentadjustmentduration.h" + +// Project +#include "guicontroller.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentDuration, AdjustDurationResponseData) + +void VTreatmentAdjustmentDuration::onActionReceive(const AdjustDurationResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + duration ( vData.mDuration ); + ultrafiltration ( vData.mUFVolume ); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustmentDuration ( true ); +} Index: sources/view/vtreatmentadjustmentduration.h =================================================================== diff -u --- sources/view/vtreatmentadjustmentduration.h (revision 0) +++ sources/view/vtreatmentadjustmentduration.h (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -0,0 +1,44 @@ +/*! + * + * 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 vtreatmentadjustmentduration.h + * \date 5/18/2020 + * \author Behrouz NematiPour + * + */ +#pragma once + +#include + +// Project +#include "vtreatmentadjustmentsresponse.h" + +namespace View { + +class VTreatmentAdjustmentDuration : public VTreatmentAdjustmentsResponse +{ + Q_OBJECT + + // friends + friend class ::tst_views; + + // coco begin validated: + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + // has been manually tested that it works perfectly fine + TRIGGER( bool , adjustmentDuration , 0) + // coco end + + // Treatment Duration data + PROPERTY( quint32 , duration , 0) + PROPERTY( float , ultrafiltration , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentDuration, AdjustDurationResponseData) +}; + +} Index: sources/view/vtreatmentadjustmentflows.cpp =================================================================== diff -u --- sources/view/vtreatmentadjustmentflows.cpp (revision 0) +++ sources/view/vtreatmentadjustmentflows.cpp (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -0,0 +1,32 @@ +/*! + * + * 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 vtreatmentadjustmentflows.cpp + * \date 5/19/2020 + * \author Behrouz NematiPour + * + */ +#include "vtreatmentadjustmentflows.h" + +// Project +#include "guicontroller.h" + +VIEW_DEF_CLASS_ADJUSTMENT(VTreatmentAdjustmentFlows, AdjustBloodDialysateResponseData) + +void VTreatmentAdjustmentFlows::onActionReceive(const AdjustBloodDialysateResponseData &vData) +{ + adjustment_Accepted ( vData.mAccepted ); + adjustment_Reason ( vData.mReason ); + bloodFlow_FlowSetPoint ( vData.mBloodRate ); + dialysateFlow_FlowSetPoint ( vData.mDialydateReate ); + + // *** has to be the last to let the information to be set and then emit the signal *** + // *** otherwise will use the previous values before being set. *** + adjustmentFlow ( true ); +} + Index: sources/view/vtreatmentadjustmentflows.h =================================================================== diff -u --- sources/view/vtreatmentadjustmentflows.h (revision 0) +++ sources/view/vtreatmentadjustmentflows.h (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -0,0 +1,44 @@ +/*! + * + * 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 vtreatmentadjustmentflows.h + * \date 5/19/2020 + * \author Behrouz NematiPour + * + */ +#pragma once + +// Qt +#include + +// Project +#include "vtreatmentadjustmentsresponse.h" + +namespace View { + +class VTreatmentAdjustmentFlows : public VTreatmentAdjustmentsResponse +{ + Q_OBJECT + // friends + friend class ::tst_views; + + // coco begin validated: + // The property adjustment_Triggered has to be always true + // and to always trigger the change event to work as a notifier for GUI + // has been manually tested that it works perfectly fine + TRIGGER( bool , adjustmentFlow , 0) + // coco end + + // Treatment Blood/Dialysate Flow data + PROPERTY( quint32 , bloodFlow_FlowSetPoint , 0) + PROPERTY( quint32 , dialysateFlow_FlowSetPoint , 0) + + VIEW_DEC_CLASS_ADJUSTMENT(VTreatmentAdjustmentFlows, AdjustBloodDialysateResponseData) +}; + +} Index: sources/view/vtreatmentadjustmentsresponse.cpp =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r016578b44e879b89bd42dda7763ed50e67d7e64c --- sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -17,9 +17,7 @@ #include "guicontroller.h" VIEW_DEF_CLASS(VTreatmentAdjustmentsResponse) -void VTreatmentAdjustmentsResponse::initConnections() { - VIEW_DEF_CONNECTION_ADJUSTMENTS -} +void VTreatmentAdjustmentsResponse::initConnections() { } /*! @@ -40,34 +38,15 @@ return mo->enumerator(enumIdx).valueToKey(vEnum); } +/*! + * \brief View::VTreatmentAdjustmentsResponse::text + * \details The slot to ge the Reasin Description + * \return Reason description as string + */ QString View::VTreatmentAdjustmentsResponse::text() { QString text; if (_adjustment_Reason != GuiRequestReasons::REQUEST_REJECT_REASON_NONE) text = reasonText(static_cast(_adjustment_Reason)); return text; } - -void VTreatmentAdjustmentsResponse::onActionReceive(const AdjustBloodDialysateResponseData &vData) -{ - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - bloodFlow_FlowSetPoint ( vData.mBloodRate ); - dialysateFlow_FlowSetPoint ( vData.mDialydateReate ); - - // *** has to be the last to let the information to be set and then emit the signal *** - // *** otherwise will use the previous values before being set. *** - adjustmentFlow ( true ); -} - -void VTreatmentAdjustmentsResponse::onActionReceive(const AdjustDurationResponseData &vData) -{ - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - duration ( vData.mDuration ); - ultrafiltration ( vData.mUFVolume ); - - // *** has to be the last to let the information to be set and then emit the signal *** - // *** otherwise will use the previous values before being set. *** - adjustmentDuration ( true ); -} Index: sources/view/vtreatmentadjustmentsresponse.h =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r016578b44e879b89bd42dda7763ed50e67d7e64c --- sources/view/vtreatmentadjustmentsresponse.h (.../vtreatmentadjustmentsresponse.h) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ sources/view/vtreatmentadjustmentsresponse.h (.../vtreatmentadjustmentsresponse.h) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -37,32 +37,15 @@ friend class ::tst_views; // coco begin validated: - - // The Reason property as quint32 is not used directly in GUI + // 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) - - // The property adjustment_Triggered has to be always true - // and to always trigger the change event to work as a notifier for GUI - // has been manually tested that it works perfectly fine - TRIGGER( bool , adjustmentFlow , 0) - TRIGGER( bool , adjustmentDuration , 0) - // coco end - - // Treatment Blood/Dialysate Flow data PROPERTY( bool , adjustment_Accepted , 0) - PROPERTY( quint32 , bloodFlow_FlowSetPoint , 0) - PROPERTY( quint32 , dialysateFlow_FlowSetPoint , 0) - // Treatment Duration data - PROPERTY( quint32 , duration , 0) - PROPERTY( float , ultrafiltration , 0) - VIEW_DEC_CLASS(VTreatmentAdjustmentsResponse) - VIEW_DEC_SLOT_ADJUSTMENTS private: QString reasonText (GuiRequestReasons vEnum); Index: sources/view/vview.h =================================================================== diff -u -rb798668f16ad0967ab97e96f5f9a2cdd821e899f -r016578b44e879b89bd42dda7763ed50e67d7e64c --- sources/view/vview.h (.../vview.h) (revision b798668f16ad0967ab97e96f5f9a2cdd821e899f) +++ sources/view/vview.h (.../vview.h) (revision 016578b44e879b89bd42dda7763ed50e67d7e64c) @@ -25,6 +25,7 @@ * * 3 - Register View : * Add the required lines like the other models in the vview.h file. + * Also add the #include in the guiglobals.cpp * * 4 - Usage in UI : * Import : import VTreatmentPressureOcclusion 0.1; @@ -73,30 +74,30 @@ //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// #define REGISTER_VIEW_TYPES \ + using namespace View; \ REGISTER_TYPE( VTreatmentBloodFlow ) \ REGISTER_TYPE( VTreatmentDialysateFlow ) \ REGISTER_TYPE( VTreatmentUltrafiltration ) \ REGISTER_TYPE( VTreatmentPressureOcclusion ) \ REGISTER_TYPE( VTreatmentTime ) \ - REGISTER_TYPE( VTreatmentAdjustmentsResponse ) \ + REGISTER_TYPE( VTreatmentAdjustmentDuration ) \ + REGISTER_TYPE( VTreatmentAdjustmentFlows ) \ REGISTER_TYPE( VTreatmentRanges ) \ REGISTER_TYPE( VAlarmStatus ) \ REGISTER_TYPE( VPowerOff ) //--------------------------------------------------------------------------------// -#define VIEW_DEF_CONNECTION_ADJUSTMENTS \ - ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustBloodDialysateResponseData); \ - ACTION_RECEIVE_BRIDGE_CONNECTION(Gui::_GuiController, AdjustDurationResponseData); + //--------------------------------------------------------------------------------// -#define VIEW_DEC_SLOT_ADJUSTMENTS \ - VIEW_DEC_SLOT(AdjustBloodDialysateResponseData) \ - VIEW_DEC_SLOT(AdjustDurationResponseData) +// The Adjustment child definition in cpp +#define VIEW_DEC_CLASS_ADJUSTMENT(vCLASS, vDATATYPE) \ + VIEW_DEC_CLASS(vCLASS) \ + VIEW_DEC_SLOT (vDATATYPE) //--------------------------------------------------------------------------------// -#include "vtreatmentbloodflow.h" -#include "vtreatmentdialysateflow.h" -#include "vtreatmentultrafiltration.h" -#include "vtreatmentpressureocclusion.h" -#include "vtreatmenttime.h" -#include "vtreatmentadjustmentsresponse.h" -#include "vtreatmentranges.h" -#include "valarmstatus.h" -#include "vpoweroff.h" +#define VIEW_DEF_CLASS_ADJUSTMENT(vCLASS, vDATATYPE) \ + using namespace View; \ + vCLASS::vCLASS(QObject *parent) : VTreatmentAdjustmentsResponse(parent) { \ + initConnections(); \ + } \ + VIEW_DEF_CONNECTION(vCLASS, vDATATYPE) +//--------------------------------------------------------------------------------// +