1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00

Merge branch 4.x

This commit is contained in:
Alexander Smorkalov
2024-04-19 14:01:08 +03:00
74 changed files with 967 additions and 632 deletions
@@ -285,6 +285,15 @@ The function destroyAllWindows destroys all of the opened HighGUI windows.
*/
CV_EXPORTS_W void destroyAllWindows();
/** @brief HighGUI backend used.
The function returns HighGUI backend name used: could be COCOA, GTK2/3, QT, WAYLAND or WIN32.
Returns empty string if there is no available UI backend.
*/
CV_EXPORTS_W const std::string currentUIFramework();
CV_EXPORTS_W int startWindowThread();
/** @brief Similar to #waitKey, but returns full key code.
+1
View File
@@ -106,6 +106,7 @@ public:
virtual int waitKeyEx(int delay /*= 0*/) = 0;
virtual int pollKey() = 0;
virtual const std::string getName() const = 0;
};
std::shared_ptr<UIBackend>& getCurrentUIBackend();
+27
View File
@@ -1082,6 +1082,33 @@ void cv::imshow(const String& winname, const ogl::Texture2D& _tex)
#endif
}
const std::string cv::currentUIFramework()
{
CV_TRACE_FUNCTION();
// plugin and backend-compatible implementations
auto backend = getCurrentUIBackend();
if (backend)
{
return backend->getName();
}
// builtin backends
#if defined(HAVE_WIN32UI)
CV_Assert(false); // backend-compatible
#elif defined (HAVE_GTK)
CV_Assert(false); // backend-compatible
#elif defined (HAVE_QT)
return std::string("QT");
#elif defined (HAVE_COCOA)
return std::string("COCOA");
#elif defined (HAVE_WAYLAND)
return std::string("WAYLAND");
#else
return std::string();
#endif
}
//========================= OpenGL fallback =========================
#ifndef HAVE_OPENGL
+13
View File
@@ -2238,6 +2238,19 @@ public:
{
return waitKeyImpl(1); // TODO
}
const std::string getName() const CV_OVERRIDE
{
#if GTK_MAJOR_VERSION == 2
return "GTK2";
#elif GTK_MAJOR_VERSION == 3
return "GTK3";
#elif GTK_MAJOR_VERSION == 4
return "GTK4";
#else
#error "Unsupported GTK version"
#endif
}
}; // GTKBackendUI
static
+5
View File
@@ -2937,6 +2937,11 @@ public:
{
return pollKey_W32();
}
const std::string getName() const CV_OVERRIDE
{
return "WIN32";
}
}; // Win32BackendUI
static
+19
View File
@@ -205,4 +205,23 @@ TEST(Highgui_GUI, trackbar)
EXPECT_NO_THROW(destroyAllWindows());
}
TEST(Highgui_GUI, currentUIFramework)
{
auto framework = currentUIFramework();
std::cout << "UI framework: \"" << framework << "\"" << std::endl;
#if (!defined(ENABLE_PLUGINS) \
&& !defined HAVE_GTK \
&& !defined HAVE_QT \
&& !defined HAVE_WIN32UI \
&& !defined HAVE_COCOA \
&& !defined HAVE_WAYLAND \
)
EXPECT_TRUE(framework.empty());
#elif !defined(ENABLE_PLUGINS)
EXPECT_GT(framework.size(), 0); // builtin backends
#endif
}
}} // namespace