comparison: src/PrinterDialog.cpp
src/PrinterDialog.cpp
- changeset 340
- b9af88bfe972
- parent 336
- e97f9e87d94b
- child 341
- 1b1e2d4c1a3e
equal
deleted
inserted
replaced
| 339:2f3cfb983fcc | 340:b9af88bfe972 |
|---|---|
| 436 | 436 |
| 437 double cost = recipe->hops.at(i).amount * recipe->hops.at(i).cost; | 437 double cost = recipe->hops.at(i).amount * recipe->hops.at(i).cost; |
| 438 cost_hops += cost; | 438 cost_hops += cost; |
| 439 double ibu = Utils::toIBU(recipe->hops.at(i).useat, recipe->hops.at(i).form, recipe->preboil_sg, recipe->batch_size, | 439 double ibu = Utils::toIBU(recipe->hops.at(i).useat, recipe->hops.at(i).form, recipe->preboil_sg, recipe->batch_size, |
| 440 recipe->hops.at(i).amount, recipe->hops.at(i).time, recipe->hops.at(i).alpha, | 440 recipe->hops.at(i).amount, recipe->hops.at(i).time, recipe->hops.at(i).alpha, |
| 441 recipe->ibu_method, 0, recipe->hops.at(i).time, 0, recipe->boil_time); | 441 recipe->ibu_method, 0, recipe->hops.at(i).time, 0, recipe->boil_time, 0, 0, 0); |
| 442 | 442 |
| 443 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 |
| 444 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); |
| 445 else if (recipe->hops.at(i).useat == 5) // Dryhop | 445 else if (recipe->hops.at(i).useat == 5) // Dryhop |
| 446 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); |
| 836 | 836 |
| 837 double cost = product->hops.at(i).amount * product->hops.at(i).cost; | 837 double cost = product->hops.at(i).amount * product->hops.at(i).cost; |
| 838 cost_hops += cost; | 838 cost_hops += cost; |
| 839 double ibu = Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->batch_size, | 839 double ibu = Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->batch_size, |
| 840 product->hops.at(i).amount, product->hops.at(i).time, product->hops.at(i).alpha, | 840 product->hops.at(i).amount, product->hops.at(i).time, product->hops.at(i).alpha, |
| 841 product->ibu_method, product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time); | 841 product->ibu_method, product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, |
| 842 product->boil_time, product->brew_cooling_method, 0, 0); | |
| 842 | 843 |
| 843 if (product->hops.at(i).useat == 2 || product->hops.at(i).useat == 4) // Boil or Whirlpool | 844 if (product->hops.at(i).useat == 2 || product->hops.at(i).useat == 4) // Boil or Whirlpool |
| 844 use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 min").arg(product->hops.at(i).time); | 845 use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 min").arg(product->hops.at(i).time); |
| 845 else if (product->hops.at(i).useat == 5) // Dryhop | 846 else if (product->hops.at(i).useat == 5) // Dryhop |
| 846 use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 days").arg(product->hops.at(i).time / 1440); | 847 use = QCoreApplication::translate("HopUse", g_hop_useat[product->hops.at(i).useat]) + QString(" %1 days").arg(product->hops.at(i).time / 1440); |
