Mercurial > octave
view libgui/graphics/Figure.h @ 25884:4e108574385c
Improve OpenGL rendering on high resolution screens with Qt 5 (bug #49053)
* FigureWindow.cc/h (FigureWindow::figureWindowShown): New signal
(FigureWindow::showEvent): Overload QMainWindow::showEvent to also emit
figureWindowShown signal.
* Figure.cc/h (Figure::figureWindowShown): New slot. Set the figure object
__device_pixel_ratio__ property and connect the window's screenChanged signal
to Figure::screenChanged slot.
(Figure::screenChanged): New slot. Update the figure object's
__device_pixel_ratio__ property.
* GLCanvas.cc (GLCanvas::draw, GLCanvas::selectFromAxes) scale the
opengl_rederer's viewport with the correct __device_pixel_ratio__
* gl-render.cc/h (opengl_renderer::m_devpixratio): New data member to store
the current screen's __device_pixel_ratio__
(opengl_renderer::draw_figure): Set m_devpixratio.
(opengl_renderer::setup_opengl_transformation,::draw_text_background,
::opengl_renderer::init_marker): Scale width and height of the figure
when setting up glOrtho transform.
(opengl_renderer::draw_image): Scale zoom factors when using glPixelZoom
(opengl_renderer::set_font): Scale font size.
(opengl_renderer::set_linewidth): Scale line width.
* graphics.cc (device_pixel_ratio): New static function to get the ancestor
figure's __devive_pixel_ratio__.
(axes::properties::update_font, text::properties::update_font): Scale font
size.
(axes::properties::get_ticklabel_extents): Scale tick labels size.
(text::properties::get_extent): Scale text size.
(figure::properties::update_text_pos): New mehtod to update the position of
axes objects annotations and text objects.
* graphics.in.h (figure::properties::__device_pixel_ratio__,
figure::properties::update__device_pixel_ratio__): New property and updater.
(axes::properties::update_font, text::properties::update_font,
text::properties::update_text_extent): Make methods public so that
update_text_pos can access them.
* acinclude.m4: Determine if QScreen::devicePixelRatio is present in the Qt
library in use.
* print.m: set __device_pixel_ratio__ to 1 when printing.
author | John Swensen <jpswensen@gmail.com> |
---|---|
date | Sat, 15 Sep 2018 09:43:48 +0200 |
parents | bb4af245dff7 |
children | 6109f302cf43 |
line wrap: on
line source
/* Copyright (C) 2011-2018 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 (octave_Figure_h) #define octave_Figure_h 1 #include <QRect> #include <QStatusBar> #include "GenericEventNotify.h" #include "MenuContainer.h" #include "Object.h" class QMainWindow; class QToolBar; class QScreen; namespace QtHandles { enum MouseMode { // NOTE: These values must match the order of the buttons in the // MouseModeActionGroup object. NoMode = 0, RotateMode = 1, ZoomInMode = 2, ZoomOutMode = 3, PanMode = 4, TextMode = 5, SelectMode = 6 }; class Container; class FigureWindow; class MenuBar; class ToolBar; class MouseModeActionGroup; class Figure : public Object, public MenuContainer, public GenericEventNotifyReceiver { Q_OBJECT friend class ToolBar; public: Figure (const graphics_object& go, FigureWindow *win); ~Figure (void); static Figure * create (const graphics_object& go); QString fileName (void); void setFileName (const QString& name); MouseMode mouseMode (void); Container * innerContainer (void); QWidget * menu (void); void updateStatusBar (ColumnVector pt); bool eventNotifyBefore (QObject *watched, QEvent *event); void eventNotifyAfter (QObject *watched, QEvent *event); protected: enum UpdateBoundingBoxFlag { UpdateBoundingBoxPosition = 0x1, UpdateBoundingBoxSize = 0x2, UpdateBoundingBoxAll = 0x3 }; protected: void redraw (void); void show (void); void print (const QString& file_cmd, const QString& term); void update (int pId); void updateBoundingBox (bool internal = false, int flags = 0); void beingDeleted (void); private: void createFigureToolBarAndMenuBar (void); void showFigureToolBar (bool visible); void showMenuBar (bool visible, int height = -1); void addCustomToolBar (QToolBar *bar, bool visible); void showCustomToolBar (QToolBar *bar, bool visible); void updateFigureToolBarAndMenuBar (void); static void updateBoundingBoxHelper (void*); void close_figure_callback (void); void enableMouseTracking (void); private slots: void setMouseMode (MouseMode mode); void updateMenuBar (int height = -1); void updateContainer (void); void toggleAxes (void); void toggleGrid (void); void autoAxes (void); void figureWindowShown (); void screenChanged (QScreen*); public slots: uint8NDArray slotGetPixels (void); signals: void asyncUpdate (void); private: Container *m_container; bool m_blockUpdates; QToolBar *m_figureToolBar; MenuBar *m_menuBar; QStatusBar *m_statusBar; QRect m_innerRect; QRect m_outerRect; MouseModeActionGroup *m_mouseModeGroup; int m_previousHeight; }; } #endif