mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-07 09:25:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix build issues with QT/OpenGL

Browse Source
This commit is contained in:
Alexander Alekhin 2018-03-30 12:48:54 +03:00
parent 5195a738ac
commit 82fd00af99
2 changed files with 57 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
modules/highgui/src/window_QT.h
View File

@ -278,9 +278,9 @@ public:
QPointer<QBoxLayout> myLayout; QPointer<QBoxLayout> myLayout;
private: private:
void closeEvent ( QCloseEvent * e ); void closeEvent ( QCloseEvent * e ) CV_OVERRIDE;
void showEvent ( QShowEvent * event ) ; void showEvent ( QShowEvent * event ) CV_OVERRIDE;
void hideEvent ( QHideEvent * event ) ; void hideEvent ( QHideEvent * event ) CV_OVERRIDE;
}; };
@ -339,7 +339,7 @@ public:
QPointer<QLabel> myStatusBar_msg; QPointer<QLabel> myStatusBar_msg;
protected: protected:
virtual void keyPressEvent(QKeyEvent* event); virtual void keyPressEvent(QKeyEvent* event) CV_OVERRIDE;
private: private:
@ -414,8 +414,8 @@ class OCVViewPort : public ViewPort
{ {
public: public:
explicit OCVViewPort(); explicit OCVViewPort();
~OCVViewPort() {}; ~OCVViewPort() CV_OVERRIDE {};
void setMouseCallBack(CvMouseCallback callback, void* param); void setMouseCallBack(CvMouseCallback callback, void* param) CV_OVERRIDE;
protected: protected:
void icvmouseEvent(QMouseEvent* event, type_mouse_event category); void icvmouseEvent(QMouseEvent* event, type_mouse_event category);
@ -433,38 +433,38 @@ class OpenGlViewPort : public QGLWidget, public OCVViewPort
{ {
public: public:
explicit OpenGlViewPort(QWidget* parent); explicit OpenGlViewPort(QWidget* parent);
~OpenGlViewPort(); ~OpenGlViewPort() CV_OVERRIDE;
QWidget* getWidget(); QWidget* getWidget() CV_OVERRIDE;
void writeSettings(QSettings& settings); void writeSettings(QSettings& settings) CV_OVERRIDE;
void readSettings(QSettings& settings); void readSettings(QSettings& settings) CV_OVERRIDE;
double getRatio(); double getRatio() CV_OVERRIDE;
void setRatio(int flags); void setRatio(int flags) CV_OVERRIDE;
void updateImage(const CvArr* arr); void updateImage(const CvArr* arr) CV_OVERRIDE;
void startDisplayInfo(QString text, int delayms); void startDisplayInfo(QString text, int delayms) CV_OVERRIDE;
void setOpenGlDrawCallback(CvOpenGlDrawCallback callback, void* userdata); void setOpenGlDrawCallback(CvOpenGlDrawCallback callback, void* userdata) CV_OVERRIDE;
void makeCurrentOpenGlContext(); void makeCurrentOpenGlContext() CV_OVERRIDE;
void updateGl(); void updateGl() CV_OVERRIDE;
void setSize(QSize size_); void setSize(QSize size_) CV_OVERRIDE;
protected: protected:
void initializeGL(); void initializeGL() CV_OVERRIDE;
void resizeGL(int w, int h); void resizeGL(int w, int h) CV_OVERRIDE;
void paintGL(); void paintGL() CV_OVERRIDE;
void wheelEvent(QWheelEvent* event); void wheelEvent(QWheelEvent* event) CV_OVERRIDE;
void mouseMoveEvent(QMouseEvent* event); void mouseMoveEvent(QMouseEvent* event) CV_OVERRIDE;
void mousePressEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event) CV_OVERRIDE;
void mouseReleaseEvent(QMouseEvent* event); void mouseReleaseEvent(QMouseEvent* event) CV_OVERRIDE;
void mouseDoubleClickEvent(QMouseEvent* event); void mouseDoubleClickEvent(QMouseEvent* event) CV_OVERRIDE;
QSize sizeHint() const; QSize sizeHint() const CV_OVERRIDE;
private: private:
QSize size; QSize size;
@ -482,25 +482,25 @@ class DefaultViewPort : public QGraphicsView, public OCVViewPort
public: public:
DefaultViewPort(CvWindow* centralWidget, int arg2); DefaultViewPort(CvWindow* centralWidget, int arg2);
~DefaultViewPort(); ~DefaultViewPort() CV_OVERRIDE;
QWidget* getWidget(); QWidget* getWidget() CV_OVERRIDE;
void writeSettings(QSettings& settings); void writeSettings(QSettings& settings) CV_OVERRIDE;
void readSettings(QSettings& settings); void readSettings(QSettings& settings) CV_OVERRIDE;
double getRatio(); double getRatio() CV_OVERRIDE;
void setRatio(int flags); void setRatio(int flags) CV_OVERRIDE;
void updateImage(const CvArr* arr); void updateImage(const CvArr* arr) CV_OVERRIDE;
void startDisplayInfo(QString text, int delayms); void startDisplayInfo(QString text, int delayms) CV_OVERRIDE;
void setOpenGlDrawCallback(CvOpenGlDrawCallback callback, void* userdata); void setOpenGlDrawCallback(CvOpenGlDrawCallback callback, void* userdata) CV_OVERRIDE;
void makeCurrentOpenGlContext(); void makeCurrentOpenGlContext() CV_OVERRIDE;
void updateGl(); void updateGl() CV_OVERRIDE;
void setSize(QSize size_); void setSize(QSize size_) CV_OVERRIDE;
public slots: public slots:
//reference: //reference:
@ -520,15 +520,15 @@ public slots:
void saveView(); void saveView();
protected: protected:
void contextMenuEvent(QContextMenuEvent* event); void contextMenuEvent(QContextMenuEvent* event) CV_OVERRIDE;
void resizeEvent(QResizeEvent* event); void resizeEvent(QResizeEvent* event) CV_OVERRIDE;
void paintEvent(QPaintEvent* paintEventInfo); void paintEvent(QPaintEvent* paintEventInfo) CV_OVERRIDE;
void wheelEvent(QWheelEvent* event); void wheelEvent(QWheelEvent* event) CV_OVERRIDE;
void mouseMoveEvent(QMouseEvent* event); void mouseMoveEvent(QMouseEvent* event) CV_OVERRIDE;
void mousePressEvent(QMouseEvent* event); void mousePressEvent(QMouseEvent* event) CV_OVERRIDE;
void mouseReleaseEvent(QMouseEvent* event); void mouseReleaseEvent(QMouseEvent* event) CV_OVERRIDE;
void mouseDoubleClickEvent(QMouseEvent* event); void mouseDoubleClickEvent(QMouseEvent* event) CV_OVERRIDE;
private: private:
int param_keepRatio; int param_keepRatio;
@ -552,7 +552,7 @@ private:
bool isSameSize(IplImage* img1,IplImage* img2); bool isSameSize(IplImage* img1,IplImage* img2);
QSize sizeHint() const; QSize sizeHint() const CV_OVERRIDE;
QPointer<CvWindow> centralWidget; QPointer<CvWindow> centralWidget;
QPointer<QTimer> timerDisplay; QPointer<QTimer> timerDisplay;
bool drawInfo; bool drawInfo;
@ -566,7 +566,7 @@ private:
void drawStatusBar(); void drawStatusBar();
void controlImagePosition(); void controlImagePosition();
void icvmouseProcessing(QPointF pt, int cv_event, int flags); void icvmouseProcessing(QPointF pt, int cv_event, int flags) CV_OVERRIDE;
private slots: private slots:
void stopDisplayInfo(); void stopDisplayInfo();

14
samples/opengl/opengl_interop.cpp
View File

@ -32,6 +32,8 @@
# pragma comment(lib, "glu32.lib") # pragma comment(lib, "glu32.lib")
#endif #endif
using namespace cv;
/* /*
// Press key to // Press key to
// 1 processing on CPU // 1 processing on CPU
@ -64,7 +66,7 @@ public:
~GLWinApp() {} ~GLWinApp() {}
virtual void cleanup() virtual void cleanup() CV_OVERRIDE
{ {
m_shutdown = true; m_shutdown = true;
#if defined(__linux__) #if defined(__linux__)
@ -75,7 +77,7 @@ public:
} }
#if defined(_WIN32) #if defined(_WIN32)
virtual LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) virtual LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) CV_OVERRIDE
{ {
switch (message) switch (message)
{ {
@ -121,7 +123,7 @@ public:
#endif #endif
#if defined(__linux__) #if defined(__linux__)
int handle_event(XEvent& e) int handle_event(XEvent& e) CV_OVERRIDE
{ {
switch(e.type) switch(e.type)
{ {
@ -167,7 +169,7 @@ public:
} }
#endif #endif
int init() int init() CV_OVERRIDE
{ {
#if defined(_WIN32) #if defined(_WIN32)
m_hDC = GetDC(m_hWnd); m_hDC = GetDC(m_hWnd);
@ -258,12 +260,12 @@ public:
#endif #endif
} }
void idle() void idle() CV_OVERRIDE
{ {
render(); render();
} }
int render() int render() CV_OVERRIDE
{ {
try try
{ {