doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up default target variant selection code and some tidying

Browse Source
This commit is contained in:
Nav
2021-04-09 20:33:24 +01:00
parent 06e056ee18
commit 0f309e04c7
7 changed files with 29 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/Insight/UserInterfaces/InsightWindow/InsightWindow.cpp
View File

@@ -82,6 +82,10 @@ void InsightWindow::init(
);
if (this->isVariantSupported(targetVariant)) {
this->supportedVariantsByName.insert(
std::pair(QString::fromStdString(targetVariant.name).toLower().toStdString(), targetVariant)
);
connect(
variantAction,
&QAction::triggered,
@@ -100,33 +104,21 @@ void InsightWindow::init(
this->variantMenu->addAction(variantAction);
}
std::copy_if(
this->targetDescriptor.variants.begin(),
this->targetDescriptor.variants.end(),
std::back_inserter(this->supportedVariants),
[this](auto variant) {
return this->isVariantSupported(variant);
}
);
Logger::debug("Number of target variants supported by Insight: " + std::to_string(supportedVariantsByName.size()));
Logger::debug("Number of target variants supported by Insight: " + std::to_string(supportedVariants.size()));
if (!this->supportedVariantsByName.empty()) {
if (!targetConfig.variantName.empty() && this->supportedVariantsByName.contains(targetConfig.variantName)) {
// The user has specified a valid variant name in their config file, so use that as the default
this->selectVariant(&(this->supportedVariantsByName.at(targetConfig.variantName)));
if (!supportedVariants.empty()) {
auto selectedVariant = std::find_if(
supportedVariants.begin(),
supportedVariants.end(),
[&targetConfig](const TargetVariant& variant) {
auto variantName = QString::fromStdString(variant.name).toLower().toStdString();
return !targetConfig.variantName.empty() && targetConfig.variantName == variantName;
} else {
if (!targetConfig.variantName.empty()) {
Logger::error("Invalid target variant name \"" + targetConfig.variantName
+ "\" - no such variant with the given name was found.");
}
);
/*
* If ths user specified a valid variant name in their config file, use that as the default, otherwise just
* use the first supported variant.
*/
this->selectVariant((selectedVariant != supportedVariants.end()) ? &(*selectedVariant)
: &supportedVariants.front());
this->selectVariant(&(this->supportedVariantsByName.begin()->second));
}
} else {
if (this->targetDescriptor.variants.empty()) {