Index: denali.pro.user =================================================================== diff -u -r4b7b2f3079f81ff442fcbbde5d5e5465f5937417 -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- denali.pro.user (.../denali.pro.user) (revision 4b7b2f3079f81ff442fcbbde5d5e5465f5937417) +++ denali.pro.user (.../denali.pro.user) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -1,6 +1,6 @@ - + EnvironmentId Index: sources/gui/qml/AlarmItem.qml =================================================================== diff -u -rc15ce613e372838316d42c40a86953e6f0aa05d3 -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision c15ce613e372838316d42c40a86953e6f0aa05d3) +++ sources/gui/qml/AlarmItem.qml (.../AlarmItem.qml) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -86,6 +86,7 @@ resumeVisible : ! vAlarmStatus.alarm_Flag_noResume rinsebackVisible : ! vAlarmStatus.alarm_Flag_noRinseback endVisible : ! vAlarmStatus.alarm_Flag_noEndTreatment + minVisible : ! vAlarmStatus.alarm_Flag_noMinimize onMuteClicked : vAlarmStatus.doSilence () onResumeClicked : vAlarmStatus.doUserActionResume () Index: sources/gui/qml/components/TimeCircle.qml =================================================================== diff -u -rdb2238dcf17941be6a3c587b55a3ef06b94cee96 -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/gui/qml/components/TimeCircle.qml (.../TimeCircle.qml) (revision db2238dcf17941be6a3c587b55a3ef06b94cee96) +++ sources/gui/qml/components/TimeCircle.qml (.../TimeCircle.qml) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -23,7 +23,7 @@ /*! * \brief Time Circle Component - * \details which contails a TimeText and ProgressCircle + * \details which contains a TimeText and ProgressCircle * Progress is connected to the time and will show time remained progress. * Time shows the time in minutes and seconds. */ Index: sources/gui/qml/compounds/InstructionView.qml =================================================================== diff -u -r4b7b2f3079f81ff442fcbbde5d5e5465f5937417 -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision 4b7b2f3079f81ff442fcbbde5d5e5465f5937417) +++ sources/gui/qml/compounds/InstructionView.qml (.../InstructionView.qml) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -23,8 +23,8 @@ import "qrc:/components" /*! - * \brief TitleBarCreateTreatment - Contains a back button as well - * as the current progress in each of the pre-treatment steps. + * \brief Contains a back button as well + * as the current progress in each of the steps. */ Rectangle { id: _root property string location : "" Index: sources/gui/qml/dialogs/NotificationDialog.qml =================================================================== diff -u -r73091a6f5717c0fc88e236c06c618ad361f30a3c -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 73091a6f5717c0fc88e236c06c618ad361f30a3c) +++ sources/gui/qml/dialogs/NotificationDialog.qml (.../NotificationDialog.qml) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -39,6 +39,7 @@ property bool rinsebackVisible : false property bool endVisible : false property bool okVisible : false + property bool minVisible : true // Look for this tag: #First_Time_Message_Sent_With_Silenced // the isSilenced is helping not to show this dialog maximized and @@ -79,11 +80,13 @@ } MouseArea { id: _minimizeArea + enabled: _root.minVisible anchors.fill: parent onClicked : _root.minimizeClicked() } UpDownButton { id: _minimizeButton + visible: _root.minVisible backgroundColor: _titleBar.color isUp: false anchors { Index: sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/gui/qml/pages/pretreatment/PreTreatmentBase.qml (.../PreTreatmentBase.qml) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -23,7 +23,7 @@ import "qrc:/compounds" /*! - * \brief the parent page of the pretreatment create screens + * \brief the parent page of the pre-treatment screens */ ScreenItem { id: _root objectName: "_PreTreatmentBase" Index: sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml =================================================================== diff -u -r4b7b2f3079f81ff442fcbbde5d5e5465f5937417 -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision 4b7b2f3079f81ff442fcbbde5d5e5465f5937417) +++ sources/gui/qml/pages/pretreatment/PreTreatmentConsumablesStack.qml (.../PreTreatmentConsumablesStack.qml) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -23,7 +23,7 @@ import "qrc:/pages/pretreatment" /*! - * \brief the pre-treatment consumbles stack screen + * \brief the pre-treatment consumables stack screen */ StackItem { id: _root objectName: "_PreTreatmentConsumblesStack" Index: sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml =================================================================== diff -u -rbd01334f257c35b96b7b232beacbcd7fae60c852 -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision bd01334f257c35b96b7b232beacbcd7fae60c852) +++ sources/gui/qml/pages/pretreatment/connection/PreTreatmentUltrafiltration.qml (.../PreTreatmentUltrafiltration.qml) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -77,7 +77,7 @@ diameter: Variables.sliderCircleDiameter decimal : Variables.ultrafiltrationPrecision minimum : Variables.ultrafiltrationMinDef - maximum : Variables.ultrafiltrationMaxDef + maximum : vTreatmentRanges.treatmentRanges_Ultrafiltration_Volume_Max minText.font.pixelSize: Fonts.fontPixelFluidText maxText.font.pixelSize: Fonts.fontPixelFluidText onPressed: isActive = true Index: sources/storage/StorageGlobals.cpp =================================================================== diff -u -r6581def57942b1c1ef56a2f2feb74559946517b9 -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 6581def57942b1c1ef56a2f2feb74559946517b9) +++ sources/storage/StorageGlobals.cpp (.../StorageGlobals.cpp) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -42,7 +42,7 @@ // Settings #ifdef BUILD_FOR_POKY - const char *Settings_Path_Name = QDir::homePath().append("/.conf/").toLatin1().data(); + const char *Settings_Path_Name = "/home/root/.config/"; #else // should be in the project application folder. [is tracking by git] const char *Settings_Path_Name = "/home/denali/Projects/application/resources/settings/"; Index: sources/view/hd/alarm/VAlarmStatus.cpp =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/hd/alarm/VAlarmStatus.cpp (.../VAlarmStatus.cpp) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -140,7 +140,7 @@ // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_1 )); // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_2 )); // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_3 )); - // (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_UNUSED_4 )); + alarm_Flag_noMinimize (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE )); alarm_Flag_alarmsCondition (vData.mFlags.at(GuiAlarmFlags::ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION )); if (vData.mTop == GuiAlarmID::ALARM_ID_NO_ALARM) { Index: sources/view/hd/alarm/VAlarmStatus.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/hd/alarm/VAlarmStatus.h (.../VAlarmStatus.h) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -65,6 +65,8 @@ PROPERTY( bool , alarm_Flag_alarmsToEscalate , false) PROPERTY( bool , alarm_Flag_alarmsSilenced , false) PROPERTY( bool , alarm_Flag_alarmsLampOn , false) + // 3 reserved flags are here... + PROPERTY( bool , alarm_Flag_noMinimize , false) PROPERTY( bool , alarm_Flag_alarmsCondition , false) PROPERTY( bool , alarm_KeepMinimized , false) Index: sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h (.../VPreTreatmentSelfTestNoCartridgeData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/hd/data/VPreTreatmentSelfTestNoCartridgeData.h (.../VPreTreatmentSelfTestNoCartridgeData.h) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -26,10 +26,10 @@ namespace View { /*! - * \brief The VTreatmentTime class + * \brief The VPreTreatmentSelfTestNoCartridge class * \details View for Model's data representation. * - * \sa Model::MTreatmentTime + * \sa Model::MPreTreatmentSelfTestNoCartridge * */ class VPreTreatmentSelfTestNoCartridge : public QObject Index: sources/view/hd/data/VPreTreatmentStatesData.cpp =================================================================== diff -u -rc6cfb5043fc9c29cc039e36915368bcd3a63baa6 -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/view/hd/data/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision c6cfb5043fc9c29cc039e36915368bcd3a63baa6) +++ sources/view/hd/data/VPreTreatmentStatesData.cpp (.../VPreTreatmentStatesData.cpp) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -64,19 +64,19 @@ // Self tests with no cartridge state bool mSelfTestNoCartridge = vData.mSubMode == GuiPreTreatmentStates ::HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE ; if ( mSelfTestNoCartridge ) { - selfTestNoCartridge_start ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_START_STATE ); - selfTestNoCartridge_waitDoorClose ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE ); - selfTestNoCartridge_occlusionSensors ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE ); - selfTestNoCartridge_bloodFlowMeters ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE ); - selfTestNoCartridge_dialysateFlowMeters ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE ); - selfTestNoCartridge_pumps ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PUMPS_STATE ); - selfTestNoCartridge_leakDetectors ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE ); - selfTestNoCartridge_boardTemperature ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE ); - selfTestNoCartridge_startHoming ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_START_HOMING_STATE ); - selfTestNoCartridge_homeValvesAndPumps ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE ); - selfTestNoCartridge_homeIdle ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_IDLE_STATE ); - selfTestNoCartridge_stopped ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_STOPPED_STATE ); - selfTestNoCartridge_complete ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_COMPLETE_STATE ); + selfTestNoCartridge_start ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_START_STATE ); + selfTestNoCartridge_waitDoorClose ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE ); + selfTestNoCartridge_occlusionSensors ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE ); + selfTestNoCartridge_bloodFlowMeters ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE ); + selfTestNoCartridge_dialysateFlowMeters ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE ); + selfTestNoCartridge_leakDetectors ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE ); + selfTestNoCartridge_boardTemperature ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE ); + selfTestNoCartridge_homeValves ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_VALVES_STATE ); + selfTestNoCartridge_homeSyringePump ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE ); + selfTestNoCartridge_pumps ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_PUMPS_STATE ); + selfTestNoCartridge_homeIdle ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_HOME_IDLE_STATE ); + selfTestNoCartridge_stopped ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_STOPPED_STATE ); + selfTestNoCartridge_complete ( vData.mSelfTestNoCartridgeState == GuiPreTreatmentSelfTestNoCartridgeStates ::NO_CART_SELF_TESTS_COMPLETE_STATE ); } selfTestNoCartridge(mSelfTestNoCartridge); // it's the main even so moved last to have all the sub-states updated prior to. Index: sources/view/hd/data/VPreTreatmentStatesData.h =================================================================== diff -u -rf688ed9f1c64a2603a6d10fbb090b257a43e1f6f -r99a56ec30f1ca4f401e744766bde4f6fac291752 --- sources/view/hd/data/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision f688ed9f1c64a2603a6d10fbb090b257a43e1f6f) +++ sources/view/hd/data/VPreTreatmentStatesData.h (.../VPreTreatmentStatesData.h) (revision 99a56ec30f1ca4f401e744766bde4f6fac291752) @@ -78,11 +78,11 @@ PROPERTY( bool , selfTestNoCartridge_occlusionSensors , false ) ///< NO_CART_SELF_TESTS_OCCLUSION_SENSORS_STATE , No cartridge occlusion sensors self-test state. PROPERTY( bool , selfTestNoCartridge_bloodFlowMeters , false ) ///< NO_CART_SELF_TESTS_BLOOD_FLOW_METERS_STATE , No cartridge blood flow meter self-test state. PROPERTY( bool , selfTestNoCartridge_dialysateFlowMeters , false ) ///< NO_CART_SELF_TESTS_DIALYSATE_FLOW_METERS_STATE , No cartridge dialysate flow meter self-test state. - PROPERTY( bool , selfTestNoCartridge_pumps , false ) ///< NO_CART_SELF_TESTS_PUMPS_STATE , No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state. PROPERTY( bool , selfTestNoCartridge_leakDetectors , false ) ///< NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE , No cartridge leak detectors self-test state. PROPERTY( bool , selfTestNoCartridge_boardTemperature , false ) ///< NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE , No cartridge board temperature self-test state. - PROPERTY( bool , selfTestNoCartridge_startHoming , false ) ///< NO_CART_SELF_TESTS_START_HOMING_STATE , No cartridge start home valves and pumps state - PROPERTY( bool , selfTestNoCartridge_homeValvesAndPumps , false ) ///< NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE , No cartridge home valves and pumps self-test state. + PROPERTY( bool , selfTestNoCartridge_homeValves , false ) ///< NO_CART_SELF_TESTS_HOME_VALVES_STATE , No cartridge home valves state + PROPERTY( bool , selfTestNoCartridge_homeSyringePump , false ) ///< NO_CART_SELF_TESTS_HOME_SYRINGE_PUMP_STATE , No cartridge home syringe pump state + PROPERTY( bool , selfTestNoCartridge_pumps , false ) ///< NO_CART_SELF_TESTS_PUMPS_STATE , No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state. PROPERTY( bool , selfTestNoCartridge_homeIdle , false ) ///< NO_CART_SELF_TESTS_HOME_IDLE_STATE , Wait for valves and pumps finish homing state. PROPERTY( bool , selfTestNoCartridge_stopped , false ) ///< NO_CART_SELF_TESTS_STOPPED_STATE , No cart self-test stopped state. PROPERTY( bool , selfTestNoCartridge_complete , false ) ///< NO_CART_SELF_TESTS_COMPLETE_STATE , No cartridge self-test complete state.