From d240dc73ab050b1da9666d4c2870b6c324d8ce46 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 25 Nov 2018 18:28:32 +0100 Subject: [PATCH] Ref T441, statistics can also display matrix --- .../views/aircraftmodelstatisticsdialog.cpp | 18 ++++++- .../views/aircraftmodelstatisticsdialog.h | 4 ++ .../views/aircraftmodelstatisticsdialog.ui | 47 ++++++++++++++++--- 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/src/blackgui/views/aircraftmodelstatisticsdialog.cpp b/src/blackgui/views/aircraftmodelstatisticsdialog.cpp index 3b79c299e..daa93fd09 100644 --- a/src/blackgui/views/aircraftmodelstatisticsdialog.cpp +++ b/src/blackgui/views/aircraftmodelstatisticsdialog.cpp @@ -9,6 +9,12 @@ #include "aircraftmodelstatisticsdialog.h" #include "ui_aircraftmodelstatisticsdialog.h" +#include "blackgui/guiapplication.h" +#include "blackmisc/simulation/aircraftmodelutils.h" + +#include +#include +#include using namespace BlackMisc::Simulation; @@ -22,6 +28,8 @@ namespace BlackGui { ui->setupUi(this); this->setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); + + connect(ui->pb_GenerateMatrix, &QPushButton::clicked, this, &CAircraftModelStatisticsDialog::displayHTMLMatrix); } CAircraftModelStatisticsDialog::~CAircraftModelStatisticsDialog() @@ -29,7 +37,15 @@ namespace BlackGui void CAircraftModelStatisticsDialog::analyzeModels(const CAircraftModelList &models) { - ui->te_Statistics->setHtml(models.htmlStatistics(true, true)); + ui->te_GeneralStatistics->setHtml(models.htmlStatistics(true, true)); + m_models = models; + } + + void CAircraftModelStatisticsDialog::displayHTMLMatrix() + { + const QString file = CAircraftModelUtilities::createIcaoAirlineAircraftHtmlMatrixFile(m_models, CGuiApplication::getTemporaryDirectory()); + if (file.isEmpty()) { return; } + QDesktopServices::openUrl(QUrl::fromLocalFile(file)); } } // ns } // ns diff --git a/src/blackgui/views/aircraftmodelstatisticsdialog.h b/src/blackgui/views/aircraftmodelstatisticsdialog.h index 38fade5e1..c4c76e5fd 100644 --- a/src/blackgui/views/aircraftmodelstatisticsdialog.h +++ b/src/blackgui/views/aircraftmodelstatisticsdialog.h @@ -37,7 +37,11 @@ namespace BlackGui void analyzeModels(const BlackMisc::Simulation::CAircraftModelList &models); private: + //! Display the HTML matrix + void displayHTMLMatrix(); + QScopedPointer ui; + BlackMisc::Simulation::CAircraftModelList m_models; }; } // ns } // ns diff --git a/src/blackgui/views/aircraftmodelstatisticsdialog.ui b/src/blackgui/views/aircraftmodelstatisticsdialog.ui index a3b9966ab..a42e468ac 100644 --- a/src/blackgui/views/aircraftmodelstatisticsdialog.ui +++ b/src/blackgui/views/aircraftmodelstatisticsdialog.ui @@ -21,13 +21,48 @@ - - - Statistics - - - true + + + 0 + + + General + + + + + + Statistics + + + true + + + + + + + + Matrix + + + + + + Generate matrix and display in browser + + + + + + + generate matix + + + + +