From ae66bdce9584d2e84b37bfb5c987c3d07e3887bb Mon Sep 17 00:00:00 2001
From: Maxime Gimeno <maxime.gimeno@gmail.com>
Date: Mon, 30 Nov 2015 09:50:10 +0100
Subject: [PATCH] Update QGLWidget to QOpenGLWidget.

---
 .../Reconstruction_simplification_2_demo.cpp           |  2 +-
 .../demo/Reconstruction_simplification_2/glviewer.cpp  | 10 +++++-----
 .../demo/Reconstruction_simplification_2/glviewer.h    |  4 ++--
 .../demo/Reconstruction_simplification_2/window.cpp    |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/Reconstruction_simplification_2_demo.cpp b/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/Reconstruction_simplification_2_demo.cpp
index 7b242aea16e..72bb286f697 100644
--- a/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/Reconstruction_simplification_2_demo.cpp
+++ b/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/Reconstruction_simplification_2_demo.cpp
@@ -6,8 +6,8 @@ int main(int argv, char **args)
   srand(1);
   QApplication app(argv, args);
   app.setApplicationName("Reconstruction_simplification_2 Demo");
+  int i =0;
   MainWindow window;
-
   window.show();
   return app.exec();
 }
diff --git a/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/glviewer.cpp b/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/glviewer.cpp
index 0cc09acf828..2dea0890bea 100644
--- a/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/glviewer.cpp
+++ b/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/glviewer.cpp
@@ -5,7 +5,7 @@
 #include "glviewer.h"
 
 GlViewer::GlViewer(QWidget *pParent)
-: QGLWidget(QGLFormat(QGL::SampleBuffers), pParent)
+: QOpenGLWidget(pParent)
 {
   m_scene = NULL;
 
@@ -50,11 +50,11 @@ void GlViewer::initializeGL()
   glClearColor(1., 1., 1., 0.);
   glDisable(GL_DEPTH_TEST);
   glEnable(GL_SMOOTH);
-  resizeGL(width(), height());
 }
 
 void GlViewer::paintGL() 
 {
+
   glClear(GL_COLOR_BUFFER_BIT);
   if (!m_scene) return;
 
@@ -85,7 +85,7 @@ void GlViewer::wheelEvent(QWheelEvent *event)
   if (!m_scene) return;
   m_scale += 0.05 * (event->delta() / 120);
   if (m_scale <= 0.0) m_scale = 0.0;
-  updateGL();
+  update();
 }
 
 void GlViewer::mousePressEvent(QMouseEvent *event) 
@@ -120,7 +120,7 @@ void GlViewer::mouseMoveEvent(QMouseEvent *event)
   }
 
   m_mouse_click = m_mouse_move;
-  updateGL();
+  update();
 }
 
 void GlViewer::mouseReleaseEvent(QMouseEvent *event) 
@@ -140,7 +140,7 @@ void GlViewer::mouseReleaseEvent(QMouseEvent *event)
 
   m_mouse_click = m_mouse_move;
   setCursor(QCursor(Qt::ArrowCursor));
-  updateGL();
+  update();
 }
 
 void GlViewer::sample_mouse_path(const QPoint& point)
diff --git a/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/glviewer.h b/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/glviewer.h
index 50f8d3dc1c0..84249d91349 100644
--- a/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/glviewer.h
+++ b/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/glviewer.h
@@ -2,13 +2,13 @@
 #define GLWIDGET_H
 
 // Qt
-#include <QGLWidget>
+#include <QOpenGLWidget>
 #include <QPaintEvent>
 
 // local
 #include "scene.h"
 
-class GlViewer : public QGLWidget 
+class GlViewer : public QOpenGLWidget
 {
     Q_OBJECT
     
diff --git a/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/window.cpp b/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/window.cpp
index 63b81b2acf7..dbb3309d98c 100644
--- a/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/window.cpp
+++ b/Reconstruction_simplification_2/demo/Reconstruction_simplification_2/window.cpp
@@ -44,6 +44,7 @@ maxNumRecentFiles(15), recentFileActs(15)
   connect(min_mass_slider, SIGNAL(valueChanged(int)), this, SLOT(update()));
   connect(this, SIGNAL(openRecentFile(QString)), this, SLOT(open(QString)));
   Q_EMIT update();
+  viewer->update();
 }
 
 MainWindow::~MainWindow()
@@ -187,7 +188,7 @@ void MainWindow::on_actionSnapshot_triggered()
   QClipboard *qb = QApplication::clipboard();
   viewer->makeCurrent();
   viewer->raise();
-  QImage snapshot = viewer->grabFrameBuffer(true);
+  QImage snapshot = viewer->grabFramebuffer();
   qb->setImage(snapshot);
   QApplication::restoreOverrideCursor();
   std::cout << "done" << std::endl;