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

refs #828, added function to generate HTML file with matrix

Browse Source 
* added utility functions
* adjusted existing functions
This commit is contained in:
Klaus Basan
2016-12-09 03:30:02 +01:00
parent 8488909a44
commit 7b11b1fb54
6 changed files with 183 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackmisc/simulation/aircraftmodel.cpp
View File

@@ -132,10 +132,12 @@ namespace BlackMisc
});
}
QString CAircraftModel::asHtmlSummary() const
QString CAircraftModel::asHtmlSummary(const QString &separator) const
{
const QString html = "Model: %1<br>Aircraft ICAO: %2<br>Livery: %3";
return html.arg(this->getModelStringAndDbKey(), this->getAircraftIcaoCode().asHtmlSummary(), this->getLivery().asHtmlSummary());
const QString html = "Model: %1%2Aircraft ICAO: %3%4Livery: %5";
return html.arg(this->getModelStringAndDbKey(), separator,
this->getAircraftIcaoCode().asHtmlSummary(), separator,
this->getLivery().asHtmlSummary());
}
bool CAircraftModel::canInitializeFromFsd() const

5
src/blackmisc/simulation/aircraftmodel.h
View File

@@ -180,6 +180,9 @@ namespace BlackMisc
//! Airline ICAO code designator
const QString &getAirlineIcaoCodeDesignator() const { return this->m_livery.getAirlineIcaoCode().getDesignator(); }
//! Airline ICAO code designator
const QString getAirlineIcaoCodeVDesignator() const { return this->m_livery.getAirlineIcaoCode().getVDesignator(); }
//! Set aircraft ICAO code
bool setAircraftIcaoCode(const BlackMisc::Aviation::CAircraftIcaoCode &aircraftIcaoCode);
@@ -377,7 +380,7 @@ namespace BlackMisc
QString toDatabaseJsonString(QJsonDocument::JsonFormat format = QJsonDocument::Compact) const;
//! As a brief HTML summary (e.g. used in tooltips)
QString asHtmlSummary() const;
QString asHtmlSummary(const QString &separator = "<br>") const;
//! Model type
static QString modelTypeToString(ModelType type);

45
src/blackmisc/simulation/aircraftmodellist.cpp
View File

@@ -503,6 +503,39 @@ namespace BlackMisc
return distributors;
}
QSet<QString> CAircraftModelList::getAircraftDesignators() const
{
QSet<QString> designators;
for (const CAircraftModel &model : *this)
{
if (!model.hasAircraftDesignator()) { continue; }
designators.insert(model.getAircraftIcaoCodeDesignator());
}
return designators;
}
QSet<QString> CAircraftModelList::getAirlineDesignators() const
{
QSet<QString> designators;
for (const CAircraftModel &model : *this)
{
if (!model.hasAirlineDesignator()) { continue; }
designators.insert(model.getAirlineIcaoCodeDesignator());
}
return designators;
}
QSet<QString> CAircraftModelList::getAirlineVDesignators() const
{
QSet<QString> designators;
for (const CAircraftModel &model : *this)
{
if (!model.hasAirlineDesignator()) { continue; }
designators.insert(model.getAirlineIcaoCodeVDesignator());
}
return designators;
}
void CAircraftModelList::updateAircraftIcao(const CAircraftIcaoCode &icao)
{
for (CAircraftModel &model : *this)
@@ -687,5 +720,17 @@ namespace BlackMisc
{
return QJsonDocument(toDatabaseJson()).toJson(format);
}
QString CAircraftModelList::asHtmlSummary() const
{
if (this->isEmpty()) { return ""; }
QString html;
for (const CAircraftModel &model : *this)
{
if (!html.isEmpty()) { html += "<br>"; }
html += model.asHtmlSummary(" ");
}
return html;
}
} // namespace
} // namespace

12
src/blackmisc/simulation/aircraftmodellist.h
View File

@@ -198,6 +198,15 @@ namespace BlackMisc
//! All distributors used with models of this list
CDistributorList getDistributors(bool onlyDbDistributors = true) const;
//! Aircraft designators
QSet<QString> getAircraftDesignators() const;
//! Airline designators
QSet<QString> getAirlineDesignators() const;
//! Airline virtual designators
QSet<QString> getAirlineVDesignators() const;
//! Update aircraft ICAO
void updateAircraftIcao(const BlackMisc::Aviation::CAircraftIcaoCode &icao);
@@ -236,6 +245,9 @@ namespace BlackMisc
//! To database JSON
QString toDatabaseJsonString(QJsonDocument::JsonFormat format = QJsonDocument::Compact) const;
//! As HTML summary
QString asHtmlSummary() const;
};
} // ns
} // ns

111
src/blackmisc/simulation/aircraftmodelutils.cpp
View File

