comparison: src/EditProductTab6.cpp
src/EditProductTab6.cpp
- changeset 179
- 512f492358e3
- parent 175
- f1ed3a2a94e9
- child 195
- 9887278c4fbe
equal
deleted
inserted
replaced
| 178:1091fd9feffe | 179:512f492358e3 |
|---|---|
| 36 QTableWidgetItem *item; | 36 QTableWidgetItem *item; |
| 37 | 37 |
| 38 qDebug() << "refreshYeasts" << product->yeasts.size(); | 38 qDebug() << "refreshYeasts" << product->yeasts.size(); |
| 39 std::sort(product->yeasts.begin(), product->yeasts.end(), yeast_sort_test); | 39 std::sort(product->yeasts.begin(), product->yeasts.end(), yeast_sort_test); |
| 40 | 40 |
| 41 const QStringList labels({tr("Yeast"), tr("Laboratory"), tr("Code"), tr("Type"), tr("Use for"), tr("Min. °C"), tr("Max. °C"), | 41 const QStringList labels({tr("Yeast"), tr("Laboratory"), tr("Code"), tr("Type"), tr("Use for"), tr("Min."), tr("Max."), |
| 42 tr("Tol. %"), tr("Attn. %"), tr("Amount"), tr("Delete"), tr("Edit") }); | 42 tr("Tol."), tr("Attn."), tr("Amount"), tr("Stock"), tr("Delete"), tr("Edit") }); |
| 43 | 43 |
| 44 ui->yeastsTable->setColumnCount(12); | 44 ui->yeastsTable->setColumnCount(13); |
| 45 ui->yeastsTable->setColumnWidth(0, 200); /* Yeast */ | 45 ui->yeastsTable->setColumnWidth(0, 200); /* Yeast */ |
| 46 ui->yeastsTable->setColumnWidth(1, 125); /* Laboratory */ | 46 ui->yeastsTable->setColumnWidth(1, 115); /* Laboratory */ |
| 47 ui->yeastsTable->setColumnWidth(2, 80); /* Code */ | 47 ui->yeastsTable->setColumnWidth(2, 80); /* Code */ |
| 48 ui->yeastsTable->setColumnWidth(3, 80); /* Type */ | 48 ui->yeastsTable->setColumnWidth(3, 80); /* Type */ |
| 49 ui->yeastsTable->setColumnWidth(4, 100); /* Usage */ | 49 ui->yeastsTable->setColumnWidth(4, 80); /* Usage */ |
| 50 ui->yeastsTable->setColumnWidth(5, 60); /* Min. */ | 50 ui->yeastsTable->setColumnWidth(5, 50); /* Min. */ |
| 51 ui->yeastsTable->setColumnWidth(6, 60); /* Max. */ | 51 ui->yeastsTable->setColumnWidth(6, 50); /* Max. */ |
| 52 ui->yeastsTable->setColumnWidth(7, 60); /* Tolerance */ | 52 ui->yeastsTable->setColumnWidth(7, 50); /* Tolerance */ |
| 53 ui->yeastsTable->setColumnWidth(8, 60); /* Attenuation */ | 53 ui->yeastsTable->setColumnWidth(8, 50); /* Attenuation */ |
| 54 ui->yeastsTable->setColumnWidth(9, 90); /* Amount */ | 54 ui->yeastsTable->setColumnWidth(9, 80); /* Amount */ |
| 55 ui->yeastsTable->setColumnWidth(10, 80); /* Delete */ | 55 ui->yeastsTable->setColumnWidth(10, 80); /* Stock */ |
| 56 ui->yeastsTable->setColumnWidth(11, 80); /* Edit */ | 56 ui->yeastsTable->setColumnWidth(11, 80); /* Delete */ |
| 57 ui->yeastsTable->setColumnWidth(12, 80); /* Edit */ | |
| 57 ui->yeastsTable->setHorizontalHeaderLabels(labels); | 58 ui->yeastsTable->setHorizontalHeaderLabels(labels); |
| 58 ui->yeastsTable->verticalHeader()->hide(); | 59 ui->yeastsTable->verticalHeader()->hide(); |
| 59 ui->yeastsTable->setRowCount(product->yeasts.size()); | 60 ui->yeastsTable->setRowCount(product->yeasts.size()); |
| 60 | 61 |
| 61 for (int i = 0; i < product->yeasts.size(); i++) { | 62 for (int i = 0; i < product->yeasts.size(); i++) { |
| 70 | 71 |
| 71 item = new QTableWidgetItem(yeast_use[product->yeasts.at(i).y_use]); | 72 item = new QTableWidgetItem(yeast_use[product->yeasts.at(i).y_use]); |
| 72 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); | 73 item->setTextAlignment(Qt::AlignCenter|Qt::AlignVCenter); |
| 73 ui->yeastsTable->setItem(i, 4, item); | 74 ui->yeastsTable->setItem(i, 4, item); |
| 74 | 75 |
| 75 item = new QTableWidgetItem(QString("%1").arg(product->yeasts.at(i).y_min_temperature, 2, 'f', 1, '0')); | 76 item = new QTableWidgetItem(QString("%1°C").arg(product->yeasts.at(i).y_min_temperature, 2, 'f', 1, '0')); |
| 76 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 77 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 77 ui->yeastsTable->setItem(i, 5, item); | 78 ui->yeastsTable->setItem(i, 5, item); |
| 78 | 79 |
| 79 item = new QTableWidgetItem(QString("%1").arg(product->yeasts.at(i).y_max_temperature, 2, 'f', 1, '0')); | 80 item = new QTableWidgetItem(QString("%1°C").arg(product->yeasts.at(i).y_max_temperature, 2, 'f', 1, '0')); |
| 80 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 81 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 81 ui->yeastsTable->setItem(i, 6, item); | 82 ui->yeastsTable->setItem(i, 6, item); |
| 82 | 83 |
| 83 item = new QTableWidgetItem(QString("%1").arg(product->yeasts.at(i).y_tolerance, 2, 'f', 1, '0')); | 84 item = new QTableWidgetItem(QString("%1%").arg(product->yeasts.at(i).y_tolerance, 2, 'f', 1, '0')); |
| 84 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 85 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 85 ui->yeastsTable->setItem(i, 7, item); | 86 ui->yeastsTable->setItem(i, 7, item); |
| 86 | 87 |
| 87 item = new QTableWidgetItem(QString("%1").arg(product->yeasts.at(i).y_attenuation, 2, 'f', 1, '0')); | 88 item = new QTableWidgetItem(QString("%1%").arg(product->yeasts.at(i).y_attenuation, 2, 'f', 1, '0')); |
| 88 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 89 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 89 ui->yeastsTable->setItem(i, 8, item); | 90 ui->yeastsTable->setItem(i, 8, item); |
| 90 | 91 |
| 91 if (product->yeasts.at(i).y_form == 0) | 92 if (product->yeasts.at(i).y_form == 0) |
| 92 item = new QTableWidgetItem(QString("%1 pack").arg(product->yeasts.at(i).y_amount, 1, 'f', 0, '0')); | 93 item = new QTableWidgetItem(QString("%1 pack").arg(product->yeasts.at(i).y_amount, 1, 'f', 0, '0')); |
| 94 item = new QTableWidgetItem(QString("%1 gr").arg(product->yeasts.at(i).y_amount * 1000.0, 3, 'f', 2, '0')); | 95 item = new QTableWidgetItem(QString("%1 gr").arg(product->yeasts.at(i).y_amount * 1000.0, 3, 'f', 2, '0')); |
| 95 else | 96 else |
| 96 item = new QTableWidgetItem(QString("%1 ml").arg(product->yeasts.at(i).y_amount * 1000.0, 3, 'f', 2, '0')); | 97 item = new QTableWidgetItem(QString("%1 ml").arg(product->yeasts.at(i).y_amount * 1000.0, 3, 'f', 2, '0')); |
| 97 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | 98 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); |
| 98 ui->yeastsTable->setItem(i, 9, item); | 99 ui->yeastsTable->setItem(i, 9, item); |
| 100 | |
| 101 if (product->yeasts.at(i).y_form == 0) | |
| 102 item = new QTableWidgetItem(QString("%1 pack").arg(product->yeasts.at(i).y_inventory, 1, 'f', 0, '0')); | |
| 103 else if (product->yeasts.at(i).y_form == 1) | |
| 104 item = new QTableWidgetItem(QString("%1 gr").arg(product->yeasts.at(i).y_inventory * 1000.0, 3, 'f', 2, '0')); | |
| 105 else | |
| 106 item = new QTableWidgetItem(QString("%1 ml").arg(product->yeasts.at(i).y_inventory * 1000.0, 3, 'f', 2, '0')); | |
| 107 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); | |
| 108 ui->yeastsTable->setItem(i, 10, item); | |
| 99 | 109 |
| 100 pWidget = new QWidget(); | 110 pWidget = new QWidget(); |
| 101 QPushButton* btn_dele = new QPushButton(); | 111 QPushButton* btn_dele = new QPushButton(); |
| 102 btn_dele->setObjectName(QString("%1").arg(i)); /* Send row with the button */ | 112 btn_dele->setObjectName(QString("%1").arg(i)); /* Send row with the button */ |
| 103 btn_dele->setText(tr("Delete")); | 113 btn_dele->setText(tr("Delete")); |
| 104 connect(btn_dele, SIGNAL(clicked()), this, SLOT(deleteYeastRow_clicked())); | 114 connect(btn_dele, SIGNAL(clicked()), this, SLOT(deleteYeastRow_clicked())); |
| 105 pLayout = new QHBoxLayout(pWidget); | 115 pLayout = new QHBoxLayout(pWidget); |
| 106 pLayout->addWidget(btn_dele); | 116 pLayout->addWidget(btn_dele); |
| 107 pLayout->setContentsMargins(5, 0, 5, 0); | 117 pLayout->setContentsMargins(5, 0, 5, 0); |
| 108 pWidget->setLayout(pLayout); | 118 pWidget->setLayout(pLayout); |
| 109 ui->yeastsTable->setCellWidget(i, 10, pWidget); | 119 ui->yeastsTable->setCellWidget(i, 11, pWidget); |
| 110 | 120 |
| 111 pWidget = new QWidget(); | 121 pWidget = new QWidget(); |
| 112 QPushButton* btn_edit = new QPushButton(); | 122 QPushButton* btn_edit = new QPushButton(); |
| 113 btn_edit->setObjectName(QString("%1").arg(i)); /* Send row with the button */ | 123 btn_edit->setObjectName(QString("%1").arg(i)); /* Send row with the button */ |
| 114 btn_edit->setText(tr("Edit")); | 124 btn_edit->setText(tr("Edit")); |
| 115 connect(btn_edit, SIGNAL(clicked()), this, SLOT(editYeastRow_clicked())); | 125 connect(btn_edit, SIGNAL(clicked()), this, SLOT(editYeastRow_clicked())); |
| 116 pLayout = new QHBoxLayout(pWidget); | 126 pLayout = new QHBoxLayout(pWidget); |
| 117 pLayout->addWidget(btn_edit); | 127 pLayout->addWidget(btn_edit); |
| 118 pLayout->setContentsMargins(5, 0, 5, 0); | 128 pLayout->setContentsMargins(5, 0, 5, 0); |
| 119 pWidget->setLayout(pLayout); | 129 pWidget->setLayout(pLayout); |
| 120 ui->yeastsTable->setCellWidget(i, 11, pWidget); | 130 ui->yeastsTable->setCellWidget(i, 12, pWidget); |
| 121 } | 131 } |
| 122 } | 132 } |
| 123 | 133 |
| 124 | 134 |
| 125 /* | 135 /* |
