comparison: src/EditRecipe.cpp
src/EditRecipe.cpp
- changeset 112
- 9e0dfa78f349
- parent 111
- 04f5a7c5a1dc
- child 113
- 30a34d639e90
equal
deleted
inserted
replaced
| 111:04f5a7c5a1dc | 112:9e0dfa78f349 |
|---|---|
| 204 } | 204 } |
| 205 | 205 |
| 206 const auto& m_json = query.value(86).toString(); | 206 const auto& m_json = query.value(86).toString(); |
| 207 if (!m_json.trimmed().isEmpty()) { | 207 if (!m_json.trimmed().isEmpty()) { |
| 208 const auto& formattedJson = QString("%1").arg(m_json); | 208 const auto& formattedJson = QString("%1").arg(m_json); |
| 209 this->miscs = QJsonDocument::fromJson(formattedJson.toUtf8(), &parseError); | 209 QJsonDocument miscs = QJsonDocument::fromJson(formattedJson.toUtf8(), &parseError); |
| 210 if (parseError.error != QJsonParseError::NoError) | 210 if (parseError.error != QJsonParseError::NoError) { |
| 211 qDebug() << "Parse error: " << parseError.errorString() << "at" << parseError.offset ; | 211 qDebug() << "Parse error: " << parseError.errorString() << "at" << parseError.offset; |
| 212 } else if (miscs.isArray()) { | |
| 213 for (int i = 0; i < miscs.array().size(); i++) { | |
| 214 QJsonObject obj = miscs.array().at(i).toObject(); | |
| 215 qDebug() << i << obj; | |
| 216 Miscs m; | |
| 217 m.m_name = obj["m_name"].toString(); | |
| 218 m.m_amount = obj["m_amount"].toDouble(); | |
| 219 m.m_type = obj["m_type"].toInt(); | |
| 220 m.m_use_use = obj["m_type"].toInt(); | |
| 221 m.m_time = obj["m_time"].toDouble(); | |
| 222 m.m_amount_is_weight = obj["m_amount_is_weight"].toInt() ? true:false; | |
| 223 m.m_cost = obj["m_cost"].toDouble(); | |
| 224 recipe->miscs.append(m); | |
| 225 } | |
| 226 qDebug() << "miscs" << recipe->miscs.size(); | |
| 227 } | |
| 212 } else { | 228 } else { |
| 213 qDebug() << "empty miscs"; | 229 qDebug() << "empty miscs"; |
| 214 } | 230 } |
| 215 | 231 |
| 216 const auto& y_json = query.value(87).toString(); | 232 const auto& y_json = query.value(87).toString(); |
| 356 recipe->wa_acid_perc = 80; | 372 recipe->wa_acid_perc = 80; |
| 357 recipe->wa_base_name = 0; | 373 recipe->wa_base_name = 0; |
| 358 | 374 |
| 359 const auto& formattedJson = QString("[]"); | 375 const auto& formattedJson = QString("[]"); |
| 360 this->hops = QJsonDocument::fromJson(formattedJson.toUtf8()); | 376 this->hops = QJsonDocument::fromJson(formattedJson.toUtf8()); |
| 361 this->miscs = QJsonDocument::fromJson(formattedJson.toUtf8()); | |
| 362 } | 377 } |
| 363 | 378 |
| 364 ui->lockedEdit->setChecked(recipe->locked); | 379 ui->lockedEdit->setChecked(recipe->locked); |
| 365 ui->st_nameEdit->setText(recipe->st_name); | 380 ui->st_nameEdit->setText(recipe->st_name); |
| 366 ui->st_groupEdit->setText(recipe->st_letter); | 381 ui->st_groupEdit->setText(recipe->st_letter); |
