mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-02 15:15:50 +08:00
Distributor filter improvements
* if all or none simulator is selected do not filter * also select if there is no (NULL) simulator
This commit is contained in:
committed by
Mat Sutcliffe
parent
00b2034b2d
commit
1642502aae
@@ -24,14 +24,21 @@ namespace BlackGui
|
||||
|
||||
CDistributorList CDistributorFilter::filter(const CDistributorList &inDistributors) const
|
||||
{
|
||||
if (!this->isValid()) { return inDistributors; }
|
||||
if (!this->isValid()) { return inDistributors; }
|
||||
if (this->ignoreSimulator()) { return inDistributors; }
|
||||
|
||||
CDistributorList outContainer;
|
||||
for (const CDistributor &distributor : inDistributors)
|
||||
{
|
||||
if (!distributor.getSimulator().matchesAny(m_simulator)) { continue; }
|
||||
if (!distributor.getSimulator().matchesAnyOrNone(m_simulator)) { continue; }
|
||||
outContainer.push_back(distributor);
|
||||
}
|
||||
return outContainer;
|
||||
}
|
||||
|
||||
bool CDistributorFilter::ignoreSimulator() const
|
||||
{
|
||||
return (m_simulator.isNoSimulator() || m_simulator.isAllSimulators());
|
||||
}
|
||||
} // namespace
|
||||
} // namespace
|
||||
|
||||
@@ -33,6 +33,9 @@ namespace BlackGui
|
||||
virtual BlackMisc::Simulation::CDistributorList filter(const BlackMisc::Simulation::CDistributorList &inDistributors) const override;
|
||||
|
||||
private:
|
||||
//! Ignore simulator filtering?
|
||||
bool ignoreSimulator() const;
|
||||
|
||||
BlackMisc::Simulation::CSimulatorInfo m_simulator;
|
||||
};
|
||||
} // namespace
|
||||
|
||||
Reference in New Issue
Block a user