Merge pull request #1108 from kerautret/FixAxisTransp

Fix axis display in transparent elements

ChangeLog.md

@@ -146,6 +146,10 @@
 - *IO Package*
  - Fix viewer tests including qt4 headers even with configuring WITH_QT5=ON.
    (Pablo Hernandez-Cerdan, [#1100](https://github.com/DGtal-team/DGtal/pull/1100))
+ - Fix Viewer3D axis display when they are included in a transparent element.
+   (issue #873)
+   (Bertrand Kerautret [##1108](https://github.com/DGtal-team/DGtal/pull/1108)))
+
 
 # DGtal 0.9
 

src/DGtal/io/viewers/Viewer3D.h

@@ -572,6 +572,14 @@ namespace DGtal
     virtual unsigned int getCurrentGLImageNumber();
 
 
+    /**
+     *  @brief Overload of the QGLViewer method in order to change the
+     *  order of display (to fix the QGLViewer axis display trough
+     *  transparency).
+     **/
+    virtual void paintGL();
+
+
     /**
      * Add a TextureImage in the list of image to be displayed.
      * @param image a TextureImage including image data buffer and position, orientation.

src/DGtal/io/viewers/Viewer3D.ih

@@ -53,6 +53,7 @@
 #include "DGtal/io/viewers/CDrawableWithViewer3D.h"
 #include "DGtal/io/viewers/Viewer3DFactory.h"
 #include "QGLViewer/manipulatedFrame.h"
+#include "QGLViewer/manipulatedCameraFrame.h"
 //////////////////////////////////////////////////////////////////////////////
 
 using namespace std;
@@ -1776,5 +1777,38 @@ DGtal::Viewer3D<Space, KSpace>::closeEvent	(	QCloseEvent * 	e	){
 
 
 
-
+template<typename Space, typename KSpace>
+inline
+void 
+DGtal::Viewer3D<Space, KSpace>::paintGL(){
+	if (displaysInStereo())
+	{
+		for (int view=1; view>=0; --view)
+		{
+			// Clears screen, set model view matrix with shifted matrix for ith buffer
+			preDrawStereo(view);
+                        postDraw();
+                  	// Used defined method. Default is empty
+			if (camera()->frame()->isManipulated())
+                          fastDraw();
+			else
+                          draw();
+
+		}
+	}
+	else
+	{
+		// Clears screen, set model view matrix...
+		preDraw();
+		postDraw();
+                // Used defined method. Default calls draw()
+		if (camera()->frame()->isManipulated())
+			fastDraw();
+		else
+                  draw();
+		// Add visual hints: axis, camera, grid...
+
+	}
+	Q_EMIT drawFinished(true);
+}