flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-15 09:15:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #506, applied recommended changes for 506 to other filters

Browse Source 
https://dev.vatsim-germany.org/issues/506#note-5
This commit is contained in:
Klaus Basan
2016-12-26 18:24:42 +01:00
committed by Mathew Sutcliffe
parent b3c7be8765
commit 59eb0247a7
7 changed files with 44 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/blackgui/filters/aircrafticaofilterbar.cpp
View File

@@ -50,13 +50,12 @@ namespace BlackGui
std::unique_ptr<BlackGui::Models::IModelFilter<CAircraftIcaoCodeList> > CAircraftIcaoFilterBar::createModelFilter() const
{
return std::unique_ptr<CAircraftIcaoFilter>(
new CAircraftIcaoFilter(
ui->le_Designator->text(),
ui->le_Manufacturer->text(),
ui->le_Description->text(),
ui->combinedType_Selector->getCombinedType()
));
return std::make_unique<CAircraftIcaoFilter>(
ui->le_Designator->text(),
ui->le_Manufacturer->text(),
ui->le_Description->text(),
ui->combinedType_Selector->getCombinedType()
);
}
void CAircraftIcaoFilterBar::filter(const CAircraftIcaoCode &icao)

33
src/blackgui/filters/aircraftmodelfilterbar.cpp
View File

@@ -99,23 +99,22 @@ namespace BlackGui
dbf = BlackMisc::Db::Invalid;
}
return std::unique_ptr<CAircraftModelFilter>(
new CAircraftModelFilter(
ui->le_ModelString->text(),
ui->le_ModelDescription->text(),
mf,
dbf,
ui->cbt_Military->checkState(),
ui->cbt_ColorLiveries->checkState(),
ui->le_AircraftIcao->text(),
ui->le_AircraftManufacturer->text(),
ui->le_AirlineIcao->text(),
ui->le_AirlineName->text(),
ui->le_LiveryCode->text(),
ui->le_FileName->text(),
ui->frp_SimulatorSelector->getValue(),
ui->comp_DistributorSelector->getDistributor()
));
return std::make_unique<CAircraftModelFilter>(
ui->le_ModelString->text(),
ui->le_ModelDescription->text(),
mf,
dbf,
ui->cbt_Military->checkState(),
ui->cbt_ColorLiveries->checkState(),
ui->le_AircraftIcao->text(),
ui->le_AircraftManufacturer->text(),
ui->le_AirlineIcao->text(),
ui->le_AirlineName->text(),
ui->le_LiveryCode->text(),
ui->le_FileName->text(),
ui->frp_SimulatorSelector->getValue(),
ui->comp_DistributorSelector->getDistributor()
);
}
void CAircraftModelFilterBar::onRowCountChanged(int count, bool withFilter)

15
src/blackgui/filters/airlineicaofilterbar.cpp
View File

@@ -50,14 +50,13 @@ namespace BlackGui
std::unique_ptr<BlackGui::Models::IModelFilter<CAirlineIcaoCodeList> > CAirlineIcaoFilterBar::createModelFilter() const
{
return std::unique_ptr<CAirlineIcaoFilter>(
new CAirlineIcaoFilter(
ui->le_Designator->text().trimmed(),
ui->le_Name->text().trimmed(),
ui->country_Selector->isSet() ? ui->country_Selector->getCountry().getIsoCode() : "",
ui->cb_RealAirline->isChecked(),
ui->cb_VirtualAirline->isChecked()
));
return std::make_unique<CAirlineIcaoFilter>(
ui->le_Designator->text().trimmed(),
ui->le_Name->text().trimmed(),
ui->country_Selector->isSet() ? ui->country_Selector->getCountry().getIsoCode() : "",
ui->cb_RealAirline->isChecked(),
ui->cb_VirtualAirline->isChecked()
);
}
void CAirlineIcaoFilterBar::filter(const CAirlineIcaoCode &icao)

9
src/blackgui/filters/countryfilterbar.cpp
View File

@@ -46,11 +46,10 @@ namespace BlackGui
std::unique_ptr<BlackGui::Models::IModelFilter<CCountryList> > CCountryFilterBar::createModelFilter() const
{
return std::unique_ptr<CCountryFilter>(
new CCountryFilter(
ui->le_IsoCode->text(),
ui->le_Name->text()
));
return std::make_unique<CCountryFilter>(
ui->le_IsoCode->text(),
ui->le_Name->text()
);
}
void CCountryFilterBar::onRowCountChanged(int count, bool withFilter)

21
src/blackgui/filters/liveryfilterbar.cpp
View File

@@ -59,17 +59,16 @@ namespace BlackGui
std::unique_ptr<BlackGui::Models::IModelFilter<CLiveryList> > CLiveryFilterBar::createModelFilter() const
{
double maxColorDistance = ui->hs_ColorDistance->value() / 100.0;
return std::unique_ptr<CLiveryFilter>(
new CLiveryFilter(
ui->le_LiveryCode->text(),
ui->le_Description->text(),
ui->le_AirlineIcaoCode->text(),
ui->color_Fuselage->getColor(),
ui->color_Tail->getColor(),
maxColorDistance,
ui->cb_Colors->isChecked(),
ui->cb_Airlines->isChecked()
));
return std::make_unique<CLiveryFilter>(
ui->le_LiveryCode->text(),
ui->le_Description->text(),
ui->le_AirlineIcaoCode->text(),
ui->color_Fuselage->getColor(),
ui->color_Tail->getColor(),
maxColorDistance,
ui->cb_Colors->isChecked(),
ui->cb_Airlines->isChecked()
);
}
void CLiveryFilterBar::filter(const CLivery &livery)

2
src/blackgui/models/airlineicaofilter.cpp
View File

@@ -29,7 +29,6 @@ namespace BlackGui
{
if (!this->isValid()) { return inContainer; }
CAirlineIcaoCodeList outContainer;
bool end = false;
for (const CAirlineIcaoCode &icao : inContainer)
{
if (!m_vDesignator.isEmpty())
@@ -58,7 +57,6 @@ namespace BlackGui
}
outContainer.push_back(icao);
if (end) { break; }
}
return outContainer;
}

2
src/blackgui/models/countryfilter.cpp
View File

@@ -32,7 +32,7 @@ namespace BlackGui
if (!m_isoCode.isEmpty())
{
if (country.getIsoCode() != m_isoCode) { continue; }
end = true; // there should me only one designator
end = true; // there should be only one designator
}
if (!this->m_name.isEmpty())