Merge pull request #1881 from alalek:move_viz_contrib

Author: alalek

modules/viz/CMakeLists.txt

@@ -0,0 +1,46 @@
+if(NOT HAVE_VTK)
+  ocv_module_disable(viz)
+endif()
+
+set(the_description "Viz")
+include(${VTK_USE_FILE})
+
+if(NOT BUILD_SHARED_LIBS)
+  # We observed conflict between builtin 3rdparty libraries and
+  # system-wide similar libraries (but with different versions) from VTK dependencies
+  set(_conflicts "")
+  foreach(dep ${VTK_LIBRARIES})
+    if(("${dep}" MATCHES "libz\\." AND BUILD_ZLIB)
+      OR ("${dep}" MATCHES "libjpeg\\." AND BUILD_JPEG)
+      OR ("${dep}" MATCHES "libpng\\." AND BUILD_PNG)
+      OR ("${dep}" MATCHES "libtiff\\." AND BUILD_TIFF)
+    )
+      list(APPEND _conflicts "${dep}")
+    endif()
+  endforeach()
+  if(_conflicts)
+    message(STATUS "Disabling VIZ module due to conflicts with VTK dependencies: ${_conflicts}")
+    ocv_module_disable(viz)
+  endif()
+endif()
+
+ocv_warnings_disable(CMAKE_CXX_FLAGS -Winconsistent-missing-override -Wsuggest-override)
+
+ocv_add_module(viz opencv_core WRAP python)
+ocv_glob_module_sources()
+ocv_module_include_directories()
+ocv_create_module()
+
+ocv_add_accuracy_tests()
+ocv_add_perf_tests()
+ocv_add_samples(opencv_imgproc opencv_calib3d opencv_features2d opencv_flann)
+
+ocv_target_link_libraries(${the_module} LINK_PRIVATE ${VTK_LIBRARIES})
+
+if(APPLE AND BUILD_opencv_viz)
+  ocv_target_link_libraries(${the_module} LINK_PRIVATE "-framework Cocoa")
+endif()
+
+if(TARGET opencv_test_viz)
+  set_target_properties(opencv_test_viz PROPERTIES MACOSX_BUNDLE TRUE)
+endif()

modules/viz/doc/images/cpw1.png

@@ -0,0 +1,84 @@
+/*M///////////////////////////////////////////////////////////////////////////////////////
+//
+//  IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
+//
+//  By downloading, copying, installing or using the software you agree to this license.
+//  If you do not agree to this license, do not download, install,
+//  copy or use the software.
+//
+//
+//                           License Agreement
+//                For Open Source Computer Vision Library
+//
+// Copyright (C) 2013, OpenCV Foundation, all rights reserved.
+// Third party copyrights are property of their respective owners.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+//   * Redistribution's of source code must retain the above copyright notice,
+//     this list of conditions and the following disclaimer.
+//
+//   * Redistribution's in binary form must reproduce the above copyright notice,
+//     this list of conditions and the following disclaimer in the documentation
+//     and/or other materials provided with the distribution.
+//
+//   * The name of the copyright holders may not be used to endorse or promote products
+//     derived from this software without specific prior written permission.
+//
+// This software is provided by the copyright holders and contributors "as is" and
+// any express or implied warranties, including, but not limited to, the implied
+// warranties of merchantability and fitness for a particular purpose are disclaimed.
+// In no event shall the Intel Corporation or contributors be liable for any direct,
+// indirect, incidental, special, exemplary, or consequential damages
+// (including, but not limited to, procurement of substitute goods or services;
+// loss of use, data, or profits; or business interruption) however caused
+// and on any theory of liability, whether in contract, strict liability,
+// or tort (including negligence or otherwise) arising in any way out of
+// the use of this software, even if advised of the possibility of such damage.
+//
+// Authors:
+//  * Ozan Tonkal, [email protected]
+//  * Anatoly Baksheev, Itseez Inc.  myname.mysurname <> mycompany.com
+//
+//M*/
+
+#ifndef OPENCV_VIZ_HPP
+#define OPENCV_VIZ_HPP
+
+#include <opencv2/viz/types.hpp>
+#include <opencv2/viz/widgets.hpp>
+#include <opencv2/viz/viz3d.hpp>
+#include <opencv2/viz/vizcore.hpp>
+
+/**
+  @defgroup viz 3D Visualizer
+
+This section describes 3D visualization window as well as classes and methods that are used to
+interact with it.
+
+3D visualization window (see Viz3d) is used to display widgets (see Widget), and it provides several
+methods to interact with scene and widgets.
+
+  @{
+    @defgroup viz_widget Widget
+
+In this section, the widget framework is explained. Widgets represent 2D or 3D objects, varying from
+simple ones such as lines to complex ones such as point clouds and meshes.
+
+Widgets are **implicitly shared**. Therefore, one can add a widget to the scene, and modify the
+widget without re-adding the widget.
+
+@code
+// Create a cloud widget
+viz::WCloud cw(cloud, viz::Color::red());
+// Display it in a window
+myWindow.showWidget("CloudWidget1", cw);
+// Modify it, and it will be modified in the window.
+cw.setColor(viz::Color::yellow());
+@endcode
+
+  @}
+*/
+
+#endif /* OPENCV_VIZ_HPP */