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

Ref T690, aded SVFR and DVFR to FP

Browse Source
This commit is contained in:
Klaus Basan
2019-06-25 14:40:02 +02:00
committed by Mat Sutcliffe
parent 4ecd8a78ad
commit fba288edc3
5 changed files with 95 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/blackgui/components/flightplancomponent.cpp
View File

@@ -83,6 +83,10 @@ namespace BlackGui
this->setForceSmall(true);
this->showKillButton(false);
// rules
ui->cb_FlightRule->clear();
ui->cb_FlightRule->addItems(CFlightPlan::flightRules());
// validators
ui->le_Callsign->setValidator(new CUpperCaseValidator(ui->le_Callsign));
ui->le_AircraftType->setValidator(new CUpperCaseValidator(ui->le_AircraftType));
@@ -249,11 +253,18 @@ namespace BlackGui
const CAltitude cruiseAlt = flightPlan.getCruiseAltitude();
ui->lep_CrusingAltitude->setAltitude(cruiseAlt);
switch (flightPlan.getFlightRulesAsVFRorIFR())
const QString r = flightPlan.getFlightRulesAsString();
if (CFlightPlan::flightRules().contains(r, Qt::CaseInsensitive))
{
case CFlightPlan::VFR: ui->cb_FlightRule->setCurrentText("VFR"); break;
default: ui->cb_FlightRule->setCurrentText("IFR"); break;
ui->cb_FlightRule->setCurrentText(r);
}
else if (flightPlan.getFlightRules() == CFlightPlan::UNKNOWN)
{
ui->cb_FlightRule->setCurrentText(CFlightPlan::flightRulesToString(CFlightPlan::IFR));
const CStatusMessage m = CStatusMessage(this).validationWarning(u"Unknown fligh rule, setting to default");
this->showOverlayMessage(m);
}
}
const CLogCategoryList &CFlightPlanComponent::getLogCategories()
@@ -270,8 +281,8 @@ namespace BlackGui
const CStatusMessage::StatusSeverity severity = strict ? CStatusMessage::SeverityError : CStatusMessage::SeverityWarning;
messages.push_back(CStatusMessage(this).validationInfo(strict ? QStringLiteral("Strict validation") : QStringLiteral("Lenient validation")));
const CFlightPlan::FlightRules rule = ui->cb_FlightRule->currentText().startsWith("I") ? CFlightPlan::IFR : CFlightPlan::VFR;
flightPlan.setFlightRule(rule);
const CFlightPlan::FlightRules rules = this->getFlightRules();
flightPlan.setFlightRule(rules);
// callsign
QString v;
@@ -789,10 +800,16 @@ namespace BlackGui
bool CFlightPlanComponent::isVfr() const
{
const bool vfr = ui->cb_FlightRule->currentText().startsWith("V", Qt::CaseInsensitive);
const bool vfr = CFlightPlan::isVFRRules(ui->cb_FlightRule->currentText());
return vfr;
}
CFlightPlan::FlightRules CFlightPlanComponent::getFlightRules() const
{
const CFlightPlan::FlightRules r = CFlightPlan::stringToFlightRules(ui->cb_FlightRule->currentText());
return r;
}
bool CFlightPlanComponent::overrideRemarks()
{
if (!ui->pte_Remarks->toPlainText().trimmed().isEmpty())

5
src/blackgui/components/flightplancomponent.h
View File

@@ -90,7 +90,7 @@ namespace BlackGui
private:
static constexpr int OverlayTimeoutMs = 5000;
QScopedPointer<Ui::CFlightPlanComponent> ui;
CAltitudeDialog *m_altitudeDialog = nullptr;
CAltitudeDialog *m_altitudeDialog = nullptr;
CStringListDialog *m_fpRemarksDialog = nullptr;
BlackMisc::Aviation::CFlightPlan m_sentFlightPlan; //!< My flight plan
BlackMisc::Simulation::CAircraftModel m_model; //!< currently used model
@@ -200,6 +200,9 @@ namespace BlackGui
//! VFR rules?
bool isVfr() const;
//! Get the FP flight rules
BlackMisc::Aviation::CFlightPlan::FlightRules getFlightRules() const;
//! Override remarks message dialog
bool overrideRemarks();

12
src/blackgui/components/flightplancomponent.ui
View File

@@ -42,7 +42,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-137</y>
<y>0</y>
<width>383</width>
<height>480</height>
</rect>
@@ -723,6 +723,16 @@
<string>VFR</string>
</property>
</item>
<item>
<property name="text">
<string>SVFR</string>
</property>
</item>
<item>
<property name="text">
<string>DVFR</string>
</property>
</item>
</widget>
</item>
<item row="1" column="2">