OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merged branch dev into pre-proto

Browse Source
This commit is contained in:
Magne Sjaastad
2017-02-27 14:03:33 +01:00
parent 374ed0130b 48599f7a94
commit 1b01e98c0e
6 changed files with 106 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ApplicationCode/UserInterface/RiuMessagePanel.cpp
View File

@@ -54,7 +54,7 @@ RiuMessagePanel::RiuMessagePanel(QDockWidget* parent)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMessagePanel::addMessage(RILogLevel messageLevel, const QString& msg, const QString& srcInfo)
void RiuMessagePanel::addMessage(RILogLevel messageLevel, const QString& msg)
{
QColor clr(Qt::black);
if (messageLevel == RI_LL_ERROR) clr = Qt::red;
@@ -68,15 +68,6 @@ void RiuMessagePanel::addMessage(RILogLevel messageLevel, const QString& msg, co
m_textEdit->setCurrentCharFormat(form);
m_textEdit->appendPlainText(msg);
if (!srcInfo.isEmpty())
{
form.setForeground(clr);
form.setFontWeight(QFont::Normal);
form.setFontItalic(true);
m_textEdit->setCurrentCharFormat(form);
m_textEdit->appendPlainText(" " + srcInfo);
}
m_textEdit->moveCursor(QTextCursor::End);
m_textEdit->ensureCursorVisible();
}
@@ -113,7 +104,8 @@ void RiuMessagePanel::slotShowContextMenu(const QPoint& pos)
void RiuMessagePanel::slotClearMessages()
{
m_textEdit->clear();
RI_LOG_INFO("Message window cleared.");
RiaLogging::info("Message window cleared.");
}
@@ -155,43 +147,43 @@ void RiuMessagePanelLogger::setLevel(int logLevel)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMessagePanelLogger::error(const char* message, const char* fileName, int lineNumber)
void RiuMessagePanelLogger::error(const char* message)
{
writeToMessagePanel(RI_LL_ERROR, message, fileName, lineNumber);
writeToMessagePanel(RI_LL_ERROR, message);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMessagePanelLogger::warning(const char* message, const char* fileName, int lineNumber)
void RiuMessagePanelLogger::warning(const char* message)
{
writeToMessagePanel(RI_LL_WARNING, message, fileName, lineNumber);
writeToMessagePanel(RI_LL_WARNING, message);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMessagePanelLogger::info(const char* message, const char* fileName, int lineNumber)
void RiuMessagePanelLogger::info(const char* message)
{
writeToMessagePanel(RI_LL_INFO, message, fileName, lineNumber);
writeToMessagePanel(RI_LL_INFO, message);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMessagePanelLogger::debug(const char* message, const char* fileName, int lineNumber)
void RiuMessagePanelLogger::debug(const char* message)
{
writeToMessagePanel(RI_LL_DEBUG, message, fileName, lineNumber);
writeToMessagePanel(RI_LL_DEBUG, message);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuMessagePanelLogger::writeToMessagePanel(RILogLevel messageLevel, const char* message, const char* fileName, int lineNumber)
void RiuMessagePanelLogger::writeToMessagePanel(RILogLevel messageLevel, const char* message)
{
if (messageLevel > m_logLevel)
{
@@ -200,13 +192,7 @@ void RiuMessagePanelLogger::writeToMessagePanel(RILogLevel messageLevel, const c
if (m_messagePanel)
{
QString codeLocation;
if (messageLevel == RI_LL_ERROR)
{
codeLocation = QString("(file %1, line %2)").arg(RiaLogger::shortFileName(fileName)).arg(lineNumber);
}
m_messagePanel->addMessage(messageLevel, message, codeLocation);
m_messagePanel->addMessage(messageLevel, message);
}
}

12
ApplicationCode/UserInterface/RiuMessagePanel.h
View File

@@ -39,7 +39,7 @@ class RiuMessagePanel : public QWidget
public:
RiuMessagePanel(QDockWidget* parent);
void addMessage(RILogLevel messageLevel, const QString& msg, const QString& srcInfo);
void addMessage(RILogLevel messageLevel, const QString& msg);
virtual QSize sizeHint () const;
private slots:
@@ -65,13 +65,13 @@ public:
virtual int level() const override;
virtual void setLevel(int logLevel) override;
virtual void error( const char* message, const char* fileName, int lineNumber) override;
virtual void warning(const char* message, const char* fileName, int lineNumber) override;
virtual void info( const char* message, const char* fileName, int lineNumber) override;
virtual void debug( const char* message, const char* fileName, int lineNumber) override;
virtual void error( const char* message) override;
virtual void warning(const char* message) override;
virtual void info( const char* message) override;
virtual void debug( const char* message) override;
private:
void writeToMessagePanel(RILogLevel messageLevel, const char* message, const char* fileName, int lineNumber);
void writeToMessagePanel(RILogLevel messageLevel, const char* message);
private:
QPointer<RiuMessagePanel> m_messagePanel;