Index: sources/gui/qml/main.qml =================================================================== diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/gui/qml/main.qml (.../main.qml) (revision f148379112a69d1c52027f2667e95f3f96d948ad) +++ sources/gui/qml/main.qml (.../main.qml) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -164,22 +164,7 @@ NotificationBar { id: _alarm anchors.bottom: _mainMenu.top level : vAlarmStatus.alarm_Priority - text : - //vAlarmStatus.alarmPriorityName(vAlarmStatus.alarm_Priority) + " , " + - vAlarmStatus.alarmIDName (vAlarmStatus.alarm_AlarmID) + " , " + - vAlarmStatus.alarm_EscalateIn + " , " + - vAlarmStatus.alarm_MuteTimeout + " [" + - (vAlarmStatus.alarm_Flag_systemFault ? "1" : "0" ) + " " + - (vAlarmStatus.alarm_Flag_stop ? "1" : "0" ) + " " + - (vAlarmStatus.alarm_Flag_noClear ? "1" : "0" ) + " " + - (vAlarmStatus.alarm_Flag_noResume ? "1" : "0" ) + " " + - (vAlarmStatus.alarm_Flag_noRinseback ? "1" : "0" ) + " " + - (vAlarmStatus.alarm_Flag_noEndTreatment ? "1" : "0" ) + " " + - (vAlarmStatus.alarm_Flag_noNewTreatment ? "1" : "0" ) + " " + - (vAlarmStatus.alarm_Flag_bypassDialyzer ? "1" : "0" ) + " " + - (vAlarmStatus.alarm_Flag_alarmsToEscalate ? "1" : "0" ) + " " + - (vAlarmStatus.alarm_Flag_alarmsSilenced ? "1" : "0" ) + "]" - + text : vAlarmStatus.text() } // 9 - Others Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml =================================================================== diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision f148379112a69d1c52027f2667e95f3f96d948ad) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentFlow.qml (.../TreatmentAdjustmentFlow.qml) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -42,20 +42,21 @@ property string unit : qsTr("mL/min") property int textWidth : 200 + onAboutToShow: { + // TODO : When Testing data on Setting screen is removed + // This needs to be moved into the Treatment______.qml + bloodFlowRateValue = vTreatmentBloodFlow. bloodFlow_FlowSetPoint + dialysateFlowRateValue = vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint + } + VTreatmentAdjustmentsResponse { id: vTreatmentAdjustmentsResponse onAdjustment_TriggeredChanged: { - // TODO : This is a work around, I can't find out why binding is not working - _bloodFlowSlider .value = vTreatmentAdjustmentsResponse. bloodFlow_MeasuredFlow - _dialysateFlowSlider.value = vTreatmentAdjustmentsResponse.dialysateFlow_MeasuredFlow - if ( adjustment_Accepted ) { accept() } else { - notificationText = // adjustment_Reason - adjustment_Accepted + " , " + - vTreatmentAdjustmentsResponse.reasonName(adjustment_Reason) + " , " + - bloodFlow_MeasuredFlow + " , " + - dialysateFlow_MeasuredFlow; + _bloodFlowSlider .value = vTreatmentAdjustmentsResponse. bloodFlow_FlowSetPoint; + _dialysateFlowSlider.value = vTreatmentAdjustmentsResponse.dialysateFlow_FlowSetPoint; + notificationText = vTreatmentAdjustmentsResponse.text(); } } } @@ -87,8 +88,6 @@ unit : _root.unit step : Variables.bloodFlowResolution ticks : true - // TODO : I can't find out why binding is not working - value : vTreatmentAdjustmentsResponse.bloodFlow_MeasuredFlow } } Line { @@ -117,8 +116,6 @@ unit : _root.unit step : Variables.dialysateFlowResolution ticks : true - // TODO : I can't find out why binding is not working - value : vTreatmentAdjustmentsResponse.dialysateFlow_MeasuredFlow } } } Index: sources/main.h =================================================================== diff -u -rfef563aa317eb3e025e2dab0264e854f05a216d6 -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/main.h (.../main.h) (revision fef563aa317eb3e025e2dab0264e854f05a216d6) +++ sources/main.h (.../main.h) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -50,7 +50,7 @@ extern bool gDisableHunhandledReport; //--------------------------------------------------------------------------------// //--------------------------------------------------------------------------------// -#define DEBUG_PROPERTY_CHANGED(vVARIABLE) qDebug() << "#" << #vVARIABLE << v##vVARIABLE; +#define DEBUG_PROPERTY_CHANGED(vVARIABLE) //qDebug() << "#" << #vVARIABLE << v##vVARIABLE; #define PROPERTY(vTYPE , vVARIABLE , vDEFVALUE, vALWAYSEMIT ) \ Q_PROPERTY(vTYPE vVARIABLE \ READ vVARIABLE \ Index: sources/model/mtreatmentadjustblooddialysateresponse.h =================================================================== diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/model/mtreatmentadjustblooddialysateresponse.h (.../mtreatmentadjustblooddialysateresponse.h) (revision f148379112a69d1c52027f2667e95f3f96d948ad) +++ sources/model/mtreatmentadjustblooddialysateresponse.h (.../mtreatmentadjustblooddialysateresponse.h) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -44,7 +44,7 @@ QString toString ( ) const ; void toVariantList ( QVariantList &vData ) const ; - bool fromByteArray(const QByteArray &vByteArray ); + bool fromByteArray (const QByteArray &vByteArray ); Data data() const; }; Index: sources/model/mtreatmentranges.h =================================================================== diff -u -r8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6 -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/model/mtreatmentranges.h (.../mtreatmentranges.h) (revision 8f6f7c11390e3ed6d918f1717d8e8b7ae5b7e5c6) +++ sources/model/mtreatmentranges.h (.../mtreatmentranges.h) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -27,8 +27,8 @@ struct Data { quint32 mDuration_Min = 0; /*!< mDuration_Min value of type U32 extracted out */ quint32 mDuration_Max = 0; /*!< mDuration_Max value of type U32 extracted out */ - float mUltrafiltration_Volume_Min = 0; /*!< mUltrafiltration_Volume_Min value of type float extracted out */ - float mUltrafiltration_Volume_Max = 0; /*!< mUltrafiltration_Volume_Max value of type float extracted out */ + quint32 mUltrafiltration_Volume_Min = 0; /*!< mUltrafiltration_Volume_Min value of type float extracted out */ + quint32 mUltrafiltration_Volume_Max = 0; /*!< mUltrafiltration_Volume_Max value of type float extracted out */ quint32 mDialysate_Flow_Min = 0; /*!< mDialysate_Flow_Min value of type U32 extracted out */ quint32 mDialysate_Flow_Max = 0; /*!< mDialysate_Flow_Max value of type U32 extracted out */ }; @@ -37,8 +37,8 @@ struct { Types::U32 mDuration_Min ; Types::U32 mDuration_Max ; - Types::F32 mUltrafiltration_Volume_Min ; - Types::F32 mUltrafiltration_Volume_Max ; + Types::U32 mUltrafiltration_Volume_Min ; + Types::U32 mUltrafiltration_Volume_Max ; Types::U32 mDialysate_Flow_Min ; Types::U32 mDialysate_Flow_Max ; } _data; Index: sources/storage/filehandler.cpp =================================================================== diff -u -rc6a09899d2e46dc0bda5a6b994aa257953626f97 -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/storage/filehandler.cpp (.../filehandler.cpp) (revision c6a09899d2e46dc0bda5a6b994aa257953626f97) +++ sources/storage/filehandler.cpp (.../filehandler.cpp) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -16,9 +16,9 @@ //Qt #include #include -#include -#include +#include + // Project #include "storageglobals.h" #include "logger.h" @@ -35,14 +35,22 @@ * \param vAppend - if set to true the content will be appended at the end of the file. * \return false if file can't be opened. */ +void FileHandler::errOut(const QString &vMessage) +{ + QString mCritical = vMessage; + //qCritical(mCritical.toLatin1().constData()); + QTextStream err(stderr); + err << mCritical << endl; +} + bool FileHandler::write(const QString &vFileName, const QString &vContent, bool vAppend) { QFile file(vFileName); QIODevice::OpenMode openMode = vAppend ? QFile::Text | QFile::Append : QFile::Text | QFile::WriteOnly; if (! file.open(openMode)) { - LOG_ERROR(QObject::tr("Can't open file for write (%1)").arg(vFileName)); + errOut(QObject::tr("Can't open file for write (%1).Possible corrupted file system").arg(vFileName)); return false; } QTextStream out(&file); @@ -62,7 +70,7 @@ { QFile file(vFileName); if (! file.open(QFile::Text | QFile::ReadOnly)) { - LOG_ERROR(QObject::tr("Can't open file for read (%1)").arg(vFileName)); + errOut(QObject::tr("Can't open file for read (%1).Possible corrupted file system").arg(vFileName)); return false; } QTextStream in(&file); Index: sources/storage/filehandler.h =================================================================== diff -u -rc6a09899d2e46dc0bda5a6b994aa257953626f97 -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/storage/filehandler.h (.../filehandler.h) (revision c6a09899d2e46dc0bda5a6b994aa257953626f97) +++ sources/storage/filehandler.h (.../filehandler.h) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -27,6 +27,8 @@ */ class FileHandler { + static void errOut(const QString &vMessage); + public: static bool write(const QString &vFileName, const QString &vContent, bool vAppend = true); static bool read (const QString &vFileName, QString &vContent); Index: sources/view/valarmstatus.cpp =================================================================== diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision f148379112a69d1c52027f2667e95f3f96d948ad) +++ sources/view/valarmstatus.cpp (.../valarmstatus.cpp) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -39,14 +39,14 @@ } /*! - * \brief VAlarmStatus::alarmPriorityName + * \brief VAlarmStatus::alarmPriorityText * \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 Alarm priority * \return String representation of the Alarm priority Enum name */ -QString VAlarmStatus::alarmPriorityName(GuiAlarmPriority vEnum) +QString VAlarmStatus::alarmPriorityText(GuiAlarmPriority vEnum) { // TEST : this code is the place holder for the alarms description mapping // since it is another feature @@ -57,14 +57,14 @@ } /*! - * \brief VAlarmStatus::alarmIDName + * \brief VAlarmStatus::alarmIDText * \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 Alarm ID * \return String representation of the Alarm Id Enum name */ -QString VAlarmStatus::alarmIDName(GuiAlarmID vEnum) +QString VAlarmStatus::alarmIDText(GuiAlarmID vEnum) { // TEST : this code is the place holder for the alarms description mapping // since it is another feature @@ -73,3 +73,23 @@ int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); return mo->enumerator(enumIdx).valueToKey(vEnum); } + +QString View::VAlarmStatus::text() +{ + QString text; + if (_alarm_AlarmID != GuiAlarmID::ALARM_ID_NO_ALARM) + text = alarmIDText (static_cast(_alarm_AlarmID)) + " , " + + _alarm_EscalateIn + " , " + + _alarm_MuteTimeout + " [" + + (_alarm_Flag_systemFault ? "1" : "0" ) + " " + + (_alarm_Flag_stop ? "1" : "0" ) + " " + + (_alarm_Flag_noClear ? "1" : "0" ) + " " + + (_alarm_Flag_noResume ? "1" : "0" ) + " " + + (_alarm_Flag_noRinseback ? "1" : "0" ) + " " + + (_alarm_Flag_noEndTreatment ? "1" : "0" ) + " " + + (_alarm_Flag_noNewTreatment ? "1" : "0" ) + " " + + (_alarm_Flag_bypassDialyzer ? "1" : "0" ) + " " + + (_alarm_Flag_alarmsToEscalate ? "1" : "0" ) + " " + + (_alarm_Flag_alarmsSilenced ? "1" : "0" ) + "]" ; + return text; +} Index: sources/view/valarmstatus.h =================================================================== diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/view/valarmstatus.h (.../valarmstatus.h) (revision f148379112a69d1c52027f2667e95f3f96d948ad) +++ sources/view/valarmstatus.h (.../valarmstatus.h) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -46,10 +46,12 @@ VIEW_DEC(VAlarmStatus, AlarmStatusData) +private: + QString alarmPriorityText (GuiAlarmPriority vEnum); + QString alarmIDText (GuiAlarmID vEnum); public slots: - QString alarmPriorityName (GuiAlarmPriority vEnum); - QString alarmIDName (GuiAlarmID vEnum); + QString text(); }; Index: sources/view/vtreatmentadjustmentsresponse.cpp =================================================================== diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision f148379112a69d1c52027f2667e95f3f96d948ad) +++ sources/view/vtreatmentadjustmentsresponse.cpp (.../vtreatmentadjustmentsresponse.cpp) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -23,22 +23,25 @@ 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. *** adjustment_Triggered ( true ); - adjustment_Accepted ( vData.mAccepted ); - adjustment_Reason ( vData.mReason ); - bloodFlow_MeasuredFlow ( vData.mBloodRate ); - dialysateFlow_MeasuredFlow ( vData.mDialydateReate ); } /*! - * \brief VTreatmentAdjustmentsResponse::reasonName + * \brief VTreatmentAdjustmentsResponse::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 VTreatmentAdjustmentsResponse::reasonName(GuiRequestReasons vEnum) +QString VTreatmentAdjustmentsResponse::reasonText(GuiRequestReasons vEnum) { // TEST : this code is the place holder for the alarms description mapping // since it is another feature @@ -47,3 +50,11 @@ int enumIdx = mo->indexOfEnumerator(qt_getEnumName(vEnum)); return mo->enumerator(enumIdx).valueToKey(vEnum); } + +QString View::VTreatmentAdjustmentsResponse::text() +{ + QString text; + if (_adjustment_Reason != GuiRequestReasons::REASON_NONE) + text = reasonText(static_cast(_adjustment_Reason)); + return text; +} Index: sources/view/vtreatmentadjustmentsresponse.h =================================================================== diff -u -rf148379112a69d1c52027f2667e95f3f96d948ad -r31b9ae63410e7ca23f0f849e38368880e4c402b4 --- sources/view/vtreatmentadjustmentsresponse.h (.../vtreatmentadjustmentsresponse.h) (revision f148379112a69d1c52027f2667e95f3f96d948ad) +++ sources/view/vtreatmentadjustmentsresponse.h (.../vtreatmentadjustmentsresponse.h) (revision 31b9ae63410e7ca23f0f849e38368880e4c402b4) @@ -29,17 +29,21 @@ { Q_OBJECT - PROPERTY( bool , adjustment_Triggered , 0, true ) PROPERTY( bool , adjustment_Accepted , 0, false) PROPERTY( quint32 , adjustment_Reason , 0, false) - PROPERTY( quint32 , bloodFlow_MeasuredFlow , 0, true ) - PROPERTY( quint32 , dialysateFlow_MeasuredFlow , 0, true ) + PROPERTY( quint32 , bloodFlow_FlowSetPoint , 0, false) + PROPERTY( quint32 , dialysateFlow_FlowSetPoint , 0, false) + PROPERTY( bool , adjustment_Triggered , 0, true ) + VIEW_DEC_CLASS(VTreatmentAdjustmentsResponse) VIEW_DEC_SLOT_ADJUSTMENTS +private: + QString reasonText (GuiRequestReasons vEnum); + public slots: - QString reasonName (GuiRequestReasons vEnum); + QString text(); }; }