Mercurial > bmsapp / file comparison

comparison: src/EditProduct.cpp

src/EditProduct.cpp

changeset 359
dfbb012c631c
parent 341
1b1e2d4c1a3e
child 365
4bc746c65650
equal deleted inserted replaced
358:d89bc21e2f07 359:dfbb012c631c
57 for (int i = 0; i < my_acids.size(); i++) { 57 for (int i = 0; i < my_acids.size(); i++) {
58 ui->mw_acidPick->addItem(my_acids.at(i).name_en); 58 ui->mw_acidPick->addItem(my_acids.at(i).name_en);
59 ui->sp_acidtypeEdit->addItem(my_acids.at(i).name_en); 59 ui->sp_acidtypeEdit->addItem(my_acids.at(i).name_en);
60 } 60 }
61 61
62 ui->sp_sourceEdit->addItem(tr("Source 1"));
63 ui->sp_sourceEdit->addItem(tr("Source 2"));
64 ui->sp_sourceEdit->addItem(tr("Mixed"));
65
66 query.prepare("SELECT name FROM inventory_waters ORDER BY record"); 62 query.prepare("SELECT name FROM inventory_waters ORDER BY record");
67 query.exec(); 63 query.exec();
68 ui->w1_nameEdit->addItem(""); 64 ui->w1_nameEdit->addItem("");
69 ui->w2_nameEdit->addItem(""); 65 ui->w2_nameEdit->addItem("");
70 while (query.next()) { 66 while (query.next()) {
106 query.exec(); 102 query.exec();
107 while (query.next()) { 103 while (query.next()) {
108 ui->bottle_sugarEdit->addItem(query.value(0).toString()); 104 ui->bottle_sugarEdit->addItem(query.value(0).toString());
109 ui->keg_sugarEdit->addItem(query.value(0).toString()); 105 ui->keg_sugarEdit->addItem(query.value(0).toString());
110 } 106 }
107
108 ui->spargeGroup->setId(ui->w1_spButton, 0);
109 ui->spargeGroup->setId(ui->w2_spButton, 1);
110 ui->spargeGroup->setId(ui->wg_spButton, 2);
111 111
112 if (id >= 0) { 112 if (id >= 0) {
113 if (! DB_product::load(product, this, id)) 113 if (! DB_product::load(product, this, id))
114 return; 114 return;
115 qInfo() << "EditProduct" << product->code << "," << product->name; 115 qInfo() << "EditProduct" << product->code << "," << product->name;
403 } 403 }
404 } 404 }
405 ui->w1_volEdit->setValue(product->w1_amount); 405 ui->w1_volEdit->setValue(product->w1_amount);
406 ui->w1_caEdit->setValue(product->w1_calcium); 406 ui->w1_caEdit->setValue(product->w1_calcium);
407 ui->w1_mgEdit->setValue(product->w1_magnesium); 407 ui->w1_mgEdit->setValue(product->w1_magnesium);
408 ui->w1_hco3Edit->setValue(product->w1_total_alkalinity * 1.22); 408 ui->w1_hco3Edit->setValue(Utils::Bicarbonate(product->w1_total_alkalinity, product->w1_ph));
409 ui->w1_caco3Edit->setValue(product->w1_total_alkalinity); 409 ui->w1_caco3Edit->setValue(product->w1_total_alkalinity);
410 ui->w1_naEdit->setValue(product->w1_sodium); 410 ui->w1_naEdit->setValue(product->w1_sodium);
411 ui->w1_clEdit->setValue(product->w1_chloride); 411 ui->w1_clEdit->setValue(product->w1_chloride);
412 ui->w1_so4Edit->setValue(product->w1_sulfate); 412 ui->w1_so4Edit->setValue(product->w1_sulfate);
413 ui->w1_phEdit->setValue(product->w1_ph); 413 ui->w1_phEdit->setValue(product->w1_ph);
439 } 439 }
440 } 440 }
441 ui->w2_volEdit->setValue(product->w2_amount); 441 ui->w2_volEdit->setValue(product->w2_amount);
442 ui->w2_caEdit->setValue(product->w2_calcium); 442 ui->w2_caEdit->setValue(product->w2_calcium);
443 ui->w2_mgEdit->setValue(product->w2_magnesium); 443 ui->w2_mgEdit->setValue(product->w2_magnesium);
444 ui->w2_hco3Edit->setValue(product->w2_total_alkalinity * 1.22); 444 ui->w2_hco3Edit->setValue(Utils::Bicarbonate(product->w2_total_alkalinity, product->w2_ph));
445 ui->w2_caco3Edit->setValue(product->w2_total_alkalinity); 445 ui->w2_caco3Edit->setValue(product->w2_total_alkalinity);
446 ui->w2_naEdit->setValue(product->w2_sodium); 446 ui->w2_naEdit->setValue(product->w2_sodium);
447 ui->w2_clEdit->setValue(product->w2_chloride); 447 ui->w2_clEdit->setValue(product->w2_chloride);
448 ui->w2_so4Edit->setValue(product->w2_sulfate); 448 ui->w2_so4Edit->setValue(product->w2_sulfate);
449 ui->w2_phEdit->setValue(product->w2_ph); 449 ui->w2_phEdit->setValue(product->w2_ph);
450 ui->mw_autoEdit->setChecked(product->calc_acid); 450 ui->mw_autoEdit->setChecked(product->calc_acid);
451 ui->mw_phEdit->setReadOnly(! product->calc_acid); 451 ui->mw_phEdit->setReadOnly(! product->calc_acid);
452 ui->mw_phEdit->setButtonSymbols(product->calc_acid ? QAbstractSpinBox::UpDownArrows : QAbstractSpinBox::NoButtons); 452 ui->mw_phEdit->setButtonSymbols(product->calc_acid ? QAbstractSpinBox::UpDownArrows : QAbstractSpinBox::NoButtons);
453 ui->mw_acidvolEdit->setReadOnly(product->calc_acid); 453 ui->mw_acidvolEdit->setReadOnly(product->calc_acid);
454 ui->mw_acidvolEdit->setButtonSymbols(product->calc_acid ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows); 454 ui->mw_acidvolEdit->setButtonSymbols(product->calc_acid ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
455 455 ui->sp_phEdit->setReadOnly(! product->calc_acid);
456 ui->sp_phEdit->setButtonSymbols(product->calc_acid ? QAbstractSpinBox::UpDownArrows : QAbstractSpinBox::NoButtons);
457 ui->sp_acidvolEdit->setReadOnly(product->calc_acid);
458 ui->sp_acidvolEdit->setButtonSymbols(product->calc_acid ? QAbstractSpinBox::NoButtons : QAbstractSpinBox::UpDownArrows);
456 ui->sp_volEdit->setValue(product->sparge_volume); 459 ui->sp_volEdit->setValue(product->sparge_volume);
457 ui->sp_tempEdit->setValue(product->sparge_temp);
458 ui->sp_phEdit->setValue(product->sparge_ph); 460 ui->sp_phEdit->setValue(product->sparge_ph);
459 ui->sp_sourceEdit->setCurrentIndex(product->sparge_source);
460 ui->sp_acidtypeEdit->setCurrentIndex(product->sparge_acid_type); 461 ui->sp_acidtypeEdit->setCurrentIndex(product->sparge_acid_type);
461 ui->sp_acidpercEdit->setValue(product->sparge_acid_perc); 462 ui->sp_acidpercEdit->setValue(product->sparge_acid_perc);
462 ui->sp_acidvolEdit->setValue(product->sparge_acid_amount); 463 ui->sp_acidvolEdit->setValue(product->sparge_acid_amount);
463 check_waters(); 464 check_waters();
464 465
467 ui->brew_mashphEdit->setValue(product->brew_mash_ph); 468 ui->brew_mashphEdit->setValue(product->brew_mash_ph);
468 ui->brew_mashphShow->setValue(product->mash_ph); 469 ui->brew_mashphShow->setValue(product->mash_ph);
469 ui->brew_mashsgEdit->setValue(product->brew_mash_sg); 470 ui->brew_mashsgEdit->setValue(product->brew_mash_sg);
470 ui->brew_mashsgShow->setValue(0); 471 ui->brew_mashsgShow->setValue(0);
471 ui->brew_masheffShow->setValue(product->brew_mash_efficiency); 472 ui->brew_masheffShow->setValue(product->brew_mash_efficiency);
472 ui->brew_spargetempShow->setValue(product->sparge_temp); 473 ui->brew_spargetempEdit->setValue(product->sparge_temp);
473 ui->brew_spargevolShow->setValue(product->sparge_volume); 474 ui->brew_spargevolShow->setValue(product->sparge_volume);
474 ui->brew_spargeestShow->setValue(product->brew_sparge_est); 475 ui->brew_spargeestShow->setValue(product->brew_sparge_est);
475 ui->brew_spargephEdit->setValue(product->brew_sparge_ph); 476 ui->brew_spargephEdit->setValue(product->brew_sparge_ph);
476 ui->brew_spargephShow->setValue(product->sparge_ph); 477 ui->brew_spargephShow->setValue(product->sparge_ph);
477 478
616 connect(ui->bs_mgso4Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_mgso4_changed); 617 connect(ui->bs_mgso4Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_mgso4_changed);
617 connect(ui->bs_naclEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_nacl_changed); 618 connect(ui->bs_naclEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_nacl_changed);
618 connect(ui->bs_mgcl2Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_mgcl2_changed); 619 connect(ui->bs_mgcl2Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_mgcl2_changed);
619 connect(ui->bs_nahco3Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_nahco3_changed); 620 connect(ui->bs_nahco3Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_nahco3_changed);
620 connect(ui->bs_caco3Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_caco3_changed); 621 connect(ui->bs_caco3Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::wb_caco3_changed);
622 connect(ui->ss_cacl2Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_cacl2_changed);
623 connect(ui->ss_caso4Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_caso4_changed);
624 connect(ui->ss_mgso4Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_mgso4_changed);
625 connect(ui->ss_naclEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_nacl_changed);
626 connect(ui->ss_mgcl2Edit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_mgcl2_changed);
621 connect(ui->mw_autoEdit, &QCheckBox::stateChanged, this, &EditProduct::mw_calc_acid_clicked); 627 connect(ui->mw_autoEdit, &QCheckBox::stateChanged, this, &EditProduct::mw_calc_acid_clicked);
622 connect(ui->mw_phEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::mw_ph_changed); 628 connect(ui->mw_phEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::mw_ph_changed);
623 connect(ui->mw_acidvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::mw_acid_changed); 629 connect(ui->mw_acidvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::mw_acid_changed);
624 connect(ui->mw_acidPick, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::mw_type_changed); 630 connect(ui->mw_acidPick, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::mw_type_changed);
625 connect(ui->wt_sourceEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::wt_target_changed); 631 connect(ui->wt_sourceEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::wt_target_changed);
626 connect(ui->w1_nameEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::w1_name_changed); 632 connect(ui->w1_nameEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::w1_name_changed);
627 connect(ui->w2_nameEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::w2_name_changed); 633 connect(ui->w2_nameEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::w2_name_changed);
628 connect(ui->w2_volEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::w2_volume_changed); 634 connect(ui->w2_volEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::w2_volume_changed);
629 connect(ui->sp_volEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_volume_changed); 635 connect(ui->sp_volEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_volume_changed);
630 connect(ui->sp_tempEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_temp_changed); 636 connect(ui->spargeGroup, SIGNAL(buttonClicked(int)), this, SLOT(sp_group_changed(int)));
631 connect(ui->sp_sourceEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::sp_source_changed);
632 connect(ui->sp_acidtypeEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::sp_type_changed); 637 connect(ui->sp_acidtypeEdit, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &EditProduct::sp_type_changed);
633 connect(ui->sp_phEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_ph_changed); 638 connect(ui->sp_phEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_ph_changed);
639 connect(ui->sp_acidvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_acid_changed);
634 640
635 /* All signals from tab Brewday */ 641 /* All signals from tab Brewday */
636 calcEfficiencyBeforeBoil(); 642 calcEfficiencyBeforeBoil();
637 calcEfficiencyAfterBoil(); 643 calcEfficiencyAfterBoil();
638 connect(ui->brew_startButton1, SIGNAL(clicked()), this, SLOT(brew_date_today())); 644 connect(ui->brew_startButton1, SIGNAL(clicked()), this, SLOT(brew_date_today()));
644 connect(ui->brew_endButton1, SIGNAL(clicked()), this, SLOT(brew_end_today())); 650 connect(ui->brew_endButton1, SIGNAL(clicked()), this, SLOT(brew_end_today()));
645 connect(ui->brew_ackButton, SIGNAL(clicked()), this, SLOT(brew_date_ack())); 651 connect(ui->brew_ackButton, SIGNAL(clicked()), this, SLOT(brew_date_ack()));
646 connect(ui->brew_mashphEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_mashph_changed); 652 connect(ui->brew_mashphEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_mashph_changed);
647 connect(ui->brew_mashsgEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_mashsg_changed); 653 connect(ui->brew_mashsgEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_mashsg_changed);
648 connect(ui->brew_spargephEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_spargeph_changed); 654 connect(ui->brew_spargephEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_spargeph_changed);
655 connect(ui->brew_spargetempEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::sp_temp_changed);
649 connect(ui->brew_preboilphEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_preboilph_changed); 656 connect(ui->brew_preboilphEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_preboilph_changed);
650 connect(ui->brew_preboilsgEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_preboilsg_changed); 657 connect(ui->brew_preboilsgEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_preboilsg_changed);
651 connect(ui->brew_preboilvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_preboilvol_changed); 658 connect(ui->brew_preboilvolEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_preboilvol_changed);
652 connect(ui->brew_preboilButton, SIGNAL(clicked()), this, SLOT(brew_preboil_button())); 659 connect(ui->brew_preboilButton, SIGNAL(clicked()), this, SLOT(brew_preboil_button()));
653 connect(ui->brew_aboilphEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_aboilph_changed); 660 connect(ui->brew_aboilphEdit, QOverload<double>::of(&QDoubleSpinBox::valueChanged), this, &EditProduct::brew_aboilph_changed);

Mercurial Repository: bmsapp

mercurial