diff --git a/android/service/doc/BaseLoaderCallback.rst b/android/service/doc/BaseLoaderCallback.rst index 0eac7573ef..b4ccf6fff6 100644 --- a/android/service/doc/BaseLoaderCallback.rst +++ b/android/service/doc/BaseLoaderCallback.rst @@ -7,5 +7,5 @@ Base Loader Callback Interface implementation Basic implementation of LoaderCallbackInterface. Implementation logic is described by diagram. -.. image:: img/AndroidAppUsageModel.dia.png +.. image:: img/AndroidAppUsageModel.png diff --git a/android/service/doc/Intro.rst b/android/service/doc/Intro.rst index 509fea76a8..452fc5be8a 100644 --- a/android/service/doc/Intro.rst +++ b/android/service/doc/Intro.rst @@ -17,7 +17,7 @@ OpenCV Manager is an Android service targeted to manage OpenCV library binaries Usage model for target user --------------------------- -.. image:: img/AndroidAppUsageModel.dia.png +.. image:: img/AndroidAppUsageModel.png First OpenCV app\: @@ -37,4 +37,4 @@ Next OpenCV app\: OpenCV Manager structure ------------------------ -.. image:: img/Structure.dia.png \ No newline at end of file +.. image:: img/Structure.png \ No newline at end of file diff --git a/android/service/doc/UseCases.rst b/android/service/doc/UseCases.rst index 819ab2499a..1d42c66d54 100644 --- a/android/service/doc/UseCases.rst +++ b/android/service/doc/UseCases.rst @@ -7,7 +7,7 @@ First application start There is no OpenCV Manager and OpenCV libraries. -.. image:: img/NoService.dia.png +.. image:: img/NoService.png Second application start ------------------------ @@ -15,15 +15,15 @@ Second application start There is OpenCV Manager service, but there is no OpenCV library. If OpenCV library installation approved\: -.. image:: img/LibInstallAproved.dia.png +.. image:: img/LibInstallAproved.png If OpenCV library installation canceled\: -.. image:: img/LibInstallCanceled.dia.png +.. image:: img/LibInstallCanceled.png Regular application start ------------------------- OpenCV Manager and OpenCV library has bee already installed. -.. image:: img/LibInstalled.dia.png \ No newline at end of file +.. image:: img/LibInstalled.png \ No newline at end of file diff --git a/android/service/doc/img/AndroidAppUsageModel.dia.png b/android/service/doc/img/AndroidAppUsageModel.png similarity index 100% rename from android/service/doc/img/AndroidAppUsageModel.dia.png rename to android/service/doc/img/AndroidAppUsageModel.png diff --git a/android/service/doc/img/LibInstallAproved.dia.png b/android/service/doc/img/LibInstallAproved.png similarity index 100% rename from android/service/doc/img/LibInstallAproved.dia.png rename to android/service/doc/img/LibInstallAproved.png diff --git a/android/service/doc/img/LibInstallCanceled.dia.png b/android/service/doc/img/LibInstallCanceled.png similarity index 100% rename from android/service/doc/img/LibInstallCanceled.dia.png rename to android/service/doc/img/LibInstallCanceled.png diff --git a/android/service/doc/img/LibInstalled.dia.png b/android/service/doc/img/LibInstalled.png similarity index 100% rename from android/service/doc/img/LibInstalled.dia.png rename to android/service/doc/img/LibInstalled.png diff --git a/android/service/doc/img/LibIntsallAproved.dia.png b/android/service/doc/img/LibIntsallAproved.png similarity index 100% rename from android/service/doc/img/LibIntsallAproved.dia.png rename to android/service/doc/img/LibIntsallAproved.png diff --git a/android/service/doc/img/LibIntsallCanceled.dia.png b/android/service/doc/img/LibIntsallCanceled.png similarity index 100% rename from android/service/doc/img/LibIntsallCanceled.dia.png rename to android/service/doc/img/LibIntsallCanceled.png diff --git a/android/service/doc/img/NoService.dia.png b/android/service/doc/img/NoService.png similarity index 100% rename from android/service/doc/img/NoService.dia.png rename to android/service/doc/img/NoService.png diff --git a/android/service/doc/img/Structure.dia.png b/android/service/doc/img/Structure.png similarity index 100% rename from android/service/doc/img/Structure.dia.png rename to android/service/doc/img/Structure.png diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index cf19934116..bb04fa907a 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -47,6 +47,11 @@ if(BUILD_DOCS AND HAVE_SPHINX) endif() endforeach() + file(GLOB_RECURSE _OPENCV_FILES_REF "${OpenCV_SOURCE_DIR}/android/service/doc/*.rst") + file(GLOB_RECURSE _OPENCV_FILES_REF_PICT "${OpenCV_SOURCE_DIR}/android/service/doc/*.png" "${OpenCV_SOURCE_DIR}/android/service/doc/*.jpg") + list(APPEND OPENCV_FILES_REF ${_OPENCV_FILES_REF}) + list(APPEND OPENCV_FILES_REF_PICT ${_OPENCV_FILES_REF_PICT}) + configure_file("${OpenCV_SOURCE_DIR}/modules/refman.rst.in" "${OpenCV_SOURCE_DIR}/modules/refman.rst" IMMEDIATE @ONLY) file(GLOB_RECURSE OPENCV_FILES_UG user_guide/*.rst) @@ -61,9 +66,11 @@ if(BUILD_DOCS AND HAVE_SPHINX) COMMAND ${SPHINX_BUILD} -b latex -c ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. . COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/pics ${CMAKE_CURRENT_BINARY_DIR}/doc/opencv1/pics COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/mymath.sty ${CMAKE_CURRENT_BINARY_DIR} - COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/patch_refman_latex.py" opencv2refman.tex + COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/patch_refman_latex.py" opencv2manager.tex COMMAND ${PDFLATEX_COMPILER} opencv2refman.tex COMMAND ${PDFLATEX_COMPILER} opencv2refman.tex + COMMAND ${PDFLATEX_COMPILER} opencv2manager.tex + COMMAND ${PDFLATEX_COMPILER} opencv2manager.tex COMMAND ${PDFLATEX_COMPILER} opencv_user.tex COMMAND ${PDFLATEX_COMPILER} opencv_user.tex COMMAND ${PDFLATEX_COMPILER} opencv_tutorials.tex diff --git a/doc/conf.py b/doc/conf.py index a633c24012..7abafa3596 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -234,6 +234,8 @@ latex_documents = [ u'', 'manual'), ('doc/tutorials/tutorials', 'opencv_tutorials.tex', u'The OpenCV Tutorials', u'', 'manual'), + ('android/refman', 'opencv2manager.tex', u'The OpenCV Manager Manual', + u'', 'manual'), ] preamble ="""