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

refs #533, fix callsign validation and split into functions for ATC/aircraft

Browse Source
This commit is contained in:
Klaus Basan
2015-12-08 06:50:07 +01:00
parent 6ac1808d25
commit f9c160d625
7 changed files with 60 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/flightplancomponent.cpp
View File

@@ -73,7 +73,7 @@ namespace BlackGui
void CFlightPlanComponent::prefillWithAircraftData(const BlackMisc::Simulation::CSimulatedAircraft &ownAircraft)
{
// only override with valid values
if (CCallsign::isValidCallsign(ownAircraft.getCallsignAsString()))
if (CCallsign::isValidAircraftCallsign(ownAircraft.getCallsignAsString()))
{
this->ui->le_Callsign->setText(ownAircraft.getCallsign().asString());
}

4
src/blackgui/components/logincomponent.cpp
View File

@@ -423,7 +423,7 @@ namespace BlackGui
bool validIcaoDesignator = CAircraftIcaoCode::isValidDesignator(values.ownAircraftIcaoTypeDesignator);
this->ui->lblp_AircraftIcaoDesignator->setTicked(validIcaoDesignator);
bool validCallsign = CCallsign::isValidCallsign(values.ownCallsign);
bool validCallsign = CCallsign::isValidAircraftCallsign(values.ownCallsign);
this->ui->lblp_Callsign->setTicked(validCallsign);
bool validSimulatorModel = !values.ownAircraftSimulatorModel.isEmpty();
@@ -486,7 +486,7 @@ namespace BlackGui
}
else
{
CLogMessage(this).validationWarning("Reverse lookup for %1 failed") << model.getModelString();
CLogMessage(this).validationInfo("Reverse lookup for %1 failed, set data manually") << model.getModelString();
}
}

2
src/blackgui/components/mappingcomponent.cpp
View File

@@ -211,7 +211,7 @@ namespace BlackGui
{
Q_ASSERT(getIContextSimulator());
QString cs = ui->le_Callsign->text().trimmed();
if (!CCallsign::isValidCallsign(cs))
if (!CCallsign::isValidAircraftCallsign(cs))
{
CLogMessage(this).validationError("Invalid callsign for mapping");
return;