mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-29 04:35:41 +08:00
Fixed "synchronized" typos
This commit is contained in:
@@ -583,7 +583,7 @@ namespace BlackCore
|
|||||||
for (CAtcStation &bookedStation : newBookedStations)
|
for (CAtcStation &bookedStation : newBookedStations)
|
||||||
{
|
{
|
||||||
// exchange booking and online data, both sides are updated
|
// exchange booking and online data, both sides are updated
|
||||||
this->m_atcStationsOnline.syncronizeWithBookedStation(bookedStation);
|
this->m_atcStationsOnline.synchronizeWithBookedStation(bookedStation);
|
||||||
}
|
}
|
||||||
this->m_atcStationsBooked = newBookedStations;
|
this->m_atcStationsBooked = newBookedStations;
|
||||||
}
|
}
|
||||||
@@ -657,7 +657,7 @@ namespace BlackCore
|
|||||||
if (this->m_atcStationsBooked.containsCallsign(callsign))
|
if (this->m_atcStationsBooked.containsCallsign(callsign))
|
||||||
{
|
{
|
||||||
CAtcStation bookedStation(this->m_atcStationsBooked.findFirstByCallsign(callsign));
|
CAtcStation bookedStation(this->m_atcStationsBooked.findFirstByCallsign(callsign));
|
||||||
station.syncronizeWithBookedStation(bookedStation); // both will be aligned
|
station.synchronizeWithBookedStation(bookedStation); // both will be aligned
|
||||||
this->m_atcStationsBooked.replaceIf(&CAtcStation::getCallsign, callsign, bookedStation);
|
this->m_atcStationsBooked.replaceIf(&CAtcStation::getCallsign, callsign, bookedStation);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ namespace BlackCore
|
|||||||
//! Delete all cookies from cookier manager
|
//! Delete all cookies from cookier manager
|
||||||
void deleteAllCookies();
|
void deleteAllCookies();
|
||||||
|
|
||||||
//! Setup already syncronized
|
//! Setup already synchronized
|
||||||
bool isSetupAvailable() const;
|
bool isSetupAvailable() const;
|
||||||
|
|
||||||
//! Reload setup and version
|
//! Reload setup and version
|
||||||
@@ -358,7 +358,7 @@ namespace BlackCore
|
|||||||
void webDataServicesStarted(bool success);
|
void webDataServicesStarted(bool success);
|
||||||
|
|
||||||
protected slots:
|
protected slots:
|
||||||
//! Setup read/syncronized
|
//! Setup read/synchronized
|
||||||
void ps_setupAvailable(bool available);
|
void ps_setupAvailable(bool available);
|
||||||
|
|
||||||
//! Startup completed
|
//! Startup completed
|
||||||
|
|||||||
@@ -359,7 +359,7 @@ namespace BlackCore
|
|||||||
models = CAircraftModelList::fromDatabaseJson(res);
|
models = CAircraftModelList::fromDatabaseJson(res);
|
||||||
}
|
}
|
||||||
|
|
||||||
// syncronized update
|
// synchronized update
|
||||||
const int n = models.size();
|
const int n = models.size();
|
||||||
qint64 latestTimestamp = models.latestTimestampMsecsSinceEpoch();
|
qint64 latestTimestamp = models.latestTimestampMsecsSinceEpoch();
|
||||||
if (n > 0 && latestTimestamp < 0)
|
if (n > 0 && latestTimestamp < 0)
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ namespace BlackCore
|
|||||||
if (!sApp) { return; } // shutting down
|
if (!sApp) { return; } // shutting down
|
||||||
|
|
||||||
Q_ASSERT_X(QSslSocket::supportsSsl(), Q_FUNC_INFO, "missing SSL support");
|
Q_ASSERT_X(QSslSocket::supportsSsl(), Q_FUNC_INFO, "missing SSL support");
|
||||||
Q_ASSERT_X(sApp->isSetupAvailable(), Q_FUNC_INFO, "Setup not syncronized");
|
Q_ASSERT_X(sApp->isSetupAvailable(), Q_FUNC_INFO, "Setup not synchronized");
|
||||||
this->setObjectName("CWebDataReader");
|
this->setObjectName("CWebDataReader");
|
||||||
|
|
||||||
// check if I need info objects
|
// check if I need info objects
|
||||||
|
|||||||
@@ -193,7 +193,7 @@ namespace BlackGui
|
|||||||
this->m_modelLoader->gracefulShutdown();
|
this->m_modelLoader->gracefulShutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
// create loader, also syncronizes the caches
|
// create loader, also synchronizes the caches
|
||||||
this->m_modelLoader = IAircraftModelLoader::createModelLoader(simulator); // last selected simulator or explicit given
|
this->m_modelLoader = IAircraftModelLoader::createModelLoader(simulator); // last selected simulator or explicit given
|
||||||
if (!this->m_modelLoader || !this->m_modelLoader->supportsSimulator(simulator))
|
if (!this->m_modelLoader || !this->m_modelLoader->supportsSimulator(simulator))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -190,7 +190,7 @@ namespace BlackMisc
|
|||||||
this->m_frequency.setUnit(CFrequencyUnit::MHz());
|
this->m_frequency.setUnit(CFrequencyUnit::MHz());
|
||||||
}
|
}
|
||||||
|
|
||||||
void CAtcStation::syncronizeControllerData(CAtcStation &otherStation)
|
void CAtcStation::synchronizeControllerData(CAtcStation &otherStation)
|
||||||
{
|
{
|
||||||
if (this->m_controller == otherStation.getController()) { return; }
|
if (this->m_controller == otherStation.getController()) { return; }
|
||||||
CUser otherController = otherStation.getController();
|
CUser otherController = otherStation.getController();
|
||||||
@@ -198,7 +198,7 @@ namespace BlackMisc
|
|||||||
otherStation.setController(otherController);
|
otherStation.setController(otherController);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CAtcStation::syncronizeWithBookedStation(CAtcStation &bookedStation)
|
void CAtcStation::synchronizeWithBookedStation(CAtcStation &bookedStation)
|
||||||
{
|
{
|
||||||
if (bookedStation.getCallsign() != this->getCallsign()) { return; }
|
if (bookedStation.getCallsign() != this->getCallsign()) { return; }
|
||||||
|
|
||||||
@@ -261,7 +261,7 @@ namespace BlackMisc
|
|||||||
}
|
}
|
||||||
|
|
||||||
// both ways
|
// both ways
|
||||||
this->syncronizeControllerData(bookedStation);
|
this->synchronizeControllerData(bookedStation);
|
||||||
if (this->hasValidRelativeDistance())
|
if (this->hasValidRelativeDistance())
|
||||||
{
|
{
|
||||||
bookedStation.setRelativeDistance(this->getRelativeDistance());
|
bookedStation.setRelativeDistance(this->getRelativeDistance());
|
||||||
|
|||||||
@@ -143,14 +143,14 @@ namespace BlackMisc
|
|||||||
//! Set position
|
//! Set position
|
||||||
void setPosition(const BlackMisc::Geo::CCoordinateGeodetic &position) { this->m_position = position; }
|
void setPosition(const BlackMisc::Geo::CCoordinateGeodetic &position) { this->m_position = position; }
|
||||||
|
|
||||||
//! Syncronize controller data
|
//! Synchronize controller data
|
||||||
//! Updates two stations (normally a booked and online ATC station) with complementary data
|
//! Updates two stations (normally a booked and online ATC station) with complementary data
|
||||||
void syncronizeControllerData(CAtcStation &otherStation);
|
void synchronizeControllerData(CAtcStation &otherStation);
|
||||||
|
|
||||||
//! Syncronize station data
|
//! Synchronize station data
|
||||||
//! Updates the two stations (a booked and online ATC station) with complementary data
|
//! Updates the two stations (a booked and online ATC station) with complementary data
|
||||||
//! \pre this object is the online station, the passed station the booked station
|
//! \pre this object is the online station, the passed station the booked station
|
||||||
void syncronizeWithBookedStation(CAtcStation &bookedStation);
|
void synchronizeWithBookedStation(CAtcStation &bookedStation);
|
||||||
|
|
||||||
//! Get the radius of the controller's area of visibility.
|
//! Get the radius of the controller's area of visibility.
|
||||||
const BlackMisc::PhysicalQuantities::CLength &getRange() const { return m_range; }
|
const BlackMisc::PhysicalQuantities::CLength &getRange() const { return m_range; }
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ namespace BlackMisc
|
|||||||
return this->findBy(Predicates::MemberValid(&CAtcStation::getController)).transform(Predicates::MemberTransform(&CAtcStation::getController));
|
return this->findBy(Predicates::MemberValid(&CAtcStation::getController)).transform(Predicates::MemberTransform(&CAtcStation::getController));
|
||||||
}
|
}
|
||||||
|
|
||||||
int CAtcStationList::syncronizeWithBookedStation(CAtcStation &bookedAtcStation)
|
int CAtcStationList::synchronizeWithBookedStation(CAtcStation &bookedAtcStation)
|
||||||
{
|
{
|
||||||
int c = 0;
|
int c = 0;
|
||||||
bookedAtcStation.setOnline(false); // reset
|
bookedAtcStation.setOnline(false); // reset
|
||||||
@@ -66,7 +66,7 @@ namespace BlackMisc
|
|||||||
for (auto i = this->begin(); i != this->end(); ++i)
|
for (auto i = this->begin(); i != this->end(); ++i)
|
||||||
{
|
{
|
||||||
if (i->getCallsign() != bookedAtcStation.getCallsign()) { continue; }
|
if (i->getCallsign() != bookedAtcStation.getCallsign()) { continue; }
|
||||||
i->syncronizeWithBookedStation(bookedAtcStation);
|
i->synchronizeWithBookedStation(bookedAtcStation);
|
||||||
c++;
|
c++;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -59,10 +59,10 @@ namespace BlackMisc
|
|||||||
//! All controllers (with valid data)
|
//! All controllers (with valid data)
|
||||||
BlackMisc::Network::CUserList getControllers() const;
|
BlackMisc::Network::CUserList getControllers() const;
|
||||||
|
|
||||||
//! Syncronize with ATC station representing booking information.
|
//! Synchronize with ATC station representing booking information.
|
||||||
//! Both sides (booking, online station) will be updated.
|
//! Both sides (booking, online station) will be updated.
|
||||||
//! \pre Can be used only if the stored data in this list are online ATC stations
|
//! \pre Can be used only if the stored data in this list are online ATC stations
|
||||||
int syncronizeWithBookedStation(CAtcStation &bookedAtcStation);
|
int synchronizeWithBookedStation(CAtcStation &bookedAtcStation);
|
||||||
};
|
};
|
||||||
|
|
||||||
} //namespace
|
} //namespace
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ namespace BlackMisc
|
|||||||
virtual void updateModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) override { this->replaceOrAddCachedModels(models, simulator); }
|
virtual void updateModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) override { this->replaceOrAddCachedModels(models, simulator); }
|
||||||
//! @}
|
//! @}
|
||||||
|
|
||||||
//! Create a loader and syncronize caches
|
//! Create a loader and synchronize caches
|
||||||
static std::unique_ptr<IAircraftModelLoader> createModelLoader(const BlackMisc::Simulation::CSimulatorInfo &simulator);
|
static std::unique_ptr<IAircraftModelLoader> createModelLoader(const BlackMisc::Simulation::CSimulatorInfo &simulator);
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
|
|||||||
@@ -429,7 +429,7 @@ namespace BlackMisc
|
|||||||
bool m_partsSynchronized = false; //!< synchronize parts
|
bool m_partsSynchronized = false; //!< synchronize parts
|
||||||
bool m_fastPositionUpdates = false; //!< use fast position updates
|
bool m_fastPositionUpdates = false; //!< use fast position updates
|
||||||
|
|
||||||
//! Init, which syncronizes some denormalized values
|
//! Init, which synchronizes some denormalized values
|
||||||
void init();
|
void init();
|
||||||
|
|
||||||
BLACK_METACLASS(
|
BLACK_METACLASS(
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ namespace BlackMisc
|
|||||||
return this->findBy(&CSimulatedAircraft::isVtol, vtol);
|
return this->findBy(&CSimulatedAircraft::isVtol, vtol);
|
||||||
}
|
}
|
||||||
|
|
||||||
CCallsignSet CSimulatedAircraftList::getCallsignsWithSyncronizedParts() const
|
CCallsignSet CSimulatedAircraftList::getCallsignsWithSynchronizedParts() const
|
||||||
{
|
{
|
||||||
CCallsignSet csl;
|
CCallsignSet csl;
|
||||||
for (const CSimulatedAircraft &aircraft : (*this))
|
for (const CSimulatedAircraft &aircraft : (*this))
|
||||||
|
|||||||
@@ -68,7 +68,7 @@ namespace BlackMisc
|
|||||||
CSimulatedAircraftList findByVtol(bool vtol) const;
|
CSimulatedAircraftList findByVtol(bool vtol) const;
|
||||||
|
|
||||||
//! Callsigns of aircraft with synchronized parts
|
//! Callsigns of aircraft with synchronized parts
|
||||||
BlackMisc::Aviation::CCallsignSet getCallsignsWithSyncronizedParts() const;
|
BlackMisc::Aviation::CCallsignSet getCallsignsWithSynchronizedParts() const;
|
||||||
|
|
||||||
//! Update aircraft with data from VATSIM data file
|
//! Update aircraft with data from VATSIM data file
|
||||||
//! \remarks The list used ("this") needs to contain the VATSIM data file objects
|
//! \remarks The list used ("this") needs to contain the VATSIM data file objects
|
||||||
|
|||||||
Reference in New Issue
Block a user