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

refs #336 Using the new CLogMessage syntax to log messages.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-10-14 00:09:18 +01:00
parent 067344df24
commit a294e8db0f
33 changed files with 200 additions and 192 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/atcstationcomponent.cpp
View File

@@ -169,7 +169,7 @@ namespace BlackGui
if (sender == this->ui->tvp_AtcStationsBooked && this->getIContextNetwork())
{
// trigger new read, which takes some time. A signal will be received when this is done
CLogMessage().info(this, "Requested new bookings");
CLogMessage(this).info("Requested new bookings");
this->getIContextNetwork()->readAtcBookingsFromSource();
}
else

6
src/blackgui/components/cockpitv1component.cpp
View File

@@ -222,7 +222,7 @@ namespace BlackGui
}
else
{
CLogMessage().error(validationMessageCategory(), "Wrong transponder code, reset");
CLogMessage(CLogCategory::validation()).error("Wrong transponder code, reset");
this->ui->ds_CockpitTransponder->setValue(transponder.getTransponderCode());
}
transponder.setTransponderMode(this->ui->cbp_CockpitTransponderMode->getSelectedTransponderMode());
@@ -392,7 +392,7 @@ namespace BlackGui
QString selcalCode = this->getSelcalCode();
if (!CSelcal::isValidCode(selcalCode))
{
CLogMessage().error(validationMessageCategory(), "Invalid SELCAL codde");
CLogMessage(CLogCategory::validation()).error("Invalid SELCAL codde");
}
else if (this->getIContextAudio())
{
@@ -401,7 +401,7 @@ namespace BlackGui
}
else
{
CLogMessage().error(validationMessageCategory(), "No audio available");
CLogMessage(CLogCategory::validation()).error("No audio available");
}
}

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

