octave: libgui/graphics/GLCanvas.cc annotate

annotate libgui/graphics/GLCanvas.cc @ 31771:21f9b34eb893

maint: Eliminate "(void)" in C++ function prototypes/declarations. * mk-opts.pl, external.txi, embedded.cc, make_int.cc, standalone.cc, standalonebuiltin.cc, BaseControl.cc, BaseControl.h, ButtonControl.cc, ButtonControl.h, ButtonGroup.cc, ButtonGroup.h, Canvas.cc, Canvas.h, CheckBoxControl.cc, CheckBoxControl.h, Container.cc, Container.h, ContextMenu.cc, ContextMenu.h, EditControl.cc, EditControl.h, Figure.cc, Figure.h, FigureWindow.cc, FigureWindow.h, GLCanvas.cc, GLCanvas.h, GenericEventNotify.h, KeyMap.cc, ListBoxControl.cc, ListBoxControl.h, Logger.cc, Logger.h, Menu.cc, Menu.h, MenuContainer.h, Object.cc, Object.h, ObjectProxy.cc, ObjectProxy.h, Panel.cc, Panel.h, PopupMenuControl.cc, PopupMenuControl.h, PushButtonControl.cc, PushButtonControl.h, PushTool.cc, PushTool.h, RadioButtonControl.cc, RadioButtonControl.h, SliderControl.cc, SliderControl.h, Table.cc, Table.h, TextControl.cc, TextControl.h, TextEdit.h, ToggleButtonControl.cc, ToggleButtonControl.h, ToggleTool.cc, ToggleTool.h, ToolBar.cc, ToolBar.h, ToolBarButton.cc, ToolBarButton.h, gl-select.cc, gl-select.h, qopengl-functions.h, qt-graphics-toolkit.h, qdialog.cpp, qfontdialog.cpp, qprintdialog_win.cpp, liboctgui-build-info.h, liboctgui-build-info.in.cc, color-picker.cc, color-picker.h, command-widget.cc, command-widget.h, community-news.cc, community-news.h, dialog.cc, dialog.h, documentation-bookmarks.cc, documentation-bookmarks.h, documentation-dock-widget.cc, documentation-dock-widget.h, documentation.cc, documentation.h, dw-main-window.cc, dw-main-window.h, external-editor-interface.cc, external-editor-interface.h, files-dock-widget.cc, files-dock-widget.h, find-files-dialog.cc, find-files-dialog.h, find-files-model.cc, find-files-model.h, gui-preferences.cc, gui-preferences.h, gui-settings.cc, gui-settings.h, history-dock-widget.cc, history-dock-widget.h, interpreter-qobject.cc, interpreter-qobject.h, file-editor-interface.h, file-editor-tab.cc, file-editor-tab.h, file-editor.cc, file-editor.h, find-dialog.cc, find-dialog.h, marker.cc, marker.h, octave-qscintilla.cc, octave-qscintilla.h, octave-txt-lexer.cc, octave-txt-lexer.h, main-window.cc, main-window.h, news-reader.cc, news-reader.h, octave-dock-widget.cc, octave-dock-widget.h, octave-qobject.cc, octave-qobject.h, qt-application.cc, qt-application.h, qt-interpreter-events.cc, qt-interpreter-events.h, release-notes.cc, release-notes.h, set-path-dialog.cc, set-path-dialog.h, set-path-model.cc, set-path-model.h, settings-dialog.cc, settings-dialog.h, shortcuts-tree-widget.cc, shortcuts-tree-widget.h, tab-bar.cc, tab-bar.h, terminal-dock-widget.cc, terminal-dock-widget.h, variable-editor-model.cc, variable-editor-model.h, variable-editor.cc, variable-editor.h, welcome-wizard.cc, welcome-wizard.h, workspace-model.cc, workspace-model.h, workspace-view.cc, workspace-view.h, build-env.h, Cell.cc, Cell.h, __contourc__.cc, __magick_read__.cc, auto-shlib.cc, auto-shlib.h, base-text-renderer.h, bsxfun.cc, c-file-ptr-stream.cc, c-file-ptr-stream.h, call-stack.cc, call-stack.h, debug.cc, defaults.cc, defaults.h, defun.cc, display.cc, display.h, dynamic-ld.cc, dynamic-ld.h, environment.cc, environment.h, error.cc, error.h, errwarn.cc, errwarn.h, event-manager.cc, event-manager.h, event-queue.cc, event-queue.h, fcn-info.cc, fcn-info.h, ft-text-renderer.cc, ft-text-renderer.h, genprops.awk, gh-manager.cc, gh-manager.h, gl-render.cc, gl-render.h, gl2ps-print.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gtk-manager.cc, gtk-manager.h, help.cc, help.h, hook-fcn.h, input.cc, input.h, interpreter-private.cc, interpreter-private.h, interpreter.cc, interpreter.h, jsondecode.cc, latex-text-renderer.cc, latex-text-renderer.h, load-path.cc, load-path.h, load-save.cc, load-save.h, ls-hdf5.cc, ls-hdf5.h, mxarray.h, oct-errno.h, oct-errno.in.cc, oct-fstrm.cc, oct-fstrm.h, oct-handle.h, oct-hist.cc, oct-hist.h, oct-iostrm.cc, oct-iostrm.h, oct-map.cc, oct-map.h, oct-opengl.h, oct-prcstrm.cc, oct-prcstrm.h, oct-procbuf.cc, oct-procbuf.h, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.cc, oct-strstrm.h, oct-tex-lexer.in.ll, pager.cc, pager.h, pr-flt-fmt.cc, pr-flt-fmt.h, pr-output.cc, pr-output.h, procstream.cc, procstream.h, settings.cc, settings.h, sighandlers.cc, sighandlers.h, stack-frame.cc, stack-frame.h, svd.cc, syminfo.cc, syminfo.h, symrec.cc, symrec.h, symscope.cc, symscope.h, symtab.cc, symtab.h, sysdep.cc, sysdep.h, text-engine.cc, text-engine.h, text-renderer.cc, text-renderer.h, toplev.cc, url-handle-manager.cc, url-handle-manager.h, variables.cc, xpow.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, gzip.cc, liboctinterp-build-info.h, liboctinterp-build-info.in.cc, mk-build-env-features.sh, mk-builtins.pl, cdef-class.cc, cdef-class.h, cdef-manager.h, cdef-method.cc, cdef-method.h, cdef-object.cc, cdef-object.h, cdef-package.cc, cdef-package.h, cdef-property.cc, cdef-property.h, cdef-utils.cc, cdef-utils.h, ov-base-diag.cc, ov-base-diag.h, ov-base-int.cc, ov-base-int.h, ov-base-mat.cc, ov-base-mat.h, ov-base-scalar.cc, ov-base-scalar.h, ov-base-sparse.cc, ov-base-sparse.h, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-mat.h, ov-bool-sparse.cc, ov-bool-sparse.h, ov-bool.cc, ov-bool.h, ov-builtin.cc, ov-builtin.h, ov-cell.cc, ov-cell.h, ov-ch-mat.cc, ov-ch-mat.h, ov-class.cc, ov-class.h, ov-classdef.cc, ov-classdef.h, ov-colon.h, ov-complex.cc, ov-complex.h, ov-cs-list.h, ov-cx-diag.cc, ov-cx-diag.h, ov-cx-mat.cc, ov-cx-mat.h, ov-cx-sparse.cc, ov-cx-sparse.h, ov-dld-fcn.cc, ov-dld-fcn.h, ov-fcn-handle.cc, ov-fcn-handle.h, ov-fcn.cc, ov-fcn.h, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h, ov-flt-cx-diag.cc, ov-flt-cx-diag.h, ov-flt-cx-mat.cc, ov-flt-cx-mat.h, ov-flt-re-diag.cc, ov-flt-re-diag.h, ov-flt-re-mat.cc, ov-flt-re-mat.h, ov-intx.h, ov-java.cc, ov-java.h, ov-lazy-idx.cc, ov-lazy-idx.h, ov-legacy-range.cc, ov-legacy-range.h, ov-magic-int.cc, ov-magic-int.h, ov-mex-fcn.cc, ov-mex-fcn.h, ov-null-mat.cc, ov-null-mat.h, ov-oncleanup.cc, ov-oncleanup.h, ov-perm.cc, ov-perm.h, ov-range.cc, ov-range.h, ov-re-diag.cc, ov-re-diag.h, ov-re-mat.cc, ov-re-mat.h, ov-re-sparse.cc, ov-re-sparse.h, ov-scalar.cc, ov-scalar.h, ov-str-mat.cc, ov-str-mat.h, ov-struct.cc, ov-struct.h, ov-typeinfo.cc, ov-typeinfo.h, ov-usr-fcn.cc, ov-usr-fcn.h, ov.cc, ov.h, ovl.cc, ovl.h, octave.cc, octave.h, anon-fcn-validator.h, bp-table.cc, bp-table.h, comment-list.cc, comment-list.h, filepos.h, lex.h, lex.ll, oct-lvalue.cc, oct-lvalue.h, oct-parse.yy, parse.h, profiler.cc, profiler.h, pt-anon-scopes.h, pt-arg-list.cc, pt-arg-list.h, pt-args-block.cc, pt-args-block.h, pt-array-list.cc, pt-array-list.h, pt-assign.cc, pt-assign.h, pt-binop.cc, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-cell.h, pt-check.h, pt-classdef.cc, pt-classdef.h, pt-cmd.h, pt-colon.h, pt-const.h, pt-decl.cc, pt-decl.h, pt-eval.cc, pt-eval.h, pt-except.cc, pt-except.h, pt-exp.cc, pt-exp.h, pt-fcn-handle.cc, pt-fcn-handle.h, pt-id.cc, pt-id.h, pt-idx.cc, pt-idx.h, pt-jump.h, pt-loop.cc, pt-loop.h, pt-mat.h, pt-misc.cc, pt-misc.h, pt-pr-code.cc, pt-pr-code.h, pt-select.cc, pt-select.h, pt-spmd.cc, pt-spmd.h, pt-stmt.cc, pt-stmt.h, pt-tm-const.cc, pt-tm-const.h, pt-unop.cc, pt-unop.h, pt-walk.h, pt.cc, pt.h, token.cc, token.h, usage.h, Array-base.cc, Array.h, CColVector.cc, CColVector.h, CDiagMatrix.cc, CDiagMatrix.h, CMatrix.cc, CMatrix.h, CNDArray.cc, CNDArray.h, CRowVector.cc, CRowVector.h, CSparse.cc, CSparse.h, DiagArray2.cc, DiagArray2.h, MArray.cc, MArray.h, MDiagArray2.h, MSparse.h, MatrixType.cc, MatrixType.h, PermMatrix.cc, PermMatrix.h, Range.cc, Range.h, Sparse-b.cc, Sparse.cc, Sparse.h, boolMatrix.cc, boolMatrix.h, boolNDArray.cc, boolNDArray.h, boolSparse.cc, boolSparse.h, chMatrix.h, chNDArray.h, dColVector.cc, dColVector.h, dDiagMatrix.cc, dDiagMatrix.h, dMatrix.cc, dMatrix.h, dNDArray.cc, dNDArray.h, dRowVector.cc, dRowVector.h, dSparse.cc, dSparse.h, dim-vector.cc, dim-vector.h, fCColVector.cc, fCColVector.h, fCDiagMatrix.cc, fCDiagMatrix.h, fCMatrix.cc, fCMatrix.h, fCNDArray.cc, fCNDArray.h, fCRowVector.cc, fCRowVector.h, fColVector.cc, fColVector.h, fDiagMatrix.cc, fDiagMatrix.h, fMatrix.cc, fMatrix.h, fNDArray.cc, fNDArray.h, fRowVector.cc, fRowVector.h, idx-vector.cc, idx-vector.h, intNDArray.cc, intNDArray.h, liboctave-build-info.h, liboctave-build-info.in.cc, CollocWt.cc, CollocWt.h, DAE.h, DAEFunc.h, DAERT.h, DAERTFunc.h, DASPK.cc, DASPK.h, DASRT.cc, DASRT.h, DASSL.cc, DASSL.h, DET.h, EIG.h, LSODE.cc, LSODE.h, ODE.h, ODEFunc.h, ODES.h, ODESFunc.h, Quad.h, aepbalance.cc, aepbalance.h, base-dae.h, base-de.h, chol.cc, chol.h, eigs-base.cc, fEIG.h, gepbalance.h, gsvd.cc, gsvd.h, hess.h, lu.cc, lu.h, oct-fftw.cc, oct-fftw.h, oct-rand.cc, oct-rand.h, oct-spparms.cc, oct-spparms.h, qr.cc, qr.h, qrp.cc, qrp.h, randmtzig.cc, randmtzig.h, schur.h, sparse-chol.cc, sparse-chol.h, sparse-lu.cc, sparse-lu.h, sparse-qr.cc, sparse-qr.h, svd.cc, svd.h, child-list.cc, child-list.h, dir-ops.cc, dir-ops.h, file-ops.cc, file-ops.h, file-stat.cc, file-stat.h, lo-sysdep.cc, lo-sysdep.h, lo-sysinfo.cc, lo-sysinfo.h, mach-info.cc, mach-info.h, oct-env.cc, oct-env.h, oct-group.cc, oct-group.h, oct-password.cc, oct-password.h, oct-syscalls.cc, oct-syscalls.h, oct-time.cc, oct-time.h, oct-uname.cc, oct-uname.h, action-container.h, base-list.h, caseless-str.h, cmd-edit.cc, cmd-edit.h, cmd-hist.cc, cmd-hist.h, data-conv.cc, file-info.h, glob-match.cc, glob-match.h, kpse.cc, kpse.h, lo-array-errwarn.cc, lo-array-errwarn.h, lo-hash.cc, lo-hash.h, lo-ieee.cc, lo-ieee.h, lo-regexp.cc, lo-regexp.h, oct-inttypes.cc, oct-inttypes.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-sort.cc, oct-sort.h, oct-sparse.cc, octave-preserve-stream-state.h, pathsearch.cc, pathsearch.h, quit.cc, singleton-cleanup.cc, singleton-cleanup.h, str-vec.cc, str-vec.h, unwind-prot.cc, unwind-prot.h, url-transfer.cc, url-transfer.h, version.cc, version.in.h, cxx-signal-helpers.cc, acinclude.m4, main-cli.cc, main-gui.cc, main.in.cc, mkoctfile.in.cc, octave-build-info.h, octave-build-info.in.cc, octave-config.in.cc, octave-svgconvert.cc, shared-fcns.h: maint: Eliminate "(void)" in C++ function prototypes/declarations.

