From 911e3118f5afccec777fdcdbc9b37f0c784b540b Mon Sep 17 00:00:00 2001 From: Philippe Renon Date: Sun, 13 Mar 2016 16:20:28 +0100 Subject: [PATCH] LP-29 start silencing osg debug output --- ground/gcs/src/libs/osgearth/osgearth.cpp | 2 ++ ground/gcs/src/libs/osgearth/osgearth.pro | 2 +- ground/gcs/src/libs/osgearth/qtwindowingsystem.cpp | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ground/gcs/src/libs/osgearth/osgearth.cpp b/ground/gcs/src/libs/osgearth/osgearth.cpp index b40d864c5..18062c685 100644 --- a/ground/gcs/src/libs/osgearth/osgearth.cpp +++ b/ground/gcs/src/libs/osgearth/osgearth.cpp @@ -107,7 +107,9 @@ void OsgEarth::initialize() initializeCache(); +#ifdef OSG_VERBOSE displayInfo(); +#endif } void OsgEarth::initializePathes() diff --git a/ground/gcs/src/libs/osgearth/osgearth.pro b/ground/gcs/src/libs/osgearth/osgearth.pro index 01c70636d..fda4784e1 100644 --- a/ground/gcs/src/libs/osgearth/osgearth.pro +++ b/ground/gcs/src/libs/osgearth/osgearth.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = GCSOsgEarth DEFINES += OSGEARTH_LIBRARY -#CONFIG += mys2 +#DEFINES += OSG_VERBOSE osg:DEFINES += USE_OSG osgQt:DEFINES += USE_OSG_QT diff --git a/ground/gcs/src/libs/osgearth/qtwindowingsystem.cpp b/ground/gcs/src/libs/osgearth/qtwindowingsystem.cpp index 3ac9a0297..0196d5af0 100644 --- a/ground/gcs/src/libs/osgearth/qtwindowingsystem.cpp +++ b/ground/gcs/src/libs/osgearth/qtwindowingsystem.cpp @@ -116,7 +116,7 @@ GraphicsWindowQt::~GraphicsWindowQt() void GraphicsWindowQt::init() { - qDebug() << "GraphicsWindowQt::init"; + // qDebug() << "GraphicsWindowQt::init"; if (_closing || _initialized) { return; } @@ -199,7 +199,7 @@ bool GraphicsWindowQt::valid() const bool GraphicsWindowQt::realizeImplementation() { - qDebug() << "GraphicsWindowQt::realizeImplementation"; + // qDebug() << "GraphicsWindowQt::realizeImplementation"; // save the current context // note: this will save only Qt-based contexts @@ -224,7 +224,9 @@ bool GraphicsWindowQt::realizeImplementation() _surface = new QOffscreenSurface(); _surface->setFormat(_glContext->format()); _surface->create(); +#ifdef OSG_VERBOSE osgQtQuick::formatInfo(_surface->format()); +#endif } else { qDebug() << "GraphicsWindowQt::realizeImplementation - using current context"; _glContext = currentContext;