# HG changeset patch # User John W. Eaton # Date 1393024835 18000 # Node ID bc31d9359cf99a5864c8dff5158175d36535b132 # Parent 146ce31e5d28ee49fc6ca9869fe4f7c40d98727e# Parent 39fbe4aba56017ee78f4cfe67c2cf434de7ab002 maint: Periodic merge of gui-release to default. diff -r 146ce31e5d28 -r bc31d9359cf9 configure.ac --- a/configure.ac Thu Feb 20 14:08:53 2014 -0800 +++ b/configure.ac Fri Feb 21 18:20:35 2014 -0500 @@ -2705,23 +2705,24 @@ warn_gui="" ## Check for Qt libraries - PKG_CHECK_MODULES(QT, [QtCore, QtGui, QtNetwork, QtOpenGL], + QT_MODULES="QtCore QtGui QtNetwork QtOpenGL" + PKG_CHECK_MODULES(QT, [$QT_MODULES], [], [warn_gui="Qt libraries not found -- disabling GUI" build_gui=no]) if test $build_gui = yes; then ## Retrieve Qt compilation and linker flags - QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I QtCore QtGui QtNetwork QtOpenGL`" - QT_LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore QtGui QtNetwork QtOpenGL`" - QT_LIBS="`$PKG_CONFIG --libs-only-l QtCore QtGui QtNetwork QtOpenGL`" + QT_CPPFLAGS="`$PKG_CONFIG --cflags-only-I $QT_MODULES`" + QT_LDFLAGS="`$PKG_CONFIG --libs-only-L $QT_MODULES`" + QT_LIBS="`$PKG_CONFIG --libs-only-l $QT_MODULES`" case $host_os in *darwin*) ## Qt might be installed in framework if test -z "$QT_LIBS"; then - QT_LDFLAGS="`$PKG_CONFIG --libs-only-other QtCore QtGui QtNetwork | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" - QT_LIBS="`$PKG_CONFIG --libs-only-other QtCore QtGui QtNetwork | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" + QT_LDFLAGS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -e '-F' | uniq | tr '\n' ' '`" + QT_LIBS="`$PKG_CONFIG --libs-only-other $QT_MODULES | tr ' ' '\n' | $GREP -v -e '-F' | uniq | tr '\n' ' '`" ## Enabling link_all_deps works around libtool's imperfect handling ## of the -F flag AM_CONDITIONAL([AMCOND_LINK_ALL_DEPS], diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/BaseControl.cc --- a/libgui/graphics/BaseControl.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/BaseControl.cc Fri Feb 21 18:20:35 2014 -0500 @@ -31,7 +31,7 @@ #include "BaseControl.h" #include "ContextMenu.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/ButtonControl.cc --- a/libgui/graphics/ButtonControl.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/ButtonControl.cc Fri Feb 21 18:20:35 2014 -0500 @@ -28,7 +28,7 @@ #include "ButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/Canvas.cc --- a/libgui/graphics/Canvas.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/Canvas.cc Fri Feb 21 18:20:35 2014 -0500 @@ -33,7 +33,7 @@ #include "Canvas.h" #include "ContextMenu.h" #include "GLCanvas.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/Container.cc --- a/libgui/graphics/Container.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/Container.cc Fri Feb 21 18:20:35 2014 -0500 @@ -31,7 +31,7 @@ #include "Canvas.h" #include "Container.h" #include "Object.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/ContextMenu.cc --- a/libgui/graphics/ContextMenu.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/ContextMenu.cc Fri Feb 21 18:20:35 2014 -0500 @@ -28,7 +28,7 @@ #include "Backend.h" #include "ContextMenu.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/EditControl.cc --- a/libgui/graphics/EditControl.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/EditControl.cc Fri Feb 21 18:20:35 2014 -0500 @@ -29,7 +29,7 @@ #include "Container.h" #include "EditControl.h" #include "TextEdit.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/Figure.cc --- a/libgui/graphics/Figure.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/Figure.cc Fri Feb 21 18:20:35 2014 -0500 @@ -43,7 +43,7 @@ #include "Figure.h" #include "FigureWindow.h" #include "MouseModeActionGroup.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/KeyMap.h --- a/libgui/graphics/KeyMap.h Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/KeyMap.h Fri Feb 21 18:20:35 2014 -0500 @@ -23,6 +23,8 @@ #ifndef __QtHandles__KeyMap__ #define __QtHandles__KeyMap__ 1 +#include + namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/ListBoxControl.cc --- a/libgui/graphics/ListBoxControl.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/ListBoxControl.cc Fri Feb 21 18:20:35 2014 -0500 @@ -28,7 +28,7 @@ #include "Container.h" #include "ListBoxControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/Menu.cc --- a/libgui/graphics/Menu.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/Menu.cc Fri Feb 21 18:20:35 2014 -0500 @@ -31,7 +31,7 @@ #include "Figure.h" #include "Menu.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/Object.cc --- a/libgui/graphics/Object.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/Object.cc Fri Feb 21 18:20:35 2014 -0500 @@ -28,7 +28,7 @@ #include "Backend.h" #include "Object.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/ObjectFactory.cc --- a/libgui/graphics/ObjectFactory.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/ObjectFactory.cc Fri Feb 21 18:20:35 2014 -0500 @@ -49,7 +49,7 @@ #include "ToggleButtonControl.h" #include "ToggleTool.h" #include "ToolBar.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/Panel.cc --- a/libgui/graphics/Panel.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/Panel.cc Fri Feb 21 18:20:35 2014 -0500 @@ -34,7 +34,7 @@ #include "Container.h" #include "ContextMenu.h" #include "Panel.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/PopupMenuControl.cc --- a/libgui/graphics/PopupMenuControl.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/PopupMenuControl.cc Fri Feb 21 18:20:35 2014 -0500 @@ -28,7 +28,7 @@ #include "Container.h" #include "PopupMenuControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/PushButtonControl.cc --- a/libgui/graphics/PushButtonControl.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/PushButtonControl.cc Fri Feb 21 18:20:35 2014 -0500 @@ -29,7 +29,7 @@ #include "PushButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/QtHandlesUtils.cc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/graphics/QtHandlesUtils.cc Fri Feb 21 18:20:35 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 +. + +*/ + +#ifdef HAVE_CONFIG_H +#include +#endif + +#include +#include +#include + +#include + +#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 +QFont computeFont (const typename T::properties& props, int height) +{ + QFont f (fromStdString (props.get_fontname ())); + + static std::map weightMap; + static std::map 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 (const uicontrol::properties& props, + int height); +template QFont computeFont (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
().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 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 diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/QtHandlesUtils.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/libgui/graphics/QtHandlesUtils.h Fri Feb 21 18:20:35 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 +. + +*/ + +#ifndef __QtHandles_Utils__ +#define __QtHandles_Utils__ 1 + +#include +#include +#include +#include +#include + +#include + +#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 + 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 + inline typename T::properties& + properties (graphics_object obj) + { return dynamic_cast (obj.get_properties ()); } + + template + inline typename T::properties& + properties (const graphics_handle& h) + { return Utils::properties (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 diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/RadioButtonControl.cc --- a/libgui/graphics/RadioButtonControl.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/RadioButtonControl.cc Fri Feb 21 18:20:35 2014 -0500 @@ -28,7 +28,7 @@ #include "RadioButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/SliderControl.cc --- a/libgui/graphics/SliderControl.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/SliderControl.cc Fri Feb 21 18:20:35 2014 -0500 @@ -28,7 +28,7 @@ #include "Container.h" #include "SliderControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" #define RANGE_INT_MAX 1000000 diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/TextControl.cc --- a/libgui/graphics/TextControl.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/TextControl.cc Fri Feb 21 18:20:35 2014 -0500 @@ -28,7 +28,7 @@ #include "Container.h" #include "TextControl.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/ToggleButtonControl.cc --- a/libgui/graphics/ToggleButtonControl.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/ToggleButtonControl.cc Fri Feb 21 18:20:35 2014 -0500 @@ -28,7 +28,7 @@ #include "ToggleButtonControl.h" #include "Container.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/ToolBar.cc --- a/libgui/graphics/ToolBar.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/ToolBar.cc Fri Feb 21 18:20:35 2014 -0500 @@ -36,7 +36,7 @@ #include "Figure.h" #include "ToolBar.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/ToolBarButton.cc --- a/libgui/graphics/ToolBarButton.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/ToolBarButton.cc Fri Feb 21 18:20:35 2014 -0500 @@ -28,7 +28,7 @@ #include #include "ToolBarButton.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/Utils.cc --- a/libgui/graphics/Utils.cc Thu Feb 20 14:08:53 2014 -0800 +++ /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 -. - -*/ - -#ifdef HAVE_CONFIG_H -#include -#endif - -#include -#include -#include - -#include - -#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 -QFont computeFont (const typename T::properties& props, int height) -{ - QFont f (fromStdString (props.get_fontname ())); - - static std::map weightMap; - static std::map 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 (const uicontrol::properties& props, - int height); -template QFont computeFont (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
().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 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 diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/Utils.h --- a/libgui/graphics/Utils.h Thu Feb 20 14:08:53 2014 -0800 +++ /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 -. - -*/ - -#ifndef __QtHandles_Utils__ -#define __QtHandles_Utils__ 1 - -#include -#include -#include -#include -#include - -#include - -#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 - 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 - inline typename T::properties& - properties (graphics_object obj) - { return dynamic_cast (obj.get_properties ()); } - - template - inline typename T::properties& - properties (const graphics_handle& h) - { return Utils::properties (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 diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/__init_qt__.cc --- a/libgui/graphics/__init_qt__.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/__init_qt__.cc Fri Feb 21 18:20:35 2014 -0500 @@ -36,7 +36,7 @@ #include "defun.h" #include "Backend.h" -#include "Utils.h" +#include "QtHandlesUtils.h" namespace QtHandles { diff -r 146ce31e5d28 -r bc31d9359cf9 libgui/graphics/module.mk --- a/libgui/graphics/module.mk Thu Feb 20 14:08:53 2014 -0800 +++ b/libgui/graphics/module.mk Fri Feb 21 18:20:35 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 \ @@ -63,7 +64,7 @@ graphics/ToggleButtonControl.h \ graphics/ToggleTool.h \ graphics/ToolBar.h \ - graphics/Utils.h \ + graphics/ToolBarButton.h \ graphics/gl-select.h graphics_libgui_graphics_la_SOURCES = \ @@ -91,6 +92,7 @@ graphics/PopupMenuControl.cc \ graphics/PushButtonControl.cc \ graphics/PushTool.cc \ + graphics/QtHandlesUtils.cc \ graphics/RadioButtonControl.cc \ graphics/SliderControl.cc \ graphics/TextControl.cc \ @@ -98,7 +100,7 @@ graphics/ToggleButtonControl.cc \ graphics/ToggleTool.cc \ graphics/ToolBar.cc \ - graphics/Utils.cc \ + graphics/ToolBarButton.cc \ graphics/gl-select.cc nodist_graphics_libgui_graphics_la_SOURCES = $(octave_gui_graphics_MOC) $(octave_gui_graphics_RC) diff -r 146ce31e5d28 -r bc31d9359cf9 libinterp/corefcn/oct-stream.cc --- a/libinterp/corefcn/oct-stream.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libinterp/corefcn/oct-stream.cc Fri Feb 21 18:20:35 2014 -0500 @@ -3275,6 +3275,14 @@ while (is && ! is.eof () && (read_to_eof || count < elts_to_read)) { + if (! read_to_eof) + { + octave_idx_type remaining_elts = elts_to_read - count; + + if (remaining_elts < input_buf_elts) + input_buf_size = remaining_elts * input_elt_size; + } + char *input_buf = new char [input_buf_size]; is.read (input_buf, input_buf_size); @@ -3283,15 +3291,35 @@ char_count += gcount; - count += gcount / input_elt_size; + size_t nel = gcount / input_elt_size; + + count += nel; input_buf_list.push_back (input_buf); - if (is && skip != 0 && count == block_size) + if (is && skip != 0 && nel == block_size) { - int seek_status = seek (skip, SEEK_CUR); - - if (seek_status < 0) + // Seek to skip. If skip would move past EOF, + // position at EOF. + + off_t orig_pos = tell (); + + seek (0, SEEK_END); + + off_t eof_pos = tell (); + + // Is it possible for this to fail to return us to + // the original position? + seek (orig_pos, SEEK_SET); + + size_t remaining = eof_pos - orig_pos; + + if (remaining < skip) + seek (0, SEEK_END); + else + seek (skip, SEEK_CUR); + + if (! is) break; } } diff -r 146ce31e5d28 -r bc31d9359cf9 libinterp/corefcn/toplev.cc --- a/libinterp/corefcn/toplev.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libinterp/corefcn/toplev.cc Fri Feb 21 18:20:35 2014 -0500 @@ -470,7 +470,7 @@ octave_function *f = elt.fcn; - if (frame == 0 || (f && f->is_user_code ())) + if (elt.scope == cs[0].scope || (f && f->is_user_code ())) { if (! skipped) // We found the current user code frame, so skip it. diff -r 146ce31e5d28 -r bc31d9359cf9 libinterp/dldfcn/qr.cc --- a/libinterp/dldfcn/qr.cc Thu Feb 20 14:08:53 2014 -0800 +++ b/libinterp/dldfcn/qr.cc Fri Feb 21 18:20:35 2014 -0500 @@ -129,7 +129,7 @@ $QR = A$ where $Q$ is an orthogonal matrix and $R$ is upper triangular.\n\ @end tex\n\ @ifnottex\n\ -@code{@var{Q} * @var{Q} = @var{A}} where @var{Q} is an orthogonal matrix and\n\ +@code{@var{Q} * @var{R} = @var{A}} where @var{Q} is an orthogonal matrix and\n\ @var{R} is upper triangular.\n\ @end ifnottex\n\ \n\ diff -r 146ce31e5d28 -r bc31d9359cf9 scripts/general/postpad.m --- a/scripts/general/postpad.m Thu Feb 20 14:08:53 2014 -0800 +++ b/scripts/general/postpad.m Fri Feb 21 18:20:35 2014 -0500 @@ -30,6 +30,9 @@ ## ## If the optional argument @var{dim} is given, operate along this ## dimension. +## +## If @var{dim} is larger than the dimensions of @var{x}, the result will +## have @var{dim} dimensions. ## @seealso{prepad, cat, resize} ## @end deftypefn @@ -56,8 +59,7 @@ ## Find the first non-singleton dimension. (dim = find (sz > 1, 1)) || (dim = 1); else - if (!(isscalar (dim) && dim == fix (dim)) - || !(1 <= dim && dim <= nd)) + if (!(isscalar (dim) && dim == fix (dim) && dim >= 1)) error ("postpad: DIM must be an integer and a valid dimension"); endif endif @@ -89,9 +91,10 @@ %!assert (postpad ([1,2], 4, 2), [1,2,2,2]) %!assert (postpad ([1;2], 4, 2), [1;2;2;2]) %!assert (postpad ([1,2], 2, 2, 1), [1,2;2,2]) +%!assert (postpad ([1;2], 2, 2, 3), reshape ([1;2;2;2], 2, 1, 2)) +%!assert (postpad ([1,2], 2, 2, 3), reshape ([1,2,2,2], 1, 2, 2)) %!error postpad () %!error postpad (1) %!error postpad (1,2,3,4,5) -%!error postpad ([1,2], 2, 2,3) diff -r 146ce31e5d28 -r bc31d9359cf9 scripts/general/prepad.m --- a/scripts/general/prepad.m Thu Feb 20 14:08:53 2014 -0800 +++ b/scripts/general/prepad.m Fri Feb 21 18:20:35 2014 -0500 @@ -30,6 +30,9 @@ ## ## If the optional argument @var{dim} is given, operate along this ## dimension. +## +## If @var{dim} is larger than the dimensions of @var{x}, the result will +## have @var{dim} dimensions. ## @seealso{postpad, cat, resize} ## @end deftypefn @@ -56,8 +59,7 @@ ## Find the first non-singleton dimension. (dim = find (sz > 1, 1)) || (dim = 1); else - if (!(isscalar (dim) && dim == fix (dim)) - || !(1 <= dim && dim <= nd)) + if (!(isscalar (dim) && dim == fix (dim) && dim >= 1)) error ("prepad: DIM must be an integer and a valid dimension"); endif endif @@ -92,6 +94,9 @@ %!assert (prepad ([1,2], 2, 2, 1), [2,2;1,2]) +%!assert (prepad ([1,2], 2, 2, 3), reshape ([2,2,1,2], 1, 2, 2)) +%!assert (prepad ([1;2], 2, 2, 3), reshape ([2;2;1;2], 2, 1, 2)) + ## FIXME -- we need tests for multidimensional arrays. %!error prepad () @@ -100,7 +105,6 @@ %!error prepad ([1,2], 2, ones (2)) %!error prepad ([1,2], 2, 2, ones (3)) %!error prepad ([1,2], 2, 2, 1.1) -%!error prepad ([1,2], 2, 2, 3) %!error prepad ([1,2], ones (2)) %!error prepad ([1,2], -1) diff -r 146ce31e5d28 -r bc31d9359cf9 scripts/plot/util/findobj.m --- a/scripts/plot/util/findobj.m Thu Feb 20 14:08:53 2014 -0800 +++ b/scripts/plot/util/findobj.m Fri Feb 21 18:20:35 2014 -0500 @@ -119,6 +119,7 @@ regularexpression = []; property = []; logicaloperator = {}; + extranegation = []; pname = {}; pvalue = {}; np = 1; @@ -128,6 +129,9 @@ while (na <= numel (args)) regularexpression(np) = 0; property(np) = 0; + if (numel (extranegation) < np) + extranegation(np) = false; + endif logicaloperator{np} = "and"; if (ischar (args{na})) if (strcmpi (args{na}, "-regexp")) @@ -177,10 +181,8 @@ error ("findobj: inconsistent number of arguments"); endif else - ## This is sloppy ... but works like Matlab. if (strcmpi (args{na}, "-not")) - h = []; - return; + extranegation(np) = true; endif na = na + 1; endif @@ -241,6 +243,9 @@ else match(nh,np) = false; endif + if (extranegation(np)) + match(nh,np) = ! match(nh,np); + endif endfor endfor diff -r 146ce31e5d28 -r bc31d9359cf9 test/io.tst --- a/test/io.tst Thu Feb 20 14:08:53 2014 -0800 +++ b/test/io.tst Fri Feb 21 18:20:35 2014 -0500 @@ -552,3 +552,25 @@ %! assert (data, [25185, 26213; 25699, 0]); %! assert (count, 3); %! fclose (id); + +%!test +%! id = tmpfile (); +%! fwrite (id, char (0:15)); +%! frewind (id); +%! [data, count] = fread (id, inf, "2*uint8", 2); +%! assert (data, [0; 1; 4; 5; 8; 9; 12; 13]); +%! assert (count, 8); +%! frewind (id); +%! [data, count] = fread (id, 3, "2*uint8", 3); +%! assert (data, [0; 1; 5]); +%! assert (count, 3); +%! [data, count] = fread (id, 3, "2*uint8", 3); +%! assert (data, [6; 7; 11]); +%! assert (count, 3); +%! [data, count] = fread (id, 3, "2*uint8", 3); +%! assert (data, [12; 13]); +%! assert (count, 2); +%! [data, count] = fread (id, 3, "2*uint8", 3); +%! assert (data, []); +%! assert (count, 0); +%! fclose (id);