@@ -7,9 +7,12 @@
* contained in the LICENSE file.
*/
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackconfig/buildconfig.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/aircraftmodelutils.h"
#include "blackmisc/verify.h"
using namespace BlackConfig;
namespace BlackMisc
{
namespace Simulation
@@ -29,5 +32,111 @@ namespace BlackMisc
}
return true;
}
QString CAircraftModelUtilities::createIcaoAirlineAircraftHtmlMatrix(const CAircraftModelList &models)
{
if (models.isEmpty()) { return ""; }
static const QString emptyDesignator = "----";
static const QString colorLiveryDesignator = "-C-";
QMap<QString, QMap<QString, CAircraftModelList>> modelsByDesignator;
// create an empty map of all airlines
const QMap<QString, CAircraftModelList> emptyAirlineDesignatorMap;
CAircraftModelList sortedByAircraft(models);
sortedByAircraft.sortBy(&CAircraftModel::getAircraftIcaoCodeDesignator);
for (const CAircraftModel &model : as_const(sortedByAircraft))
{
const QString aircraftIcao(model.hasAircraftDesignator() ? model.getAircraftIcaoCodeDesignator() : emptyDesignator);
if (!modelsByDesignator.contains(aircraftIcao))
{
modelsByDesignator.insert(aircraftIcao, emptyAirlineDesignatorMap);
}
QMap<QString, CAircraftModelList> &airlineModels = modelsByDesignator[aircraftIcao];
const QString airlineIcao(
model.getLivery().isColorLivery() ? colorLiveryDesignator :
model.hasAirlineDesignator() ? model.getAirlineIcaoCodeDesignator() : emptyDesignator);
if (airlineModels.contains(airlineIcao))
{
airlineModels[airlineIcao].push_back(model);
}
else
{
airlineModels.insert(airlineIcao, CAircraftModelList({model}));
}
}
// to HTML
QString html("<table>\n");
QStringList airlineIcaos = models.getAirlineVDesignators().toList();
qSort(airlineIcaos);
airlineIcaos.push_front(colorLiveryDesignator);
airlineIcaos.push_back(emptyDesignator);
QStringList aircraftIcaos = modelsByDesignator.keys();
qSort(aircraftIcaos);
// header
html += "<thead><tr>\n";
html += "<th></th>";
for (const QString &airline : as_const(airlineIcaos))
{
html += "<th>";
html += airline;
html += "</th>";
}
html += "\n</tr></thead>\n";
// fill data
html += "<tbody>\n";
for (const QString &aircraftIcao : as_const(aircraftIcaos))
{
html += "<tr>\n";
html += " <th>";
html += aircraftIcao;
html += "</th>\n";
const QMap<QString, CAircraftModelList> &airlineModels = modelsByDesignator[aircraftIcao];
for (const QString &airline : as_const(airlineIcaos))
{
if (airlineModels.contains(airline))
{
html += " <td>";
const CAircraftModelList &models(airlineModels[airline]);
html += "<a>";
html += QString::number(models.size());
html += "</a><div class=\"mouseoverdisplay\">";
html += models.asHtmlSummary();
html += "</div>";
html += "</td>\n";
}
else
{
html += " <td></td>\n";
}
}
html += "</tr>\n";
}
html += "</tbody>\n";
html += "</table>\n";
return html;
}
QString CAircraftModelUtilities::createIcaoAirlineAircraftHtmlMatrixFile(const CAircraftModelList &models, const QString &tempDir)
{
Q_ASSERT_X(!tempDir.isEmpty(), Q_FUNC_INFO, "Need directory");
if (models.isEmpty()) { return ""; }
const QString html = createIcaoAirlineAircraftHtmlMatrix(models);
if (html.isEmpty()) { return ""; }
QDir dir(tempDir);
BLACK_VERIFY_X(dir.exists(), Q_FUNC_INFO, "Directory does not exist");
if (!dir.exists()) { return ""; }
const QString htmlTemplate = CFileUtils::readFileToString(CBuildConfig::getHtmlTemplateFileName());
const QString fn("airlineAircraftMatrix.html");
const bool ok = CFileUtils::writeStringToFile(htmlTemplate.arg(html), dir.absoluteFilePath(fn));
return ok ? dir.absoluteFilePath(fn) : "";
}
} // ns
} // ns

7
src/blackmisc/simulation/aircraftmodelutils.h
View File

@@ -28,6 +28,13 @@ namespace BlackMisc
//! Merge with vPilot data if possible
static bool mergeWithVPilotData(BlackMisc::Simulation::CAircraftModelList &modelToBeModified, const BlackMisc::Simulation::CAircraftModelList &vPilotModels, bool force = false);
//! Matrix airlines/aircraft ICAOs
static QString createIcaoAirlineAircraftHtmlMatrix(const BlackMisc::Simulation::CAircraftModelList &models);
//! Matrix airlines/aircraft ICAOs
static QString createIcaoAirlineAircraftHtmlMatrixFile(const BlackMisc::Simulation::CAircraftModelList &models, const QString &tempDir);
};
} //namespace
} // namespace