Mercurial > bmsapp / file comparison

comparison: src/EditProductTab4.cpp

src/EditProductTab4.cpp

changeset 440
349c0c5bd512
parent 413
8ea791d4cab6
child 454
2dfead81c72f
equal deleted inserted replaced
439:31419b7cee69 440:349c0c5bd512
105 ui->hopsTable->setItem(i, 6, item); 105 ui->hopsTable->setItem(i, 6, item);
106 106
107 double ibu = Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3, product->batch_size, 107 double ibu = Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3, product->batch_size,
108 product->hops.at(i).amount, product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method, 108 product->hops.at(i).amount, product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method,
109 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, 109 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
110 product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor); 110 product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
111 product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
111 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0')); 112 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0'));
112 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); 113 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
113 ui->hopsTable->setItem(i, 7, item); 114 ui->hopsTable->setItem(i, 7, item);
114 115
115 if (product->hops.at(i).amount < 1.0) { 116 if (product->hops.at(i).amount < 1.0) {
258 259
259 ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3, 260 ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3,
260 product->batch_size, product->hops.at(i).amount, 261 product->batch_size, product->hops.at(i).amount,
261 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method, 262 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method,
262 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, 263 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
263 product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor); 264 product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
265 product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
264 if (product->stage > PROD_STAGE_BREW) 266 if (product->stage > PROD_STAGE_BREW)
265 ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->brew_preboil_sg, product->brew_fermenter_sg, 267 ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->brew_preboil_sg, product->brew_fermenter_sg,
266 product->brew_fermenter_volume + product->brew_fermenter_tcloss + product->boil_absorb, product->hops.at(i).amount, 268 product->brew_fermenter_volume + product->brew_fermenter_tcloss + product->boil_absorb, product->hops.at(i).amount,
267 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method, 269 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method,
268 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, 270 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
269 product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor); 271 product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
272 product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
270 else 273 else
271 ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3, 274 ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, product->est_og3,
272 product->brew_fermenter_volume + product->brew_fermenter_tcloss + product->boil_absorb, product->hops.at(i).amount, 275 product->brew_fermenter_volume + product->brew_fermenter_tcloss + product->boil_absorb, product->hops.at(i).amount,
273 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method, 276 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method,
274 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, 277 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
275 product->brew_cooling_method, 0, 0, product->hops.at(i).utilisation, product->hops.at(i).bu_factor); 278 product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
279 product->hops.at(i).utilisation, product->hops.at(i).bu_factor);
276 280
277 hop_flavour += Utils::hopFlavourContribution(product->hops.at(i).time, product->batch_size, product->hops.at(i).useat, 281 hop_flavour += Utils::hopFlavourContribution(product->hops.at(i).time, product->batch_size, product->hops.at(i).useat,
278 product->hops.at(i).amount, product->hops.at(i).form); 282 product->hops.at(i).amount, product->hops.at(i).form);
279 hop_aroma += Utils::hopAromaContribution(product->hops.at(i).time, product->batch_size, product->hops.at(i).useat, 283 hop_aroma += Utils::hopAromaContribution(product->hops.at(i).time, product->batch_size, product->hops.at(i).useat,
280 product->hops.at(i).amount, product->hops.at(i).form); 284 product->hops.at(i).amount, product->hops.at(i).form);
379 383
380 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, product->est_og3, 384 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, product->est_og3,
381 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time, 385 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
382 product->hops.at(product->hops_row).alpha, product->ibu_method, 386 product->hops.at(product->hops_row).alpha, product->ibu_method,
383 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, 387 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
384 product->brew_cooling_method, 0, 0, 388 product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
385 product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor); 389 product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor);
386 390
387 ibuEdit->setValue(ibu); 391 ibuEdit->setValue(ibu);
388 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0')); 392 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0'));
389 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); 393 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
415 419
416 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, product->est_og3, 420 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, product->est_og3,
417 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time, 421 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
418 product->hops.at(product->hops_row).alpha, product->ibu_method, 422 product->hops.at(product->hops_row).alpha, product->ibu_method,
419 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, 423 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
420 product->brew_cooling_method, 0, 0, 424 product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
421 product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor); 425 product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor);
422 426
423 ibuEdit->setValue(ibu); 427 ibuEdit->setValue(ibu);
424 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0')); 428 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0'));
425 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); 429 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
484 488
485 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, product->est_og3, 489 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, product->est_og3,
486 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time, 490 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
487 product->hops.at(product->hops_row).alpha, product->ibu_method, 491 product->hops.at(product->hops_row).alpha, product->ibu_method,
488 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, 492 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
489 product->brew_cooling_method, 0, 0, 493 product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
490 product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor); 494 product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor);
491 ibuEdit->setValue(ibu); 495 ibuEdit->setValue(ibu);
492 496
493 ui->hopsTable->setItem(product->hops_row, 0, new QTableWidgetItem(product->hops.at(product->hops_row).origin)); 497 ui->hopsTable->setItem(product->hops_row, 0, new QTableWidgetItem(product->hops.at(product->hops_row).origin));
494 ui->hopsTable->setItem(product->hops_row, 1, new QTableWidgetItem(product->hops.at(product->hops_row).name)); 498 ui->hopsTable->setItem(product->hops_row, 1, new QTableWidgetItem(product->hops.at(product->hops_row).name));
708 ibuEdit->setDecimals(1); 712 ibuEdit->setDecimals(1);
709 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, product->est_og3, 713 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, product->est_og3,
710 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time, 714 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
711 product->hops.at(product->hops_row).alpha, product->ibu_method, 715 product->hops.at(product->hops_row).alpha, product->ibu_method,
712 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time, 716 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
713 product->brew_cooling_method, 0, 0, 717 product->brew_cooling_method, product->eq_chiller_to79, product->eq_chiller_lpm,
714 product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor); 718 product->hops.at(product->hops_row).utilisation, product->hops.at(product->hops_row).bu_factor);
715 ibuEdit->setValue(ibu); 719 ibuEdit->setValue(ibu);
716 720
717 hop_instock_changed(true); 721 hop_instock_changed(true);
718 722

Mercurial Repository: bmsapp

mercurial