octave: libgui/graphics/Table.cc annotate

annotate libgui/graphics/Table.cc @ 31791:5cb96bc0adc8

maint: Merge stable to default.

author	John W. Eaton <jwe@octave.org>
date	Sun, 29 Jan 2023 13:10:40 -0500
parents	21f9b34eb893 abe72b9464d6
children	90621682cc03

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

Mercurial > octave

annotate libgui/graphics/Table.cc @ 31791:5cb96bc0adc8