Commit Graph

137 Commits

Author SHA1 Message Date
Vladislav Vinogradov
e06c3ec7c5 updated OpenGL functionality:
* removed OpenGLFuncTab, now extensions are loaded internally
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
* added Access parameter to GlBuffer::mapHost
* added autoRelease parameter to all create methods
2013-02-19 14:13:11 +04:00
Andrey Kamaev
57d3152cd0 Merge branch '2.4' 2013-01-31 14:35:27 +04:00
Ilya Lysenkov
3c8787980c Fixed cvDestroyAllWindows() without windows in QT (#2440) 2013-01-30 15:26:49 +04:00
Vladislav Vinogradov
08fbf667f9 refactored opengl functionality
* removed OpenGLFuncTab, now extensions are loaded internally
* renamed GlTexture -> GlTexture2D
* added support of GlBuffer and GlTexture2D to InputArray/OutputArray
* added ELEMENT_ARRAY_BUFFER and PIXEL_PACK_BUFFER targets
* added copyFrom/copyTo method for GlBuffer and GlTexture2D
* removed GlFont
* removed pointCloudShow
* removed OpenGLCleanCallback
2012-11-30 17:35:28 +04:00
OpenCV Buildbot
81f826db2b Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
Vadim Pisarevsky
d9e801fbfa improved image rendering performance in Qt backend for highgui UI (bug #2356) 2012-09-17 16:13:53 +04:00
Andrey Kamaev
df262b340c Fixed #2125 2012-07-02 14:20:59 +00:00
Andrey Kamaev
4d09d62f85 Added Ptr<T> support to AlgorithmInfo; fixed some warnings 2012-06-29 07:46:53 +00:00
Andrey Kamaev
c5aba337e9 Fixed number of warnings. Fixed mingw64 build. 2012-06-12 14:46:12 +00:00
Andrey Kamaev
49a1ba6038 Set stricter warning rules for gcc 2012-06-07 17:21:29 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Alexander Reshetnikov
3a564d1ae8 Updated displayOverlay's implementation & documentation (ticket #903) 2012-03-30 19:58:44 +00:00
Andrey Kamaev
d46f44b48a #1695 fixed arrow key events with the Qt backend 2012-03-28 22:22:02 +00:00
Vladislav Vinogradov
6310622be3 minor 2011-12-13 06:25:37 +00:00
Vladislav Vinogradov
061f032719 fixed build under linux 2011-12-12 13:57:37 +00:00
Vladislav Vinogradov
3afc97e67e fixed new OpenGL functionality under Qt 2011-12-12 12:52:06 +00:00
Ilya Lysenkov
233dfd252d Qt: fixed signal of a clicked push button (patch #786) 2011-06-20 09:49:21 +00:00
Ilya Lysenkov
77be493e45 Qt: fixed keyPressEvent (ticket #803) 2011-06-17 09:26:53 +00:00
Ilya Lysenkov
480f8235a7 Qt: fixed destroyAllWindow crash (patch #794) 2011-06-16 15:48:01 +00:00
Ilya Lysenkov
0565a9456d Qt: fixed using of OpenCV in another Qt app (patch #919) 2011-06-16 13:20:50 +00:00
Ilya Lysenkov
4f3fb040a4 Qt: fixed resizing of maximized window (patch #858). 2011-06-16 12:44:04 +00:00
Ilya Lysenkov
f0cc8d3085 QT: fixed exceptions (ticket #901) 2011-06-15 13:26:40 +00:00
Ilya Lysenkov
96503991b1 Fixed wheel zoom with QT (ticket #733) 2011-06-15 09:27:38 +00:00
Vadim Pisarevsky
23d211bfed applied patches from #1005 2011-06-13 22:04:28 +00:00
Vadim Pisarevsky
11ed55ddb4 fixed mouse painting in Qt bindings (to make watershed & inpaint demos work); increased the font in the detailed pixel image display. 2010-12-04 15:15:06 +00:00
Stefano Fabri
ed0ce7ed50 Fixed missing semicolon 2010-10-25 11:29:08 +00:00
Yannick Verdie
54ba887432 Qt fix: cvAddText ticket #561 2010-09-16 17:52:10 +00:00
Yannick Verdie
24427d593f Qt add byte per line information to fix a bug 2010-08-24 16:18:32 +00:00
Yannick Verdie
411e16074e Qt Ticket #520 2010-08-24 12:23:37 +00:00
Yannick Verdie
69e6294854 Qt ticket #537
Forgot to update so code after previous fix
2010-08-20 13:06:14 +00:00
Yannick Verdie
3e8a8f7942 Qt weird bug with QLabel (is it really fixed ?) 2010-08-19 22:59:32 +00:00
Yannick Verdie
45daaa6e11 Qt bug with buttons 2010-08-19 10:36:57 +00:00
Yannick Verdie
48090fd37e Qt bug fixed #534 2010-08-18 18:56:22 +00:00
Yannick Verdie
3746c48451 Bug in calibration.cpp sample
This was crashing my code:
    for( size_t i = 1; i < imagePoints.size(); i++ )
        objectPoints.push_back(objectPoints[0]);

Changed by:
objectPoints.resize(imagePoints.size(),objectPoints[0]);

Plus clean up on Qt code
2010-08-18 15:35:56 +00:00
Yannick Verdie
8ada1da08c 2010-08-18 14:45:38 +00:00
Yannick Verdie
94b588099c Qt test (some code disabled for debugging) 2010-08-18 14:07:02 +00:00
Yannick Verdie
a3582b4780 Qt Python binding -- #512 2010-08-18 11:02:11 +00:00
Yannick Verdie
b530a2cba9 Qt ticket #531 2010-08-17 17:22:21 +00:00
Yannick Verdie
662c58ca86 Qt bug fixed with cvWaitKey(0) 2010-08-15 20:43:54 +00:00
Yannick Verdie
dec6f2c393 Qt fixed bug with OpenGL, and save issue reported in #520 2010-08-14 18:36:53 +00:00
Yannick Verdie
2505e7e267 Qt: disable KEEP_RATIO with OpenGL to avoid a blinking bug
Qt: Now OpenGL rendering is ok
2010-08-02 17:10:43 +00:00
Yannick Verdie
d6bbaea28a Qt imgRegion bug fixed
Qt compilation pb with OpenGL flags fixed
2010-08-02 10:58:25 +00:00
Yannick Verdie
e8aad75446 Fixed bugs on Qt 2010-07-31 18:04:28 +00:00
Yannick Verdie
8f8aba9c88 fixed Qt bug 2010-07-30 14:13:20 +00:00
Yannick Verdie
8f33e89d46 working on OpenGL for Windows 2010-07-28 21:55:55 +00:00
Yannick Verdie
7ce53adac9 Qt:
Fixed bug with exclusive buttons
Fixed memory leaks
2010-07-28 20:59:41 +00:00
Yannick Verdie
c77e8fc638 Qt - debugging Linux and Windows 2010-07-27 17:29:22 +00:00
Yannick Verdie
21b0652c40 QT statusbar bug fixed for Windows 2010-07-27 14:17:43 +00:00
Yannick Verdie
b0ab2ef16d Qt on Windows -- in progress 2010-07-27 13:14:56 +00:00
Yannick Verdie
bb2fe87b32 2010-07-26 12:28:33 +00:00
Yannick Verdie
f2353b8523 QT new functions:
- cvCreateOpenGLCallback: draw 3D on top of the image
2010-07-23 15:22:04 +00:00
Yannick Verdie
ffe7bdf69c ticket 490:
bool not defined ? -> changed everything in int
2010-07-23 12:09:13 +00:00
Yannick Verdie
f572047496 QT new functions:
- add CV_RADIOBOX with exclusive mode
2010-07-22 21:46:27 +00:00
Yannick Verdie
2c923c7eba QT new functions:
- cvAddButton changed to match requirement
 - CV_GUI_NORMAL and CV_GUI_EXPANDED done
 - context menu with right click
2010-07-22 20:39:44 +00:00
Yannick Verdie
14bf624af4 QT new functions:
- cvAddButton done
 - All the "actions" of the toolbar are working
 - Window properties done
2010-07-20 09:39:36 +00:00
Vadim Pisarevsky
758e826d2e do not use WIN64/_WIN64 anymore - CMake did not set it anyway. Use WIN32 + __x86_64 or _M_X64 instead. Also, make VideoInput optional (WITH_VIDEOINPUT=ON/OFF) => now Mingw-dw2 can build OpenCV 2010-07-16 22:38:57 +00:00
Yannick Verdie
9fae7aee5b QT new functions:
- fixed icvFindTrackbar bug
2010-07-16 15:22:07 +00:00
Yannick Verdie
0c9eca7922 QT new functions:
- Finished toolbar: the last icon opens an external window with the trackbars inside
2010-07-16 12:51:29 +00:00
Yannick Verdie
ddc29e08be QT new functions:
- Add toolbar
 - Clean the code
 - Window properties in progress
2010-07-16 09:12:15 +00:00
Yannick Verdie
e11a77cb70 use sleep instead of usleep on window 2010-07-12 15:24:15 +00:00
Yannick Verdie
f2971aebd0 Ticket #458 2010-07-12 14:39:31 +00:00
Yannick Verdie
c3eb7881f1 New functions with QT GUI:
- 3 new points mostly done:
      - OpenGL support enabled (windows are rendered using GPU)
      - Save current screen (with overlay and so on...) with shortcut CTRL+S
      - Text rendering (with any system font, and possibility to set the style - normal, italic,... - the weight - normal, bold, ... - the color, the spacing between letters, and so on...)
2010-07-12 11:04:26 +00:00
Vadim Pisarevsky
269afb91da make Qt bindings compile with any Qt 4.x 2010-07-08 11:24:32 +00:00
Yannick Verdie
3d55d4818b New functions with QT GUI:
- Save current screen (CTRL+S), with png, jpg, jpeg, bmp format support
- OpenGL rendering enable (make Qt very fast)
      -> working on opengl callback (done soon)
- Rendering optimised (with and without openGL)
2010-07-07 17:53:59 +00:00
Yannick Verdie
2f4d396506 New functions with QT GUI:
- save/load window parameters implemented !
2010-06-29 22:14:24 +00:00
Vadim Pisarevsky
d9ff8a30f5 fixed compile errors on Ubuntu 10.04 2010-06-29 15:49:44 +00:00
Yannick Verdie
f668a230ea New functions with QT GUI:
- imgregion shortcut implemented (CTRL+O)
2010-06-28 21:15:54 +00:00
Yannick Verdie
f8c83340b2 New functions with QT GUI:
- imgregion (as with Matlab) implemented
2010-06-28 21:01:37 +00:00
Yannick Verdie
4bcd81f85f New functions with QT GUI:
- aspectRatio is controled by cvSet/getWindowProperty
2010-06-26 22:36:41 +00:00
Yannick Verdie
6314cd28cf New functions with QT GUI:
- fix zoom offset of 0.5
- fix CMake problem with QT detection
- Code optimisation
2010-06-25 17:19:11 +00:00
Yannick Verdie
f69514eef7 New functions with QT GUI:
StatusBar with zoom/color/position information
user can display infor mation in statusbar with cvDisplayStatusBar(window,text,delay_ms)
2010-06-22 17:15:49 +00:00
Yannick Verdie
2f9aedfaab New functions with QT GUI:
- fix c++ wrapper
- rename cvInformation in cvDisplayOverlay
2010-06-20 10:29:11 +00:00
Yannick Verdie
bd643ad550 New functions with QT GUI:
Fixed memory leak
Disable QT by default
2010-06-20 08:44:19 +00:00
Yannick Verdie
c007b60b25 New functions with QT GUI:
Fixed bugs indicated by Vadim
2010-06-19 21:01:27 +00:00
Yannick Verdie
5cbe64dac7 New functions with QT GUI
Shortcut for zoom (CTRL + and CTRL - for zoomin/out, CTRL Left/Right/Up/Down for panning, CTRL P for zoom = 1)
Fix bug with key event
2010-06-19 18:57:04 +00:00
Vadim Pisarevsky
47620085b5 added dummy cvInitSystem() to Qt bindings to avoid "unresolved symbol" errors 2010-06-19 16:26:22 +00:00
Yannick Verdie
3d2ec9875d New functions with QT GUI
Mouse callback return correct value during zoom/panning
Window overview in zoom mode done !
2010-06-17 20:44:18 +00:00
Yannick Verdie
386496863c New functions with QT GUI
use inv matrix for Zoom in/out for better result
Fix some bugs with zoom/panning
2010-06-17 16:41:48 +00:00
Yannick Verdie
f4dba4686d New functions with QT GUI (presented in the 4th report)
-Fullscreen
-Change Autoresize dynamically (after windows are created)
-Zoom on mouse location (with wheel)
-Panning by click'ndrag posible after zooming
2010-06-16 07:58:53 +00:00
Yannick Verdie
c4fded9afa New functions with QT GUI
Zoom function done, working on panning now (weel enable it)
Fixed mouse coordinate bugs
2010-06-14 16:00:38 +00:00
Yannick Verdie
be292046d8 working on QT change/get win property (done)
Fullscreen done
change autoresize dynamically done
2010-06-12 18:08:27 +00:00
Yannick Verdie
e71c5e8754 working on QT change/get win property (stylesheet for cvTrackBar fixed !!!) 2010-06-12 16:56:01 +00:00
Yannick Verdie
9eea2a5fe6 working on QT change/get win property (stylesheet for cvTrackBar fixed !!!) 2010-06-12 16:36:46 +00:00
Yannick Verdie
f6f634bace working on QT change/get win property (stylesheet for cvTrackBar fixed !!!) 2010-06-11 09:02:57 +00:00
Yannick Verdie
802d5f9940 working on QT change/get win property 2010-06-11 07:35:36 +00:00
Yannick Verdie
799460bd66 will work on the trunk 2010-06-10 20:03:52 +00:00