flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 11:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add in simulator info returns delta

Browse Source
This commit is contained in:
Klaus Basan
2018-11-27 02:29:14 +01:00
parent 2ad293fbad
commit 9c46cab133
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackmisc/simulation/simulatorinfo.cpp
View File

@@ -181,10 +181,15 @@ namespace BlackMisc
return CValueObject::toIcon(); return CValueObject::toIcon();
} }
void CSimulatorInfo::add(const CSimulatorInfo &other) CSimulatorInfo CSimulatorInfo::add(const CSimulatorInfo &other)
{ {
if (other.isUnspecified()) { return; } // anything to add?
if (other.isUnspecified()) { return None; }
if (this->matchesAll(other)) { return None; }
this->setSimulator(this->getSimulator() | other.getSimulator()); this->setSimulator(this->getSimulator() | other.getSimulator());
const CSimulatorInfo delta(this->getSimulator() & other.getSimulator());
return delta;
} }
QSet<CSimulatorInfo> CSimulatorInfo::asSingleSimulatorSet() const QSet<CSimulatorInfo> CSimulatorInfo::asSingleSimulatorSet() const

2
src/blackmisc/simulation/simulatorinfo.h
View File

@@ -157,7 +157,7 @@ namespace BlackMisc
CIcon toIcon() const; CIcon toIcon() const;
//! Add simulator //! Add simulator
void add(const CSimulatorInfo &other); CSimulatorInfo add(const CSimulatorInfo &other);
//! As a set of single simulator info objects //! As a set of single simulator info objects
QSet<CSimulatorInfo> asSingleSimulatorSet() const; QSet<CSimulatorInfo> asSingleSimulatorSet() const;