Index: sources/view/VTreatmentCreate.cpp
===================================================================
diff -u -re5ae6f8513673d1c09bd04ec3da08e71bfded5e2 -r656a6e14a253c7125fa8408ae2aa0c1223009565
--- sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision e5ae6f8513673d1c09bd04ec3da08e71bfded5e2)
+++ sources/view/VTreatmentCreate.cpp	(.../VTreatmentCreate.cpp)	(revision 656a6e14a253c7125fa8408ae2aa0c1223009565)
@@ -38,7 +38,6 @@
  * Validates the treatment profile locally, then requests validation of it with FW
  */
 void VTreatmentCreate::doValidation() {
-
     AdjustParametersValidationRequestData data;
 
     data.mBloodFlowRate                 = _bloodFlowRate                 ;
@@ -59,11 +58,6 @@
     data.mBloodPressureMeasureInterval  = _bloodPressureMeasureInterval  ;
     data.mRinsebackFlowRate             = _rinsebackFlowRate             ;
 
-    // copy unconfirmed/unvalidated parameters into temporary model
-    _storedParameters.copy(data);
-
-    //DEBUG: qDebug()<< "Unconfirmed Parameters :  " << _storedParameters.toString();
-
     emit didAdjustment(data);
 }
 
@@ -74,6 +68,8 @@
  * \note    Finished create treatment confirm...
  */
 void VTreatmentCreate::doConfirm() {
+    updateConfirmedTreatmentParams();
+
     AdjustParametersConfirmRequestData  confirmTreatmentRequest;
     confirmTreatmentRequest.requestedState = AdjustParametersConfirmRequestData::eConfirm;
     emit didAdjustment(confirmTreatmentRequest);
@@ -140,6 +136,33 @@
 }
 
 /*!
+ * \brief   VCreateTreatment::updateConfirmedTreatmentParams
+ * \details Update the stored member variable for confirmed treatment parameters
+ */
+void VTreatmentCreate::updateConfirmedTreatmentParams() {
+    isLastConfirmedParametersPopulated(true);
+
+    // update the confirmed parameter model for pre-populate treatment option
+    _confirmedTxParamsData.mBloodFlowRate                 = _bloodFlowRate                 ;
+    _confirmedTxParamsData.mDialysateFlowRate             = _dialysateFlowRate             ;
+    _confirmedTxParamsData.mTreatmentDuration             = _treatmentDuration             ;
+    _confirmedTxParamsData.mHeparinDispensingRate         = _heparinDispensingRate         ;
+    _confirmedTxParamsData.mHeparinBolusVolume            = _heparinBolusVolume            ;
+    _confirmedTxParamsData.mHeparinStopTime               = _heparinStopTime               ;
+    _confirmedTxParamsData.mSalineBolus                   = _salineBolusVolume             ;
+    _confirmedTxParamsData.mHeparinType                   = _heparinType                   ;
+    _confirmedTxParamsData.mAcidConcentrate               = _acidConcentrate               ;
+    _confirmedTxParamsData.mBicarbonateConcentrate        = _bicarbonateConcentrate        ;
+    _confirmedTxParamsData.mDialyzerType                  = _dialyzerType                  ;
+    _confirmedTxParamsData.mDialysateTemp                 = _dialysateTemp                 ;
+    _confirmedTxParamsData.mArterialPressureLimitWindow   = _arterialPressureLimitWindow   ;
+    _confirmedTxParamsData.mVenousPressureLimitWindow     = _venousPressureLimitWindow     ;
+    _confirmedTxParamsData.mVenousPressureLimitAsymtrc    = _venousPressureLimitAsymtrc    ;
+    _confirmedTxParamsData.mBloodPressureMeasureInterval  = _bloodPressureMeasureInterval  ;
+    _confirmedTxParamsData.mRinsebackFlowRate             = _rinsebackFlowRate             ;
+}
+
+/*!
  * \brief   VCreateTreatment::doGetPrescriptionParameterValues
  * \details Gets a list of the prescription parameter values
  * \return  (QStringList) The list of parameter values with units
@@ -204,31 +227,27 @@
                          << QString("%0 mL/min" ).arg(_rinsebackFlowRate            );
 }
 
-/**
- * \brief   VCreateTreatment::doConfirmParameters
- * \details Copies confirmed treatment parameters into the properties for pre-populating applying
+/*!
+ * \brief   VCreateTreatment::prepopulateParameters
+ * \details Set the current treatment parameter properties to last confirmed parameters
  */
