comparison: src/EditProductTab7.cpp
src/EditProductTab7.cpp
- changeset 287
- 83e66c6b6e07
- parent 257
- cfba041bdaee
- child 301
- fe6346211b5b
equal
deleted
inserted
replaced
| 286:18a7e8d67fc5 | 287:83e66c6b6e07 |
|---|---|
| 261 } | 261 } |
| 262 | 262 |
| 263 | 263 |
| 264 void EditProduct::addMashRow_clicked() | 264 void EditProduct::addMashRow_clicked() |
| 265 { | 265 { |
| 266 Mashs newm; | 266 MashSteps newm; |
| 267 | 267 |
| 268 for (int i = 0; i < product->mashs.size(); i++) { | 268 for (int i = 0; i < product->mashs.size(); i++) { |
| 269 if (product->mashs.at(i).step_time == 0) | 269 if (product->mashs.at(i).step_time == 0) |
| 270 return; // Add only one at a time. | 270 return; // Add only one at a time. |
| 271 } | 271 } |
| 318 | 318 |
| 319 QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); | 319 QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); |
| 320 int row = pb->objectName().toInt(); | 320 int row = pb->objectName().toInt(); |
| 321 qDebug() << "Move up mash row" << row << product->mashs.size(); | 321 qDebug() << "Move up mash row" << row << product->mashs.size(); |
| 322 | 322 |
| 323 Mashs temp; | 323 MashSteps temp; |
| 324 temp = product->mashs[row - 1]; | 324 temp = product->mashs[row - 1]; |
| 325 product->mashs[row - 1] = product->mashs[row]; | 325 product->mashs[row - 1] = product->mashs[row]; |
| 326 product->mashs[row] = temp; | 326 product->mashs[row] = temp; |
| 327 is_changed(); | 327 is_changed(); |
| 328 emit refreshAll(); | 328 emit refreshAll(); |
| 336 | 336 |
| 337 QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); | 337 QPushButton *pb = qobject_cast<QPushButton *>(QObject::sender()); |
| 338 int row = pb->objectName().toInt(); | 338 int row = pb->objectName().toInt(); |
| 339 qDebug() << "Move down mash row" << row << product->mashs.size(); | 339 qDebug() << "Move down mash row" << row << product->mashs.size(); |
| 340 | 340 |
| 341 Mashs temp; | 341 MashSteps temp; |
| 342 temp = product->mashs[row + 1]; | 342 temp = product->mashs[row + 1]; |
| 343 product->mashs[row + 1] = product->mashs[row]; | 343 product->mashs[row + 1] = product->mashs[row]; |
| 344 product->mashs[row] = temp; | 344 product->mashs[row] = temp; |
| 345 is_changed(); | 345 is_changed(); |
| 346 emit refreshAll(); | 346 emit refreshAll(); |
| 533 return; | 533 return; |
| 534 | 534 |
| 535 QToolButton *pb = qobject_cast<QToolButton *>(QObject::sender()); | 535 QToolButton *pb = qobject_cast<QToolButton *>(QObject::sender()); |
| 536 product->mashs_row = pb->objectName().toInt(); | 536 product->mashs_row = pb->objectName().toInt(); |
| 537 qDebug() << "Edit mash row" << product->mashs_row; | 537 qDebug() << "Edit mash row" << product->mashs_row; |
| 538 Mashs backup = product->mashs.at(product->mashs_row); | 538 MashSteps backup = product->mashs.at(product->mashs_row); |
| 539 | 539 |
| 540 QDialog* dialog = new QDialog(this); | 540 QDialog* dialog = new QDialog(this); |
| 541 dialog->resize(738, 290); | 541 dialog->resize(738, 290); |
| 542 QDialogButtonBox *buttonBox = new QDialogButtonBox(dialog); | 542 QDialogButtonBox *buttonBox = new QDialogButtonBox(dialog); |
| 543 buttonBox->setObjectName(QString::fromUtf8("buttonBox")); | 543 buttonBox->setObjectName(QString::fromUtf8("buttonBox")); |
| 794 ui->mashsTable->clear(); | 794 ui->mashsTable->clear(); |
| 795 } | 795 } |
| 796 if (newsteps.isArray()) { | 796 if (newsteps.isArray()) { |
| 797 for (i = 0; i < newsteps.array().size(); i++) { | 797 for (i = 0; i < newsteps.array().size(); i++) { |
| 798 QJsonObject obj = newsteps.array().at(i).toObject(); | 798 QJsonObject obj = newsteps.array().at(i).toObject(); |
| 799 Mashs m; | 799 MashSteps m; |
| 800 m.step_name = obj["step_name"].toString(); | 800 m.step_name = obj["step_name"].toString(); |
| 801 if (obj["step_type"].isString()) | 801 if (obj["step_type"].isString()) |
| 802 m.step_type = QString(obj["step_type"].toString()).toInt(); | 802 m.step_type = QString(obj["step_type"].toString()).toInt(); |
| 803 else | 803 else |
| 804 m.step_type = obj["step_type"].toInt(); | 804 m.step_type = obj["step_type"].toInt(); |
