octave: libgui/graphics/Table.cc annotate

annotate libgui/graphics/Table.cc @ 27645:028205a91a07

eliminate global access to Octave resources in qt graphics classes Provide reference to base_qobject to qt graphics classes to eliminate need for accessing it through a global variable. * qt-graphics-toolkit.h, qt-graphics-toolkit.cc (qt_graphics_toolkit::m_octave_qobj): New member variable. (qt_graphics_toolkit::qt_graphics_toolkit): Accept reference to base_qobject as argument. (qt_graphics_toolkit::create_object): Pass m_octave_qobj to create functions for individual graphics objects. * __init_qt__.cc (__init__): Temporarily access base_qobject by calling octave::base_qobject::the_octave_qobject. Pass it to qt_graphics_toolkit constructor. * BaseControl.h, BaseControl.cc, ButtonControl.h, ButtonControl.cc, ButtonGroup.h, ButtonGroup.cc, Canvas.h, Canvas.cc, CheckBoxControl.h, CheckBoxControl.cc, Container.h, Container.cc, ContextMenu.h, ContextMenu.cc, EditControl.h, EditControl.cc, Figure.h, Figure.cc, GLCanvas.h, GLCanvas.cc, ListBoxControl.h, ListBoxControl.cc, Menu.h, Menu.cc, Panel.h, Panel.cc, PopupMenuControl.h, PopupMenuControl.cc, PushButtonControl.h, PushButtonControl.cc, PushTool.h, PushTool.cc, RadioButtonControl.h, RadioButtonControl.cc, SliderControl.h, SliderControl.cc, Table.h, Table.cc, TextControl.h, TextControl.cc, ToggleButtonControl.h, ToggleButtonControl.cc, ToggleTool.h, ToggleTool.cc, ToolBar.h, ToolBar.cc, ToolBarButton.h, ToolBarButton.cc, annotation-dialog.h, annotation-dialog.cc: Accept reference to base_qobject in create function and constructors for graphics objects. Eliminate global access to GUI resources.

author	John W. Eaton <jwe@octave.org>
date	Tue, 05 Nov 2019 13:28:45 -0500
parents	f844b1f03dcc
children	2a506bc4a7af

