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

Issue #77 Break cyclic dependency between CStatusMessage and CLogPattern by moving methods from one to the other

Browse Source
This commit is contained in:
Mat Sutcliffe
2020-11-07 22:34:25 +00:00
parent 211fd42eaf
commit 3d129dc83f
8 changed files with 29 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackgui/components/statusmessageform.cpp
View File

@@ -7,7 +7,7 @@
*/
#include "blackgui/components/statusmessageform.h"
#include "blackmisc/logcategories.h"
#include "blackmisc/logpattern.h"
#include "ui_statusmessageform.h"
#include <QLabel>
@@ -41,7 +41,7 @@ namespace BlackGui
{
ui->te_Message->setPlainText(message.getMessage());
ui->lbl_SeverityIcon->setPixmap(CIcon(message.toIcon()));
const QString hrc(message.getHumanReadablePattern());
const QString hrc(CLogPattern::humanReadableNamesFrom(message).join(", "));
if (hrc.isEmpty())
{
ui->le_Categories->setText(message.getCategories().toQString());

3
src/blackgui/components/statusmessageformsmall.cpp
View File

@@ -7,6 +7,7 @@
*/
#include "blackgui/components/statusmessageformsmall.h"
#include "blackmisc/logpattern.h"
#include "ui_statusmessageformsmall.h"
#include <QLabel>
@@ -39,7 +40,7 @@ namespace BlackGui
{
ui->te_Message->setPlainText(message.getMessage());
ui->lbl_SeverityIcon->setPixmap(CIcon(message.toIcon()));
ui->le_Categories->setText(message.getHumanOrTechnicalCategoriesAsString());
ui->le_Categories->setText(CLogPattern::humanOrTechnicalCategoriesFrom(message).join(", "));
ui->le_Severity->setText(message.getSeverityAsString());
ui->le_Timestamp->setText(message.getFormattedUtcTimestampYmdhms());
}

2
src/blackgui/models/statusmessagefilter.cpp
View File

@@ -40,7 +40,7 @@ namespace BlackGui
if (!this->m_category.isEmpty())
{
if (!this->stringMatchesFilterExpression(msg.getHumanOrTechnicalCategoriesAsString(), this->m_category)) { continue; }
if (!this->stringMatchesFilterExpression(CLogPattern::humanOrTechnicalCategoriesFrom(msg).join(", "), this->m_category)) { continue; }
}
outContainer.push_back(msg);

2
src/blackgui/models/statusmessagelistmodel.cpp
View File

@@ -89,7 +89,7 @@ namespace BlackGui
col.setSortPropertyIndex(CStatusMessage::IndexSeverityAsString);
m_columns.addColumn(col);
m_columns.addColumn(CColumn::standardString("message", CStatusMessage::IndexMessage));
m_columns.addColumn(CColumn::standardString("category", CStatusMessage::IndexCategoryHumanReadableOrTechnicalAsString));
m_columns.addColumn(CColumn::standardString("category", CStatusMessage::IndexCategoriesAsString));
}
break;
case SimplifiedWithOrder: