Mercurial > octave
comparison test/jupyter-notebook/jupyter-notebook.tst @ 31751:e863066429f1
assume QOffscreenSurface is available
QOffscreenSurface was introduced in Qt 5.1.
* acinclude.m4 (OCTAVE_CHECK_QT_OPENGL_OFFSCREEN_OK): Delete.
(OCTAVE_CHECK_QT_VERSION): Delete use.
* configure.ac, geometryimages.m, interpimages.m, module.mk,
plotimages.m, sparseimages.m, splineimages.m, GLCanvas.cc, GLCanvas.h,
getframe.m, __check_rendering_capability__.m, copyobj.m, hgsave.m,
jupyter-notebook.tst, publish.tst: Eliminate checks for Qt
OffscreenSurface feature. Assume it is always available.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 17 Jan 2023 13:11:02 -0500 |
parents | 597f3ee61a48 |
children | 2e484f9f1f18 |
comparison
equal
deleted
inserted
replaced
31750:85723a361b2b | 31751:e863066429f1 |
---|---|
26 ## Test running a single cell | 26 ## Test running a single cell |
27 %!testif HAVE_RAPIDJSON | 27 %!testif HAVE_RAPIDJSON |
28 %! visibility = get (0, "defaultfigurevisible"); | 28 %! visibility = get (0, "defaultfigurevisible"); |
29 %! toolkit = graphics_toolkit (); | 29 %! toolkit = graphics_toolkit (); |
30 %! unwind_protect | 30 %! unwind_protect |
31 %! if (! __have_feature__ ("QT_OFFSCREEN") | 31 %! if (! strcmp (graphics_toolkit (), "qt")) |
32 %! || ! strcmp (graphics_toolkit (), "qt")) | |
33 %! try | 32 %! try |
34 %! graphics_toolkit ("gnuplot"); | 33 %! graphics_toolkit ("gnuplot"); |
35 %! catch | 34 %! catch |
36 %! ## The system doesn't support gnuplot for drawing hidden | 35 %! ## The system doesn't support gnuplot for drawing hidden |
37 %! ## figures. Just return and have test marked as passing. | 36 %! ## figures. Just return and have test marked as passing. |
61 ## Test running all cells | 60 ## Test running all cells |
62 %!testif HAVE_RAPIDJSON | 61 %!testif HAVE_RAPIDJSON |
63 %! visibility = get (0, "defaultfigurevisible"); | 62 %! visibility = get (0, "defaultfigurevisible"); |
64 %! toolkit = graphics_toolkit (); | 63 %! toolkit = graphics_toolkit (); |
65 %! unwind_protect | 64 %! unwind_protect |
66 %! if (! __have_feature__ ("QT_OFFSCREEN") | 65 %! if (! strcmp (graphics_toolkit (), "qt")) |
67 %! || ! strcmp (graphics_toolkit (), "qt")) | |
68 %! try | 66 %! try |
69 %! graphics_toolkit ("gnuplot"); | 67 %! graphics_toolkit ("gnuplot"); |
70 %! catch | 68 %! catch |
71 %! ## The system doesn't support gnuplot for drawing hidden | 69 %! ## The system doesn't support gnuplot for drawing hidden |
72 %! ## figures. Just return and have test marked as passing. | 70 %! ## figures. Just return and have test marked as passing. |
100 ## Test plot magic | 98 ## Test plot magic |
101 %!testif HAVE_RAPIDJSON | 99 %!testif HAVE_RAPIDJSON |
102 %! visibility = get (0, "defaultfigurevisible"); | 100 %! visibility = get (0, "defaultfigurevisible"); |
103 %! toolkit = graphics_toolkit (); | 101 %! toolkit = graphics_toolkit (); |
104 %! unwind_protect | 102 %! unwind_protect |
105 %! if (! __have_feature__ ("QT_OFFSCREEN") | 103 %! if (! strcmp (graphics_toolkit (), "qt")) |
106 %! || ! strcmp (graphics_toolkit (), "qt")) | |
107 %! try | 104 %! try |
108 %! graphics_toolkit ("gnuplot"); | 105 %! graphics_toolkit ("gnuplot"); |
109 %! catch | 106 %! catch |
110 %! ## The system doesn't support gnuplot for drawing hidden | 107 %! ## The system doesn't support gnuplot for drawing hidden |
111 %! ## figures. Just return and have test marked as passing. | 108 %! ## figures. Just return and have test marked as passing. |
144 ## Test errors | 141 ## Test errors |
145 %!testif HAVE_RAPIDJSON | 142 %!testif HAVE_RAPIDJSON |
146 %! visibility = get (0, "defaultfigurevisible"); | 143 %! visibility = get (0, "defaultfigurevisible"); |
147 %! toolkit = graphics_toolkit (); | 144 %! toolkit = graphics_toolkit (); |
148 %! unwind_protect | 145 %! unwind_protect |
149 %! if (! __have_feature__ ("QT_OFFSCREEN") | 146 %! if (! strcmp (graphics_toolkit (), "qt")) |
150 %! || ! strcmp (graphics_toolkit (), "qt")) | |
151 %! try | 147 %! try |
152 %! graphics_toolkit ("gnuplot"); | 148 %! graphics_toolkit ("gnuplot"); |
153 %! catch | 149 %! catch |
154 %! ## The system doesn't support gnuplot for drawing hidden | 150 %! ## The system doesn't support gnuplot for drawing hidden |
155 %! ## figures. Just return and have test marked as passing. | 151 %! ## figures. Just return and have test marked as passing. |