comparison: src/PrinterDialog.cpp
src/PrinterDialog.cpp
- changeset 373
- b02aca4e926c
- parent 367
- 60c493e08800
- child 379
- 0f2ce4ebd1b8
equal
deleted
inserted
replaced
| 372:d9c78eb19728 | 373:b02aca4e926c |
|---|---|
| 433 double cost_hops = 0; | 433 double cost_hops = 0; |
| 434 for (int i = 0; i < recipe->hops.size(); i++) { | 434 for (int i = 0; i < recipe->hops.size(); i++) { |
| 435 | 435 |
| 436 double cost = recipe->hops.at(i).amount * recipe->hops.at(i).cost; | 436 double cost = recipe->hops.at(i).amount * recipe->hops.at(i).cost; |
| 437 cost_hops += cost; | 437 cost_hops += cost; |
| 438 double ibu = Utils::toIBU(recipe->hops.at(i).useat, recipe->hops.at(i).form, recipe->preboil_sg, recipe->batch_size, | 438 double ibu = Utils::toIBU(recipe->hops.at(i).useat, recipe->hops.at(i).form, recipe->preboil_sg, recipe->est_og, recipe->batch_size, |
| 439 recipe->hops.at(i).amount, recipe->hops.at(i).time, recipe->hops.at(i).alpha, | 439 recipe->hops.at(i).amount, recipe->hops.at(i).time, recipe->hops.at(i).alpha, |
| 440 recipe->ibu_method, 0, recipe->hops.at(i).time, 0, recipe->boil_time, 0, 0, 0); | 440 recipe->ibu_method, 0, recipe->hops.at(i).time, 0, recipe->boil_time, 0, 0, 0, |
| 441 recipe->hops.at(i).utilisation, recipe->hops.at(i).bu_factor); | |
| 441 | 442 |
| 442 if (recipe->hops.at(i).useat == 2 || recipe->hops.at(i).useat == 4) // Boil or Whirlpool | 443 if (recipe->hops.at(i).useat == 2 || recipe->hops.at(i).useat == 4) // Boil or Whirlpool |
| 443 use = QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]) + QString(" %1 min").arg(recipe->hops.at(i).time); | 444 use = QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]) + QString(" %1 min").arg(recipe->hops.at(i).time); |
| 444 else if (recipe->hops.at(i).useat == 5) // Dryhop | 445 else if (recipe->hops.at(i).useat == 5) // Dryhop |
| 445 use = QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]) + QString(" %1 days").arg(recipe->hops.at(i).time / 1440); | 446 use = QCoreApplication::translate("HopUse", g_hop_useat[recipe->hops.at(i).useat]) + QString(" %1 days").arg(recipe->hops.at(i).time / 1440); |
| 844 double cost_hops = 0; | 845 double cost_hops = 0; |
| 845 for (int i = 0; i < product->hops.size(); i++) { | 846 for (int i = 0; i < product->hops.size(); i++) { |
| 846 | 847 |
| 847 double cost = product->hops.at(i).amount * product->hops.at(i).cost; | 848 double cost = product->hops.at(i).amount * product->hops.at(i).cost; |
| 848 cost_hops += cost; | 849 cost_hops += cost; |
| 849 double ibu = Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->batch_size, | 850 double ibu = Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3, product->batch_size, |
| 850 product->hops.at(i).amount, product->hops.at(i).time, product->hops.at(i).alpha, | 851 product->hops.at(i).amount, product->hops.at(i).time, product->hops.at(i).alpha, |
| 851 product->ibu_method, product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, | 852 product->ibu_method, product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, |
| 852 product->boil_time, product->brew_cooling_method, 0, 0); | 853 product->boil_time, product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor); |
| 853 | 854 |
| 854 if (product->hops.at(i).useat == 2 || product->hops.at(i).useat == 4) // Boil or Whirlpool | 855 if (product->hops.at(i).useat == 2 || product->hops.at(i).useat == 4) // Boil or Whirlpool |
| 855 use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 min").arg(product->hops.at(i).time); | 856 use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 min").arg(product->hops.at(i).time); |
| 856 else if (product->hops.at(i).useat == 5) // Dryhop | 857 else if (product->hops.at(i).useat == 5) // Dryhop |
| 857 use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 days").arg(product->hops.at(i).time / 1440); | 858 use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 days").arg(product->hops.at(i).time / 1440); |
