Commit Graph

349 Commits

Author SHA1 Message Date
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
ozantonkal
540f9a67f3 remove unnecessary declaration 2013-07-22 15:14:33 +02:00
ozantonkal
c0f44ca421 shorten Trajectory widget implementation 2013-07-22 15:03:28 +02:00
ozantonkal
5af739dfc1 plane widget size fix 2013-07-22 14:34:44 +02:00
ozantonkal
16c8c98895 trajectory widget with frustums 2013-07-22 14:11:06 +02:00
ozantonkal
f3b228c91f initial implementation of trajectory widget 2013-07-22 12:53:19 +02:00
ozantonkal
13a2516a6a avoid memory leak in mesh widget 2013-07-22 09:11:16 +02:00
ozantonkal
0a3691d6ac CameraPositionWidget: constructor with Vec2f fov (tentative) 2013-07-19 18:30:12 +02:00
ozantonkal
2294eb82c9 fix aspect_ratio in camera position widget, add scale parameter (tentative implementation of scale) 2013-07-18 17:46:08 +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
ozantonkal
3260404fdf initial CameraPositionWidget implementation using eye, look_at, up_vector 2013-07-18 10:39:34 +02:00
ozantonkal
40e47e6f3f Image widgets implementation, GridWidget: vtkExtractEdges instead of Wireframe 2013-07-17 11:35:14 +02:00
ozantonkal
769eba7535 cube wire_frame fix using vtkOutlineSource 2013-07-16 09:06:14 +02:00
ozantonkal
4b85c849ca fix rgb and bgr incompatibility 2013-07-16 09:06:14 +02:00
ozantonkal
1bfd7ad17e arrow widget thickness parameter 2013-07-16 09:06:14 +02:00
Anatoly Baksheev
dc348ff93d removed Mesh::Ptr since mesh itself consists of shared points (cv::Mat) 2013-07-15 19:18:37 +04:00
Anatoly Baksheev
0e20473c97 minor mesh load fixes 2013-07-15 16:46:39 +04:00
Anatoly Baksheev
4c228c07f1 fixed copilation 2013-07-15 16:31:28 +04:00
ozantonkal
efbebe6236 Merge branch 'implementing_widgets' of https://github.com/ozantonkal/opencv into implementing_widgets 2013-07-15 12:04:24 +02:00
ozantonkal
25f98bc022 mesh widget casting 2013-07-15 12:02:53 +02:00
ozantonkal
b066d1982f mesh widget implementation 2013-07-15 12:02:20 +02:00
Anatoly Baksheev
6ca1822f36 added comments with future work for VizImpl
added authors to license header
2013-07-13 20:42:49 +04:00
Anatoly Baksheev
d6e2b657f9 more refactoring 2013-07-13 19:42:49 +04:00
Anatoly Baksheev
512afe2a90 beatification of test_viz 2013-07-13 18:23:46 +04:00
Anatoly Baksheev
83cb28f169 temp_viz removed 2013-07-13 18:01:56 +04:00
Anatoly Baksheev
3e41f0647e removed q subfolder 2013-07-13 17:45:46 +04:00
Anatoly Baksheev
f480eca668 removed Affine3f from coordinate frame constructor 2013-07-13 01:49:59 +04:00
Anatoly Baksheev
328f0e32d8 added makeTransformToGlobal() function 2013-07-13 00:00:57 +04:00
Anatoly Baksheev
6045ae856b reshape continuous clouds for better performance. 2013-07-12 23:59:19 +04:00
Anatoly Baksheev
ae2e3a1a93 viz license header template 2013-07-12 16:53:25 +04:00
Anatoly Baksheev
c6a8bd65a8 fixed some warnings for windows
minor buitification
2013-07-11 14:45:39 +04:00
ozantonkal
acd63c1497 fix grid widget unused color 2013-07-11 11:52:59 +02:00
ozantonkal
eef8195569 clean unnecessary methods, make text3d face camera 2013-07-11 09:30:52 +02:00
ozantonkal
5813a3a99d text3D widget implementation 2013-07-10 16:34:47 +02:00
ozantonkal
e185900270 grid widget implementation 2013-07-10 15:34:19 +02:00
ozantonkal
71c76aecc9 PolyLine widget implementation 2013-07-10 12:51:17 +02:00
ozantonkal
d3dee3a2fe explicit casting among widgets, removed implicit casting 2013-07-10 09:55:42 +02:00
Anatoly Baksheev
e4c3416f58 experimental widget casting functionality 2013-07-09 20:16:43 +04:00
Anatoly Baksheev
509a93c7ce minor naming 2013-07-09 19:35:26 +04:00
ozantonkal
200b254bad rearrange widget constructors 2013-07-09 15:18:44 +02:00
ozantonkal
10d955f18b widget2d setcolor implementation 2013-07-09 14:28:55 +02:00
ozantonkal
318b1c00a9 implement assignment operator and copy constructor for all widgets existing 2013-07-09 14:12:49 +02:00
ozantonkal
195d60f4f8 fix widget delete bug 2013-07-09 11:07:21 +02:00
ozantonkal
d324c03b6a initial redesigning widgets 2013-07-09 10:22:12 +02:00
ozantonkal
b50d777985 cloudwidget private implementation for duplicate code, add cv_assert(exists), fix bug point_step bug in CloudNormalsWidget 2013-07-08 21:48:19 +02:00
ozantonkal
cc08149d7c remove redundant statements 2013-07-08 19:05:35 +02:00
ozantonkal
658e4c5e97 set/get/updateWidgetPose implemented, cloudNormals with color 2013-07-08 18:56:13 +02:00
ozantonkal
e76023be96 cloud normals widget implementation 2013-07-08 18:22:51 +02:00
ozantonkal
6e5ae98582 initial cloud widget implementation, fix safedowncasts 2013-07-08 15:12:50 +02:00
ozantonkal
d394e233bb cube widget wireframe 2013-07-08 11:34:11 +02:00
ozantonkal
653eda45f8 text widget implementation 2013-07-08 10:41:42 +02:00
ozantonkal
c4f4727ee5 showWidget takes Affine3f as argument 2013-07-08 10:53:00 +03:00
ozantonkal
eafcdc004d plane widget size 2013-07-07 21:19:21 +03:00
ozantonkal
030400d50f circle widget thickness property 2013-07-07 16:21:47 +03:00
Anatoly Baksheev
9d684a39da Fixed ref counting bug, minor formatting 2013-07-05 14:35:12 +04:00
ozantonkal
7e2643abff removed shape files 2013-07-04 19:05:56 +03:00
ozantonkal
4c3d1d583a remove ModelCoefficients, remove showShape methods from viz3d 2013-07-04 18:47:52 +03:00
ozantonkal
5bb95c4110 remove widget implementation 2013-07-04 18:36:26 +03:00
ozantonkal
ecdd8513fd coordinate system widget implementation, update pose fix 2013-07-04 18:19:06 +03:00
ozantonkal
03cc439b08 cube widget implementation 2013-07-04 17:59:11 +03:00
ozantonkal
f07486b563 cylinder widget implementation 2013-07-04 17:44:41 +03:00
ozantonkal
f97c3c8b06 circle widget and arrow widget implementation 2013-07-04 16:54:46 +03:00
ozantonkal
d80a965f97 sphere widget implementation 2013-07-04 16:32:06 +03:00
ozantonkal
3d3e3fd470 plane widget implementation 2013-07-04 16:15:20 +03:00
ozantonkal
ba89a6a34a line widget set/get line width 2013-07-04 16:05:05 +03:00
ozantonkal
158ed299c1 reference counting in widget 2013-07-04 15:57:49 +03:00
Anatoly Baksheev
141cfd562c widget_accessor.hpp - minimize dependencies 2013-07-04 15:16:48 +04:00
Anatoly Baksheev
efa7f09048 slight refactoring of widget system code 2013-07-04 13:54:00 +04:00
ozantonkal
daa2a205a4 remove redundant methods, implement assignment operator for widget 2013-07-03 22:27:09 +03:00
ozantonkal
c8d2b5ff44 fix vtkActor to vtkLODActor, initial implementation LineWidget, showWidget 2013-07-03 20:53:03 +03:00
ozantonkal
54c7dfab83 initial base widget implementation 2013-07-03 18:48:11 +03:00
Anatoly Baksheev
e0b7e63787 getShapePose/setShapePose simplification
little code beautification, formatting
2013-07-02 00:07:05 +04:00
Anatoly Baksheev
2229d91c50 Merge remote-tracking branch 'remotes/ozan/refactoring_shapeMethods' into viz
Conflicts:
	modules/viz/test/test_viz3d.cpp
