Index: denali.pro.user =================================================================== diff -u -rc241fc1d31be3e4958582dff94de8189f5bbba67 -r321e667cd58da515845f2173d5e1a59082823455 --- denali.pro.user (.../denali.pro.user) (revision c241fc1d31be3e4958582dff94de8189f5bbba67) +++ denali.pro.user (.../denali.pro.user) (revision 321e667cd58da515845f2173d5e1a59082823455) @@ -1,6 +1,6 @@ - + EnvironmentId @@ -89,7 +89,7 @@ Desktop Qt 5.12.5 GCC 64bit Desktop Qt 5.12.5 GCC 64bit qt.qt5.5125.gcc_64_kit - 9 + 1 0 0 @@ -100,7 +100,7 @@ qmake QtProjectManager.QMakeBuildStep - false + true false false @@ -1122,6 +1122,15 @@ 1 + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 @@ -1176,7 +1185,7 @@ false true - /home/denali/Projects/tmp/build/unittest/tst_views + /home/denali/Projects/tmp/build/denali-Desktop_Qt_5_12_5_GCC_64bit-Release 1 @@ -1187,7 +1196,7 @@ Qt 5.12.5 (iMX8) Qt 5.12.5 (iMX8) {5d6458ef-f917-4aef-a092-c77bbe106149} - 0 + 1 0 0 @@ -1198,7 +1207,7 @@ qmake QtProjectManager.QMakeBuildStep - false + true false false @@ -1414,6 +1423,15 @@ 1 + dwarf + + cpu-cycles + + + 250 + -F + true + 4096 false false 1000 Index: sources/VTreatmentBegin.cpp =================================================================== diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -r321e667cd58da515845f2173d5e1a59082823455 --- sources/VTreatmentBegin.cpp (.../VTreatmentBegin.cpp) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad) +++ sources/VTreatmentBegin.cpp (.../VTreatmentBegin.cpp) (revision 321e667cd58da515845f2173d5e1a59082823455) @@ -9,10 +9,10 @@ /** - * \brief VTreatmentBegin::onUserModifiedParameters + * \brief VTreatmentBegin::doUserModifiedParameters * Manages enabling / disabling the start treatment button */ -void VTreatmentBegin::onUserModifiedParameters() +void VTreatmentBegin::doUserModifiedParameters() { continueEnabled(true); emit continueEnabledChanged(continueEnabled()); Index: sources/VTreatmentBegin.h =================================================================== diff -u -r074b32b5cc08f41f2d9ce0d021f2151b76bba5ad -r321e667cd58da515845f2173d5e1a59082823455 --- sources/VTreatmentBegin.h (.../VTreatmentBegin.h) (revision 074b32b5cc08f41f2d9ce0d021f2151b76bba5ad) +++ sources/VTreatmentBegin.h (.../VTreatmentBegin.h) (revision 321e667cd58da515845f2173d5e1a59082823455) @@ -23,9 +23,7 @@ PROPERTY(bool, continueEnabled, false) private slots: - void onUserModifiedParameters(); - + void doUserModifiedParameters(); }; - } #endif // VTREATMENTSTART_H Index: sources/gui/qml/components/ConfirmTreatmentTable.qml =================================================================== diff -u -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f -r321e667cd58da515845f2173d5e1a59082823455 --- sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) +++ sources/gui/qml/components/ConfirmTreatmentTable.qml (.../ConfirmTreatmentTable.qml) (revision 321e667cd58da515845f2173d5e1a59082823455) @@ -101,10 +101,10 @@ anchors.bottom: parent.bottom width: parent.width - 2*Variables.createTreatmentMargin height: _root.height - _header.height - prescriptionKeys: vTreatmentCreate.getPrescriptionParameterNames() - prescriptionValues: vTreatmentCreate.getPrescriptionParameterValues() - operatingKeys: vTreatmentCreate.getOperatingParameterNames() - operatingValues: vTreatmentCreate.getOperatingParameterValues() + prescriptionKeys: vTreatmentCreate.doGetPrescriptionParameterNames() + prescriptionValues: vTreatmentCreate.doGetPrescriptionParameterValues() + operatingKeys: vTreatmentCreate.doGetOperatingParameterNames() + operatingValues: vTreatmentCreate.doGetOperatingParameterValues() onVisibleChanged: { if (visible) { prescriptionKeys = vTreatmentCreate.getPrescriptionParameterNames() Index: sources/gui/qml/pages/treatment/TreatmentStack.qml =================================================================== diff -u -rc241fc1d31be3e4958582dff94de8189f5bbba67 -r321e667cd58da515845f2173d5e1a59082823455 --- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision c241fc1d31be3e4958582dff94de8189f5bbba67) +++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 321e667cd58da515845f2173d5e1a59082823455) @@ -60,7 +60,7 @@ TreatmentHome { id: _treatmentHome onTreatmentStarted : push( _treatmentStart ) - onTreatmentCreated : vTreatmentCreate.onSelectingParameters() + onTreatmentCreated : vTreatmentCreate.doSelectParameters() } TreatmentStart { id: _treatmentStart @@ -85,23 +85,23 @@ } TreatmentCreate { id: _treatmentCreate - onClickedBack : {vTreatmentCreate.onCancelSelectingParameters() } - onClickedContinue : {vTreatmentCreate.onFinishedCreate(); } + onClickedBack : {vTreatmentCreate.doCancelSelectingParameters() } + onClickedContinue : {vTreatmentCreate.doFinishedCreate(); } } TreatmentConfirm { id: _treatmentConfirm - onClickedBack : {vTreatmentCreate.onCancelConfirmParameters() } - onClickedConfirm : {vTreatmentCreate.onFinishedConfirm(); } + onClickedBack : {vTreatmentCreate.doCancelConfirmParameters() } + onClickedConfirm : {vTreatmentCreate.doFinishedConfirm(); } } TreatmentPrime { id: _treatmentPrime - onClickedBack : {vTreatmentCreate.onRequestPop() } - onClickedContinue : {vTreatmentCreate.onFinishedPrime(); } + onClickedBack : {vTreatmentCreate.doRequestPop() } + onClickedContinue : {vTreatmentCreate.doFinishedPrime(); } } TreatmentBegin { id: _treatmentBegin - onClickedBack : {vTreatmentCreate.onRequestPop() } - onClickedStart : {vTreatmentCreate.onStartTreatment(); } + onClickedBack : {vTreatmentCreate.doRequestPop() } + onClickedStart : {vTreatmentCreate.doStartTreatment(); } } Index: sources/main.h =================================================================== diff -u -r0583a63307936f09e184dfe16acca25f9e3fd81c -r321e667cd58da515845f2173d5e1a59082823455 --- sources/main.h (.../main.h) (revision 0583a63307936f09e184dfe16acca25f9e3fd81c) +++ sources/main.h (.../main.h) (revision 321e667cd58da515845f2173d5e1a59082823455) @@ -266,24 +266,24 @@ READ NAME##Res \ WRITE NAME##Res \ NOTIFY NAME##ResChanged) \ - void set_##NAME(const TYPE &p##NAME) { \ - if ( !is##NAME##Set || _##NAME != p##NAME ) { \ - _##NAME = p##NAME; \ + void set_##NAME(const TYPE &v##NAME) { \ + if ( !is##NAME##Set || _##NAME != v##NAME ) { \ + _##NAME = v##NAME; \ is##NAME##Set = true; \ emit NAME##Changed(_##NAME); \ - onUserModifiedParameters(); \ + doUserModifiedParameters(); \ } \ DEBUG_TREATMENT_PARAMETER(#NAME, _##NAME) \ } \ TYPE NAME##Min() const { return _##NAME##Min; } \ - void NAME##Min(const TYPE &p##NAME##Min) \ - { _##NAME##Min = p##NAME##Min; emit NAME##MinChanged(_##NAME##Min);} \ + void NAME##Min(const TYPE &v##NAME##Min) \ + { _##NAME##Min = v##NAME##Min; emit NAME##MinChanged(_##NAME##Min);} \ TYPE NAME##Max() const { return _##NAME##Max; } \ - void NAME##Max(const TYPE &p##NAME##Max) \ - { _##NAME##Max = p##NAME##Max; emit NAME##MaxChanged(_##NAME##Max);} \ + void NAME##Max(const TYPE &v##NAME##Max) \ + { _##NAME##Max = v##NAME##Max; emit NAME##MaxChanged(_##NAME##Max);} \ TYPE NAME##Res() const { return _##NAME##Res; } \ - void NAME##Res(const TYPE &p##NAME##Res) \ - { _##NAME##Res = p##NAME##Res; emit NAME##ResChanged(_##NAME##Res);} \ + void NAME##Res(const TYPE &v##NAME##Res) \ + { _##NAME##Res = v##NAME##Res; emit NAME##ResChanged(_##NAME##Res);} \ TYPE get_##NAME() const { \ return _##NAME; \ } \ @@ -293,9 +293,9 @@ emit NAME##Changed(_##NAME); \ } \ Q_SIGNALS: \ - void NAME##Changed(const TYPE &p##NAME); \ - void NAME##MinChanged(const TYPE &p##NAME); \ - void NAME##MaxChanged(const TYPE &p##NAME); \ - void NAME##ResChanged(const TYPE &p##NAME); \ + void NAME##Changed(const TYPE &v##NAME); \ + void NAME##MinChanged(const TYPE &v##NAME); \ + void NAME##MaxChanged(const TYPE &v##NAME); \ + void NAME##ResChanged(const TYPE &v##NAME); \ void NAME##_ValidationFailed(const QString &reason); Index: sources/view/VPriming.cpp =================================================================== diff -u -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f -r321e667cd58da515845f2173d5e1a59082823455 --- sources/view/VPriming.cpp (.../VPriming.cpp) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) +++ sources/view/VPriming.cpp (.../VPriming.cpp) (revision 321e667cd58da515845f2173d5e1a59082823455) @@ -39,12 +39,14 @@ case STARTING: checkingInstallationComplete(false); creatingDialysateComplete(false); - checkingInstallationComplete(false); primingLinesComplete(false); primingComplete(false); -// TODO: Uncomment once FW supports priming -// continueEnabled(false); -// emit continueBtnTextChanged(); + /* + // Uncomment once FW supports priming + continueEnabled(false); + emit continueBtnTextChanged(); + */ + break; case CHECKING_INSTALLATION: break; case CREATING_DIALYSATE: Index: sources/view/VPriming.h =================================================================== diff -u -r0401b9a1fb6f89f0ec83571f2f868956c7500a0f -r321e667cd58da515845f2173d5e1a59082823455 --- sources/view/VPriming.h (.../VPriming.h) (revision 0401b9a1fb6f89f0ec83571f2f868956c7500a0f) +++ sources/view/VPriming.h (.../VPriming.h) (revision 321e667cd58da515845f2173d5e1a59082823455) @@ -47,7 +47,7 @@ PRIMING_COMPLETE }; - QString continueBtnText = "CONTINUE TO TREATMENT"; + QString continueBtnText = tr("CONTINUE TO TREATMENT"); Q_PROPERTY(QString continueBtnText READ getContinueBtnText NOTIFY continueBtnTextChanged) Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -r4d30a4bbefaf43966b88e7f76225bfce0242d889 -r321e667cd58da515845f2173d5e1a59082823455 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 4d30a4bbefaf43966b88e7f76225bfce0242d889) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision 321e667cd58da515845f2173d5e1a59082823455) @@ -34,7 +34,7 @@ &_GuiController, SLOT(doAdjustment(AdjustTreatmentParametersRequestData))); connect(&_GuiController, SIGNAL(didActionReceive(AdjustTreatmentParametersResponseData)), - this, SLOT(onFWValidationResponse(AdjustTreatmentParametersResponseData))); + this, SLOT(doActionReceive(AdjustTreatmentParametersResponseData))); connect(this, SIGNAL(requestSelectParameters(StartTreatmentRequestData)), &_GuiController, SLOT(doAdjustment(StartTreatmentRequestData))); @@ -43,7 +43,7 @@ &_GuiController, SLOT(doAdjustment(ConfirmTreatmentRequestData))); connect(&_GuiController, SIGNAL(didActionReceive(StartTreatmentResponseData)), - this, SLOT(onStartTreatmentResponse(StartTreatmentResponseData))); + this, SLOT(doActionReceive(StartTreatmentResponseData))); connect(this, SIGNAL(requestConcurrentSave(QString,QString,bool)), &_FileSaver, SLOT(onConcurrentSave(QString,QString,bool))); @@ -122,7 +122,7 @@ * Resets the create treatment page to the default values. * Disables the continue button. */ -void VTreatmentCreate::onResetCreateTreatment() +void VTreatmentCreate::doResetCreateTreatment() { reset_bloodFlowRate(); reset_dialysateFlowRate(); @@ -193,7 +193,7 @@ * \brief VCreateTreatment::onFinishedCreate * Validates the treatment profile locally, then requests validation of it with FW */ -void VTreatmentCreate::onFinishedCreate() { +void VTreatmentCreate::doFinishedCreate() { setTreatmentData(); @@ -235,7 +235,7 @@ * \param messageData The message data must contain the reject reason codes for all parameters * \returns True if FW OK's treatment parameters, false otherwise */ -bool VTreatmentCreate::onFWValidationResponse(AdjustTreatmentParametersResponseData data) { +bool VTreatmentCreate::doActionReceive(AdjustTreatmentParametersResponseData data) { bool success = true; if (data.bloodFlowRate != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) { @@ -340,12 +340,12 @@ } /** - * @brief VCreateTreatment::onStartTreatmentResponse + * @brief VCreateTreatment::doActionReceive * Called when we receive a response back from firmware after requesting * to start selecting treatment parameters, cancel, or start the treatment * @param messageData */ -void VTreatmentCreate::onStartTreatmentResponse(const StartTreatmentResponseData &messageData) +void VTreatmentCreate::doActionReceive(const StartTreatmentResponseData &messageData) { qDebug() << "Received response after start treatment request: " << messageData.startTreatmentResponse; if (messageData.startTreatmentResponse != 1) @@ -433,7 +433,7 @@ * who emits to application controller and the * application controller will save the data to disk. */ -void VTreatmentCreate::onFinishedConfirm() { +void VTreatmentCreate::doFinishedConfirm() { qDebug() << "Finished create treatment confirm..."; @@ -559,7 +559,7 @@ * Called when priming qml selections are complete. * TODO: Placed here for now. Likely will be moved eventually. */ -void VTreatmentCreate::onFinishedPrime() { +void VTreatmentCreate::doFinishedPrime() { qDebug() << "Finished create treatment prime..."; goToNextPage(true); @@ -569,7 +569,7 @@ * \brief VCreateTreatment::start * Called when user is ready to begin a new treatment. */ -void VTreatmentCreate::onStartTreatment() { +void VTreatmentCreate::doStartTreatment() { qDebug() << "Requesting to start a treatment..."; startTreatmentRequest.request = StartTreatmentRequestData::eStartTreatment; emit requestSelectParameters(startTreatmentRequest); @@ -762,10 +762,10 @@ } /** - * \brief VCreateTreatment::onUserModifiedParameters + * \brief VCreateTreatment::doUserModifiedParameters * Manages enabling / disabling the continue button */ -void VTreatmentCreate::onUserModifiedParameters() +void VTreatmentCreate::doUserModifiedParameters() { setTreatmentData(); @@ -774,11 +774,11 @@ } /*! - * \brief VCreateTreatment::getPrescriptionParameterNames + * \brief VCreateTreatment::doGetPrescriptionParameterNames * Gets a list of the prescription parameter names. * \return (QStringList) A list of the prescription parameter names */ -QStringList VTreatmentCreate::getPrescriptionParameterNames() +QStringList VTreatmentCreate::doGetPrescriptionParameterNames() { return QStringList() << "Blood Flow Rate" << "Dialysate Flow Rate" @@ -791,11 +791,11 @@ } /*! - * \brief VCreateTreatment::getPrescriptionParameterValues + * \brief VCreateTreatment::doGetPrescriptionParameterValues * Gets a list of the prescription parameter values * \return (QStringList) The list of parameter values with units */ -QStringList VTreatmentCreate::getPrescriptionParameterValues() +QStringList VTreatmentCreate::doGetPrescriptionParameterValues() { return QStringList() << QString("%0 mL/min").arg(_bloodFlowRate) << QString("%0 mL/min").arg(_dialysateFlowRate) @@ -807,11 +807,11 @@ } /*! - * \brief VCreateTreatment::getOperatingParameterNames + * \brief VCreateTreatment::doGetOperatingParameterNames * Gets a list of the operating parameter names * \return (QStringList) The list of operating parameter names */ -QStringList VTreatmentCreate::getOperatingParameterNames() +QStringList VTreatmentCreate::doGetOperatingParameterNames() { return QStringList() << "Acid Concentrate" << "Bicarbonate Concentrate" @@ -826,11 +826,11 @@ } /*! - * \brief VCreateTreatment::getOperatingParameterValues + * \brief VCreateTreatment::doGetOperatingParameterValues * Gets the operating parameter values * \return (QStringList) The list of operating parameter values with units where applicable */ -QStringList VTreatmentCreate::getOperatingParameterValues() +QStringList VTreatmentCreate::doGetOperatingParameterValues() { QString aConcentrate; QString bCarbConcentrate; @@ -860,32 +860,32 @@ } /** - * @brief VCreateTreatment::onSelectingParameters + * @brief VCreateTreatment::doSelectParameters * Sends a request to FW to start selecting treatment parameters */ -void VTreatmentCreate::onSelectingParameters() +void VTreatmentCreate::doSelectParameters() { qDebug() << "Sending request to FW to select parameters..."; startTreatmentRequest.request = StartTreatmentRequestData::eSelectParams; emit requestSelectParameters(startTreatmentRequest); } /** - * @brief VCreateTreatment::onCancelSelectingParameters + * @brief VCreateTreatment::doCancelSelectingParameters * Sends a request to FW to cancel selecting parameters */ -void VTreatmentCreate::onCancelSelectingParameters() +void VTreatmentCreate::doCancelSelectingParameters() { qDebug() << "Sending request to FW to cancel selecting parameters..."; startTreatmentRequest.request = StartTreatmentRequestData::eCancel; emit requestSelectParameters(startTreatmentRequest); } /** - * @brief VCreateTreatment::onCancelConfirmParameters + * @brief VCreateTreatment::doCancelConfirmParameters * Notifies FW the user has cancelled confirming the treatment parameters */ -void VTreatmentCreate::onCancelConfirmParameters() +void VTreatmentCreate::doCancelConfirmParameters() { // Tell FW we cancel confirm qDebug() << "Telling FW user is cancelling confirm treatment parameters..."; @@ -895,10 +895,10 @@ } /** - * @brief VCreateTreatment::onRequestPop + * @brief VCreateTreatment::doRequestPop * Navigates backward in the create treatment process. */ -void VTreatmentCreate::onRequestPop() +void VTreatmentCreate::doRequestPop() { goToNextPage(false); } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -r4d30a4bbefaf43966b88e7f76225bfce0242d889 -r321e667cd58da515845f2173d5e1a59082823455 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 4d30a4bbefaf43966b88e7f76225bfce0242d889) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision 321e667cd58da515845f2173d5e1a59082823455) @@ -152,22 +152,22 @@ void requestConcurrentSave(QString, QString, bool); public slots: - void onResetCreateTreatment(); - void onFinishedCreate(); - void onFinishedConfirm(); - void onFinishedPrime(); - void onStartTreatment(); - bool onFWValidationResponse(AdjustTreatmentParametersResponseData data); - void onStartTreatmentResponse(const StartTreatmentResponseData &messageData); - void onUserModifiedParameters(); - QStringList getPrescriptionParameterNames(); - QStringList getPrescriptionParameterValues(); - QStringList getOperatingParameterNames(); - QStringList getOperatingParameterValues(); - void onSelectingParameters(); - void onCancelConfirmParameters(); - void onCancelSelectingParameters(); - void onRequestPop(); + void doResetCreateTreatment(); + void doFinishedCreate(); + void doFinishedConfirm(); + void doFinishedPrime(); + void doStartTreatment(); + bool doActionReceive(AdjustTreatmentParametersResponseData data); + void doActionReceive(const StartTreatmentResponseData &messageData); + void doUserModifiedParameters(); + QStringList doGetPrescriptionParameterNames(); + QStringList doGetPrescriptionParameterValues(); + QStringList doGetOperatingParameterNames(); + QStringList doGetOperatingParameterValues(); + void doSelectParameters(); + void doCancelConfirmParameters(); + void doCancelSelectingParameters(); + void doRequestPop(); }; } Index: unittests/tst_views.cpp =================================================================== diff -u -r0583a63307936f09e184dfe16acca25f9e3fd81c -r321e667cd58da515845f2173d5e1a59082823455 --- unittests/tst_views.cpp (.../tst_views.cpp) (revision 0583a63307936f09e184dfe16acca25f9e3fd81c) +++ unittests/tst_views.cpp (.../tst_views.cpp) (revision 321e667cd58da515845f2173d5e1a59082823455) @@ -138,7 +138,7 @@ QCOMPARE(view.get_bloodPressureMeasureInterval(), view.bloodPressureMeasureIntervalMax()); QCOMPARE(view.get_rinsebackFlowRate(), view.rinsebackFlowRateMax()); - view.onFinishedCreate(); + view.doFinishedCreate(); } else { QCOMPARE(view.validate(view.treatmentData), false); @@ -304,7 +304,7 @@ QCOMPARE(view.validate(view.treatmentData), false); - view.onResetCreateTreatment(); + view.doResetCreateTreatment(); for (int i = 0; i < 17; ++i) { @@ -336,7 +336,7 @@ QCOMPARE(view.validate(view.treatmentData), false); - view.onFinishedCreate(); + view.doFinishedCreate(); } } @@ -671,28 +671,28 @@ if (i == 15) respData.heparinDispensingRate = 1; else respData.heparinDispensingRate = 0; if (i == 16) respData.heparinBolusVolume = 1; else respData.heparinBolusVolume = 0; if (i == 17) respData.dialysateTemp = 1; else respData.dialysateTemp = 0; - QVERIFY(!view.onFWValidationResponse(respData)); + QVERIFY(!view.doActionReceive(respData)); } AdjustTreatmentParametersRequestData dataBackup = view.treatmentData; AdjustTreatmentParametersResponseData respData; - QVERIFY(view.onFWValidationResponse(respData)); + QVERIFY(view.doActionReceive(respData)); view.saveTreatmentProfile(false); QVERIFY(!view._saveTreatmentProfile); - view.onFinishedConfirm(); + view.doFinishedConfirm(); view.saveTreatmentProfile(true); QVERIFY(view._saveTreatmentProfile); - view.onFinishedConfirm(); + view.doFinishedConfirm(); view.onFinishedSaveNewTreatment(true); view.onFinishedSaveNewTreatment(false); - view.onFinishedPrime(); - view.onStartTreatment(); + view.doFinishedPrime(); + view.doStartTreatment(); QCOMPARE(view.treatmentData.bloodFlowRate, dataBackup.bloodFlowRate); QCOMPARE(view.treatmentData.dialysateFlowRate, dataBackup.dialysateFlowRate);