include viz tutorials in the main tutorials file. ignore viz samples

pull/1453/head
Ozan Tonkal 11 years ago
parent a117400577
commit 223fb39d94
  1. BIN
      doc/tutorials/images/viz.jpg
  2. 16
      doc/tutorials/tutorials.rst
  3. 2
      doc/tutorials/viz/creating_widgets/creating_widgets.rst
  4. 0
      doc/tutorials/viz/creating_widgets/images/red_triangle.png
  5. 0
      doc/tutorials/viz/launching_viz/images/window_demo.png
  6. 2
      doc/tutorials/viz/launching_viz/launching_viz.rst
  7. BIN
      doc/tutorials/viz/table_of_content_viz/images/facedetect.jpg
  8. BIN
      doc/tutorials/viz/table_of_content_viz/images/image_effects.png
  9. BIN
      doc/tutorials/viz/table_of_content_viz/images/intro.png
  10. 94
      doc/tutorials/viz/table_of_content_viz/table_of_content_viz.rst
  11. 0
      doc/tutorials/viz/transformations/images/camera_view_point.png
  12. 0
      doc/tutorials/viz/transformations/images/global_view_point.png
  13. 2
      doc/tutorials/viz/transformations/transformations.rst
  14. BIN
      doc/tutorials/viz/widget_pose/images/widgetpose.png
  15. 2
      doc/tutorials/viz/widget_pose/widget_pose.rst
  16. 11
      samples/cpp/CMakeLists.txt

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

@ -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

@ -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

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.3 KiB

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.5 KiB

@ -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

@ -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

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

@ -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

@ -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)

Loading…
Cancel
Save