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

refs #535, updated aircraft model / view

Browse Source 
* add functions to apply changes to selected objects
* allow to highlight models by their model strings
* Utility function to show which parts come from DB
* model strings can be obtained sorted/unsorted
This commit is contained in:
Klaus Basan
2015-12-13 19:40:04 +01:00
parent ecb4694c7f
commit 1601ca62fd
10 changed files with 156 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -302,7 +302,7 @@ namespace BlackGui
this->ui->tvp_AircraftModels->updateContainer(ml);
// model completer
this->m_modelCompleter->setModel(new QStringListModel(ml.getSortedModelStrings(), this->m_modelCompleter));
this->m_modelCompleter->setModel(new QStringListModel(ml.getModelStrings(), this->m_modelCompleter));
this->m_modelCompleter->setModelSorting(QCompleter::CaseInsensitivelySortedModel);
this->m_modelCompleter->setCaseSensitivity(Qt::CaseInsensitive);
this->m_modelCompleter->setWrapAround(true);

56
src/blackgui/models/aircraftmodellistmodel.cpp
View File

@@ -42,20 +42,25 @@ namespace BlackGui
case OwnSimulatorModel:
case StashModel:
this->m_columns.addColumn(CColumn::standardString("model", { CAircraftModel::IndexModelString}));
this->m_columns.addColumn(CColumn::standardString("DB", "parts from DB", { CAircraftModel::IndexPartsDbStatus}));
this->m_columns.addColumn(CColumn::standardString("description", { CAircraftModel::IndexDescription}));
this->m_columns.addColumn(CColumn::standardString("name", { CAircraftModel::IndexName}));
this->m_columns.addColumn(CColumn::standardString("filename", { CAircraftModel::IndexFileName}));
this->m_columns.addColumn(CColumn::standardString("sim.", "simulator supported", CAircraftModel::IndexSimulatorInfoAsString));
this->m_columns.addColumn(CColumn::standardString("dist.", "distributor", { CAircraftModel::IndexDistributor, CDistributor::IndexDbStringKey}));
this->m_columns.addColumn(CColumn::standardString("aircraft", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexDesignatorManufacturer}));
this->m_columns.addColumn(CColumn::standardString("livery", { CAircraftModel::IndexLivery, CLivery::IndexCombinedCode}));
this->m_columns.addColumn(CColumn::standardString("airline", { CAircraftModel::IndexLivery, CLivery::IndexAirlineIcaoCode, CAirlineIcaoCode::IndexDesignatorNameCountry}));
this->m_columns.addColumn(CColumn::standardString("name", { CAircraftModel::IndexName}));
this->m_columns.addColumn(CColumn::standardString("filename", { CAircraftModel::IndexFileName}));
// default sort order
this->setSortColumnByPropertyIndex(CAircraftModel::IndexModelString);
this->m_sortOrder = Qt::AscendingOrder;
break;
case MappedModel:
case OwnSimulatorModelMapping:
this->m_columns.addColumn(CColumn::standardValueObject("call", "callsign", CAircraftModel::IndexCallsign));
this->m_columns.addColumn(CColumn::standardString("model", CAircraftModel::IndexModelString));
this->m_columns.addColumn(CColumn::standardString("ac", "aircraft ICAO", { CAircraftModel::IndexAircraftIcaoCode, CAircraftIcaoCode::IndexAircraftDesignator}));
@@ -120,19 +125,50 @@ namespace BlackGui
}
}
QStringList CAircraftModelListModel::getModelStrings(bool sort) const
{
if (this->isEmpty()) { return QStringList(); }
return this->container().getModelStrings(sort);
}
void CAircraftModelListModel::replaceOrAddByModelString(const CAircraftModelList &models)
{
if (models.isEmpty()) { return; }
CAircraftModelList currentModels(container());
currentModels.removeModelsWithString(models.getModelStrings(true), Qt::CaseInsensitive);
currentModels.push_back(models);
this->updateContainerMaybeAsync(currentModels);
}
QVariant CAircraftModelListModel::data(const QModelIndex &index, int role) const
{
if (!m_highlightDbData || role != Qt::BackgroundRole) { return CListModelBase::data(index, role); }
if (role != Qt::BackgroundRole) { return CListModelBase::data(index, role); }
bool db = highlightDbData();
bool ms = highlightGivenModelStrings() && !m_highlightStrings.isEmpty();
if (!db && !ms) { return CListModelBase::data(index, role); }
CAircraftModel model(this->at(index));
if (model.hasValidDbKey())
{
static const QBrush b(Qt::green);
return b;
}
else
// highlight stashed first
if (ms)
{
if (m_highlightStrings.contains(model.getModelString(), Qt::CaseInsensitive))
{
static const QBrush b(Qt::yellow);
return b;
}
return QVariant();
}
// highlight DB models
if (db)
{
if (model.hasValidDbKey())
{
static const QBrush b(Qt::green);
return b;
}
}
return QVariant();
}
} // namespace
} // namespace

28
src/blackgui/models/aircraftmodellistmodel.h
View File

