Mercurial > bmsapp / file diff

--- a/src/EditProduct.h	Sat Jan 14 15:38:28 2023 +0100
+++ b/src/EditProduct.h	Sun Jan 15 12:35:04 2023 +0100
@@ -181,11 +181,13 @@
     void brew_preboilsg_changed(double val);
     void brew_preboilvol_changed(double val);
     void brew_preboil_cm_changed(double val);
+    void brew_preboil_brix_button();
     void brew_preboil_button();
     void brew_aboilph_changed(double val);
     void brew_aboilsg_changed(double val);
     void brew_aboilvol_changed(double val);
     void brew_aboil_cm_changed(double val);
+    void brew_aboil_brix_button();
     void brew_aboil_button();
     void brew_cooling_to_changed(double val);
     void brew_cooling_time_changed(double val);
@@ -198,6 +200,7 @@
     void brew_aertime_changed(double val);
     void brew_trubloss_changed(double val);
     void brew_topupwater_changed(double val);
+    void brew_brix_changed(double val);
     void brew_log_button();
     void savePNG();
     void brix_changed(double val);
@@ -269,7 +272,7 @@
     QString bar_20 = "QProgressBar::chunk {background: #004D00;}";
     int recno;
     bool textIsChanged = false;
-    double ret_fg;
+    double ret_fg, sg_return;
     /*
      * Variables for popup ingredients editing.
      */
@@ -332,7 +335,25 @@
     void updateBrewday();
     void calcEfficiencyBeforeBoil();
     void calcEfficiencyAfterBoil();
-    void brew_volume_calc(double volume, double kettle_volume, double kettle_height, double est_volume, bool aboil);
+
+    /**
+     * @brief Popup to enter a brix value to get SG before fermentation.
+     * @param sg The SG is known, else 0.
+     * @param sg_default Use this if sg is 0.
+     * @return The sg calculated from the brix value.
+     */
+    double brew_brix_edit(double sg, double sg_default);
+
+    /**
+     * @brief Calculate height in cm and ask for measured cm from the kettle top.
+     * @param volume The known volume, or zero if initial value is to be used.
+     * @param kettle_volume The volume of the kettle.
+     * @param kettle_height The internal height of the kettle.
+     * @param est_volume The default estimated volume.
+     * @param aboil True if after boil volume is asked, else preboil. Selects destination of result.
+     * @param chiller True if an immersion chiller is in the kettle, give a extra remark.
+     */
+    void brew_volume_calc(double volume, double kettle_volume, double kettle_height, double est_volume, bool aboil, bool chiller);
     double get_fg(double gravity);
     double GetPressure(double CO2, double T);
     double CarbCO2ToPressure(double CO2, double T);