Mercurial > bmsapp / changeset

--- a/src/EditRecipe.cpp	Sun Jul 17 22:16:20 2022 +0200
+++ b/src/EditRecipe.cpp	Sun Jul 17 22:18:48 2022 +0200
@@ -285,7 +285,7 @@
     ui->w1_volEdit->setValue(recipe->w1_amount);
     ui->w1_caEdit->setValue(recipe->w1_calcium);
     ui->w1_mgEdit->setValue(recipe->w1_magnesium);
-    ui->w1_hco3Edit->setValue(recipe->w1_total_alkalinity * 1.22);
+    ui->w1_hco3Edit->setValue(Utils::Bicarbonate(recipe->w1_total_alkalinity, recipe->w1_ph));
     ui->w1_caco3Edit->setValue(recipe->w1_total_alkalinity);
     ui->w1_naEdit->setValue(recipe->w1_sodium);
     ui->w1_clEdit->setValue(recipe->w1_chloride);
@@ -321,7 +321,7 @@
     ui->w2_volEdit->setValue(recipe->w2_amount);
     ui->w2_caEdit->setValue(recipe->w2_calcium);
     ui->w2_mgEdit->setValue(recipe->w2_magnesium);
-    ui->w2_hco3Edit->setValue(recipe->w2_total_alkalinity * 1.22);
+    ui->w2_hco3Edit->setValue(Utils::Bicarbonate(recipe->w2_total_alkalinity, recipe->w2_ph));
     ui->w2_caco3Edit->setValue(recipe->w2_total_alkalinity);
     ui->w2_naEdit->setValue(recipe->w2_sodium);
     ui->w2_clEdit->setValue(recipe->w2_chloride);

--- a/src/EditRecipeTab7.cpp	Sun Jul 17 22:16:20 2022 +0200
+++ b/src/EditRecipeTab7.cpp	Sun Jul 17 22:18:48 2022 +0200
@@ -161,7 +161,7 @@
     qDebug() << "calcWater()";
 
     ui->w1_hardnessEdit->setValue(Utils::Hardness(recipe->w1_calcium, recipe->w1_magnesium));
-    ui->w1_raEdit->setValue(Utils::RA_ppm(recipe->w1_total_alkalinity, recipe->w1_calcium, recipe->w1_magnesium));
+    ui->w1_raEdit->setValue(Utils::ResidualAlkalinity(recipe->w1_total_alkalinity, recipe->w1_calcium, recipe->w1_magnesium));
 
     /*
      * If there is a dilute water source, mix the waters.
@@ -176,7 +176,7 @@
 	total_alkalinity = Utils::mix(recipe->w1_amount, recipe->w2_amount, recipe->w1_total_alkalinity, recipe->w2_total_alkalinity);
 	ph = -log10(((pow(10, -recipe->w1_ph) * recipe->w1_amount) + (pow(10, -recipe->w2_ph) * recipe->w2_amount)) / liters);
 	ui->w2_hardnessEdit->setValue(Utils::Hardness(recipe->w2_calcium, recipe->w2_magnesium));
-	ui->w2_raEdit->setValue(Utils::RA_ppm(recipe->w2_total_alkalinity, recipe->w2_calcium, recipe->w2_magnesium));
+	ui->w2_raEdit->setValue(Utils::ResidualAlkalinity(recipe->w2_total_alkalinity, recipe->w2_calcium, recipe->w2_magnesium));
     } else {
 	liters = recipe->w1_amount;
 	calcium = recipe->w1_calcium;
@@ -197,18 +197,18 @@
     recipe->wg_total_alkalinity = round(total_alkalinity * 10.0) / 10.0;
     recipe->wg_ph = ph;
 
+    bicarbonate = Utils::Bicarbonate(total_alkalinity, ph);
     ui->wg_volEdit->setValue(liters);
     ui->wg_caEdit->setValue(calcium);
     ui->wg_mgEdit->setValue(magnesium);
-    ui->wg_hco3Edit->setValue(total_alkalinity * 1.22);
+    ui->wg_hco3Edit->setValue(bicarbonate);
     ui->wg_caco3Edit->setValue(total_alkalinity);
     ui->wg_naEdit->setValue(sodium);
     ui->wg_clEdit->setValue(chloride);
     ui->wg_so4Edit->setValue(sulfate);
     ui->wg_phEdit->setValue(ph);
     ui->wg_hardnessEdit->setValue(Utils::Hardness(calcium, magnesium));
-    ui->wg_raEdit->setValue(Utils::RA_ppm(total_alkalinity, calcium, magnesium));
-    bicarbonate = total_alkalinity * 1.22;
+    ui->wg_raEdit->setValue(Utils::ResidualAlkalinity(total_alkalinity, calcium, magnesium));
 
     /* Save mixed water ions for later */
     double wg_calcium = calcium;
@@ -383,7 +383,7 @@
     ui->wb_clEdit->setValue(chloride);
     ui->wb_so4Edit->setValue(sulfate);
     ui->wb_hardnessEdit->setValue(Utils::Hardness(calcium, magnesium));
-    ui->wb_raEdit->setValue(Utils::RA_ppm(total_alkalinity, calcium, magnesium));
+    ui->wb_raEdit->setValue(Utils::ResidualAlkalinity(total_alkalinity, calcium, magnesium));
 
     ui->wb_caEdit->setStyleSheet((calcium < 40 || calcium > 150) ? "background-color: red":"background-color: green");
     ui->wb_mgEdit->setStyleSheet((magnesium < 5 || magnesium > 40) ? "background-color: red":"background-color: green");
@@ -657,25 +657,25 @@
     }
     qDebug() << "set water" << query.value(1).toString();
 