-void VTreatmentCreate::doConfirmParameters() {
-
-    isLastConfirmedParametersPopulated(true);
-
-    _bloodFlowRate_confirmed                = _storedParameters.mBloodFlowRate                 ;
-    _dialysateFlowRate_confirmed            = _storedParameters.mDialysateFlowRate             ;
-    _treatmentDuration_confirmed            = _storedParameters.mTreatmentDuration             ;
-    _heparinDispensingRate_confirmed        = _storedParameters.mHeparinDispensingRate         ;
-    _heparinBolusVolume_confirmed           = _storedParameters.mHeparinBolusVolume            ;
-    _heparinStopTime_confirmed              = _storedParameters.mHeparinStopTime               ;
-    _salineBolusVolume_confirmed            = _storedParameters.mSalineBolus                   ;
-    _heparinType_confirmed                  = _storedParameters.mHeparinType                   ;
-    _acidConcentrate_confirmed              = _storedParameters.mAcidConcentrate               ;
-    _bicarbonateConcentrate_confirmed       = _storedParameters.mBicarbonateConcentrate        ;
-    _dialyzerType_confirmed                 = _storedParameters.mDialyzerType                  ;
-    _dialysateTemp_confirmed                = _storedParameters.mDialysateTemp                 ;
-    _arterialPressureLimitWindow_confirmed  = _storedParameters.mArterialPressureLimitWindow   ;
-    _venousPressureLimitWindow_confirmed    = _storedParameters.mVenousPressureLimitWindow     ;
-    _venousPressureLimitAsymtrc_confirmed   = _storedParameters.mVenousPressureLimitAsymtrc    ;
-    _bloodPressureMeasureInterval_confirmed = _storedParameters.mBloodPressureMeasureInterval  ;
-    _rinsebackFlowRate_confirmed            = _storedParameters.mRinsebackFlowRate             ;
-
-    //DEBUG: qDebug()<< Q_FUNC_INFO << " isPopulated : " << _isLastConfirmedParametersPopulated << _storedParameters.toString();
+void VTreatmentCreate::prepopulateParameters() {
+    // update the confirmed parameter model for pre-populate treatment option
+    bloodFlowRate               ( _confirmedTxParamsData.mBloodFlowRate                 );
+    dialysateFlowRate           ( _confirmedTxParamsData.mDialysateFlowRate             );
+    treatmentDuration           ( _confirmedTxParamsData.mTreatmentDuration             );
+    heparinDispensingRate       ( _confirmedTxParamsData.mHeparinDispensingRate         );
+    heparinBolusVolume          ( _confirmedTxParamsData.mHeparinBolusVolume            );
+    heparinStopTime             ( _confirmedTxParamsData.mHeparinStopTime               );
+    salineBolusVolume           ( _confirmedTxParamsData.mSalineBolus                   );
+    heparinType                 ( _confirmedTxParamsData.mHeparinType                   );
+    acidConcentrate             ( _confirmedTxParamsData.mAcidConcentrate               );
+    bicarbonateConcentrate      ( _confirmedTxParamsData.mBicarbonateConcentrate        );
+    dialyzerType                ( _confirmedTxParamsData.mDialyzerType                  );
+    dialysateTemp               ( _confirmedTxParamsData.mDialysateTemp                 );
+    arterialPressureLimitWindow ( _confirmedTxParamsData.mArterialPressureLimitWindow   );
+    venousPressureLimitWindow   ( _confirmedTxParamsData.mVenousPressureLimitWindow     );
+    venousPressureLimitAsymtrc  ( _confirmedTxParamsData.mVenousPressureLimitAsymtrc    );
+    bloodPressureMeasureInterval( _confirmedTxParamsData.mBloodPressureMeasureInterval  );
+    rinsebackFlowRate           ( _confirmedTxParamsData.mRinsebackFlowRate             );
 }