Cross-thread lambda functions fail on win32

[fstl] / src / canvas.cpp

diff --git a/src/canvas.cpp b/src/canvas.cpp
index 346890751b80e02fb2b2af22332d43017d1b042f..930fd2cde13402b6c0b2bbd37eb803103fdf6a6f 100644 (file)
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -1,13 +1,16 @@
 #include <QMouseEvent>
 #include <QDebug>
 
+#include <cmath>
+
 #include "canvas.h"
+#include "backdrop.h"
 #include "glmesh.h"
 #include "mesh.h"
 
 Canvas::Canvas(const QGLFormat& format, QWidget *parent)
     : QGLWidget(format, parent), mesh(NULL),
-      scale(1), tilt(90), yaw(0)
+      scale(1), tilt(90), yaw(0), status(" ")
 {
     // Nothing to do here
 }
@@ -27,29 +30,51 @@ void Canvas::load_mesh(Mesh* m)
                 pow(m->xmax() - m->xmin(), 2) +
                 pow(m->ymax() - m->ymin(), 2) +
                 pow(m->zmax() - m->zmin(), 2));
-
     update();
 
     delete m;
 }
 
+void Canvas::set_status(const QString &s)
+{
+    status = s;
+    update();
+}
+
+void Canvas::clear_status()
+{
+    status = "";
+    update();
+}
+
 void Canvas::initializeGL()
 {
     mesh_shader.addShaderFromSourceFile(QGLShader::Vertex, ":/gl/mesh.vert");
     mesh_shader.addShaderFromSourceFile(QGLShader::Fragment, ":/gl/mesh.frag");
     mesh_shader.link();
 
-    glClearColor(0.0, 0.0, 0.0, 0.0);
-    glEnable(GL_DEPTH_TEST);
+    backdrop = new Backdrop();
 }
 
-void Canvas::paintGL()
+void Canvas::paintEvent(QPaintEvent *event)
 {
+    Q_UNUSED(event);
+
+    glClearColor(0.0, 0.0, 0.0, 0.0);
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glEnable(GL_DEPTH_TEST);
 
+    backdrop->draw();
     if (mesh)  draw_mesh();
+
+    if (status.isNull())    return;
+
+    QPainter painter(this);
+    painter.setRenderHint(QPainter::Antialiasing);
+    painter.drawText(10, height() - 10, status);
 }
 
+
 void Canvas::draw_mesh()
 {
     mesh_shader.bind();
@@ -89,11 +114,11 @@ QMatrix4x4 Canvas::view_matrix() const
     QMatrix4x4 m;
     if (width() > height())
     {
-        m.scale(height() / float(width()), 1, 0.5);
+        m.scale(-height() / float(width()), 1, 0.5);
     }
     else
     {
-        m.scale(1, width() / float(height()), 0.5);
+        m.scale(-1, width() / float(height()), 0.5);
     }
     return m;
 }
@@ -121,7 +146,7 @@ void Canvas::mouseMoveEvent(QMouseEvent* event)
     {
         auto p = event->pos();
         auto d = p - mouse_pos;
-        yaw = fmod(yaw + d.x(), 360);
+        yaw = fmod(yaw - d.x(), 360);
         tilt = fmax(0, fmin(180, tilt - d.y()));
         mouse_pos = p;
         update();