Index: sources/canbus/MessageDispatcher.cpp =================================================================== diff -u -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 -rb1462640e36df3f567c42aa8c8cbd6dafe865625 --- sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) +++ sources/canbus/MessageDispatcher.cpp (.../MessageDispatcher.cpp) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) @@ -522,7 +522,7 @@ mData += vData.mArterialPressureLimitWindow ; mData += vData.mVenousPressureLimitWindow ; mData += vData.mVenousPressureLimitAsymtrc ; - mData += vData.mTrancembrncPressureLimitWindow ; + mData += vData.mTransmembranePressureLimitWindow; mData += vData.mDialysateTemp ; mData += vData.mHeparinDispensingRate ; mData += vData.mHeparinBolusVolume ; Index: sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml =================================================================== diff -u -rc3ccffd6df1e4c2c42ebaa80e751895a82cf7460 -rb1462640e36df3f567c42aa8c8cbd6dafe865625 --- sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision c3ccffd6df1e4c2c42ebaa80e751895a82cf7460) +++ sources/gui/qml/pages/treatment/adjustments/TreatmentAdjustmentPressuresLimits.qml (.../TreatmentAdjustmentPressuresLimits.qml) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) @@ -41,7 +41,7 @@ _arterialWindow.value = vTreatmentCreate.arterialPressureLimitWindow _venousWindow.value = vTreatmentCreate.venousPressureLimitWindow _venousAsymmetricWindow.value = vTreatmentCreate.venousPressureLimitAsymtrc - _tmpWindow.value = vTreatmentCreate.trancembrncPressureLimitWindow + _tmpWindow.value = vTreatmentCreate.transmembranePressureLimitWindow } Item { id: _contentItem @@ -77,7 +77,6 @@ minimum : vTreatmentRanges.arterialPressureLimitWindowMin maximum : vTreatmentRanges.arterialPressureLimitWindowMax step : vTreatmentRanges.arterialPressureLimitWindowRes - value : { value = vTreatmentRanges.arterialPressureLimitWindowDef } // set without binding onDidChange : function(vValue) { value = vValue } } @@ -92,7 +91,6 @@ minimum : vTreatmentRanges.venousPressureLimitWindowMin maximum : vTreatmentRanges.venousPressureLimitWindowMax step : vTreatmentRanges.venousPressureLimitWindowRes - value : { value = vTreatmentRanges.venousPressureLimitWindowDef } // set without binding onDidChange : function(vValue) { value = vValue } } @@ -107,7 +105,6 @@ minimum : vTreatmentRanges.venousPressureLimitAsymtrcMin maximum : vTreatmentRanges.venousPressureLimitAsymtrcMax step : vTreatmentRanges.venousPressureLimitAsymtrcRes - value : { value = vTreatmentRanges.venousPressureLimitAsymtrcDef } // set without binding onDidChange : function(vValue) { value = vValue } } @@ -119,10 +116,9 @@ unitText : Variables.unitTextPressure unitFontPixelSize : _arterialWindow.unitFontPixelSize isActive : true - minimum : vTreatmentRanges.trancembrncPressureLimitWindowMin - maximum : vTreatmentRanges.trancembrncPressureLimitWindowMax - step : vTreatmentRanges.trancembrncPressureLimitWindowRes - value : { value = vTreatmentRanges.trancembrncPressureLimitWindowDef } // set without binding + minimum : vTreatmentRanges.transmembranePressureLimitWindowMin + maximum : vTreatmentRanges.transmembranePressureLimitWindowMax + step : vTreatmentRanges.transmembranePressureLimitWindowRes onDidChange : function(vValue) { value = vValue } } Index: sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml =================================================================== diff -u -rb6964f987cdc41c7ad3c3ad8f7dffc30d75b3205 -rb1462640e36df3f567c42aa8c8cbd6dafe865625 --- sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision b6964f987cdc41c7ad3c3ad8f7dffc30d75b3205) +++ sources/gui/qml/pages/treatment/sections/TreatmentPressures.qml (.../TreatmentPressures.qml) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) @@ -31,8 +31,8 @@ property int arterialMaximum : vTreatmentRanges.arterialPressureMonitorMax property int venousMinimum : vTreatmentRanges.venousPressureMonitorMin property int venousMaximum : vTreatmentRanges.venousPressureMonitorMax - property int tmpMinimum : vTreatmentRanges.trancembrncPressureMonitorMin - property int tmpMaximum : vTreatmentRanges.trancembrncPressureMonitorMax + property int tmpMinimum : vTreatmentRanges.transmembranePressureMonitorMin + property int tmpMaximum : vTreatmentRanges.transmembranePressureMonitorMax property int arterialLowerBound : vTreatmentPressureOcclusion.arterialMin property int arterialUpperBound : vTreatmentPressureOcclusion.arterialMax Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -rb1462640e36df3f567c42aa8c8cbd6dafe865625 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.cpp (.../MPreTreatmentAdjustParametersValidationResponse.cpp) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) @@ -34,7 +34,7 @@ _data.mArterialPressureLimitWindowRejectReason .value, _data.mVenousPressureLimitWindowRejectReason .value, _data.mVenousPressureLimitAsymtrcRejectReason .value, - _data.mTrancembrncPressureLimitWindowRejectReason .value, + _data.mTransmembranePressureLimitWindowRejectReason .value, _data.mDialysateTempRejectReason .value, _data.mHeparinDispensingRateRejectReason .value, _data.mHeparinBolusVolumeRejectReason .value @@ -59,7 +59,7 @@ if ( ! GetValue(vByteArray, index, _data.mArterialPressureLimitWindowRejectReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitWindowRejectReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mVenousPressureLimitAsymtrcRejectReason )) goto lError; - if ( ! GetValue(vByteArray, index, _data.mTrancembrncPressureLimitWindowRejectReason )) goto lError; + if ( ! GetValue(vByteArray, index, _data.mTransmembranePressureLimitWindowRejectReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mDialysateTempRejectReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mHeparinDispensingRateRejectReason )) goto lError; if ( ! GetValue(vByteArray, index, _data.mHeparinBolusVolumeRejectReason )) goto lError; @@ -74,25 +74,25 @@ MAdjustParametersValidationResponse::Data MAdjustParametersValidationResponse::data() const { Data data; - data.mAccepted = _data.mAccepted .value; - data.mBloodFlowRateRejectReason = _data.mBloodFlowRateRejectReason .value; - data.mDialysateFlowRateRejectReason = _data.mDialysateFlowRateRejectReason .value; - data.mTreatmentDurationRejectReason = _data.mTreatmentDurationRejectReason .value; - data.mSalineBolusVolumeRejectReason = _data.mSalineBolusVolumeRejectReason .value; - data.mHeparinStopTimeRejectReason = _data.mHeparinStopTimeRejectReason .value; - data.mHeparinTypeRejectReason = _data.mHeparinTypeRejectReason .value; - data.mAcidConcentrateRejectReason = _data.mAcidConcentrateRejectReason .value; - data.mBicarbonateConcentrateRejectReason = _data.mBicarbonateConcentrateRejectReason .value; - data.mDialyzerTypeRejectReason = _data.mDialyzerTypeRejectReason .value; - data.mBloodPressureMeasureIntervalRejectReason = _data.mBloodPressureMeasureIntervalRejectReason .value; - data.mRinsebackFlowRateRejectReason = _data.mRinsebackFlowRateRejectReason .value; - data.mRinsebackVolumeRejectReason = _data.mRinsebackVolumeRejectReason .value; - data.mArterialPressureLimitWindowRejectReason = _data.mArterialPressureLimitWindowRejectReason .value; - data.mVenousPressureLimitWindowRejectReason = _data.mVenousPressureLimitWindowRejectReason .value; - data.mVenousPressureLimitAsymtrcRejectReason = _data.mVenousPressureLimitAsymtrcRejectReason .value; - data.mTrancembrncPressureLimitWindowRejectReason = _data.mTrancembrncPressureLimitWindowRejectReason .value; - data.mDialysateTempRejectReason = _data.mDialysateTempRejectReason .value; - data.mHeparinDispensingRateRejectReason = _data.mHeparinDispensingRateRejectReason .value; - data.mHeparinBolusVolumeRejectReason = _data.mHeparinBolusVolumeRejectReason .value; + data.mAccepted = _data.mAccepted .value; + data.mBloodFlowRateRejectReason = _data.mBloodFlowRateRejectReason .value; + data.mDialysateFlowRateRejectReason = _data.mDialysateFlowRateRejectReason .value; + data.mTreatmentDurationRejectReason = _data.mTreatmentDurationRejectReason .value; + data.mSalineBolusVolumeRejectReason = _data.mSalineBolusVolumeRejectReason .value; + data.mHeparinStopTimeRejectReason = _data.mHeparinStopTimeRejectReason .value; + data.mHeparinTypeRejectReason = _data.mHeparinTypeRejectReason .value; + data.mAcidConcentrateRejectReason = _data.mAcidConcentrateRejectReason .value; + data.mBicarbonateConcentrateRejectReason = _data.mBicarbonateConcentrateRejectReason .value; + data.mDialyzerTypeRejectReason = _data.mDialyzerTypeRejectReason .value; + data.mBloodPressureMeasureIntervalRejectReason = _data.mBloodPressureMeasureIntervalRejectReason .value; + data.mRinsebackFlowRateRejectReason = _data.mRinsebackFlowRateRejectReason .value; + data.mRinsebackVolumeRejectReason = _data.mRinsebackVolumeRejectReason .value; + data.mArterialPressureLimitWindowRejectReason = _data.mArterialPressureLimitWindowRejectReason .value; + data.mVenousPressureLimitWindowRejectReason = _data.mVenousPressureLimitWindowRejectReason .value; + data.mVenousPressureLimitAsymtrcRejectReason = _data.mVenousPressureLimitAsymtrcRejectReason .value; + data.mTransmembranePressureLimitWindowRejectReason = _data.mTransmembranePressureLimitWindowRejectReason .value; + data.mDialysateTempRejectReason = _data.mDialysateTempRejectReason .value; + data.mHeparinDispensingRateRejectReason = _data.mHeparinDispensingRateRejectReason .value; + data.mHeparinBolusVolumeRejectReason = _data.mHeparinBolusVolumeRejectReason .value; return data; } Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -rb1462640e36df3f567c42aa8c8cbd6dafe865625 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustParametersValidationResponse.h (.../MPreTreatmentAdjustParametersValidationResponse.h) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) @@ -35,26 +35,26 @@ * * | Payload || * | || - * | #01:(U32) | \ref Data::mAccepted | - * | #02:(U32) | \ref Data::mBloodFlowRateRejectReason | - * | #03:(U32) | \ref Data::mDialysateFlowRateRejectReason | - * | #04:(U32) | \ref Data::mTreatmentDurationRejectReason | - * | #05:(U32) | \ref Data::mSalineBolusVolumeRejectReason | - * | #06:(U32) | \ref Data::mHeparinStopTimeRejectReason | - * | #07:(U32) | \ref Data::mHeparinTypeRejectReason | - * | #08:(U32) | \ref Data::mAcidConcentrateRejectReason | - * | #09:(U32) | \ref Data::mBicarbonateConcentrateRejectReason | - * | #10:(U32) | \ref Data::mDialyzerTypeRejectReason | - * | #11:(U32) | \ref Data::mBloodPressureMeasureIntervalRejectReason | - * | #12:(U32) | \ref Data::mRinsebackFlowRateRejectReason | - * | #13:(U32) | \ref Data::mRinsebackVolumeRejectReason | - * | #14:(U32) | \ref Data::mArterialPressureLimitWindowRejectReason | - * | #15:(U32) | \ref Data::mVenousPressureLimitWindowRejectReason | - * | #16:(U32) | \ref Data::mVenousPressureLimitAsymtrcRejectReason | - * | #17:(U32) | \ref Data::mTrancembrncPressureLimitWindowRejectReason | - * | #18:(U32) | \ref Data::mDialysateTempRejectReason | - * | #19:(U32) | \ref Data::mHeparinDispensingRateRejectReason | - * | #20:(U32) | \ref Data::mHeparinBolusVolumeRejectReason | + * | #01:(U32) | \ref Data::mAccepted | + * | #02:(U32) | \ref Data::mBloodFlowRateRejectReason | + * | #03:(U32) | \ref Data::mDialysateFlowRateRejectReason | + * | #04:(U32) | \ref Data::mTreatmentDurationRejectReason | + * | #05:(U32) | \ref Data::mSalineBolusVolumeRejectReason | + * | #06:(U32) | \ref Data::mHeparinStopTimeRejectReason | + * | #07:(U32) | \ref Data::mHeparinTypeRejectReason | + * | #08:(U32) | \ref Data::mAcidConcentrateRejectReason | + * | #09:(U32) | \ref Data::mBicarbonateConcentrateRejectReason | + * | #10:(U32) | \ref Data::mDialyzerTypeRejectReason | + * | #11:(U32) | \ref Data::mBloodPressureMeasureIntervalRejectReason | + * | #12:(U32) | \ref Data::mRinsebackFlowRateRejectReason | + * | #13:(U32) | \ref Data::mRinsebackVolumeRejectReason | + * | #14:(U32) | \ref Data::mArterialPressureLimitWindowRejectReason | + * | #15:(U32) | \ref Data::mVenousPressureLimitWindowRejectReason | + * | #16:(U32) | \ref Data::mVenousPressureLimitAsymtrcRejectReason | + * | #17:(U32) | \ref Data::mTransmembranePressureLimitWindowRejectReason | + * | #18:(U32) | \ref Data::mDialysateTempRejectReason | + * | #19:(U32) | \ref Data::mHeparinDispensingRateRejectReason | + * | #20:(U32) | \ref Data::mHeparinBolusVolumeRejectReason | * * \sa Data * @@ -89,7 +89,7 @@ Types::U32 mArterialPressureLimitWindowRejectReason ; Types::U32 mVenousPressureLimitWindowRejectReason ; Types::U32 mVenousPressureLimitAsymtrcRejectReason ; - Types::U32 mTrancembrncPressureLimitWindowRejectReason ; + Types::U32 mTransmembranePressureLimitWindowRejectReason ; Types::U32 mDialysateTempRejectReason ; Types::U32 mHeparinDispensingRateRejectReason ; Types::U32 mHeparinBolusVolumeRejectReason ; @@ -118,7 +118,7 @@ quint32 mArterialPressureLimitWindowRejectReason = 0; quint32 mVenousPressureLimitWindowRejectReason = 0; quint32 mVenousPressureLimitAsymtrcRejectReason = 0; - quint32 mTrancembrncPressureLimitWindowRejectReason = 0; + quint32 mTransmembranePressureLimitWindowRejectReason = 0; quint32 mDialysateTempRejectReason = 0; quint32 mHeparinDispensingRateRejectReason = 0; quint32 mHeparinBolusVolumeRejectReason = 0; Index: sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -rb1462640e36df3f567c42aa8c8cbd6dafe865625 --- sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/model/hd/adjustment/pretreatment/MPreTreatmentAdjustRequests.h (.../MPreTreatmentAdjustRequests.h) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) @@ -87,7 +87,7 @@ * | #13:(S32) | \ref mArterialPressureLimitWindow | * | #14:(S32) | \ref mVenousPressureLimitWindow | * | #15:(S32) | \ref mVenousPressureLimitAsymtrc | - * | #16:(S32) | \ref mTrancembrncPressureLimitWindow | + * | #16:(S32) | \ref mTransmembranePressureLimitWindow | * | #17:(F32) | \ref mDialysateTemp | * | #18:(F32) | \ref mHeparinDispensingRate | * | #19:(F32) | \ref mHeparinBolusVolume | @@ -110,7 +110,7 @@ qint32 mArterialPressureLimitWindow = 0; // mmHg qint32 mVenousPressureLimitWindow = 0; // mmHg qint32 mVenousPressureLimitAsymtrc = 0; // mmHg - qint32 mTrancembrncPressureLimitWindow = 0; // mmHg + qint32 mTransmembranePressureLimitWindow = 0; // mmHg float mDialysateTemp = 0; // Celsius float mHeparinDispensingRate = 0; // mL/hr float mHeparinBolusVolume = 0; // mL @@ -132,7 +132,7 @@ mArterialPressureLimitWindow , mVenousPressureLimitWindow , mVenousPressureLimitAsymtrc , - mTrancembrncPressureLimitWindow , + mTransmembranePressureLimitWindow , mDialysateTemp , mHeparinDispensingRate , mHeparinBolusVolume , Index: sources/view/VTreatmentCreate.cpp =================================================================== diff -u -rcc7aae88f15228ff37b840946818692e444718bf -rb1462640e36df3f567c42aa8c8cbd6dafe865625 --- sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision cc7aae88f15228ff37b840946818692e444718bf) +++ sources/view/VTreatmentCreate.cpp (.../VTreatmentCreate.cpp) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) @@ -58,7 +58,7 @@ data.mArterialPressureLimitWindow = _arterialPressureLimitWindow ; data.mVenousPressureLimitWindow = _venousPressureLimitWindow ; data.mVenousPressureLimitAsymtrc = _venousPressureLimitAsymtrc ; - data.mTrancembrncPressureLimitWindow = _trancembrncPressureLimitWindow ; + data.mTransmembranePressureLimitWindow = _transmembranePressureLimitWindow; data.mDialysateTemp = _dialysateTemp ; data.mHeparinDispensingRate = _heparinDispensingRate ; data.mHeparinBolusVolume = _heparinBolusVolume ; @@ -133,7 +133,7 @@ bloodPressureMeasureIntervalRejectReason (data.mBloodPressureMeasureIntervalRejectReason ); rinsebackFlowRateRejectReason (data.mRinsebackFlowRateRejectReason ); rinsebackVolumeRejectReason (data.mRinsebackVolumeRejectReason ); - trancembrncPressureLimitWindowRejectReason (data.mTrancembrncPressureLimitWindowRejectReason ); + transmembranePressureLimitWindowRejectReason(data.mTransmembranePressureLimitWindowRejectReason ); parametersValidated(false); } Index: sources/view/VTreatmentCreate.h =================================================================== diff -u -rcc7aae88f15228ff37b840946818692e444718bf -rb1462640e36df3f567c42aa8c8cbd6dafe865625 --- sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision cc7aae88f15228ff37b840946818692e444718bf) +++ sources/view/VTreatmentCreate.h (.../VTreatmentCreate.h) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) @@ -94,7 +94,7 @@ VALUESET(qint32 , arterialPressureLimitWindow , 0) VALUESET(qint32 , venousPressureLimitWindow , 0) VALUESET(qint32 , venousPressureLimitAsymtrc , 0) - VALUESET(qint32 , trancembrncPressureLimitWindow , 0) + VALUESET(qint32 , transmembranePressureLimitWindow , 0) VALUESET(float , dialysateTemp , 0) VALUESET(float , heparinDispensingRate , 0) VALUESET(float , heparinBolusVolume , 0) @@ -123,7 +123,7 @@ TRIGGER(quint32 , bloodPressureMeasureIntervalRejectReason , 0) TRIGGER(quint32 , rinsebackFlowRateRejectReason , 0) TRIGGER(quint32 , rinsebackVolumeRejectReason , 0) - TRIGGER(quint32 , trancembrncPressureLimitWindowRejectReason , 0) + TRIGGER(quint32 , transmembranePressureLimitWindowRejectReason , 0) VIEW_DEC_CLASS(VTreatmentCreate) VIEW_DEC_SLOT(AdjustParametersValidationResponseData) Index: sources/view/hd/data/VTreatmentRanges.cpp =================================================================== diff -u -rde099919f262c3429cb0592ef71deb6a16e92892 -rb1462640e36df3f567c42aa8c8cbd6dafe865625 --- sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision de099919f262c3429cb0592ef71deb6a16e92892) +++ sources/view/hd/data/VTreatmentRanges.cpp (.../VTreatmentRanges.cpp) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) @@ -183,15 +183,15 @@ FROMVARIANT_WITHRETURN ( dialysateTempMax , "Dialysate Temperature" , "Dialysate_Temperature_Max" , Float , isConfigsOk ); FROMVARIANT_WITHRETURN ( dialysateTempRes , "Dialysate Temperature" , "Dialysate_Temperature_Res" , Float , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowDef , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Def" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowMin , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Min" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowMax , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Max" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureLimitWindowRes , "Trancememberance Pressure Ranges" , "Trancememberance_Adjust_Window_Res" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureLimitWindowDef , "Transmembrane Pressure Ranges" , "Transmembrane_Adjust_Window_Def" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureLimitWindowMin , "Transmembrane Pressure Ranges" , "Transmembrane_Adjust_Window_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureLimitWindowMax , "Transmembrane Pressure Ranges" , "Transmembrane_Adjust_Window_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureLimitWindowRes , "Transmembrane Pressure Ranges" , "Transmembrane_Adjust_Window_Res" , Int , isConfigsOk ); - // trancembrncPressureMonitor: Def intentionally omitted (see config/configurations/Parameters/DataList.conf) - FROMVARIANT_WITHRETURN ( trancembrncPressureMonitorMin , "Trancememberance Pressure Ranges" , "Trancememberance_Monitor_Min" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureMonitorMax , "Trancememberance Pressure Ranges" , "Trancememberance_Monitor_Max" , Int , isConfigsOk ); - FROMVARIANT_WITHRETURN ( trancembrncPressureMonitorRes , "Trancememberance Pressure Ranges" , "Trancememberance_Monitor_Res" , Int , isConfigsOk ); + // transmembranePressureMonitor: Def intentionally omitted (see config/configurations/Parameters/DataList.conf) + FROMVARIANT_WITHRETURN ( transmembranePressureMonitorMin , "Transmembrane Pressure Ranges" , "Transmembrane_Monitor_Min" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureMonitorMax , "Transmembrane Pressure Ranges" , "Transmembrane_Monitor_Max" , Int , isConfigsOk ); + FROMVARIANT_WITHRETURN ( transmembranePressureMonitorRes , "Transmembrane Pressure Ranges" , "Transmembrane_Monitor_Res" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( arterialPressureLimitWindowDef , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Def" , Int , isConfigsOk ); FROMVARIANT_WITHRETURN ( arterialPressureLimitWindowMin , "Arterial Blood Pressure Ranges" , "Arterial_Adjust_Window_Min" , Int , isConfigsOk ); Index: sources/view/hd/data/VTreatmentRanges.h =================================================================== diff -u -rde099919f262c3429cb0592ef71deb6a16e92892 -rb1462640e36df3f567c42aa8c8cbd6dafe865625 --- sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision de099919f262c3429cb0592ef71deb6a16e92892) +++ sources/view/hd/data/VTreatmentRanges.h (.../VTreatmentRanges.h) (revision b1462640e36df3f567c42aa8c8cbd6dafe865625) @@ -67,14 +67,14 @@ TRIGGER ( bool , acidConcentrateAccepted , false) RANGESET( float , dialysateTemp , 0) - RANGESET( qint32 , trancembrncPressureLimitWindow , 0) + RANGESET( qint32 , transmembranePressureLimitWindow , 0) RANGESET( qint32 , arterialPressureLimitWindow , 0) RANGESET( qint32 , venousPressureLimitWindow , 0) RANGESET( qint32 , venousPressureLimitAsymtrc , 0) RANGESET( quint32 , rinsebackFlowRate , 0) // monitoring ranges - RANGESET( qint32 , trancembrncPressureMonitor , 0) + RANGESET( qint32 , transmembranePressureMonitor , 0) RANGESET( qint32 , arterialPressureMonitor , 0) RANGESET( qint32 , venousPressureMonitor , 0)