diff --git a/doc/tutorials/images/viz.jpg b/doc/tutorials/images/viz.jpg new file mode 100644 index 0000000000..7ac8f3ed8d Binary files /dev/null and b/doc/tutorials/images/viz.jpg differ diff --git a/doc/tutorials/tutorials.rst b/doc/tutorials/tutorials.rst index 07bc515d53..d5d6d4f1e6 100644 --- a/doc/tutorials/tutorials.rst +++ b/doc/tutorials/tutorials.rst @@ -186,6 +186,21 @@ As always, we would be happy to hear your comments and receive your contribution :width: 80pt :alt: gpu icon +* :ref:`Table-Of-Content-Viz` + + .. tabularcolumns:: m{100pt} m{300pt} + .. cssclass:: toctableopencv + + =========== ======================================================= + |Viz| These tutorials show how to use Viz module effectively. + + =========== ======================================================= + + .. |Viz| image:: images/viz.jpg + :height: 80pt + :width: 80pt + :alt: viz icon + * :ref:`Table-Of-Content-General` .. tabularcolumns:: m{100pt} m{300pt} @@ -221,4 +236,5 @@ As always, we would be happy to hear your comments and receive your contribution gpu/table_of_content_gpu/table_of_content_gpu bioinspired/table_of_content_bioinspired/table_of_content_bioinspired ios/table_of_content_ios/table_of_content_ios + viz/table_of_content_viz/table_of_content_viz general/table_of_content_general/table_of_content_general diff --git a/doc/tutorials/viz/creating_widgets.rst b/doc/tutorials/viz/creating_widgets/creating_widgets.rst similarity index 97% rename from doc/tutorials/viz/creating_widgets.rst rename to doc/tutorials/viz/creating_widgets/creating_widgets.rst index fd002a8a22..0d9b288c34 100644 --- a/doc/tutorials/viz/creating_widgets.rst +++ b/doc/tutorials/viz/creating_widgets/creating_widgets.rst @@ -16,7 +16,7 @@ In this tutorial you will learn how to Code ==== -You can download the code from `here <../../../../samples/cpp/tutorial_code/viz/creating_widgets.cpp>`_. +You can download the code from :download:`here <../../../../samples/cpp/tutorial_code/viz/creating_widgets.cpp>`. .. code-block:: cpp diff --git a/doc/tutorials/viz/images/red_triangle.png b/doc/tutorials/viz/creating_widgets/images/red_triangle.png similarity index 100% rename from doc/tutorials/viz/images/red_triangle.png rename to doc/tutorials/viz/creating_widgets/images/red_triangle.png diff --git a/doc/tutorials/viz/images/window_demo.png b/doc/tutorials/viz/launching_viz/images/window_demo.png similarity index 100% rename from doc/tutorials/viz/images/window_demo.png rename to doc/tutorials/viz/launching_viz/images/window_demo.png diff --git a/doc/tutorials/viz/launching_viz.rst b/doc/tutorials/viz/launching_viz/launching_viz.rst similarity index 96% rename from doc/tutorials/viz/launching_viz.rst rename to doc/tutorials/viz/launching_viz/launching_viz.rst index 4b8bd5f934..56526ef4ed 100644 --- a/doc/tutorials/viz/launching_viz.rst +++ b/doc/tutorials/viz/launching_viz/launching_viz.rst @@ -18,7 +18,7 @@ In this tutorial you will learn how to Code ==== -You can download the code from `here <../../../../samples/cpp/tutorial_code/viz/launching_viz.cpp>`_. +You can download the code from :download:`here <../../../../samples/cpp/tutorial_code/viz/launching_viz.cpp>`. .. code-block:: cpp diff --git a/doc/tutorials/viz/table_of_content_viz/images/facedetect.jpg b/doc/tutorials/viz/table_of_content_viz/images/facedetect.jpg new file mode 100644 index 0000000000..788b7d8262 Binary files /dev/null and b/doc/tutorials/viz/table_of_content_viz/images/facedetect.jpg differ diff --git a/doc/tutorials/viz/table_of_content_viz/images/image_effects.png b/doc/tutorials/viz/table_of_content_viz/images/image_effects.png new file mode 100755 index 0000000000..1a675ce74f Binary files /dev/null and b/doc/tutorials/viz/table_of_content_viz/images/image_effects.png differ diff --git a/doc/tutorials/viz/table_of_content_viz/images/intro.png b/doc/tutorials/viz/table_of_content_viz/images/intro.png new file mode 100644 index 0000000000..4f54cfb916 Binary files /dev/null and b/doc/tutorials/viz/table_of_content_viz/images/intro.png differ diff --git a/doc/tutorials/viz/table_of_content_viz/table_of_content_viz.rst b/doc/tutorials/viz/table_of_content_viz/table_of_content_viz.rst new file mode 100644 index 0000000000..c3d08fe17b --- /dev/null +++ b/doc/tutorials/viz/table_of_content_viz/table_of_content_viz.rst @@ -0,0 +1,94 @@ +.. _Table-Of-Content-Viz: + +**OpenCV Viz** +----------------------------------------------------------- + +.. include:: ../../definitions/tocDefinitions.rst + ++ + .. tabularcolumns:: m{100pt} m{300pt} + .. cssclass:: toctableopencv + + ================== =============================================================================== + |VizLaunchingViz| **Title:** :ref:`launching_viz` + + *Compatibility:* > OpenCV 3.0.0 + + *Author:* Ozan Tonkal + + You will learn how to launch a viz window. + + ================== =============================================================================== + + .. |VizLaunchingViz| image:: ../launching_viz/images/window_demo.png + :height: 120pt + :width: 90pt + ++ + .. tabularcolumns:: m{100pt} m{300pt} + .. cssclass:: toctableopencv + + ================ ============================================================================ + |WidgetPose| **Title:** :ref:`widget_pose` + + *Compatibility:* > OpenCV 3.0.0 + + *Author:* Ozan Tonkal + + You will learn how to change pose of a widget. + + ================ ============================================================================ + + .. |WidgetPose| image:: ../widget_pose/images/widgetpose.png + :height: 90pt + :width: 90pt + ++ + .. tabularcolumns:: m{100pt} m{300pt} + .. cssclass:: toctableopencv + + ================== ============================================================================ + |Transformations| **Title:** :ref:`transformations` + + *Compatibility:* > OpenCV 3.0.0 + + *Author:* Ozan Tonkal + + You will learn how to transform between global and camera frames. + + ================== ============================================================================ + + .. |Transformations| image:: ../transformations/images/global_view_point.png + :height: 120pt + :width: 90pt + ++ + .. tabularcolumns:: m{100pt} m{300pt} + .. cssclass:: toctableopencv + + ================== ============================================================================ + |CreatingWidgets| **Title:** :ref:`creating_widgets` + + *Compatibility:* > OpenCV 3.0.0 + + *Author:* Ozan Tonkal + + You will learn how to create your own widgets. + + ================== ============================================================================ + + .. |CreatingWidgets| image:: ../creating_widgets/images/red_triangle.png + :height: 120pt + :width: 90pt + +.. raw:: latex + + \pagebreak + +.. toctree:: + :hidden: + + ../launching_viz/launching_viz + ../widget_pose/widget_pose + ../transformations/transformations + ../creating_widgets/creating_widgets diff --git a/doc/tutorials/viz/images/camera_view_point.png b/doc/tutorials/viz/transformations/images/camera_view_point.png similarity index 100% rename from doc/tutorials/viz/images/camera_view_point.png rename to doc/tutorials/viz/transformations/images/camera_view_point.png diff --git a/doc/tutorials/viz/images/global_view_point.png b/doc/tutorials/viz/transformations/images/global_view_point.png similarity index 100% rename from doc/tutorials/viz/images/global_view_point.png rename to doc/tutorials/viz/transformations/images/global_view_point.png diff --git a/doc/tutorials/viz/transformations.rst b/doc/tutorials/viz/transformations/transformations.rst similarity index 98% rename from doc/tutorials/viz/transformations.rst rename to doc/tutorials/viz/transformations/transformations.rst index 0bcc7db609..fd7cafe715 100644 --- a/doc/tutorials/viz/transformations.rst +++ b/doc/tutorials/viz/transformations/transformations.rst @@ -17,7 +17,7 @@ In this tutorial you will learn how to Code ==== -You can download the code from `here <../../../../samples/cpp/tutorial_code/viz/transformations.cpp>`_. +You can download the code from :download:`here <../../../../samples/cpp/tutorial_code/viz/transformations.cpp>`. .. code-block:: cpp diff --git a/doc/tutorials/viz/widget_pose/images/widgetpose.png b/doc/tutorials/viz/widget_pose/images/widgetpose.png new file mode 100644 index 0000000000..ef8a5937f9 Binary files /dev/null and b/doc/tutorials/viz/widget_pose/images/widgetpose.png differ diff --git a/doc/tutorials/viz/widget_pose.rst b/doc/tutorials/viz/widget_pose/widget_pose.rst similarity index 97% rename from doc/tutorials/viz/widget_pose.rst rename to doc/tutorials/viz/widget_pose/widget_pose.rst index a0cb00f5fb..18df97033c 100644 --- a/doc/tutorials/viz/widget_pose.rst +++ b/doc/tutorials/viz/widget_pose/widget_pose.rst @@ -17,7 +17,7 @@ In this tutorial you will learn how to Code ==== -You can download the code from `here <../../../../samples/cpp/tutorial_code/viz/widget_pose.cpp>`_. +You can download the code from :download:`here <../../../../samples/cpp/tutorial_code/viz/widget_pose.cpp>`. .. code-block:: cpp diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt index d5302fc86a..ad7ca7f8b7 100644 --- a/samples/cpp/CMakeLists.txt +++ b/samples/cpp/CMakeLists.txt @@ -28,9 +28,6 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) if(HAVE_opencv_gpufilters) ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/gpufilters/include") endif() - if(HAVE_opencv_viz) - ocv_include_directories("${OpenCV_SOURCE_DIR}/modules/viz/include") - endif() if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") @@ -58,10 +55,6 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) if("${srcs}" MATCHES "gpu/") target_link_libraries(${the_target} opencv_gpuarithm opencv_gpufilters) endif() - - if(HAVE_opencv_viz) - target_link_libraries(${the_target} opencv_viz) - endif() set_target_properties(${the_target} PROPERTIES OUTPUT_NAME "cpp-${sample_kind}-${name}" @@ -90,9 +83,7 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND) ocv_list_filterout(cpp_samples "/gpu/") endif() - if(NOT HAVE_opencv_viz) - ocv_list_filterout(cpp_samples "viz") - endif() + ocv_list_filterout(cpp_samples "viz") foreach(sample_filename ${cpp_samples}) get_filename_component(sample ${sample_filename} NAME_WE)