diff --git a/.gitignore b/.gitignore index ebbd047..b1e713d 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ *.snm *.synctex.gz *.toc +*.dvi diff --git a/carte-Europe.pdf b/carte-Europe.pdf new file mode 100644 index 0000000..89ca67e Binary files /dev/null and b/carte-Europe.pdf differ diff --git a/présentation.pdf b/présentation.pdf index 07da43d..5db7eb4 100644 Binary files a/présentation.pdf and b/présentation.pdf differ diff --git a/présentation.tex b/présentation.tex index a7a95b6..ac51ecc 100644 --- a/présentation.tex +++ b/présentation.tex @@ -186,7 +186,18 @@ Il s'agit d'un logiciel libre permettant de distribuer un service S3 sur diverse \subsection{Comment ça marche ?} \begin{frame} -\todo{Grosse partie ici où j'explique comment ça marche en pratique} +\begin{columns} +\column{0.5 \linewidth} +\input{schéma europe} +\column{0.5 \linewidth} +\begin{center} +Chaque objet est dupliqué sur plusieurs zones différentes.\linebreak + +\onslide<13->{Si une zone devient indisponible, les autres continuent d'assurer le service.}\linebreak + +\onslide<13->{Cette redondance allège grandement la charge qui repose sur les administrateurs face aux incidents ou tracas du quotidien.}\linebreak +\end{center} +\end{columns} \end{frame} \subsection{Financement} diff --git a/schéma europe.tex b/schéma europe.tex new file mode 100644 index 0000000..1d14d75 --- /dev/null +++ b/schéma europe.tex @@ -0,0 +1,49 @@ +\begin{tikzpicture} +\node (carte) {\includegraphics[width=\textwidth]{carte-Europe.pdf}}; + +% \personnage{position X}{position Y}{facteur d'échelle} +\newcommand{\personnage}[4] +{ +\fill[#4] ({#1-(0.4 * #3)},{#2-(0.9 * #3)}) .. controls ({#1-(0.4 * #3)},#2) and ({#1+(0.4 * #3)},#2) .. ({#1+(0.4 * #3)},{#2-(0.9 * #3)}) -- ({#1-(0.4 * #3)},{#2-(0.9 * #3)}); +\fill[#4] (#1,#2) circle ({0.25 * #3}); +} + +\onslide<1-12>{\personnage{-2.25}{-0.75}{0.75}{green}} +\onslide<1-12>{\draw (-1.9,-1.6) rectangle ++(1,1.2);} +\onslide<2-12>{\draw[fill=green] (-1.8,-1.525) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 1};} +\onslide<7-12>{\draw[fill=red] (-1.8,-1.15) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 3};} +\onslide<10-12>{\draw[fill=blue] (-1.8,-0.775) rectangle ++(0.35,0.3) node[pos=0.5, white] {\tiny 5};} +\onslide<5-12>{\draw[fill=blue] (-1.35,-1.525) rectangle ++(0.35,0.3) node[pos=0.5, white] {\tiny 2};} +\onslide<9-12>{\draw[fill=yellow] (-1.35,-1.15) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 4};} +\onslide<11-12>{\draw[fill=red] (-1.35,-0.775) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 6};} + +\personnage{1.65}{1.5}{0.75}{blue} +\draw (0.3,0.7) rectangle ++(1,1.2); +\onslide<3->{\draw[fill=green] (0.4,0.775) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 1};} +\onslide<7->{\draw[fill=red] (0.4,1.15) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 3};} +\onslide<11->{\draw[fill=red] (0.4,1.525) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 6};} +\onslide<4->{\draw[fill=blue] (0.85,0.775) rectangle ++(0.35,0.3) node[pos=0.5, white] {\tiny 2};} +\onslide<10->{\draw[fill=blue] (0.85,1.15) rectangle ++(0.35,0.3) node[pos=0.5, white] {\tiny 5};} +\onslide<12->{\draw[fill=green] (0.85,1.525) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 7};} + +\personnage{1.85}{-2.3}{0.75}{red} +\draw (0.5,-3.15) rectangle ++(1,1.2); +\onslide<3->{\draw[fill=green] (0.6,-3.075) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 1};} +\onslide<6->{\draw[fill=red] (0.6,-2.7) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 3};} +\onslide<11->{\draw[fill=red] (0.6,-2.325) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 6};} +\onslide<5->{\draw[fill=blue] (1.05,-3.075) rectangle ++(0.35,0.3) node[pos=0.5, white] {\tiny 2};} +\onslide<9->{\draw[fill=yellow] (1.05,-2.7) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 4};} +\onslide<12->{\draw[fill=green] (1.05,-2.325) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 7};} + +\onslide<8->{\personnage{1.05}{-0.15}{0.75}{yellow}} +\onslide<8->{\draw (-0.35,-1) rectangle ++(1,1.2);} +\onslide<9->{\draw[fill=yellow] (-0.25,-0.925) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 4};} +\onslide<12->{\draw[fill=green] (-0.25,-0.55) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 7};} +%\draw (-0.25,-0.175) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 1}; +\onslide<10->{\draw[fill=blue] (0.2,-0.925) rectangle ++(0.35,0.3) node[pos=0.5, white] {\tiny 5};} +%\onslide<12->{\draw[fill=green] (0.2,-0.55) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 7};} +%\draw (0.2,-0.175) rectangle ++(0.35,0.3) node[pos=0.5] {\tiny 1}; + +\onslide<13->{\draw[line width=0.25cm] (-2.15,-0.5) -- ++(1,-1);} +\onslide<13->{\draw[line width=0.25cm] (-2.15,-1.5) -- ++(1,1);} +\end{tikzpicture} \ No newline at end of file