Roman Donchenko
|
40a740ff88
|
Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
modules/imgproc/src/opencl/precornerdetect.cl
modules/nonfree/perf/perf_main.cpp
modules/nonfree/perf/perf_surf.ocl.cpp
modules/ocl/src/arithm.cpp
modules/ocl/src/gftt.cpp
modules/ocl/src/opencl/arithm_bitwise.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_minMax.cl
modules/ocl/src/opencl/arithm_nonzero.cl
modules/ocl/src/opencl/arithm_sum.cl
modules/ocl/test/test_arithm.cpp
modules/viz/src/precomp.hpp
modules/viz/src/vizcore.cpp
modules/viz/src/vtk/vtkCloudMatSink.h
modules/viz/src/vtk/vtkXYZReader.cpp
modules/viz/src/vtk/vtkXYZReader.h
modules/viz/test/test_precomp.hpp
|
2014-03-17 14:14:07 +04:00 |
|
Anatoly Baksheev
|
fb7e74c511
|
iteractor work
|
2014-03-02 23:15:53 +04:00 |
|
Anatoly Baksheev
|
56754e907d
|
fixed crash for windows if console widow is closed or CTRL_C/CTRL_BRAK keys in console are pressed.
|
2014-02-15 20:08:04 +04:00 |
|
Anatoly Baksheev
|
1a5dfe421d
|
Added WidgetMerger, Polyline - colors support for each point independently, simple widgets now compute color array instead of setting global color
|
2014-02-15 17:02:17 +04:00 |
|
Anatoly Baksheev
|
5dc17f5d58
|
Fixed all OpenGL issues for Macos (via objective-C++ layer)
|
2014-02-10 15:45:46 +04:00 |
|
Anatoly Baksheev
|
17fea0dd0a
|
fixed size_t/int conversion warnings
|
2014-02-10 15:45:45 +04:00 |
|
Anatoly Baksheev
|
eb8728d727
|
Updated cloud io functionality - removed dependency from VTK legacy
|
2014-02-10 15:45:44 +04:00 |
|
Anatoly Baksheev
|
02ebc4368c
|
Viz initial backport, compilation fixes, moved viz/viz.hpp header according to 2.4 style
|
2014-01-20 22:51:33 +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
|
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
|
74206e0159
|
added painted cloud widget
|
2014-01-19 18:38:57 +04:00 |
|
Anatoly Baksheev
|
bb891f0570
|
added cone implementation
|
2014-01-19 18:38:56 +04:00 |
|
Anatoly Baksheev
|
c0cc551228
|
refactored circle
|
2014-01-19 18:38:55 +04:00 |
|
Anatoly Baksheev
|
cad9a786c4
|
optimized Mat to vtkImageData conversion
|
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
|
d591bd875b
|
fixed crash in enabling shading for polydata widgets
|
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
|
45879fb9db
|
more refactoring
|
2014-01-19 18:38:50 +04:00 |
|
Anatoly Baksheev
|
a8556134ae
|
refactored simple trajectory to use TensorGlyph
|
2014-01-19 18:38:49 +04:00 |
|
Anatoly Baksheev
|
d264465422
|
more refactoring
|
2014-01-19 18:38:48 +04:00 |
|
Anatoly Baksheev
|
b100299644
|
code beatification
|
2014-01-19 18:38:48 +04:00 |
|
Anatoly Baksheev
|
cd57c4e189
|
refactored CloudNormals and added test for it
|
2014-01-19 18:38:47 +04:00 |
|
Anatoly Baksheev
|
c1b41caa7c
|
added vtkCloudMatSink, reworked cloud IO functions, added normals support
|
2014-01-19 18:38:44 +04:00 |
|
Anatoly Baksheev
|
b131faa8f9
|
export scene to vrml and obj formats
|
2014-01-19 18:38:43 +04:00 |
|
Anatoly Baksheev
|
84d6fe397d
|
reading/writing clouds functionality
|
2014-01-19 18:38:42 +04:00 |
|
Anatoly Baksheev
|
7dbf6bc8df
|
rewrote cloud widget in vtk filters style
Conflicts:
modules/viz/src/clouds.cpp
|
2014-01-19 18:38:42 +04:00 |
|
Anatoly Baksheev
|
cad2f98007
|
removed vizActor (since unnecessarily in new design concept with simplified widgets)
|
2014-01-19 18:38:41 +04:00 |
|
Anatoly Baksheev
|
45aeecb043
|
renaming
|
2014-01-19 18:38:41 +04:00 |
|
Anatoly Baksheev
|
4979f44cfa
|
minor
|
2014-01-19 18:38:40 +04:00 |
|
Anatoly Baksheev
|
c7ff13873d
|
minor
|
2014-01-19 18:38:39 +04:00 |
|
Anatoly Baksheev
|
44c1d4dfdc
|
allow fast switch between actors (except mesh, cloud, cloud collection)
|
2014-01-19 18:38:38 +04:00 |
|
Anatoly Baksheev
|
4c66b87698
|
fixed -Wshadow and other warnings, added rvec test
|
2013-12-07 20:33:50 +04:00 |
|
Anatoly Baksheev
|
3830a0b5b2
|
fixed bug with deletion from std::map
|
2013-12-07 18:50:47 +04:00 |
|
Anatoly Baksheev
|
fb62a66b69
|
removed unused code
|
2013-12-07 18:50:46 +04:00 |
|
Anatoly Baksheev
|
b88fdc73d6
|
VizAccessor is now private and renamed to VizStorage
|
2013-12-07 18:50:46 +04:00 |
|
Anatoly Baksheev
|
9e3a29701e
|
Viz code beautification
|
2013-11-17 19:33:55 +04:00 |
|
Anatoly Baksheev
|
d8600d3d13
|
fixed all Viz warnings
moved some headers to precomp.hpp
|
2013-11-17 14:13:11 +04:00 |
|
Pablo Speciale
|
f47afe5799
|
Fixed VIZ compilation module (Bug 3297: code.opencv.org/issues/3297)
|
2013-10-03 02:10:27 +02:00 |
|
Ozan Tonkal
|
3165b526f2
|
merge with Itseez/opencv
|
2013-09-15 17:51:27 +02:00 |
|
Ozan Tonkal
|
620d92824c
|
hide VizMap and VizPair from public interface
|
2013-09-11 13:23:57 +02:00 |
|
Ozan Tonkal
|
26005a19bd
|
add license headers
|
2013-09-08 19:05:24 +02:00 |
|
Ozan Tonkal
|
fdbf20c172
|
delete common.h, viz_types.hpp, rendering properties are public, setcolor in creating_widgets tutorial
|
2013-09-08 19:03:54 +02:00 |
|
ozantonkal
|
9086cf5d79
|
remove unused includes and libraries from linking
|
2013-09-05 21:03:39 +02:00 |
|
ozantonkal
|
08917908f3
|
remove eigen dependency
|
2013-09-05 20:56:33 +02:00 |
|
ozantonkal
|
d0bd344a42
|
image 3d widget use texture instead of imageactor for more flexibility (such as resizing)
|
2013-07-22 16:48:17 +02:00 |
|
ozantonkal
|
9d3f3c66da
|
camera position widget: constructor with no parameter, constructor with intrinsic matrix for visualizing frustum
|
2013-07-18 17:08:58 +02:00 |
|