@@ -110,17 +110,17 @@ namespace BlackGui
v = ui->le_Callsign->text().trimmed();
if (v.isEmpty())
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Missing %1") << this->ui->lbl_Callsign->text());
messages.push_back(CLogMessage(CLogCategory::validation()).error("Missing %1") << this->ui->lbl_Callsign->text());
}
v = ui->pte_Route->toPlainText().trimmed();
if (v.isEmpty())
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Missing flight plan route"));
messages.push_back(CLogMessage(CLogCategory::validation()).error("Missing flight plan route"));
}
else if (v.length() > CFlightPlan::MaxRouteLength)
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Flight plan route length exceeded (%1 chars max.)") << CFlightPlan::MaxRouteLength);
messages.push_back(CLogMessage(CLogCategory::validation()).error("Flight plan route length exceeded (%1 chars max.)") << CFlightPlan::MaxRouteLength);
}
else
flightPlan.setRoute(v);
@@ -128,11 +128,11 @@ namespace BlackGui
v = ui->pte_Remarks->toPlainText().trimmed();
if (v.isEmpty())
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "No remarks, voice capabilities are mandatory"));
messages.push_back(CLogMessage(CLogCategory::validation()).error("No remarks, voice capabilities are mandatory"));
}
else if (v.length() > CFlightPlan::MaxRemarksLength)
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Flight plan remarks length exceeded (%1 chars max.)") << CFlightPlan::MaxRemarksLength);
messages.push_back(CLogMessage(CLogCategory::validation()).error("Flight plan remarks length exceeded (%1 chars max.)") << CFlightPlan::MaxRemarksLength);
}
else
flightPlan.setRemarks(v);
@@ -140,7 +140,7 @@ namespace BlackGui
v = ui->le_EstimatedTimeEnroute->text();
if (v.isEmpty() || v == defaultTime())
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Missing %1") << this->ui->lbl_EstimatedTimeEnroute->text());
messages.push_back(CLogMessage(CLogCategory::validation()).error("Missing %1") << this->ui->lbl_EstimatedTimeEnroute->text());
}
else
flightPlan.setEnrouteTime(v);
@@ -148,7 +148,7 @@ namespace BlackGui
v = ui->le_FuelOnBoard->text();
if (v.isEmpty() || v == defaultTime())
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Missing %1") << this->ui->lbl_FuelOnBorad->text());
messages.push_back(CLogMessage(CLogCategory::validation()).error("Missing %1") << this->ui->lbl_FuelOnBorad->text());
}
else
flightPlan.setFuelTime(v);
@@ -156,7 +156,7 @@ namespace BlackGui
v = ui->le_TakeOffTimePlanned->text();
if (v.isEmpty() || v == defaultTime())
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Missing %1") << this->ui->lbl_TakeOffTimePlanned->text());
messages.push_back(CLogMessage(CLogCategory::validation()).error("Missing %1") << this->ui->lbl_TakeOffTimePlanned->text());
}
else
flightPlan.setTakeoffTimePlanned(v);
@@ -172,7 +172,7 @@ namespace BlackGui
CAltitude cruisingAltitude(v, CPqString::SeparatorsLocale);
if (v.isEmpty() || cruisingAltitude.isNull())
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Wrong %1") << this->ui->lbl_CrusingAltitude->text());
messages.push_back(CLogMessage(CLogCategory::validation()).error("Wrong %1") << this->ui->lbl_CrusingAltitude->text());
}
else
flightPlan.setCruiseAltitude(cruisingAltitude);
@@ -180,7 +180,7 @@ namespace BlackGui
v = this->ui->le_AlternateAirport->text();
if (v.isEmpty() || v.endsWith(defaultIcao(), Qt::CaseInsensitive))
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Missing %1") << this->ui->lbl_AlternateAirport->text());
messages.push_back(CLogMessage(CLogCategory::validation()).error("Missing %1") << this->ui->lbl_AlternateAirport->text());
flightPlan.setAlternateAirportIcao(defaultIcao());
}
else
@@ -189,7 +189,7 @@ namespace BlackGui
v = this->ui->le_DestinationAirport->text();
if (v.isEmpty() || v.endsWith(defaultIcao(), Qt::CaseInsensitive))
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Missing %1") << this->ui->lbl_DestinationAirport->text());
messages.push_back(CLogMessage(CLogCategory::validation()).error("Missing %1") << this->ui->lbl_DestinationAirport->text());
flightPlan.setDestinationAirportIcao(defaultIcao());
}
else
@@ -200,7 +200,7 @@ namespace BlackGui
cruiseTAS.parseFromString(v, CPqString::SeparatorsLocale);
if (cruiseTAS.isNull())
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Wrong TAS, %1") << this->ui->lbl_CruiseTrueAirspeed->text());
messages.push_back(CLogMessage(CLogCategory::validation()).error("Wrong TAS, %1") << this->ui->lbl_CruiseTrueAirspeed->text());
flightPlan.setDestinationAirportIcao(defaultIcao());
}
else
@@ -209,7 +209,7 @@ namespace BlackGui
v = this->ui->le_OriginAirport->text();
if (v.isEmpty() || v.endsWith(defaultIcao(), Qt::CaseInsensitive))
{
messages.push_back(CLogMessage().error(validationMessageCategory(), "Missing %1") << this->ui->lbl_OriginAirport->text());
messages.push_back(CLogMessage(CLogCategory::validation()).error("Missing %1") << this->ui->lbl_OriginAirport->text());
flightPlan.setOriginAirportIcao(defaultIcao());
}
else
@@ -230,13 +230,13 @@ namespace BlackGui
flightPlan.setWhenLastSentOrLoaded(QDateTime::currentDateTimeUtc());
this->getIContextNetwork()->sendFlightPlan(flightPlan);
this->ui->le_LastSent->setText(flightPlan.whenLastSentOrLoaded().toString());
CLogMessage().info(this, "Sent flight plan");
CLogMessage(this).info("Sent flight plan");
}
else
{
flightPlan.setWhenLastSentOrLoaded(QDateTime()); // empty
this->ui->le_LastSent->clear();
CLogMessage().error(this, "No errors, but not connected, cannot send flight plan");
CLogMessage(this).error("No errors, but not connected, cannot send flight plan");
}
this->m_flightPlan = flightPlan; // last valid FP
}
@@ -272,12 +272,12 @@ namespace BlackGui
{
if (!this->getIContextNetwork())
{
CLogMessage().info(this, "Cannot load flight plan, network not available");
CLogMessage(this).info("Cannot load flight plan, network not available");
return;
}
if (!this->getIContextNetwork()->isConnected())
{
CLogMessage().warning(this, "Cannot load flight plan, network not connected");
CLogMessage(this).warning("Cannot load flight plan, network not connected");
return;
}
@@ -286,11 +286,11 @@ namespace BlackGui
if (loadedPlan.wasSentOrLoaded())
{
this->fillWithFlightPlanData(loadedPlan);
CLogMessage().info(this, "Updated with loaded flight plan");
CLogMessage(this).info("Updated with loaded flight plan");
}
else
{
CLogMessage().warning(this, "No flight plan data");
CLogMessage(this).warning("No flight plan data");
}
}
@@ -370,7 +370,7 @@ namespace BlackGui
void CFlightPlanComponent::copyRemarks()
{
this->ui->pte_Remarks->setPlainText(this->ui->pte_RemarksGenerated->toPlainText());
CLogMessage().info(this, "Copied remarks");
CLogMessage(this).info("Copied remarks");
}
void CFlightPlanComponent::currentTabGenerator()

