mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#4683 clang-format on all files in ApplicationCode
This commit is contained in:
@@ -1,17 +1,17 @@
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Copyright (C) 2017- Statoil ASA
|
||||
//
|
||||
//
|
||||
// ResInsight is free software: you can redistribute it and/or modify
|
||||
// it under the terms of the GNU General Public License as published by
|
||||
// the Free Software Foundation, either version 3 of the License, or
|
||||
// (at your option) any later version.
|
||||
//
|
||||
//
|
||||
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
// FITNESS FOR A PARTICULAR PURPOSE.
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
//
|
||||
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
|
||||
// for more details.
|
||||
//
|
||||
/////////////////////////////////////////////////////////////////////////////////
|
||||
@@ -25,60 +25,62 @@
|
||||
#include <QPlainTextEdit>
|
||||
#include <QVBoxLayout>
|
||||
|
||||
|
||||
|
||||
//==================================================================================================
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//==================================================================================================
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RiuMessagePanel::RiuMessagePanel(QDockWidget* parent)
|
||||
: QWidget(parent)
|
||||
RiuMessagePanel::RiuMessagePanel( QDockWidget* parent )
|
||||
: QWidget( parent )
|
||||
{
|
||||
QVBoxLayout* layout = new QVBoxLayout(this);
|
||||
layout->setMargin(0);
|
||||
QVBoxLayout* layout = new QVBoxLayout( this );
|
||||
layout->setMargin( 0 );
|
||||
|
||||
m_textEdit = new QPlainTextEdit;
|
||||
m_textEdit->setReadOnly(true);
|
||||
m_textEdit->setLineWrapMode(QPlainTextEdit::NoWrap);
|
||||
m_textEdit->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
m_textEdit->setReadOnly( true );
|
||||
m_textEdit->setLineWrapMode( QPlainTextEdit::NoWrap );
|
||||
m_textEdit->setContextMenuPolicy( Qt::CustomContextMenu );
|
||||
|
||||
connect(m_textEdit, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(slotShowContextMenu(const QPoint&)));
|
||||
connect( m_textEdit,
|
||||
SIGNAL( customContextMenuRequested( const QPoint& ) ),
|
||||
SLOT( slotShowContextMenu( const QPoint& ) ) );
|
||||
|
||||
layout->addWidget(m_textEdit);
|
||||
layout->addWidget( m_textEdit );
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessagePanel::addMessage(RILogLevel messageLevel, const QString& msg)
|
||||
void RiuMessagePanel::addMessage( RILogLevel messageLevel, const QString& msg )
|
||||
{
|
||||
QColor clr(Qt::black);
|
||||
if (messageLevel == RI_LL_ERROR) clr = Qt::red;
|
||||
else if (messageLevel == RI_LL_WARNING) clr = QColor(220,100,10);
|
||||
else if (messageLevel == RI_LL_DEBUG) clr = QColor(100,100,200);
|
||||
QColor clr( Qt::black );
|
||||
if ( messageLevel == RI_LL_ERROR )
|
||||
clr = Qt::red;
|
||||
else if ( messageLevel == RI_LL_WARNING )
|
||||
clr = QColor( 220, 100, 10 );
|
||||
else if ( messageLevel == RI_LL_DEBUG )
|
||||
clr = QColor( 100, 100, 200 );
|
||||
|
||||
QTextCharFormat form = m_textEdit->currentCharFormat();
|
||||
form.setForeground(clr);
|
||||
form.setFontWeight(messageLevel == RI_LL_ERROR ? QFont::DemiBold : QFont::Normal);
|
||||
form.setFontItalic(messageLevel == RI_LL_DEBUG ? true : false);
|
||||
m_textEdit->setCurrentCharFormat(form);
|
||||
m_textEdit->appendPlainText(msg);
|
||||
form.setForeground( clr );
|
||||
form.setFontWeight( messageLevel == RI_LL_ERROR ? QFont::DemiBold : QFont::Normal );
|
||||
form.setFontItalic( messageLevel == RI_LL_DEBUG ? true : false );
|
||||
m_textEdit->setCurrentCharFormat( form );
|
||||
m_textEdit->appendPlainText( msg );
|
||||
|
||||
m_textEdit->moveCursor(QTextCursor::End);
|
||||
m_textEdit->moveCursor( QTextCursor::End );
|
||||
m_textEdit->ensureCursorVisible();
|
||||
|
||||
if (!RiaRegressionTestRunner::instance()->isRunningRegressionTests())
|
||||
if ( !RiaRegressionTestRunner::instance()->isRunningRegressionTests() )
|
||||
{
|
||||
if (messageLevel == RI_LL_ERROR || messageLevel == RI_LL_WARNING)
|
||||
if ( messageLevel == RI_LL_ERROR || messageLevel == RI_LL_WARNING )
|
||||
{
|
||||
QDockWidget* parentDockWidget = dynamic_cast<QDockWidget*>(this->parent());
|
||||
if (parentDockWidget && !parentDockWidget->isVisible())
|
||||
QDockWidget* parentDockWidget = dynamic_cast<QDockWidget*>( this->parent() );
|
||||
if ( parentDockWidget && !parentDockWidget->isVisible() )
|
||||
{
|
||||
parentDockWidget->toggleViewAction()->trigger();
|
||||
}
|
||||
@@ -86,137 +88,123 @@ void RiuMessagePanel::addMessage(RILogLevel messageLevel, const QString& msg)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QSize RiuMessagePanel::sizeHint() const
|
||||
{
|
||||
return QSize(20, 20);
|
||||
return QSize( 20, 20 );
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessagePanel::slotShowContextMenu(const QPoint& pos)
|
||||
void RiuMessagePanel::slotShowContextMenu( const QPoint& pos )
|
||||
{
|
||||
QMenu menu;
|
||||
|
||||
// Reworked from implemenmtation in QTextControl::createStandardContextMenu()
|
||||
{
|
||||
QAction* a = menu.addAction("&Copy", m_textEdit, SLOT(copy()), QKeySequence::Copy);
|
||||
a->setEnabled(m_textEdit->textCursor().hasSelection());
|
||||
QAction* a = menu.addAction( "&Copy", m_textEdit, SLOT( copy() ), QKeySequence::Copy );
|
||||
a->setEnabled( m_textEdit->textCursor().hasSelection() );
|
||||
}
|
||||
{
|
||||
menu.addSeparator();
|
||||
QAction* a = menu.addAction("Select All", m_textEdit, SLOT(selectAll()), QKeySequence::SelectAll);
|
||||
a->setEnabled(!m_textEdit->document()->isEmpty());
|
||||
QAction* a = menu.addAction( "Select All", m_textEdit, SLOT( selectAll() ), QKeySequence::SelectAll );
|
||||
a->setEnabled( !m_textEdit->document()->isEmpty() );
|
||||
}
|
||||
|
||||
menu.addSeparator();
|
||||
menu.addAction("Clear All &Messages", this, SLOT(slotClearMessages()));
|
||||
|
||||
menu.exec(m_textEdit->mapToGlobal(pos));
|
||||
menu.addAction( "Clear All &Messages", this, SLOT( slotClearMessages() ) );
|
||||
|
||||
menu.exec( m_textEdit->mapToGlobal( pos ) );
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessagePanel::slotClearMessages()
|
||||
{
|
||||
m_textEdit->clear();
|
||||
|
||||
RiaLogging::info("Message window cleared.");
|
||||
RiaLogging::info( "Message window cleared." );
|
||||
}
|
||||
|
||||
|
||||
|
||||
//==================================================================================================
|
||||
//
|
||||
//
|
||||
//
|
||||
//
|
||||
//==================================================================================================
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RiuMessagePanelLogger::RiuMessagePanelLogger(RiuMessagePanel* messagePanel)
|
||||
: m_messagePanel(messagePanel),
|
||||
m_logLevel(RI_LL_WARNING)
|
||||
RiuMessagePanelLogger::RiuMessagePanelLogger( RiuMessagePanel* messagePanel )
|
||||
: m_messagePanel( messagePanel )
|
||||
, m_logLevel( RI_LL_WARNING )
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
int RiuMessagePanelLogger::level() const
|
||||
{
|
||||
return m_logLevel;
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessagePanelLogger::setLevel(int logLevel)
|
||||
void RiuMessagePanelLogger::setLevel( int logLevel )
|
||||
{
|
||||
m_logLevel = logLevel;
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessagePanelLogger::error(const char* message)
|
||||
void RiuMessagePanelLogger::error( const char* message )
|
||||
{
|
||||
writeToMessagePanel(RI_LL_ERROR, message);
|
||||
writeToMessagePanel( RI_LL_ERROR, message );
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessagePanelLogger::warning(const char* message)
|
||||
void RiuMessagePanelLogger::warning( const char* message )
|
||||
{
|
||||
writeToMessagePanel(RI_LL_WARNING, message);
|
||||
writeToMessagePanel( RI_LL_WARNING, message );
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessagePanelLogger::info(const char* message)
|
||||
void RiuMessagePanelLogger::info( const char* message )
|
||||
{
|
||||
writeToMessagePanel(RI_LL_INFO, message);
|
||||
writeToMessagePanel( RI_LL_INFO, message );
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessagePanelLogger::debug(const char* message)
|
||||
void RiuMessagePanelLogger::debug( const char* message )
|
||||
{
|
||||
writeToMessagePanel(RI_LL_DEBUG, message);
|
||||
writeToMessagePanel( RI_LL_DEBUG, message );
|
||||
}
|
||||
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RiuMessagePanelLogger::writeToMessagePanel(RILogLevel messageLevel, const char* message)
|
||||
void RiuMessagePanelLogger::writeToMessagePanel( RILogLevel messageLevel, const char* message )
|
||||
{
|
||||
if (messageLevel > m_logLevel)
|
||||
if ( messageLevel > m_logLevel )
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_messagePanel)
|
||||
if ( m_messagePanel )
|
||||
{
|
||||
m_messagePanel->addMessage(messageLevel, message);
|
||||
m_messagePanel->addMessage( messageLevel, message );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user