comparison: src/EditRecipeTab2.cpp
src/EditRecipeTab2.cpp
- changeset 451
- ccf00788bccc
- parent 449
- 00757c056ca6
- child 454
- 2dfead81c72f
equal
deleted
inserted
replaced
| 450:d4cff87ea156 | 451:ccf00788bccc |
|---|---|
| 169 */ | 169 */ |
| 170 if (recipe->mashs.size() > 0) { | 170 if (recipe->mashs.size() > 0) { |
| 171 for (i = 0; i < recipe->mashs.size(); i++) { | 171 for (i = 0; i < recipe->mashs.size(); i++) { |
| 172 if (recipe->mashs.at(i).step_type == 0) // Infusion | 172 if (recipe->mashs.at(i).step_type == 0) // Infusion |
| 173 mashinfuse += recipe->mashs.at(i).step_infuse_amount; | 173 mashinfuse += recipe->mashs.at(i).step_infuse_amount; |
| 174 if (recipe->mashs.at(i).step_temp < 75) { // Ignore mashout | 174 if (recipe->mashs.at(i).step_temp <= 75 && recipe->mashs.at(i).step_temp >= 60) { // Ignore mashout and low temperatures. |
| 175 mashtime += recipe->mashs.at(i).step_time; | 175 double timem = recipe->mashs.at(i).step_time; |
| 176 mashtemp += recipe->mashs.at(i).step_time * recipe->mashs.at(i).step_temp; | 176 if (i > 0) |
| 177 timem += recipe->mashs.at(i).ramp_time; | |
| 178 mashtime += timem; | |
| 179 mashtemp += timem * recipe->mashs.at(i).step_temp; | |
| 177 } | 180 } |
| 178 } | 181 } |
| 179 mashtemp = mashtemp / mashtime; | 182 mashtemp = mashtemp / mashtime; |
| 180 mvol = mashinfuse; | 183 mvol = mashinfuse; |
| 181 qDebug() << " mash time" << mashtime << "temp" << mashtemp << "infuse" << mashinfuse; | 184 qDebug() << " mash time" << mashtime << "temp" << mashtemp << "infuse" << mashinfuse; |
