Index: sources/canbus/MessageGlobals.h =================================================================== diff -u -r9f70ae0e4a2a053486198c4a505575044a7ab3be -r1a614320ec16b956d14c644ac2e90833f5cbdbcf --- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 9f70ae0e4a2a053486198c4a505575044a7ab3be) +++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 1a614320ec16b956d14c644ac2e90833f5cbdbcf) @@ -153,8 +153,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 , 19 * 4 }, //19 parameters each 4bytes + {Gui::GuiActionType::ID_AdjustParametersValidationRsp , 20 * 4 }, //18 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/canbus/MessageInterpreter.cpp =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r1a614320ec16b956d14c644ac2e90833f5cbdbcf --- sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ sources/canbus/MessageInterpreter.cpp (.../MessageInterpreter.cpp) (revision 1a614320ec16b956d14c644ac2e90833f5cbdbcf) @@ -462,8 +462,8 @@ // ----- Settings case Gui::GuiActionType::ID_AdjustServiceModeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceModeRsp ); break; case Gui::GuiActionType::ID_AdjustVersionsHDReq : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDReq ); break; - case Gui::GuiActionType::ID_AdjustVersionsHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsHDRsp ); break; - case Gui::GuiActionType::ID_AdjustSerialHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialHDRsp ); break; + case Gui::GuiActionType::ID_AdjustVersionsTDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsTDRsp ); break; + case Gui::GuiActionType::ID_AdjustSerialTDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialTDRsp ); break; case Gui::GuiActionType::ID_AdjustServiceDatesHDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesHDRsp ); break; case Gui::GuiActionType::ID_AdjustHDDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustHDDateTimeRsp ); break; case Gui::GuiActionType::ID_HDUsageInfoRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_HDUsageInfoRsp ); break; @@ -594,8 +594,8 @@ // ----- Datum - Pre-Treatment progress case Gui::GuiActionType::ID_DGFilterFlushData : ok = notify(vMessage, vData, Gui::GuiActionType::ID_DGFilterFlushData ); break; // DG Response Messages - case Gui::GuiActionType::ID_AdjustVersionsDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDGRsp ); break; - case Gui::GuiActionType::ID_AdjustSerialDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDGRsp ); break; + case Gui::GuiActionType::ID_AdjustVersionsDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustVersionsDDRsp ); break; + case Gui::GuiActionType::ID_AdjustSerialDDRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustSerialDDRsp ); break; case Gui::GuiActionType::ID_AdjustServiceDatesDGRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustServiceDatesDGRsp ); break; case Gui::GuiActionType::ID_AdjustDGDateTimeRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGDateTimeRsp ); break; case Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp : ok = notify(vMessage, vData, Gui::GuiActionType::ID_AdjustDGCleaningUsageRsp ); break; Index: sources/cloudsync/CloudSyncController.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r1a614320ec16b956d14c644ac2e90833f5cbdbcf --- sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/cloudsync/CloudSyncController.cpp (.../CloudSyncController.cpp) (revision 1a614320ec16b956d14c644ac2e90833f5cbdbcf) @@ -782,8 +782,8 @@ } break; - case GuiActionType::ID_AdjustSerialHDRsp : - case GuiActionType::ID_AdjustSerialDGRsp : + case GuiActionType::ID_AdjustSerialTDRsp : + case GuiActionType::ID_AdjustSerialDDRsp : // this message is not complete in one step and saves only the received info and waits for the other if complete will send. saveDeviceInfo(vAction, vData); break; @@ -1237,14 +1237,14 @@ // if both values received initDeviceInfoWait(); - if ( vAction == GuiActionType::ID_AdjustSerialHDRsp ) { + if ( vAction == GuiActionType::ID_AdjustSerialTDRsp ) { if ( vData.count() ) { _deviceInfoHD = vData[eDeviceInfo_Ix].toString(); } else { _deviceInfoHD = ""; } } - if ( vAction == GuiActionType::ID_AdjustSerialDGRsp ) { + if ( vAction == GuiActionType::ID_AdjustSerialDDRsp ) { if ( vData.count() ) { _deviceInfoDG = vData[eDeviceInfo_Ix].toString(); } else { Index: sources/gui/GuiGlobals.h =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r1a614320ec16b956d14c644ac2e90833f5cbdbcf --- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 1a614320ec16b956d14c644ac2e90833f5cbdbcf) @@ -98,10 +98,10 @@ ID_AdjustVersionsUIReq = 0x1C00, // 28 ID_AdjustVersionsUIRsp = 0x9F00, // 159 // ID_UIVersionsTxr - UI Version response transmit ID_AdjustVersionsHDReq = 0x9E00, // 158 // ID_HDVersionsRxq - HD Version request received - ID_AdjustVersionsHDRsp = 0x1D00, // 29 - ID_AdjustVersionsDGRsp = 0x1E00, // 30 - ID_AdjustSerialHDRsp = 0x9900, // 153 - ID_AdjustSerialDGRsp = 0x8800, // 136 + ID_AdjustVersionsTDRsp = 0x1D00, // 29 + ID_AdjustVersionsDDRsp = 0x1E00, // 30 + ID_AdjustSerialTDRsp = 0x9900, // 153 + ID_AdjustSerialDDRsp = 0x8800, // 136 // Service Information ID_AdjustServiceDatesReq = 0x8900, // 137 Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml =================================================================== diff -u -r2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9 -r1a614320ec16b956d14c644ac2e90833f5cbdbcf --- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 2ad0fc5c1215088ee0e4ea7f9b2bc367c4ed2fd9) +++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreate.qml (.../PreTreatmentCreate.qml) (revision 1a614320ec16b956d14c644ac2e90833f5cbdbcf) @@ -218,7 +218,26 @@ vTreatmentCreate.treatmentDuration = value } } + Connections { target: _duration + function onValueChanged ( ) { + if ( _heparinDispensingRateSwitch.checked ) { + // FIXME: LEAHI + //////////////////////////////////////////////////////////////// + // depending on the feedback the approach could be differnet. // + //////////////////////////////////////////////////////////////// + + //A: Deactive the hheparin stop time and let the usere re-set the value + _heparinStopTime.active = false + + //B: Leave the set value on heparin stop time and just fix if exceeds max. + if ( _heparinStopTime.value > _duration.value ) { + _heparinStopTime.reset( _duration.value ) + } + } + } + } + Connections { target : _heparinDispensingRateSwitch function onActiveChanged ( ) { let mActive = _heparinDispensingRateSwitch.active @@ -409,8 +428,8 @@ flickable : _flickable unit : Variables.unitTextDuration minimum : vTreatmentRanges.heparinStopTimeMin - maximum : vTreatmentRanges.heparinStopTimeMax - step : vTreatmentRanges.heparinStopTimeRes + maximum : _duration.value // vTreatmentRanges.heparinStopTimeMax // this maximum depends on the Treatment Duration Value. + step : _duration.step // vTreatmentRanges.heparinStopTimeRes defaultValue: vTreatmentRanges.heparinStopTimeDef valid : !vTreatmentCreate.heparinStopTimeRejectReason enabled : false // this switch depends on the heparin dispencing Index: sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml =================================================================== diff -u -r9f70ae0e4a2a053486198c4a505575044a7ab3be -r1a614320ec16b956d14c644ac2e90833f5cbdbcf --- sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision 9f70ae0e4a2a053486198c4a505575044a7ab3be) +++ sources/gui/qml/pages/settings/SettingsDeviceRegistration.qml (.../SettingsDeviceRegistration.qml) (revision 1a614320ec16b956d14c644ac2e90833f5cbdbcf) @@ -85,7 +85,7 @@ TextEntry { id : _serial_DD textInput.clip : true hasCursor : false - textInput.text : vAdjustmentVersions .ddSerial + textInput.text : vAdjustmentVersions .dgSerial textInput.horizontalAlignment: Text.AlignLeft label.text : qsTr("DD Serial") separator.text : _root.separatorText Index: sources/storage/Logger.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r1a614320ec16b956d14c644ac2e90833f5cbdbcf --- sources/storage/Logger.cpp (.../Logger.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/storage/Logger.cpp (.../Logger.cpp) (revision 1a614320ec16b956d14c644ac2e90833f5cbdbcf) @@ -577,7 +577,7 @@ } break; - case GuiActionType::ID_AdjustSerialHDRsp : { + case GuiActionType::ID_AdjustSerialTDRsp : { if ( vData.length() >= 1 ) { QString hdSerial= vData[0].toString(); if ( hdSerial.trimmed().isEmpty() ) hdSerial = "Unknown";