Skip to content

Commit d49fcf2

Browse files
committed
cafTestApplication: Add console logging support
Registers a ConsoleLogger to handle PDM logging output and removes manual std::cout calls from test PDM objects in favor of the framework's logging system.
1 parent 3635a38 commit d49fcf2

File tree

3 files changed

+20
-12
lines changed

3 files changed

+20
-12
lines changed

Fwk/AppFwk/cafTests/cafTestApplication/Main.cpp

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,33 @@
44
#include "cafCmdFeatureManager.h"
55
#include "cafFactory.h"
66
#include "cafPdmDefaultObjectFactory.h"
7+
#include "cafPdmLogging.h"
78
#include "cafPdmUiFieldEditorHandle.h"
89
#include "cafUiAppearanceSettings.h"
910

1011
#include <QApplication>
1112

13+
#include <iostream>
14+
15+
class ConsoleLogger : public caf::PdmLogger
16+
{
17+
public:
18+
int level() const override { return static_cast<int>( caf::PdmLogLevel::PDM_LL_DEBUG ); }
19+
void setLevel( int logLevel ) override {}
20+
21+
void error( const QString& message ) override { std::cout << "ERROR: " << message.toStdString() << std::endl; }
22+
void warning( const QString& message ) override { std::cout << "WARNING: " << message.toStdString() << std::endl; }
23+
void info( const QString& message ) override { std::cout << "INFO: " << message.toStdString() << std::endl; }
24+
void debug( const QString& message ) override { std::cout << "DEBUG: " << message.toStdString() << std::endl; }
25+
};
26+
1227
int main( int argc, char* argv[] )
1328
{
1429
// https://www.w3.org/wiki/CSS/Properties/color/keywords
1530
caf::UiAppearanceSettings::instance()->setAutoValueEditorColor( "moccasin" );
1631

32+
caf::PdmLogging::registerLogger( std::make_shared<ConsoleLogger>() );
33+
1734
auto appExitCode = 0;
1835
{
1936
QApplication app( argc, argv );
@@ -28,6 +45,7 @@ int main( int argc, char* argv[] )
2845
appExitCode = app.exec();
2946
}
3047

48+
caf::PdmLogging::clearAllLoggers();
3149
caf::CmdFeatureManager::deleteSingleton();
3250
caf::PdmDefaultObjectFactory::deleteSingleton();
3351

Fwk/AppFwk/cafTests/cafTestApplication/PdmObjects/ManyGroups.h

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,16 +24,8 @@ class ManyGroups : public caf::PdmObject
2424

2525
void fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue ) override;
2626

27-
void setDoubleMember( const double& d )
28-
{
29-
m_doubleMember = d;
30-
std::cout << "setDoubleMember" << std::endl;
31-
}
32-
double doubleMember() const
33-
{
34-
std::cout << "doubleMember" << std::endl;
35-
return m_doubleMember;
36-
}
27+
void setDoubleMember( const double& d ) { m_doubleMember = d; }
28+
double doubleMember() const { return m_doubleMember; }
3729

3830
//--------------------------------------------------------------------------------------------------
3931
///

Fwk/AppFwk/cafTests/cafTestApplication/PdmObjects/SmallDemoPdmObject.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,13 @@ void SmallDemoPdmObject::fieldChangedByUi( const caf::PdmFieldHandle* changedFie
178178
void SmallDemoPdmObject::setDoubleMember( const double& d )
179179
{
180180
m_doubleMember = d;
181-
std::cout << "setDoubleMember" << std::endl;
182181
}
183182

184183
//--------------------------------------------------------------------------------------------------
185184
///
186185
//--------------------------------------------------------------------------------------------------
187186
double SmallDemoPdmObject::doubleMember() const
188187
{
189-
std::cout << "doubleMember" << std::endl;
190188
return m_doubleMember;
191189
}
192190

0 commit comments

Comments
 (0)