diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp
index 44f71cd50..c3831f09c 100644
--- a/src/blackcore/aircraftmatcher.cpp
+++ b/src/blackcore/aircraftmatcher.cpp
@@ -1440,13 +1440,13 @@ namespace BlackCore
// military / civilian
bool milFlagReduced = false;
- if (mode.testFlag(CAircraftMatcherSetup::ByForceMilitary) && remoteAircraft.isMilitary())
+ if (mode.testFlag(CAircraftMatcherSetup::ByMilitary) && remoteAircraft.isMilitary())
{
matchedModels = ifPossibleReduceByMilitaryFlag(remoteAircraft, matchedModels, reduced, reduceLog);
milFlagReduced = true;
}
- if (!milFlagReduced && mode.testFlag(CAircraftMatcherSetup::ByForceCivilian) && !remoteAircraft.isMilitary())
+ if (!milFlagReduced && mode.testFlag(CAircraftMatcherSetup::ByCivilian) && !remoteAircraft.isMilitary())
{
matchedModels = ifPossibleReduceByMilitaryFlag(remoteAircraft, matchedModels, reduced, reduceLog);
milFlagReduced = true;
diff --git a/src/blackgui/editors/matchingform.cpp b/src/blackgui/editors/matchingform.cpp
index 482fb1a30..eec562566 100644
--- a/src/blackgui/editors/matchingform.cpp
+++ b/src/blackgui/editors/matchingform.cpp
@@ -51,8 +51,8 @@ namespace BlackGui
CGuiUtility::checkBoxReadOnly(ui->cb_ByLivery, readonly);
CGuiUtility::checkBoxReadOnly(ui->cb_ByCombinedCode, readonly);
CGuiUtility::checkBoxReadOnly(ui->cb_ByVtol, readonly);
- CGuiUtility::checkBoxReadOnly(ui->cb_ByForceMilitary, readonly);
- CGuiUtility::checkBoxReadOnly(ui->cb_ByForceCivilian, readonly);
+ CGuiUtility::checkBoxReadOnly(ui->cb_ByMilitary, readonly);
+ CGuiUtility::checkBoxReadOnly(ui->cb_ByCivilian, readonly);
CGuiUtility::checkBoxReadOnly(ui->cb_ScoreIgnoreZeros, readonly);
CGuiUtility::checkBoxReadOnly(ui->cb_ScorePreferColorLiveries, readonly);
CGuiUtility::checkBoxReadOnly(ui->cb_ModelSetRemoveFailed, readonly);
@@ -112,8 +112,8 @@ namespace BlackGui
ui->cb_ByLivery->setChecked(mode.testFlag(CAircraftMatcherSetup::ByLivery));
ui->cb_ByFamily->setChecked(mode.testFlag(CAircraftMatcherSetup::ByFamily));
- ui->cb_ByForceMilitary->setChecked(mode.testFlag(CAircraftMatcherSetup::ByForceMilitary));
- ui->cb_ByForceCivilian->setChecked(mode.testFlag(CAircraftMatcherSetup::ByForceCivilian));
+ ui->cb_ByMilitary->setChecked(mode.testFlag(CAircraftMatcherSetup::ByMilitary));
+ ui->cb_ByCivilian->setChecked(mode.testFlag(CAircraftMatcherSetup::ByCivilian));
ui->cb_CategoryGlider->setChecked(mode.testFlag(CAircraftMatcherSetup::ByCategoryGlider));
ui->cb_CategoryMilitaryAircraft->setChecked(mode.testFlag(CAircraftMatcherSetup::ByCategoryMilitary));
ui->cb_CategorySmallAircraft->setChecked(mode.testFlag(CAircraftMatcherSetup::ByCategorySmallAircraft));
@@ -203,8 +203,8 @@ namespace BlackGui
ui->rb_ByIcaoDataAircraft1st->isChecked(), ui->rb_ByIcaoDataAirline1st->isChecked(),
ui->cb_ByFamily->isChecked(), ui->cb_ByLivery->isChecked(),
ui->cb_ByCombinedCode->isChecked(),
- ui->cb_ByForceMilitary->isChecked(),
- ui->cb_ByForceCivilian->isChecked(),
+ ui->cb_ByMilitary->isChecked(),
+ ui->cb_ByCivilian->isChecked(),
ui->cb_ByVtol->isChecked(),
ui->cb_CategoryGlider->isChecked(),
ui->cb_CategoryMilitaryAircraft->isChecked(),
diff --git a/src/blackgui/editors/matchingform.ui b/src/blackgui/editors/matchingform.ui
index 8ff674275..b812d8a4f 100644
--- a/src/blackgui/editors/matchingform.ui
+++ b/src/blackgui/editors/matchingform.ui
@@ -6,8 +6,8 @@
0
0
- 315
- 664
+ 378
+ 696
@@ -272,69 +272,14 @@
3
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
+
-
+
- livery
-
-
-
- -
-
-
- inbound civilian force matched civilian
-
-
- force civilian
-
-
-
- -
-
-
- family
-
-
-
- -
-
-
- combined code
-
-
-
- -
-
-
- Vertical Takeoff or Landing
-
-
- VTOL (helicopters and such)
-
-
-
- -
-
-
- model string
-
-
-
- -
-
-
- inbound military force matched military
-
-
- force military
+ no airline group
+
+ bg_AirlineGroup
+
-
@@ -357,14 +302,59 @@
- -
-
+
-
+
- no airline group
+ family
+
+
+
+ -
+
+
+ livery
+
+
+
+ -
+
+
+ inbound civilian try to match civilian
+
+
+ civilian
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Vertical Takeoff or Landing
+
+
+ VTOL (helicopters and such)
+
+
+
+ -
+
+
+ model string
+
+
+
+ -
+
+
+ combined code
-
- bg_AirlineGroup
-
-
@@ -377,6 +367,16 @@
+ -
+
+
+ inbound military try to find military
+
+
+ military
+
+
+
-
@@ -589,8 +589,8 @@
cb_ByFamily
cb_ByCombinedCode
cb_ByVtol
- cb_ByForceMilitary
- cb_ByForceCivilian
+ cb_ByMilitary
+ cb_ByCivilian
cb_CategoryGlider
cb_CategoryMilitaryAircraft
cb_CategorySmallAircraft
diff --git a/src/blackmisc/simulation/aircraftmatchersetup.cpp b/src/blackmisc/simulation/aircraftmatchersetup.cpp
index 37fd3330b..847c24084 100644
--- a/src/blackmisc/simulation/aircraftmatchersetup.cpp
+++ b/src/blackmisc/simulation/aircraftmatchersetup.cpp
@@ -196,8 +196,8 @@ namespace BlackMisc
static const QString icaoAircraft("by ICAO aircraft first");
static const QString icaoAirline("by ICAO airline first");
static const QString family("by family");
- static const QString forceMil("force military");
- static const QString forceCiv("force civilian");
+ static const QString military("by military");
+ static const QString civilian("by civilian");
static const QString vtol("VTOL");
static const QString livery("by livery");
static const QString combined("by combined code");
@@ -228,8 +228,8 @@ namespace BlackMisc
case ByCombinedType: return combined;
case ByIcaoOrderAircraftFirst: return icaoAircraft;
case ByIcaoOrderAirlineFirst: return icaoAirline;
- case ByForceCivilian: return forceCiv;
- case ByForceMilitary: return forceMil;
+ case ByCivilian: return civilian;
+ case ByMilitary: return military;
case ByVtol: return vtol;
case ByCategoryGlider: return categoryGlider;
case ByCategoryMilitary: return categoryMilitary;
@@ -263,8 +263,8 @@ namespace BlackMisc
if (mode.testFlag(ByFamily)) { modes << modeFlagToString(ByFamily); }
if (mode.testFlag(ByLivery)) { modes << modeFlagToString(ByLivery); }
if (mode.testFlag(ByCombinedType)) { modes << modeFlagToString(ByCombinedType); }
- if (mode.testFlag(ByForceCivilian)) { modes << modeFlagToString(ByForceCivilian); }
- if (mode.testFlag(ByForceMilitary)) { modes << modeFlagToString(ByForceMilitary); }
+ if (mode.testFlag(ByCivilian)) { modes << modeFlagToString(ByCivilian); }
+ if (mode.testFlag(ByMilitary)) { modes << modeFlagToString(ByMilitary); }
if (mode.testFlag(ByCategoryGlider)) { modes << modeFlagToString(ByCategoryGlider); }
if (mode.testFlag(ByCategoryMilitary)) { modes << modeFlagToString(ByCategoryMilitary); }
if (mode.testFlag(ByCategorySmallAircraft)) { modes << modeFlagToString(ByCategorySmallAircraft); }
@@ -301,8 +301,8 @@ namespace BlackMisc
CAircraftMatcherSetup::MatchingMode CAircraftMatcherSetup::matchingMode(
bool revModelString, bool revLiveryIds,
bool byModelString, bool byIcaoDataAircraft1st, bool byIcaoDataAirline1st, bool byFamily, bool byLivery, bool byCombinedType,
- bool byForceMilitary, bool byForceCivilian, bool byVtol,
- bool byGliderCategory, bool byMilitaryCategory, bool bySmallAircraftCategory,
+ bool byMilitary, bool byCivilian, bool byVtol,
+ bool byGliderCategory, bool byMilitaryCategory, bool bySmallAircraftCategory,
bool scoreIgnoreZeros, bool scorePreferColorLiveries,
bool excludeNoDbData, bool excludeNoExcluded,
bool modelVerification, bool modelVerificationWarnError,
@@ -316,8 +316,8 @@ namespace BlackMisc
if (byFamily) { mode |= ByFamily; }
if (byLivery) { mode |= ByLivery; }
if (byCombinedType) { mode |= ByCombinedType; }
- if (byForceMilitary) { mode |= ByForceMilitary; }
- if (byForceCivilian) { mode |= ByForceCivilian; }
+ if (byMilitary) { mode |= ByMilitary; }
+ if (byCivilian) { mode |= ByCivilian; }
if (byVtol) { mode |= ByVtol; }
if (byGliderCategory) { mode |= ByCategoryGlider; }
if (byMilitaryCategory) { mode |= ByCategoryMilitary; }
diff --git a/src/blackmisc/simulation/aircraftmatchersetup.h b/src/blackmisc/simulation/aircraftmatchersetup.h
index 36d3b5857..8b68f37bf 100644
--- a/src/blackmisc/simulation/aircraftmatchersetup.h
+++ b/src/blackmisc/simulation/aircraftmatchersetup.h
@@ -39,9 +39,9 @@ namespace BlackMisc
ByLivery = 1 << 3,
ByCombinedType = 1 << 4,
ByManufacturer = 1 << 5,
- ByForceMilitary = 1 << 6, //!< military (in) will only search in military
- ByForceCivilian = 1 << 7, //!< civilian (in) will only search in civilian
- ByMilitary = ByForceCivilian | ByForceMilitary,
+ ByMilitary = 1 << 6, //!< military (in) will only search in military
+ ByCivilian = 1 << 7, //!< civilian (in) will only search in civilian
+ ByMilOrCivilian = ByCivilian | ByMilitary,
ByVtol = 1 << 8,
ByIcaoOrderAircraftFirst = (1 << 9) | ByIcaoData,
ByIcaoOrderAirlineFirst = (1 << 10) | ByIcaoData,
@@ -75,7 +75,7 @@ namespace BlackMisc
// --- others ---
ModeNone = 0,
- ModeByFLags = ByMilitary | ByVtol,
+ ModeByFLags = ByMilOrCivilian | ByVtol,
// default mode for set handling
ModeDefaultSet = ModelSetRemoveFailedModel | ModelVerificationAtStartup | ModelFailoverIfNoModelCanBeAdded,