Index: sources/gui/qml/dialogs/CalibrationDialog.qml =================================================================== diff -u -r969fb65fb9857c0a6a84cb9f7d591d16de40e898 -rbb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43 --- sources/gui/qml/dialogs/CalibrationDialog.qml (.../CalibrationDialog.qml) (revision 969fb65fb9857c0a6a84cb9f7d591d16de40e898) +++ sources/gui/qml/dialogs/CalibrationDialog.qml (.../CalibrationDialog.qml) (revision bb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43) @@ -81,24 +81,38 @@ } header: Item { id : _headerRect - implicitHeight: Variables.adjustmentHeaderHeight + implicitHeight: Variables.alarmDialogHeaderHeight TitleText { id : _titleText - text: qsTr("Edit %1 (%2)").arg(titleText).arg(componentName) + text: qsTr("Edit %1").arg(titleText) font { pixelSize : Fonts.fontPixelSection weight : Font.Medium } color : Colors.offWhite width : _root.width - Variables.defaultMargin * 2 - height : parent.height + height : parent.height / 2 anchors { bottom : parent.bottom horizontalCenter : parent.horizontalCenter - margins : Variables.defaultMargin + margins : Variables.defaultMargin * 2 } } + Text { + visible: _root.componentName !== "" + + text : ("(%1)").arg(componentName) + color : Colors.offWhite + font { + pixelSize : Fonts.fontPixelTextRectTitle + } + anchors { + top : _titleText.bottom + horizontalCenter: parent.horizontalCenter + } + } + CloseButton { id : _closeButton anchors { right : parent.right Index: sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml =================================================================== diff -u -r969fb65fb9857c0a6a84cb9f7d591d16de40e898 -rbb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43 --- sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml (.../SettingsCalibrationSettings.qml) (revision 969fb65fb9857c0a6a84cb9f7d591d16de40e898) +++ sources/gui/qml/pages/settings/SettingsCalibrationSettings.qml (.../SettingsCalibrationSettings.qml) (revision bb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43) @@ -34,7 +34,7 @@ qsTr("Temperature" ) , qsTr("Concentrate Pump" ) , qsTr("Dialysate Pump (D48)" ) , - qsTr("Dialysate Pump (D1)" ) , + qsTr("Dialysate Pump (D12)" ) , qsTr("Acid Types" ) , qsTr("Bicarb Types" ) , qsTr("Accelerometer" ) , @@ -79,11 +79,9 @@ model : vCalibrationSettings.columnTitle delegate: HeaderText { - readonly property bool isCalTime: index === _repeater.count - 1 - title : modelData height : Variables.institutionaltContainerHeight - leftPadding : isCalTime ? Variables.defaultMargin : Variables.defaultMargin * 2 + leftPadding : 0 width : _headerComponentRow.width / vCalibrationSettings.columnTitle.length verticalAlignment : Text.AlignVCenter } @@ -164,7 +162,7 @@ title : isCalTime ? modelData : Number(modelData).toFixed(3) height : Variables.institutionaltContainerHeight - leftPadding : isCalTime ? 0 : Variables.defaultMargin * 2 + leftPadding : 0 width : _delegateComponentRow.width / vCalibrationSettings.columnTitle.length verticalAlignment : Text.AlignVCenter font.pixelSize : isCalTime ? Fonts.fontPixelDefaultButton : Fonts.fontPixelTextRectTitle Index: sources/view/settings/VCalibrationSettings.cpp =================================================================== diff -u -r969fb65fb9857c0a6a84cb9f7d591d16de40e898 -rbb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43 --- sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision 969fb65fb9857c0a6a84cb9f7d591d16de40e898) +++ sources/view/settings/VCalibrationSettings.cpp (.../VCalibrationSettings.cpp) (revision bb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43) @@ -17,18 +17,20 @@ }); } -QVariantList View::VCalibrationSettings::createInitPayload(int vCount) +QVariantList View::VCalibrationSettings::initList(const QStringList &vTitles) { - QVariantList list; - list.reserve(vCount); + columnTitle ( vTitles ) ; - for (int i = 0; i < vCount; ++i) { - list.append(0); + QVariantList mInitValues; + mInitValues.reserve(vTitles.count()); + + for (int i = 0; i < vTitles.count(); ++i) { + mInitValues.append(0.0); } - rejectionReasons(list); + rejectionReasons(mInitValues); - return list; + return mInitValues; } quint32 View::VCalibrationSettings::getEpochUTC() @@ -43,49 +45,82 @@ _calibrationList.clear(); switch (vIndex) { - case ePressure : - { - columnTitle ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; - QVariantList initPayloadValues = createInitPayload(_columnTitle.count()); // may remove alter when we add getter message from FW - // DD Pressure sensors - _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Outlet Pressure")}, { eRole_Component, tr("D9" )}, {eRole_Payload, initPayloadValues }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Dry Bicarb Pressure")}, { eRole_Component, tr("D66")}, {eRole_Payload, initPayloadValues }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pressure")}, { eRole_Component, tr("D51")}, {eRole_Payload, initPayloadValues }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pressure")}, { eRole_Component, tr("D15")}, {eRole_Payload, initPayloadValues }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Transmembrane Pressure")}, { eRole_Component, tr("D41")}, {eRole_Payload, initPayloadValues }}); - _calibrationList.appendRow( {{ eRole_Title, tr("D87 Pressure Sensor")}, { eRole_Component, tr("D87")}, {eRole_Payload, initPayloadValues }}); -// // FP Pressure sensors - _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before regulator")}, { eRole_Component, tr("M3") }, {eRole_Payload, initPayloadValues }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure after regulator")}, { eRole_Component, tr("P8") }, {eRole_Payload, initPayloadValues }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before the cond. sensor")}, { eRole_Component, tr("P13")}, {eRole_Payload, initPayloadValues }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Pressure before the RO filter")}, { eRole_Component, tr("P17")}, {eRole_Payload, initPayloadValues }}); - _calibrationList.appendRow( {{ eRole_Title, tr("Pressure after the RO filter")}, { eRole_Component, tr("P46")}, {eRole_Payload, initPayloadValues }}); - break; + case ePressure : + { + QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + // DD Pressure sensors + _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Outlet Pressure")}, { eRole_Component, tr("D9" )}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Dry Bicarb Pressure")}, { eRole_Component, tr("D66")}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pressure")}, { eRole_Component, tr("D51")}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pressure")}, { eRole_Component, tr("D15")}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Transmembrane Pressure")}, { eRole_Component, tr("D41")}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("D87 Pressure Sensor")}, { eRole_Component, tr("D87")}, {eRole_Payload, initPayloadValues }}); + // FP Pressure sensors + _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before regulator")}, { eRole_Component, tr("M3") }, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure after regulator")}, { eRole_Component, tr("P8") }, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Water inlet pressure before the cond. sensor")}, { eRole_Component, tr("P13")}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Pressure before the RO filter")}, { eRole_Component, tr("P17")}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Pressure after the RO filter")}, { eRole_Component, tr("P46")}, {eRole_Payload, initPayloadValues }}); + break; + } + case eTemperature : + { + QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + _calibrationList.appendRow( {{ eRole_Title, tr("Heat exchanger Inlet")}, { eRole_Component, tr("D1" )}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Heat exchanger Outlet")}, { eRole_Component, tr("D78")}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Hydraulics Primary Heater")}, { eRole_Component, tr("D4" )}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Trimmer Heater")}, { eRole_Component, tr("D50")}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Conductivity")}, { eRole_Component, tr("D99")}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Barometric")}, { eRole_Component, tr("BRD")}, {eRole_Payload, initPayloadValues }}); + break; + } + case eConcentratePump : + { + QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + _calibrationList.appendRow( {{ eRole_Title, tr("Acid")}, { eRole_Component, tr("D11_CP1" )}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Bicarbonate")}, { eRole_Component, tr("D10_CP2" )}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("Ultrafiltration")}, { eRole_Component, tr("D76" )}, {eRole_Payload, initPayloadValues }}); + break; + } + case eDialysatePumpD12 : + { + QVariantList initPayloadValues = initList ( { tr("Target Speed"), tr("Cal Time") } ) ; + _calibrationList.appendRow( {{ eRole_Title, tr("Fresh Dialysate Pump")}, { eRole_Component, tr("D12" )}, {eRole_Payload, initPayloadValues }}); + break; + } + case eDialysatePumpD48 : + { + QVariantList initPayloadValues = initList ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; + _calibrationList.appendRow( {{ eRole_Title, tr("Spent Dialysate Pump")}, { eRole_Component, tr("D48" )}, {eRole_Payload, initPayloadValues }}); + break; + } + case eAcidTypes : + { + QVariantList initPayloadValues = initList ( { tr("Mix Ratio"), tr("Full Bottle Vol. (mL)"), tr("Cond. (uS/cm)"), tr("Temp (°C)"), tr("Cal Time") } ) ; + _calibrationList.appendRow( {{ eRole_Title, tr("08-1251-1")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("08-2251-0")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }}); + _calibrationList.appendRow( {{ eRole_Title, tr("08-3251-9")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }}); + break; + } + case eBicarbTypes : + { + QVariantList initPayloadValues = initList ( { tr("Mix Ratio"), tr("Start Volume (mL)"), tr("Cond. (uS/cm)"), tr("Temp (°C)"), tr("Cal Time") } ) ; + _calibrationList.appendRow( {{ eRole_Title, tr("08-677753-0")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }}); + break; + } + case eAccelerometer : + { + QVariantList initPayloadValues = initList ( { tr("X axis offset"), tr("Y axis offset"), tr("Z axis offset"), tr("Cal Time") } ) ; + _calibrationList.appendRow( {{ eRole_Title, tr("Accelerometer")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }}); + break; + } + case eBloodLeak : + { + QVariantList initPayloadValues = initList ( { tr("Set Point"), tr("Cal Time") } ) ; + _calibrationList.appendRow( {{ eRole_Title, tr("Blood Leak")}, { eRole_Component, tr("")}, {eRole_Payload, initPayloadValues }}); + break; + } } - case eTemperature : - columnTitle ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; - - break; - case eConcentratePump : - columnTitle ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; - break; - case eDialysatePumpD48 : - columnTitle ( { tr("4th order"), tr("3rd order"), tr("2nd order"), tr("Gain"), tr("Offset"), tr("Cal Time") } ) ; - - break; - case eDialysatePumpD1 : - columnTitle ( { tr("Target Speed"), tr("Cal Time") } ) ; - - break; - case eAcidTypes : - break; - case eBicarbTypes : - break; - case eAccelerometer : - break; - case eBloodLeak : - break; - } } void View::VCalibrationSettings::doAdjustment(int vIndex, int vSensorIndex, QVariantList vPayload) @@ -105,18 +140,17 @@ qDebug() << "Cal Time: " << vPayload.last() << " -- Epoch:" << calTime; - switch (vIndex) { case ePressure : break; case eTemperature : break; case eConcentratePump : break; + case eDialysatePumpD12 : + break; case eDialysatePumpD48 : break; - case eDialysatePumpD1 : - break; case eAcidTypes : break; case eBicarbTypes : Index: sources/view/settings/VCalibrationSettings.h =================================================================== diff -u -r969fb65fb9857c0a6a84cb9f7d591d16de40e898 -rbb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43 --- sources/view/settings/VCalibrationSettings.h (.../VCalibrationSettings.h) (revision 969fb65fb9857c0a6a84cb9f7d591d16de40e898) +++ sources/view/settings/VCalibrationSettings.h (.../VCalibrationSettings.h) (revision bb3bfd135aa8216edb4d8f83ef6e4ecf311b2b43) @@ -34,8 +34,8 @@ ePressure , eTemperature , eConcentratePump , + eDialysatePumpD12 , eDialysatePumpD48 , - eDialysatePumpD1 , eAcidTypes , eBicarbTypes , eAccelerometer , @@ -52,12 +52,11 @@ Q_PROPERTY(MListModel* model READ model NOTIFY didModelChange) VIEW_DEC_CLASS(VCalibrationSettings); /// REMOVE ONCE RESPONSE INPOMEPLEENTED -// VIEW_DEC_CLASS_ADJUSTMENT(VCalibrationSettings, InstitutionalRecordResponseData ) private: MListModel* model () { return &_calibrationList; } MListModel _calibrationList; - QVariantList createInitPayload(int vCount); + QVariantList initList(const QStringList &vTitles); quint32 getEpochUTC(); public slots: