Index: leahi.pro
===================================================================
diff -u -r6f49a9645e5e8a38832bbfa20e0f2ee5314065db -r5a0639ee020873025a536140b8c6b5507d173412
--- leahi.pro (.../leahi.pro) (revision 6f49a9645e5e8a38832bbfa20e0f2ee5314065db)
+++ leahi.pro (.../leahi.pro) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -204,6 +204,7 @@
sources/model/td/data/MTDVoltageData.h \
sources/model/td/data/MWaterSampleData.h \
sources/model/td/data/pretreatment/MPreTreatmentStatesData.h \
+ sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \
sources/model/td/data/treatment/MTreatmentBloodFlowData.h \
sources/model/td/data/treatment/MTreatmentBloodPrimeData.h \
sources/model/td/data/treatment/MTreatmentHDFData.h \
@@ -299,6 +300,7 @@
sources/view/td/data/VTDSyringePumpData.h \
\ # ---------- Views - TD - Data - Pre-Treatment
sources/view/td/data/pretreatment/VPreTreatmentStatesData.h \
+ sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \
\ # ---------- Views - TD - Data - In-Treatment
sources/view/td/data/treatment/VTDTreatmentStatesData.h \
sources/view/td/data/treatment/VTreatmentBloodFlow.h \
@@ -338,7 +340,7 @@
\ # ---------- Views - TD - Adjustment - Pre-Treatment
sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.h \
sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.h \
- sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \
+ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.h \
\ # ---------- Views - TD - Adjustment - Post-Treatment
sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustPatientDisconnectionConfirm.h \
sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.h \
@@ -409,7 +411,6 @@
\ # ---------- Models - HD - Data - Pre-Treatment - Progress
sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.h \
sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.h \
- sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h \
\ # ---------- Models - HD - Data
sources/model/hd/data/MHDDebugText.h \
sources/model/hd/data/MHDGeneralEvent.h \
@@ -501,7 +502,6 @@
\ # ---------- Views - HD - Data - Pre-Treatment - Progress
sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.h \
sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.h \
- sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h \
\ # ---------- Views - HD - Data
sources/view/hd/data/post/VHDPOSTData.h \
sources/view/hd/data/VHDAccelerometerData.h \
@@ -591,6 +591,7 @@
sources/model/td/data/MTDVoltageData.cpp \
sources/model/td/data/MWaterSampleData.cpp \
sources/model/td/data/pretreatment/MPreTreatmentStatesData.cpp \
+ sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
sources/model/td/data/MTDSyringePumpData.cpp \
sources/model/td/data/treatment/MTreatmentBloodFlowData.cpp \
sources/model/td/data/treatment/MTreatmentBloodPrimeData.cpp \
@@ -731,7 +732,6 @@
sources/model/hd/data/post/MHDRTCEpochData.cpp \
sources/model/hd/data/MHDUsageInfoResponse.cpp \
\ # ---------- Models - HD - Data - Pre-Treatment
- sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp \
sources/model/hd/data/pretreatment/MPreTreatmentSelfTestNoCartridgeData.cpp \
sources/model/hd/data/pretreatment/MPreTreatmentSelfTestDryData.cpp \
\ # ---------- Models - DG - Adjustment - Settings
@@ -789,6 +789,7 @@
sources/view/td/data/VTDSyringePumpData.cpp \
\ # ---------- Views - TD - Data - Pre-Treatment
sources/view/td/data/pretreatment/VPreTreatmentStatesData.cpp \
+ sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \
\ # ---------- Views - TD - Data - In-Treatment
sources/view/td/data/treatment/VTDTreatmentStatesData.cpp \
sources/view/td/data/treatment/VTreatmentBloodFlow.cpp \
@@ -828,7 +829,7 @@
\ # ---------- Views - TD - Adjustment - Pre-Treatment
sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentDisposablesConfirm.cpp \
sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentStartTreatment.cpp \
- sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \
+ sources/view/td/adjustment/pretreatment/VPreTreatmentAdjustmentWaterSample.cpp \
\ # ---------- Views - TD - Adjustment - Post-Treatment
sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustDisposablesRemovalConfirm.cpp \
sources/view/td/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp \
@@ -881,7 +882,6 @@
\ # ---------- Views - HD - Data - Pre-Treatment
sources/view/hd/data/pretreatment/VPreTreatmentSelfTestNoCartridgeData.cpp \
sources/view/hd/data/pretreatment/VPreTreatmentSelfTestDryData.cpp \
- sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp \
\ # ---------- Views - HD - Data - In-Treatment
sources/view/hd/data/treatment/VTreatmentDialysateFlow.cpp \
sources/view/hd/data/treatment/VTreatmentHeparinData.cpp \
Index: sources/canbus/MessageGlobals.h
===================================================================
diff -u -rd82d6c9dbf4b10a90a1e5e742e9c31400c547358 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision d82d6c9dbf4b10a90a1e5e742e9c31400c547358)
+++ sources/canbus/MessageGlobals.h (.../MessageGlobals.h) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -129,7 +129,7 @@
{Gui::GuiActionType::ID_HDUsageInfoRsp , 4 * 4 + 2 }, // 4 parameters each 4bytes + 1 parameter 2 bytes
//TD Data Messages
{Gui::GuiActionType::ID_TDVoltageData , 8 * 4 }, // 8 parameters each 4bytes
- {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 7*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes
+ {Gui::GuiActionType::ID_TDValvesData , 3 * 4 + 5*2 }, // 5 parameters each 4bytes + 2 parametres 2 bytes
{Gui::GuiActionType::ID_TDEjectorData , 4 * 4 }, // 4 parameters each 4bytes
{Gui::GuiActionType::ID_TDSwitchesData , 1 * 4 }, // 3 parameters each 4bytes
{Gui::GuiActionType::ID_TDBatteryData , 2 * 4 }, // 2 parameters each 4bytes
@@ -248,7 +248,7 @@
// Pre-Treatment Disposable Priming
{Gui::GuiActionType::ID_AdjustDisposablesPrimeReq , 0 * 4 }, // 0 parameter
{Gui::GuiActionType::ID_AdjustDisposablesPrimeRsp , 2 * 4 }, // 2 parameters each 4bytes
- {Gui::GuiActionType::ID_DisposablesPrimeData , 2 * 4 }, // 2 parameters each 4bytes
+ {Gui::GuiActionType::ID_DisposablesPrimeData , 4 * 4 }, // 2 parameters each 4bytes
// Pre-Treatment Patient Connection Begin
{Gui::GuiActionType::ID_AdjustPatientConnectionBeginReq , 0 * 4 }, // 0 parameter
{Gui::GuiActionType::ID_AdjustPatientConnectionBeginRsp , 2 * 4 }, // 2 parameters each 4bytes
Index: sources/gui/GuiGlobals.h
===================================================================
diff -u -r6f49a9645e5e8a38832bbfa20e0f2ee5314065db -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 6f49a9645e5e8a38832bbfa20e0f2ee5314065db)
+++ sources/gui/GuiGlobals.h (.../GuiGlobals.h) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -179,7 +179,7 @@
// Pre-Treatment Disposable Priming
ID_AdjustDisposablesPrimeReq = 0x3C0F, // 60 //// ----- @CRAPIZED: had to change to avoid duplication
ID_AdjustDisposablesPrimeRsp = 0x3D0F, // 61 //// ----- @CRAPIZED: had to change to avoid duplication
- ID_DisposablesPrimeData = 0x43FF, // ?? //// ----- @CRAPIZED - FFed
+ ID_DisposablesPrimeData = 0xC700, // 199 //// ----- @LEAHIZED
// Pre-Treatment Patient Connection Begin
ID_AdjustPatientConnectionBeginReq = 0x640F, // 100 //// ----- @CRAPIZED: had to change to avoid duplication
ID_AdjustPatientConnectionBeginRsp = 0x650F, // 101 //// ----- @CRAPIZED: had to change to avoid duplication
Index: sources/gui/qml/components/HeaderBar.qml
===================================================================
diff -u -r290835d1a861d8fe7a716d061f0b079d9cfff75a -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 290835d1a861d8fe7a716d061f0b079d9cfff75a)
+++ sources/gui/qml/components/HeaderBar.qml (.../HeaderBar.qml) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -181,6 +181,7 @@
extraSpace : _headerButtonRow.spacing
visible : vTDTreatmentStates.txEnd
+ onPressed : _endTreatmentDialog.open()
}
IconButton { id : _waterSample
Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
===================================================================
diff -u -r9eb583ef8480f80fe55be7b88b3ed1a27109492a -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 9eb583ef8480f80fe55be7b88b3ed1a27109492a)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -194,9 +194,6 @@
vTDValves.posA ,
vTDValves.posB ,
vTDValves.posC ,
- vTDValves.posD ,
- vTDValves.maxHomingPos ,
-
]
label: [
"ID ",
@@ -207,8 +204,6 @@
"Pos A ",
"Pos B ",
"Pos C ",
- "Pos D ",
- "Max Homing Pos ",
]
}
Index: sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml
===================================================================
diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml (.../WaterSampleDialog.qml) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2)
+++ sources/gui/qml/dialogs/watersample/WaterSampleDialog.qml (.../WaterSampleDialog.qml) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -26,11 +26,11 @@
height : Variables.dialogHeight
clip : true
- readonly property bool timeout: vWaterSample.timeout
+ readonly property bool timeout : vWaterSample.timeout
onTimeoutChanged: {
if ( _root.timeout ) {
- _menu.index = WaterSampleDialog.WaterSample
+ _menu.index = _WaterSampleDialog.WaterSample
_root.open()
}
}
@@ -40,8 +40,8 @@
Dialysate
}
- WaterSamplePage { id: _waterSample; visible : vRoWaterMode.status ? _menu.index === WaterSampleDialog.WaterSample : false ; }
- WaterSampleDialysatePage { id: _dialysateChecks; visible : vRoWaterMode.status ? _menu.index === WaterSampleDialog.Dialysate : true ; }
+ WaterSamplePage { id: _waterSample; visible : vWaterSampleModel.isROFeatured ? _menu.index === WaterSampleDialog.WaterSample : false ; }
+ WaterSampleDialysatePage { id: _dialysateChecks; visible : vWaterSampleModel.isROFeatured ? _menu.index === WaterSampleDialog.Dialysate : true ; }
MainMenu { id: _menu
anchors {
@@ -69,7 +69,7 @@
CloseButton { id : _closeButton
- visible: vRoWaterMode.status ? _waterSample.isPrimary : true
+ visible: vWaterSampleModel.isROFeatured ? _waterSample.isPrimary : true
onClicked : {
_root.close()
Index: sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml
===================================================================
diff -u -ra7aab61ca63538c37b6931c60252680fc2ec2416 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision a7aab61ca63538c37b6931c60252680fc2ec2416)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentPrime.qml (.../PreTreatmentPrime.qml) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -20,88 +20,68 @@
// Qml imports
import "qrc:/globals"
import "qrc:/components"
+import "qrc:/compounds"
import "qrc:/pages/pretreatment"
/*!
* \brief The Pre Tretreatment Prime Screen
*/
PreTreatmentBase { id: _root
objectName: "_PreTreatmentPrime"
- isComplete : timeCircleProgressValue >= timeCircleMaximum // TODO Update later
+
+ enum Prime {
+ BloodTubeCircuit = 0,
+ DialysateCircuit = 1,
+ DialysatePurge = 2,
+ PrimingFluidDiscard = 3,
+ Complete = 4
+ }
+
+ isComplete : vPreTreatmentDisposablesPrime.primeComplete // PRIME_COMPLETE_STATE
completeText : qsTr("Priming Complete!")
// time circle
hasTimeCircle : true
timeCircleMinimum : 0
- timeCircleMaximum : 3 * 60 // vPreTreatmentDisposablesPrime.total // TODO implement in later story
- timeCircleProgressValue : 0 // vPreTreatmentDisposablesPrime.elapsed
- timeCircleTimeTextValue : timeCircleProgressValue * 60 // vPreTreatmentDisposablesPrime.remaining * 60
+ timeCircleMaximum : vPreTreatmentDisposablesPrime.total
+ timeCircleProgressValue : vPreTreatmentDisposablesPrime.elapsed
+ timeCircleTimeTextValue : vPreTreatmentDisposablesPrime.countDown * 60
// chcek list
hasCheckList : true
checkListStepNames : [
qsTr("Blood Tubing Circuit Priming" ),
qsTr("Dialysate Circuit Priming" ),
+ qsTr("Dialysate Purge" ),
+ qsTr("Priming Fluid Discard" ),
]
- // TODO implement in later story
-// Connections { target: vPreTreatmentStates
-// function onSelfTestDryChanged ( vValue ) { page( _preTreatmentDrySelfTest , vValue )}
-// function onSelfTestDry_startChanged ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(0, true )}
-// function onSelfTestDry_waitDoorCloseChanged ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(0, vValue )}
-// function onSelfTestDry_usedCartridgeEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(1, true )}
-// function onSelfTestDry_cartridgeLoadedEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(1, vValue )}
-// function onSelfTestDry_pressureSensorsNormalSetupEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(2, true )}
-// function onSelfTestDry_pressureSensorsVenousSetupEntered ( vValue ) {}
-// function onSelfTestDry_pressureSensorsVenousEntered ( vValue ) {}
-// function onSelfTestDry_pressureSensorsArterialSetupEntered ( vValue ) {}
-// function onSelfTestDry_pressureSensorsArterialEntered ( vValue ) {}
-// function onSelfTestDry_pressureSensorsDecayEntered ( vValue ) {}
-// function onSelfTestDry_pressureSensorsStabilityEntered ( vValue ) {}
-// function onSelfTestDry_pressureSensorsNormalEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(2, vValue )}
-// function onSelfTestDry_syringePumpEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(3, vValue )}
-// function onSelfTestDry_syringePumpOcclusionDetectionEntered ( vValue ) { _preTreatmentDrySelfTest .checkList.setItemExt(4, vValue )}
-// function onSelfTestDry_stoppedEntered ( vValue ) {}
-// function onSelfTestDry_completeEntered ( vValue ) {}
-// }
+ onVisibleChanged: if (visible) checkList.resetItems()
-// Connections { target: vPreTreatmentStates
-// function onPrimeChanged ( vValue ) { page( _preTreatmentDisposablesPrime , vValue )}
-// function onPrime_waitUserStartEntered ( vValue ) {}
-// function onPrime_salineSetupEntered ( vValue ) {}
-// function onPrime_salinePurgeAirEntered ( vValue ) {}
-// function onPrime_salineCirculateBloodCircuitEntered ( vValue ) {}
-// function onPrime_reservoirOneFillCompleteEntered ( vValue ) {}
-// function onPrime_dialysateDialyzerEntered ( vValue ) {}
-// function onPrime_salineDialyzerSetupEntered ( vValue ) {}
-// function onPrime_salineDialyzerEntered ( vValue ) {}
-// function onPrime_reservoirTwoFillCompleteEntered ( vValue ) {}
-// function onPrime_dialysateBypassEntered ( vValue ) {}
-// function onPrime_wetSelfTestsEntered ( vValue ) {}
-// function onPrime_pauseEntered ( vValue ) {}
-// function onPrime_completeEntered ( vValue ) {}
+ Item {
+ anchors.top: parent.top
+ anchors.left: parent.left
+ width: 40
+ height: 40
+ Text {
+ color: Colors.offWhite
+ text: vPreTreatmentDisposablesPrime.state
+ anchors.centerIn: parent
+ }
+ }
-// //TODO this way of handling the states are new for states which can reset to the previous states
-// // if it is successfull I may use everywhere.
-// // 1 - it uses new setItemExt
-// // 2 - bundles the states of FW in UI states
-// // setitem differences.
-// // old:
-// // 1 - the start FW state of the UI state set to true
-// // 2 - the end FW state fo the UI state set with vValue
-// // 3 - nothing for the FW in-states of the UI states
-// // new:
-// // - all set with vValue and use the setItemExt
-// // Unkown missbehavior:
-// // - the only misbehavior is if the FW changes the FW state in the middle (in one of in-states),
-// // since UI budles the FW states, it assumes it is done and checks the state which may not be ideal.
-// // as an example if during the Dyalysate FW changes th state to the pause, UI may not show the Dialysaate done (probably!).
-// function onPrime__BloodCircuitEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItemExt(0, vValue )}
-// function onPrime__DialysateCircuitEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItemExt(1, vValue )}
-// function onPrime__WetSelfTestsEntered ( vValue ) { _preTreatmentDisposablesPrime .checkList.setItemExt(2, vValue )}
-// }
+ Connections { target: vPreTreatmentDisposablesPrime
+ function onPrimeBloodCircuitChanged ( vValue ) { print("onPrimeBloodCircuitChanged " + vValue)
+ checkList.setItemExt(PreTreatmentPrime.BloodTubeCircuit , vValue )
+ }
-
-
-
+ function onPrimeBloodCircuitStartChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.BloodTubeCircuit , true )}
+ function onPrimeBloodCircuitEndChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.BloodTubeCircuit , vValue )}
+ function onPrimeDialysateCircuitStartChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.DialysateCircuit , true )}
+ function onPrimeDialysateCircuitEndChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.DialysateCircuit , vValue )}
+ function onPrimeDialysatePurgeStartChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.DialysatePurge , true )}
+ function onPrimeDialysatePurgeEndChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.DialysatePurge , vValue )}
+ function onPrimePrimingFluidDiscardStartChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.PrimingFluidDiscard , vValue )}
+ function onPrimePrimingFluidDiscardEndChanged ( vValue ) { checkList.setItemExt(PreTreatmentPrime.Complete , vValue )}
+ }
}
Index: sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml
===================================================================
diff -u -rb67c15152e0bd979d3a96f44abcea23d22dcd735 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision b67c15152e0bd979d3a96f44abcea23d22dcd735)
+++ sources/gui/qml/pages/pretreatment/PreTreatmentStack.qml (.../PreTreatmentStack.qml) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -115,8 +115,6 @@
setPage ( _pretreatmentPrime )
break
case PreTreatmentStack.Step.Prime:
- if ( _pretreatmentPrime.timeCircleProgressValue === 0 ) { vPreTreatmentAdjustmentDisposablesPrime.doPrime(); }
- setPage ( _pretreatmentCreate )
break
case PreTreatmentStack.Step.CreateRx:
_pretreatmentCreate.confirmButtonClicked()
@@ -178,8 +176,8 @@
switch ( stepKeys[_root.stackStepIndex] ) {
// case PreTreatmentStack.Step.SelfTests: // TODO set when implementing self test/ prime
// return _pretreatmentSelfTests.isComplete
-// case PreTreatmentStack.Step.Prime:
-// return _pretreatmentPrime.isComplete
+ case PreTreatmentStack.Step.Prime:
+ return false
case PreTreatmentStack.Step.CreateRx:
return _pretreatmentCreate.confirmReady()
default:
@@ -247,16 +245,16 @@
function onGoToPreviousStep () { setPage ( _pretreatmentConcentrates )}
}
- // priming
- Connections { target: vPreTreatmentAdjustmentDisposablesPrime
- function onAdjustmentTriggered ( vValue ) {
- if ( vPreTreatmentAdjustmentDisposablesPrime.adjustment_Accepted ) {
- _pretreatmentPrime.reasonText = ""
- } else {
- _pretreatmentPrime.reasonText = vPreTreatmentAdjustmentDisposablesPrime.text()
- }
- }
- }
+ // priming - TODO check if needed. may not need
+// Connections { target: vPreTreatmentAdjustmentDisposablesPrime
+// function onAdjustmentTriggered ( vValue ) {
+// if ( vPreTreatmentAdjustmentDisposablesPrime.adjustment_Accepted ) {
+// _pretreatmentPrime.reasonText = ""
+// } else {
+// _pretreatmentPrime.reasonText = vPreTreatmentAdjustmentDisposablesPrime.text()
+// }
+// }
+// }
// creat rx
Connections{ target: vTreatmentCreate
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml
===================================================================
diff -u -rb67c15152e0bd979d3a96f44abcea23d22dcd735 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision b67c15152e0bd979d3a96f44abcea23d22dcd735)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreateContent.qml (.../PreTreatmentCreateContent.qml) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -119,6 +119,11 @@
// store for the TreatmentLog
vPostTreatmentAdjustmentTreatmentLog.patientID = vTreatmentCreate.patientID
vTreatmentCreate.finalConfirmation = vFinalConfirmation ? 1 : 0
+ if ( ! PreTreatmentCreatePatientPrescription.isHDFFeatured ) {
+ vTreatmentCreate.substitutionFluidVolume = 0
+ vTreatmentCreate.hdfTreatmentMode = 0
+ }
+
vTreatmentCreate.doValidation ( )
}
@@ -136,6 +141,8 @@
function onDidValidationPass ( ) {
activateAndRefresh() // refresh values on validation
clearErrors()
+
+ if ( _headerbarPrescription.visible) _headerbarPrescription.close()
}
}
Index: sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml
===================================================================
diff -u -rb33a0dc4ca14c3bf58831d49d1910c39a091e658 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision b33a0dc4ca14c3bf58831d49d1910c39a091e658)
+++ sources/gui/qml/pages/pretreatment/create/PreTreatmentCreatePatientPrescription.qml (.../PreTreatmentCreatePatientPrescription.qml) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -202,7 +202,7 @@
step : vTreatmentRanges.substitutionVolumeRes
defaultValue : vTreatmentRanges.substitutionVolumeDef
decimal : Variables.substitutionPrecision
- value : _root.isHDFFeatured ? vTreatmentCreate.substitutionFluidVolume : vTreatmentRanges.substitutionVolumeDef
+ value : vTreatmentCreate.substitutionFluidVolume
isActive : vTreatmentCreate.substitutionFluidVolumeSet
onDidActiveChange : function(vState) { vTreatmentCreate.substitutionFluidVolumeSet = vState }
Index: sources/gui/qml/pages/settings/SettingsInformation.qml
===================================================================
diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2)
+++ sources/gui/qml/pages/settings/SettingsInformation.qml (.../SettingsInformation.qml) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -98,7 +98,7 @@
label : [ qsTr("Water Input" )]
- initial : [ qsTr("RO Water %1" ).arg(vRoWaterMode.status ? qsTr("Featured") : qsTr("Defeatured")) ]
+ initial : [ qsTr("RO Water %1" ).arg(vTreatmentRanges.roWaterModeOptions[vRoWaterMode.status]) ]
actual : [""]
units : [""]
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
===================================================================
diff -u -rd82d6c9dbf4b10a90a1e5e742e9c31400c547358 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision d82d6c9dbf4b10a90a1e5e742e9c31400c547358)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -768,7 +768,7 @@
*
* | MSG | CAN ID | Type | Ack | Src | Dest | Description |
* |:----:|:------:|:----:|:---:|:---:|:----:|:---------------: |
- * |0xC500| 0x100 | Req | Y | UI | HD | Dry Bicart Disconnect Request |
+ * |0xC500| 0x100 | Req | Y | UI | TD | Dry Bicart Disconnect Request |
*
* | Payload ||
* | ||
Fisheye: Tag 5a0639ee020873025a536140b8c6b5507d173412 refers to a dead (removed) revision in file `sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5a0639ee020873025a536140b8c6b5507d173412 refers to a dead (removed) revision in file `sources/model/hd/data/pretreatment/MPreTreatmentDisposablesPrimeData.h'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h
===================================================================
diff -u -rea37bc16ab57586729e332c2a9df3299f91012ca -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h (.../MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h) (revision ea37bc16ab57586729e332c2a9df3299f91012ca)
+++ sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h (.../MPostTreatmentAdjustPatientDisconnectionConfirmResponse.h) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -32,7 +32,7 @@
*
* | MSG | CAN ID | Type | Ack | Src | Dest | Description |
* |:----:|:------:|:----:|:---:|:---:|:----:|:-----------:|
- * |0x7E00| 0x020 | Rsp | Y | HD | UI | Disposables Removal Response |
+ * |0x5600| 0x020 | Rsp | Y | HD | UI | Disposables Removal Response |
*
* | Payload ||
* | ||
Index: sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustRequests.h
===================================================================
diff -u -rd82802819678ccdb5d2cf480cf06071c4b4b4197 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustRequests.h (.../MPostTreatmentAdjustRequests.h) (revision d82802819678ccdb5d2cf480cf06071c4b4b4197)
+++ sources/model/td/adjustment/posttreatment/MPostTreatmentAdjustRequests.h (.../MPostTreatmentAdjustRequests.h) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -99,7 +99,7 @@
*
* | MSG | CAN ID | M.Box | Type | Ack | Src | Dest | Description |
* |:----:|:------:|:-----:|:----:|:---:|:---:|:----:|:-----------:|
- * |0x7500| 0x100 | 9 | Req | Y | UI | HD | Treatment Log Request |
+ * |0xA900| 0x100 | 9 | Req | Y | UI | HD | Treatment Log Request |
*
* | Payload ||
* | ||
Index: sources/model/td/data/MTDValvesData.cpp
===================================================================
diff -u -r292beb22109065953f769ace13c3a395674612ac -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/model/td/data/MTDValvesData.cpp (.../MTDValvesData.cpp) (revision 292beb22109065953f769ace13c3a395674612ac)
+++ sources/model/td/data/MTDValvesData.cpp (.../MTDValvesData.cpp) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -26,8 +26,6 @@
_data.mPosA .value,
_data.mPosB .value,
_data.mPosC .value,
- _data.mPosD .value,
- _data.mMaxHomingPos .value,
};
}
@@ -41,8 +39,6 @@
if ( ! GetValue(vByteArray, index, _data.mPosA )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mPosB )) goto lError;
if ( ! GetValue(vByteArray, index, _data.mPosC )) goto lError;
- if ( ! GetValue(vByteArray, index, _data.mPosD )) goto lError;
- if ( ! GetValue(vByteArray, index, _data.mMaxHomingPos )) goto lError;
return true ;
@@ -67,7 +63,5 @@
data.mPosA = _data.mPosA .value;
data.mPosB = _data.mPosB .value;
data.mPosC = _data.mPosC .value;
- data.mPosD = _data.mPosD .value;
- data.mMaxHomingPos = _data.mMaxHomingPos .value;
return data;
}
Index: sources/model/td/data/MTDValvesData.h
===================================================================
diff -u -r292beb22109065953f769ace13c3a395674612ac -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/model/td/data/MTDValvesData.h (.../MTDValvesData.h) (revision 292beb22109065953f769ace13c3a395674612ac)
+++ sources/model/td/data/MTDValvesData.h (.../MTDValvesData.h) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -43,8 +43,6 @@
* | #6:(S16) | \ref Data::mPosA |
* | #7:(S16) | \ref Data::mPosB |
* | #8:(S16) | \ref Data::mPosC |
- * | #9:(S16) | \ref Data::mPosD |
- * |#10:(S16) | \ref Data::mMaxHomingPos |
*
* \sa Data
*
@@ -72,8 +70,6 @@
Types::S16 mPosA ;
Types::S16 mPosB ;
Types::S16 mPosC ;
- Types::S16 mPosD ;
- Types::S16 mMaxHomingPos ;
} _data;
public:
@@ -92,8 +88,6 @@
qint16 mPosA = 0;
qint16 mPosB = 0;
qint16 mPosC = 0;
- qint16 mPosD = 0;
- qint16 mMaxHomingPos = 0;
};
MTDValvesData () { }
Index: sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp
===================================================================
diff -u
--- sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp (revision 0)
+++ sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.cpp (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -0,0 +1,55 @@
+/*!
+ *
+ * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file MPreTreatmentDisposablesPrimeData.cpp
+ * \author (last) Behrouz NematiPour
+ * \date (last) 11-Apr-2021
+ * \author (original) Behrouz NematiPour
+ * \date (original) 11-Apr-2021
+ *
+ */
+#include "MPreTreatmentDisposablesPrimeData.h"
+
+using namespace Model;
+
+QVariantList MPreTreatmentDisposablesPrime::parameters() const {
+ return {
+ _data.mPrimeState .value,
+ _data.mTotalDuration .value,
+ _data.mCountDown .value,
+ _data.mPauseCountdown .value,
+ };
+}
+
+bool MPreTreatmentDisposablesPrime::fromByteArray(const QByteArray &vByteArray, int *vIndex) {
+ int index = 0; // message data start position
+ if ( ! GetValue(vByteArray, index, _data.mPrimeState )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mTotalDuration )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mCountDown )) goto lError;
+ if ( ! GetValue(vByteArray, index, _data.mPauseCountdown )) goto lError;
+
+ return true ;
+
+lError:
+ if(vIndex) { *vIndex = index; }
+
+ return false ;
+}
+
+/*!
+ * \brief MPreTreatmentPrime::data
+ * \details Provides model's Data from the received messages data values
+ * \return Data
+ */
+MPreTreatmentDisposablesPrime::Data MPreTreatmentDisposablesPrime::data() const {
+ Data data;
+ data.mPrimeState = _data.mPrimeState .value;
+ data.mTotalDuration = _data.mTotalDuration .value;
+ data.mCountDown = _data.mCountDown .value;
+ data.mPauseCountdown = _data.mPauseCountdown .value;
+ return data;
+}
Index: sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h
===================================================================
diff -u
--- sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h (revision 0)
+++ sources/model/td/data/pretreatment/MPreTreatmentDisposablesPrimeData.h (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -0,0 +1,86 @@
+/*!
+ *
+ * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file MPreTreatmentDisposablesPrimeData.h
+ * \author (last) Behrouz NematiPour
+ * \date (last) 11-Apr-2021
+ * \author (original) Behrouz NematiPour
+ * \date (original) 11-Apr-2021
+ *
+ */
+
+#pragma once
+
+// Project
+#include "MAbstract.h"
+#include "types.h"
+
+// forward declarations
+class tst_models;
+namespace Model {
+
+/*!
+ * \brief The MPreTreatmentPrime class
+ * \details The progress and state data model
+ *
+ * | MSG | CAN ID | Box | Type | Ack | Src | Dst | Description |
+ * |:----:|:------:|:---:|:------:|:---:|:---:|:---:|:--------------: |
+ * |0xC700| 0x020 | 9 | 1 Hz | N | HD | UI | Pre-Treatment Disposable Priming Progress Data |
+ *
+ * | Payload ||
+ * | ||
+ * | #1:(U32) | \ref Data::mPrimeState |
+ * | #2:(U32) | \ref Data::mTotalDuration |
+ * | #3:(U32) | \ref Data::mCountDown |
+ * | #4:(U32) | \ref Data::mPauseCountdown |
+ *
+ * \sa Data
+ *
+ *
+ * | ||
+ * | ||
+ * | typeText | Datum |
+ * | unitText | TD |
+ * | infoText | DisposablesPrime |
+ *
+ */
+class MPreTreatmentDisposablesPrime : public MAbstract {
+
+ // friends
+ friend class ::tst_models;
+
+ QVariantList parameters() const override;
+
+
+ struct {
+ Types::U32 mPrimeState ;
+ Types::U32 mTotalDuration ;
+ Types::U32 mCountDown ;
+ Types::U32 mPauseCountdown ;
+ } _data;
+
+public:
+ Type_Enum typeText () const override { return Type_Enum::eDatum ; }
+ Unit_Enum unitText () const override { return Unit_Enum::eTD ; }
+ QString infoText () const override { return QString("DisposablesPrime"); }
+
+ struct Data {
+ quint32 mPrimeState = 0; ///< Timeout Total time in sec */
+ quint32 mTotalDuration = 0; ///< Countdown current time countdown in sec */
+ quint32 mCountDown = 0; ///< Countdown current time countdown in sec */
+ quint32 mPauseCountdown = 0; ///< Countdown current time countdown in sec */
+ };
+
+public:
+ MPreTreatmentDisposablesPrime() { }
+
+ bool fromByteArray (const QByteArray &vByteArray , int *vIndex = nullptr) override;
+ Data data ( ) const ;
+};
+}
+
+typedef Model::MPreTreatmentDisposablesPrime::Data PreTreatmentDisposablesPrimeData;
Index: sources/view/VWaterSampleModel.cpp
===================================================================
diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/view/VWaterSampleModel.cpp (.../VWaterSampleModel.cpp) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2)
+++ sources/view/VWaterSampleModel.cpp (.../VWaterSampleModel.cpp) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -16,12 +16,12 @@
void View::VWaterSampleModel::initModel()
{
_model.clear();
- _model.insertRow( eWaterSample , {{ eRole_Text, tr("Water Sample") }, { eRole_Visible, _roWaterMode }});
+ _model.insertRow( eWaterSample , {{ eRole_Text, tr("Water Sample") }, { eRole_Visible, _isROFeatured }});
_model.insertRow( eDialysateChecks , {{ eRole_Text, tr("Dialysate Checks")}, { eRole_Visible, true }});
}
void View::VWaterSampleModel::onActionReceive(const RoWaterModeResponseData &vData)
{
- roWaterMode ( vData.mValue );
+ isROFeatured ( vData.mValue != eDefeatured );
initModel();
}
Index: sources/view/VWaterSampleModel.h
===================================================================
diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/view/VWaterSampleModel.h (.../VWaterSampleModel.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2)
+++ sources/view/VWaterSampleModel.h (.../VWaterSampleModel.h) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -34,9 +34,16 @@
eDialysateChecks= 1
} WaterSample;
+ // TODO Update to use shared FW enums in common.h
+ enum {
+ eFeatured = 0,
+ eFeatueredBoost = 1,
+ eDefeatured = 2
+ } RoMode;
+
Q_PROPERTY(MListModel* model READ model NOTIFY didModelChange)
- PROPERTY ( int , roWaterMode , 0)
+ PROPERTY ( bool , isROFeatured , true)
VIEW_DEC_SLOT(RoWaterModeResponseData )
Fisheye: Tag 5a0639ee020873025a536140b8c6b5507d173412 refers to a dead (removed) revision in file `sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 5a0639ee020873025a536140b8c6b5507d173412 refers to a dead (removed) revision in file `sources/view/hd/data/pretreatment/VPreTreatmentDisposablesPrimeData.h'.
Fisheye: No comparison available. Pass `N' to diff?
Index: sources/view/settings/VRoWaterMode.h
===================================================================
diff -u -rb110ee732fe1306669f71d9c17ed4714e1f03ee2 -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/view/settings/VRoWaterMode.h (.../VRoWaterMode.h) (revision b110ee732fe1306669f71d9c17ed4714e1f03ee2)
+++ sources/view/settings/VRoWaterMode.h (.../VRoWaterMode.h) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -24,7 +24,7 @@
// has been manually tested that it works perfectly fine
TRIGGER ( bool , adjustment , 0)
- TRIGGER ( int , status , 0)
+ PROPERTY ( int , status , 0)
VIEW_DEC_CLASS_ADJUSTMENT(VRoWaterMode, RoWaterModeResponseData)
Index: sources/view/td/data/VTDValvesData.cpp
===================================================================
diff -u -r292beb22109065953f769ace13c3a395674612ac -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/view/td/data/VTDValvesData.cpp (.../VTDValvesData.cpp) (revision 292beb22109065953f769ace13c3a395674612ac)
+++ sources/view/td/data/VTDValvesData.cpp (.../VTDValvesData.cpp) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -28,6 +28,4 @@
posA (vData.mPosA );
posB (vData.mPosB );
posC (vData.mPosC );
- posD (vData.mPosD );
- maxHomingPos (vData.mMaxHomingPos );
}
Index: sources/view/td/data/VTDValvesData.h
===================================================================
diff -u -r292beb22109065953f769ace13c3a395674612ac -r5a0639ee020873025a536140b8c6b5507d173412
--- sources/view/td/data/VTDValvesData.h (.../VTDValvesData.h) (revision 292beb22109065953f769ace13c3a395674612ac)
+++ sources/view/td/data/VTDValvesData.h (.../VTDValvesData.h) (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -43,8 +43,6 @@
PROPERTY( qint16 , posA , 0)
PROPERTY( qint16 , posB , 0)
PROPERTY( qint16 , posC , 0)
- PROPERTY( qint16 , posD , 0)
- PROPERTY( qint16 , maxHomingPos , 0)
VIEW_DEC(VTDValves, TDValvesData)
};
Index: sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp
===================================================================
diff -u
--- sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp (revision 0)
+++ sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.cpp (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -0,0 +1,78 @@
+/*!
+ *
+ * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file VPreTreatmentDisposablesPrimeData.cpp
+ * \author (last) Behrouz NematiPour
+ * \date (last) 11-Apr-2021
+ * \author (original) Behrouz NematiPour
+ * \date (original) 11-Apr-2021
+ *
+ */
+#include "VPreTreatmentDisposablesPrimeData.h"
+
+// Project
+#include "GuiController.h"
+
+//ENUM Checks
+//TODO: ---------- Improve me ----------
+// This part of the code is a WIP example to fail the build if the enum is changed but UI doesn't aware.
+#define ENUM_PRINT( vTYPE ) {} // qDebug() << v##vTYPE
+#define ENUM_CHECK_O( vTYPE, vVALUE ) vTYPE v##vTYPE = static_cast(vVALUE); switch(v##vTYPE)
+#define ENUM_CHECK( vTYPE, vENUM ) case vTYPE::vENUM : { if ( vTYPE::vENUM == v##vTYPE) ENUM_PRINT(vTYPE); } break;
+#define ENUM_CHECK_C( vTYPE, vENUM ) case vTYPE::vENUM : break;
+#define ENUM_READ( vTYPE, vENUM, vSTATE ) vSTATE( vTYPE::vENUM == v##vTYPE);
+
+VIEW_DEF(VPreTreatmentDisposablesPrime, PreTreatmentDisposablesPrimeData)
+
+void VPreTreatmentDisposablesPrime::onActionReceive(const PreTreatmentDisposablesPrimeData &vData)
+{
+ state (vData.mPrimeState );
+ total (vData.mTotalDuration );
+ countDown (vData.mCountDown );
+ pauseCountDown (vData.mPauseCountdown );
+ elapsed (vData.mTotalDuration - vData.mCountDown );
+
+ // Prime States
+// ENUM_CHECK_O( GuiPreTreatmentPrimeStates, vData.mPrimeState ) {
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_START_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_INITIAL_REVERSE_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_AIR_TRAP_LOWER_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_INITIAL_DIALYZER_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_FILL_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE1 )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE2 )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE3 )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_WAIT_FOR_DIALYSATE_READY_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_DC_INITIAL_DIALYSATE_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_DC_DEPRESSURIZE_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_WAIT_FOR_AIR_TRAP_FILL_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC2_FORWARD_RECIRC_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC2_PAUSE_TO_ROTATE_OPP_DIR_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_BC2_REVERSE_RECIRC_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_PAUSE_STATE )
+// ENUM_CHECK ( GuiPreTreatmentPrimeStates, PRIME_COMPLETE_STATE )
+// ENUM_CHECK_C( GuiPreTreatmentPrimeStates, NUM_OF_PRIME_STATES ) }
+
+
+// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_BC_INITIAL_REVERSE_STATE , primeBloodCircuitStart );
+// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_BC_CLEAR_STATE3 , primeBloodCircuitEnd );
+// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_DC_INITIAL_DIALYSATE_STATE , primeDialysateCircuitStart );
+// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_BC2_FORWARD_RECIRC_STATE , primeDialysateCircuitEnd );
+// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_BC2_FORWARD_RECIRC_STATE , primeDialysatePurgeStart );
+// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE , primeDialysatePurgeEnd );
+// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_DC_DISCARD_AND_REVERSE_PRIME_STATE , primePrimingFluidDiscardStart );
+// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_COMPLETE_STATE , primePrimingFluidDiscardEnd );
+// ENUM_READ ( GuiPreTreatmentPrimeStates, PRIME_COMPLETE_STATE , primeComplete );
+
+// emit state(vData.mPrimeState);
+
+
+
+ primeBloodCircuit(vData.mPrimeState >= GuiPreTreatmentPrimeStates::PRIME_START_STATE &&
+ vData.mPrimeState <= GuiPreTreatmentPrimeStates::PRIME_WAIT_FOR_DIALYSATE_READY_STATE );
+}
Index: sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h
===================================================================
diff -u
--- sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h (revision 0)
+++ sources/view/td/data/pretreatment/VPreTreatmentDisposablesPrimeData.h (revision 5a0639ee020873025a536140b8c6b5507d173412)
@@ -0,0 +1,63 @@
+/*!
+ *
+ * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved.
+ * \copyright
+ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
+ * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
+ *
+ * \file VPreTreatmentDisposablesPrimeData.h
+ * \author (last) Behrouz NematiPour
+ * \date (last) 10-Aug-2021
+ * \author (original) Behrouz NematiPour
+ * \date (original) 11-Apr-2021
+ *
+ */
+#pragma once
+
+// Qt
+#include
+
+// Project
+#include "main.h" // Doxygen : do not remove
+#include "VView.h"
+#include "MPreTreatmentDisposablesPrimeData.h"
+
+// namespace
+namespace View {
+
+/*!
+ * \brief The VPreTreatmentDisposablesPrime class
+ * \details View for Model's data representation.
+ *
+ * \sa Model::MTreatmentTime
+ *
+ */
+class VPreTreatmentDisposablesPrime : public QObject
+{
+ Q_OBJECT
+
+ PROPERTY( quint32 , state , 0)
+ PROPERTY( quint32 , total , 0)
+ PROPERTY( quint32 , countDown , 0)
+ PROPERTY( quint32 , pauseCountDown , 0)
+ PROPERTY( quint32 , elapsed , 0)
+
+ PROPERTY ( bool , primeBloodCircuitStart , false)
+ PROPERTY ( bool , primeBloodCircuitEnd , false)
+ PROPERTY ( bool , primeDialysateCircuitStart , false)
+ PROPERTY ( bool , primeDialysateCircuitEnd , false)
+ PROPERTY ( bool , primeDialysatePurgeStart , false)
+ PROPERTY ( bool , primeDialysatePurgeEnd , false)
+ PROPERTY ( bool , primePrimingFluidDiscardStart , false)
+ PROPERTY ( bool , primePrimingFluidDiscardEnd , false)
+ PROPERTY ( bool , primeComplete , false)
+
+
+ PROPERTY ( bool , primeBloodCircuit , false)
+// PROPERTY ( bool , primeDialysateCircuit\ , false)
+// PROPERTY ( bool , primeDialysatePurge , false)
+// PROPERTY ( bool , primePrimingFluidDiscard , false)
+
+ VIEW_DEC(VPreTreatmentDisposablesPrime, PreTreatmentDisposablesPrimeData)
+};
+}