Index: sources/view/VCreateTreatment.cpp
===================================================================
diff -u -rc71deaab48699cffdf9db816dfac2778d79c2238 -r2d09ae36f6b791e0415a87b6f14f582d4b434d7d
--- sources/view/VCreateTreatment.cpp	(.../VCreateTreatment.cpp)	(revision c71deaab48699cffdf9db816dfac2778d79c2238)
+++ sources/view/VCreateTreatment.cpp	(.../VCreateTreatment.cpp)	(revision 2d09ae36f6b791e0415a87b6f14f582d4b434d7d)
@@ -25,6 +25,11 @@
     loadTreatmentParameterRanges();
 }
 
+/**
+ * @brief VCreateTreatment::loadTreatmentParameterRanges
+ *  Loads treatment parameters from a json file
+ * @return QJsonObject holding the treatment parameters
+ */
 QJsonObject VCreateTreatment::loadTreatmentParameterRanges()
 {
     QJsonObject obj;
@@ -196,25 +201,6 @@
 
     setTreatmentData();
 
-    qDebug() << treatmentData.bloodFlowRate;
-    qDebug() << treatmentData.dialysateFlowRate;
-    qDebug() << treatmentData.duration;
-    qDebug() << treatmentData.heparinDispensingRate;
-    qDebug() << treatmentData.heparinBolusVolume;
-    qDebug() << treatmentData.heparinStopTime;
-    qDebug() << treatmentData.salineBolus;
-
-    qDebug() << treatmentData.acidConcentrate;
-    qDebug() << treatmentData.bicarbonateConcentrate;
-    qDebug() << treatmentData.dialyzerType;
-    qDebug() << treatmentData.dialysateTemp;
-    qDebug() << treatmentData.arterialPressureLimitLow;
-    qDebug() << treatmentData.arterialPressureLimitHigh;
-    qDebug() << treatmentData.venousPressureLimitLow;
-    qDebug() << treatmentData.venousPressureLimitHigh;
-    qDebug() << treatmentData.bloodPressureMeasureInterval;
-    qDebug() << treatmentData.rinsebackFlowRate;
-
     if (!validate(treatmentData))
     {
         qDebug() << "Local create treatment validation failed.";
@@ -223,10 +209,10 @@
     }
 
 
-#ifdef DEBUG
+#ifdef QT_DEBUG
     emit showConfirm();
 #else
-    // TODO: Ask FW to validate selected parameters
+    // Request that FW validates the selected parameters
     QVariantList messageData = {
         treatmentData.bloodFlowRate,
         treatmentData.dialysateFlowRate,
@@ -300,7 +286,7 @@
     }
     if (data.heparinDispensingRate != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) {
         success = false;
-        emit heparinBolusVolume_ValidationFailed(enumToString(static_cast<GuiRequestReasons>(data.heparinDispensingRate)));
+        emit heparinDispensingRate_ValidationFailed(enumToString(static_cast<GuiRequestReasons>(data.heparinDispensingRate)));
     }
     if (data.heparinBolusVolume != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) {
 
@@ -325,7 +311,7 @@
     }
     if (data.dialyzerType != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) {
         success = false;
-        emit dialysateFlowRate_ValidationFailed(enumToString(static_cast<GuiRequestReasons>(data.dialyzerType)));
+        emit dialyzerType_ValidationFailed(enumToString(static_cast<GuiRequestReasons>(data.dialyzerType)));
     }
     if (data.dialysateTemp != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) {
         success = false;
@@ -349,7 +335,7 @@
     }
     if (data.bloodPressureMeasureInterval != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) {
         success = false;
-        emit bloodFlowRate_ValidationFailed(enumToString(static_cast<GuiRequestReasons>(data.bloodPressureMeasureInterval)));
+        emit bloodPressureMeasureInterval_ValidationFailed(enumToString(static_cast<GuiRequestReasons>(data.bloodPressureMeasureInterval)));
     }
     if (data.rinsebackFlowRate != Gui::GuiRequestReasons::REQUEST_REJECT_REASON_NONE) {
         success = false;
@@ -392,7 +378,8 @@
         {"rinsebackFlowRate",           QString::number(treatmentData.rinsebackFlowRate)}
     };
 
-    saveNewTreatment(obj);
+    if (saveTreatmentProfile())
+        saveNewTreatment(obj);
 
     emit didCreateTreatment(treatmentData);
     emit showPrime();
@@ -506,7 +493,6 @@
         success = false;
 
     if (!success) {
-        qDebug() << "Not all values are set yet.";
         return false;
     }
 
@@ -614,12 +600,6 @@
         success = false;
     }
 
-    if (!success)
-    {
-        qDebug() << "Initial treatment parameter validation failed.";
-    }
-
-
     return success;
 
 }