Mercurial > mxe-octave

annotate src/gnuplot-2-qt6.patch @ 7243:ae230ac322f7 default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* src/sqlite.mk: update to v3460000
author John Donoghue <john.donoghue@ieee.org>
date Wed, 05 Jun 2024 10:26:58 -0400
parents 6adeb47401d6
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6837
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
1 diff -ur gnuplot-5.2.8.orig/config/mingw/Makefile gnuplot-5.2.8/config/mingw/Makefile
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
2 --- gnuplot-5.2.8.orig/config/mingw/Makefile 2023-08-18 15:53:34.185447448 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
3 +++ gnuplot-5.2.8/config/mingw/Makefile 2023-08-18 16:03:31.492411188 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
4 @@ -463,11 +463,13 @@
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
5 endif
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
6
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
7 ifdef QT
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
8 - QT_LIBS = -lQt5Core -lQt5Gui -lQt5Network -lQt5Svg -lQt5Widgets -lQt5PrintSupport -lqtmain
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
9 + QT_VERSION ?= 5
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
10 + QT_EXTRA_LIBS ?= -lqtmain
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
11 + QT_LIBS = -lQt$(QT_VERSION)Core -lQt$(QT_VERSION)Gui -lQt$(QT_VERSION)Network -lQt$(QT_VERSION)Svg -lQt$(QT_VERSION)Widgets -lQt$(QT_VERSION)PrintSupport $(QT_EXTRA_LIBS)
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
12 QT_CXXFLAGS = -I$(QT_DIR)/include -I$(QT_DIR)/include/Qt -I$(QT_DIR)/include/QtCore -I$(QT_DIR)/include/QtGui
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
13 QT_CXXFLAGS += -I$(QT_DIR)/include/QtWidgets -I$(QT_DIR)/include/QtNetwork
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
14 - QT_CXXFLAGS += -I$(QT_DIR)/include/QtSvg -DQTGNUPLOT_DATA_DIR=\"$(GNUPLOT_QT_DIR)\"
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
15 - QT_LDFLAGS = -L$(QT_DIR)/lib
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
16 + QT_CXXFLAGS += -I$(QT_DIR)/include/QtSvg -DQTGNUPLOT_DATA_DIR=\"$(GNUPLOT_QT_DIR)\" $(QT_EXTRA_CXXFLAGS)
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
17 + QT_LDFLAGS = -L$(QT_DIR)/lib $(QT_EXTRA_LDFLAGS)
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
18 #
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
19 CFLAGS += -DQTTERM -DQT_NO_OPENGL
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
20 TERMLIBS += $(QT_LIBS)
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
21 diff -ur gnuplot-5.2.8.orig/src/qtterminal/qt_term.cpp gnuplot-5.2.8/src/qtterminal/qt_term.cpp
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
22 --- gnuplot-5.2.8.orig/src/qtterminal/qt_term.cpp 2023-08-18 15:53:34.166446304 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
23 +++ gnuplot-5.2.8/src/qtterminal/qt_term.cpp 2023-08-18 16:05:08.522243654 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
24 @@ -76,6 +76,7 @@
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
25 #include "qt_term.h"
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
26 #include "QtGnuplotEvent.h"
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
27 #include "QtGnuplotApplication.h"
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
28 +#include <QTextCodec>
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
29 #include "qt_conversion.cpp"
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
30
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
31 void qt_atexit();
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
32 diff -ur gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotScene.cpp gnuplot-5.2.8/src/qtterminal/QtGnuplotScene.cpp
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
33 --- gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotScene.cpp 2023-08-19 07:00:17.830930697 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
34 +++ gnuplot-5.2.8/src/qtterminal/QtGnuplotScene.cpp 2023-08-19 07:29:58.464228586 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
35 @@ -649,7 +649,7 @@
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
36 {
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
37 QFontMetrics metrics(m_font);
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
38 int par1 = (metrics.ascent() + metrics.descent());
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
39 - int par2 = metrics.width("0123456789")/10.;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
40 + int par2 = metrics.horizontalAdvance("0123456789")/10.;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
41 m_eventHandler->postTermEvent(GE_fontprops, 0, 0, par1, par2, m_widget);
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
42 }
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
43 else if (type == GEDone)
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
44 @@ -803,7 +803,7 @@
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
45
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
46 int button = 0;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
47 if (event->button()== Qt::LeftButton) button = 1;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
48 - else if (event->button()== Qt::MidButton) button = 2;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
49 + else if (event->button()== Qt::MiddleButton) button = 2;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
50 else if (event->button()== Qt::RightButton) button = 3;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
51
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
52 m_eventHandler->postTermEvent(GE_buttonpress,
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
53 @@ -892,7 +892,7 @@
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
54
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
55 int button = 0;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
56 if (event->button()== Qt::LeftButton) button = 1;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
57 - else if (event->button()== Qt::MidButton) button = 2;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
58 + else if (event->button()== Qt::MiddleButton) button = 2;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
59 else if (event->button()== Qt::RightButton) button = 3;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
60
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
61 qint64 time = 301; /* Only used the first time in, when timer not yet running */
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
62 diff -ur gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotScene.h gnuplot-5.2.8/src/qtterminal/QtGnuplotScene.h
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
63 --- gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotScene.h 2023-08-19 07:00:17.831930754 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
64 +++ gnuplot-5.2.8/src/qtterminal/QtGnuplotScene.h 2023-08-19 07:31:27.261363017 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
65 @@ -51,7 +51,7 @@
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
66
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
67 #include <QGraphicsScene>
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
68 #include <QGraphicsItemGroup>
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
69 -#include <QTime>
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
70 +#include <QElapsedTimer>
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
71
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
72 class QtGnuplotEnhanced;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
73 class QtGnuplotWidget;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
74 @@ -106,7 +106,7 @@
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
75 QPoint m_currentBoxOrigin;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
76 QPoint m_textOffset;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
77 double m_currentZ;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
78 - QTime m_watches[4];
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
79 + QElapsedTimer m_watches[4];
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
80 int m_currentPlotNumber;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
81 bool m_inKeySample;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
82 bool m_preserve_visibility;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
83 diff -ur gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotWidget.cpp gnuplot-5.2.8/src/qtterminal/QtGnuplotWidget.cpp
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
84 --- gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotWidget.cpp 2023-08-19 07:00:17.831930754 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
85 +++ gnuplot-5.2.8/src/qtterminal/QtGnuplotWidget.cpp 2023-08-19 07:16:25.518277987 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
86 @@ -128,7 +128,7 @@
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
87
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
88 void QtGnuplotWidget::setViewMatrix()
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
89 {
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
90 - m_view->resetMatrix();
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
91 + m_view->resetTransform();
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
92 }
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
93
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
94 void QtGnuplotWidget::processEvent(QtGnuplotEventType type, QDataStream& in)
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
95 @@ -146,7 +146,7 @@
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
96 QSize s;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
97 in >> s;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
98 m_lastSizeRequest = s;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
99 - m_view->resetMatrix();
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
100 + m_view->resetTransform();
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
101 QWidget* viewport = m_view->viewport();
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
102 /* qDebug() << "QtGnuplotWidget::processEvent Size request" << s << size() << " / viewport" << m_view->maximumViewportSize();
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
103 qDebug() << " widget size " << size();
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
104 @@ -291,8 +291,8 @@
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
105 QPrinter printer;
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
106 printer.setOutputFormat(QPrinter::PdfFormat);
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
107 printer.setOutputFileName(fileName);
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
108 - printer.setPaperSize(QSizeF(m_scene->width(), m_scene->height()), QPrinter::Point);
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
109 - printer.setPageMargins(0, 0, 0, 0, QPrinter::Point);
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
110 + printer.setPageSize(QPageSize(QSizeF(m_scene->width(), m_scene->height()), QPageSize::Point));
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
111 + printer.setPageMargins(QMarginsF(0,0,0,0), QPageLayout::Unit(QPrinter::Point));
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
112 QPainter painter(&printer);
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
113 painter.setRenderHints(renderHints());
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
114 m_scene->render(&painter);
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
115 diff -ur gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotItems.cpp gnuplot-5.2.8/src/qtterminal/QtGnuplotItems.cpp
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
116 --- gnuplot-5.2.8.orig/src/qtterminal/QtGnuplotItems.cpp 2023-08-19 07:54:01.475635227 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
117 +++ gnuplot-5.2.8/src/qtterminal/QtGnuplotItems.cpp 2023-08-19 07:56:36.531724069 -0400
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
118 @@ -111,7 +111,7 @@
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
119 qreal QtGnuplotEnhancedFragment::width() const
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
120 {
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
121 QFontMetricsF metrics(m_font);
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
122 - return metrics.width(m_text);
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
123 + return metrics.horizontalAdvance(m_text);
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
124 }
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
125
6adeb47401d6 Add qt6 usage to mxe-octave
John Donoghue <john.donoghue@ieee.org>
parents:
diff changeset
126 void QtGnuplotEnhancedFragment::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)