Mercurial > bmsapp / file comparison

comparison: src/EditProductTab6.cpp

src/EditProductTab6.cpp

changeset 464
1fed3ff9a64e
parent 458
ac216a75ca9b
child 476
29487eac1183
equal deleted inserted replaced
463:98df69885455 464:1fed3ff9a64e
50 QTableWidgetItem *item; 50 QTableWidgetItem *item;
51 51
52 std::sort(product->yeasts.begin(), product->yeasts.end(), yeast_sort_test); 52 std::sort(product->yeasts.begin(), product->yeasts.end(), yeast_sort_test);
53 53
54 const QStringList labels({tr("Yeast"), tr("Laboratory"), tr("Code"), tr("Type"), tr("Use for"), tr("Min."), tr("Max."), 54 const QStringList labels({tr("Yeast"), tr("Laboratory"), tr("Code"), tr("Type"), tr("Use for"), tr("Min."), tr("Max."),
55 tr("Tol."), tr("Attn."), tr("Amount"), tr("Stock"), tr("Delete"), tr("Edit") }); 55 tr("Tol."), tr("Attn."), tr("STA"), tr("Amount"), tr("Stock"), tr("Delete"), tr("Edit") });
56 56
57 ui->yeastsTable->setColumnCount(13); 57 ui->yeastsTable->setColumnCount(14);
58 ui->yeastsTable->setColumnWidth(0, 200); /* Yeast */ 58 ui->yeastsTable->setColumnWidth(0, 200); /* Yeast */
59 ui->yeastsTable->setColumnWidth(1, 115); /* Laboratory */ 59 ui->yeastsTable->setColumnWidth(1, 115); /* Laboratory */
60 ui->yeastsTable->setColumnWidth(2, 80); /* Code */ 60 ui->yeastsTable->setColumnWidth(2, 80); /* Code */
61 ui->yeastsTable->setColumnWidth(3, 80); /* Type */ 61 ui->yeastsTable->setColumnWidth(3, 75); /* Type */
62 ui->yeastsTable->setColumnWidth(4, 80); /* Usage */ 62 ui->yeastsTable->setColumnWidth(4, 75); /* Usage */
63 ui->yeastsTable->setColumnWidth(5, 50); /* Min. */ 63 ui->yeastsTable->setColumnWidth(5, 50); /* Min. */
64 ui->yeastsTable->setColumnWidth(6, 50); /* Max. */ 64 ui->yeastsTable->setColumnWidth(6, 50); /* Max. */
65 ui->yeastsTable->setColumnWidth(7, 50); /* Tolerance */ 65 ui->yeastsTable->setColumnWidth(7, 50); /* Tolerance */
66 ui->yeastsTable->setColumnWidth(8, 50); /* Attenuation */ 66 ui->yeastsTable->setColumnWidth(8, 50); /* Attenuation */
67 ui->yeastsTable->setColumnWidth(9, 80); /* Amount */ 67 ui->yeastsTable->setColumnWidth(9, 40); /* STA1 gen */
68 ui->yeastsTable->setColumnWidth(10, 80); /* Stock */ 68 ui->yeastsTable->setColumnWidth(10, 80); /* Amount */
69 ui->yeastsTable->setColumnWidth(11, 80); /* Delete */ 69 ui->yeastsTable->setColumnWidth(11, 80); /* Stock */
70 ui->yeastsTable->setColumnWidth(12, 80); /* Edit */ 70 ui->yeastsTable->setColumnWidth(12, 80); /* Delete */
71 ui->yeastsTable->setColumnWidth(13, 80); /* Edit */
71 ui->yeastsTable->setHorizontalHeaderLabels(labels); 72 ui->yeastsTable->setHorizontalHeaderLabels(labels);
72 ui->yeastsTable->verticalHeader()->hide(); 73 ui->yeastsTable->verticalHeader()->hide();
73 ui->yeastsTable->setRowCount(product->yeasts.size()); 74 ui->yeastsTable->setRowCount(product->yeasts.size());
74 75
75 for (int i = 0; i < product->yeasts.size(); i++) { 76 for (int i = 0; i < product->yeasts.size(); i++) {
99 ui->yeastsTable->setItem(i, 7, item); 100 ui->yeastsTable->setItem(i, 7, item);
100 101
101 item = new QTableWidgetItem(QString("%1%").arg(product->yeasts.at(i).attenuation, 2, 'f', 1, '0')); 102 item = new QTableWidgetItem(QString("%1%").arg(product->yeasts.at(i).attenuation, 2, 'f', 1, '0'));
102 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); 103 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
103 ui->yeastsTable->setItem(i, 8, item); 104 ui->yeastsTable->setItem(i, 8, item);
105
106 if (product->yeasts.at(i).use != YEAST_USE_BOTTLE && product->yeasts.at(i).sta1) {
107 QWidget *pWidget = new QWidget();
108 QLabel *label = new QLabel;
109 label->setPixmap(QPixmap(":icons/silk/tick.png"));
110 QHBoxLayout *pLayout = new QHBoxLayout(pWidget);
111 pLayout->addWidget(label);
112 pLayout->setAlignment(Qt::AlignCenter);
113 pLayout->setContentsMargins(0, 0, 0, 0);
114 pWidget->setLayout(pLayout);
115 ui->yeastsTable->setCellWidget(i, 9, pWidget);
116 } else {
117 ui->yeastsTable->removeCellWidget(i, 9);
118 }
119
104 120
105 if (product->yeasts.at(i).form == YEAST_FORMS_LIQUID) 121 if (product->yeasts.at(i).form == YEAST_FORMS_LIQUID)
106 item = new QTableWidgetItem(QString("%1 pack").arg(product->yeasts.at(i).amount, 1, 'f', 0, '0')); 122 item = new QTableWidgetItem(QString("%1 pack").arg(product->yeasts.at(i).amount, 1, 'f', 0, '0'));
107 else if (product->yeasts.at(i).form == YEAST_FORMS_DRY || product->yeasts.at(i).form == YEAST_FORMS_DRIED) 123 else if (product->yeasts.at(i).form == YEAST_FORMS_DRY || product->yeasts.at(i).form == YEAST_FORMS_DRIED)
108 item = new QTableWidgetItem(QString("%1 gr").arg(product->yeasts.at(i).amount * 1000.0, 3, 'f', 2, '0')); 124 item = new QTableWidgetItem(QString("%1 gr").arg(product->yeasts.at(i).amount * 1000.0, 3, 'f', 2, '0'));
109 else 125 else
110 item = new QTableWidgetItem(QString("%1 ml").arg(product->yeasts.at(i).amount * 1000.0, 3, 'f', 2, '0')); 126 item = new QTableWidgetItem(QString("%1 ml").arg(product->yeasts.at(i).amount * 1000.0, 3, 'f', 2, '0'));
111 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); 127 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
112 ui->yeastsTable->setItem(i, 9, item); 128 ui->yeastsTable->setItem(i, 10, item);
113 129
114 if (block_yeast(product->stage, product->yeasts.at(i).use)) { 130 if (block_yeast(product->stage, product->yeasts.at(i).use)) {
115 item = new QTableWidgetItem(QString("")); 131 item = new QTableWidgetItem(QString(""));
116 } else { 132 } else {
117 if (product->yeasts.at(i).form == YEAST_FORMS_LIQUID) 133 if (product->yeasts.at(i).form == YEAST_FORMS_LIQUID)
122 item = new QTableWidgetItem(QString("%1 ml").arg(product->yeasts.at(i).inventory * 1000.0, 3, 'f', 2, '0')); 138 item = new QTableWidgetItem(QString("%1 ml").arg(product->yeasts.at(i).inventory * 1000.0, 3, 'f', 2, '0'));
123 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter); 139 item->setTextAlignment(Qt::AlignRight|Qt::AlignVCenter);
124 if (product->yeasts.at(i).inventory < product->yeasts.at(i).amount) 140 if (product->yeasts.at(i).inventory < product->yeasts.at(i).amount)
125 item->setForeground(QBrush(QColor(Qt::red))); 141 item->setForeground(QBrush(QColor(Qt::red)));
126 } 142 }
127 ui->yeastsTable->setItem(i, 10, item); 143 ui->yeastsTable->setItem(i, 11, item);
128 144
129 if (block_yeast(product->stage, product->yeasts.at(i).use)) { 145 if (block_yeast(product->stage, product->yeasts.at(i).use)) {
130 ui->yeastsTable->removeCellWidget(i, 11); /* to remove the unneeded button */ 146 ui->yeastsTable->removeCellWidget(i, 12); /* to remove the unneeded button */
131 item = new QTableWidgetItem("");
132 item->setToolTip(tr("Yeast already used"));
133 ui->yeastsTable->setItem(i, 11, item);
134 ui->yeastsTable->removeCellWidget(i, 12);
135 item = new QTableWidgetItem(""); 147 item = new QTableWidgetItem("");
136 item->setToolTip(tr("Yeast already used")); 148 item->setToolTip(tr("Yeast already used"));
137 ui->yeastsTable->setItem(i, 12, item); 149 ui->yeastsTable->setItem(i, 12, item);
150 ui->yeastsTable->removeCellWidget(i, 13);
151 item = new QTableWidgetItem("");
152 item->setToolTip(tr("Yeast already used"));
153 ui->yeastsTable->setItem(i, 13, item);
138 } else { 154 } else {
139 pWidget = new QWidget(); 155 pWidget = new QWidget();
140 QPushButton* btn_dele = new QPushButton(); 156 QPushButton* btn_dele = new QPushButton();
141 btn_dele->setObjectName(QString("%1").arg(i)); /* Send row with the button */ 157 btn_dele->setObjectName(QString("%1").arg(i)); /* Send row with the button */
142 btn_dele->setText(tr("Delete")); 158 btn_dele->setText(tr("Delete"));
143 connect(btn_dele, SIGNAL(clicked()), this, SLOT(deleteYeastRow_clicked())); 159 connect(btn_dele, SIGNAL(clicked()), this, SLOT(deleteYeastRow_clicked()));
144 pLayout = new QHBoxLayout(pWidget); 160 pLayout = new QHBoxLayout(pWidget);
145 pLayout->addWidget(btn_dele); 161 pLayout->addWidget(btn_dele);
146 pLayout->setContentsMargins(5, 0, 5, 0); 162 pLayout->setContentsMargins(5, 0, 5, 0);
147 pWidget->setLayout(pLayout); 163 pWidget->setLayout(pLayout);
148 ui->yeastsTable->setCellWidget(i, 11, pWidget); 164 ui->yeastsTable->setCellWidget(i, 12, pWidget);
149 165
150 pWidget = new QWidget(); 166 pWidget = new QWidget();
151 QPushButton* btn_edit = new QPushButton(); 167 QPushButton* btn_edit = new QPushButton();
152 btn_edit->setObjectName(QString("%1").arg(i)); /* Send row with the button */ 168 btn_edit->setObjectName(QString("%1").arg(i)); /* Send row with the button */
153 btn_edit->setText(tr("Edit")); 169 btn_edit->setText(tr("Edit"));
154 connect(btn_edit, SIGNAL(clicked()), this, SLOT(editYeastRow_clicked())); 170 connect(btn_edit, SIGNAL(clicked()), this, SLOT(editYeastRow_clicked()));
155 pLayout = new QHBoxLayout(pWidget); 171 pLayout = new QHBoxLayout(pWidget);
156 pLayout->addWidget(btn_edit); 172 pLayout->addWidget(btn_edit);
157 pLayout->setContentsMargins(5, 0, 5, 0); 173 pLayout->setContentsMargins(5, 0, 5, 0);
158 pWidget->setLayout(pLayout); 174 pWidget->setLayout(pLayout);
159 ui->yeastsTable->setCellWidget(i, 12, pWidget); 175 ui->yeastsTable->setCellWidget(i, 13, pWidget);
160 } 176 }
161 } 177 }
162 } 178 }
163 179
164 180

Mercurial Repository: bmsapp

mercurial