author	Rik <rik@octave.org>
date	Tue, 24 Jan 2023 17:19:44 -0800
parents	1d1eff97670e
children	90621682cc03

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
31706 597f3ee61a48 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 31648 diff changeset	3 // Copyright (C) 2011-2023 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21692 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21203 diff changeset	27 # include "config.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	29
27417 f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	30 #include "GLCanvas.h"
f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	31 #include "gl-select.h"
f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27393 diff changeset	32
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include "gl-render.h"
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	34 #include "gl2ps-print.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	35 #include "graphics.h"
27647 2a506bc4a7af eliminate global access to Octave interpreter in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27645 diff changeset	36 #include "interpreter.h"
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	37
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	38 OCTAVE_BEGIN_NAMESPACE(octave)
c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	39
31770 1d1eff97670e revise parentage of GLWidget object (bug #63697) John W. Eaton <jwe@octave.org> parents: 31762 diff changeset	40 GLWidget::GLWidget (Canvas& parent_canvas, QWidget *parent)
1d1eff97670e revise parentage of GLWidget object (bug #63697) John W. Eaton <jwe@octave.org> parents: 31762 diff changeset	41 : QOpenGLWidget (parent), m_parent_canvas (parent_canvas),
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	42 m_glfcns (), m_renderer (m_glfcns)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	43 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	44 setFocusPolicy (Qt::ClickFocus);
23070 bef714f45999 maint: Use space after function name/before parenthesis in libgui. Rik <rik@octave.org> parents: 22755 diff changeset	45 setFocus ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	46 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	47
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31770 diff changeset	48 GLWidget::~GLWidget () { }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	49
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	50 void
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31770 diff changeset	51 GLWidget::initializeGL ()
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	52 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	53 // The qopengl_functions object (part of Octave, not Qt) is just
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	54 // wrapper around QOpenGLFunctions_1_1. Does initialization really
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	55 // need to be deferred until initializeGL is called?
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	56
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	57 m_glfcns.init ();
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	58
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	59 // All other resources we need are currently (supposed to be)
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	60 // managed by the QOpenGLWidget object so there is else nothing to
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	61 // do here. If we used custom shader programs, then we would need
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	62 // to initialize them here.
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	63 }
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	64
e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	65 void
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	66 GLWidget::draw (graphics_object go)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	67 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	68 if (go)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	69 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	70 begin_rendering ();
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	71
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	72 unwind_action reset_current ([=] () { end_rendering (); });
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	73
25884 4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25863 diff changeset	74 graphics_object fig = go.get_ancestor ("figure");
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25863 diff changeset	75 double dpr = fig.get ("__device_pixel_ratio__").double_value ();
4e108574385c Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053) John Swensen <jpswensen@gmail.com> parents: 25863 diff changeset	76 m_renderer.set_viewport (dpr * width (), dpr * height ());
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	77 m_renderer.set_device_pixel_ratio (dpr);
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	78
25863 8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	79 m_renderer.draw (go);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	80 }
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	81 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	82
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	83 uint8NDArray
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	84 GLWidget::do_getPixels (graphics_object go)
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	85 {
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	86 uint8NDArray retval;
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27303 diff changeset	87
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	88 if (go && go.isa ("figure"))
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	89 {
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	90 Matrix pos = go.get ("position").matrix_value ();
25998 8d2b3e3ff182 print.m: Implement "-opengl", "-painters" and "-RGBImage" options (bug #52866) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	91 double dpr = go.get ("__device_pixel_ratio__").double_value ();
8d2b3e3ff182 print.m: Implement "-opengl", "-painters" and "-RGBImage" options (bug #52866) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	92 pos(2) *= dpr;
8d2b3e3ff182 print.m: Implement "-opengl", "-painters" and "-RGBImage" options (bug #52866) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	93 pos(3) *= dpr;
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	94
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	95 begin_rendering ();
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	96
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	97 unwind_action reset_current ([=] () { end_rendering (); });
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	98
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	99 // When the figure is not visible or its size is frozen for printing,
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	100 // we use a framebuffer object to make sure we are rendering on a
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	101 // suitably large frame.
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	102 if (go.get ("visible").string_value () == "off"
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	103 \|\| go.get ("__printing__").string_value () == "on")
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	104 {
31752 345a3f5890e7 assume QOpenGLWidget is available John W. Eaton <jwe@octave.org> parents: 31751 diff changeset	105 QOpenGLFramebufferObject
345a3f5890e7 assume QOpenGLWidget is available John W. Eaton <jwe@octave.org> parents: 31751 diff changeset	106 fbo (pos(2), pos(3),
345a3f5890e7 assume QOpenGLWidget is available John W. Eaton <jwe@octave.org> parents: 31751 diff changeset	107 QOpenGLFramebufferObject::Attachment::Depth);
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25081 diff changeset	108
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	109 fbo.bind ();
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25081 diff changeset	110
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	111 unwind_action release_fbo ([&] () { fbo.release (); });
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	112
25863 8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	113 m_renderer.set_viewport (pos(2), pos(3));
25998 8d2b3e3ff182 print.m: Implement "-opengl", "-painters" and "-RGBImage" options (bug #52866) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	114 m_renderer.set_device_pixel_ratio (dpr);
25863 8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	115 m_renderer.draw (go);
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	116
25863 8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	117 retval = m_renderer.get_pixels (pos(2), pos(3));
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	118 }
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	119 else
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	120 {
25863 8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	121 m_renderer.set_viewport (pos(2), pos(3));
25998 8d2b3e3ff182 print.m: Implement "-opengl", "-painters" and "-RGBImage" options (bug #52866) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25889 diff changeset	122 m_renderer.set_device_pixel_ratio (dpr);
25863 8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	123 m_renderer.draw (go);
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	124
25863 8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	125 retval = m_renderer.get_pixels (pos(2), pos(3));
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	126 }
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	127 }
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	128
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	129 return retval;
2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	130 }
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25081 diff changeset	131
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	132 void
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	133 GLWidget::do_print (const QString& file_cmd, const QString& term,
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	134 graphics_object go)
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	135 {
27168 e6bc258df691 Use framebuffer object for printing invisible Qt figures on mac (bug #55268) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26617 diff changeset	136 if (go.valid_object ())
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	137 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	138 begin_rendering ();
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	139
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	140 unwind_action reset_current ([=] () { end_rendering (); });
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	141
27168 e6bc258df691 Use framebuffer object for printing invisible Qt figures on mac (bug #55268) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26617 diff changeset	142 graphics_object fig (go.get_ancestor ("figure"));
26617 98afb8bbd1f6 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	143
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	144 if (fig.get ("visible").string_value () == "on")
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	145 octave::gl2ps_print (m_glfcns, fig, file_cmd.toStdString (),
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	146 term.toStdString ());
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	147 else
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	148 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	149 // When the figure is not visible, we use a framebuffer object
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	150 // to make sure we are rendering on a suitably large frame.
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	151 Matrix pos = fig.get ("position").matrix_value ();
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	152 double dpr = fig.get ("__device_pixel_ratio__").double_value ();
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	153 pos(2) *= dpr;
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	154 pos(3) *= dpr;
27168 e6bc258df691 Use framebuffer object for printing invisible Qt figures on mac (bug #55268) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26617 diff changeset	155
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	156 QOpenGLFramebufferObject
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	157 fbo (pos(2), pos(3),
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	158 QOpenGLFramebufferObject::Attachment::Depth);
27168 e6bc258df691 Use framebuffer object for printing invisible Qt figures on mac (bug #55268) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26617 diff changeset	159
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	160 fbo.bind ();
27168 e6bc258df691 Use framebuffer object for printing invisible Qt figures on mac (bug #55268) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26617 diff changeset	161
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	162 unwind_action release_fbo ([&] () { fbo.release (); });
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	163
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	164 octave::gl2ps_print (m_glfcns, fig, file_cmd.toStdString (),
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	165 term.toStdString ());
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	166 }
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	167 }
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	168 }
23535 2aab625b502c Add getframe function for opengl based toolkits (bug #48195) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 23449 diff changeset	169
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	170 graphics_object
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	171 GLWidget::selectFromAxes (const graphics_object& ax, const QPoint& pt)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	172 {
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	173 if (ax)
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	174 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	175 begin_rendering ();
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	176
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	177 unwind_action reset_current ([=] () { end_rendering (); });
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	178
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	179 octave::opengl_selector s (m_glfcns);
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	180
25889 2da65009cc7f Fix graphics object selection on high resolution screens (bug #49053) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 25884 diff changeset	181 s.set_viewport (width (), height ());
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	182
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	183 graphics_object go = s.select (ax, pt.x (), height () - pt.y (),
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	184 octave::select_ignore_hittest);
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	185
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	186 doneCurrent ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	187 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	188
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	189 return graphics_object ();
c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	190 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	191
25862 e5a73a8c116c use wrapper class to call OpenGL functions John W. Eaton <jwe@octave.org> parents: 25103 diff changeset	192 void
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	193 GLWidget::drawZoomBox (const QPoint& p1, const QPoint& p2)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	194 {
25863 8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	195 Matrix overlaycolor (3, 1);
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	196 overlaycolor(0) = 0.45;
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	197 overlaycolor(1) = 0.62;
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	198 overlaycolor(2) = 0.81;
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	199 double overlayalpha = 0.1;
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	200 Matrix bordercolor = overlaycolor;
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	201 double borderalpha = 0.9;
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	202 double borderwidth = 1.5;
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	203
25863 8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	204 m_renderer.draw_zoom_box (width (), height (),
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	205 p1.x (), p1.y (), p2.x (), p2.y (),
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	206 overlaycolor, overlayalpha,
8a6bf76abf31 eliminate some duplicate OpenGL drawing code John W. Eaton <jwe@octave.org> parents: 25862 diff changeset	207 bordercolor, borderalpha, borderwidth);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	208 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	209
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	210 void
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31770 diff changeset	211 GLWidget::paintGL ()
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	212 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	213 m_parent_canvas.canvasPaintEvent ();
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	214 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	215
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	216 void
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	217 GLWidget::mouseDoubleClickEvent (QMouseEvent *xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	218 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	219 m_parent_canvas.canvasMouseDoubleClickEvent (xevent);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	220 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19642 diff changeset	221
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	222 void
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	223 GLWidget::mouseMoveEvent (QMouseEvent *xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	224 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	225 m_parent_canvas.canvasMouseMoveEvent (xevent);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	226 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	227
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	228 void
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	229 GLWidget::mousePressEvent (QMouseEvent *xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	230 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	231 m_parent_canvas.canvasMousePressEvent (xevent);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	232 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	233
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	234 void
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	235 GLWidget::mouseReleaseEvent (QMouseEvent *xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	236 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	237 m_parent_canvas.canvasMouseReleaseEvent (xevent);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	238 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	239
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	240 void
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	241 GLWidget::wheelEvent (QWheelEvent *xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	242 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	243 m_parent_canvas.canvasWheelEvent (xevent);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	244 }
19663 dfea01b3425f more mouse interaction features for Qt plotting widget John W. Eaton <jwe@octave.org> parents: 19642 diff changeset	245
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	246 void
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	247 GLWidget::keyPressEvent (QKeyEvent *xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	248 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	249 if (! m_parent_canvas.canvasKeyPressEvent (xevent))
31752 345a3f5890e7 assume QOpenGLWidget is available John W. Eaton <jwe@octave.org> parents: 31751 diff changeset	250 QOpenGLWidget::keyPressEvent (xevent);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	251 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	252
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	253 void
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	254 GLWidget::keyReleaseEvent (QKeyEvent *xevent)
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	255 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	256 if (! m_parent_canvas.canvasKeyReleaseEvent (xevent))
31752 345a3f5890e7 assume QOpenGLWidget is available John W. Eaton <jwe@octave.org> parents: 31751 diff changeset	257 QOpenGLWidget::keyReleaseEvent (xevent);
22411 c69805d1fa64 maint: Style check C++ code in libgui/ Rik <rik@octave.org> parents: 22326 diff changeset	258 }
18498 2e7cad6f180c Initial integration of QtHandles. John W. Eaton <jwe@octave.org> parents: diff changeset	259
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	260 bool
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31770 diff changeset	261 GLWidget::begin_rendering ()
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	262 {
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	263 bool retval = true;
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25081 diff changeset	264
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	265 if (! isValid ())
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	266 {
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	267 // FIXME: Is this really the right way to manager offscreen
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	268 // rendering for printing?
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	269
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	270 static bool os_ctx_ok = true;
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	271
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	272 if (os_ctx_ok && ! m_os_context.isValid ())
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	273 {
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	274 // Try to initialize offscreen context
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	275 m_os_surface.create ();
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	276
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	277 if (! m_os_context.create ())
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	278 {
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	279 os_ctx_ok = false;
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	280 return false;
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	281 }
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	282 }
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25081 diff changeset	283
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	284 retval = m_os_context.makeCurrent (&m_os_surface);
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	285 }
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	286 else
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	287 makeCurrent ();
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25081 diff changeset	288
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	289 return retval;
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	290 }
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25081 diff changeset	291
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	292 void
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31770 diff changeset	293 GLWidget::end_rendering ()
25103 078b795c5219 maint: style check C++ ahead of 4.4 release. Rik <rik@octave.org> parents: 25081 diff changeset	294 {
24798 45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	295 doneCurrent ();
45470049a43f Allow getframe and print to work without osmesa (bug #53186). Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 24691 diff changeset	296 }
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	297
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	298 GLCanvas::GLCanvas (octave::interpreter& interp,
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	299 const graphics_handle& gh, QWidget *parent)
31770 1d1eff97670e revise parentage of GLWidget object (bug #63697) John W. Eaton <jwe@octave.org> parents: 31762 diff changeset	300 : Canvas (interp, gh), m_glwidget (new GLWidget (*this, parent))
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	301 { }
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	302
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31770 diff changeset	303 GLCanvas::~GLCanvas ()
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	304 {
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	305 delete m_glwidget;
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	306 }
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	307
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	308 void
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	309 GLCanvas::draw (const graphics_handle& gh)
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	310 {
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	311 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	312
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	313 octave::autolock guard (gh_mgr.graphics_lock ());
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	314
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	315 graphics_object go = gh_mgr.get_object (gh);
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	316
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	317 m_glwidget->draw (go);
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	318 }
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	319
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	320 uint8NDArray
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	321 GLCanvas::do_getPixels (const graphics_handle& gh)
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	322 {
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	323 uint8NDArray retval;
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	324
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	325 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	326
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	327 graphics_object go = gh_mgr.get_object (gh);
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	328
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	329 return m_glwidget->do_getPixels (go);
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	330 }
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	331
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	332 void
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	333 GLCanvas::do_print (const QString& file_cmd, const QString& term,
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	334 const graphics_handle& handle)
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	335 {
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	336 gh_manager& gh_mgr = m_interpreter.get_gh_manager ();
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	337
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	338 octave::autolock guard (gh_mgr.graphics_lock ());
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	339
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	340 graphics_object go = gh_mgr.get_object (handle);
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	341
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	342 try
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	343 {
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	344 m_glwidget->do_print (file_cmd, term, go);
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	345 }
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	346 catch (octave::execution_exception& ee)
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	347 {
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	348 emit interpreter_event
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31770 diff changeset	349 ([=] ()
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	350 {
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	351 // INTERPRETER THREAD
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	352 throw ee;
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	353 });
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	354 }
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	355 }
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	356
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	357 graphics_object
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	358 GLCanvas::selectFromAxes (const graphics_object& ax, const QPoint& pt)
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	359 {
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	360 return m_glwidget->selectFromAxes (ax, pt);
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	361 }
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	362
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	363 void
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	364 GLCanvas::drawZoomBox (const QPoint& p1, const QPoint& p2)
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	365 {
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	366 m_glwidget->drawZoomBox (p1, p2);
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	367 }
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	368
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	369 bool
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31770 diff changeset	370 GLCanvas::begin_rendering ()
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	371 {
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	372 return m_glwidget->begin_rendering ();
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	373 }
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	374
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	375 void
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31770 diff changeset	376 GLCanvas::end_rendering ()
31762 d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	377 {
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	378 m_glwidget->end_rendering ();
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	379 }
d94ceed56929 GLCanvas: avoid multiple inheritance from both QWidget and QObject John W. Eaton <jwe@octave.org> parents: 31752 diff changeset	380
31646 c6d54dd31a7e maint: Use macros to begin/end C++ namespaces. John W. Eaton <jwe@octave.org> parents: 30564 diff changeset	381 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libgui/graphics/GLCanvas.cc @ 31771:21f9b34eb893