octave: libgui/graphics/Table.cc annotate

annotate libgui/graphics/Table.cc @ 27935:f1844e33f621

maint: Use Octave coding conventions in libgui/ directory. * Table.cc, qt-graphics-toolkit.cc, documentation.cc, documentation.h, files-dock-widget.cc, find-files-dialog.cc, gui-preferences-cs.h, gui-preferences-dw.h, gui-preferences-ed.h, gui-preferences-ff.h, gui-preferences-mw.h, gui-preferences-sc.h, history-dock-widget.cc, file-editor-tab.cc, file-editor.cc, find-dialog.cc, octave-qscintilla.cc, main-window.cc, octave-dock-widget.cc, octave-qobject.cc, resource-manager.cc, set-path-dialog.cc, set-path-model.cc, settings-dialog.cc, settings-dialog.h, shortcut-manager.cc, tab-bar.cc, variable-editor.cc, workspace-model.cc, workspace-model.h, workspace-view.cc: Use Octave coding conventions in libgui/ directory.

author	Rik <rik@octave.org>
date	Sun, 12 Jan 2020 09:33:21 -0800
parents	bd51beb6205e
children	0c6dcf803529 0a5b15007766

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

Mercurial > octave

annotate libgui/graphics/Table.cc @ 27935:f1844e33f621