@@ -13,8 +13,9 @@
#define BLACKGUI_AIRCRAFTMODELLISTMODEL_H
#include "blackgui/blackguiexport.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackgui/models/modelswithdbkey.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include <QStringList>
#include <QAbstractItemModel>
namespace BlackGui
@@ -33,7 +34,6 @@ namespace BlackGui
NotSet,
OwnSimulatorModel, ///< models existing for my simulator
OwnSimulatorModelMapping, ///< models of my simulator, but in mapping mode
MappedModel, ///< model based on mapping operation
Database, ///< Database entry
VPilotRuleModel, ///< vPilot rule turned into model
StashModel ///< stashed models
@@ -57,20 +57,30 @@ namespace BlackGui
//! Highlight the DB models
void setHighlightDbData(bool highlightDbData) { m_highlightDbData = highlightDbData; }
//! Highlight stashed models
bool highlightStashedModels() const { return m_highlightStashedData; }
//! Highlight models
bool highlightGivenModelStrings() const { return m_highlightModelStrings; }
//! Highlight stashed models
void setHighlightStashedModels(bool highlightStashedModels) { m_highlightStashedData = highlightStashedModels; }
//! Highlight models
void setHighlightModelsStrings(const QStringList &modelStrings = QStringList()) { m_highlightStrings = modelStrings; }
//! Highlight models
void setHighlightModelsStrings(bool highlightModelStrings) { m_highlightModelStrings = highlightModelStrings; }
//! Model strings
QStringList getModelStrings(bool sort) const;
//! Replace models with same model string, or just add
void replaceOrAddByModelString(const BlackMisc::Simulation::CAircraftModelList &models);
protected:
//! \copydoc QAbstractItemModel::data
virtual QVariant data(const QModelIndex &index, int role) const override;
private:
AircraftModelMode m_mode = NotSet; //!< current mode
bool m_highlightDbData = false;
bool m_highlightStashedData = false;
AircraftModelMode m_mode = NotSet; //!< current mode
bool m_highlightDbData = false; //!< highlight if DB data entry (valid key)
bool m_highlightModelStrings = false; //!< highlight in in model strings
QStringList m_highlightStrings; //!< model strings to highlight
};
} // ns
} // ns

28
src/blackgui/views/aircraftmodelview.cpp
View File

@@ -15,6 +15,7 @@
using namespace BlackMisc;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Aviation;
using namespace BlackGui::Models;
using namespace BlackGui::Filters;
@@ -56,7 +57,7 @@ namespace BlackGui
break;
case CAircraftModelListModel::VPilotRuleModel:
this->m_withMenuItemClear = false;
this->m_withMenuItemRefresh = false;
this->m_withMenuItemRefresh = true;
this->m_withMenuItemBackend = false;
this->setCustomMenu(new CHighlightDbModelsMenu(this, true));
this->setCustomMenu(new CHighlightStashedModelsMenu(this, true));
@@ -80,6 +81,25 @@ namespace BlackGui
}
}
void CAircraftModelView::applyToSelected(const CLivery &livery)
{
if (!hasSelection()) { return; }
int c = this->updateSelected(CVariant::from(livery), CAircraftModel::IndexLivery);
// this->updateContainer(models);
}
void CAircraftModelView::applyToSelected(const CAircraftIcaoCode &icao)
{
if (!hasSelection()) { return; }
int c = this->updateSelected(CVariant::from(icao), CAircraftModel::IndexAircraftIcaoCode);
}
void CAircraftModelView::applyToSelected(const CDistributor &distributor)
{
if (!hasSelection()) { return; }
int c = this->updateSelected(CVariant::from(distributor), CAircraftModel::IndexDistributor);
}
void CAircraftModelView::ps_toggleHighlightDbModels()
{
bool h = derivedModel()->highlightDbData();
@@ -88,8 +108,8 @@ namespace BlackGui
void CAircraftModelView::ps_toggleHighlightStashedModels()
{
bool h = derivedModel()->highlightStashedModels();
derivedModel()->setHighlightStashedModels(!h);
bool h = derivedModel()->highlightGivenModelStrings();
derivedModel()->setHighlightModelsStrings(!h);
}
void CAircraftModelView::CHighlightDbModelsMenu::customMenu(QMenu &menu) const
@@ -108,7 +128,7 @@ namespace BlackGui
Q_ASSERT_X(mv, Q_FUNC_INFO, "no view");
QAction *a = menu.addAction(CIcons::appDbStash16(), "Highlight stashed models", mv, SLOT(ps_toggleHighlightStashedModels()));
a->setCheckable(true);
a->setChecked(mv->derivedModel()->highlightStashedModels());
a->setChecked(mv->derivedModel()->highlightGivenModelStrings());
this->nestedCustomMenu(menu);
}

9
src/blackgui/views/aircraftmodelview.h
View File

@@ -34,6 +34,15 @@ namespace BlackGui
//! Set display mode
void setAircraftModelMode(Models::CAircraftModelListModel::AircraftModelMode mode);
//! Apply to selected objects
void applyToSelected(const BlackMisc::Aviation::CLivery &livery);
//! Apply to selected objects
void applyToSelected(const BlackMisc::Aviation::CAircraftIcaoCode &icao);
//! Apply to selected objects
void applyToSelected(const BlackMisc::Simulation::CDistributor &distributor);
signals:
//! Request to load VPilot data
void requestVPilotRules();