Mercurial > bmsapp / file diff

--- a/src/EditProduct.cpp	Thu May 05 17:20:06 2022 +0200
+++ b/src/EditProduct.cpp	Thu May 05 20:01:30 2022 +0200
@@ -333,14 +333,14 @@
 	product->starter_viability = query.value("starter_viability").toInt();
 	product->yeast_prod_date = query.value("yeast_prod_date").toDate();
 	product->yeast_pitchrate = query.value("yeast_pitchrate").toDouble();
-	product->prop1_type = query.value("prop1_type").toInt();
-	product->prop1_volume = query.value("prop1_volume").toDouble();
-	product->prop2_type = query.value("prop2_type").toInt();
-        product->prop2_volume = query.value("prop2_volume").toDouble();
-	product->prop3_type = query.value("prop3_type").toInt();
-        product->prop3_volume = query.value("prop3_volume").toDouble();
-	product->prop4_type = query.value("prop4_type").toInt();
-        product->prop4_volume = query.value("prop4_volume").toDouble();
+	product->prop_type[0] = query.value("prop1_type").toInt();
+	product->prop_volume[0] = query.value("prop1_volume").toDouble();
+	product->prop_type[1] = query.value("prop2_type").toInt();
+        product->prop_volume[1] = query.value("prop2_volume").toDouble();
+	product->prop_type[2] = query.value("prop3_type").toInt();
+        product->prop_volume[2] = query.value("prop3_volume").toDouble();
+	product->prop_type[3] = query.value("prop4_type").toInt();
+        product->prop_volume[3] = query.value("prop4_volume").toDouble();
 
 	product->divide_type = query.value("divide_type").toInt();
 	product->divide_size = query.value("divide_size").toDouble();
@@ -729,11 +729,11 @@
 	product->wa_acid_perc = 80;
 	product->wa_base_name = 0;
 	product->starter_enable = false;
-	product->starter_type = product->prop1_type = product->prop2_type = product->prop3_type = product->prop4_type = 0;
+	product->starter_type = product->prop_type[0] = product->prop_type[1] = product->prop_type[2] = product->prop_type[3] = 0;
 	product->starter_viability = 100;
 	product->starter_sg = 1.037;
 	product->yeast_prod_date = QDate();
-	product->yeast_pitchrate = product->prop1_volume = product->prop2_volume = product->prop3_volume = product->prop4_volume = 0;
+	product->yeast_pitchrate = product->prop_volume[0] = product->prop_volume[1] = product->prop_volume[2] = product->prop_volume[3] = 0;
 	product->divide_type = product->divide_parts = product->divide_part = 0;
 	product->divide_size = product->divide_factor = 0;
     }
@@ -1503,14 +1503,14 @@
 	query.bindValue(":starter_viability", product->starter_viability);
 	query.bindValue(":yeast_prod_date", product->yeast_prod_date);
 	query.bindValue(":yeast_pitchrate", round(product->yeast_pitchrate * 1000) / 1000);
-	query.bindValue(":prop1_type", product->prop1_type);
-	query.bindValue(":prop1_volume", round(product->prop1_volume * 1000) / 1000);
-	query.bindValue(":prop2_type", product->prop2_type);
-	query.bindValue(":prop2_volume", round(product->prop2_volume * 1000) / 1000);
-	query.bindValue(":prop3_type", product->prop3_type);
-	query.bindValue(":prop3_volume", round(product->prop3_volume * 1000) / 1000);
-	query.bindValue(":prop4_type", product->prop4_type);
-	query.bindValue(":prop4_volume", round(product->prop4_volume * 1000) / 1000);
+	query.bindValue(":prop1_type", product->prop_type[0]);
+	query.bindValue(":prop1_volume", round(product->prop_volume[0] * 1000) / 1000);
+	query.bindValue(":prop2_type", product->prop_type[1]);
+	query.bindValue(":prop2_volume", round(product->prop_volume[1] * 1000) / 1000);
+	query.bindValue(":prop3_type", product->prop_type[2]);
+	query.bindValue(":prop3_volume", round(product->prop_volume[2] * 1000) / 1000);
+	query.bindValue(":prop4_type", product->prop_type[3]);
+	query.bindValue(":prop4_volume", round(product->prop_volume[3] * 1000) / 1000);
 	query.bindValue(":divide_type", product->divide_type);
 	query.bindValue(":divide_size", round(product->divide_size * 10) / 10);
 	query.bindValue(":divide_factor", round(product->divide_factor * 100) / 100);