Mercurial > bmsapp / file diff

--- a/src/EditProductTab2.cpp	Mon Oct 24 16:06:14 2022 +0200
+++ b/src/EditProductTab2.cpp	Mon Oct 24 19:59:08 2022 +0200
@@ -30,21 +30,26 @@
     ui->mash_maxEdit->setValue(product->eq_mash_max);
 
     /* Lautering */
-    ui->lauter_volumeEdit->setValue(product->eq_lauter_volume);
     ui->lauter_deadspaceEdit->setValue(product->eq_lauter_deadspace);
+    ui->eq_efficiencyEdit->setValue(product->eq_efficiency);
 
     /* Boiling */
     ui->kettle_volumeEdit->setValue(product->eq_kettle_volume);
+    ui->kettle_lossEdit->setValue(product->eq_trub_chiller_loss);
     ui->eqboil_sizeEdit->setValue(product->eq_boil_size);
     ui->evap_rateEdit->setValue(product->eq_evap_rate);
     ui->eqboil_timeEdit->setValue(product->eq_boil_time);
     ui->topup_kettleEdit->setValue(product->eq_top_up_kettle);
-    ui->hop_utilizationEdit->setValue(product->eq_hop_utilization);
     ui->eqbatch_sizeEdit->setValue(product->eq_batch_size);
-    ui->eq_efficiencyEdit->setValue(product->eq_efficiency);
 
     /* Chilling */
-    ui->trub_chillerlossEdit->setValue(product->eq_trub_chiller_loss);
+    ui->chiller_typeEdit->setText(QCoreApplication::translate("ChillerType", g_chiller_types[product->eq_chiller_type]));
+    ui->chiller_to79Edit->setValue(product->eq_chiller_to79);
+    ui->chiller_volumeEdit->setValue(product->eq_chiller_volume);
+    ui->chiller_lpmEdit->setValue(product->eq_chiller_lpm);
+    ui->chiller_lossEdit->setValue(product->eq_chiller_loss);
+
+    /* Transfer */
     ui->topup_waterEdit->setValue(product->eq_top_up_water);
 }
 
@@ -95,17 +100,22 @@
     product->eq_trub_chiller_loss = query.value("trub_chiller_loss").toDouble();
     product->eq_evap_rate = query.value("evap_rate").toDouble();
     product->eq_boil_time = query.value("boil_time").toDouble();
-    product->eq_calc_boil_volume = query.value("calc_boil_volume").toInt() ? true:false;
+    //product->eq_calc_boil_volume = query.value("calc_boil_volume").toInt() ? true:false;
     product->eq_top_up_kettle = query.value("top_up_kettle").toDouble();
-    product->eq_hop_utilization = query.value("hop_utilization").toDouble();
-    product->eq_lauter_volume = query.value("lauter_volume").toDouble();
-    product->eq_lauter_height = query.value("lauter_height").toDouble();
+    //product->eq_hop_utilization = query.value("hop_utilization").toDouble();
+    //product->eq_lauter_volume = query.value("lauter_volume").toDouble();
+    //product->eq_lauter_height = query.value("lauter_height").toDouble();
     product->eq_lauter_deadspace = query.value("lauter_deadspace").toDouble();
     product->eq_kettle_volume = query.value("kettle_volume").toDouble();
     product->eq_kettle_height = query.value("kettle_height").toDouble();
     product->eq_mash_volume = query.value("mash_volume").toDouble();
     product->eq_mash_max = query.value("mash_max").toDouble();
     product->eq_efficiency = query.value("efficiency").toDouble();
+    product->eq_chiller_type = query.value("chiller_type").toInt();
+    product->eq_chiller_to79 = query.value("chiller_to79").toDouble();
+    product->eq_chiller_volume = query.value("chiller_volume").toDouble();
+    product->eq_chiller_lpm = query.value("chiller_lpm").toDouble();
+    product->eq_chiller_loss = query.value("chiller_loss").toDouble();
     showEquipment();
 
     /*