Fixed zooming when preset camera is other than 'PresetFrontLow'

Removed some qmake warnings

4 files changed, 6 insertions, 15 deletions

diff --git a/src/datavis3d/engine/q3dbars.cpp b/src/datavis3d/engine/q3dbars.cpp
index 93ecaf14..247da8da 100644
--- a/src/datavis3d/engine/q3dbars.cpp
+++ b/src/datavis3d/engine/q3dbars.cpp
@@ -128,6 +128,7 @@ void Q3DBars::render()
 
     if (d_ptr->m_paintDevice) {
         QPainter painter(d_ptr->m_paintDevice);
+        painter.setRenderHint(QPainter::HighQualityAntialiasing, true);
         render(&painter);
         painter.end();
     }
diff --git a/src/datavis3d/engine/q3dbars.h b/src/datavis3d/engine/q3dbars.h
index dee30d9a..e21562c8 100644
--- a/src/datavis3d/engine/q3dbars.h
+++ b/src/datavis3d/engine/q3dbars.h
@@ -1,8 +1,8 @@
 #ifndef Q3DBARS_H
 #define Q3DBARS_H
 
-#include "qdatavis3dglobal.h"
-#include "q3dwindow.h"
+#include "QtDataVis3D/qdatavis3dglobal.h"
+#include "QtDataVis3D/q3dwindow.h"
 
 class QOpenGLShaderProgram;
 
diff --git a/src/datavis3d/engine/q3dwindow.h b/src/datavis3d/engine/q3dwindow.h
index 84ef3b2e..922ef5fd 100644
--- a/src/datavis3d/engine/q3dwindow.h
+++ b/src/datavis3d/engine/q3dwindow.h
@@ -39,20 +39,10 @@
 **
 ****************************************************************************/
 
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-
 #ifndef Q3DWINDOW_H
 #define Q3DWINDOW_H
 
-#include "qdatavis3dglobal.h"
+#include "QtDataVis3D/qdatavis3dglobal.h"
 #include "q3dwindow_p.h"
 
 #include <QWindow>
diff --git a/src/datavis3d/utils/camerahelper.cpp b/src/datavis3d/utils/camerahelper.cpp
index bef73a56..89993881 100644
--- a/src/datavis3d/utils/camerahelper.cpp
+++ b/src/datavis3d/utils/camerahelper.cpp
@@ -81,10 +81,10 @@ QMatrix4x4 CameraHelper::calculateViewMatrix(QPoint mousePos, int zoom
     viewMatrix.rotate(m_xRotation, 0, cos(m_yRotation*m_pi/180), sin(m_yRotation*m_pi/180));
     // y rotation is always "clean"
     viewMatrix.rotate(m_yRotation, 1.0f, 0, 0);
-    // Compensate for translation (if m_target is off origin)
-    viewMatrix.translate(-m_target.x(), -m_target.y(), -m_target.z());
     // handle zoom by scaling
     viewMatrix.scale((float)zoom / 100.0f);
+    // Compensate for translation (if m_target is off origin)
+    viewMatrix.translate(-m_target.x(), -m_target.y(), -m_target.z());
     //qDebug() << m_xRotation << m_yRotation;
 
     //qDebug() << "sin(m_yRotation)" << sin(m_yRotation*m_pi/180);