From ff4190a676f24a1bd189452c34ce6b368f866d9d Mon Sep 17 00:00:00 2001 From: Thibaut ROMAIN <thibaut.romain@cs-soprasteria.com> Date: Fri, 21 Feb 2025 14:31:07 +0100 Subject: [PATCH] DOC: fix a regression in generateWrappersRstDoc and update First steps with the one line install --- .../Scripts/otbGenerateWrappersRstDoc.py | 1 - .../Cookbook/rst/First_Step_Linux.rst | 23 +++++-------------- .../Cookbook/rst/First_Step_Windows.rst | 9 ++++---- 3 files changed, 11 insertions(+), 22 deletions(-) diff --git a/Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py b/Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py index 97558a9e08..7e40cde940 100755 --- a/Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py +++ b/Documentation/Cookbook/Scripts/otbGenerateWrappersRstDoc.py @@ -445,7 +445,6 @@ def GenerateRstForModules(rst_dir,otb_root): if os.path.isdir(os.path.join(otb_modules_dir, modname))] #Create the rst for each module moduleslist.remove("ThirdParty") - moduleslist.remove("Remote") moduleslist.sort() for mod in moduleslist: diff --git a/Documentation/Cookbook/rst/First_Step_Linux.rst b/Documentation/Cookbook/rst/First_Step_Linux.rst index f8b90a32d3..fe0ef8bb06 100644 --- a/Documentation/Cookbook/rst/First_Step_Linux.rst +++ b/Documentation/Cookbook/rst/First_Step_Linux.rst @@ -16,42 +16,31 @@ Debian / Ubuntu Simple OTB use case : Compute NDVI with the CLI interface ````````````````````````````````````````````````````````` -Download OTB -++++++++++++ +Download and install OTB +++++++++++++++++++++++++ .. code-block:: bash - curl https://www.orfeo-toolbox.org/packages/archives/OTB/OTB-10.0.0-Linux.tar.gz -o /Path/Download/OTB-10.0.tar.gz - - -Installation -++++++++++++ - -.. code-block:: bash - - # Install otb - cd /Path/Download - tar xvf OTB-10.0.tar.gz --one-top-level="/Path/To/Install/OTB" - source /Path/To/Install/OTB/otbenv.profile + bash -c "$(curl -fsSL https://orfeo-toolbox.org/packages/install-otb.sh) 9.1.0 $HOME/otb" Download an example image +++++++++++++++++++++++++ .. code-block:: bash - curl https://www.orfeo-toolbox.org/packages/examples/phr_xs.tif -o /Path/You/Want/phr_xs.tif + curl https://www.orfeo-toolbox.org/packages/examples/phr_xs.tif -o $HOME/Data/phr_xs.tif Compute NDVI using the CLI interface ++++++++++++++++++++++++++++++++++++ .. code-block:: bash - otbcli_BandMath –il /Path/You/Want/phr_xs.tif –out /Path/You/Want/ndvi.tif –exp “(im1b4-im1b1)/ (im1b4+im1b1)†+ otbcli_BandMath –il $HOME/Data/phr_xs.tif –out $HOME/Data/ndvi.tif –exp “(im1b4-im1b1)/ (im1b4+im1b1)†Use Python API to compute NDVI ++++++++++++++++++++++++++++++ -To use the Python API you have first to recompile the bindings for your version of Python. By default they are compiled for Python 3.10 +To use the Python API you have first to recompile the bindings for your version of Python if this version is different than 3.10. .. code-block:: bash diff --git a/Documentation/Cookbook/rst/First_Step_Windows.rst b/Documentation/Cookbook/rst/First_Step_Windows.rst index 9cee4514ea..4b6a3d08d7 100644 --- a/Documentation/Cookbook/rst/First_Step_Windows.rst +++ b/Documentation/Cookbook/rst/First_Step_Windows.rst @@ -1,13 +1,14 @@ Windows binary packages are available for Windows 10 64bits or higher. In order to run properly, you need to make sure you installed the required system dependencies +Important Note +`````````````` + +Monteverdi has been removed in OTB >= 9 version, you can use QGIS which is now the default viewer for launching OTB applications + Installation of required dependencies ````````````````````````````````````` - You must have "Visual C++ Redistributable for Visual Studio 2019" installed for using this package. It can be downloaded freely from `microsoft <https://aka.ms/vs/16/release/vc_redist.x64.exe>`_ -Important Note -`````````````` - -Monteverdi has been removed in OTB >= 9 version, you can use QGIS which is now the default viewer for OTB -- GitLab