mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-26 15:54:15 +01:00
LP-29 more osgearth log silencing
This commit is contained in:
parent
7212d65a1f
commit
2c75badb0b
@ -77,7 +77,6 @@ OSGBillboardNode::OSGBillboardNode(QObject *parent) : Inherited(parent), h(new H
|
|||||||
|
|
||||||
OSGBillboardNode::~OSGBillboardNode()
|
OSGBillboardNode::~OSGBillboardNode()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGBillboardNode::~OSGBillboardNode";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -196,7 +196,6 @@ OSGCamera::OSGCamera(QObject *parent) : Inherited(parent), h(new Hidden(this))
|
|||||||
|
|
||||||
OSGCamera::~OSGCamera()
|
OSGCamera::~OSGCamera()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGCamera::~OSGCamera";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -151,7 +151,6 @@ OSGFileNode::OSGFileNode(QObject *parent) : Inherited(parent), h(new Hidden(this
|
|||||||
|
|
||||||
OSGFileNode::~OSGFileNode()
|
OSGFileNode::~OSGFileNode()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGFileNode::~OSGFileNode";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -160,7 +160,6 @@ OSGGeoTransformNode::OSGGeoTransformNode(QObject *parent) : Inherited(parent), h
|
|||||||
|
|
||||||
OSGGeoTransformNode::~OSGGeoTransformNode()
|
OSGGeoTransformNode::~OSGGeoTransformNode()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGGeoTransformNode::~OSGGeoTransformNode";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -196,7 +196,6 @@ OSGGroup::OSGGroup(QObject *parent) : Inherited(parent), h(new Hidden(this))
|
|||||||
|
|
||||||
OSGGroup::~OSGGroup()
|
OSGGroup::~OSGGroup()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGGroup::~OSGGroup";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -93,7 +93,6 @@ OSGImageNode::OSGImageNode(QObject *parent) : Inherited(parent), h(new Hidden(th
|
|||||||
|
|
||||||
OSGImageNode::~OSGImageNode()
|
OSGImageNode::~OSGImageNode()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGImageNode::~OSGImageNode";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -82,7 +82,6 @@ OSGShapeNode::OSGShapeNode(QObject *parent) : Inherited(parent), h(new Hidden(th
|
|||||||
|
|
||||||
OSGShapeNode::~OSGShapeNode()
|
OSGShapeNode::~OSGShapeNode()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGShapeNode::~OSGShapeNode";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -230,7 +230,6 @@ OSGSkyNode::OSGSkyNode(QObject *parent) : Inherited(parent), h(new Hidden(this))
|
|||||||
|
|
||||||
OSGSkyNode::~OSGSkyNode()
|
OSGSkyNode::~OSGSkyNode()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGSkyNode::~OSGSkyNode";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -96,7 +96,6 @@ OSGTransformNode::OSGTransformNode(QObject *parent) : Inherited(parent), h(new H
|
|||||||
|
|
||||||
OSGTransformNode::~OSGTransformNode()
|
OSGTransformNode::~OSGTransformNode()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGTransformNode::~OSGTransformNode";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -614,7 +614,6 @@ OSGViewport::OSGViewport(QQuickItem *parent) : Inherited(parent), h(new Hidden(t
|
|||||||
|
|
||||||
OSGViewport::~OSGViewport()
|
OSGViewport::~OSGViewport()
|
||||||
{
|
{
|
||||||
// qDebug() << "OSGViewport::~OSGViewport";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -110,7 +110,6 @@ OSGCameraManipulator::OSGCameraManipulator(QObject *parent) : QObject(parent), h
|
|||||||
|
|
||||||
OSGCameraManipulator::~OSGCameraManipulator()
|
OSGCameraManipulator::~OSGCameraManipulator()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGCameraManipulator::~OSGCameraManipulator";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +62,6 @@ OSGEarthManipulator::OSGEarthManipulator(QObject *parent) : Inherited(parent), h
|
|||||||
|
|
||||||
OSGEarthManipulator::~OSGEarthManipulator()
|
OSGEarthManipulator::~OSGEarthManipulator()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGEarthManipulator::~OSGEarthManipulator";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
} // namespace osgQtQuick
|
} // namespace osgQtQuick
|
||||||
|
@ -208,7 +208,6 @@ OSGGeoTransformManipulator::OSGGeoTransformManipulator(QObject *parent) : Inheri
|
|||||||
|
|
||||||
OSGGeoTransformManipulator::~OSGGeoTransformManipulator()
|
OSGGeoTransformManipulator::~OSGGeoTransformManipulator()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGGeoTransformManipulator::~OSGGeoTransformManipulator";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -127,7 +127,6 @@ OSGNodeTrackerManipulator::OSGNodeTrackerManipulator(QObject *parent) : Inherite
|
|||||||
|
|
||||||
OSGNodeTrackerManipulator::~OSGNodeTrackerManipulator()
|
OSGNodeTrackerManipulator::~OSGNodeTrackerManipulator()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGNodeTrackerManipulator::~OSGNodeTrackerManipulator";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -62,7 +62,6 @@ OSGTrackballManipulator::OSGTrackballManipulator(QObject *parent) : Inherited(pa
|
|||||||
|
|
||||||
OSGTrackballManipulator::~OSGTrackballManipulator()
|
OSGTrackballManipulator::~OSGTrackballManipulator()
|
||||||
{
|
{
|
||||||
qDebug() << "OSGTrackballManipulator::~OSGTrackballManipulator";
|
|
||||||
delete h;
|
delete h;
|
||||||
}
|
}
|
||||||
} // namespace osgQtQuick
|
} // namespace osgQtQuick
|
||||||
|
@ -103,14 +103,14 @@ GraphicsWindowQt::GraphicsWindowQt(osg::GraphicsContext::Traits *traits) :
|
|||||||
_glContext(NULL),
|
_glContext(NULL),
|
||||||
_surface(NULL)
|
_surface(NULL)
|
||||||
{
|
{
|
||||||
qDebug() << "GraphicsWindowQt::GraphicsWindowQt";
|
// qDebug() << "GraphicsWindowQt::GraphicsWindowQt";
|
||||||
_traits = traits;
|
_traits = traits;
|
||||||
init();
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
GraphicsWindowQt::~GraphicsWindowQt()
|
GraphicsWindowQt::~GraphicsWindowQt()
|
||||||
{
|
{
|
||||||
qDebug() << "GraphicsWindowQt::~GraphicsWindowQt";
|
// qDebug() << "GraphicsWindowQt::~GraphicsWindowQt";
|
||||||
close();
|
close();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -217,7 +217,7 @@ bool GraphicsWindowQt::realizeImplementation()
|
|||||||
QOpenGLContext *currentContext = QOpenGLContext::currentContext();
|
QOpenGLContext *currentContext = QOpenGLContext::currentContext();
|
||||||
|
|
||||||
if (!currentContext) {
|
if (!currentContext) {
|
||||||
qDebug() << "GraphicsWindowQt::realizeImplementation - creating owned context";
|
// qDebug() << "GraphicsWindowQt::realizeImplementation - creating owned context";
|
||||||
_owned = true;
|
_owned = true;
|
||||||
_glContext = new QOpenGLContext();
|
_glContext = new QOpenGLContext();
|
||||||
_glContext->create();
|
_glContext->create();
|
||||||
@ -228,7 +228,7 @@ bool GraphicsWindowQt::realizeImplementation()
|
|||||||
osgQtQuick::formatInfo(_surface->format());
|
osgQtQuick::formatInfo(_surface->format());
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
qDebug() << "GraphicsWindowQt::realizeImplementation - using current context";
|
// qDebug() << "GraphicsWindowQt::realizeImplementation - using current context";
|
||||||
_glContext = currentContext;
|
_glContext = currentContext;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -318,7 +318,7 @@ bool GraphicsWindowQt::releaseContextImplementation()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (_owned && _glContext) {
|
if (_owned && _glContext) {
|
||||||
qDebug() << "GraphicsWindowQt::releaseContextImplementation";
|
// qDebug() << "GraphicsWindowQt::releaseContextImplementation";
|
||||||
_glContext->doneCurrent();
|
_glContext->doneCurrent();
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
@ -326,14 +326,14 @@ bool GraphicsWindowQt::releaseContextImplementation()
|
|||||||
|
|
||||||
void GraphicsWindowQt::closeImplementation()
|
void GraphicsWindowQt::closeImplementation()
|
||||||
{
|
{
|
||||||
qDebug() << "GraphicsWindowQt::closeImplementation";
|
// qDebug() << "GraphicsWindowQt::closeImplementation";
|
||||||
_closing = true;
|
_closing = true;
|
||||||
_initialized = false;
|
_initialized = false;
|
||||||
_valid = false;
|
_valid = false;
|
||||||
_realized = false;
|
_realized = false;
|
||||||
if (_owned) {
|
if (_owned) {
|
||||||
if (_glContext) {
|
if (_glContext) {
|
||||||
qDebug() << "GraphicsWindowQt::closeImplementation - deleting owned context";
|
// qDebug() << "GraphicsWindowQt::closeImplementation - deleting owned context";
|
||||||
delete _glContext;
|
delete _glContext;
|
||||||
}
|
}
|
||||||
if (_surface) {
|
if (_surface) {
|
||||||
|
@ -127,16 +127,16 @@ void QuickWidgetProxy::onStatusChanged(QQuickWidget::Status status)
|
|||||||
{
|
{
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case QQuickWidget::Null:
|
case QQuickWidget::Null:
|
||||||
qDebug() << "QuickWidgetProxy - status Null";
|
qWarning() << "QuickWidgetProxy - status Null";
|
||||||
break;
|
break;
|
||||||
case QQuickWidget::Ready:
|
case QQuickWidget::Ready:
|
||||||
qDebug() << "QuickWidgetProxy - status Ready";
|
// qDebug() << "QuickWidgetProxy - status Ready";
|
||||||
break;
|
break;
|
||||||
case QQuickWidget::Loading:
|
case QQuickWidget::Loading:
|
||||||
qDebug() << "QuickWidgetProxy - status Loading";
|
// qDebug() << "QuickWidgetProxy - status Loading";
|
||||||
break;
|
break;
|
||||||
case QQuickWidget::Error:
|
case QQuickWidget::Error:
|
||||||
qDebug() << "QuickWidgetProxy - status Error";
|
qWarning() << "QuickWidgetProxy - status Error";
|
||||||
foreach(const QQmlError &error, errors()) {
|
foreach(const QQmlError &error, errors()) {
|
||||||
qWarning() << error.description();
|
qWarning() << error.description();
|
||||||
}
|
}
|
||||||
@ -148,16 +148,16 @@ void QuickWidgetProxy::onStatusChanged(QQuickView::Status status)
|
|||||||
{
|
{
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case QQuickView::Null:
|
case QQuickView::Null:
|
||||||
qDebug() << "QuickWidgetProxy - status Null";
|
qWarning() << "QuickWidgetProxy - status Null";
|
||||||
break;
|
break;
|
||||||
case QQuickView::Ready:
|
case QQuickView::Ready:
|
||||||
qDebug() << "QuickWidgetProxy - status Ready";
|
// qDebug() << "QuickWidgetProxy - status Ready";
|
||||||
break;
|
break;
|
||||||
case QQuickView::Loading:
|
case QQuickView::Loading:
|
||||||
qDebug() << "QuickWidgetProxy - status Loading";
|
// qDebug() << "QuickWidgetProxy - status Loading";
|
||||||
break;
|
break;
|
||||||
case QQuickView::Error:
|
case QQuickView::Error:
|
||||||
qDebug() << "QuickWidgetProxy - status Error";
|
qWarning() << "QuickWidgetProxy - status Error";
|
||||||
foreach(const QQmlError &error, errors()) {
|
foreach(const QQmlError &error, errors()) {
|
||||||
qWarning() << error.description();
|
qWarning() << error.description();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user