rev	line source
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1 /*
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	2
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	3 Copyright (C) 2016 Andrew Thornton
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	4
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	5 This file is part of Octave.
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	6
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	8 under the terms of the GNU General Public License as published by
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	10 (at your option) any later version.
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	11
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	12 Octave is distributed in the hope that it will be useful, but
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	15 GNU General Public License for more details.
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	16
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	17 You should have received a copy of the GNU General Public License
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	19 <https://www.gnu.org/licenses/>.
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	20
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	21 */
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	22
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	23 #if defined (HAVE_CONFIG_H)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	24 # include "config.h"
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	25 #endif
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	26
27417 f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	27 #include <QCheckBox>
f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	28 #include <QComboBox>
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	29 #include <QEvent>
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	30 #include <QFrame>
27417 f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	31 #include <QHBoxLayout>
f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	32 #include <QHeaderView>
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	33 #include <QLabel>
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	34 #include <QLineEdit>
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	35 #include <QModelIndexList>
27417 f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	36 #include <QMouseEvent>
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	37 #include <QString>
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	38 #include <QStringList>
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	39 #include <QTableWidget>
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	40 #include <QTableWidgetItem>
27417 f844b1f03dcc update some header file lists in libgui sources John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	41 #include <QTimer>
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	42
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	43 #include "Container.h"
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	44 #include "ContextMenu.h"
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	45 #include "Table.h"
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	46 #include "QtHandlesUtils.h"
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	47
27645 028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	48 #include "octave-qobject.h"
028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	49
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	50 #include "graphics.h"
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	51 #include "interpreter-private.h"
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	52 #include "oct-stream.h"
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	53 #include "oct-string.h"
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	54 #include "oct-strstrm.h"
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	55 #include "ov-struct.h"
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	56
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	57 namespace QtHandles
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	58 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	59
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	60 static const int AUTO_WIDTH = 75;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	61
26372 2d9ae06f621b Fix static analyzer detected V1003 issues with expansions in macros (bug #55347). Rik <rik@octave.org> parents: 26149 diff changeset	62 #define AUTO_HEIGHT (tp.get_fontsize () * 2 - 1)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	63
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	64 static QSize realQSizeForTable (QTableWidget *t)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	65 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	66 int w = t->verticalHeader ()->width () + 4;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	67 for (int i = 0; i < t->columnCount (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	68 w += t->columnWidth (i);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	69 int h = t->horizontalHeader ()->height () + 4;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	70 for (int i = 0; i < t->rowCount (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	71 h += t->rowHeight (i);
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	72 return QSize (w, h);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	73 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	74
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	75 #define FORMATNUMBER(type) \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	76 static QString formatNumber (type d, \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	77 char format = 'f', \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	78 int precision = 4) \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	79 { \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	80 if (format == 'n') \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	81 { \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	82 if (d == floor (d)) \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	83 return QString::number (d, 'g', precision); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	84 else if (d <= pow (10, precision - 1) && d > pow (10, 1 - precision)) \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	85 return QString::number (d, 'f', precision); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	86 else \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	87 return QString::number (d, 'e', precision); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	88 } \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	89 else if (format == 'F') \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	90 { \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	91 int exponent = floor (log10 (d) / 3) * 3; \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	92 d *= pow (10, -exponent); \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	93 return QString::number (d, 'f', precision) + "e" + \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	94 (exponent < 0 ? "-" : "+") + \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	95 QString ("%1").arg (abs (exponent), 3, 10, QChar ('0')); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	96 } \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	97 else if (format == 'E') \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	98 { \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	99 int exponent = floor (log10 (d) / 3) * 3; \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	100 d *= pow (10, -exponent); \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	101 return QString::number (d, \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	102 'f', \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	103 precision - floor (log10 (d)) - 1) + \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	104 "e" + (exponent < 0 ? "-" : "+") + \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	105 QString ("%1").arg (abs (exponent), 3, 10, QChar ('0')); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	106 } \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	107 else \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	108 return QString::number (d, format, precision); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	109 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	110
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	111 FORMATNUMBER(double)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	112 FORMATNUMBER(float)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	113
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	114 #undef FORMATNUMBER
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	115
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	116 static QString formatComplex (Complex c, char format = 'f', int precision = 4)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	117 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	118 return formatNumber (c.real (), format, precision) + " + "
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	119 + formatNumber (c.imag (), format, precision) + "i";
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	120 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	121
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	122 #define FORMAT_VALUE_EXCEPT_RAT(f,l) \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	123 if (format == "numeric" \|\| format == "short") \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	124 text = formatNumber (value, 'n', f); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	125 else if (format == "short f" \|\| format == "shortf") \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	126 text = formatNumber (value, 'f', f); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	127 else if (format == "short e" \|\| format == "shorte") \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	128 text = formatNumber (value, 'e', f); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	129 else if (format == "short eng" \|\| format == "shorteng") \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	130 text = formatNumber (value, 'F', f); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	131 else if (format == "short g" \|\| format == "shortg") \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	132 text = formatNumber (value, 'g', f + 1); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	133 else if (format == "long") \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	134 text = formatNumber (value, 'n', l); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	135 else if (format == "long f" \|\| format == "longf") \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	136 text = formatNumber (value, 'f', l); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	137 else if (format == "long e" \|\| format == "longe") \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	138 text = formatNumber (value, 'e', l); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	139 else if (format == "long eng" \|\| format == "longeng") \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	140 text = formatNumber (value, 'E', l); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	141 else if (format == "long g" \|\| format == "longg") \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	142 text = formatNumber (value, 'g', l + 1); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	143 else if (format == "bank") \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	144 text = QString::number (value, 'f', 2); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	145 else if (format == "+") \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	146 if (value > 0) \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	147 text = Utils::fromStdString ("+"); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	148 else if (value < 0) \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	149 text = Utils::fromStdString ("-"); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	150 else \
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	151 text = Utils::fromStdString ("");
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	152
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	153 #define FORMAT_VALUE(f,l) \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	154 FORMAT_VALUE_EXCEPT_RAT(f,l) \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	155 else if (format == "rat") \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	156 text = Utils::fromStdString (rational_approx (double (value), 0)); \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	157 else \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	158 { \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	159 text = formatNumber (value, 'n', f); \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	160 flag = Qt::AlignLeft ; \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	161 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	162
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	163 #define FORMAT_UINT_VALUE() \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	164 text = QString::number (value); \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	165 if (format == "char" \|\| format == "popup") \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	166 flag = Qt::AlignLeft; \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	167 else if (format == "+") \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	168 { \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	169 if (value > 0) \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	170 text = Utils::fromStdString ("+"); \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	171 else \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	172 text = Utils::fromStdString (""); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	173 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	174
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	175 #define FORMAT_INT_VALUE() \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	176 text = QString::number (value); \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	177 if (format == "char" \|\| format == "popup") \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	178 flag = Qt::AlignLeft ; \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	179 else if (format == "+") \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	180 { \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	181 if (value > 0) \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	182 text = Utils::fromStdString ("+"); \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	183 else if (value < 0) \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	184 text = Utils::fromStdString ("-"); \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	185 else \
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	186 text = Utils::fromStdString (""); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	187 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	188
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	189 static std::pair<Qt::AlignmentFlag, QString>
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	190 qStringValueFor (octave_value val, std::string format = "")
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	191 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	192 Qt::AlignmentFlag flag = Qt::AlignRight;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	193 QString text;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	194 if (val.is_string ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	195 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	196 text = QtHandles::Utils::fromStdString (val.string_value ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	197 flag = Qt::AlignLeft ;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	198 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	199 else if (val.iscomplex ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	200 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	201 // Matlab has multiple complex types, we only have double.
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	202 Complex c = val.complex_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	203 if (format == "short")
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	204 text = formatComplex (c, 'f', 4);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	205 else if (format == "short e" \|\| format == "shorte")
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	206 text = formatComplex (c, 'e', 4);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	207 else if (format == "short eng" \|\| format == "shorteng")
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	208 text = formatComplex (c, 'E', 4);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	209 else if (format == "short g" \|\| format == "shortg")
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	210 text = formatComplex (c, 'g', 5);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	211 else if (format == "long")
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	212 text = formatComplex (c, 'f', 15);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	213 else if (format == "long e" \|\| format == "longe")
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	214 text = formatComplex (c, 'e', 15);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	215 else if (format == "long eng" \|\| format == "longeng")
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	216 text = formatComplex (c, 'E', 15);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	217 else if (format == "long g" \|\| format == "longg")
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	218 text = formatComplex (c, 'g', 16);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	219 else if (format == "bank")
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	220 text = QString::number (c.real (), 'f', 2);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	221 else if (format == "+")
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	222 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	223 if (c.real () > 0)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	224 text = Utils::fromStdString ("+");
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	225 else if (c.real () < 0)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	226 text = Utils::fromStdString ("-");
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	227 else
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	228 text = Utils::fromStdString ("");
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	229 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	230 else if (format == "rat")
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	231 text = Utils::fromStdString (rational_approx (c.real (), 0)) + " + "
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	232 + Utils::fromStdString (rational_approx (c.imag (), 0)) + "i";
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	233 else if (format == "numeric")
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	234 text = QString::number (c.real (), 'g', 5) + " + "
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	235 + QString::number (c.imag (), 'g', 5) + "i";
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	236 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	237 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	238 text = QString::number (c.real (), 'g', 5) + " + "
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	239 + QString::number (c.imag (), 'g', 5) + "i";
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	240 flag = Qt::AlignLeft ;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	241 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	242 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	243 else if (val.is_double_type () )
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	244 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	245 double value = val.double_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	246 FORMAT_VALUE(4, 15)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	247 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	248 else if (val.is_single_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	249 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	250 float value = val.float_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	251 FORMAT_VALUE(4, 7)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	252 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	253 else if (val.is_int8_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	254 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	255 short int value = val.short_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	256 FORMAT_INT_VALUE()
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	257 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	258 else if (val.is_uint8_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	259 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	260 unsigned short int value = val.ushort_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	261 FORMAT_UINT_VALUE()
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	262 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	263 else if (val.is_int16_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	264 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	265 int value = val.int_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	266 FORMAT_INT_VALUE()
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	267 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	268 else if (val.is_uint16_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	269 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	270 unsigned int value = val.uint_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	271 FORMAT_UINT_VALUE()
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	272 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	273 else if (val.is_int32_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	274 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	275 long int value = val.long_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	276 FORMAT_INT_VALUE()
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	277 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	278 else if (val.is_uint32_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	279 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	280 unsigned long int value = val.ulong_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	281 FORMAT_UINT_VALUE()
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	282 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	283 else if (val.is_int64_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	284 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	285 int64_t value = val.int64_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	286 FORMAT_INT_VALUE()
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	287 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	288 else if (val.is_uint64_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	289 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	290 uint64_t value = val.uint64_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	291 FORMAT_UINT_VALUE()
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	292 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	293 else if (val.islogical ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	294 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	295 bool b = val.bool_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	296 if (format == "char" \|\| format == "popup" \|\| format == "")
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	297 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	298 text = Utils::fromStdString (b ? "true" : "false");
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	299 flag = Qt::AlignLeft ;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	300 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	301 else if (format == "+")
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	302 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	303 text = Utils::fromStdString (b ? "+" : "");
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	304 flag = Qt::AlignLeft ;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	305 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	306 else
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	307 text = Utils::fromStdString (b ? "1" : "0");
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	308 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	309 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	310 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	311 std::stringstream warn_string;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	312 warn_string << "Unknown conversion for datatype " << val.class_name ()
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	313 << " to " << format
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	314 << " for value " << val.string_value (true);
26149 242aa7b2c783 Silence unnecessary warnings about security-format (bug #55046). Rik <rik@octave.org> parents: 26127 diff changeset	315 warning ("%s", warn_string.str ().c_str ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	316
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	317 text = Utils::fromStdString (val.string_value (true));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	318 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	319
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	320 return std::make_pair (flag, text);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	321 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	322
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	323 #undef FORMAT_VALUE
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	324 #undef FORMAT_VALUE_EXCEPT_RAT
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	325 #undef FORMAT_UINT_VALUE
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	326 #undef FORMAT_INT_VALUE
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	327
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	328 static QTableWidgetItem * itemFor (octave_value val, std::string format = "",
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	329 bool enabled = false)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	330 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	331 QTableWidgetItem *retval = new QTableWidgetItem ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	332 std::pair<Qt::AlignmentFlag, QString> flag_and_text =
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	333 qStringValueFor (val, format);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	334 retval->setTextAlignment (flag_and_text.first);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	335 retval->setText (flag_and_text.second);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	336
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	337 if (enabled)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	338 retval->setFlags (retval->flags () \| Qt::ItemIsEditable);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	339 else
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	340 retval->setFlags (retval->flags () & ~Qt::ItemIsEditable);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	341
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	342 return retval;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	343 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	344
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	345 static octave_value
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	346 attempt_type_conversion (const octave_value& ov,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	347 const octave_value& old_value)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	348 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	349 octave_value retval;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	350
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	351 // Define a macro to help with the conversion of strings to integers
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	352 // FIXME: these will happily integer overflow in the (u)int64 case
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	353 // - this probably doesn't matter.
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	354 #define SCANF_AND_CONVERT(name,ctype,format) \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	355 else if (old_value.is_ ## name ## _type ()) \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	356 { \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	357 ctype val; \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	358 int n; \
26467 6595716a7f33 Table.cc: Fix static analyzer detected issues (bug #55347). Markus Mützel <markus.muetzel@gmx.de> parents: 26372 diff changeset	359 const std::string cxx_str = ov.string_value (); \
6595716a7f33 Table.cc: Fix static analyzer detected issues (bug #55347). Markus Mützel <markus.muetzel@gmx.de> parents: 26372 diff changeset	360 const char *c_str = cxx_str.c_str (); \
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	361 int error = sscanf (c_str, format, &val, &n); \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	362 if (error != 1 \|\| c_str[n]) \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	363 { \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	364 val = 0; \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	365 } \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	366 retval = octave_value ( octave_ ## name (val)); \
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	367 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	368
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	369 if (old_value.is_string ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	370 retval = ov;
26467 6595716a7f33 Table.cc: Fix static analyzer detected issues (bug #55347). Markus Mützel <markus.muetzel@gmx.de> parents: 26372 diff changeset	371 SCANF_AND_CONVERT(int8, int64_t, "%" PRId64 " %n")
6595716a7f33 Table.cc: Fix static analyzer detected issues (bug #55347). Markus Mützel <markus.muetzel@gmx.de> parents: 26372 diff changeset	372 SCANF_AND_CONVERT(uint8, uint64_t, "%" PRIu64 " %n")
6595716a7f33 Table.cc: Fix static analyzer detected issues (bug #55347). Markus Mützel <markus.muetzel@gmx.de> parents: 26372 diff changeset	373 SCANF_AND_CONVERT(int16, int64_t, "%" PRId64 " %n")
6595716a7f33 Table.cc: Fix static analyzer detected issues (bug #55347). Markus Mützel <markus.muetzel@gmx.de> parents: 26372 diff changeset	374 SCANF_AND_CONVERT(uint16, uint64_t, "%" PRIu64 " %n")
6595716a7f33 Table.cc: Fix static analyzer detected issues (bug #55347). Markus Mützel <markus.muetzel@gmx.de> parents: 26372 diff changeset	375 SCANF_AND_CONVERT(int32, int64_t, "%" PRId64 " %n")
6595716a7f33 Table.cc: Fix static analyzer detected issues (bug #55347). Markus Mützel <markus.muetzel@gmx.de> parents: 26372 diff changeset	376 SCANF_AND_CONVERT(uint32, uint64_t, "%" PRIu64 " %n")
6595716a7f33 Table.cc: Fix static analyzer detected issues (bug #55347). Markus Mützel <markus.muetzel@gmx.de> parents: 26372 diff changeset	377 SCANF_AND_CONVERT(int64, int64_t, "%" PRId64 " %n")
6595716a7f33 Table.cc: Fix static analyzer detected issues (bug #55347). Markus Mützel <markus.muetzel@gmx.de> parents: 26372 diff changeset	378 SCANF_AND_CONVERT(uint64, uint64_t, "%" PRIu64 " %n")
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	379
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	380 #undef SCANF_AND_CONVERT
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	381
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	382 else if (old_value.isnumeric () && ! old_value.isinteger ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	383 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	384 // Basically need to do str2double
26127 37e3aa267374 Move function str2double inside octave::string namespace (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26122 diff changeset	385 Complex complex = octave::string::str2double (ov.string_value ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	386 if (old_value.is_single_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	387 retval = octave_value (FloatComplex (complex));
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	388 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	389 retval = octave_value (complex);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	390 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	391 else if (old_value.islogical ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	392 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	393 // Right: Matlab basically needs this to be true or false, we should
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	394 // accept 1 too.
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	395 if (ov.string_value () == "true" \|\| ov.string_value () == "1")
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	396 retval = octave_value (true);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	397 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	398 retval = octave_value (false);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	399 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	400 else
26127 37e3aa267374 Move function str2double inside octave::string namespace (patch #9084). Markus Mützel <markus.muetzel@gmx.de> parents: 26122 diff changeset	401 retval = octave_value (octave::string::str2double (ov.string_value ()));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	402 return retval;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	403 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	404
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	405 QWidget *
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	406 Table::checkBoxForLogical (octave_value val, bool enabled = false)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	407 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	408 QWidget *retval = new QWidget (m_tableWidget);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	409 QCheckBox *checkBox = new QCheckBox ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	410 QHBoxLayout *layout = new QHBoxLayout (retval);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	411 layout->addWidget (checkBox);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	412 layout->setAlignment (Qt::AlignCenter);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	413 layout->setContentsMargins (0, 0, 0, 0);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	414 retval->setLayout (layout);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	415
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	416 if ((val.islogical () \|\| val.is_bool_scalar ()) && val.bool_value ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	417 checkBox->setCheckState (Qt::Checked);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	418 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	419 checkBox->setCheckState (Qt::Unchecked);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	420
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	421 checkBox->setAttribute (Qt::WA_TransparentForMouseEvents, true);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	422 checkBox->setFocusPolicy (Qt::NoFocus);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	423 checkBox->setProperty ("Enabled", QVariant (enabled));
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	424
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	425 return retval;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	426 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	427
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	428 Table*
27645 028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	429 Table::create (octave::base_qobject& oct_qobj, const graphics_object& go)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	430 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	431 Object *parent = Object::parentObject (go);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	432
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	433 if (parent)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	434 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	435 Container *container = parent->innerContainer ();
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	436
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	437 if (container)
27645 028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	438 return new Table (oct_qobj, go, new QTableWidget (container));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	439 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	440
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	441 return 0;
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	442 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	443
27645 028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	444 Table::Table (octave::base_qobject&, const graphics_object& go,
028205a91a07 eliminate global access to Octave resources in qt graphics classes John W. Eaton <jwe@octave.org> parents: 27417 diff changeset	445 QTableWidget *tableWidget)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	446 : Object (go, tableWidget), m_tableWidget (tableWidget), m_curData (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	447 m_blockUpdates (false)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	448 {
26820 0a383bddfb40 Also update uitbale position when figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26470 diff changeset	449 qObject ()->setObjectName ("UItable");
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	450 uitable::properties& tp = properties<uitable> ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	451
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	452 m_curData = octave_value (tp.get_data ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	453 Matrix bb = tp.get_boundingbox (false);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	454 m_tableWidget->setObjectName ("UITable");
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	455 m_tableWidget->setAutoFillBackground (true);
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	456 m_tableWidget->setGeometry (octave::math::round (bb(0)),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	457 octave::math::round (bb(1)),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	458 octave::math::round (bb(2)),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	459 octave::math::round (bb(3)));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	460 m_tableWidget->setFont (Utils::computeFont<uitable> (tp)) ;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	461 m_tableWidget->setSelectionBehavior (QAbstractItemView::SelectItems);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	462 updatePalette ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	463 m_keyPressHandlerDefined = ! tp.get_keypressfcn ().isempty ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	464 m_keyReleaseHandlerDefined = ! tp.get_keyreleasefcn ().isempty ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	465 updateData ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	466 updateRowname ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	467 updateColumnname ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	468 updateColumnwidth ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	469 updateEnable (); // Also does rearrangeableColumns
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	470 m_tableWidget->setToolTip (Utils::fromStdString (tp.get_tooltipstring ()));
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	471 m_tableWidget->setVisible (tp.is_visible ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	472 updateExtent ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	473 m_tableWidget->installEventFilter (this);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	474
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	475
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	476 connect (m_tableWidget, SIGNAL (itemChanged (QTableWidgetItem*)),
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	477 SLOT (itemChanged (QTableWidgetItem*)));
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	478 connect (m_tableWidget, SIGNAL (cellClicked (int, int)),
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	479 SLOT (cellClicked (int, int)));
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	480 connect (m_tableWidget, SIGNAL (itemSelectionChanged (void)),
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	481 SLOT (itemSelectionChanged (void)));
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	482 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	483
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	484 Table::~Table (void) { }
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	485
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	486 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	487 Table::itemSelectionChanged ()
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	488 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	489 if (! (properties<uitable> ().get_cellselectioncallback ().isempty ()))
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	490 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	491 QModelIndexList modelIndexList =
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	492 m_tableWidget->selectionModel ()->selectedIndexes ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	493 int length = modelIndexList.size ();
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	494 Matrix indices = Matrix (length, 2);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	495 for (int i = 0; i < length; i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	496 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	497 indices(i, 0) = modelIndexList.value (i).row () + 1;
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	498 indices(i, 1) = modelIndexList.value (i).column () + 1;
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	499 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	500 octave_scalar_map eventData;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	501 eventData.setfield ("Indices", indices);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	502 octave_value cellSelectionCallbackEventObject =
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	503 octave_value (new octave_struct (eventData));
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	504 emit gh_callback_event (m_handle, "cellselectioncallback",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	505 cellSelectionCallbackEventObject);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	506 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	507 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	508
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	509 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	510 Table::cellClicked (int row, int col)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	511 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	512 QCheckBox *checkBox = nullptr;
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	513 QWidget *widget
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	514 = qobject_cast<QWidget *> (m_tableWidget->cellWidget (row, col));
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	515 if (widget && ! widget->children ().isEmpty ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	516 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	517 QHBoxLayout *layout
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	518 = qobject_cast<QHBoxLayout *> (widget->children ().first ());
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	519
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	520 if (layout && layout->count () > 0)
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	521 checkBox = qobject_cast<QCheckBox *> (layout->itemAt (0)-> widget ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	522 }
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	523
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	524 if (checkBox && checkBox->property ("Enabled").toBool ())
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	525 checkBoxClicked (row, col, checkBox);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	526 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	527
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	528 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	529 Table::sendCellEditCallback (int row,
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	530 int col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	531 octave_value old_value,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	532 octave_value new_value,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	533 octave_value edit_data,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	534 octave_value error)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	535 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	536
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	537 if (!(properties<uitable> ().get_celleditcallback ().isempty ()))
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	538 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	539 Matrix indices = Matrix (1, 2);
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	540 indices(0, 0) = row + 1;
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	541 indices(0, 1) = col + 1;
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	542
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	543 octave_scalar_map eventData;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	544 eventData.setfield ("Indices", indices);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	545 eventData.setfield ("PreviousData", old_value);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	546 eventData.setfield ("NewData", new_value);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	547 eventData.setfield ("EditData", edit_data);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	548 eventData.setfield ("Error", error);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	549
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	550 octave_value cellEditCallbackEventObject =
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	551 octave_value (new octave_struct (eventData));
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	552
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	553 emit gh_callback_event (m_handle, "celleditcallback",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	554 cellEditCallbackEventObject);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	555 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	556 else if (error.string_value ().length () > 0)
26149 242aa7b2c783 Silence unnecessary warnings about security-format (bug #55046). Rik <rik@octave.org> parents: 26127 diff changeset	557 warning ("%s", error.string_value ().c_str ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	558 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	559
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	560 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	561 Table::comboBoxCurrentIndexChanged (const QString& value)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	562 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	563 if (m_blockUpdates)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	564 return;
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	565
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	566 m_blockUpdates = true;
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	567
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	568 gh_manager& gh_mgr = octave::__get_gh_manager__ ("Table::comboBoxCurrentIndexChanged");
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	569
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	570 octave::autolock guard (gh_mgr.graphics_lock ());
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	571
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	572 octave_value data = octave_value (m_curData);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	573 bool ok = false;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	574
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	575 QComboBox comboBox = qobject_cast<QComboBox > (sender ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	576 int row = comboBox->property ("row").toInt ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	577 int col = comboBox->property ("col").toInt ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	578
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	579 octave_value edit_data = octave_value (Utils::toStdString (value));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	580
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	581 if (row < data.rows () && col < data.columns ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	582 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	583 if (data.iscell ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	584 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	585 Cell cell = data.cell_value ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	586 octave_value old_data = cell(row, col);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	587 if (cell(row, col).is_string ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	588 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	589 cell(row, col) = edit_data;
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	590 if (edit_data.string_value () != old_data.string_value ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	591 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	592 m_curData = octave_value (cell);
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	593 emit gh_set_event (m_handle, "data", octave_value (cell),
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	594 false);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	595 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	596
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	597 octave_value error = octave_value ("");
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	598 sendCellEditCallback (row, col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	599 old_data,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	600 edit_data,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	601 edit_data,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	602 error);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	603 ok = true;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	604 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	605 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	606 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	607 cell(row, col) = attempt_type_conversion (edit_data, old_data);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	608
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	609 // Inform the QTableWidget of our change
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	610 updateData (row, col, cell(row, col),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	611 columnformat (col), columneditable (col));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	612
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	613 m_curData = octave_value (cell);
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	614 emit gh_set_event (m_handle, "data", octave_value (cell),
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	615 false);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	616
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	617 octave_value error = octave_value ("");
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	618 sendCellEditCallback (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	619 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	620 old_data,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	621 cell(row, col),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	622 edit_data,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	623 error);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	624 ok = true;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	625 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	626 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	627 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	628 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	629 octave_value old_data = data.is_matrix_type ()
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	630 ? data.fast_elem_extract (row + col * data.rows ())
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	631 : octave_value ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	632 data.fast_elem_insert (row + col * data.rows (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	633 attempt_type_conversion (edit_data, old_data));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	634
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	635 // Inform the QTableWidget of our change
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	636 updateData (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	637 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	638 data.fast_elem_extract (row + col * data.rows ()),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	639 columnformat (col),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	640 columneditable (col));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	641
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	642 m_curData = octave_value (data);
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	643 emit gh_set_event (m_handle, "data", data, false);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	644
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	645 octave_value error = octave_value ("");
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	646 sendCellEditCallback (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	647 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	648 old_data,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	649 data.fast_elem_extract (row + col * data.rows ()),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	650 edit_data,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	651 error);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	652 ok = true;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	653 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	654 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	655 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	656 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	657 // Reset the QTableWidgetItem
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	658 updateData (row, col, octave_value (""), columnformat (col),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	659 columneditable (col));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	660
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	661 octave_value error =
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	662 octave_value ("Table data is not editable at this location.");
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	663 sendCellEditCallback (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	664 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	665 octave_value (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	666 octave_value (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	667 edit_data,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	668 error);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	669 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	670
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	671 if (! ok)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	672 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	673 comboBox->setCurrentIndex (-1);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	674 comboBox->setEditable (true);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	675 comboBox->setEditText (comboBox->property ("original_value").toString ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	676 comboBox->lineEdit ()->setReadOnly (true);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	677 }
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	678 m_blockUpdates = false;
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	679 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	680
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	681 void
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	682 Table::checkBoxClicked (int row, int col, QCheckBox *checkBox)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	683 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	684 if (m_blockUpdates)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	685 return;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	686 m_blockUpdates = true;
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	687
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	688 gh_manager& gh_mgr = octave::__get_gh_manager__ ("Table::checkBoxClicked");
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	689
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	690 octave::autolock guard (gh_mgr.graphics_lock ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	691
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	692 bool new_value = ! checkBox->isChecked ();
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	693
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	694 octave_value data = octave_value (m_curData);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	695 if (data.islogical ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	696 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	697 // EASY WE JUST CONVERT
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	698 boolMatrix matrix = data.bool_matrix_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	699 if (row < matrix.rows () && col < matrix.columns ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	700 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	701 bool old_value = matrix(row, col);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	702 matrix(row, col) = new_value;
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	703 checkBox->setChecked (new_value);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	704 if (new_value != old_value)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	705 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	706 m_curData = octave_value (matrix);
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	707 emit gh_set_event (m_handle, "data", octave_value (matrix),
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	708 false);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	709 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	710
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	711 sendCellEditCallback (row, col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	712 octave_value (old_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	713 octave_value (new_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	714 octave_value (new_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	715 octave_value (""));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	716
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	717 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	718 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	719 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	720 sendCellEditCallback (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	721 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	722 octave_value (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	723 octave_value (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	724 octave_value (new_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	725 octave_value ("Table data is not editable at this location."));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	726 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	727 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	728 else if (data.iscell ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	729 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	730 Cell cell = data.cell_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	731 if (row < cell.rows () && col < cell.columns ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	732 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	733 if (cell(row, col).islogical ())
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	734 {
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	735 bool old_value = cell(row, col).bool_value ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	736 cell(row, col) = octave_value (new_value);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	737 checkBox->setChecked (new_value);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	738 if (new_value != old_value)
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	739 {
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	740 m_curData = octave_value (cell);
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	741 emit gh_set_event (m_handle, "data", octave_value (cell),
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	742 false);
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	743 }
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	744
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	745 sendCellEditCallback (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	746 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	747 octave_value (old_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	748 octave_value (new_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	749 octave_value (new_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	750 octave_value (""));
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	751 }
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	752 else
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	753 {
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	754 sendCellEditCallback (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	755 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	756 cell(row, col),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	757 octave_value (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	758 octave_value (new_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	759 octave_value ("Cannot convert logical edit to other type."));
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	760 }
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	761 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	762 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	763 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	764 sendCellEditCallback (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	765 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	766 cell(row, col),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	767 octave_value (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	768 octave_value (new_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	769 octave_value ("Table data is not editable at this location."));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	770 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	771 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	772 else if (data.is_matrix_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	773 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	774 if (row < data.rows () && col < data.columns ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	775 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	776 sendCellEditCallback (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	777 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	778 data.fast_elem_extract (row + col * data.rows ()),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	779 octave_value (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	780 octave_value (new_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	781 octave_value ("Cannot convert logical edit to other type."));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	782 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	783 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	784 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	785 sendCellEditCallback (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	786 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	787 data.fast_elem_extract (row + col * data.rows ()),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	788 octave_value (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	789 octave_value (new_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	790 octave_value ("Table data is not editable at this location."));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	791 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	792 }
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	793 m_blockUpdates = false;
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	794 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	795
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	796
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	797 void
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	798 Table::itemChanged (QTableWidgetItem *item)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	799 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	800 if (m_blockUpdates)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	801 return;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	802 m_blockUpdates = true;
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	803
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	804 gh_manager& gh_mgr = octave::__get_gh_manager__ ("Table::itemChanged");
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	805
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	806 octave::autolock guard (gh_mgr.graphics_lock ());
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	807
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	808 octave_value data = octave_value (m_curData);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	809
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	810 int row = item->row ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	811 int col = item->column ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	812 octave_value edit_data = octave_value (Utils::toStdString (item->text ()));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	813 octave_value new_value;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	814 octave_value old_value;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	815 octave_value new_data;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	816
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	817 if (row < data.rows () && col < data.columns ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	818 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	819 if (data.iscell ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	820 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	821 old_value = data.cell_value () (row, col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	822 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	823 else if (data.is_matrix_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	824 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	825 old_value = data.fast_elem_extract (row + col * data.rows ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	826 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	827
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	828 // Now we need to coerce the new_value in to the type of the old_value
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	829 if (old_value.is_string ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	830 new_value = edit_data;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	831 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	832 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	833 new_value = attempt_type_conversion (edit_data, old_value);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	834 std::pair<Qt::AlignmentFlag, QString> flag_and_text =
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	835 qStringValueFor (new_value, columnformat (col));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	836 item->setTextAlignment (flag_and_text.first);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	837 item->setText (flag_and_text.second);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	838 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	839
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	840 if (data.iscell ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	841 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	842 Cell cell = data.cell_value ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	843 cell(row, col) = new_value;
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	844 new_data = octave_value (cell);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	845 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	846 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	847 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	848 data.fast_elem_insert (row + col * data.rows (), new_value);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	849 new_data = data;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	850 }
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	851 m_curData = octave_value (new_data);
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	852 emit gh_set_event (m_handle, "data", new_data, false);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	853
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	854 sendCellEditCallback (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	855 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	856 octave_value (old_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	857 octave_value (new_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	858 octave_value (new_value),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	859 octave_value (""));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	860 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	861 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	862 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	863 item->setText ("");
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	864
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	865 octave_value error =
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	866 octave_value ("Table data is not editable at this location.");
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	867 sendCellEditCallback (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	868 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	869 octave_value (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	870 octave_value (),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	871 edit_data,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	872 error);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	873 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	874
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	875 m_blockUpdates = false;
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	876 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	877
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	878 void
26820 0a383bddfb40 Also update uitbale position when figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26470 diff changeset	879 Table::redraw (void)
0a383bddfb40 Also update uitbale position when figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26470 diff changeset	880 {
0a383bddfb40 Also update uitbale position when figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26470 diff changeset	881 update (uitable::properties::ID_POSITION);
0a383bddfb40 Also update uitbale position when figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26470 diff changeset	882 }
0a383bddfb40 Also update uitbale position when figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26470 diff changeset	883
0a383bddfb40 Also update uitbale position when figure is (un)maximized (bug #53709) Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 26470 diff changeset	884 void
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	885 Table::update (int pId)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	886 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	887 uitable::properties& tp = properties<uitable> ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	888
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	889 switch (pId)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	890 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	891 case uitable::properties::ID_BACKGROUNDCOLOR:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	892 case uitable::properties::ID_FOREGROUNDCOLOR:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	893 updatePalette ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	894 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	895
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	896 case uitable::properties::ID_COLUMNNAME:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	897 updateColumnname ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	898 updateColumnwidth ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	899 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	900
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	901 case uitable::properties::ID_COLUMNWIDTH:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	902 updateColumnwidth ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	903 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	904
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	905 case uitable::properties::ID_COLUMNEDITABLE:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	906 case uitable::properties::ID_COLUMNFORMAT:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	907 case uitable::properties::ID_DATA:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	908 m_blockUpdates = true;
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	909 m_curData = octave_value (tp.get_data ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	910 updateData ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	911 updateRowname ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	912 updateColumnname ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	913 updateColumnwidth ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	914 updateEnable ();
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	915 m_blockUpdates = false;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	916 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	917
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	918 case uitable::properties::ID_ENABLE:
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	919 updateEnable ();
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	920 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	921
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	922 case uitable::properties::ID_KEYPRESSFCN:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	923 m_keyPressHandlerDefined = ! tp.get_keypressfcn ().isempty ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	924 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	925
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	926 case uitable::properties::ID_KEYRELEASEFCN:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	927 m_keyReleaseHandlerDefined = ! tp.get_keyreleasefcn ().isempty ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	928 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	929
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	930 case uitable::properties::ID_FONTNAME:
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	931 case uitable::properties::ID_FONTSIZE:
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	932 case uitable::properties::ID_FONTWEIGHT:
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	933 case uitable::properties::ID_FONTANGLE:
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	934 if (m_tableWidget)
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	935 {
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	936 m_tableWidget->setFont (Utils::computeFont<uitable> (tp));
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	937 for (int row = 0; row < m_tableWidget->rowCount (); row++)
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	938 {
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	939 m_tableWidget->setRowHeight (row, AUTO_HEIGHT);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	940 }
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	941 }
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	942 break;
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	943
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	944 case uitable::properties::ID_POSITION:
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	945 {
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	946 Matrix bb = tp.get_boundingbox (false);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	947 m_tableWidget->setGeometry (octave::math::round (bb(0)),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	948 octave::math::round (bb(1)),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	949 octave::math::round (bb(2)),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	950 octave::math::round (bb(3)));
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	951 updateExtent ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	952 }
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	953 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	954
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	955 case uitable::properties::ID_REARRANGEABLECOLUMNS:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	956 updateRearrangeableColumns ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	957 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	958
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	959 case uitable::properties::ID_ROWNAME:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	960 updateRowname ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	961 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	962
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	963 case uitable::properties::ID_ROWSTRIPING:
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	964 updatePalette ();
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	965 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	966
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	967 case uitable::properties::ID_TOOLTIPSTRING:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	968 m_tableWidget->setToolTip (Utils::fromStdString (tp.get_tooltipstring ()));
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	969 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	970
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	971 case base_properties::ID_VISIBLE:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	972 m_tableWidget->setVisible (tp.is_visible ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	973 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	974
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	975 default:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	976 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	977
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	978 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	979 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	980
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	981 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	982 Table::updateColumnname (void)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	983 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	984 uitable::properties& tp = properties<uitable> ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	985
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	986 // Reset the Column Count
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	987 m_tableWidget->setColumnCount (tp.get_data ().columns ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	988
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	989 octave_value columnname = tp.get_columnname ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	990 QStringList l;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	991 bool visible = true;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	992
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	993 if (columnname.is_string () && columnname.string_value (false) == "numbered")
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	994 for (int i = 0; i < m_tableWidget->columnCount (); i++)
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	995 l << QString::number (i + 1);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	996 else if (columnname.is_string ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	997 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	998 if (m_tableWidget->columnCount () > 0)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	999 l << Utils::fromStdString (columnname.string_value ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1000 for (int i = 1; i < m_tableWidget->columnCount (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1001 l << "";
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1002 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1003 else if (columnname.isempty ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1004 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1005 for (int i = 0; i < m_tableWidget->columnCount (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1006 l << "";
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1007
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1008 visible = false;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1009 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1010 else if (columnname.iscell ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1011 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1012 octave_idx_type n = columnname.numel ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1013 Cell cell_value = columnname.cell_value ();
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1014
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1015 for (octave_idx_type i = 0; i < n; i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1016 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1017 octave_value v = cell_value (i);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1018 if (v.is_string ())
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1019 l << Utils::fromStdString (v.string_value (true));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1020 else if (v.is_matrix_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1021 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1022 Matrix data = v.matrix_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1023
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1024 /* Now Matlab does something very strange here:
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1025 * If data is a row or column matrix,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1026 * then each datapoint is added.
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1027 * Otherwise, nothing is set.
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1028 */
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1029 if (data.rows () > 1 && data.cols () > 1)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1030 l << "";
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1031 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1032 for (octave_idx_type j = 0; j < data.numel (); j++)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1033 l << QString::number (data(j));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1034 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1035 else if (v.isnumeric ())
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1036 l << QString::number (v.double_value ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1037 else
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1038 l << QString::number (v.double_value ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1039 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1040 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1041 else if (columnname.is_matrix_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1042 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1043 octave_idx_type n = columnname.numel ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1044 Matrix matrix_value = columnname.matrix_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1045
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1046 for (octave_idx_type i = 0; i < n; i++)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1047 l << QString::number (matrix_value(i));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1048 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1049 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1050 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1051 for (int i = 0; i < m_tableWidget->columnCount (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1052 l << "";
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1053 visible = false;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1054 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1055
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1056 l.replaceInStrings ("\|", "\n");
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1057
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1058 // Now add the columns as required
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1059 if (m_tableWidget->columnCount () < l.length ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1060 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1061 int oldColumnCount = m_tableWidget->columnCount ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1062 m_tableWidget->setColumnCount (l.length ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1063 for (int col = oldColumnCount; col < l.length (); col++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1064 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1065 std::string format = columnformat (col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1066 bool enabled = columneditable (col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1067
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1068 for (int row = 0; row < m_tableWidget->rowCount (); row++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1069 updateData (row, col, octave_value (""), format, enabled);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1070 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1071 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1072
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1073 m_tableWidget->setHorizontalHeaderLabels (l);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1074 m_tableWidget->horizontalHeader ()->setVisible (visible);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1075 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1076
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1077 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1078 Table::updateColumnwidth (void)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1079 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1080 uitable::properties& tp = properties<uitable> ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1081
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1082 octave_value columnwidth = tp.get_columnwidth ();
27277 db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	1083 if (columnwidth.isempty ()
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	1084 \|\| (columnwidth.is_string ()
db687716fed6 style fixes: generally aim to break long lines before operators, not after John W. Eaton <jwe@octave.org> parents: 27276 diff changeset	1085 && columnwidth.string_value (false) == "auto"))
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1086 for (int i = 0; i < m_tableWidget->columnCount (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1087 m_tableWidget->setColumnWidth (i, AUTO_WIDTH);
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1088 else if (columnwidth.is_string ()
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1089 && columnwidth.string_value (false) == "preferred")
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1090 for (int i = 0; i < m_tableWidget->columnCount (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1091 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1092 int column_size =
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1093 (qobject_cast<QAbstractItemView *> (m_tableWidget))->sizeHintForColumn (i);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1094 int header_size = m_tableWidget->horizontalHeader ()->sectionSizeHint (i);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1095
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1096 if (column_size > header_size)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1097 header_size = column_size;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1098 m_tableWidget->setColumnWidth (i, header_size);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1099 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1100 else if (columnwidth.iscell ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1101 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1102 Cell cell_value = columnwidth.cell_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1103 int i = 0;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1104 for (; i < m_tableWidget->columnCount () && i < cell_value.numel (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1105 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1106 octave_value v = cell_value (i);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1107 if (v.is_string () && v.string_value (false) == "auto")
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1108 m_tableWidget->setColumnWidth (i, AUTO_WIDTH);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1109 else if (v.is_string () && v.string_value (false) == "preferred")
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1110 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1111 int column_size =
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1112 (qobject_cast<QAbstractItemView *> (m_tableWidget))->sizeHintForColumn (i);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1113 int header_size = m_tableWidget->horizontalHeader ()->sectionSizeHint (i);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1114
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1115 if (column_size > header_size)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1116 header_size = column_size;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1117 m_tableWidget->setColumnWidth (i, header_size);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1118 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1119 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1120 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1121 int w = int (v.double_value ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1122 m_tableWidget->setColumnWidth (i, w);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1123 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1124 }
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1125 for (; i < m_tableWidget->columnCount (); i++)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1126 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1127 int column_size =
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1128 (qobject_cast<QAbstractItemView *> (m_tableWidget))->sizeHintForColumn (i);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1129 int header_size = m_tableWidget->horizontalHeader ()->sectionSizeHint (i);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1130
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1131 if (column_size > header_size)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1132 header_size = column_size;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1133 m_tableWidget->setColumnWidth (i, header_size);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1134 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1135 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1136 else if (columnwidth.is_matrix_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1137 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1138 Matrix matrix_value = columnwidth.matrix_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1139 int i = 0;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1140 for (; i < m_tableWidget->columnCount () && i < matrix_value.numel (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1141 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1142 octave_value v = matrix_value(i);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1143 int w = int (v.double_value ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1144 m_tableWidget->setColumnWidth (i, w);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1145 }
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1146 for (; i < m_tableWidget->columnCount (); i++)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1147 m_tableWidget->setColumnWidth (i, AUTO_WIDTH);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1148 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1149 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1150
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1151 bool inline
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1152 Table::columneditable (int col)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1153 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1154 uitable::properties& tp = properties<uitable> ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1155 boolNDArray columneditable = tp.get_columneditable ().bool_array_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1156 bool editable = false;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1157
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1158 if (! columneditable.isempty () && col < columneditable.numel ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1159 editable = columneditable.xelem (col);
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1160 else if (! columneditable.isempty () && columneditable.numel () == 1)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1161 editable = columneditable.xelem (0);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1162
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1163 return editable;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1164 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1165
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1166 std::string inline
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1167 Table::columnformat (int col)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1168 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1169 uitable::properties& tp = properties<uitable> ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1170 std::string format = "";
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1171 octave_value ov_columnformat = tp.get_columnformat ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1172
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1173 if (ov_columnformat.iscell ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1174 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1175 Cell columnformat = ov_columnformat.cell_value ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1176 if (! columnformat.isempty () && col < columnformat.numel ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1177 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1178 octave_value format_value = columnformat.xelem (col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1179
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1180 if (! format_value.isempty () && format_value.is_string ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1181 format = format_value.string_value ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1182 else if (! format_value.isempty () && format_value.iscell ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1183 format = "popup";
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1184 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1185 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1186 else if (ov_columnformat.is_string ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1187 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1188 format = ov_columnformat.string_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1189 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1190 return format;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1191 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1192
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1193 void inline
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1194 Table::updateDataColumn (int col)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1195 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1196 octave_value data = properties<uitable> ().get_data ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1197
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1198 std::string format = columnformat (col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1199 bool is_editable = columneditable (col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1200
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1201 for (octave_idx_type row = 0; row < data.rows (); row++)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1202 updateData (row,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1203 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1204 data.iscell ()
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1205 ? data.cell_value () (row, col)
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1206 : data.fast_elem_extract (row + col * data.rows ()),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1207 format,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1208 is_editable);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1209 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1210
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1211 void inline
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1212 Table::updateData (int row, int col)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1213 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1214 octave_value data = properties<uitable> ().get_data ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1215 updateData (row,
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1216 col,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1217 data.iscell ()
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1218 ? data.cell_value () (row, col)
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1219 : data.fast_elem_extract (row + col * data.rows ()),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1220 columnformat (col),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1221 columneditable (col));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1222 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1223
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1224 void inline
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1225 Table::updateData (int row, int col, octave_value value,
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1226 std::string format = "", bool enabled = false)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1227 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1228 if (format == "logical" \|\| (format == "" && value.islogical ()))
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1229 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1230 if (m_tableWidget->item (row, col))
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1231 delete m_tableWidget->item (row, col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1232
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1233 m_tableWidget->setCellWidget (row, col, checkBoxForLogical (value, enabled));
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1234 m_tableWidget->cellWidget (row, col)->setProperty ("row", QVariant (row));
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1235 m_tableWidget->cellWidget (row, col)->setProperty ("col", QVariant (col));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1236 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1237 else if (format == "popup" && enabled)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1238 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1239 if (m_tableWidget->item (row, col))
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1240 delete m_tableWidget->item (row, col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1241
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1242 QString string_value = qStringValueFor (value, format).second;
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1243 uitable::properties& tp = properties<uitable> ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1244 octave_value format_value = tp.get_columnformat ().cell_value ().xelem (col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1245
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1246 QComboBox *comboBox = new QComboBox ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1247 comboBox->setProperty ("row", QVariant (row));
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1248 comboBox->setProperty ("col", QVariant (col));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1249
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1250 int index = -1;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1251 for (int k = 0; k < format_value.numel (); k++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1252 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1253 QString popup_item
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1254 = Utils::fromStdString (format_value.fast_elem_extract (k).string_value ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1255
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1256 comboBox->addItem (popup_item);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1257
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1258 if (popup_item == string_value)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1259 index = k;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1260 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1261 comboBox->setCurrentIndex (index);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1262
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1263 if (index < 0)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1264 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1265 comboBox->setEditable (true);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1266 comboBox->setEditText (string_value);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1267 comboBox->lineEdit ()->setReadOnly (true);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1268 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1269
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1270 comboBox->setProperty ("original_value", QVariant (string_value));
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1271
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1272 comboBox->installEventFilter (this);
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1273 m_tableWidget->setCellWidget (row, col, comboBox);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1274 connect (comboBox, SIGNAL(currentIndexChanged (const QString&)),
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1275 this, SLOT(comboBoxCurrentIndexChanged (const QString&)));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1276 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1277 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1278 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1279 if (m_tableWidget->cellWidget (row, col))
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1280 delete m_tableWidget->cellWidget (row, col);
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1281 m_tableWidget->setItem (row, col, itemFor (value, format, enabled));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1282 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1283 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1284
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1285 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1286 Table::updateData ()
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1287 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1288 uitable::properties& tp = properties<uitable> ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1289
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1290 octave_value data = tp.get_data ();
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1291
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1292 if (data.iscell () \|\| data.is_matrix_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1293 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1294 m_tableWidget->setRowCount (data.rows ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1295 m_tableWidget->setColumnCount (data.columns ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1296
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1297 for (octave_idx_type col = 0; col < data.columns (); col++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1298 updateDataColumn (col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1299 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1300
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1301 for (octave_idx_type row = 0; row < m_tableWidget->rowCount (); row++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1302 m_tableWidget->setRowHeight (row, AUTO_HEIGHT);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1303 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1304
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1305 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1306 Table::updateEnable (void)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1307 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1308 uitable::properties& tp = properties<uitable> ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1309 bool enabled = tp.is_enable ();
26470 83857449f3da Table.cc (Table::updateEnable): Do not invert enabled status (bug #55403). Markus Mützel <markus.muetzel@gmx.de> parents: 26467 diff changeset	1310 m_tableWidget->setEnabled (enabled);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1311
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1312 bool rearrangeableColumns = tp.is_rearrangeablecolumns ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1313
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1314 // Set selection mode
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1315 m_tableWidget->setSelectionMode (enabled
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1316 ? QAbstractItemView::ExtendedSelection
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1317 : QAbstractItemView::NoSelection);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1318
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1319 // Set rearrangeablecolumns
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1320 #if defined (HAVE_QT4)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1321 m_tableWidget->horizontalHeader ()->setMovable (enabled && rearrangeableColumns);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1322 #elif defined (HAVE_QT5)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1323 m_tableWidget->horizontalHeader ()->setSectionsMovable (enabled && rearrangeableColumns);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1324 #endif
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1325 m_tableWidget->horizontalHeader ()->setDragEnabled (enabled && rearrangeableColumns);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1326 m_tableWidget->horizontalHeader ()->setDragDropMode (QAbstractItemView::InternalMove);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1327
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1328 // Turn off column editable
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1329 for (int col = 0; col < m_tableWidget->columnCount (); col++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1330 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1331 bool editable = columneditable (col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1332
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1333 for (int row = 0; row < m_tableWidget->rowCount (); row++)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1334 if (QTableWidgetItem *item = m_tableWidget->item (row, col))
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1335 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1336 Qt::ItemFlags flags = item->flags ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1337 if (enabled && editable)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1338 item->setFlags (flags \| Qt::ItemIsEditable);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1339 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1340 item->setFlags (flags & ~Qt::ItemIsEditable);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1341 }
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1342 else if (QWidget *widget = m_tableWidget->cellWidget (row, col))
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1343 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1344 QCheckBox *checkBox = nullptr;
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1345 if (widget && ! widget->children ().isEmpty ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1346 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1347 QHBoxLayout *layout
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1348 = qobject_cast<QHBoxLayout *> (widget->children ().first ());
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1349
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1350 if (layout && layout->count () > 0)
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1351 checkBox = qobject_cast<QCheckBox *> (layout->itemAt (0)-> widget ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1352 }
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1353
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1354 if (checkBox)
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1355 widget->setProperty ("Enabled", QVariant (enabled & editable));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1356 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1357 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1358 widget->setAttribute (Qt::WA_TransparentForMouseEvents,
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1359 !(editable & enabled));
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1360
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1361 widget->setFocusPolicy (Qt::NoFocus);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1362 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1363 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1364 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1365 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1366
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1367 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1368 Table::updateExtent (void)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1369 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1370 QSize s = realQSizeForTable (m_tableWidget);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1371 Matrix extent = Matrix (1, 4);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1372 extent(0, 0) = 0;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1373 extent(0, 1) = 0;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1374 extent(0, 2) = s.width ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1375 extent(0, 3) = s.height () ;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1376 graphics_object go = object ();
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1377 emit gh_set_event (go.get_handle (), "extent", extent, false);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1378 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1379
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1380 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1381 Table::updatePalette (void)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1382 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1383 uitable::properties& tp = properties<uitable> ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1384
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1385 QPalette p = m_tableWidget->palette ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1386 p.setColor (QPalette::Text,
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1387 Utils::fromRgb (tp.get_foregroundcolor_rgb ()));
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1388 p.setColor (QPalette::Base,
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1389 Utils::fromRgb (tp.get_backgroundcolor_rgb ()));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1390 p.setColor (QPalette::AlternateBase,
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1391 Utils::fromRgb (tp.get_alternatebackgroundcolor_rgb ()));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1392 m_tableWidget->setPalette (p);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1393 m_tableWidget->setAlternatingRowColors (tp.is_rowstriping ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1394 // FIXME: Handle multiple alternating background colors
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1395 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1396
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1397 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1398 Table::updateRowname (void)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1399 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1400 uitable::properties& tp = properties<uitable> ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1401
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1402 // Reset the row count
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1403 m_tableWidget->setRowCount (tp.get_data ().rows ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1404
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1405 octave_value rowname = tp.get_rowname ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1406 QStringList l;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1407 bool visible = true;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1408
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1409 if (rowname.is_string () && rowname.string_value (false) == "numbered")
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1410 for (int i = 0; i < m_tableWidget->rowCount (); i++)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1411 l << QString::number (i + 1);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1412 else if (rowname.is_string ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1413 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1414 if (m_tableWidget->rowCount () > 0)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1415 l << Utils::fromStdString (rowname.string_value ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1416 for (int i = 1; i < m_tableWidget->rowCount (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1417 l << "";
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1418 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1419 else if (rowname.isempty ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1420 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1421 for (int i = 0; i < m_tableWidget->rowCount (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1422 l << "";
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1423 visible = false;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1424 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1425 else if (rowname.iscell ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1426 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1427 octave_idx_type n = rowname.numel ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1428 Cell cell_value = rowname.cell_value ();
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1429
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1430 for (octave_idx_type i = 0; i < n; i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1431 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1432 octave_value v = cell_value (i);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1433 if (v.is_string ())
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1434 l << Utils::fromStdString (v.string_value (true));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1435 else if (v.is_matrix_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1436 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1437 Matrix data = v.matrix_value ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1438
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1439 /* Now Matlab does something very strange here:
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1440 * If data is a row or column matrix,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1441 * then each datapoint is added.
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1442 * Otherwise, nothing is set.
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1443 */
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1444 if (data.rows () > 1 && data.cols () > 1)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1445 l << "";
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1446 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1447 for (octave_idx_type j = 0; j < data.numel (); j++)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1448 l << QString::number (data(j));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1449 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1450 else if (v.isnumeric ())
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1451 l << QString::number (v.double_value (true));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1452 else
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1453 l << QString::number (v.double_value (true));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1454 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1455 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1456 else if (rowname.is_matrix_type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1457 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1458 octave_idx_type n = rowname.numel ();
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1459 Matrix matrix_value = rowname.matrix_value ();
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1460
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1461 for (octave_idx_type i = 0; i < n; i++)
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1462 l << QString::number (matrix_value(i));
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1463 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1464 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1465 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1466 for (int i = 0; i < m_tableWidget->columnCount (); i++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1467 l << "";
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1468 visible = false;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1469 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1470
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1471 // Add dummy rows as required
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1472 if (m_tableWidget->rowCount () < l.length ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1473 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1474 int oldRowCount = m_tableWidget->rowCount ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1475 m_tableWidget->setRowCount (l.length ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1476
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1477 for (int col = 0; col < m_tableWidget->columnCount (); col++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1478 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1479 std::string format = columnformat (col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1480 bool enabled = columneditable (col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1481
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1482 for (int row = oldRowCount; row < l.length (); row++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1483 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1484 m_tableWidget->setRowHeight (row, AUTO_HEIGHT);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1485
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1486 updateData (row, col, octave_value (""), format, enabled);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1487 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1488 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1489 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1490
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1491 m_tableWidget->setVerticalHeaderLabels (l);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1492 m_tableWidget->verticalHeader ()->setVisible (visible);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1493 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1494
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1495 void
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1496 Table::updateRearrangeableColumns (void)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1497 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1498 uitable::properties& tp = properties<uitable> ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1499
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1500 bool rearrangeableColumns = tp.is_rearrangeablecolumns ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1501 bool enabled = tp.is_enable ();
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1502
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1503 #if defined (HAVE_QT4)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1504 m_tableWidget->horizontalHeader ()->setMovable (enabled && rearrangeableColumns);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1505 #elif defined (HAVE_QT5)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1506 m_tableWidget->horizontalHeader ()->setSectionsMovable (enabled && rearrangeableColumns);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1507 #endif
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1508 m_tableWidget->horizontalHeader ()->setDragEnabled (enabled && rearrangeableColumns);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1509 m_tableWidget->horizontalHeader ()->setDragDropMode (QAbstractItemView::InternalMove);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1510 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1511
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1512 bool
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1513 Table::eventFilter (QObject watched, QEvent xevent)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1514 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1515 gh_manager& gh_mgr = octave::__get_gh_manager__ ("Table::eventFilter");
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1516
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1517 //uitable::properties& tp = properties<uitable> ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1518 if (qobject_cast<QTableWidget *> (watched))
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1519 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1520 switch (xevent->type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1521 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1522 case QEvent::Resize:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1523 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1524 octave::autolock guard (gh_mgr.graphics_lock ());
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1525
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1526 graphics_object go = object ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1527 if (go.valid_object ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1528 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1529 const uitable::properties& tp =
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1530 Utils::properties<uitable> (go);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1531 if (tp.fontunits_is ("normalized"))
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1532 m_tableWidget->setFont (Utils::computeFont<uitable> (tp));
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1533 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1534 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1535 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1536
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1537 case QEvent::MouseButtonPress:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1538 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1539 octave::autolock guard (gh_mgr.graphics_lock ());
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1540
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1541 QMouseEvent m = dynamic_cast<QMouseEvent > (xevent);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1542 graphics_object go = object ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1543 const uitable::properties& tp =
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1544 Utils::properties<uitable> (go);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1545 graphics_object fig = go.get_ancestor ("figure");
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1546
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1547 if (m->button () != Qt::LeftButton \|\| ! tp.is_enable ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1548 {
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1549 emit gh_set_event (fig.get_handle (), "selectiontype",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1550 Utils::figureSelectionType (m), false);
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1551 emit gh_set_event (fig.get_handle (), "currentpoint",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1552 Utils::figureCurrentPoint (fig, m),
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1553 false);
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1554 emit gh_callback_event (fig.get_handle (),
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1555 "windowbuttondownfcn");
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1556 emit gh_callback_event (m_handle, "buttondownfcn");
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1557
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1558 if (m->button () == Qt::RightButton)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1559 ContextMenu::executeAt (properties (), m->globalPos ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1560 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1561 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1562 {
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1563 emit gh_set_event (fig.get_handle (), "selectiontype",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1564 octave_value ("normal"), false);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1565 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1566 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1567 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1568
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1569 case QEvent::KeyPress:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1570 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1571 QKeyEvent k = dynamic_cast<QKeyEvent > (xevent);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1572 if (m_keyPressHandlerDefined)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1573 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1574 octave::autolock guard (gh_mgr.graphics_lock ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1575
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1576 octave_scalar_map keyData = Utils::makeKeyEventStruct (k);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1577 graphics_object fig = object ().get_ancestor ("figure");
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1578
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1579 emit gh_set_event (fig.get_handle (), "currentcharacter",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1580 keyData.getfield ("Character"), false);
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1581 emit gh_callback_event (m_handle, "keypressfcn", keyData);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1582 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1583 int row = m_tableWidget->currentRow ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1584 int col = m_tableWidget->currentColumn ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1585 switch (k->key ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1586 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1587 case Qt::Key_Space:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1588 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1589 QCheckBox *checkBox = nullptr;
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1590
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1591 QWidget *widget
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1592 = qobject_cast<QWidget *> (m_tableWidget->cellWidget (row, col));
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1593
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1594 if (widget && ! widget->children ().isEmpty ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1595 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1596 QHBoxLayout *layout
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1597 = qobject_cast<QHBoxLayout *> (widget->children ().first ());
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1598
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1599 if (layout && layout->count () > 0)
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1600 checkBox = qobject_cast<QCheckBox *> (layout->itemAt (0)-> widget ());
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1601 }
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1602
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1603 if (checkBox && checkBox->property ("Enabled").toBool ())
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1604 checkBoxClicked (row, col, checkBox);
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1605
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1606 QComboBox *comboBox
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1607 = qobject_cast<QComboBox *> (m_tableWidget->cellWidget (row, col));
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1608
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1609 if (comboBox)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1610 comboBox->showPopup ();
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1611 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1612 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1613
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1614 case Qt::Key_Return:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1615 case Qt::Key_Enter:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1616 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1617 if (k->modifiers () == Qt::NoModifier)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1618 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1619 if (row + 1 < m_tableWidget->rowCount ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1620 m_tableWidget->setCurrentCell (row + 1, col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1621 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1622 {
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1623 if (col + 1 < m_tableWidget->columnCount ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1624 m_tableWidget->setCurrentCell (0, col + 1);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1625 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1626 m_tableWidget->setCurrentCell (0, 0);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1627 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1628 }
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1629 else if (k->modifiers () == Qt::ShiftModifier)
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1630 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1631 if (row - 1 >= 0)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1632 m_tableWidget->setCurrentCell (row - 1, col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1633 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1634 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1635 if (col - 1 >= 0)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1636 m_tableWidget->setCurrentCell
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1637 (m_tableWidget->rowCount () - 1,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1638 col - 1);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1639 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1640 m_tableWidget->setCurrentCell
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1641 (m_tableWidget->rowCount () - 1,
4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1642 m_tableWidget->columnCount () - 1);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1643 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1644 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1645 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1646 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1647
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1648 default:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1649 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1650 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1651 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1652 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1653
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1654 case QEvent::KeyRelease:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1655 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1656 if (m_keyReleaseHandlerDefined)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1657 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1658 octave::autolock guard (gh_mgr.graphics_lock ());
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1659
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1660 QKeyEvent k = dynamic_cast<QKeyEvent > (xevent);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1661
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1662 octave_scalar_map keyData = Utils::makeKeyEventStruct (k);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1663 graphics_object fig = object ().get_ancestor ("figure");
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1664
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1665 emit gh_set_event (fig.get_handle (), "currentcharacter",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1666 keyData.getfield ("Character"), false);
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1667 emit gh_callback_event (m_handle, "keyreleasefcn", keyData);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1668 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1669 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1670 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1671
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1672 default:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1673 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1674 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1675 }
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1676 else if (qobject_cast<QComboBox *> (watched))
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1677 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1678 switch (xevent->type ())
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1679 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1680 case QEvent::MouseButtonPress:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1681 {
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1682 octave::autolock guard (gh_mgr.graphics_lock ());
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27319 diff changeset	1683
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1684 QMouseEvent m = dynamic_cast<QMouseEvent > (xevent);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1685 graphics_object go = object ();
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1686 const uitable::properties& tp = Utils::properties<uitable> (go);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1687 graphics_object fig = go.get_ancestor ("figure");
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1688
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1689 if (m->button () != Qt::LeftButton \|\| ! tp.is_enable ())
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1690 {
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1691 emit gh_set_event (fig.get_handle (), "selectiontype",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1692 Utils::figureSelectionType (m), false);
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1693 emit gh_set_event (fig.get_handle (), "currentpoint",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1694 Utils::figureCurrentPoint (fig, m),
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1695 false);
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1696 emit gh_callback_event (fig.get_handle (),
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1697 "windowbuttondownfcn");
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1698 emit gh_callback_event (m_handle, "buttondownfcn");
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1699
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1700 if (m->button () == Qt::RightButton)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1701 ContextMenu::executeAt (tp, m->globalPos ());
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1702 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1703 else
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1704 {
27319 6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1705 emit gh_set_event (fig.get_handle (), "selectiontype",
6b2d20317b26 use Qt signals to manage calls to gh_manager functions in Qt graphics toolkit John W. Eaton <jwe@octave.org> parents: 27277 diff changeset	1706 Utils::figureSelectionType (m), false);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1707
26122 4d1c6c60f6b3 Clean up implementation of uitable in 36e0e5b428e7. Rik <rik@octave.org> parents: 26112 diff changeset	1708 QComboBox comboBox_0 = qobject_cast<QComboBox > (watched);
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1709 for (int row = 0; row < m_tableWidget->rowCount (); row++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1710 {
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1711 for (int col = 0; col < m_tableWidget->columnCount (); col++)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1712 {
27276 7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1713 QComboBox *comboBox_1
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1714 = qobject_cast<QComboBox *> (m_tableWidget->cellWidget (row, col));
7455523fdf01 style fixes: avoid breaking lines immediately after '(' John W. Eaton <jwe@octave.org> parents: 26820 diff changeset	1715
26112 36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1716 if (comboBox_0 == comboBox_1)
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1717 m_tableWidget->setCurrentCell (row, col);
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1718 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1719 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1720 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1721 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1722 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1723
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1724 default:
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1725 break;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1726 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1727 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1728 return false;
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1729 }
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1730
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1731 #undef AUTO_HEIGHT
36e0e5b428e7 Implement uitable (patch #9084) Andrew Thornton <art27@cantab.net> parents: diff changeset	1732 }

Mercurial > octave

annotate libgui/graphics/Table.cc @ 27645:028205a91a07