Roman Donchenko
|
e45fd939c2
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/ocl/src/cl_runtime/cl_runtime.cpp
modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
|
2014-01-20 15:10:19 +04:00 |
|
Roman Donchenko
|
087371c021
|
Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2
|
2014-01-20 14:15:05 +04:00 |
|
Ilya Lavrenov
|
5abfd40989
|
added perf test for cv::goodFeaturesToTrack
|
2014-01-20 13:57:53 +04:00 |
|
Ilya Lavrenov
|
52ed6d0d27
|
ported cv::goodFeaturesToTrack to T-API
|
2014-01-20 13:57:53 +04:00 |
|
Ilya Lavrenov
|
5d18cf9989
|
added cv::[extract|insert]Channel to T-API
|
2014-01-20 13:52:07 +04:00 |
|
Roman Donchenko
|
8386ce2b2f
|
Merge pull request #2160 from SpecLad:norm-assert
|
2014-01-20 12:20:21 +04:00 |
|
Roman Donchenko
|
d47f32581c
|
Merge pull request #2174 from Nerei:yet_another_fix_for_pr2172
|
2014-01-20 12:06:44 +04:00 |
|
Anatoly Baksheev
|
4cc8f7012b
|
closing window
|
2014-01-19 18:39:01 +04:00 |
|
Anatoly Baksheev
|
4e18007066
|
fixed white spaces
|
2014-01-19 18:39:01 +04:00 |
|
Anatoly Baksheev
|
d29c3d2f0d
|
fixed documentation warnings
|
2014-01-19 18:39:00 +04:00 |
|
Anatoly Baksheev
|
8f15a8abdb
|
disabled Ubuntu workaround code for Windows
|
2014-01-19 18:39:00 +04:00 |
|
Anatoly Baksheev
|
0d12fb0346
|
implemented workaround of a problem with x-server for ubuntu
|
2014-01-19 18:39:00 +04:00 |
|
Anatoly Baksheev
|
7410593d55
|
fixed warnigns and compiler errors for Ubuntu
|
2014-01-19 18:39:00 +04:00 |
|
Anatoly Baksheev
|
d7ca0bb757
|
merged background color with background gradient methods, updated tests to show description of scene
|
2014-01-19 18:38:59 +04:00 |
|
Anatoly Baksheev
|
16281027af
|
resolved problem with multiple spin()/spinOnce()
|
2014-01-19 18:38:59 +04:00 |
|
Anatoly Baksheev
|
57d5ad5131
|
minor iteractor refactoring
|
2014-01-19 18:38:59 +04:00 |
|
Anatoly Baksheev
|
ffad7b699c
|
added test for textured mesh
|
2014-01-19 18:38:59 +04:00 |
|
Anatoly Baksheev
|
8d327fa497
|
updated for compatibility with VTK6.0
|
2014-01-19 18:38:58 +04:00 |
|
Anatoly Baksheev
|
e472d45d99
|
updated mesh reading (texture support)
|
2014-01-19 18:38:58 +04:00 |
|
Anatoly Baksheev
|
625c35a9f9
|
added support of texture for mesh
|
2014-01-19 18:38:58 +04:00 |
|
Anatoly Baksheev
|
74206e0159
|
added painted cloud widget
|
2014-01-19 18:38:57 +04:00 |
|
Anatoly Baksheev
|
3086095837
|
improved background gradient
|
2014-01-19 18:38:57 +04:00 |
|
Anatoly Baksheev
|
b0ca93b22c
|
by default enabled tests vtk
|
2014-01-19 18:38:57 +04:00 |
|
Anatoly Baksheev
|
d7c30281a5
|
set background texture method
|
2014-01-19 18:38:57 +04:00 |
|
Anatoly Baksheev
|
e2ef558c8a
|
refactored WGrid
|
2014-01-19 18:38:56 +04:00 |
|
Anatoly Baksheev
|
658f4a7d38
|
refactoed plane
|
2014-01-19 18:38:56 +04:00 |
|
Anatoly Baksheev
|
53b8218652
|
addeed test for text 2d/3d
|
2014-01-19 18:38:56 +04:00 |
|
Anatoly Baksheev
|
bb891f0570
|
added cone implementation
|
2014-01-19 18:38:56 +04:00 |
|
Anatoly Baksheev
|
08f50314cb
|
updated cylinder and cube
|
2014-01-19 18:38:55 +04:00 |
|
Anatoly Baksheev
|
c0cc551228
|
refactored circle
|
2014-01-19 18:38:55 +04:00 |
|
Anatoly Baksheev
|
dac27c9913
|
refactored arrow
|
2014-01-19 18:38:55 +04:00 |
|
Anatoly Baksheev
|
1449823bcd
|
implemented showImage
|
2014-01-19 18:38:55 +04:00 |
|
Anatoly Baksheev
|
d90a068e0e
|
fixed bug with setImage
|
2014-01-19 18:38:54 +04:00 |
|
Anatoly Baksheev
|
cad9a786c4
|
optimized Mat to vtkImageData conversion
|
2014-01-19 18:38:54 +04:00 |
|
Anatoly Baksheev
|
e21f2a81ff
|
factored camera postions with image
|
2014-01-19 18:38:54 +04:00 |
|
Anatoly Baksheev
|
a23f1447a8
|
minor
|
2014-01-19 18:38:53 +04:00 |
|
Anatoly Baksheev
|
f930f2f19d
|
simplification of cloud collection
|
2014-01-19 18:38:53 +04:00 |
|
Anatoly Baksheev
|
e3ff28dacc
|
refactored WImage3D
|
2014-01-19 18:38:53 +04:00 |
|
Anatoly Baksheev
|
f37c31742a
|
created tests for images, created vtk/vtkImageMatSource, and switched all images to that class
|
2014-01-19 18:38:53 +04:00 |
|
Anatoly Baksheev
|
462d516743
|
added test for camera positions, slightly refactored the widgets
|
2014-01-19 18:38:52 +04:00 |
|
Anatoly Baksheev
|
8309d19f31
|
renamed Mesh3d -> Mesh
|
2014-01-19 18:38:52 +04:00 |
|
Anatoly Baksheev
|
d591bd875b
|
fixed crash in enabling shading for polydata widgets
|
2014-01-19 18:38:52 +04:00 |
|
Anatoly Baksheev
|
e478d6b1e9
|
renamed cv::viz::get() to getWindowByName()
|
2014-01-19 18:38:52 +04:00 |
|
Anatoly Baksheev
|
25b417e8b2
|
added test for trajectories and fixed bug with float type
|
2014-01-19 18:38:51 +04:00 |
|
Anatoly Baksheev
|
64566e6178
|
minor
|
2014-01-19 18:38:51 +04:00 |
|
Anatoly Baksheev
|
0d702b83f4
|
updated code to use mapper->SetInput instead of SetInputConnection. All widgets except plane, images ans texts
|
2014-01-19 18:38:51 +04:00 |
|
Anatoly Baksheev
|
a3b1f29d23
|
refactored spheres trajectory
|
2014-01-19 18:38:51 +04:00 |
|
Anatoly Baksheev
|
38c9fa4a92
|
more refactoring
|
2014-01-19 18:38:50 +04:00 |
|
Anatoly Baksheev
|
4833976a0c
|
refactored frustum trajectory to use glyphs
|
2014-01-19 18:38:50 +04:00 |
|
Anatoly Baksheev
|
42dc90295d
|
refactored camera position - simplified frustum creation
|
2014-01-19 18:38:50 +04:00 |
|