2
src/blackgui/components/infowindowcomponent.cpp
View File

@@ -90,7 +90,7 @@ namespace BlackGui
}
this->ui->le_SmSeverity->setText(statusMessage.getSeverityAsString());
this->ui->le_SmType->setText(statusMessage.getCategory()); // TODO should be called ui->le_SmCategory
this->ui->le_SmType->setText(statusMessage.getCategories().toQString()); // TODO should be called ui->le_SmCategories
this->ui->te_SmStatusMessage->setText(statusMessage.getMessage());
this->ui->lbl_SmSeverityIcon->setPixmap(statusMessage.toPixmap());

9
src/blackgui/components/runtimebasedcomponent.h
View File

@@ -38,10 +38,11 @@ namespace BlackGui
static void setRuntimeForComponents(BlackCore::CRuntime *runtime, QWidget *parent);
//! Log message category
static QString getMessageCategory() { return "swift.gui.component"; }
//! Validation log message category
static QString validationMessageCategory() { return "swift.gui.component.validation"; }
static const CLogCategoryList &getLogCategories()
{
static const CLogCategoryList cats { CLogCategory::guiComponent() };
return cats;
}
protected:
//! Constructor

10
src/blackgui/components/settingscomponent.cpp
View File

@@ -237,7 +237,7 @@ namespace BlackGui
CServer server = this->ps_selectedServerFromTextboxes();
if (!server.isValidForLogin())
{
CLogMessage().error(validationMessageCategory(), "Wrong settings for server");
CLogMessage(CLogCategory::validation()).error("Wrong settings for server");
return;
}
@@ -376,11 +376,11 @@ namespace BlackGui
bool ok = CStyleSheetUtility::instance().updateFonts(fontFamily, fontSize, CStyleSheetUtility::fontStyle(fontStyleCombined), CStyleSheetUtility::fontWeight(fontStyleCombined), fontColor);
if (ok)
{
CLogMessage().info(this, "Updated font style");
CLogMessage(this).info("Updated font style");
}
else
{
CLogMessage().info(this, "Updating style failed");
CLogMessage(this).info("Updating style failed");
}
}
@@ -403,12 +403,12 @@ namespace BlackGui
{
if (!this->getIContextAudio())
{
CLogMessage().error(this, "voice context not available");
CLogMessage(this).error("voice context not available");
return;
}
if (this->m_timerAudioTests->isActive())
{
CLogMessage().error(this, "test running, wait until completed");
CLogMessage(this).error("test running, wait until completed");
return;
}

28
src/blackgui/components/settingsfsxcomponent.cpp
View File

@@ -55,28 +55,28 @@ namespace BlackGui
if (address.isEmpty() || port.isEmpty())
{
CLogMessage().warning(this, "no address or port");
CLogMessage(this).warning("no address or port");
return;
}
if (!CNetworkUtils::isValidIPv4Address(address))
{
CLogMessage().warning(this, "IPv4 address invalid");
CLogMessage(this).warning("IPv4 address invalid");
return;
}
if (!CNetworkUtils::isValidPort(port))
{
CLogMessage().warning(this, "invalid port");
CLogMessage(this).warning("invalid port");
return;
}
quint16 p = port.toUInt();
QString msg;
if (!CNetworkUtils::canConnect(address, p, msg))
{
CLogMessage().warning(this, msg);
CLogMessage(this).warning(msg);
return;
}
CLogMessage().info(this, "Connected to %1:%2") << address << port;
CLogMessage(this).info("Connected to %1:%2") << address << port;
}
/*
@@ -86,7 +86,7 @@ namespace BlackGui
{
if (!this->getIContextSimulator() || !this->getIContextSimulator()->isSimulatorAvailable())
{
CLogMessage().error(this, "Simulator not available");
CLogMessage(this).error("Simulator not available");
return;
}
QString address = this->ui->le_SettingsFsxAddress->text().trimmed();
@@ -94,17 +94,17 @@ namespace BlackGui
if (address.isEmpty() || port.isEmpty())
{
CLogMessage().warning(this, "no address or port");
CLogMessage(this).warning("no address or port");
return;
}
if (!CNetworkUtils::isValidIPv4Address(address))
{
CLogMessage().warning(this, "IPv4 address invalid");
CLogMessage(this).warning("IPv4 address invalid");
return;
}
if (!CNetworkUtils::isValidPort(port))
{
CLogMessage().warning(this, "invalid port");
CLogMessage(this).warning("invalid port");
return;
}
quint16 p = port.toUInt();
@@ -117,11 +117,11 @@ namespace BlackGui
this->getIContextApplication()->writeToFile(fileName, CSimConnectUtilities::simConnectCfg(address, p));
if (success)
{
CLogMessage().info(this, localSimulatorObject ? "Written local %1" : "Written remote %1") << fileName;
CLogMessage(this).info(localSimulatorObject ? "Written local %1" : "Written remote %1") << fileName;
}
else
{
CLogMessage().error(this, "Cannot write %1") << fileName;
CLogMessage(this).error("Cannot write %1") << fileName;
}
this->ui->pb_SettingsFsxExistsSimconncetCfg->click(); // update status
}
@@ -133,7 +133,7 @@ namespace BlackGui
{
if (!this->getIContextSimulator() || !this->getIContextSimulator()->isSimulatorAvailable())
{
CLogMessage().error(this, "Simulator not available");
CLogMessage(this).error("Simulator not available");
return;
}
@@ -153,12 +153,12 @@ namespace BlackGui
{
QFile f(fileName);
f.remove();
CLogMessage().info(this, "Deleted locally %1") << fileName;
CLogMessage(this).info("Deleted locally %1") << fileName;
}
else
{
this->getIContextApplication()->removeFile(fileName);
CLogMessage().info(this, "Deleted remotely %1") << fileName;
CLogMessage(this).info("Deleted remotely %1") << fileName;
}
this->ui->pb_SettingsFsxExistsSimconncetCfg->click(); // update status
}

6
src/blackgui/components/settingssimulatorcomponent.cpp
View File

@@ -95,12 +95,12 @@ namespace BlackGui
CSimulatorInfoList simDrivers = this->getIContextSimulator()->getAvailableSimulatorPlugins();
if (simDrivers.isEmpty())
{
CLogMessage().error(this, "No drivers available");
CLogMessage(this).error("No drivers available");
return;
}
if (simDrivers.size() <= index)
{
CLogMessage().error(this, "Wrong driver index");
CLogMessage(this).error("Wrong driver index");
return;
}
@@ -146,7 +146,7 @@ namespace BlackGui
}
if (ost.isNull())
{
CLogMessage().error(validationMessageCategory(), "Invalid offset time");
CLogMessage(CLogCategory::validation()).error("Invalid offset time");
}
else
{

14
src/blackgui/components/textmessagecomponent.cpp
View File

@@ -93,7 +93,7 @@ namespace BlackGui
}
else
{
emit this->displayInInfoWindow(CLogMessage().info(this, "SELCAL received"), 3 * 1000);
emit this->displayInInfoWindow(CLogMessage(this).info("SELCAL received"), 3 * 1000);
}
}
continue; // not displayed
@@ -382,12 +382,12 @@ namespace BlackGui
{
if (!this->getIContextNetwork() || !this->getIContextNetwork()->isConnected())
{
CLogMessage().error(this, "network needs to be connected");
CLogMessage(this).error("network needs to be connected");
return;
}
if (parts.length() < 3)
{
CLogMessage().error(this, "incorrect message");
CLogMessage(this).error("incorrect message");
return;
}
QString p = parts[1].trimmed(); // receiver
@@ -416,7 +416,7 @@ namespace BlackGui
int index = cmdLine.indexOf(tm.getRecipientCallsign().getStringAsSet(), 0, Qt::CaseInsensitive);
if (index < 0)
{
CLogMessage().error(this, "incomplete message");
CLogMessage(this).error("incomplete message");
return;
}
QString msg(cmdLine.mid(index + tm.getRecipientCallsign().asString().length() + 1));
@@ -438,20 +438,20 @@ namespace BlackGui
// line is considered to be a message to the selected channel, send
if (!this->isNetworkConnected())
{
CLogMessage().error(this, "network needs to be connected");
CLogMessage(this).error("network needs to be connected");
return;
}
if (!this->isVisible())
{
CLogMessage().error(this, "text messages can only be sent from corresponding page");
CLogMessage(this).error("text messages can only be sent from corresponding page");
return;
}
int index = this->currentIndex();
if (index < 0 || index == this->indexOf(this->ui->tb_TextMessagesAll))
{
CLogMessage().error(this, "incorrect channel");
CLogMessage(this).error("incorrect channel");
}
else
{