Mercurial > octave
view libgui/graphics/GLCanvas.cc @ 24636:9d01ce02d5cb
Make selection and "HitTest" compatible with Matlab (bug #52795).
* GLCanvas.cc (GLCanvas::selectFromAxes): Don't take "HitTest" into account
during selection.
* Canvas.cc (Canvas::canvasMousePressEvent): If the selected object has
"HitTest"->"off" then replace it with the first ancestor with "HitTest"->"on"
or fallback to empty matrix.
* NEWS: Announce that HitTest property is now fully implemented.
author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
---|---|
date | Mon, 22 Jan 2018 16:46:59 +0100 |
parents | 194eb4bd202b |
children | b658e0fa0cb3 |
line wrap: on
line source
/* Copyright (C) 2011-2017 Michael Goffioul This file is part of Octave. Octave is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <https://www.gnu.org/licenses/>. */ #if defined (HAVE_CONFIG_H) # include "config.h" #endif #include "gl-render.h" #include "graphics.h" #include "GLCanvas.h" #include "gl-select.h" namespace QtHandles { #if defined (HAVE_QOPENGLWIDGET) # define OCTAVE_QT_OPENGL_WIDGET_FORMAT_ARGS #else # if defined (Q_OS_WIN32) # define OCTAVE_QT_OPENGL_WIDGET_FORMAT_ARGS \ QGLFormat (QGL::SampleBuffers | QGL::AlphaChannel \ | QGL::IndirectRendering), # else # define OCTAVE_QT_OPENGL_WIDGET_FORMAT_ARGS \ QGLFormat (QGL::SampleBuffers | QGL::AlphaChannel), # endif #endif GLCanvas::GLCanvas (QWidget *xparent, const graphics_handle& gh) : OCTAVE_QT_OPENGL_WIDGET (OCTAVE_QT_OPENGL_WIDGET_FORMAT_ARGS xparent), Canvas (gh) { setFocusPolicy (Qt::ClickFocus); setFocus (); } GLCanvas::~GLCanvas (void) { } void GLCanvas::draw (const graphics_handle& gh) { gh_manager::auto_lock lock; graphics_object go = gh_manager::get_object (gh); if (go) { octave::opengl_renderer r; r.set_viewport (width (), height ()); r.draw (go); } } uint8NDArray GLCanvas::do_getPixels (const graphics_handle& gh) { uint8NDArray retval; graphics_object go = gh_manager::get_object (gh); if (go) { octave::opengl_renderer r; r.set_viewport (width (), height ()); r.draw (go); retval = r.get_pixels (width (), height ()); } return retval; } void GLCanvas::toggleAxes (const graphics_handle& gh) { canvasToggleAxes (gh); } void GLCanvas::toggleGrid (const graphics_handle& gh) { canvasToggleGrid (gh); } void GLCanvas::autoAxes (const graphics_handle& gh) { canvasAutoAxes (gh); } graphics_object GLCanvas::selectFromAxes (const graphics_object& ax, const QPoint& pt) { makeCurrent (); if (ax) { octave::opengl_selector s; s.set_viewport (width (), height ()); return s.select (ax, pt.x (), height () - pt.y (), octave::select_ignore_hittest); } return graphics_object (); } inline void glDrawZoomBox (const QPoint& p1, const QPoint& p2) { glVertex2d (p1.x (), p1.y ()); glVertex2d (p2.x (), p1.y ()); glVertex2d (p2.x (), p2.y ()); glVertex2d (p1.x (), p2.y ()); glVertex2d (p1.x (), p1.y ()); } void GLCanvas::drawZoomBox (const QPoint& p1, const QPoint& p2) { glMatrixMode (GL_MODELVIEW); glPushMatrix (); glLoadIdentity (); glMatrixMode (GL_PROJECTION); glPushMatrix (); glLoadIdentity (); glOrtho (0, width (), height (), 0, 1, -1); glPushAttrib (GL_DEPTH_BUFFER_BIT | GL_CURRENT_BIT); glDisable (GL_DEPTH_TEST); glBegin (GL_POLYGON); glColor4f (0.45, 0.62, 0.81, 0.1); glDrawZoomBox (p1, p2); glEnd (); glLineWidth (1.5); glBegin (GL_LINE_STRIP); glColor4f (0.45, 0.62, 0.81, 0.9); glDrawZoomBox (p1, p2); glEnd (); glPopAttrib (); glMatrixMode (GL_MODELVIEW); glPopMatrix (); glMatrixMode (GL_PROJECTION); glPopMatrix (); } void GLCanvas::paintGL (void) { canvasPaintEvent (); } void GLCanvas::mouseDoubleClickEvent (QMouseEvent *xevent) { canvasMouseDoubleClickEvent (xevent); } void GLCanvas::mouseMoveEvent (QMouseEvent *xevent) { canvasMouseMoveEvent (xevent); } void GLCanvas::mousePressEvent (QMouseEvent *xevent) { canvasMousePressEvent (xevent); } void GLCanvas::mouseReleaseEvent (QMouseEvent *xevent) { canvasMouseReleaseEvent (xevent); } void GLCanvas::wheelEvent (QWheelEvent *xevent) { canvasWheelEvent (xevent); } void GLCanvas::keyPressEvent (QKeyEvent *xevent) { if (! canvasKeyPressEvent (xevent)) OCTAVE_QT_OPENGL_WIDGET::keyPressEvent (xevent); } void GLCanvas::keyReleaseEvent (QKeyEvent *xevent) { if (! canvasKeyReleaseEvent (xevent)) OCTAVE_QT_OPENGL_WIDGET::keyReleaseEvent (xevent); } }