Mercurial > octave-nkf
changeset 18505:fb96b7f55242 gui-release
rename file to avoid clash on case-insenstive filesystems (bug #41658)
* libgui/graphics/QtHandlesUtils.cc: Rename from Utils.cc.
* libgui/graphics/QtHandlesUtils.h: Rename from Utils.h.
Change all uses.
* libgui/graphics/module.mk: Update lists.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 21 Feb 2014 11:35:36 -0500 |
| parents | b75adad91fc6 |
| children | dca6ecfd622c |
| files | libgui/graphics/BaseControl.cc libgui/graphics/ButtonControl.cc libgui/graphics/Canvas.cc libgui/graphics/Container.cc libgui/graphics/ContextMenu.cc libgui/graphics/EditControl.cc libgui/graphics/Figure.cc libgui/graphics/ListBoxControl.cc libgui/graphics/Menu.cc libgui/graphics/Object.cc libgui/graphics/ObjectFactory.cc libgui/graphics/Panel.cc libgui/graphics/PopupMenuControl.cc libgui/graphics/PushButtonControl.cc libgui/graphics/QtHandlesUtils.cc libgui/graphics/QtHandlesUtils.h libgui/graphics/RadioButtonControl.cc libgui/graphics/SliderControl.cc libgui/graphics/TextControl.cc libgui/graphics/ToggleButtonControl.cc libgui/graphics/ToolBar.cc libgui/graphics/ToolBarButton.cc libgui/graphics/Utils.cc libgui/graphics/Utils.h libgui/graphics/__init_qt__.cc libgui/graphics/module.mk |
| diffstat | 26 files changed, 429 insertions(+), 429 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/BaseControl.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/BaseControl.cc Fri Feb 21 11:35:36 2014 -0500 @@ -31,7 +31,7 @@ #include "BaseControl.h" #include "ContextMenu.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/ButtonControl.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/ButtonControl.cc Fri Feb 21 11:35:36 2014 -0500 @@ -28,7 +28,7 @@ #include "ButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/Canvas.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/Canvas.cc Fri Feb 21 11:35:36 2014 -0500 @@ -33,7 +33,7 @@ #include "Canvas.h" #include "ContextMenu.h" #include "GLCanvas.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/Container.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/Container.cc Fri Feb 21 11:35:36 2014 -0500 @@ -31,7 +31,7 @@ #include "Canvas.h" #include "Container.h" #include "Object.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/ContextMenu.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/ContextMenu.cc Fri Feb 21 11:35:36 2014 -0500 @@ -28,7 +28,7 @@ #include "Backend.h" #include "ContextMenu.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/EditControl.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/EditControl.cc Fri Feb 21 11:35:36 2014 -0500 @@ -29,7 +29,7 @@ #include "Container.h" #include "EditControl.h" #include "TextEdit.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/Figure.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/Figure.cc Fri Feb 21 11:35:36 2014 -0500 @@ -43,7 +43,7 @@ #include "Figure.h" #include "FigureWindow.h" #include "MouseModeActionGroup.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/ListBoxControl.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/ListBoxControl.cc Fri Feb 21 11:35:36 2014 -0500 @@ -28,7 +28,7 @@ #include "Container.h" #include "ListBoxControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/Menu.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/Menu.cc Fri Feb 21 11:35:36 2014 -0500 @@ -31,7 +31,7 @@ #include "Figure.h" #include "Menu.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/Object.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/Object.cc Fri Feb 21 11:35:36 2014 -0500 @@ -28,7 +28,7 @@ #include "Backend.h" #include "Object.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/ObjectFactory.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/ObjectFactory.cc Fri Feb 21 11:35:36 2014 -0500 @@ -49,7 +49,7 @@ #include "ToggleButtonControl.h" #include "ToggleTool.h" #include "ToolBar.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/Panel.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/Panel.cc Fri Feb 21 11:35:36 2014 -0500 @@ -34,7 +34,7 @@ #include "Container.h" #include "ContextMenu.h" #include "Panel.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/PopupMenuControl.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/PopupMenuControl.cc Fri Feb 21 11:35:36 2014 -0500 @@ -28,7 +28,7 @@ #include "Container.h" #include "PopupMenuControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/PushButtonControl.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/PushButtonControl.cc Fri Feb 21 11:35:36 2014 -0500 @@ -29,7 +29,7 @@ #include "PushButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/graphics/QtHandlesUtils.cc Fri Feb 21 11:35:36 2014 -0500 @@ -0,0 +1,324 @@ +/* + +Copyright (C) 2011-2014 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 +<http://www.gnu.org/licenses/>. + +*/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <QApplication> +#include <QKeyEvent> +#include <QMouseEvent> + +#include <list> + +#include "ov.h" +#include "graphics.h" + +#include "Backend.h" +#include "Container.h" +#include "KeyMap.h" +#include "Object.h" +#include "QtHandlesUtils.h" + +namespace QtHandles +{ + +namespace Utils +{ + +QString fromStdString (const std::string& s) +{ + return QString::fromLocal8Bit (s.c_str ()); +} + +std::string toStdString (const QString& s) +{ + return std::string (s.toLocal8Bit ().data ()); +} + +QStringList fromStringVector (const string_vector& v) +{ + QStringList l; + octave_idx_type n = v.length (); + + for (octave_idx_type i = 0; i < n; i++) + l << fromStdString (v[i]); + + return l; +} + +string_vector toStringVector (const QStringList& l) +{ + string_vector v (l.length ()); + int i = 0; + + foreach (const QString& s, l) + v[i++] = toStdString (s); + + return v; +} + +template <class T> +QFont computeFont (const typename T::properties& props, int height) +{ + QFont f (fromStdString (props.get_fontname ())); + + static std::map<std::string, QFont::Weight> weightMap; + static std::map<std::string, QFont::Style> angleMap; + static bool mapsInitialized = false; + + if (! mapsInitialized) + { + weightMap[std::string ("normal")] = QFont::Normal; + weightMap[std::string ("light")] = QFont::Light; + weightMap[std::string ("demi")] = QFont::DemiBold; + weightMap[std::string ("bold")] = QFont::Normal; + + angleMap[std::string ("normal")] = QFont::StyleNormal; + angleMap[std::string ("italic")] = QFont::StyleItalic; + angleMap[std::string ("oblique")] = QFont::StyleOblique; + + mapsInitialized = true; + } + + f.setPointSizeF (props.get_fontsize_points (height)); + f.setWeight (weightMap[props.get_fontweight ()]); + f.setStyle (angleMap[props.get_fontangle ()]); + + return f; +} + +template QFont computeFont<uicontrol> (const uicontrol::properties& props, + int height); +template QFont computeFont<uipanel> (const uipanel::properties& props, + int height); + +QColor fromRgb (const Matrix& rgb) +{ + QColor c; + + if (rgb.numel () == 3) + c.setRgbF (rgb(0), rgb(1), rgb(2)); + + return c; +} + +Matrix toRgb (const QColor& c) +{ + Matrix rgb (1, 3); + double* rgbData = rgb.fortran_vec (); + + c.getRgbF (rgbData, rgbData+1, rgbData+2); + + return rgb; +} + +std::string figureSelectionType (QMouseEvent* event, bool isDoubleClick) +{ + if (isDoubleClick) + return std::string ("open"); + else + { + Qt::MouseButtons buttons = event->buttons (); + Qt::KeyboardModifiers mods = event->modifiers (); + + if (mods == Qt::NoModifier) + { + if (buttons == Qt::LeftButton) + return std::string ("normal"); + else if (buttons == Qt::RightButton) + return std::string ("alt"); +#if defined (Q_WS_WIN) + else if (buttons == (Qt::LeftButton|Qt::RightButton)) + return std::string ("extend"); +#elif defined (Q_WS_X11) + else if (buttons == Qt::MidButton) + return std::string ("extend"); +#endif + } + else if (buttons == Qt::LeftButton) + { + if (mods == Qt::ShiftModifier) + return std::string ("extend"); + else if (mods == Qt::ControlModifier) + return std::string ("alt"); + } + } + + return std::string ("normal"); +} + +Matrix figureCurrentPoint (const graphics_object& fig, QMouseEvent* event) +{ + Object* tkFig = Backend::toolkitObject (fig); + + if (tkFig) + { + Container* c = tkFig->innerContainer (); + + if (c) + { + QPoint qp = c->mapFromGlobal (event->globalPos ()); + + return + tkFig->properties<figure> ().map_from_boundingbox (qp.x (), + qp.y ()); + } + } + + return Matrix (1, 2, 0.0); +} + +Qt::Alignment fromHVAlign (const caseless_str& halign, + const caseless_str& valign) +{ + Qt::Alignment flags; + + if (halign.compare ("left")) + flags |= Qt::AlignLeft; + else if (halign.compare ("center")) + flags |= Qt::AlignHCenter; + else if (halign.compare ("right")) + flags |= Qt::AlignRight; + else + flags |= Qt::AlignLeft; + + if (valign.compare ("middle")) + flags |= Qt::AlignVCenter; + else if (valign.compare ("top")) + flags |= Qt::AlignTop; + else if (valign.compare ("bottom")) + flags |= Qt::AlignBottom; + else + flags |= Qt::AlignVCenter; + + return flags; +} + +QImage makeImageFromCData (const octave_value& v, int width, int height) +{ + dim_vector dv (v.dims ()); + + if (dv.length () == 3 && dv(2) == 3) + { + int w = qMin (dv(1), width); + int h = qMin (dv(0), height); + + int x_off = (w < width ? (width - w) / 2 : 0); + int y_off = (h < height ? (height - h) / 2 : 0); + + QImage img (width, height, QImage::Format_ARGB32); + img.fill (qRgba (0, 0, 0, 0)); + + if (v.is_uint8_type ()) + { + uint8NDArray d = v.uint8_array_value (); + + for (int i = 0; i < w; i++) + for (int j = 0; j < h; j++) + { + int r = d(j, i, 0); + int g = d(j, i, 1); + int b = d(j, i, 2); + int a = 255; + + img.setPixel (x_off + i, y_off + j, qRgba (r, g, b, a)); + } + } + else if (v.is_single_type ()) + { + FloatNDArray f = v.float_array_value (); + + for (int i = 0; i < w; i++) + for (int j = 0; j < h; j++) + { + float r = f(j, i, 0); + float g = f(j, i, 1); + float b = f(j, i, 2); + int a = (xisnan (r) || xisnan (g) || xisnan (b) ? 0 : 255); + + img.setPixel (x_off + i, y_off + j, + qRgba (xround (r * 255), + xround (g * 255), + xround (b * 255), + a)); + } + } + else if (v.is_real_type ()) + { + NDArray d = v.array_value (); + + for (int i = 0; i < w; i++) + for (int j = 0; j < h; j++) + { + double r = d(j, i, 0); + double g = d(j, i, 1); + double b = d(j, i, 2); + int a = (xisnan (r) || xisnan (g) || xisnan (b) ? 0 : 255); + + img.setPixel (x_off + i, y_off + j, + qRgba (xround (r * 255), + xround (g * 255), + xround (b * 255), + a)); + } + } + + return img; + } + + return QImage (); +} + +octave_scalar_map makeKeyEventStruct (QKeyEvent* event) +{ + octave_scalar_map retval; + + retval.setfield ("Key", KeyMap::qKeyToKeyString (event->key ())); + retval.setfield ("Character", toStdString (event->text ())); + + std::list<std::string> modList; + Qt::KeyboardModifiers mods = event->modifiers (); + + if (mods & Qt::ShiftModifier) + modList.push_back ("shift"); + if (mods & Qt::ControlModifier) +#ifdef Q_OS_MAC + modList.push_back ("command"); +#else + modList.push_back ("control"); +#endif + if (mods & Qt::AltModifier) + modList.push_back ("alt"); +#ifdef Q_OS_MAC + if (mods & Qt::MetaModifier) + modList.push_back ("control"); +#endif + + retval.setfield ("Modifier", Cell (modList)); + + return retval; +} + +}; // namespace Utils + +}; // namespace QtHandles
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/graphics/QtHandlesUtils.h Fri Feb 21 11:35:36 2014 -0500 @@ -0,0 +1,82 @@ +/* + +Copyright (C) 2011-2014 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 +<http://www.gnu.org/licenses/>. + +*/ + +#ifndef __QtHandles_Utils__ +#define __QtHandles_Utils__ 1 + +#include <QColor> +#include <QFont> +#include <QImage> +#include <QString> +#include <QStringList> + +#include <string> + +#include "graphics.h" + +class QKeyEvent; +class QMouseEvent; + +namespace QtHandles +{ + +namespace Utils +{ + QString fromStdString (const std::string& s); + std::string toStdString (const QString& s); + + QStringList fromStringVector (const string_vector& v); + string_vector toStringVector (const QStringList& l); + + template <class T> + QFont computeFont (const typename T::properties& props, int height = -1); + + QColor fromRgb (const Matrix& rgb); + Matrix toRgb (const QColor& c); + + Qt::Alignment fromHVAlign (const caseless_str& halign, + const caseless_str& valign); + + std::string figureSelectionType (QMouseEvent* event, + bool isDoubleClick = false); + + Matrix figureCurrentPoint (const graphics_object& fig, QMouseEvent* event); + + template <class T> + inline typename T::properties& + properties (graphics_object obj) + { return dynamic_cast<typename T::properties&> (obj.get_properties ()); } + + template <class T> + inline typename T::properties& + properties (const graphics_handle& h) + { return Utils::properties<T> (gh_manager::get_object (h)); } + + QImage makeImageFromCData (const octave_value& v, int width = -1, + int height = -1); + + octave_scalar_map makeKeyEventStruct (QKeyEvent* event); +}; + +}; // namespace QtHandles + +#endif
--- a/libgui/graphics/RadioButtonControl.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/RadioButtonControl.cc Fri Feb 21 11:35:36 2014 -0500 @@ -28,7 +28,7 @@ #include "RadioButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/SliderControl.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/SliderControl.cc Fri Feb 21 11:35:36 2014 -0500 @@ -28,7 +28,7 @@ #include "Container.h" #include "SliderControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" #define RANGE_INT_MAX 1000000
--- a/libgui/graphics/TextControl.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/TextControl.cc Fri Feb 21 11:35:36 2014 -0500 @@ -28,7 +28,7 @@ #include "Container.h" #include "TextControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/ToggleButtonControl.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/ToggleButtonControl.cc Fri Feb 21 11:35:36 2014 -0500 @@ -28,7 +28,7 @@ #include "ToggleButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/ToolBar.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/ToolBar.cc Fri Feb 21 11:35:36 2014 -0500 @@ -36,7 +36,7 @@ #include "Figure.h" #include "ToolBar.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/ToolBarButton.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/ToolBarButton.cc Fri Feb 21 11:35:36 2014 -0500 @@ -28,7 +28,7 @@ #include <QWidget> #include "ToolBarButton.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/Utils.cc Thu Feb 20 21:32:45 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,324 +0,0 @@ -/* - -Copyright (C) 2011-2014 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 -<http://www.gnu.org/licenses/>. - -*/ - -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#include <QApplication> -#include <QKeyEvent> -#include <QMouseEvent> - -#include <list> - -#include "ov.h" -#include "graphics.h" - -#include "Backend.h" -#include "Container.h" -#include "KeyMap.h" -#include "Object.h" -#include "Utils.h" - -namespace QtHandles -{ - -namespace Utils -{ - -QString fromStdString (const std::string& s) -{ - return QString::fromLocal8Bit (s.c_str ()); -} - -std::string toStdString (const QString& s) -{ - return std::string (s.toLocal8Bit ().data ()); -} - -QStringList fromStringVector (const string_vector& v) -{ - QStringList l; - octave_idx_type n = v.length (); - - for (octave_idx_type i = 0; i < n; i++) - l << fromStdString (v[i]); - - return l; -} - -string_vector toStringVector (const QStringList& l) -{ - string_vector v (l.length ()); - int i = 0; - - foreach (const QString& s, l) - v[i++] = toStdString (s); - - return v; -} - -template <class T> -QFont computeFont (const typename T::properties& props, int height) -{ - QFont f (fromStdString (props.get_fontname ())); - - static std::map<std::string, QFont::Weight> weightMap; - static std::map<std::string, QFont::Style> angleMap; - static bool mapsInitialized = false; - - if (! mapsInitialized) - { - weightMap[std::string ("normal")] = QFont::Normal; - weightMap[std::string ("light")] = QFont::Light; - weightMap[std::string ("demi")] = QFont::DemiBold; - weightMap[std::string ("bold")] = QFont::Normal; - - angleMap[std::string ("normal")] = QFont::StyleNormal; - angleMap[std::string ("italic")] = QFont::StyleItalic; - angleMap[std::string ("oblique")] = QFont::StyleOblique; - - mapsInitialized = true; - } - - f.setPointSizeF (props.get_fontsize_points (height)); - f.setWeight (weightMap[props.get_fontweight ()]); - f.setStyle (angleMap[props.get_fontangle ()]); - - return f; -} - -template QFont computeFont<uicontrol> (const uicontrol::properties& props, - int height); -template QFont computeFont<uipanel> (const uipanel::properties& props, - int height); - -QColor fromRgb (const Matrix& rgb) -{ - QColor c; - - if (rgb.numel () == 3) - c.setRgbF (rgb(0), rgb(1), rgb(2)); - - return c; -} - -Matrix toRgb (const QColor& c) -{ - Matrix rgb (1, 3); - double* rgbData = rgb.fortran_vec (); - - c.getRgbF (rgbData, rgbData+1, rgbData+2); - - return rgb; -} - -std::string figureSelectionType (QMouseEvent* event, bool isDoubleClick) -{ - if (isDoubleClick) - return std::string ("open"); - else - { - Qt::MouseButtons buttons = event->buttons (); - Qt::KeyboardModifiers mods = event->modifiers (); - - if (mods == Qt::NoModifier) - { - if (buttons == Qt::LeftButton) - return std::string ("normal"); - else if (buttons == Qt::RightButton) - return std::string ("alt"); -#if defined (Q_WS_WIN) - else if (buttons == (Qt::LeftButton|Qt::RightButton)) - return std::string ("extend"); -#elif defined (Q_WS_X11) - else if (buttons == Qt::MidButton) - return std::string ("extend"); -#endif - } - else if (buttons == Qt::LeftButton) - { - if (mods == Qt::ShiftModifier) - return std::string ("extend"); - else if (mods == Qt::ControlModifier) - return std::string ("alt"); - } - } - - return std::string ("normal"); -} - -Matrix figureCurrentPoint (const graphics_object& fig, QMouseEvent* event) -{ - Object* tkFig = Backend::toolkitObject (fig); - - if (tkFig) - { - Container* c = tkFig->innerContainer (); - - if (c) - { - QPoint qp = c->mapFromGlobal (event->globalPos ()); - - return - tkFig->properties<figure> ().map_from_boundingbox (qp.x (), - qp.y ()); - } - } - - return Matrix (1, 2, 0.0); -} - -Qt::Alignment fromHVAlign (const caseless_str& halign, - const caseless_str& valign) -{ - Qt::Alignment flags; - - if (halign.compare ("left")) - flags |= Qt::AlignLeft; - else if (halign.compare ("center")) - flags |= Qt::AlignHCenter; - else if (halign.compare ("right")) - flags |= Qt::AlignRight; - else - flags |= Qt::AlignLeft; - - if (valign.compare ("middle")) - flags |= Qt::AlignVCenter; - else if (valign.compare ("top")) - flags |= Qt::AlignTop; - else if (valign.compare ("bottom")) - flags |= Qt::AlignBottom; - else - flags |= Qt::AlignVCenter; - - return flags; -} - -QImage makeImageFromCData (const octave_value& v, int width, int height) -{ - dim_vector dv (v.dims ()); - - if (dv.length () == 3 && dv(2) == 3) - { - int w = qMin (dv(1), width); - int h = qMin (dv(0), height); - - int x_off = (w < width ? (width - w) / 2 : 0); - int y_off = (h < height ? (height - h) / 2 : 0); - - QImage img (width, height, QImage::Format_ARGB32); - img.fill (qRgba (0, 0, 0, 0)); - - if (v.is_uint8_type ()) - { - uint8NDArray d = v.uint8_array_value (); - - for (int i = 0; i < w; i++) - for (int j = 0; j < h; j++) - { - int r = d(j, i, 0); - int g = d(j, i, 1); - int b = d(j, i, 2); - int a = 255; - - img.setPixel (x_off + i, y_off + j, qRgba (r, g, b, a)); - } - } - else if (v.is_single_type ()) - { - FloatNDArray f = v.float_array_value (); - - for (int i = 0; i < w; i++) - for (int j = 0; j < h; j++) - { - float r = f(j, i, 0); - float g = f(j, i, 1); - float b = f(j, i, 2); - int a = (xisnan (r) || xisnan (g) || xisnan (b) ? 0 : 255); - - img.setPixel (x_off + i, y_off + j, - qRgba (xround (r * 255), - xround (g * 255), - xround (b * 255), - a)); - } - } - else if (v.is_real_type ()) - { - NDArray d = v.array_value (); - - for (int i = 0; i < w; i++) - for (int j = 0; j < h; j++) - { - double r = d(j, i, 0); - double g = d(j, i, 1); - double b = d(j, i, 2); - int a = (xisnan (r) || xisnan (g) || xisnan (b) ? 0 : 255); - - img.setPixel (x_off + i, y_off + j, - qRgba (xround (r * 255), - xround (g * 255), - xround (b * 255), - a)); - } - } - - return img; - } - - return QImage (); -} - -octave_scalar_map makeKeyEventStruct (QKeyEvent* event) -{ - octave_scalar_map retval; - - retval.setfield ("Key", KeyMap::qKeyToKeyString (event->key ())); - retval.setfield ("Character", toStdString (event->text ())); - - std::list<std::string> modList; - Qt::KeyboardModifiers mods = event->modifiers (); - - if (mods & Qt::ShiftModifier) - modList.push_back ("shift"); - if (mods & Qt::ControlModifier) -#ifdef Q_OS_MAC - modList.push_back ("command"); -#else - modList.push_back ("control"); -#endif - if (mods & Qt::AltModifier) - modList.push_back ("alt"); -#ifdef Q_OS_MAC - if (mods & Qt::MetaModifier) - modList.push_back ("control"); -#endif - - retval.setfield ("Modifier", Cell (modList)); - - return retval; -} - -}; // namespace Utils - -}; // namespace QtHandles
--- a/libgui/graphics/Utils.h Thu Feb 20 21:32:45 2014 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,82 +0,0 @@ -/* - -Copyright (C) 2011-2014 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 -<http://www.gnu.org/licenses/>. - -*/ - -#ifndef __QtHandles_Utils__ -#define __QtHandles_Utils__ 1 - -#include <QColor> -#include <QFont> -#include <QImage> -#include <QString> -#include <QStringList> - -#include <string> - -#include "graphics.h" - -class QKeyEvent; -class QMouseEvent; - -namespace QtHandles -{ - -namespace Utils -{ - QString fromStdString (const std::string& s); - std::string toStdString (const QString& s); - - QStringList fromStringVector (const string_vector& v); - string_vector toStringVector (const QStringList& l); - - template <class T> - QFont computeFont (const typename T::properties& props, int height = -1); - - QColor fromRgb (const Matrix& rgb); - Matrix toRgb (const QColor& c); - - Qt::Alignment fromHVAlign (const caseless_str& halign, - const caseless_str& valign); - - std::string figureSelectionType (QMouseEvent* event, - bool isDoubleClick = false); - - Matrix figureCurrentPoint (const graphics_object& fig, QMouseEvent* event); - - template <class T> - inline typename T::properties& - properties (graphics_object obj) - { return dynamic_cast<typename T::properties&> (obj.get_properties ()); } - - template <class T> - inline typename T::properties& - properties (const graphics_handle& h) - { return Utils::properties<T> (gh_manager::get_object (h)); } - - QImage makeImageFromCData (const octave_value& v, int width = -1, - int height = -1); - - octave_scalar_map makeKeyEventStruct (QKeyEvent* event); -}; - -}; // namespace QtHandles - -#endif
--- a/libgui/graphics/__init_qt__.cc Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/__init_qt__.cc Fri Feb 21 11:35:36 2014 -0500 @@ -36,7 +36,7 @@ #include "defun.h" #include "Backend.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles {
--- a/libgui/graphics/module.mk Thu Feb 20 21:32:45 2014 -0500 +++ b/libgui/graphics/module.mk Fri Feb 21 11:35:36 2014 -0500 @@ -56,6 +56,7 @@ graphics/PopupMenuControl.h \ graphics/PushButtonControl.h \ graphics/PushTool.h \ + graphics/QtHandlesUtils.h \ graphics/RadioButtonControl.h \ graphics/SliderControl.h \ graphics/TextControl.h \ @@ -64,7 +65,6 @@ graphics/ToggleTool.h \ graphics/ToolBar.h \ graphics/ToolBarButton.h \ - graphics/Utils.h \ graphics/gl-select.h graphics_libgui_graphics_la_SOURCES = \ @@ -92,6 +92,7 @@ graphics/PopupMenuControl.cc \ graphics/PushButtonControl.cc \ graphics/PushTool.cc \ + graphics/QtHandlesUtils.cc \ graphics/RadioButtonControl.cc \ graphics/SliderControl.cc \ graphics/TextControl.cc \ @@ -100,7 +101,6 @@ graphics/ToggleTool.cc \ graphics/ToolBar.cc \ graphics/ToolBarButton.cc \ - graphics/Utils.cc \ graphics/gl-select.cc nodist_graphics_libgui_graphics_la_SOURCES = $(octave_gui_graphics_MOC) $(octave_gui_graphics_RC)