Mercurial > octave

changeset 27168:e6bc258df691 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use framebuffer object for printing invisible Qt figures on mac (bug #55268) * GLCanvas.cc (GLCanvas::do_print): On Mac, bind a custom framebuffer object to the opengl context when printing invisible figures.
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Wed, 23 Jan 2019 10:20:07 +0100
parents 53ae2b0fee3c
children 031a3c85ddb7 e3b2d4e442c4
files libgui/graphics/GLCanvas.cc
diffstat 1 files changed, 30 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libgui/graphics/GLCanvas.cc	Thu Jun 06 20:42:41 2019 +0200
+++ b/libgui/graphics/GLCanvas.cc	Wed Jan 23 10:20:07 2019 +0100
@@ -135,11 +135,11 @@
                       const graphics_handle& handle)
   {
     gh_manager::auto_lock lock;
-    graphics_object obj = gh_manager::get_object (handle);
+    graphics_object go = gh_manager::get_object (handle);
 
-    if (obj.valid_object ())
+    if (go.valid_object ())
       {
-        graphics_object figObj (obj.get_ancestor ("figure"));
+        graphics_object fig (go.get_ancestor ("figure"));
 
         // Make sure we have a valid current context
         if (! begin_rendering ())
@@ -147,8 +147,34 @@
 
         try
           {
-            octave::gl2ps_print (m_glfcns, figObj, file_cmd.toStdString (),
+#if defined (Q_OS_MAC)
+            if (fig.get ("visible").string_value () == "on")
+              octave::gl2ps_print (m_glfcns, fig, file_cmd.toStdString (),
+                                   term.toStdString ());
+            else
+              {
+                // When the figure is not visible, we use a framebuffer object
+                // to make sure we are rendering on a suitably large frame.
+                Matrix pos = fig.get ("position").matrix_value ();
+                double dpr = fig.get ("__device_pixel_ratio__").double_value ();
+                pos(2) *= dpr;
+                pos(3) *= dpr;
+
+                OCTAVE_QT_OPENGL_FBO
+                  fbo (pos(2), pos(3),
+                       OCTAVE_QT_OPENGL_FBO::Attachment::Depth);
+
+                fbo.bind ();
+
+                octave::gl2ps_print (m_glfcns, fig, file_cmd.toStdString (),
+                                     term.toStdString ());
+
+                fbo.release ();
+              }
+#else
+            octave::gl2ps_print (m_glfcns, fig, file_cmd.toStdString (),
                                  term.toStdString ());
+#endif
           }
         catch (octave::execution_exception& e)
           {