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

refs #707, adjusted matcher GUI (added callsign)

Browse Source
This commit is contained in:
Klaus Basan
2016-07-13 19:26:45 +02:00
parent 44faccb568
commit 83ff4cb3cf
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackgui/components/modelmatchercomponent.cpp
View File

@@ -65,6 +65,7 @@ namespace BlackGui
const CUpperCaseValidator *validator = new CUpperCaseValidator(this);
ui->le_ModelString->setValidator(validator);
ui->le_Manufacturer->setValidator(validator);
ui->le_Callsign->setValidator(validator);
connect(ui->comp_SimulatorSelector, &CSimulatorSelector::changed, this, &CModelMatcherComponent::ps_simulatorChanged);
connect(ui->pb_ModelMatching, &QPushButton::pressed, this, &CModelMatcherComponent::ps_testModelMatching);
@@ -158,21 +159,18 @@ namespace BlackGui
const QString combined(ui->comp_CombinedCode->getCombinedType());
const QString manufacturer(ui->le_Manufacturer->text().trimmed().toUpper());
const QString liveryCombinedCode(ui->comp_LiverySelector->getRawCombinedCode());
static const CCallsign cs("SWIFT");
const CCallsign cs(ui->le_Callsign->text());
static const CUser pilot("123456", "swift Test", cs);
CAircraftIcaoCode icao(aircraft, combined);
icao.setManufacturer(manufacturer);
const CAirlineIcaoCode al(airline);
const CLivery l(liveryCombinedCode.isEmpty() ? CLivery::getStandardCode(al) : liveryCombinedCode,
al,
"Standard");
const CAirlineIcaoCode airlineIcao(airline);
const CLivery livery(liveryCombinedCode, airlineIcao, "");
CAircraftModel m(modelString, CAircraftModel::TypeFSInnData);
m.setLivery(l);
m.setLivery(livery);
m.setCallsign(cs);
m.setModelType(CAircraftModel::TypeFSInnData);
m.setModelType(modelString.isEmpty() ? CAircraftModel::TypeQueriedFromNetwork : CAircraftModel::TypeFSInnData);
CSimulatedAircraft sa(m);
sa.setPilot(pilot);
sa.setAircraftIcaoCode(icao);

10
src/blackgui/components/modelmatchercomponent.ui
View File

@@ -257,6 +257,16 @@
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QLabel" name="lbl_Callsign">
<property name="text">
<string>Callsign:</string>
</property>
</widget>
</item>
<item row="4" column="3">
<widget class="QLineEdit" name="le_Callsign"/>
</item>
</layout>
</widget>
<customwidgets>