Index: sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp =================================================================== diff -u -r88563177f10f20ced98750b2e40036201728131d -r5e3b27057e9c7dedf9c46e3881609b7e96c3fb71 --- sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 88563177f10f20ced98750b2e40036201728131d) +++ sources/view/hd/adjustment/posttreatment/VPostTreatmentAdjustTreatmentLog.cpp (.../VPostTreatmentAdjustTreatmentLog.cpp) (revision 5e3b27057e9c7dedf9c46e3881609b7e96c3fb71) @@ -37,6 +37,82 @@ adjustment_Accepted ( vData.mAccepted ); adjustment_Reason ( vData.mReason ); + // Formatted values + QStringList mParametersText; + QString mStr = "%1"; + mParametersText += mStr.arg(vData.mBloodFlowRate ); + mParametersText += mStr.arg(vData.mDialysateFlowRate ); + mParametersText += mStr.arg(vData.mTreatmentDuration ); + mParametersText += mStr.arg(vData.mActualTreatmentDuration ); + mParametersText += mStr.arg(vData.mAcidConcentrateType ); + mParametersText += mStr.arg(vData.mBicarbonateConcentrateType ); + mParametersText += mStr.arg(vData.mPotassiumConcentration ); + mParametersText += mStr.arg(vData.mCalciumConcentration ); + mParametersText += mStr.arg(vData.mBicarbonateConcentration ); + mParametersText += mStr.arg(vData.mSodiumConcentration ); + mParametersText += mStr.arg(vData.mDialysateTemperature ,0,'f',3); + mParametersText += mStr.arg(vData.mDialyzerType ); + mParametersText += mStr.arg(vData.mTreatmentDateTime ); + mParametersText += mStr.arg(vData.mAverageBloodFlow ,0,'f',3); + mParametersText += mStr.arg(vData.mAverageDialysateFlow ,0,'f',3); + mParametersText += mStr.arg(vData.mDialysateVolumeUsed ,0,'f',3); + mParametersText += mStr.arg(vData.mAverageDialysateTemp ,0,'f',3); + mParametersText += mStr.arg(vData.mTargetUFVolume ,0,'f',3); + mParametersText += mStr.arg(vData.mActualUFVolume ,0,'f',3); + mParametersText += mStr.arg(vData.mTargetUFRate ,0,'f',3); + mParametersText += mStr.arg(vData.mActualUFRate ,0,'f',3); + mParametersText += mStr.arg(vData.mSalineBolusVolume ); + mParametersText += mStr.arg(vData.mHeparinType ); + mParametersText += mStr.arg(vData.mHeparinConcentration ); + mParametersText += mStr.arg(vData.mHeparinBolusVolume ,0,'f',3); + mParametersText += mStr.arg(vData.mHeparinDispenseRate ,0,'f',3); + mParametersText += mStr.arg(vData.mHeparinPreStop ); + mParametersText += mStr.arg(vData.mHeparinDeliveredVolume ,0,'f',3); + mParametersText += mStr.arg(vData.mAverageArterialPressure ,0,'f',3); + mParametersText += mStr.arg(vData.mAverageVenousPressure ,0,'f',3); + mParametersText += mStr.arg(vData.mEndTreatmentEarlyAlarm ); + mParametersText += mStr.arg(vData.mDeviceID ); + mParametersText += mStr.arg(vData.mWaterSampleTestResult ); + parametersText( mParametersText ); + + // Titles + QStringList mParametersTitle; + mParametersTitle += tr("Blood Flow Rate" ); + mParametersTitle += tr("Dialysate Flow Rate" ); + mParametersTitle += tr("Treatment Duration" ); + mParametersTitle += tr("Actual Treatment Duration" ); + mParametersTitle += tr("Acid ConcentrateType" ); + mParametersTitle += tr("Bicarbonate Concentrate Type"); + mParametersTitle += tr("Potassium Concentration" ); + mParametersTitle += tr("Calcium Concentration" ); + mParametersTitle += tr("Bicarbonate Concentration" ); + mParametersTitle += tr("Sodium Concentration" ); + mParametersTitle += tr("Dialysate Temperature" ); + mParametersTitle += tr("Dialyzer Type" ); + mParametersTitle += tr("Treatment DateTime" ); + mParametersTitle += tr("Average Blood Flow" ); + mParametersTitle += tr("Average Dialysate Flow" ); + mParametersTitle += tr("Dialysate Volume Used" ); + mParametersTitle += tr("Average Dialysate Temp" ); + mParametersTitle += tr("Target UF Volume" ); + mParametersTitle += tr("Actual UF Volume" ); + mParametersTitle += tr("Target UF Rate" ); + mParametersTitle += tr("Actual UF Rate" ); + mParametersTitle += tr("Saline Bolus Volume" ); + mParametersTitle += tr("Heparin Type" ); + mParametersTitle += tr("Heparin Concentration" ); + mParametersTitle += tr("Heparin Bolus Volume" ); + mParametersTitle += tr("Heparin Dispense Rate" ); + mParametersTitle += tr("Heparin Pre-Stop" ); + mParametersTitle += tr("Heparin Delivered Volume" ); + mParametersTitle += tr("Average Arterial Pressure" ); + mParametersTitle += tr("Average Venous Pressure" ); + mParametersTitle += tr("End Treatment Early Alarm" ); + mParametersTitle += tr("Device ID" ); + mParametersTitle += tr("Water Sample Test Result" ); + parametersTitle( mParametersTitle ); + + // raw values bloodFlowRate ( vData.mBloodFlowRate ); dialysateFlowRate ( vData.mDialysateFlowRate ); treatmentDuration ( vData.mTreatmentDuration ); @@ -71,6 +147,8 @@ deviceID ( vData.mDeviceID ); waterSampleTestResult ( vData.mWaterSampleTestResult ); + + // *** has to be the last to let the information to be set and then emit the signal *** // *** otherwise will use the Previous values before being set. *** adjustment ( true );