comparison: src/EditProductTab11.cpp
src/EditProductTab11.cpp
- changeset 224
- d369948a3eb5
- parent 223
- 37bac72eff61
- child 238
- 047e99c90848
equal
deleted
inserted
replaced
| 223:37bac72eff61 | 224:d369948a3eb5 |
|---|---|
| 148 qDebug() << " total" << total << product->fermentables.at(i).f_amount; | 148 qDebug() << " total" << total << product->fermentables.at(i).f_amount; |
| 149 if (total != product->fermentables.at(i).f_amount) { | 149 if (total != product->fermentables.at(i).f_amount) { |
| 150 qDebug() << " update priming sugar" << total; | 150 qDebug() << " update priming sugar" << total; |
| 151 product->fermentables[i].f_amount = total; | 151 product->fermentables[i].f_amount = total; |
| 152 refreshFermentables(); | 152 refreshFermentables(); |
| 153 ui->bottle_sug_weightShow->setValue(total * 1000); | |
| 154 is_changed(); | 153 is_changed(); |
| 155 } | 154 } |
| 155 ui->bottle_sug_weightShow->setValue(total * 1000); | |
| 156 | 156 |
| 157 double pabv = product->final_abv + (product->bottle_priming_amount * (1 / SFactor) * 0.47) / 7.907; | 157 double pabv = product->final_abv + (product->bottle_priming_amount * (1 / SFactor) * 0.47) / 7.907; |
| 158 double pvol = product->bottle_amount - (pabv * product->bottle_amount) / 100; | 158 double pvol = product->bottle_amount - (pabv * product->bottle_amount) / 100; |
| 159 talc = product->bottle_amount - pvol; | 159 talc = product->bottle_amount - pvol; |
| 160 tvol = pvol + product->bottle_priming_water; | 160 tvol = pvol + product->bottle_priming_water; |
| 225 qDebug() << " total" << total << product->fermentables.at(i).f_amount; | 225 qDebug() << " total" << total << product->fermentables.at(i).f_amount; |
| 226 if (total != product->fermentables.at(i).f_amount) { | 226 if (total != product->fermentables.at(i).f_amount) { |
| 227 qDebug() << " update priming sugar" << total; | 227 qDebug() << " update priming sugar" << total; |
| 228 product->fermentables[i].f_amount = total; | 228 product->fermentables[i].f_amount = total; |
| 229 refreshFermentables(); | 229 refreshFermentables(); |
| 230 ui->keg_sug_weightShow->setValue(total * 1000); | |
| 231 is_changed(); | 230 is_changed(); |
| 232 } | 231 } |
| 232 ui->keg_sug_weightShow->setValue(total * 1000); | |
| 233 | 233 |
| 234 double pabv = product->final_abv + (product->keg_priming_amount * (1 / SFactor) * 0.47) / 7.907; | 234 double pabv = product->final_abv + (product->keg_priming_amount * (1 / SFactor) * 0.47) / 7.907; |
| 235 double pvol = product->keg_amount - (pabv * product->keg_amount) / 100; | 235 double pvol = product->keg_amount - (pabv * product->keg_amount) / 100; |
| 236 talc = product->keg_amount - pvol; | 236 talc = product->keg_amount - pvol; |
| 237 tvol = pvol + product->keg_priming_water; | 237 tvol = pvol + product->keg_priming_water; |
| 267 | 267 |
| 268 | 268 |
| 269 void EditProduct::pack_date_changed(QDate val) | 269 void EditProduct::pack_date_changed(QDate val) |
| 270 { | 270 { |
| 271 qDebug() << "pack_date_changed" << val; | 271 qDebug() << "pack_date_changed" << val; |
| 272 product->package_date = ui->pack_dateEdit->nullDate(); | |
| 273 is_changed(); | |
| 274 setStage(); | |
| 272 } | 275 } |
| 273 | 276 |
| 274 | 277 |
| 275 void EditProduct::pack_date_button() | 278 void EditProduct::pack_date_button() |
| 276 { | 279 { |
| 280 ui->pack_dateEdit->setDate(QDate::currentDate()); | |
| 277 } | 281 } |
| 278 | 282 |
| 279 | 283 |
| 280 void EditProduct::pack_date_ack() | 284 void EditProduct::pack_date_ack() |
| 281 { | 285 { |
| 286 int rc = QMessageBox::warning(this, tr("Confirm package"), tr("Confirm that the beer is packaged and all data is correct"), | |
| 287 QMessageBox::Yes | QMessageBox::No, QMessageBox::No); | |
| 288 | |
| 289 if (rc == QMessageBox::No) | |
| 290 return; | |
| 291 | |
| 292 product->stage = PROD_STAGE_CARBONATION; | |
| 293 setStage(); | |
| 294 is_changed(); | |
| 282 } | 295 } |
| 283 | 296 |
| 284 | 297 |
| 285 void EditProduct::pack_volume_changed(double val) | 298 void EditProduct::pack_volume_changed(double val) |
| 286 { | 299 { |
