From 21a6a371e976d1d7d5ca60174b3ef9926df494e2 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Sun, 24 Mar 2024 16:06:34 +0100 Subject: [PATCH] refactor: Remove flight plan component prefill method For the user this method is very opaque on what is actually does. To avoid confusion and to simplify the component, this commit removes it. --- .../components/flightplancomponent.cpp | 57 ------------------- src/blackgui/components/flightplancomponent.h | 3 - .../components/flightplancomponent.ui | 15 ----- 3 files changed, 75 deletions(-) diff --git a/src/blackgui/components/flightplancomponent.cpp b/src/blackgui/components/flightplancomponent.cpp index 9098017184..9348ccc704 100644 --- a/src/blackgui/components/flightplancomponent.cpp +++ b/src/blackgui/components/flightplancomponent.cpp @@ -125,7 +125,6 @@ namespace BlackGui::Components connect(ui->pb_Download, &QPushButton::pressed, this, &CFlightPlanComponent::loadFlightPlanFromNetwork, Qt::QueuedConnection); connect(ui->pb_Reset, &QPushButton::pressed, this, &CFlightPlanComponent::resetFlightPlan, Qt::QueuedConnection); connect(ui->tb_SyncWithSimulator, &QPushButton::released, this, &CFlightPlanComponent::syncWithSimulator, Qt::QueuedConnection); - connect(ui->pb_Prefill, &QPushButton::pressed, this, &CFlightPlanComponent::anticipateValues, Qt::QueuedConnection); connect(ui->pb_SimBrief, &QPushButton::pressed, this, &CFlightPlanComponent::loadFromSimBrief, Qt::QueuedConnection); connect(ui->pb_SaveTemplate, &QPushButton::released, this, &CFlightPlanComponent::saveTemplateToDisk, Qt::QueuedConnection); @@ -812,62 +811,6 @@ namespace BlackGui::Components return true; } - void CFlightPlanComponent::anticipateValues() - { - if (!this->overrideRemarks()) { return; } - CStatusMessageList msgs; - const bool vfr = this->isVfr(); - const bool airline = m_model.hasAirlineDesignator(); - - if (vfr) - { - ui->cb_NoSidsStarts->setChecked(true); - msgs.push_back(CStatusMessage(this).validationInfo(u"No SID/STARs")); - ui->cb_RequiredNavigationPerformance->setCurrentIndex(0); - ui->cb_PerformanceCategory->setCurrentIndex(0); - msgs.push_back(CStatusMessage(this).validationInfo(u"Set performance to VFR")); - } - else - { - // IFR - const CAircraftIcaoCode icao = this->getAircraftIcaoCode(); - if (icao.isLoadedFromDb()) - { - if (icao.getEnginesCount() >= 2 && icao.getEngineType() == "J") - { - // jet with >=2 engines - msgs.push_back(CStatusMessage(this).validationInfo(u"Jet >=2 engines")); - msgs.push_back(CStatusMessage(this).validationInfo(u"SID/STARs")); - ui->cb_NoSidsStarts->setChecked(false); - msgs.push_back(CStatusMessage(this).validationInfo(u"Capable of SIDs/STARs")); - - // reset those values - ui->cb_RequiredNavigationPerformance->setCurrentIndex(0); - ui->cb_PerformanceCategory->setCurrentIndex(0); - } - } // ICAO - } - - // further info if having model from DB - if (m_model.isLoadedFromDb()) - { - if (airline) - { - ui->le_AirlineOperator->setText(m_model.getAirlineIcaoCode().getName()); - } - } - - // messages - this->showOverlayMessages(msgs, false, OverlayTimeoutMs); - - // copy over - if (msgs.isSuccess()) - { - this->buildRemarksString(); - this->copyRemarks(false); - } - } - void CFlightPlanComponent::updateDirectorySettings(const QString &fileOrDirectory) { if (fileOrDirectory.isEmpty()) { return; } diff --git a/src/blackgui/components/flightplancomponent.h b/src/blackgui/components/flightplancomponent.h index 05fa82b1ef..35547293ff 100644 --- a/src/blackgui/components/flightplancomponent.h +++ b/src/blackgui/components/flightplancomponent.h @@ -242,9 +242,6 @@ namespace BlackGui::Components //! Override remarks message dialog bool overrideRemarks(); - //! Guess some FP values/setting - void anticipateValues(); - //! Update the diretcory settings void updateDirectorySettings(const QString &fileOrDirectory); diff --git a/src/blackgui/components/flightplancomponent.ui b/src/blackgui/components/flightplancomponent.ui index 3546ac9c38..26ce261405 100644 --- a/src/blackgui/components/flightplancomponent.ui +++ b/src/blackgui/components/flightplancomponent.ui @@ -743,20 +743,6 @@ - - - - Anticipate (guess) some values - - - &Prefill - - - - :/diagona/icons/diagona/icons/compass--pencil.png:/diagona/icons/diagona/icons/compass--pencil.png - - - @@ -1155,7 +1141,6 @@ le_PilotsName le_PilotsHomeBase le_LastSent - pb_Prefill pb_Reset pb_Send pb_Download