# HG changeset patch # User Michiel Broek # Date 1649702722 -7200 # Node ID a9c19eaab0183eb8ced20c6852b7080c56f24749 # Parent 0f4eee875ea66663ecbe165cb0462487773aeccc Blocked hop table edit. Implemented add and delete hop rows. Started the ui of the water tab. diff -r 0f4eee875ea6 -r a9c19eaab018 src/EditRecipe.cpp --- a/src/EditRecipe.cpp Mon Apr 11 17:33:38 2022 +0200 +++ b/src/EditRecipe.cpp Mon Apr 11 20:45:22 2022 +0200 @@ -488,9 +488,10 @@ connect(ui->addFermentable, SIGNAL(clicked()), this, SLOT(on_addFermentRow_clicked())); // All signals from tab "Hops" + ui->hopsTable->setEditTriggers(QAbstractItemView::NoEditTriggers); connect(ui->hop_tasteShow, &QProgressBar::valueChanged, this, &EditRecipe::on_Flavour_valueChanged); connect(ui->hop_aromaShow, &QProgressBar::valueChanged, this, &EditRecipe::on_Aroma_valueChanged); -// connect(ui->hopsTable, SIGNAL(cellChanged(int, int)), this, SLOT(cell_Changed(int, int))); + connect(ui->addHop, SIGNAL(clicked()), this, SLOT(on_addHopRow_clicked())); // All signals from tab "Miscs" // connect(ui->hopsTable, SIGNAL(cellChanged(int, int)), this, SLOT(cell_Changed(int, int))); @@ -889,6 +890,7 @@ #include "EditRecipeTab4.cpp" #include "EditRecipeTab5.cpp" #include "EditRecipeTab6.cpp" +#include "EditRecipeTab7.cpp" void EditRecipe::on_deleteButton_clicked() diff -r 0f4eee875ea6 -r a9c19eaab018 src/EditRecipeTab2.cpp --- a/src/EditRecipeTab2.cpp Mon Apr 11 17:33:38 2022 +0200 +++ b/src/EditRecipeTab2.cpp Mon Apr 11 20:45:22 2022 +0200 @@ -1,7 +1,7 @@ /** * EditRecipe.cpp is part of bmsapp. * - * Tab 2, fermetables + * Tab 2, fermentables * * bmsapp is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff -r 0f4eee875ea6 -r a9c19eaab018 src/EditRecipeTab3.cpp --- a/src/EditRecipeTab3.cpp Mon Apr 11 17:33:38 2022 +0200 +++ b/src/EditRecipeTab3.cpp Mon Apr 11 20:45:22 2022 +0200 @@ -223,6 +223,24 @@ return; // Add only one at a time. } + newh.h_name = "Select one"; + newh.h_origin = ""; + newh.h_amount = 0; + newh.h_cost = 0; + newh.h_type = 0; + newh.h_form = 0; + newh.h_useat = 2; + newh.h_time = 0; + newh.h_alpha = 0; + newh.h_beta = 0; + newh.h_hsi = 0; + newh.h_humulene = 0; + newh.h_caryophyllene = 0; + newh.h_cohumulone = 0; + newh.h_myrcene = 0; + newh.h_total_oil = 0; + + recipe->hops.append(newh); emit refreshAll(); } @@ -241,7 +259,11 @@ if (rc == QMessageBox::No) return; - + this->ignoreChanges = true; + recipe->hops.removeAt(row); + this->ignoreChanges = false; + is_changed(); + emit refreshAll(); } diff -r 0f4eee875ea6 -r a9c19eaab018 src/EditRecipeTab7.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/EditRecipeTab7.cpp Mon Apr 11 20:45:22 2022 +0200 @@ -0,0 +1,21 @@ +/** + * EditRecipe.cpp is part of bmsapp. + * + * tab 6, water. + * + * bmsapp is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * bmsapp is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + + + diff -r 0f4eee875ea6 -r a9c19eaab018 ui/EditRecipe.ui --- a/ui/EditRecipe.ui Mon Apr 11 17:33:38 2022 +0200 +++ b/ui/EditRecipe.ui Mon Apr 11 20:45:22 2022 +0200 @@ -95,7 +95,7 @@ QTabWidget::Rounded - 0 + 6 Qt::ElideNone @@ -1545,12 +1545,29 @@ 10 - 10 + 70 1101 - 451 + 391 + + + + 140 + 30 + 80 + 23 + + + + Add + + + + :/icons/bms/peper.png:/icons/bms/peper.png + + @@ -1814,6 +1831,23 @@ + + + + 180 + 210 + 80 + 23 + + + + Add + + + + :/icons/bms/erlenmeyer.png:/icons/bms/erlenmeyer.png + + @@ -1833,6 +1867,75 @@ + + + + 140 + 40 + 80 + 23 + + + + Add + + + + :/icons/bms/mash.png:/icons/bms/mash.png + + + + + + 0 + 10 + 131 + 20 + + + + Mash name: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 570 + 10 + 131 + 20 + + + + Mash schedule: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 710 + 10 + 321 + 23 + + + + + + + 140 + 10 + 321 + 23 + + + @@ -1842,6 +1945,1313 @@ Water + + + + 170 + 10 + 941 + 241 + + + + Water overview + + + + + 300 + 50 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 860 + 50 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2 + + + 1000.000000000000000 + + + + + + 780 + 50 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 700 + 50 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 620 + 50 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 540 + 50 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 460 + 50 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 380 + 50 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 300 + 20 + 71 + 21 + + + + Ca + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 380 + 20 + 71 + 21 + + + + Mg + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 460 + 20 + 71 + 21 + + + + HCO3 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 540 + 20 + 71 + 21 + + + + CaCO3 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 620 + 20 + 71 + 21 + + + + Na + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 700 + 20 + 71 + 21 + + + + Cl + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 780 + 20 + 71 + 21 + + + + SO4 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 860 + 20 + 71 + 21 + + + + pH + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 200 + 50 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2 + + + 10000.000000000000000 + + + + + + 200 + 20 + 71 + 21 + + + + Volume + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 460 + 80 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 860 + 80 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2 + + + 1000.000000000000000 + + + + + + 540 + 80 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 620 + 80 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 780 + 80 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 300 + 80 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 700 + 80 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 200 + 80 + 84 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + QAbstractSpinBox::UpDownArrows + + + true + + + 2 + + + 10000.000000000000000 + + + 5.000000000000000 + + + + + + 380 + 80 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 460 + 110 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 860 + 110 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2 + + + 1000.000000000000000 + + + + + + 540 + 110 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 620 + 110 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 780 + 110 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 300 + 110 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 700 + 110 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 200 + 110 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2 + + + 10000.000000000000000 + + + + + + 380 + 110 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 460 + 200 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 860 + 140 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2 + + + 1000.000000000000000 + + + + + + 540 + 200 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 620 + 200 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 780 + 200 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 300 + 200 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 700 + 200 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 380 + 200 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 380 + 140 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 460 + 140 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 780 + 140 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 300 + 140 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 700 + 140 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 540 + 140 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 620 + 140 + 71 + 24 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1 + + + 1000.000000000000000 + + + + + + 10 + 20 + 171 + 21 + + + + Water profile + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 10 + 50 + 181 + 23 + + + + + + + 10 + 80 + 181 + 23 + + + + + + + 10 + 200 + 181 + 23 + + + + + + + 10 + 110 + 171 + 21 + + + + Mixed water + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 10 + 140 + 171 + 21 + + + + Treated water + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + 10 + 170 + 171 + 21 + + + + Result + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + +