comparison: src/EditRecipeTab4.cpp
src/EditRecipeTab4.cpp
- changeset 154
- 1af9f7b7f317
- parent 152
- 58e4ce7dd217
- child 171
- 6cd2d808d863
equal
deleted
inserted
replaced
| 153:e71642121fb6 | 154:1af9f7b7f317 |
|---|---|
| 68 | 68 |
| 69 for (int i = 0; i < recipe->miscs.size(); i++) { | 69 for (int i = 0; i < recipe->miscs.size(); i++) { |
| 70 | 70 |
| 71 ui->miscsTable->setItem(i, 0, new QTableWidgetItem(recipe->miscs.at(i).m_name)); | 71 ui->miscsTable->setItem(i, 0, new QTableWidgetItem(recipe->miscs.at(i).m_name)); |
| 72 | 72 |
| 73 item = new QTableWidgetItem(m_types[recipe->miscs.at(i).m_type]); | 73 item = new QTableWidgetItem(misc_types[recipe->miscs.at(i).m_type]); |
| 74 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 74 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 75 ui->miscsTable->setItem(i, 1, item); | 75 ui->miscsTable->setItem(i, 1, item); |
| 76 | 76 |
| 77 item = new QTableWidgetItem(m_uses[recipe->miscs.at(i).m_use_use]); | 77 item = new QTableWidgetItem(misc_uses[recipe->miscs.at(i).m_use_use]); |
| 78 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 78 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 79 ui->miscsTable->setItem(i, 2, item); | 79 ui->miscsTable->setItem(i, 2, item); |
| 80 | 80 |
| 81 if (recipe->miscs.at(i).m_use_use == 2) { // Boil | 81 if (recipe->miscs.at(i).m_use_use == 2) { // Boil |
| 82 item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(i).m_time, 1, 'f', 0, '0')); | 82 item = new QTableWidgetItem(QString("%1 min.").arg(recipe->miscs.at(i).m_time, 1, 'f', 0, '0')); |
| 381 * Update the visible fields | 381 * Update the visible fields |
| 382 */ | 382 */ |
| 383 mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).m_name); | 383 mnameEdit->setText(recipe->miscs.at(recipe->miscs_row).m_name); |
| 384 ui->miscsTable->setItem(recipe->miscs_row, 0, new QTableWidgetItem(recipe->miscs.at(recipe->miscs_row).m_name)); | 384 ui->miscsTable->setItem(recipe->miscs_row, 0, new QTableWidgetItem(recipe->miscs.at(recipe->miscs_row).m_name)); |
| 385 | 385 |
| 386 item = new QTableWidgetItem(m_types[recipe->miscs.at(recipe->miscs_row).m_type]); | 386 item = new QTableWidgetItem(misc_types[recipe->miscs.at(recipe->miscs_row).m_type]); |
| 387 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 387 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 388 ui->miscsTable->setItem(recipe->miscs_row, 1, item); | 388 ui->miscsTable->setItem(recipe->miscs_row, 1, item); |
| 389 | 389 |
| 390 item = new QTableWidgetItem(m_uses[recipe->miscs.at(recipe->miscs_row).m_use_use]); | 390 item = new QTableWidgetItem(misc_uses[recipe->miscs.at(recipe->miscs_row).m_use_use]); |
| 391 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 391 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 392 ui->miscsTable->setItem(recipe->miscs_row, 2, item); | 392 ui->miscsTable->setItem(recipe->miscs_row, 2, item); |
| 393 useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).m_use_use); | 393 useatEdit->setCurrentIndex(recipe->miscs.at(recipe->miscs_row).m_use_use); |
| 394 | 394 |
| 395 if (recipe->miscs.at(recipe->miscs_row).m_use_use == 3 || recipe->miscs.at(recipe->miscs_row).m_use_use == 4) { // Fermentation stages | 395 if (recipe->miscs.at(recipe->miscs_row).m_use_use == 3 || recipe->miscs.at(recipe->miscs_row).m_use_use == 4) { // Fermentation stages |
| 440 query.prepare(sql); | 440 query.prepare(sql); |
| 441 query.exec(); | 441 query.exec(); |
| 442 query.first(); | 442 query.first(); |
| 443 this->mselectEdit->addItem(""); // Start with empty value | 443 this->mselectEdit->addItem(""); // Start with empty value |
| 444 for (int i = 0; i < query.size(); i++) { | 444 for (int i = 0; i < query.size(); i++) { |
| 445 this->mselectEdit->addItem(query.value(0).toString()+ " (" + m_types[query.value(1).toInt()] + ") " + | 445 this->mselectEdit->addItem(query.value(0).toString()+ " (" + misc_types[query.value(1).toInt()] + ") " + |
| 446 QString("%1 %2").arg(query.value(3).toDouble() * 1000.0, 3, 'f', 2, '0').arg(query.value(2).toInt()?"gr":"ml")); | 446 QString("%1 %2").arg(query.value(3).toDouble() * 1000.0, 3, 'f', 2, '0').arg(query.value(2).toInt()?"gr":"ml")); |
| 447 query.next(); | 447 query.next(); |
| 448 } | 448 } |
| 449 } | 449 } |
| 450 | 450 |
| 453 { | 453 { |
| 454 QTableWidgetItem *item; | 454 QTableWidgetItem *item; |
| 455 | 455 |
| 456 qDebug() << "misc_useat_changed" << val; | 456 qDebug() << "misc_useat_changed" << val; |
| 457 recipe->miscs[recipe->miscs_row].m_use_use = val; | 457 recipe->miscs[recipe->miscs_row].m_use_use = val; |
| 458 item = new QTableWidgetItem(m_uses[val]); | 458 item = new QTableWidgetItem(misc_uses[val]); |
| 459 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 459 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 460 ui->miscsTable->setItem(recipe->miscs_row, 2, item); | 460 ui->miscsTable->setItem(recipe->miscs_row, 2, item); |
| 461 | 461 |
| 462 if (val == 3 || val == 4) { // Fermentation stages | 462 if (val == 3 || val == 4) { // Fermentation stages |
| 463 recipe->miscs[recipe->miscs_row].m_time = mtimeEdit->value() * 1440; | 463 recipe->miscs[recipe->miscs_row].m_time = mtimeEdit->value() * 1440; |
