comparison: src/EditProductTab3.cpp
src/EditProductTab3.cpp
- changeset 177
- 62b8d701cd88
- parent 175
- f1ed3a2a94e9
- child 181
- 14a1f7bca79b
equal
deleted
inserted
replaced
| 176:69a033e099a2 | 177:62b8d701cd88 |
|---|---|
| 38 QHBoxLayout *pLayout = new QHBoxLayout(pWidget); | 38 QHBoxLayout *pLayout = new QHBoxLayout(pWidget); |
| 39 pLayout->addWidget(label); | 39 pLayout->addWidget(label); |
| 40 pLayout->setAlignment(Qt::AlignCenter); | 40 pLayout->setAlignment(Qt::AlignCenter); |
| 41 pLayout->setContentsMargins(0, 0, 0, 0); | 41 pLayout->setContentsMargins(0, 0, 0, 0); |
| 42 pWidget->setLayout(pLayout); | 42 pWidget->setLayout(pLayout); |
| 43 ui->fermentablesTable->setCellWidget(row, 9, pWidget); | 43 ui->fermentablesTable->setCellWidget(row, 10, pWidget); |
| 44 } else { | 44 } else { |
| 45 ui->fermentablesTable->removeCellWidget(row, 9); | 45 ui->fermentablesTable->removeCellWidget(row, 10); |
| 46 } | 46 } |
| 47 } | 47 } |
| 48 | 48 |
| 49 | 49 |
| 50 void EditProduct::refreshFermentables() | 50 void EditProduct::refreshFermentables() |
| 56 | 56 |
| 57 qDebug() << "refreshFermentables" << product->fermentables.size(); | 57 qDebug() << "refreshFermentables" << product->fermentables.size(); |
| 58 std::sort(product->fermentables.begin(), product->fermentables.end(), ferment_sort_test); | 58 std::sort(product->fermentables.begin(), product->fermentables.end(), ferment_sort_test); |
| 59 | 59 |
| 60 const QStringList labels({tr("Supplier"), tr("Fermentable"), tr("EBC"), tr("Type"), tr("Graintype"), tr("When"), tr("Yield"), | 60 const QStringList labels({tr("Supplier"), tr("Fermentable"), tr("EBC"), tr("Type"), tr("Graintype"), tr("When"), tr("Yield"), |
| 61 tr("Amount"), tr("Procent"), tr("100%"), tr("Delete"), tr("Edit") }); | 61 tr("Amount"), tr("Stock"), tr("Procent"), tr("100%"), tr("Delete"), tr("Edit") }); |
| 62 ui->fermentablesTable->setColumnCount(12); | 62 ui->fermentablesTable->setColumnCount(13); |
| 63 ui->fermentablesTable->setColumnWidth(0, 150); /* Supplier */ | 63 ui->fermentablesTable->setColumnWidth(0, 130); /* Supplier */ |
| 64 ui->fermentablesTable->setColumnWidth(1, 225); /* Fermentable */ | 64 ui->fermentablesTable->setColumnWidth(1, 210); /* Fermentable */ |
| 65 ui->fermentablesTable->setColumnWidth(2, 50); /* Color */ | 65 ui->fermentablesTable->setColumnWidth(2, 45); /* Color */ |
| 66 ui->fermentablesTable->setColumnWidth(3, 75); /* Type */ | 66 ui->fermentablesTable->setColumnWidth(3, 75); /* Type */ |
| 67 ui->fermentablesTable->setColumnWidth(4, 75); /* Graintype */ | 67 ui->fermentablesTable->setColumnWidth(4, 75); /* Graintype */ |
| 68 ui->fermentablesTable->setColumnWidth(5, 82); /* Added */ | 68 ui->fermentablesTable->setColumnWidth(5, 77); /* Added */ |
| 69 ui->fermentablesTable->setColumnWidth(6, 60); /* Yield */ | 69 ui->fermentablesTable->setColumnWidth(6, 55); /* Yield */ |
| 70 ui->fermentablesTable->setColumnWidth(7, 90); /* Amount */ | 70 ui->fermentablesTable->setColumnWidth(7, 80); /* Amount */ |
| 71 ui->fermentablesTable->setColumnWidth(8, 60); /* Procent */ | 71 ui->fermentablesTable->setColumnWidth(8, 80); /* Stock */ |
| 72 ui->fermentablesTable->setColumnWidth(9, 50); /* 100% */ | 72 ui->fermentablesTable->setColumnWidth(9, 55); /* Procent */ |
| 73 ui->fermentablesTable->setColumnWidth(10, 80); /* Delete */ | 73 ui->fermentablesTable->setColumnWidth(10, 50); /* 100% */ |
| 74 ui->fermentablesTable->setColumnWidth(11, 80); /* Edit */ | 74 ui->fermentablesTable->setColumnWidth(11, 80); /* Delete */ |
| 75 ui->fermentablesTable->setColumnWidth(12, 80); /* Edit */ | |
| 75 ui->fermentablesTable->setHorizontalHeaderLabels(labels); | 76 ui->fermentablesTable->setHorizontalHeaderLabels(labels); |
| 76 ui->fermentablesTable->verticalHeader()->hide(); | 77 ui->fermentablesTable->verticalHeader()->hide(); |
| 77 ui->fermentablesTable->setRowCount(product->fermentables.size()); | 78 ui->fermentablesTable->setRowCount(product->fermentables.size()); |
| 78 | 79 |
| 79 for (int i = 0; i < product->fermentables.size(); i++) { | 80 for (int i = 0; i < product->fermentables.size(); i++) { |
| 104 | 105 |
| 105 item = new QTableWidgetItem(QString("%1 Kg").arg(product->fermentables.at(i).f_amount, 4, 'f', 3, '0')); | 106 item = new QTableWidgetItem(QString("%1 Kg").arg(product->fermentables.at(i).f_amount, 4, 'f', 3, '0')); |
| 106 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 107 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 107 ui->fermentablesTable->setItem(i, 7, item); | 108 ui->fermentablesTable->setItem(i, 7, item); |
| 108 | 109 |
| 110 item = new QTableWidgetItem(QString("%1 Kg").arg(product->fermentables.at(i).f_inventory, 4, 'f', 3, '0')); | |
| 111 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | |
| 112 ui->fermentablesTable->setItem(i, 8, item); | |
| 113 | |
| 109 if (product->fermentables.at(i).f_added < 4) { | 114 if (product->fermentables.at(i).f_added < 4) { |
| 110 item = new QTableWidgetItem(QString("%1%").arg(product->fermentables.at(i).f_percentage, 2, 'f', 1, '0')); | 115 item = new QTableWidgetItem(QString("%1%").arg(product->fermentables.at(i).f_percentage, 2, 'f', 1, '0')); |
| 111 } else { | 116 } else { |
| 112 item = new QTableWidgetItem(QString("")); // Blank for bottling and kegging. | 117 item = new QTableWidgetItem(QString("")); // Blank for bottling and kegging. |
| 113 } | 118 } |
| 114 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 119 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 115 ui->fermentablesTable->setItem(i, 8, item); | 120 ui->fermentablesTable->setItem(i, 9, item); |
| 116 | 121 |
| 117 to100Fermentables(i); | 122 to100Fermentables(i); |
| 118 | 123 |
| 119 /* Add the Delete row button */ | 124 /* Add the Delete row button */ |
| 120 pWidget = new QWidget(); | 125 pWidget = new QWidget(); |
| 124 connect(btn_dele, SIGNAL(clicked()), this, SLOT(deleteFermentRow_clicked())); | 129 connect(btn_dele, SIGNAL(clicked()), this, SLOT(deleteFermentRow_clicked())); |
| 125 pLayout = new QHBoxLayout(pWidget); | 130 pLayout = new QHBoxLayout(pWidget); |
| 126 pLayout->addWidget(btn_dele); | 131 pLayout->addWidget(btn_dele); |
| 127 pLayout->setContentsMargins(5, 0, 5, 0); | 132 pLayout->setContentsMargins(5, 0, 5, 0); |
| 128 pWidget->setLayout(pLayout); | 133 pWidget->setLayout(pLayout); |
| 129 ui->fermentablesTable->setCellWidget(i, 10, pWidget); | 134 ui->fermentablesTable->setCellWidget(i, 11, pWidget); |
| 130 | 135 |
| 131 pWidget = new QWidget(); | 136 pWidget = new QWidget(); |
| 132 QPushButton* btn_edit = new QPushButton(); | 137 QPushButton* btn_edit = new QPushButton(); |
| 133 btn_edit->setObjectName(QString("%1").arg(i)); /* Send row with the button */ | 138 btn_edit->setObjectName(QString("%1").arg(i)); /* Send row with the button */ |
| 134 btn_edit->setText(tr("Edit")); | 139 btn_edit->setText(tr("Edit")); |
| 135 connect(btn_edit, SIGNAL(clicked()), this, SLOT(editFermentRow_clicked())); | 140 connect(btn_edit, SIGNAL(clicked()), this, SLOT(editFermentRow_clicked())); |
| 136 pLayout = new QHBoxLayout(pWidget); | 141 pLayout = new QHBoxLayout(pWidget); |
| 137 pLayout->addWidget(btn_edit); | 142 pLayout->addWidget(btn_edit); |
| 138 pLayout->setContentsMargins(5, 0, 5, 0); | 143 pLayout->setContentsMargins(5, 0, 5, 0); |
| 139 pWidget->setLayout(pLayout); | 144 pWidget->setLayout(pLayout); |
| 140 ui->fermentablesTable->setCellWidget(i, 11, pWidget); | 145 ui->fermentablesTable->setCellWidget(i, 12, pWidget); |
| 141 } | 146 } |
| 142 } | 147 } |
| 143 | 148 |
| 144 | 149 |
| 145 void EditProduct::calcFermentables() | 150 void EditProduct::calcFermentables() |
| 211 ui->est_abv2Edit->setValue(0); | 216 ui->est_abv2Edit->setValue(0); |
| 212 ui->est_abvShow->setValue(0); | 217 ui->est_abvShow->setValue(0); |
| 213 product->est_abv = 0; | 218 product->est_abv = 0; |
| 214 ui->calEdit->setValue(0); | 219 ui->calEdit->setValue(0); |
| 215 product->mashs_kg = 0; | 220 product->mashs_kg = 0; |
| 221 ui->mash_kgEdit->setValue(0); | |
| 216 return; | 222 return; |
| 217 } | 223 } |
| 218 qDebug() << " adjust to 100" << product->fermentables_use100; | 224 qDebug() << " adjust to 100" << product->fermentables_use100; |
| 219 | 225 |
| 220 product->mashs_kg = 0; | 226 product->mashs_kg = 0; |
| 287 ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(color)); | 293 ui->est_colorEdit->setStyleSheet(Utils::ebc_to_style(color)); |
| 288 ui->est_color2Edit->setValue(color); | 294 ui->est_color2Edit->setValue(color); |
| 289 ui->est_color2Edit->setStyleSheet(Utils::ebc_to_style(color)); | 295 ui->est_color2Edit->setStyleSheet(Utils::ebc_to_style(color)); |
| 290 ui->est_colorShow->setValue(color); | 296 ui->est_colorShow->setValue(color); |
| 291 | 297 |
| 292 /* | 298 ui->perc_mashShow->setValue(round(product->mashs_kg / product->eq_mash_max * 100)); |
| 293 * We don't have a equipment profile in products, | 299 ui->mash_kgEdit->setValue(product->mashs_kg); |
| 294 * so we assume a certain guessed mashtun size. | |
| 295 */ | |
| 296 ui->perc_mashShow->setValue(round(product->mashs_kg / (product->boil_size / 3) * 100)); | |
| 297 ui->perc_sugarsShow->setValue(round(psugar)); | 300 ui->perc_sugarsShow->setValue(round(psugar)); |
| 298 ui->perc_caraShow->setValue(round(pcara)); | 301 ui->perc_caraShow->setValue(round(pcara)); |
| 299 if (product->mashs_kg > 0) { | 302 if (product->mashs_kg > 0) { |
| 300 qDebug() << " lintner" << lintner << " mashkg" << product->mashs_kg << "final" << round(lintner / product->mashs_kg); | 303 qDebug() << " lintner" << lintner << " mashkg" << product->mashs_kg << "final" << round(lintner / product->mashs_kg); |
| 301 ui->lintnerShow->setValue(round(lintner / product->mashs_kg)); | 304 ui->lintnerShow->setValue(round(lintner / product->mashs_kg)); |
