diff --git a/Documentation/SoftwareGuide/Latex/CMakeLists.txt b/Documentation/SoftwareGuide/Latex/CMakeLists.txt index 099e91e0b24d7c7f57b5c4cd5b9c8f26d6b107a7..cbc41cbc0094855a8a1b83e30af8ec3431e00536 100644 --- a/Documentation/SoftwareGuide/Latex/CMakeLists.txt +++ b/Documentation/SoftwareGuide/Latex/CMakeLists.txt @@ -137,7 +137,6 @@ SET( Tex_SRCS FeatureExtraction.tex ObjectBasedImageAnalysis.tex Hyperspectral.tex - ReleaseNotes.tex Wrapping.tex ) diff --git a/Documentation/SoftwareGuide/Latex/Installation.tex b/Documentation/SoftwareGuide/Latex/Installation.tex index e6ab1534d296b6158b0a4627fc4edecfd363992f..5b42bde45442ae35fb66640ed19a1ae07a168283 100644 --- a/Documentation/SoftwareGuide/Latex/Installation.tex +++ b/Documentation/SoftwareGuide/Latex/Installation.tex @@ -126,7 +126,7 @@ See table \ref{tab:otb-dependencies} for the full list of dependencies. \hline \textbf{OPENGL} & \url{https://www.opengl.org/} & no & - \\ \hline -\textbf{Qt} & \url{http://qt-project.org} & no & 4 \\ +\textbf{Qt} & \url{https://www.qt.io/developers/} & no & 5 \\ \hline \textbf{QWT} & \url{http://qwt.sourceforge.net} & no & 6 \\ \hline @@ -170,8 +170,7 @@ $ mkdir install The OTB project uses a git branching model where \texttt{develop} is the current development version. It contains the latest patches and represents the work in progress towards the next release. -For more information on OTB and git, including how to decide which branch to want to compile, please see the -OTB wiki page at \url{http://wiki.orfeo-toolbox.org/index.php/Git}. +For more information regarding the use of Git in the project please have a look at : \url{http://wiki.orfeo-toolbox.org/index.php/Git}. See the contributing.md (\url{https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/blob/develop/CONTRIBUTING.md}) to have more inforamtion on how to contribute to OTB. Checkout the relevant branch now: \begin{verbatim} @@ -294,16 +293,16 @@ want to build) : \url{https://www.orfeo-toolbox.org/packages} \end{center} -Qt library: Unlike other dependencies building Qt4 on all platform is not trivial task but +Qt library: Unlike other dependencies building Qt5 on all platform is not trivial task but OTB SuperBuild makes best effort to make it easier for you. So there is still some additional package installation, one has to do as a pre-requistie for SuperBuild On a GNU/Linux you must have Qt X11 dependencies installed. -See Qt 4.8 documentation for list of packages that needs to be installed -before starting superbuild. http://doc.qt.io/qt-4.8/requirements-x11.html -For a debian 8.1 systeme, I installed all Qt4 dependencies with below 'apt-get install' +See Qt 5 documentation for list of packages that needs to be installed +before starting superbuild. https://doc.qt.io/qt-5/linux-requirements.html. +For a Debian 8.1 system, I installed all Qt5 dependencies with below 'apt-get install' \texttt{apt-get install libx11-dev libxext-dev libxt-dev libxi-dev libxrandr-dev libgl-dev libglu-dev} -You can also deactivate QT4 and skip this by passing \texttt{-DOTB\_USE\_QT4=OFF} to cmake. +You can also deactivate QT5 and skip this by passing \texttt{-DOTB\_USE\_QT=OFF} to cmake. This will give you OTB install without monteverdi, mapla and gui application launchers. For Mac OSX you need to install XCode and Windows 7,8.1,10 requires MSVC 2015 or higher. @@ -410,7 +409,7 @@ $ make install \hline \textbf{OTB\_USE\_LIBKML} & OTBlibkml & OTBKMZWriter OTBIOKML OTBAppKMZ \\ \hline -\textbf{OTB\_USE\_QT4} & OTBQt4 & OTBQtWidget \\ +\textbf{OTB\_USE\_QT} & OTBQt & OTBQtWidget \\ \hline \textbf{OTB\_USE\_QWT} & OTBQwt & OTBMonteverdiGUI OTBMonteverdi \\ \hline diff --git a/Documentation/SoftwareGuide/Latex/ReleaseNotes.tex b/Documentation/SoftwareGuide/Latex/ReleaseNotes.tex deleted file mode 100644 index ab97f045e27723cf6dcdd8436c2915b2e1b29fb4..0000000000000000000000000000000000000000 --- a/Documentation/SoftwareGuide/Latex/ReleaseNotes.tex +++ /dev/null @@ -1 +0,0 @@ -\verbatiminput{RELEASE_NOTES.txt} diff --git a/Documentation/SoftwareGuide/Latex/SoftwareGuide.tex b/Documentation/SoftwareGuide/Latex/SoftwareGuide.tex index 8cf39aa7a0f2cfff48375656602a0a2404cf053c..934497e2b81d3e53522ebf7bea2ed094ecb194d0 100644 --- a/Documentation/SoftwareGuide/Latex/SoftwareGuide.tex +++ b/Documentation/SoftwareGuide/Latex/SoftwareGuide.tex @@ -264,10 +264,6 @@ colorlinks,linkcolor={blue},citecolor={blue},urlcolor={blue}, \part{Appendix}\label{part:appendix} -\chapter{Release Notes} -\label{sec:ReleaseNotes} -\input{ReleaseNotes.tex} - %Comment generation of wrapping documentation for release 3.2 \chapter{Wrappings to other languages} \label{chap:wrappings} diff --git a/Examples/Application/ApplicationExample.cxx b/Examples/Application/ApplicationExample.cxx index 420adc0c1761720db85ab40aa6fd455f3cb133e1..9ab5550cbda09e3d972ecf03c34cfe7cf96e6efd 100644 --- a/Examples/Application/ApplicationExample.cxx +++ b/Examples/Application/ApplicationExample.cxx @@ -144,7 +144,7 @@ private: // Software Guide : BeginLatex // Application parameters declaration is done using \code{AddParameter()} method. // \code{AddParameter()} requires the input parameter type - // (ParameterType_InputImage, ParameterType_Int, ParameterType_Float), its name and description. + // (ParameterType\_InputImage, ParameterType\_Int, ParameterType\_Float), its name and description. // \subdoxygen{otb}{Wrapper}{Application} class contains methods to set parameters characteristics. // Software Guide : EndLatex