2013-07-01 21:39:04 +04:00
ozantonkal
1830059969 removed redundant addShape methods 2013-06-27 13:05:52 +03:00
ozantonkal
4a19ff3a7c createArrow and showArrow implementation without label 2013-06-27 12:33:19 +03:00
ozantonkal
c4a07b7531 createSphere and showSphere implementations 2013-06-27 11:51:36 +03:00
ozantonkal
17bdc29d5b setShapePose and getShapePose implementations 2013-06-26 12:52:43 +02:00
ozantonkal
fd6eeac6aa showCylinder and showCircle implementations 2013-06-26 11:32:12 +02:00
ozantonkal
98edabd42c showCylinder implementation 2013-06-26 11:13:34 +02:00
ozantonkal
55683e7b3b showCube implementation 2013-06-26 10:46:26 +02:00
ozantonkal
93fe2f6e4d showPlane with color 2013-06-21 14:09:12 +02:00
ozantonkal
f94c2414e6 showPlane implementation 2013-06-21 14:00:22 +02:00
ozantonkal
26a6823207 showLine implementation 2013-06-21 12:48:27 +02:00
ozantonkal
b387581d4f initial refactoring 2013-06-17 16:32:52 +02:00
Anatoly Baksheev
909f905b57 --amend 2013-06-14 14:22:03 +04:00
Anatoly Baksheev
c65d888875 little refactoring 2013-06-14 14:20:19 +04:00
ozantonkal
f91b1a1771 showPointCloud with single color without duplicating color 2013-06-12 17:38:39 +02:00
ozantonkal
0e90c0fff2 updated test for single color 2013-06-12 10:56:46 +02:00
ozantonkal
46cf22cdff showPointCloud with single color 2013-06-12 10:55:07 +02:00
ozantonkal
01086323b0 mistype fix 2013-06-12 09:29:04 +02:00
Anatoly Baksheev
1b51ee385b refactored showPointCloud to for shorter code. Implemented NanFilter::copy<T>() function 2013-06-11 22:01:50 +04:00
Anatoly Baksheev
1ae5918fa8 refactoring of copy_non_nans 2013-06-11 18:38:20 +04:00
ozantonkal
abdc022b20 implemented copy_non_nans, isnan 2013-06-11 11:02:26 +02:00
ozantonkal
c4fe98977a implementation of * operator for Affine3f and point3d, initial implementation of isNaN 2013-06-11 11:02:26 +02:00
Anatoly Baksheev
c622ebf890 implemented wasStopped flag 2013-06-10 14:11:34 +04:00
Anatoly Baksheev
0f5da429c5 misprint 2013-06-10 12:42:11 +04:00
Anatoly Baksheev
909c45f1b9 little refactoring 2013-06-10 12:32:03 +04:00
ozantonkal
aecff5237b CV_64FC3 support 2013-06-07 16:07:23 +02:00
ozantonkal
e58b0b3507 removed cv keywords and redundant lines from showPointCloud 2013-06-07 12:16:22 +02:00
ozantonkal
d11d07aaf5 showPointCloud initial implementation together with test 2013-06-07 11:18:26 +02:00
Anatoly Baksheev
ace0933bed fixed compilation (included ctime in precomp.hpp) 2013-05-31 13:42:49 +04:00
ozantonkal
6603cc4405 boost dependency has been removed 2013-05-30 20:01:33 +02:00
ozantonkal
e10582ce4f Initial implementation of keyboard callback registration mechanism without boost 2013-05-29 20:58:57 +02:00
ozantonkal
e75057956a fix linux compilation errors 2013-05-29 18:37:53 +02:00
Anatoly Baksheev
0e7d4a5703 First version of 'viz' module 2013-05-24 17:58:39 +04:00