comparison: src/EditProductTab3.cpp
src/EditProductTab3.cpp
- changeset 427
- 1466eab37f53
- parent 413
- 8ea791d4cab6
- child 431
- bfac9a7008a3
equal
deleted
inserted
replaced
| 426:3c3d6585c395 | 427:1466eab37f53 |
|---|---|
| 258 ui->ferment_absorpShow->setValue(product->ferment_absorb); | 258 ui->ferment_absorpShow->setValue(product->ferment_absorb); |
| 259 | 259 |
| 260 const QSignalBlocker blocker1(ui->est_ogEdit); | 260 const QSignalBlocker blocker1(ui->est_ogEdit); |
| 261 const QSignalBlocker blocker2(ui->est_og2Edit); | 261 const QSignalBlocker blocker2(ui->est_og2Edit); |
| 262 | 262 |
| 263 product->fermentables_use100 = false; | |
| 263 if (product->fermentables.size() < 1) { | 264 if (product->fermentables.size() < 1) { |
| 264 qDebug() << " no fermentables, return."; | 265 qDebug() << " no fermentables, return."; |
| 265 product->est_og = 0.980; | 266 product->est_og = 0.980; |
| 266 ui->est_ogEdit->setValue(0.980); | 267 ui->est_ogEdit->setValue(0.980); |
| 267 ui->est_og2Edit->setValue(0.980); | 268 ui->est_og2Edit->setValue(0.980); |
| 288 ui->calEdit->setValue(0); | 289 ui->calEdit->setValue(0); |
| 289 product->mashs_kg = 0; | 290 product->mashs_kg = 0; |
| 290 ui->mash_kgEdit->setValue(0); | 291 ui->mash_kgEdit->setValue(0); |
| 291 return; | 292 return; |
| 292 } | 293 } |
| 293 qDebug() << " adjust to 100" << product->fermentables_use100; | |
| 294 | 294 |
| 295 product->fermentables_ok = true; | 295 product->fermentables_ok = true; |
| 296 product->mashs_kg = 0; | 296 product->mashs_kg = 0; |
| 297 for (i = 0; i < product->fermentables.size(); i++) { | 297 for (i = 0; i < product->fermentables.size(); i++) { |
| 298 if (product->fermentables.at(i).adjust_to_total_100 && product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) | |
| 299 product->fermentables_use100 = true; | |
| 298 if (product->fermentables.at(i).type == FERMENTABLE_TYPE_SUGAR && product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) | 300 if (product->fermentables.at(i).type == FERMENTABLE_TYPE_SUGAR && product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) |
| 299 psugar += product->fermentables.at(i).percentage; | 301 psugar += product->fermentables.at(i).percentage; |
| 300 if (product->fermentables.at(i).graintype == FERMENTABLE_GRAINTYPE_CRYSTAL && product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) | 302 if (product->fermentables.at(i).graintype == FERMENTABLE_GRAINTYPE_CRYSTAL && product->fermentables.at(i).added < FERMENTABLE_ADDED_BOTTLE) |
| 301 pcara += product->fermentables.at(i).percentage; | 303 pcara += product->fermentables.at(i).percentage; |
| 302 d = product->fermentables.at(i).amount * (product->fermentables.at(i).yield / 100) * (1 - product->fermentables.at(i).moisture / 100); | 304 d = product->fermentables.at(i).amount * (product->fermentables.at(i).yield / 100) * (1 - product->fermentables.at(i).moisture / 100); |
| 334 ((product->inventory_reduced <= PROD_STAGE_PACKAGE) && (product->fermentables.at(i).added == FERMENTABLE_ADDED_KEGS))) && | 336 ((product->inventory_reduced <= PROD_STAGE_PACKAGE) && (product->fermentables.at(i).added == FERMENTABLE_ADDED_KEGS))) && |
| 335 product->fermentables.at(i).inventory < product->fermentables.at(i).amount) { | 337 product->fermentables.at(i).inventory < product->fermentables.at(i).amount) { |
| 336 product->fermentables_ok = false; | 338 product->fermentables_ok = false; |
| 337 } | 339 } |
| 338 } | 340 } |
| 341 qDebug() << " adjust to 100" << product->fermentables_use100; | |
| 339 qDebug() << " supplies" << product->fermentables_ok; | 342 qDebug() << " supplies" << product->fermentables_ok; |
| 340 qDebug() << " colort" << colort << "colorh" << colorh << "colorn" << colorn; | 343 qDebug() << " colort" << colort << "colorh" << colorh << "colorn" << colorn; |
| 341 qDebug() << " psugar" << psugar << "pcara" << pcara << "mvol" << mvol; | 344 qDebug() << " psugar" << psugar << "pcara" << pcara << "mvol" << mvol; |
| 342 qDebug() << " sugarsf" << sugarsf << "sugarsm" << sugarsm; | 345 qDebug() << " sugarsf" << sugarsf << "sugarsm" << sugarsm; |
| 343 | 346 |
