Index: leahi.qrc
===================================================================
diff -u -rbe078c5a3e044ad1d943525dd6c50124d2f78905 -r5941bc1d07e5d58f9d848afbf1414ef4f78e9185
--- leahi.qrc (.../leahi.qrc) (revision be078c5a3e044ad1d943525dd6c50124d2f78905)
+++ leahi.qrc (.../leahi.qrc) (revision 5941bc1d07e5d58f9d848afbf1414ef4f78e9185)
@@ -124,6 +124,8 @@
resources/images/water_sample.png
resources/images/ArrowDownDisabled.png
resources/images/ArrowUpDisabled.png
+ resources/images/recirculate_main.png
+ resources/images/bloodpump.png
resources/images/edit_yellow.png
@@ -172,6 +174,7 @@
sources/gui/qml/components/Footer.qml
sources/gui/qml/components/TextEntry.qml
sources/gui/qml/components/ScrollBar.qml
+ sources/gui/qml/components/ScrollBar2.qml
sources/gui/qml/components/FooterStatic.qml
sources/gui/qml/components/TimeEntry.qml
sources/gui/qml/components/Label.qml
@@ -284,6 +287,7 @@
sources/gui/qml/pages/treatment/TreatmentSectionHeader.qml
sources/gui/qml/pages/treatment/TreatmentHeparin.qml
sources/gui/qml/pages/treatment/TreatmentHDF.qml
+ sources/gui/qml/pages/treatment/TreatmentTrends.qml
sources/gui/qml/pages/treatment/sections/TreatmentFlows.qml
@@ -325,8 +329,9 @@
sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinsebackInit.qml
sources/gui/qml/pages/endtreatment/rinseback/EndTreatmentRinseback.qml
-
-
+
+ sources/gui/qml/pages/endtreatment/recirculate/EndTreatmentRecirculateProgress.qml
+
sources/gui/qml/pages/posttreatment/PostTreatmentBase.qml
sources/gui/qml/pages/posttreatment/PostTreatmentStack.qml
Index: sources/gui/qml/globals/Variables.qml
===================================================================
diff -u -rbe078c5a3e044ad1d943525dd6c50124d2f78905 -r5941bc1d07e5d58f9d848afbf1414ef4f78e9185
--- sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision be078c5a3e044ad1d943525dd6c50124d2f78905)
+++ sources/gui/qml/globals/Variables.qml (.../Variables.qml) (revision 5941bc1d07e5d58f9d848afbf1414ef4f78e9185)
@@ -320,6 +320,8 @@
readonly property string unitTextDispensingRate : qsTr("mL/hr")
readonly property string unitTextRate : qsTr("L/h")
readonly property string unitTextDialCond : qsTr("mS/cm")
+ // - Pressures
+ readonly property string unitPressure : qsTr("mmHg")
// - Vitals
readonly property string unitTextBloodPressure : qsTr("mmHg")
readonly property string unitTextHeartBeat : qsTr("BPM" )
Index: sources/gui/qml/main.qml
===================================================================
diff -u -r82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180 -r5941bc1d07e5d58f9d848afbf1414ef4f78e9185
--- sources/gui/qml/main.qml (.../main.qml) (revision 82b22f0f0ae1ff5b0a5c1524c7e91cc8d667b180)
+++ sources/gui/qml/main.qml (.../main.qml) (revision 5941bc1d07e5d58f9d848afbf1414ef4f78e9185)
@@ -83,6 +83,7 @@
import VTreatmentStop 0.1
import VTreatmentRanges 0.1
import VTreatmentHeparin 0.1
+import VTreatmentTrends 0.1
// Pre-Treatment
import VPreTreatmentAdjustmentInitTreatment 0.1
@@ -303,6 +304,8 @@
VTreatmentCreate { id: vTreatmentCreate }
VTreatmentRanges { id: vTreatmentRanges }
+ VTreatmentTrends { id: vTreatmentTrends }
+
VTreatmentAdjustmentBloodPrime { id: vTreatmentAdjustmentBloodPrime }
VTreatmentAdjustmentBolusVolume { id: vTreatmentAdjustmentBolusVolume }
VTreatmentAdjustmentIsolatedUFDurationEdit { id: vTreatmentAdjustmentIsolatedUFDurationEdit }
Index: sources/gui/qml/pages/treatment/TreatmentStack.qml
===================================================================
diff -u -r698c4d2275163b2d81bd4ab430be02bad65ede84 -r5941bc1d07e5d58f9d848afbf1414ef4f78e9185
--- sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 698c4d2275163b2d81bd4ab430be02bad65ede84)
+++ sources/gui/qml/pages/treatment/TreatmentStack.qml (.../TreatmentStack.qml) (revision 5941bc1d07e5d58f9d848afbf1414ef4f78e9185)
@@ -126,7 +126,18 @@
}
}
- ScreenItem { id: _treatmentTrends } // TODO: make me!
+ TreatmentTrends { id: _treatmentTrends
+ objectName: "_treatmentTrends"
+ Connections { target: vTDOpMode
+ function onInTreatmentChanged() {
+ if (vTDOpMode.inTreatment) {
+ _treatmentTrends.isParamExpanded = true
+ vTreatmentTrends.doClearData()
+ }
+ }
+ }
+ }
+
TreatmentHeparin { id: _treatmentHeparin }
Connections { target: _treatmentHeparin
function onIdleTimeout ( ) {
Index: sources/model/MListModel.cpp
===================================================================
diff -u -raacca8cc53f5e4ff5abb6d7df3d5ad48c915645c -r5941bc1d07e5d58f9d848afbf1414ef4f78e9185
--- sources/model/MListModel.cpp (.../MListModel.cpp) (revision aacca8cc53f5e4ff5abb6d7df3d5ad48c915645c)
+++ sources/model/MListModel.cpp (.../MListModel.cpp) (revision 5941bc1d07e5d58f9d848afbf1414ef4f78e9185)
@@ -65,6 +65,20 @@
}
/*!
+ * \brief Return a list of roles from each row of model
+ * \param[in] vRole Role of model to populate list
+ */
+QStringList View::MListModel::getAllRoles( int vRole ) const
+{
+ QStringList result;
+
+ for (int row = 0; row < rowCount(); ++row) {
+ result.append(data(index(row), vRole).toString());
+ }
+ return result;
+}
+
+/*!
* \brief Clear any data contained in this list model.
*/
void View::MListModel::clear() {
Index: sources/model/MListModel.h
===================================================================
diff -u -raacca8cc53f5e4ff5abb6d7df3d5ad48c915645c -r5941bc1d07e5d58f9d848afbf1414ef4f78e9185
--- sources/model/MListModel.h (.../MListModel.h) (revision aacca8cc53f5e4ff5abb6d7df3d5ad48c915645c)
+++ sources/model/MListModel.h (.../MListModel.h) (revision 5941bc1d07e5d58f9d848afbf1414ef4f78e9185)
@@ -30,6 +30,7 @@
void insertRow (const int vRow, const QHash &vData );
void updateData (const int vRow, const int vRole, const QVariant& vValue );
MListModel &operator = (const QList> &src );
+ QStringList getAllRoles (int vRole ) const;
public slots:
QVariantMap get (int vRow ) const; // Exposed to QML
Index: sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h
===================================================================
diff -u -r1da0c41020664b642359f3cd5d58a2fdc36774a2 -r5941bc1d07e5d58f9d848afbf1414ef4f78e9185
--- sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 1da0c41020664b642359f3cd5d58a2fdc36774a2)
+++ sources/model/hd/adjustment/treatment/MTreatmentAdjustRequests.h (.../MTreatmentAdjustRequests.h) (revision 5941bc1d07e5d58f9d848afbf1414ef4f78e9185)
@@ -176,23 +176,42 @@
*
* | Payload ||
* | ||
- * | #1:(U32) | \ref bloodFlowRate |
- * | #2:(U32) | \ref dialysateFlowRate |
- * | #3:(F32) | \ref dialysateTemperature |
- * | #4:(U32) | \ref acidConcentrate |
- * | #5:(U32) | \ref bicarbConcentrate |
+ * | #1:(U32) | \ref bloodFlowRate |
+ * | #2:(U32) | \ref dialysateFlowRate |
+ * | #3:(F32) | \ref dialysateTemperature |
+ * | #4:(U32) | \ref acidConcentrate |
+ * | #5:(U32) | \ref acidConcentrateConversionFactor |
+ * | #6:(U32) | \ref bicarbConcentrate |
+ * | #7:(U32) | \ref treatmentModality |
+ * | #8:(U32) | \ref hepatitus |
+ * | #9:(U32) | \ref sodium |
+ * | #10:(U32)| \ref bicarbonate |
*
*/
class MAdjustSetPointsReq : public MModel {
public:
- quint32 bloodFlowRate = 0;
- quint32 dialysateFlowRate = 0;
- float dialysateTemperature = 0;
- quint32 acidConcentrate = 0;
- quint32 bicarbConcentrate = 0;
+ quint32 bloodFlowRate = 0;
+ quint32 dialysateFlowRate = 0;
+ float dialysateTemperature = 0;
+ quint32 acidConcentrate = 0;
+ float acidConcentrateConversionFactor = 0;
+ quint32 bicarbConcentrate = 0;
+ quint32 treatmentModality = 0;
+ quint32 hepatitus = 0;
+ quint32 sodium = 0;
+ quint32 bicarbonate = 0;
QString toString() {
- return toString({bloodFlowRate, dialysateFlowRate, dialysateTemperature, acidConcentrate, bicarbConcentrate});
+ return toString({ bloodFlowRate,
+ dialysateFlowRate,
+ dialysateTemperature,
+ acidConcentrate,
+ acidConcentrateConversionFactor,
+ bicarbConcentrate,
+ treatmentModality,
+ hepatitus,
+ sodium,
+ bicarbonate});
}
static QString toString(const QVariantList &vParameters) {
return MModel::toString("AdjustSetPointsReq", vParameters);