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

refactor: Remove strict checking from flightplan component

Browse Source 
The strict checking was disabled by default and likely not used by many users.
This commit is contained in:
Lars Toenning
2024-03-24 15:51:02 +01:00
parent 6cf9dfaecf
commit f7bee831b7
2 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -310,10 +310,7 @@ namespace BlackGui::Components
CStatusMessageList CFlightPlanComponent::validateAndInitializeFlightPlan(CFlightPlan &flightPlan)
{
CStatusMessageList messages;
const bool strict = ui->cb_StrictCheck->isChecked();
const bool vfr = this->isVfr();
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 rules = this->getFlightRules();
flightPlan.setFlightRule(rules);
@@ -396,7 +393,7 @@ namespace BlackGui::Components
v = ui->le_EstimatedTimeEnroute->text();
if (v.isEmpty() || v == defaultTime())
{
messages.push_back(CStatusMessage(this).validation(severity, u"Missing '%1'") << ui->lbl_EstimatedTimeEnroute->text());
messages.push_back(CStatusMessage(this).validationWarning(u"Missing '%1'") << ui->lbl_EstimatedTimeEnroute->text());
}
flightPlan.setEnrouteTime(v);
@@ -404,7 +401,7 @@ namespace BlackGui::Components
v = ui->le_FuelOnBoard->text();
if (v.isEmpty() || v == defaultTime())
{
messages.push_back(CStatusMessage(this).validation(severity, u"Missing '%1'") << ui->lbl_FuelOnBoard->text());
messages.push_back(CStatusMessage(this).validationWarning(u"Missing '%1'") << ui->lbl_FuelOnBoard->text());
}
flightPlan.setFuelTime(v);
@@ -412,7 +409,7 @@ namespace BlackGui::Components
v = ui->le_TakeOffTimePlanned->text();
if (v.isEmpty() || v == defaultTime())
{
messages.push_back(CStatusMessage(this).validation(severity, u"Missing '%1'") << ui->lbl_TakeOffTimePlanned->text());
messages.push_back(CStatusMessage(this).validationWarning(u"Missing '%1'") << ui->lbl_TakeOffTimePlanned->text());
}
flightPlan.setTakeoffTimePlanned(v);
@@ -433,11 +430,7 @@ namespace BlackGui::Components
else
{
flightPlan.setDestinationAirportIcao(v);
if (strict && !flightPlan.getDestinationAirportIcao().hasValidIcaoCode(true))
{
messages.push_back(CStatusMessage(this).validationError(u"Invalid destination ICAO code '%1'") << v);
}
else if (!flightPlan.getDestinationAirportIcao().hasValidIcaoCode(false))
if (!flightPlan.getDestinationAirportIcao().hasValidIcaoCode(false))
{
messages.push_back(CStatusMessage(this).validationWarning(u"Wrong or missing '%1'") << ui->lbl_DestinationAirport->text());
}
@@ -453,11 +446,7 @@ namespace BlackGui::Components
else
{
flightPlan.setOriginAirportIcao(v);
if (strict && !flightPlan.getOriginAirportIcao().hasValidIcaoCode(true))
{
messages.push_back(CStatusMessage(this).validationError(u"Invalid origin ICAO code '%1'") << v);
}
else if (!flightPlan.getOriginAirportIcao().hasValidIcaoCode(false))
if (!flightPlan.getOriginAirportIcao().hasValidIcaoCode(false))
{
messages.push_back(CStatusMessage(this).validationWarning(u"Wrong or missing '%1'") << ui->lbl_DestinationAirport->text());
}

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

@@ -708,16 +708,6 @@
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QCheckBox" name="cb_StrictCheck">
<property name="toolTip">
<string>strict check</string>
</property>
<property name="text">
<string>strict &amp;check</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="pb_ValidateFlightPlan">
<property name="text">
@@ -1184,7 +1174,6 @@
<tabstop>pb_SimBrief</tabstop>
<tabstop>pb_SaveDisk</tabstop>
<tabstop>pb_LoadDisk</tabstop>
<tabstop>cb_StrictCheck</tabstop>
<tabstop>pb_SaveTemplate</tabstop>
<tabstop>pb_LoadTemplate</tabstop>
<tabstop>pb_ClearTemplate</tabstop>