From dae4c0aa935daa00a70eabacc2f0592f510f68c2 Mon Sep 17 00:00:00 2001
From: stathis <doc@fotis-laptop.(none)>
Date: Wed, 20 Aug 2008 22:15:57 +0300
Subject: [PATCH] Use qDebug() plus some new debug messages

---
 qt/sphere-orbit-camera-gui/myglwidget.cpp | 39 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/qt/sphere-orbit-camera-gui/myglwidget.cpp b/qt/sphere-orbit-camera-gui/myglwidget.cpp
index 0753f48..c390018 100644
--- a/qt/sphere-orbit-camera-gui/myglwidget.cpp
+++ b/qt/sphere-orbit-camera-gui/myglwidget.cpp
@@ -14,7 +14,7 @@ MyGLWidget::MyGLWidget(Axis *pAxisX, Axis *pAxisY, Axis *pAxisZ,
                        unsigned int timerInterval, QWidget *parent)
     : QGLWidget(parent)
 {
-    std::cout << "GLWidget() constructor\n";
+    qDebug("MyGLWidget::MyGLWidget()");
 
     m_pAxisX = pAxisX;
     m_pAxisY = pAxisY;
@@ -36,12 +36,12 @@ MyGLWidget::MyGLWidget(Axis *pAxisX, Axis *pAxisY, Axis *pAxisZ,
 
 MyGLWidget::~MyGLWidget()
 {
-    std::cout << "MyGLWidget::~GLWidget() deconstructor\n";
+    qDebug("MyGLWidget::~MyGLWidget()");
 }
 
 void MyGLWidget::initializeGL()
 {
-    std::cout << "MyGLWidget::initializeGL()\n";
+    qDebug("MyGLWidget::initializeGL()");
 
     // Enable backface culling
     glEnable(GL_CULL_FACE);
@@ -61,7 +61,7 @@ void MyGLWidget::initializeGL()
 
 void MyGLWidget::paintGL()
 {
-    std::cout << "MyGLWidget::paintGL()\n";
+    qDebug("MyGLWidget::paintGL()");
 
     // Clear scene
     glClear(GL_COLOR_BUFFER_BIT);
@@ -116,9 +116,8 @@ void MyGLWidget::paintGL()
 
 void MyGLWidget::resizeGL(int width, int height)
 {
-    std::cout << "MyGLWidget::resizeGL()\n";
-    std::cout << "New width = " << width
-              << "\nNew height = " << height << "\n";
+    qDebug("MyGLWidget::resizeGL()\n"
+	   "New width = %d\tNew height = %d", width, height);
 
     // Update viewport to cover the whole screen
     glViewport(0, 0, width, height);
@@ -133,21 +132,13 @@ void MyGLWidget::resizeGL(int width, int height)
     glLoadIdentity();
 }
 
-void MyGLWidget::drawAxis(void)
-{
-    std::cout << "MyGLWidget::drawAxis()\n";
-    std::cout << "m_pAxisX = " << m_pAxisX
-              << "\tm_pAxisY = " << m_pAxisY
-              << "\tm_pAxisZ = " << m_pAxisZ << "\n";
-}
-
 void MyGLWidget::pullData(void)
 {
-    std::cout << "MyGLWidget::pullData()\n";
+    qDebug("MyGLWidget::pullData()");
 
     mutex.lock();
     if (data.size() >= 6) {
-        std::cout << data.size() << "\n";
+        qDebug("Queue size = %d", data.size());
         m_xCoord = data.dequeue();
         m_yCoord = data.dequeue();
         m_zCoord = data.dequeue();
@@ -157,7 +148,7 @@ void MyGLWidget::pullData(void)
     }
     else {
         mutex.unlock();
-        std::cout << "MyGLWidget::pullData()\t[WAKING THREAD]\n";
+        qDebug("WAKING THREAD");
         m_thread.condition.wakeOne();
         return;
     }
@@ -167,22 +158,30 @@ void MyGLWidget::pullData(void)
 
 void MyGLWidget::startWorkerThread(void)
 {
+    qDebug("MyGLWidget::startWorkerThread()");
+
     m_thread.setData(&this->data);
     m_thread.start();
 }
 
 void MyGLWidget::startAnimation(void)
 {
+    qDebug("MyGLWidget::startAnimation()");
+
     m_timer.start(m_timerInterval);
 }
 
 void MyGLWidget::stopAnimation(void)
 {
+    qDebug("MyGLWidget::stopAnimation()");
+
     m_timer.stop();
 }
 
 void MyGLWidget::setAxis(axis_t axis, const Axis *pAxis)
 {
+    qDebug("MyGLWidget::setAxis()");
+
     switch(axis) {
     case AXIS_X:
         m_pAxisX = pAxis;
@@ -198,10 +197,14 @@ void MyGLWidget::setAxis(axis_t axis, const Axis *pAxis)
 
 void MyGLWidget::setCamera(const Camera *pCamera)
 {
+    qDebug("MyGLWidget::setCamera()");
+
     m_pCamera = pCamera;
 }
 
 void MyGLWidget::setSphere(const Sphere *pSphere)
 {
+    qDebug("MyGLWidge::setSphere()");
+
     m_pSphere = pSphere;
 }
-- 
2.11.4.GIT