diff --git a/Courses/org/WorkshopGuide/workshopGuide-en.org b/Courses/org/WorkshopGuide/workshopGuide-en.org index 302a6bd69eafa3628d03f77b83dbff1f823de31e..2d6f80de4a63d171e3fbd46169f8e39835f46347 100644 --- a/Courses/org/WorkshopGuide/workshopGuide-en.org +++ b/Courses/org/WorkshopGuide/workshopGuide-en.org @@ -34,7 +34,7 @@ #+LATEX:\fancyhead[RE]{\bfseries\leftmark} #+LATEX:\fancyfoot[LE,RO]{\vspace{0pt}\includegraphics[height=20pt]{../../../Artwork/logoVectoriel.png}} #+LATEX:\fancyfoot[LO,RE]{\vspace{0pt}\includegraphics[height=20pt]{Images/logo_cnes.png}} -#+LATEX:\fancyfoot[C]{\vspace{2pt}\footnotesize{Orfeo ToolBox course}} +#+LATEX:\fancyfoot[C]{\vspace{2pt} \includegraphics[height=20pt]{Images/cc-by-sa.png}}} * Foreword :fw: diff --git a/Courses/org/WorkshopGuide/workshopGuide-fr.org b/Courses/org/WorkshopGuide/workshopGuide-fr.org index 828fed10ee87c3646e045cbf75cacefa713475c9..4b0bac36d4a439d9dcd2357077c7d22c9e2d9931 100644 --- a/Courses/org/WorkshopGuide/workshopGuide-fr.org +++ b/Courses/org/WorkshopGuide/workshopGuide-fr.org @@ -34,7 +34,7 @@ #+LATEX:\fancyhead[RE]{\bfseries\leftmark} #+LATEX:\fancyfoot[LE,RO]{\vspace{0pt}\includegraphics[height=20pt]{../../../Artwork/logoVectoriel.png}} #+LATEX:\fancyfoot[LO,RE]{\vspace{0pt}\includegraphics[height=20pt]{Images/logo_cnes.png}} -#+LATEX:\fancyfoot[C]{\vspace{2pt}\footnotesize{Formation Orfeo ToolBox}} +#+LATEX:\fancyfoot[C]{\vspace{2pt} \includegraphics[height=20pt]{Images/cc-by-sa.png}}} diff --git a/Courses/org/WorkshopGuide/workshopSlides-en.org b/Courses/org/WorkshopGuide/workshopSlides-en.org index eef3dbb3c25cf7053c01176f0d8850f3d4437424..d87c8c9bfda8763156144b102a85311c5c01326c 100644 --- a/Courses/org/WorkshopGuide/workshopSlides-en.org +++ b/Courses/org/WorkshopGuide/workshopSlides-en.org @@ -29,7 +29,7 @@ #+latex_header: \newcommand{\shorttitle}{OTB Training Slides} #+latex_header: \newcommand{\shortauthor}{} #+latex_header: \setbeamertemplate{footline}{\leavevmode\hbox{\begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,left]{author in head/foot} \usebeamerfont{author in headfoot}\insertshortinstitute~~\shortauthor \end{beamercolorbox} \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,center]{title in head/foot} \usebeamerfont{title in head/foot}\shorttitle \end{beamercolorbox} \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,right]{date in head/foot}\usebeamerfont{date in head/foot}\insertshortdate{} \hspace*{2em}\insertframenumber{} / \inserttotalframenumber\hspace*{2ex} \end{beamercolorbox}}\vskip0pt} -#+latex_header: \institute{ \includegraphics[width=0.6cm]{../../../Artwork/logoVectoriel.png} \hspace{0.1cm} \includegraphics[width=1.5cm]{Images/logo_cnes.png}} +#+latex_header: \institute{ \includegraphics[width=0.6cm]{../../../Artwork/logoVectoriel.png} \hspace{0.1cm} \includegraphics[height=12pt]{Images/cc-by-sa.png} \hspace{0.1cm} \includegraphics[width=1.5cm]{Images/logo_cnes.png}} #+latex_header: \usepackage{fourier} #+latex_header: \usepackage{amsfonts,bm,amsmath,amssymb,ifsym,marvosym,tabularx,array,ifsym} #+latex_header: \usepackage{tikz} diff --git a/Courses/org/WorkshopGuide/workshopSlides-fr.org b/Courses/org/WorkshopGuide/workshopSlides-fr.org index 0513bc1b0fc4cca10bcb93f9024dfd07a86a2665..164a9ebc4bf1c1ea3019f3d58d29ccf99682e60c 100644 --- a/Courses/org/WorkshopGuide/workshopSlides-fr.org +++ b/Courses/org/WorkshopGuide/workshopSlides-fr.org @@ -29,7 +29,7 @@ #+latex_header: \newcommand{\shorttitle}{Slides formation OTB} #+latex_header: \newcommand{\shortauthor}{} #+latex_header: \setbeamertemplate{footline}{\leavevmode\hbox{\begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,left]{author in head/foot} \usebeamerfont{author in headfoot}\insertshortinstitute~~\shortauthor \end{beamercolorbox} \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,center]{title in head/foot} \usebeamerfont{title in head/foot}\shorttitle \end{beamercolorbox} \begin{beamercolorbox}[wd=.333333\paperwidth,ht=2.25ex,dp=1ex,right]{date in head/foot}\usebeamerfont{date in head/foot}\insertshortdate{} \hspace*{2em}\insertframenumber{} / \inserttotalframenumber\hspace*{2ex} \end{beamercolorbox}}\vskip0pt} -#+latex_header: \institute{ \includegraphics[width=0.6cm]{../../../Artwork/logoVectoriel.png} \hspace{0.1cm} \includegraphics[width=1.5cm]{Images/logo_cnes.png}} +#+latex_header: \institute{ \includegraphics[height=0.3cm]{../../../Artwork/logoVectoriel.png} \hspace{0.1cm} \includegraphics[height=0.3cm]{Images/cc-by-sa.png} \hspace{0.1cm} \includegraphics[height=0.3cm]{Images/logo_cnes.png}} #+latex_header: \usepackage{fourier} #+latex_header: \usepackage{amsfonts,bm,amsmath,amssymb,ifsym,marvosym,tabularx,array,ifsym} #+latex_header: \usepackage{tikz} diff --git a/Courses/org/WorkshopGuide/workshopSolution-en.org b/Courses/org/WorkshopGuide/workshopSolution-en.org index d33e18cc315f0907cfdcd19ebfe102cf54e8db79..07f4d8c84f8e688ba8b7023ae5b7684bc0740e8a 100644 --- a/Courses/org/WorkshopGuide/workshopSolution-en.org +++ b/Courses/org/WorkshopGuide/workshopSolution-en.org @@ -33,10 +33,10 @@ #+LATEX:\fancyhead[RE]{\bfseries\leftmark} #+LATEX:\fancyfoot[LE,RO]{\vspace{0pt}\includegraphics[height=20pt]{../../../Artwork/logoVectoriel.png}} #+LATEX:\fancyfoot[LO,RE]{\vspace{0pt}\includegraphics[height=20pt]{Images/logo_cnes.png}} -#+LATEX:\fancyfoot[C]{\vspace{2pt}\footnotesize{Orfeo ToolBox Course - 2016}} +#+LATEX:\fancyfoot[C]{\vspace{2pt} \includegraphics[height=20pt]{Images/cc-by-sa.png}}} * Foreword :fw: - + ** Goal The goal of this training course is to give an overview of the OTB remote sensing @@ -114,6 +114,8 @@ Solutions in the guide mostly use the command line interface of OTB applications. However, it is possible to apply the same commands by using the parameter values in the GUI (Mapla or Monteverdi). +#+INCLUDE: "licence.org" + * Basics #+INCLUDE: "mvd-qgis-en.org" :minlevel 2 #+INCLUDE: "otb-apps-en.org" :minlevel 2 diff --git a/Courses/org/WorkshopGuide/workshopSolution-fr.org b/Courses/org/WorkshopGuide/workshopSolution-fr.org index 00d21cd13b2f1d19e703a55fa54a037973623b01..5044ea7574ec2bd1aed14e5dc6abf5e883acbff8 100644 --- a/Courses/org/WorkshopGuide/workshopSolution-fr.org +++ b/Courses/org/WorkshopGuide/workshopSolution-fr.org @@ -33,7 +33,7 @@ #+LATEX:\fancyhead[RE]{\bfseries\leftmark} #+LATEX:\fancyfoot[LE,RO]{\vspace{0pt}\includegraphics[height=20pt]{../../../Artwork/logoVectoriel.png}} #+LATEX:\fancyfoot[LO,RE]{\vspace{0pt}\includegraphics[height=20pt]{Images/logo_cnes.png}} -#+LATEX:\fancyfoot[C]{\vspace{2pt}\footnotesize{Formation Orfeo ToolBox - 2016}} +#+LATEX:\fancyfoot[C]{\vspace{2pt} \includegraphics[height=20pt]{Images/cc-by-sa.png}}} * Avant-propos :fw: ** Données @@ -61,6 +61,7 @@ La plupart des solutions proposées dans ce guide des solutions sont l'Orfeo ToolBox. Néanmoins, le lecteur pourra aisément reporter ces paramètres dans l'interface graphique si besoin. +#+INCLUDE: "licence.org" * Généralités #+INCLUDE: "mvd-qgis-fr.org" :minlevel 2 #+INCLUDE: "otb-apps-fr.org" :minlevel 2