piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Add default category on-the-fly

Browse Source
This commit is contained in:
Raphael Coeffic
2022-01-09 10:07:27 +01:00
parent ef7a5d34c7
commit ff1e5cedc5
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/edgetx/edgetxinterface.cpp
+9 -4
View File
@@ -110,18 +110,23 @@ bool writeModelsListToYaml(const std::vector<CategoryData>& categories,
QByteArray& data)
{
YAML::Node node;
std::vector<CategoryData> cats = categories;
for (const auto& modelFile: modelFiles) {
YAML::Node cat_attrs;
cat_attrs["filename"] = modelFile.filename;
cat_attrs["name"] = modelFile.name;
if (modelFile.category >= (int)categories.size()) {
return false;
auto catIdx = modelFile.category;
if (catIdx >= (int)cats.size()) {
catIdx = 0;
if (cats.size() == 0) {
cats.push_back("Models");
}
}
const std::string cat_name = categories[modelFile.category].name;
node[modelFile.category][cat_name].push_back(cat_attrs);
const std::string cat_name = cats[catIdx].name;
node[catIdx][cat_name].push_back(cat_attrs);
}
writeYamlToByteArray(node, data);
companion/src/radiointerface.cpp
+1 -1
View File
@@ -220,7 +220,7 @@ bool readSettingsSDCard(const QString & filename, ProgressWidget * progress)
}
Storage outputStorage(filename);
if (!outputStorage.write(radioData)) {
QMessageBox::critical(progress, CPN_STR_TTL_ERROR, QCoreApplication::translate("RadioInterface", "Failed to write Models and Setting file") % filename);
QMessageBox::critical(progress, CPN_STR_TTL_ERROR, QCoreApplication::translate("RadioInterface", "Failed to write Models and Setting file") % " " % filename);
return false;
}