diff -r ecfcbee4a9b2 -r 1ce50e72a6b1 src/EditRecipe.h --- a/src/EditRecipe.h Tue Apr 05 22:28:35 2022 +0200 +++ b/src/EditRecipe.h Wed Apr 06 12:10:33 2022 +0200 @@ -118,7 +118,7 @@ double step_temp; double step_time; double ramp_time; - double end_time; + double end_temp; double step_wg_ratio; // May not be present }; @@ -174,7 +174,7 @@ double sparge_acid_perc; double sparge_acid_amount; double mash_ph; - double mash_name; + QString mash_name; bool calc_acid; QString w1_name; ///< Water source 1 @@ -221,6 +221,23 @@ QList miscs; QList yeasts; QList mashs; + + /* + * These are not in the MySL database, but are global variables + * that belong with the loaded recipe data and are present to + * make things easier. + */ + int fermentables_records; ///< Total records + int fermentables_current; ///< Current record, -1 is invalid. + bool fermentables_use100; ///< Use percentages instead of amount + int hops_records; + int hops_current; + int misc_records; + int misc_current; + int yeasts_records; + int yeasts_current; + int mashs_records; + int mashs_current; }; @@ -280,7 +297,7 @@ /* * Variables for popup ingredients editing. */ - QJsonDocument fermentables, hops, miscs, yeasts, mashs; + QJsonDocument fermentables, hops, miscs, yeasts; QJsonObject work, backup; QComboBox *selectEdit, *addedEdit; QLineEdit *nameEdit, *supplierEdit;