Commit Graph

354 Commits

Author SHA1 Message Date
Anatoly Baksheev
e94ee94be3 refactored WCoordinateSystem widget 2014-01-19 18:38:49 +04:00
Anatoly Baksheev
56819eaf19 switched completer API to doubles, updated docs 2014-01-19 18:38:48 +04:00
Anatoly Baksheev
d264465422 more refactoring 2014-01-19 18:38:48 +04:00
Anatoly Baksheev
406444037d refactored polyline 2014-01-19 18:38:48 +04:00
Anatoly Baksheev
b100299644 code beatification 2014-01-19 18:38:48 +04:00
Anatoly Baksheev
e26b7e1e4f ported some trajectories functionality to InputArray style 2014-01-19 18:38:47 +04:00
Anatoly Baksheev
cd57c4e189 refactored CloudNormals and added test for it 2014-01-19 18:38:47 +04:00
Anatoly Baksheev
b7cb3fe8e0 switched more to doubles 2014-01-19 18:38:47 +04:00
Anatoly Baksheev
baee8c3aa5 refactored Mesh, added tests, added failing "twice spin()" test 2014-01-19 18:38:46 +04:00
Anatoly Baksheev
70a81db567 fixed bugs in cloud collection and added test 2014-01-19 18:38:46 +04:00
Anatoly Baksheev
cb58061649 getViewerPose implementation simplified (and error seems to be fixed) 2014-01-19 18:38:45 +04:00
Anatoly Baksheev
186853a50f mass switch from Affine3f to Affine3d 2014-01-19 18:38:45 +04:00
Anatoly Baksheev
1615527426 switched source to InputArrays 2014-01-19 18:38:45 +04:00
Anatoly Baksheev
f610c295f2 more tests 2014-01-19 18:38:44 +04:00
Anatoly Baksheev
e7791e1590 colors minor 2014-01-19 18:38:44 +04:00
Anatoly Baksheev
c1b41caa7c added vtkCloudMatSink, reworked cloud IO functions, added normals support 2014-01-19 18:38:44 +04:00
Anatoly Baksheev
1c4cfd8eaf normals support for CloudMatSource 2014-01-19 18:38:43 +04:00
Anatoly Baksheev
bf30c33e6e getting data from opencv_extra 2014-01-19 18:38:43 +04:00
Anatoly Baksheev
b131faa8f9 export scene to vrml and obj formats 2014-01-19 18:38:43 +04:00
Anatoly Baksheev
b2cd526e6a removed extra code 2014-01-19 18:38:42 +04:00
Anatoly Baksheev
84d6fe397d reading/writing clouds functionality 2014-01-19 18:38:42 +04:00
Anatoly Baksheev
80ab6e889f refactoring 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
159de9cc47 fixed potential crash 2014-01-19 18:38:41 +04:00
Anatoly Baksheev
2705068290 refactored Keyboard and Mouse Events 2014-01-19 18:38:41 +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
abc9465798 kinect camera CAD parameters 2014-01-19 18:38:40 +04:00
Anatoly Baksheev
e990d5b999 reading/writing trajectories 2014-01-19 18:38:40 +04:00
Anatoly Baksheev
e048df51ce for shapes switched vtkDataSetMapper to more efficient vtkPolyDataMapper 2014-01-19 18:38:40 +04:00
Anatoly Baksheev
4979f44cfa minor 2014-01-19 18:38:40 +04:00
Anatoly Baksheev
31d42ce18f refactored Trajectory: split into Trajectory and TrajectoryFrustums) 2014-01-19 18:38:39 +04:00
Anatoly Baksheev
54fa69cab2 renamed Spheres Trajectory, minor changes in Trajectory 2014-01-19 18:38:39 +04:00
Anatoly Baksheev
c7ff13873d minor 2014-01-19 18:38:39 +04:00
Anatoly Baksheev
f6e9b81188 reduced exported interface names (to make IntelliSense hints less littered) 2014-01-19 18:38:38 +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
2d63f60d43 minor changes, opencv cross-branch code 2014-01-19 18:38:38 +04:00
Anatoly Baksheev
15fd3faa40 support gray color clouds 2014-01-19 18:38:38 +04:00
Anatoly Baksheev
2cbfb04144 viz: rich set of named colors 2014-01-19 18:38:37 +04:00
Anatoly Baksheev
4c66b87698 fixed -Wshadow and other warnings, added rvec test 2013-12-07 20:33:50 +04:00
Anatoly Baksheev
f9ca6cfd22 fixed ocv_module_disable() 2013-12-07 18:58:28 +04:00
Anatoly Baksheev
546c084fe6 fixed shadow error and added ocv_disable_module 2013-12-07 18:58:27 +04:00
Anatoly Baksheev
0e88733b13 updating Viz cmake (switched to WITH_VTK option) 2013-12-07 18:58:27 +04:00
Anatoly Baksheev
3830a0b5b2 fixed bug with deletion from std::map 2013-12-07 18:50:47 +04:00
Anatoly Baksheev
a6ab9be5a6 removed VizAccessor from docs 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
d970d58308 added Viz::tutorial2 test 2013-12-07 18:50:45 +04:00
Anatoly Baksheev
177f7eb339 fixed warning 2013-12-07 18:50:43 +04:00
Anatoly Baksheev
0895616576 switched from unnecessarily 'dobule' to 'float' in some places (commonly for widget scale) 2013-12-07 18:50:43 +04:00
Anatoly Baksheev
b560cc35d9 removed Ptr typedef from Viz3d. It is deprecated since Viz3d itseez is a shared pointer 2013-12-07 18:50:42 +04:00
Anatoly Baksheev
9e3a29701e Viz code beautification 2013-11-17 19:33:55 +04:00
Anatoly Baksheev
efcc341219 added viz tutorial 3 test 2013-11-17 15:18:15 +04:00
Anatoly Baksheev
d8600d3d13 fixed all Viz warnings
moved some headers to precomp.hpp
2013-11-17 14:13:11 +04:00
Anatoly Baksheev
dfef42f94e Fixed Viz compilation: removed CV_EXPORTS from cv::viz::Color. The macro forced instantiation of all Matx<double, 4, 1> constructors and triggered StaticAssert there. 2013-11-17 14:08:56 +04:00
Anatoly Baksheev
d275e29ea4 compilation & warnings 2013-11-17 14:08:55 +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
5780b418c9 delete duplicate bunny.ply, remove tabs and extra lines 2013-09-18 13:46:43 +01:00
Ozan Tonkal
8de46e1f81 removed trailing spaces 2013-09-18 12:50:55 +01:00
Ozan Tonkal
a117400577 ignore viz tutorials when BUILD_opencv_viz is not set 2013-09-17 18:55:10 +02:00
Ozan Tonkal
3165b526f2 merge with Itseez/opencv 2013-09-15 17:51:27 +02:00
Ozan Tonkal
c31fb8ffff rename widgets from *Widgets to W* 2013-09-15 16:26:53 +02:00
Ozan Tonkal
f570b3e18d cmake check if VTK version is lower than 5, and give fatal error if it is 2013-09-15 11:24:20 +02:00
Ozan Tonkal
3f27ba54e0 re-render the scene after changing camera properties 2013-09-12 19:23:05 +02:00
Ozan Tonkal
620d92824c hide VizMap and VizPair from public interface 2013-09-11 13:23:57 +02:00
Ozan Tonkal
9895093524 check if vtk 5.10.0 exists, if not require 6.0.0 2013-09-08 19:41:35 +02:00
Ozan Tonkal
56f9168ac1 support VTK 6.0.0: cmakelist.txt might need to be refactored 2013-09-08 19:07:15 +02:00
Ozan Tonkal
26005a19bd add license headers 2013-09-08 19:05:24 +02:00
Ozan Tonkal
c773061457 updated documentation 2013-09-08 19:03:55 +02:00
Ozan Tonkal
3bdb55e1ef another constructor for CameraPositionWidget for displaying image by also using field of view instead of intrinsic matrix 2013-09-08 19:03:55 +02:00
Ozan Tonkal
2170559bed text3dwidget offers now users to decide whether it should face the camera or not 2013-09-08 19:03:54 +02:00
Ozan Tonkal
286f81f305 fix crucial bug in get method, hide add and remove methods from user 2013-09-08 19:03:54 +02:00
Ozan Tonkal
fcf437cf69 combine representation methods to one as setRepresentation 2013-09-08 19:03:54 +02:00
Ozan Tonkal
94ca5d65d0 remove VIZ prefix from rendering properties, fix setRenderingProperties and getRenderingProperties methods 2013-09-08 19:03:54 +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
Anatoly Baksheev
9a91a12fb2 VIZ disabled by default, VTK search is performed iff BUILD_opencv_viz is enabled 2013-09-06 19:50:47 +04:00
Anatoly Baksheev
477ca067f0 compilation for macos 2013-09-06 19:32:35 +04:00
Anatoly Baksheev
eed7bf6902 compilation for windows 2013-09-06 18:43:14 +04:00
Ozan Tonkal
5eed0d6bef remove common.h include from widgets.hpp 2013-09-05 21:03:40 +02:00
Ozan Tonkal
31501ebf4f replace tabs by spaces 2013-09-05 21:03:39 +02:00
Ozan Tonkal
a5b75769a3 initial documentation 2013-09-05 21:03:39 +02:00
Ozan Tonkal
2822845ba6 set get RenderingProperty id comes first 2013-09-05 21:03:39 +02:00
Ozan Tonkal
9d4fe6984b remove setWindowName method to avoid complications 2013-09-05 21:03:39 +02:00
Ozan Tonkal
21be9796ae comments on widgets where constructors might be confusing 2013-09-05 21:03:39 +02:00
ozantonkal
2705113bc4 remove common.cpp, remove commented code in common.h 2013-09-05 21:03:39 +02:00
ozantonkal
ffbb5e9524 resetCamera, resetViewpoint in Viz3d 2013-09-05 21:03:39 +02:00
ozantonkal
4aa61dee50 minor refactoring interactor_style 2013-09-05 21:03:39 +02:00
ozantonkal
af8a918e04 fix minor bug, minor cleaning, cv_assert with messages 2013-09-05 21:03:39 +02:00
ozantonkal
69f135ec57 fix memory leak in viz3d 2013-09-05 21:03:39 +02:00
ozantonkal
6c0c217562 removed reference counter in widgets, fixed memory leak 2013-09-05 21:03:39 +02:00
ozantonkal
4b443059ec reverted widget reference count in order to avoid memory leak 2013-09-05 21:03:39 +02:00
ozantonkal
8007e07ad2 load mesh function is finalized: color range is always 0-255 and RGB due to vtkPLYReader limitations 2013-09-05 21:03:39 +02:00
ozantonkal
e4b13f2ef0 update reader after setting file name 2013-09-05 21:03:39 +02:00
ozantonkal
3da7dd9849 fix yellow and magenta color bgr codes 2013-09-05 21:03:39 +02:00
ozantonkal
9086cf5d79 remove unused includes and libraries from linking 2013-09-05 21:03:39 +02:00
ozantonkal
3038ffb886 setDesiredUpdateRate implementation in Viz3d 2013-09-05 20:56:33 +02:00
ozantonkal
ed0162ad0b remove reference counting in widgets 2013-09-05 20:56:33 +02:00
ozantonkal
08917908f3 remove eigen dependency 2013-09-05 20:56:33 +02:00
ozantonkal
f98614ece0 remove cloudactormap, shapeactormap. only vtkProp is stored and view transformation can be obtained using GetUserMatrix of vtkProp3D 2013-09-05 20:56:33 +02:00
ozantonkal
f6e1a093cd implement window relevant methods in Viz3d 2013-09-05 20:56:33 +02:00
ozantonkal
4f416352e1 implemented actor representation methods in viz3d 2013-09-05 20:56:33 +02:00
ozantonkal
cf36b8f817 rendering properties in Widget and Viz3d 2013-09-05 20:56:33 +02:00
ozantonkal
b032b4dded move frompolyfile to widget class as static method, remove addpolygon and its alikes 2013-09-05 20:56:33 +02:00
ozantonkal
0bbaf5d47a removeAllWidgets implementation, removed other remove methods 2013-09-05 20:56:33 +02:00
ozantonkal
e106dcc606 remove include vtk headers from outside of precomp.hpp 2013-09-05 20:56:32 +02:00
Anatoly Baksheev
35e7952909 simplify modules/viz/CMakeLists.txt 2013-09-03 01:59:00 +04:00
ozantonkal
d83be1dccc fixes based on the feedback: window name prefix is automatically added when it is not there, singleton class returns reference instead of pointer, destructor is private, release function implemented 2013-08-23 18:49:21 +02:00
ozantonkal
6bc393676d cv::viz::get(window_name) implementation 2013-08-20 20:22:14 +02:00
ozantonkal
c37f091cc5 remove redundant statement 2013-08-20 18:18:01 +02:00
ozantonkal
669abd58bc initial shared pointer implementation for Viz3d, singleton VizAccessor, cv::viz::get function initial implementation 2013-08-19 20:09:47 +02:00
ozantonkal
b69a97bef3 access focal length and principal point in camera 2013-08-12 09:07:50 +02:00
ozantonkal
4a1573de9b principal point is always set even though the intrinsic parameters are not given (center of window), fixed computation mistakes in setWindowSize in camera class 2013-08-09 10:39:30 +02:00
ozantonkal
bb057491ea create camera from projection matrix (used for getCamera in viz) 2013-08-08 12:14:27 +02:00
ozantonkal
71dc5f8291 simulate real cameras by working around vtkUserTransform to set projection matrix 2013-08-07 16:20:23 +02:00
ozantonkal
422b967e9a fix computeProjectionMatrix in Camera class, also check if there is principal point defined 2013-08-07 15:52:24 +02:00
ozantonkal
5335489daa viz getWindowSize, setWindowSize 2013-08-07 09:28:39 +02:00
ozantonkal
731a931c0c field of views are in radians 2013-08-05 19:35:20 +02:00
ozantonkal
32985aa724 fix camera constructor, add tentative KinectCamera method 2013-08-05 19:22:43 +02:00
ozantonkal
9c20e77013 fix conversion functions to use appropriate vtk function 2013-08-05 18:39:36 +02:00
ozantonkal
f8ad3c0204 fix field of view computation in setWindowSize 2013-08-05 16:06:02 +02:00
ozantonkal
119d97f1f6 remove old camera, rename new camera 2013-08-05 15:37:08 +02:00
ozantonkal
f060eee5a5 fix window_size setter, remove camera related old methods from viz3d 2013-08-05 15:10:17 +02:00
ozantonkal
439ba98e0a initial implementation of projection matrix, 3D to window coordinates, window coordinates to 3D ray (not yet tested) 2013-08-05 13:01:21 +02:00
ozantonkal
0bb89e767a fix field of view formula in camera class, implement get camera 2013-08-04 17:01:41 +02:00
ozantonkal
f445f76213 initial setCamera implementation 2013-08-03 16:33:11 +02:00
ozantonkal
4953786de1 remove boost include (caused by Kdevelop autocomplete) 2013-08-03 15:42:10 +02:00
ozantonkal
e4e9ed876f spheres trajectory widget implementation 2013-08-03 15:40:36 +02:00
ozantonkal
a76cc9ef88 initial camera implementation (camera2), fix bug (zeros method) 2013-08-03 15:24:15 +02:00
ozantonkal
8fa6b6a6ef initial setViewerPose implementation 2013-08-03 15:24:15 +02:00
Anatoly Baksheev
54774f6d3b updated license header 2013-08-02 13:45:43 +04:00
Anatoly Baksheev
69e66d7bb5 fixed little bug in makeCameraPose 2013-08-02 13:37:15 +04:00
ozantonkal
f5816c883f fix setting color of 3D objects 2013-07-29 15:10:48 +02:00
ozantonkal
b64e6ccc6c static function for appending clouds in cloud collection widget 2013-07-29 15:06:05 +02:00
ozantonkal
42266b04a5 makeCameraPose implementation 2013-07-29 12:25:46 +02:00
ozantonkal
250dac5b71 fix: trajectory path is now relative to the global frame 2013-07-29 11:01:59 +02:00
ozantonkal
3fe5984e46 cloud collection widget implementation 2013-07-26 16:55:03 +02:00
ozantonkal
edfad34d39 trajectory with spheres and lines (based on the code snippet in gdocs) 2013-07-26 14:50:11 +02:00
ozantonkal
b661d72252 CameraPositionWidget: a workaround for setting frustum color in the presence of an image 2013-07-25 16:47:30 +02:00
ozantonkal
ec756afe87 trajectorywidget display modes are combined with & instead of | 2013-07-25 16:08:23 +02:00
ozantonkal
64cdd82146 trajectory widget constructor with field of view 2013-07-25 15:08:45 +02:00
ozantonkal
7d458e852e trajectory widget display options: display path, display frames, display both 2013-07-25 10:56:54 +02:00
ozantonkal
aa2594c06c fix aspect_ratio computation from fovs, add casting for camerapositionwidget, trajectorywidget 2013-07-25 10:23:24 +02:00
ozantonkal
769512db2d move image copying structure to viz3d_impl: ConvertToVtkImage 2013-07-24 10:32:21 +02:00
ozantonkal
952029a47b GridImpl structure to shorten grid widget implementation 2013-07-24 10:13:01 +02:00
ozantonkal
6e5a712f6e Gridwidget with plane coefficients 2013-07-24 10:02:33 +02:00
ozantonkal
40b50755d3 add const keywords to gridwidget constructor 2013-07-23 15:46:14 +02:00
ozantonkal
4d70671231 intial implementation of frustum + image (the color of the frustum is currently dependent on the first pixel of the image) 2013-07-23 15:43:23 +02:00
ozantonkal
f9938da67d image 3d widget with position, normal, up_vector 2013-07-22 17:18:19 +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
27f5cd2afd overlay image widget constructor with Rect 2013-07-22 16:12:22 +02:00