Mercurial > bmsapp / file comparison

comparison: src/EditProductTab4.cpp

src/EditProductTab4.cpp

changeset 340
b9af88bfe972
parent 305
35ce719998e1
child 373
b02aca4e926c
equal deleted inserted replaced
339:2f3cfb983fcc 340:b9af88bfe972
104 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); 104 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
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->batch_size, 107 double ibu = Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, 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);
110 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0')); 111 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0'));
111 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); 112 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
112 ui->hopsTable->setItem(i, 7, item); 113 ui->hopsTable->setItem(i, 7, item);
113 114
114 if (product->hops.at(i).amount < 1.0) { 115 if (product->hops.at(i).amount < 1.0) {
256 for (int i = 0; i < product->hops.size(); i++) { 257 for (int i = 0; i < product->hops.size(); i++) {
257 258
258 ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, 259 ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg,
259 product->batch_size, product->hops.at(i).amount, 260 product->batch_size, product->hops.at(i).amount,
260 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method, 261 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method,
261 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time); 262 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
263 product->brew_cooling_method, 0, 0);
262 ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg, 264 ferm_ibus += Utils::toIBU(product->hops.at(i).useat, product->hops.at(i).form, product->preboil_sg,
263 product->brew_fermenter_volume + product->brew_fermenter_tcloss, product->hops.at(i).amount, 265 product->brew_fermenter_volume + product->brew_fermenter_tcloss, product->hops.at(i).amount,
264 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method, 266 product->hops.at(i).time, product->hops.at(i).alpha, product->ibu_method,
265 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time); 267 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
268 product->brew_cooling_method, 0, 0);
266 269
267 hop_flavour += Utils::hopFlavourContribution(product->hops.at(i).time, product->batch_size, product->hops.at(i).useat, product->hops.at(i).amount); 270 hop_flavour += Utils::hopFlavourContribution(product->hops.at(i).time, product->batch_size, product->hops.at(i).useat, product->hops.at(i).amount);
268 hop_aroma += Utils::hopAromaContribution(product->hops.at(i).time, product->batch_size, product->hops.at(i).useat, product->hops.at(i).amount); 271 hop_aroma += Utils::hopAromaContribution(product->hops.at(i).time, product->batch_size, product->hops.at(i).useat, product->hops.at(i).amount);
269 if ((((product->inventory_reduced <= PROD_STAGE_BREW) && (product->hops.at(i).useat <= HOP_USEAT_WHIRLPOOL)) || 272 if ((((product->inventory_reduced <= PROD_STAGE_BREW) && (product->hops.at(i).useat <= HOP_USEAT_WHIRLPOOL)) ||
270 ((product->inventory_reduced <= PROD_STAGE_PACKAGE) && (product->hops.at(i).useat == HOP_USEAT_DRY_HOP))) && 273 ((product->inventory_reduced <= PROD_STAGE_PACKAGE) && (product->hops.at(i).useat == HOP_USEAT_DRY_HOP))) &&
358 ui->hopsTable->setItem(product->hops_row, 8, item); 361 ui->hopsTable->setItem(product->hops_row, 8, item);
359 362
360 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, 363 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg,
361 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time, 364 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
362 product->hops.at(product->hops_row).alpha, product->ibu_method, 365 product->hops.at(product->hops_row).alpha, product->ibu_method,
363 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time); 366 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
367 product->brew_cooling_method, 0, 0);
364 368
365 ibuEdit->setValue(ibu); 369 ibuEdit->setValue(ibu);
366 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0')); 370 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0'));
367 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); 371 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
368 ui->hopsTable->setItem(product->hops_row, 7, item); 372 ui->hopsTable->setItem(product->hops_row, 7, item);
392 ui->hopsTable->setItem(product->hops_row, 6, item); 396 ui->hopsTable->setItem(product->hops_row, 6, item);
393 397
394 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, 398 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg,
395 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time, 399 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
396 product->hops.at(product->hops_row).alpha, product->ibu_method, 400 product->hops.at(product->hops_row).alpha, product->ibu_method,
397 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time); 401 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
402 product->brew_cooling_method, 0, 0);
398 403
399 ibuEdit->setValue(ibu); 404 ibuEdit->setValue(ibu);
400 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0')); 405 item = new QTableWidgetItem(QString("%1").arg(ibu, 2, 'f', 1, '0'));
401 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); 406 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
402 ui->hopsTable->setItem(product->hops_row, 7, item); 407 ui->hopsTable->setItem(product->hops_row, 7, item);
457 horiginEdit->setText(product->hops.at(product->hops_row).origin); 462 horiginEdit->setText(product->hops.at(product->hops_row).origin);
458 463
459 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, 464 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg,
460 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time, 465 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
461 product->hops.at(product->hops_row).alpha, product->ibu_method, 466 product->hops.at(product->hops_row).alpha, product->ibu_method,
462 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time); 467 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
468 product->brew_cooling_method, 0, 0);
463 ibuEdit->setValue(ibu); 469 ibuEdit->setValue(ibu);
464 470
465 ui->hopsTable->setItem(product->hops_row, 0, new QTableWidgetItem(product->hops.at(product->hops_row).origin)); 471 ui->hopsTable->setItem(product->hops_row, 0, new QTableWidgetItem(product->hops.at(product->hops_row).origin));
466 ui->hopsTable->setItem(product->hops_row, 1, new QTableWidgetItem(product->hops.at(product->hops_row).name)); 472 ui->hopsTable->setItem(product->hops_row, 1, new QTableWidgetItem(product->hops.at(product->hops_row).name));
467 473
681 ibuEdit->setButtonSymbols(QAbstractSpinBox::NoButtons); 687 ibuEdit->setButtonSymbols(QAbstractSpinBox::NoButtons);
682 ibuEdit->setDecimals(1); 688 ibuEdit->setDecimals(1);
683 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg, 689 double ibu = Utils::toIBU(product->hops.at(product->hops_row).useat, product->hops.at(product->hops_row).form, product->preboil_sg,
684 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time, 690 product->batch_size, product->hops.at(product->hops_row).amount, product->hops.at(product->hops_row).time,
685 product->hops.at(product->hops_row).alpha, product->ibu_method, 691 product->hops.at(product->hops_row).alpha, product->ibu_method,
686 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time); 692 product->brew_whirlpool9, product->brew_whirlpool7, product->brew_whirlpool6, product->boil_time,
693 product->brew_cooling_method, 0, 0);
687 ibuEdit->setValue(ibu); 694 ibuEdit->setValue(ibu);
688 695
689 hop_instock_changed(true); 696 hop_instock_changed(true);
690 697
691 connect(hselectEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::hop_select_changed); 698 connect(hselectEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::hop_select_changed);

Mercurial Repository: bmsapp

mercurial