Index: denali.pro.user =================================================================== diff -u -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- denali.pro.user (.../denali.pro.user) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) +++ denali.pro.user (.../denali.pro.user) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -1,6 +1,6 @@ - + EnvironmentId Index: en_US.udic =================================================================== diff -u -re2dc7bd9995a3bb410aa472a1f95c1cc9ba3136d -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- en_US.udic (.../en_US.udic) (revision e2dc7bd9995a3bb410aa472a1f95c1cc9ba3136d) +++ en_US.udic (.../en_US.udic) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -198,3 +198,4 @@ Unmounts bluetooth vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv +dialyzer Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -r77f3f723a4f59871f5fe66942df028d60a20fe52 -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 77f3f723a4f59871f5fe66942df028d60a20fe52) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -518,6 +518,7 @@ mData += vData.duration ; mData += vData.heparinStopTime ; mData += vData.salineBolus ; + mData += vData.heparinType ; mData += vData.acidConcentrate ; mData += vData.bicarbonateConcentrate ; mData += vData.dialyzerType ; Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r161d1431cc3507cd430f54af6aa47dab5145d472 -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 161d1431cc3507cd430f54af6aa47dab5145d472) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -138,8 +138,8 @@ {Gui::GuiActionType::ID_AdjustInitTreatmentReq , 1 * 4 }, // 1 parameters each 4bytes {Gui::GuiActionType::ID_AdjustInitTreatmentRsp , 2 * 4 }, // 2 parameters each 4bytes // Pre-Treatment Treatment Parameters Validation/Confirm - {Gui::GuiActionType::ID_AdjustParametersValidationReq , 17 * 4 }, //17 parameters each 4bytes - {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 18 * 4 }, //18 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustParametersValidationReq , 18 * 4 }, //18 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 19 * 4 }, //19 parameters each 4bytes {Gui::GuiActionType::ID_AdjustParametersConfirmReq , 1 * 4 }, // 1 parameters each 4bytes // Pre-Treatment Water Sample {Gui::GuiActionType::ID_DGFilterFlushData , 2 * 4 }, // 2 parameters each 4bytes Index: sources/gui/qml/components/SliderCreateTreatment.qml =================================================================== diff -u -r9327fae7b109203ca698d361b113a81d139a0cf9 -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 9327fae7b109203ca698d361b113a81d139a0cf9) +++ sources/gui/qml/components/SliderCreateTreatment.qml (.../SliderCreateTreatment.qml) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -25,7 +25,7 @@ * \brief Slider component with a title and the currently selected value */ Rectangle { id: _root - + // TODO: This Component needs a cleanup property alias text: _text.text property var units: "" property alias min: _slider.minimum Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r8a5dbf556a66524fbe4b60ac1573182a0bd27617 -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 8a5dbf556a66524fbe4b60ac1573182a0bd27617) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -204,6 +204,16 @@ font.bold: true } + GridSelection { id: _heparinType + objectName: "_heparinTypeRect" + name: qsTr("Heparin Type") + numRows: 1 + buttonNames: vTreatmentCreate.heparinTypeOptions + onButtonClicked: { + vTreatmentCreate.heparinType = selectedIndex + } + } + GridSelection { id: _acidConcentrate objectName : "_acidConcentrateRect" name : qsTr("Acid Concentrate") Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml =================================================================== diff -u -rc4bd7072571428744e11dd24d5da1d1a3e1d1686 -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision c4bd7072571428744e11dd24d5da1d1a3e1d1686) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateStack.qml (.../PreTreatmentCreateStack.qml) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -99,7 +99,7 @@ } Connections { target: _pretreatmentCreate - onBackClicked : { pageoPatientID ()} + onBackClicked : { pagePatientID ()} onConfirmClicked : { vTreatmentCreate.doValidation ()} } Index: sources/main.h =================================================================== diff -u -raa873f8620e3f402bf60827e9c54623b5e09280e -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- sources/main.h (.../main.h) (revision aa873f8620e3f402bf60827e9c54623b5e09280e) +++ sources/main.h (.../main.h) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -22,7 +22,8 @@ // Application #define PRINT_THREAD_NAME_ENABLE 0 #if (PRINT_THREAD_NAME_ENABLE) - #define PRINT_THREAD_NAME qDebug() << " ----- " << QThread::currentThread()->objectName() << __func__ ; + #include + #define PRINT_THREAD_NAME qDebug() << " ----- " << QThread::currentThread()->objectName() << metaObject()->className() << __func__ ; #else #define PRINT_THREAD_NAME #endif Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -35,24 +35,25 @@ * * | Payload || * | || - * | #1:(U32) | \ref Data::mAccepted | - * | #2:(U32) | \ref Data::bloodFlowRate | - * | #3:(U32) | \ref Data::dialysateFlowRate | - * | #4:(U32) | \ref Data::duration | - * | #5:(U32) | \ref Data::heparinStopTime | - * | #6:(U32) | \ref Data::salineBolus | - * | #7:(U32) | \ref Data::acidConcentrate | - * | #8:(U32) | \ref Data::bicarbonateConcentrate | - * | #9:(U32) | \ref Data::dialyzerType | - * | #10:(U32) | \ref Data::bloodPressureMeasureInterval | - * | #11:(U32) | \ref Data::rinsebackFlowRate | - * | #12:(U32) | \ref Data::arterialPressureLimitLow | - * | #13:(U32) | \ref Data::arterialPressureLimitHigh | - * | #14:(U32) | \ref Data::venousPressureLimitLow | - * | #15:(U32) | \ref Data::venousPressureLimitHigh | - * | #16:(U32) | \ref Data::heparinDispensingRate | - * | #17:(U32) | \ref Data::heparinBolusVolume | - * | #18:(U32) | \ref Data::dialysateTemp | + * | #01:(U32) | \ref Data::mAccepted | + * | #02:(U32) | \ref Data::bloodFlowRate | + * | #03:(U32) | \ref Data::dialysateFlowRate | + * | #04:(U32) | \ref Data::duration | + * | #05:(U32) | \ref Data::heparinStopTime | + * | #06:(U32) | \ref Data::salineBolus | + * | #07:(U32) | \ref Data::heparinType | + * | #08:(U32) | \ref Data::acidConcentrate | + * | #09:(U32) | \ref Data::bicarbonateConcentrate | + * | #10:(U32) | \ref Data::dialyzerType | + * | #11:(U32) | \ref Data::bloodPressureMeasureInterval | + * | #12:(U32) | \ref Data::rinsebackFlowRate | + * | #13:(U32) | \ref Data::arterialPressureLimitLow | + * | #14:(U32) | \ref Data::arterialPressureLimitHigh | + * | #15:(U32) | \ref Data::venousPressureLimitLow | + * | #16:(U32) | \ref Data::venousPressureLimitHigh | + * | #17:(U32) | \ref Data::heparinDispensingRate | + * | #18:(U32) | \ref Data::heparinBolusVolume | + * | #19:(U32) | \ref Data::dialysateTemp | * * \sa Data * @@ -72,23 +73,24 @@ struct { Types::U32 mAccepted ; - Types::U32 bloodFlowRate ; - Types::U32 dialysateFlowRate ; - Types::U32 duration ; - Types::U32 heparinStopTime ; - Types::U32 salineBolus ; - Types::U32 acidConcentrate ; - Types::U32 bicarbonateConcentrate ; - Types::U32 dialyzerType ; - Types::U32 bloodPressureMeasureInterval ; - Types::U32 rinsebackFlowRate ; - Types::U32 arterialPressureLimitLow ; - Types::U32 arterialPressureLimitHigh ; - Types::U32 venousPressureLimitLow ; - Types::U32 venousPressureLimitHigh ; - Types::U32 heparinDispensingRate ; - Types::U32 heparinBolusVolume ; - Types::U32 dialysateTemp ; + Types::U32 bloodFlowRate ; ///< User set blood flow rate (in mL/min) + Types::U32 dialysateFlowRate ; ///< User set dialysate flow rate (in mL/min) + Types::U32 duration ; ///< User set treatment duration (in min) + Types::U32 heparinStopTime ; ///< User set heparin pre-stop time (in min) + Types::U32 salineBolus ; ///< User set saline bolus volume (in mL) + Types::U32 heparinType ; ///< User set heparin type option + Types::U32 acidConcentrate ; ///< User set acid concentrate option + Types::U32 bicarbonateConcentrate ; ///< User set bicarbonate concentrate option + Types::U32 dialyzerType ; ///< User set dialyzer type option + Types::U32 bloodPressureMeasureInterval ; ///< User set blood pressure measurement interval (in min) + Types::U32 rinsebackFlowRate ; ///< User set rinseback flow rate (in mL/min) + Types::U32 arterialPressureLimitLow ; ///< User set lower alarm limit for arterial pressure (in mmHg) + Types::U32 arterialPressureLimitHigh ; ///< User set upper alarm limit for arterial pressure (in mmHg) + Types::U32 venousPressureLimitLow ; ///< User set lower alarm limit for venous pressure (in mmHg) + Types::U32 venousPressureLimitHigh ; ///< User set upper alarm limit for venous pressure (in mmHg) + Types::U32 heparinDispensingRate ; ///< User set heparin dispense rate (in mL/hr) + Types::U32 heparinBolusVolume ; ///< User set heparin bolus volume (in mL) + Types::U32 dialysateTemp ; ///< User set dialysate temperature (in deg C) } _data; public: @@ -104,6 +106,7 @@ quint32 duration = 0; quint32 heparinStopTime = 0; quint32 salineBolus = 0; + quint32 heparinType = 0; quint32 acidConcentrate = 0; quint32 bicarbonateConcentrate = 0; quint32 dialyzerType = 0; Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -75,23 +75,24 @@ * * | Payload || * | || - * | #1:(U32) | \ref bloodFlowRate | - * | #2:(U32) | \ref dialysateFlowRate | - * | #3:(U32) | \ref duration | - * | #4:(U32) | \ref heparinStopTime | - * | #5:(U32) | \ref salineBolus | - * | #6:(U32) | \ref acidConcentrate | - * | #7:(U32) | \ref bicarbonateConcentrate | - * | #8:(U32) | \ref dialyzerType | - * | #9:(U32) | \ref bloodPressureMeasureInterval | - * | #10:(U32) | \ref rinsebackFlowRate | - * | #11:(S32) | \ref arterialPressureLimitLow | - * | #12:(S32) | \ref arterialPressureLimitHigh | - * | #13:(S32) | \ref venousPressureLimitLow | - * | #14:(S32) | \ref venousPressureLimitHigh | - * | #15:(F32) | \ref heparinDispensingRate | - * | #16:(F32) | \ref heparinBolusVolume | - * | #17:(F32) | \ref dialysateTemp | + * | #01:(U32) | \ref bloodFlowRate | + * | #02:(U32) | \ref dialysateFlowRate | + * | #03:(U32) | \ref duration | + * | #04:(U32) | \ref heparinStopTime | + * | #05:(U32) | \ref salineBolus | + * | #06:(U32) | \ref heparinType | + * | #07:(U32) | \ref acidConcentrate | + * | #08:(U32) | \ref bicarbonateConcentrate | + * | #09:(U32) | \ref dialyzerType | + * | #10:(U32) | \ref bloodPressureMeasureInterval | + * | #11:(U32) | \ref rinsebackFlowRate | + * | #12:(S32) | \ref arterialPressureLimitLow | + * | #13:(S32) | \ref arterialPressureLimitHigh | + * | #14:(S32) | \ref venousPressureLimitLow | + * | #15:(S32) | \ref venousPressureLimitHigh | + * | #16:(F32) | \ref heparinDispensingRate | + * | #17:(F32) | \ref heparinBolusVolume | + * | #18:(F32) | \ref dialysateTemp | * */ class MAdjustParametersValidationReq : public MModel { @@ -102,9 +103,10 @@ quint32 duration = 0; // minutes quint32 heparinStopTime = 0; // min quint32 salineBolus = 0; // mL - quint32 acidConcentrate = 0; // - quint32 bicarbonateConcentrate = 0; // - quint32 dialyzerType = 0; // + quint32 heparinType = 0; // + quint32 acidConcentrate = 0; // + quint32 bicarbonateConcentrate = 0; // + quint32 dialyzerType = 0; // quint32 bloodPressureMeasureInterval = 0; // minutes quint32 rinsebackFlowRate = 0; // mL/min qint32 arterialPressureLimitLow = 0; // mmHg @@ -124,6 +126,7 @@ duration , heparinStopTime , salineBolus , + heparinType , acidConcentrate , bicarbonateConcentrate , dialyzerType , @@ -162,7 +165,7 @@ enum Options { eCancel = 0, eConfirm = 1 - }; + }; Options requestedState = eConfirm; // coco begin validated : Has been validated manually. // This object is used statically for now, kept the logic for later usage. Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r6b132368f2d26c6d869ed910ee4910282c192d75 -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 6b132368f2d26c6d869ed910ee4910282c192d75) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -50,6 +50,7 @@ reset_heparinBolusVolume(); reset_heparinStopTime(); reset_salineBolusVolume(); + reset_heparinType(); reset_acidConcentrate(); reset_bicarbonateConcentrate(); reset_dialyzerType(); @@ -72,24 +73,25 @@ */ void VTreatmentCreate::setTreatmentData() { - treatmentData.bloodFlowRate = _bloodFlowRate; - treatmentData.dialysateFlowRate = _dialysateFlowRate; - treatmentData.duration = _duration; - treatmentData.heparinDispensingRate = _heparinDispensingRate; - treatmentData.heparinBolusVolume = _heparinBolusVolume; - treatmentData.heparinStopTime = _heparinStopTime; - treatmentData.salineBolus = _salineBolusVolume; + treatmentData.bloodFlowRate = _bloodFlowRate; + treatmentData.dialysateFlowRate = _dialysateFlowRate; + treatmentData.duration = _duration; + treatmentData.heparinDispensingRate = _heparinDispensingRate; + treatmentData.heparinBolusVolume = _heparinBolusVolume; + treatmentData.heparinStopTime = _heparinStopTime; + treatmentData.salineBolus = _salineBolusVolume; - treatmentData.acidConcentrate = _acidConcentrate; - treatmentData.bicarbonateConcentrate = _bicarbonateConcentrate; - treatmentData.dialyzerType = _dialyzerType; - treatmentData.dialysateTemp = _dialysateTemp; - treatmentData.arterialPressureLimitLow = _arterialPressureLimitLow; - treatmentData.arterialPressureLimitHigh = _arterialPressureLimitHigh; - treatmentData.venousPressureLimitLow = _venousPressureLimitLow; - treatmentData.venousPressureLimitHigh = _venousPressureLimitHigh; - treatmentData.bloodPressureMeasureInterval = _bloodPressureMeasureInterval; - treatmentData.rinsebackFlowRate = _rinsebackFlowRate; + treatmentData.heparinType = _heparinType; + treatmentData.acidConcentrate = _acidConcentrate; + treatmentData.bicarbonateConcentrate = _bicarbonateConcentrate; + treatmentData.dialyzerType = _dialyzerType; + treatmentData.dialysateTemp = _dialysateTemp; + treatmentData.arterialPressureLimitLow = _arterialPressureLimitLow; + treatmentData.arterialPressureLimitHigh = _arterialPressureLimitHigh; + treatmentData.venousPressureLimitLow = _venousPressureLimitLow; + treatmentData.venousPressureLimitHigh = _venousPressureLimitHigh; + treatmentData.bloodPressureMeasureInterval = _bloodPressureMeasureInterval; + treatmentData.rinsebackFlowRate = _rinsebackFlowRate; } /** @@ -117,6 +119,7 @@ * \note Finished create treatment confirm... */ void VTreatmentCreate::doConfirm() { + AdjustParametersConfirmRequestData confirmTreatmentRequest; confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eConfirm; emit didAdjustment(confirmTreatmentRequest); } @@ -128,6 +131,7 @@ */ void VTreatmentCreate::doCancel() { + AdjustParametersConfirmRequestData confirmTreatmentRequest; confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eCancel; emit didAdjustment(confirmTreatmentRequest); } @@ -202,6 +206,11 @@ success = false; emit dialyzerType_ValidationFailed(enumToString(static_cast(data.dialyzerType))); } + if (data.heparinType != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) { + if (success) emit scrollToParameter(GET_VARIABLE_NAME(data.heparinType)); + success = false; + emit heparinType_ValidationFailed(enumToString(static_cast(data.heparinType))); + } if (data.dialysateTemp != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) { if (success) emit scrollToParameter(GET_VARIABLE_NAME(data.dialysateTemp)); success = false; @@ -269,6 +278,7 @@ if (!isheparinBolusVolumeSet ) return false; if (!isheparinStopTimeSet ) return false; if (!issalineBolusVolumeSet ) return false; + if (!isheparinTypeSet ) return false; if (!isacidConcentrateSet ) return false; if (!isbicarbonateConcentrateSet ) return false; if (!isdialyzerTypeSet ) return false; @@ -334,7 +344,8 @@ */ QStringList VTreatmentCreate::doGetOperatingParameterNames() { - return QStringList() << "Acid Concentrate" + return QStringList() << "Heparin Type" + << "Acid Concentrate" << "Bicarbonate Concentrate" << "Dialyzer Type" << "Dialysate Temperature" @@ -353,24 +364,34 @@ */ QStringList VTreatmentCreate::doGetOperatingParameterValues() { - QString aConcentrate; - QString bCarbConcentrate; - QString dType; + QString heparinType; + QString acidConcentrate; + QString bicarbConcentrate; + QString dialyzerType; + if ((heparinTypeOptions().length() - 1 < (int)_heparinType)) + heparinType = "None"; + else + heparinType = heparinTypeOptions().at(_heparinType); + if ((acidConcentrateOptions().length() - 1 < (int)_acidConcentrate)) - aConcentrate = "None"; + acidConcentrate = "None"; else - aConcentrate = acidConcentrateOptions().at(acidConcentrate()); + acidConcentrate = acidConcentrateOptions().at(_acidConcentrate); + if ((bicarbonateConcentrateOptions().length() - 1 < (int)_bicarbonateConcentrate)) - bCarbConcentrate = "None"; + bicarbConcentrate = "None"; else - bCarbConcentrate = bicarbonateConcentrateOptions().at(bicarbonateConcentrate()); + bicarbConcentrate = bicarbonateConcentrateOptions().at(_bicarbonateConcentrate); + if ((dialyzerTypeOptions().length() - 1 < (int)_dialyzerType) || ((int)_dialyzerType < 0)) - dType = "None"; + dialyzerType = "None"; else - dType = dialyzerTypeOptions().at(dialyzerType()); - return QStringList() << aConcentrate - << bCarbConcentrate - << dType + dialyzerType = dialyzerTypeOptions().at(_dialyzerType); + + return QStringList() << heparinType + << acidConcentrate + << bicarbConcentrate + << dialyzerType << QString("%0 °C").arg(_dialysateTemp) << QString("%0 mmHg").arg(_arterialPressureLimitLow) << QString("%0 mmHg").arg(_arterialPressureLimitHigh) @@ -391,8 +412,8 @@ */ void VTreatmentCreate::onSettingsDone() { + heparinTypeOptions ( _Settings.keys("Heparin Type" )); acidConcentrateOptions ( _Settings.keys("Acid Concentrate" )); bicarbonateConcentrateOptions ( _Settings.keys("Bicarbonate Concentrate" )); dialyzerTypeOptions ( _Settings.keys("Dialyzer Type" )); - heparinTypeOptions ( _Settings.keys("Heparin Type" )); } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r6b132368f2d26c6d869ed910ee4910282c192d75 -r7914ad8a4b8450d855fcc75855ca57b6644e9f7c --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 6b132368f2d26c6d869ed910ee4910282c192d75) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 7914ad8a4b8450d855fcc75855ca57b6644e9f7c) @@ -106,10 +106,9 @@ const quint32 salineBolusVolume_Max = 300 ; // PRS 350 const quint32 salineBolusVolume_Res = 100 ; // PRS 350 + const quint32 heparinType_Res = 1 ; // PRS ??? const quint32 acidConcentrate_Res = 1 ; // PRS 35 - const quint32 bicarbonateConcentrate_Res = 1 ; // PRS 351 - const quint32 dialyzerType_Res = 1 ; // PRS 352 // Celsius @@ -173,6 +172,11 @@ eDialyzer03 , }; + enum HEPARIN_ENUM { + eHeparinUnset = 9999, + eHeparin01 = 0, + }; + protected: TREATMENT_PARAMETER(quint32, bloodFlowRate, bloodFlowRate_Def, bloodFlowRate_Min, bloodFlowRate_Max, bloodFlowRate_Res) TREATMENT_PARAMETER(quint32, dialysateFlowRate, dialysateFlowRate_Def, dialysateFlowRate_Min, dialysateFlowRate_Max, dialysateFlowRate_Res) @@ -182,6 +186,7 @@ TREATMENT_PARAMETER(quint32, heparinStopTime, heparinStopTime_Def, heparinStopTime_Min, heparinStopTime_Max, heparinStopTime_Res) TREATMENT_PARAMETER(quint32, salineBolusVolume, salineBolusVolume_Def, salineBolusVolume_Min, salineBolusVolume_Max, salineBolusVolume_Res) + TREATMENT_PARAMETER(quint32, heparinType, eHeparinUnset, eHeparin01, eHeparin01, heparinType_Res) TREATMENT_PARAMETER(quint32, acidConcentrate, eAcidUnset, eAcid01, eAcid03, acidConcentrate_Res) TREATMENT_PARAMETER(quint32, bicarbonateConcentrate, eBicarbUnset, eBicarb01, eBicarb01, bicarbonateConcentrate_Res) TREATMENT_PARAMETER(quint32, dialyzerType, eDialyzerUnset, eDialyzer01, eDialyzer03, dialyzerType_Res) @@ -195,7 +200,6 @@ TREATMENT_PARAMETER(quint32, rinsebackFlowRate, rinsebackFlowRate_Def, rinsebackFlowRate_Min, rinsebackFlowRate_Max, rinsebackFlowRate_Res) protected: - PROPERTY(QString , patientID , "") PROPERTY(QStringList, acidConcentrateOptions , {}) PROPERTY(QStringList, bicarbonateConcentrateOptions , {}) @@ -204,7 +208,6 @@ PROPERTY(bool , continueEnabled , false) AdjustParametersValidationRequestData treatmentData; // OK - AdjustParametersConfirmRequestData confirmTreatmentRequest; bool validate(const AdjustParametersValidationRequestData &vData); void setTreatmentData();