comparison: src/database/db_product.cpp
src/database/db_product.cpp
- changeset 485
- 83b5c2b3c414
- parent 482
- e13763ec829f
- child 487
- 04c67c9f903c
equal
deleted
inserted
replaced
| 484:ebf7ef31da35 | 485:83b5c2b3c414 |
|---|---|
| 432 if (parseError.error != QJsonParseError::NoError) { | 432 if (parseError.error != QJsonParseError::NoError) { |
| 433 qWarning() << "Parse error: " << parseError.errorString() << "at" << parseError.offset ; | 433 qWarning() << "Parse error: " << parseError.errorString() << "at" << parseError.offset ; |
| 434 } else if (yeasts.isArray()) { | 434 } else if (yeasts.isArray()) { |
| 435 for (int i = 0; i < yeasts.array().size(); i++) { | 435 for (int i = 0; i < yeasts.array().size(); i++) { |
| 436 QJsonObject obj = yeasts.array().at(i).toObject(); | 436 QJsonObject obj = yeasts.array().at(i).toObject(); |
| 437 qDebug() << "yeasts_Json" << i << obj; | 437 // qDebug() << "yeasts_Json" << i << obj; |
| 438 Yeasts y; | 438 Yeasts y; |
| 439 /* First some defaults for newer fields. */ | 439 /* First some defaults for newer fields. */ |
| 440 y.tolerance = y.harvest_time = y.pitch_temperature = y.zymocide = 0; | 440 y.tolerance = y.harvest_time = y.pitch_temperature = y.zymocide = 0; |
| 441 y.avail = y.sta1 = y.bacteria = y.harvest_top = y.pofpos = false; | 441 y.avail = y.sta1 = y.bacteria = y.harvest_top = y.pofpos = false; |
| 442 y.gr_hl_lo = 50; | 442 y.gr_hl_lo = 50; |
| 444 y.gr_hl_hi = 80; | 444 y.gr_hl_hi = 80; |
| 445 y.sg_hi = 1.08; | 445 y.sg_hi = 1.08; |
| 446 /* Clear Yeast Package data */ | 446 /* Clear Yeast Package data */ |
| 447 y.yp_uuid = QString(); | 447 y.yp_uuid = QString(); |
| 448 y.yp_package = QString(); | 448 y.yp_package = QString(); |
| 449 y.yp_cells = obj["y_cells"].toDouble(); | 449 y.yp_cells = 0; |
| 450 y.yp_viability = 0.99; | 450 y.yp_viability = 0.99; |
| 451 y.yp_max = 100; | 451 y.yp_max = 100; |
| 452 y.yp_size = 0.01; | 452 y.yp_size = 0.01; |
| 453 /* Now get what we have got */ | 453 /* Now get what we have got */ |
| 454 y.name = obj["y_name"].toString(); | 454 y.name = obj["y_name"].toString(); |
| 510 } | 510 } |
| 511 /* | 511 /* |
| 512 * Yeast Pack. | 512 * Yeast Pack. |
| 513 */ | 513 */ |
| 514 if (obj.contains("y_package") && obj["y_package"].isObject()) { | 514 if (obj.contains("y_package") && obj["y_package"].isObject()) { |
| 515 qDebug() << "y_package object present"; | 515 // qDebug() << "y_package object present"; |
| 516 QJsonObject package = obj.value("y_package").toObject(); | 516 QJsonObject package = obj.value("y_package").toObject(); |
| 517 qDebug() << "yeasts_Json package" << i << package; | 517 qDebug() << "yeasts_Json package" << i << package; |
| 518 y.yp_uuid = package["uuid"].toString(); | 518 y.yp_uuid = package["uuid"].toString(); |
| 519 y.yp_package = package["package"].toString(); | 519 y.yp_package = package["package"].toString(); |
| 520 y.yp_cells = package["cells"].toDouble(); | 520 y.yp_cells = package["cells"].toDouble(); |
| 521 y.yp_viability = package["viability"].toDouble(); | 521 y.yp_viability = package["viability"].toDouble(); |
| 522 y.yp_max = package["max"].toInt(); | 522 y.yp_max = package["max"].toInt(); |
| 523 y.yp_size = package["size"].toDouble(); | 523 y.yp_size = package["size"].toDouble(); |
| 524 } else { | |
| 525 qDebug() << "y_package not present"; | |
| 526 } | 524 } |
| 527 | 525 |
| 528 prod->yeasts.append(y); | 526 prod->yeasts.append(y); |
| 529 } | 527 } |
| 530 // qDebug() << "yeasts" << prod->yeasts.size(); | 528 // qDebug() << "yeasts" << prod->yeasts.size(); |
| 993 obj.insert("y_sg_lo", round(prod->yeasts.at(i).sg_lo * 1000) / 1000); | 991 obj.insert("y_sg_lo", round(prod->yeasts.at(i).sg_lo * 1000) / 1000); |
| 994 obj.insert("y_gr_hl_hi", prod->yeasts.at(i).gr_hl_hi); | 992 obj.insert("y_gr_hl_hi", prod->yeasts.at(i).gr_hl_hi); |
| 995 obj.insert("y_sg_hi", round(prod->yeasts.at(i).sg_hi * 1000) / 1000); | 993 obj.insert("y_sg_hi", round(prod->yeasts.at(i).sg_hi * 1000) / 1000); |
| 996 obj.insert("y_cost", round(prod->yeasts.at(i).cost * 1000) / 1000); | 994 obj.insert("y_cost", round(prod->yeasts.at(i).cost * 1000) / 1000); |
| 997 if (! product->yeasts.at(i).yp_uuid.isNull() && (product->yeasts.at(i).yp_uuid.length() == 36)) { | 995 if (! product->yeasts.at(i).yp_uuid.isNull() && (product->yeasts.at(i).yp_uuid.length() == 36)) { |
| 998 qDebug() << "yeasts_Json append package"; | 996 // qDebug() << "yeasts_Json append package"; |
| 999 QJsonObject package; | 997 QJsonObject package; |
| 1000 package.insert("uuid", prod->yeasts.at(i).yp_uuid); | 998 package.insert("uuid", prod->yeasts.at(i).yp_uuid); |
| 1001 package.insert("package", prod->yeasts.at(i).yp_package); | 999 package.insert("package", prod->yeasts.at(i).yp_package); |
| 1002 package.insert("cells", prod->yeasts.at(i).yp_cells); | 1000 package.insert("cells", prod->yeasts.at(i).yp_cells); |
| 1003 package.insert("viability", round(prod->yeasts.at(i).yp_viability * 10000) / 10000); | 1001 package.insert("viability", round(prod->yeasts.at(i).yp_viability * 10000) / 10000); |