-    recipe->w1_name = query.value(1).toString();
-    recipe->w1_calcium = query.value(3).toDouble();
-    recipe->w1_magnesium = query.value(8).toDouble();
-    recipe->w1_total_alkalinity = query.value(11).toDouble();
-    recipe->w1_sodium = query.value(7).toDouble();
-    recipe->w1_chloride = query.value(6).toDouble();
-    recipe->w1_sulfate = query.value(5).toDouble();
-    recipe->w1_ph = query.value(9).toDouble();
+    recipe->w1_name = query.value("name").toString();
+    recipe->w1_calcium = query.value("calcium").toDouble();
+    recipe->w1_magnesium = query.value("magnesium").toDouble();
+    recipe->w1_total_alkalinity = query.value("total_alkalinity").toDouble();
+    recipe->w1_sodium = query.value("sodium").toDouble();
+    recipe->w1_chloride = query.value("chloride").toDouble();
+    recipe->w1_sulfate = query.value("sulfate").toDouble();
+    recipe->w1_ph = query.value("ph").toDouble();
 
     ui->w1_caEdit->setValue(recipe->w1_calcium);
     ui->w1_mgEdit->setValue(recipe->w1_magnesium);
-    ui->w1_hco3Edit->setValue(recipe->w1_total_alkalinity * 1.22);
+    ui->w1_hco3Edit->setValue(Utils::Bicarbonate(recipe->w1_total_alkalinity, recipe->w1_ph));
     ui->w1_caco3Edit->setValue(recipe->w1_total_alkalinity);
     ui->w1_naEdit->setValue(recipe->w1_sodium);
     ui->w1_clEdit->setValue(recipe->w1_chloride);
     ui->w1_so4Edit->setValue(recipe->w1_sulfate);
     ui->w1_phEdit->setValue(recipe->w1_ph);
-    ui->w1_hardnessEdit->setValue(Utils::Hardness(product->w1_calcium, product->w1_magnesium));
-    ui->w1_raEdit->setValue(Utils::RA_ppm(product->w1_total_alkalinity, product->w1_calcium, product->w1_magnesium));
+    ui->w1_hardnessEdit->setValue(Utils::Hardness(recipe->w1_calcium, recipe->w1_magnesium));
+    ui->w1_raEdit->setValue(Utils::ResidualAlkalinity(recipe->w1_total_alkalinity, recipe->w1_calcium, recipe->w1_magnesium));
 
     is_changed();
     calcWater();
@@ -710,22 +710,22 @@
         }
 	qDebug() << "set water" << query.value(1).toString();
 
-	recipe->w2_name = query.value(1).toString();
-	recipe->w2_calcium = query.value(3).toDouble();
-        recipe->w2_magnesium = query.value(8).toDouble();
-        recipe->w2_total_alkalinity = query.value(11).toDouble();
-        recipe->w2_sodium = query.value(7).toDouble();
-        recipe->w2_chloride = query.value(6).toDouble();
-        recipe->w2_sulfate = query.value(5).toDouble();
-        recipe->w2_ph = query.value(9).toDouble();
-	hardness = Utils::Hardness(product->w2_calcium, product->w2_magnesium);
-	ra_ppm = Utils::RA_ppm(product->w2_total_alkalinity, product->w2_calcium, product->w2_magnesium);
+	recipe->w2_name = query.value("name").toString();
+	recipe->w2_calcium = query.value("calcium").toDouble();
+        recipe->w2_magnesium = query.value("magnesium").toDouble();
+        recipe->w2_total_alkalinity = query.value("total_alkalinity").toDouble();
+        recipe->w2_sodium = query.value("sodium").toDouble();
+        recipe->w2_chloride = query.value("chloride").toDouble();
+        recipe->w2_sulfate = query.value("sulfate").toDouble();
+        recipe->w2_ph = query.value("ph").toDouble();
+	hardness = Utils::Hardness(recipe->w2_calcium, recipe->w2_magnesium);
+	ra_ppm = Utils::ResidualAlkalinity(recipe->w2_total_alkalinity, recipe->w2_calcium, recipe->w2_magnesium);
     }
     ui->w1_volEdit->setValue(recipe->w1_amount);
     ui->w2_volEdit->setValue(recipe->w2_amount);
     ui->w2_caEdit->setValue(recipe->w2_calcium);
     ui->w2_mgEdit->setValue(recipe->w2_magnesium);
-    ui->w2_hco3Edit->setValue(recipe->w2_total_alkalinity * 1.22);
+    ui->w2_hco3Edit->setValue(Utils::Bicarbonate(recipe->w2_total_alkalinity, recipe->w2_ph));
     ui->w2_caco3Edit->setValue(recipe->w2_total_alkalinity);
     ui->w2_naEdit->setValue(recipe->w2_sodium);
     ui->w2_clEdit->setValue(recipe->w2_chloride);
@@ -769,7 +769,7 @@
 	ui->wt_clEdit->setValue(query.value("chloride").toDouble());
 	ui->wt_so4Edit->setValue(query.value("sulfate").toDouble());
 	ui->wt_hardnessEdit->setValue(Utils::Hardness(query.value("calcium").toDouble(), query.value("magnesium").toDouble()));
-	ui->wt_raEdit->setValue(Utils::RA_ppm(query.value("total_alkalinity").toDouble(), query.value("calcium").toDouble(), query.value("magnesium").toDouble()));
+	ui->wt_raEdit->setValue(Utils::ResidualAlkalinity(query.value("total_alkalinity").toDouble(), query.value("calcium").toDouble(), query.value("magnesium").toDouble()));
     }
     calcWater();
 }