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

refs #640, support for simulator in distributor

Browse Source 
* changed backend (JSON) and added support for simulator data
* get distributors by simulator
* renamed to setSimulator / getSimulator
This commit is contained in:
Klaus Basan
2016-04-17 19:08:44 +02:00
parent b78308b059
commit 5d39c906e4
17 changed files with 125 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/editors/modelmappingform.cpp
View File

@@ -37,7 +37,7 @@ namespace BlackGui
BlackMisc::Simulation::CAircraftModel CModelMappingForm::getValue() const
{
CAircraftModel model(m_originalModel);
model.setSimulatorInfo(this->ui->selector_Simulator->getValue());
model.setSimulator(this->ui->selector_Simulator->getValue());
model.setDescription(this->ui->le_Description->text());
model.setModelString(this->ui->le_ModelKey->text());
model.setName(this->ui->le_Name->text());
@@ -73,7 +73,7 @@ namespace BlackGui
ui->le_Description->setText(model.getDescription());
ui->le_Name->setText(model.getName());
ui->selector_ModelMode->setValue(model.getModelMode());
ui->selector_Simulator->setValue(model.getSimulatorInfo());
ui->selector_Simulator->setValue(model.getSimulator());
m_originalModel = model;
}

2
src/blackgui/editors/modelmappingmodifyform.cpp
View File

@@ -69,7 +69,7 @@ namespace BlackGui
{
this->ui->le_Description->setText(model.getDescription());
this->ui->le_Name->setText(model.getName());
this->ui->frp_SimulatorSelector->setValue(model.getSimulatorInfo());
this->ui->frp_SimulatorSelector->setValue(model.getSimulator());
this->ui->frp_IncludeSelector->setValue(model);
}

2
src/blackgui/models/aircraftmodelfilter.cpp
View File

@@ -40,7 +40,7 @@ namespace BlackGui
{
if (!m_simulatorInfo.isAllSimulators())
{
if (!this->m_simulatorInfo.matchesAny(model.getSimulatorInfo())) { continue; }
if (!this->m_simulatorInfo.matchesAny(model.getSimulator())) { continue; }
}
if (!this->m_modelKey.isEmpty())

1
src/blackgui/models/distributorlistmodel.cpp
View File

@@ -43,6 +43,7 @@ namespace BlackGui
this->m_columns.addColumn(CColumn::standardString("description", CDistributor::IndexDescription));
this->m_columns.addColumn(CColumn::standardString("alias1", CDistributor::IndexAlias1));
this->m_columns.addColumn(CColumn::standardString("alias2", CDistributor::IndexAlias2));
this->m_columns.addColumn(CColumn::standardString("sim.", "simulator", { CDistributor::IndexSimulator, CSimulatorInfo::IndexString}));
this->m_columns.addColumn(CColumn::standardString("changed", CDistributor::IndexUtcTimestampFormattedYmdhms));
// default sort order