diff --git a/rapport/img/cas-échec-2.png b/rapport/img/cas-échec-2.png new file mode 100644 index 0000000..d69cc27 Binary files /dev/null and b/rapport/img/cas-échec-2.png differ diff --git a/rapport/img/cas-échec.png b/rapport/img/cas-échec.png new file mode 100644 index 0000000..d0a52ad Binary files /dev/null and b/rapport/img/cas-échec.png differ diff --git a/rapport/img/paraview.png b/rapport/img/paraview.png new file mode 100644 index 0000000..286777f Binary files /dev/null and b/rapport/img/paraview.png differ diff --git a/rapport/img/vtk-unstructuredgrid-0.png b/rapport/img/vtk-unstructuredgrid-0.png new file mode 100644 index 0000000..bcc9667 Binary files /dev/null and b/rapport/img/vtk-unstructuredgrid-0.png differ diff --git a/rapport/img/vtk-unstructuredgrid-1.png b/rapport/img/vtk-unstructuredgrid-1.png new file mode 100644 index 0000000..8fba304 Binary files /dev/null and b/rapport/img/vtk-unstructuredgrid-1.png differ diff --git a/rapport/img/vtk-unstructuredgrid-2.png b/rapport/img/vtk-unstructuredgrid-2.png new file mode 100644 index 0000000..af41198 Binary files /dev/null and b/rapport/img/vtk-unstructuredgrid-2.png differ diff --git a/rapport/img/vtk-unstructuredgrid-3.png b/rapport/img/vtk-unstructuredgrid-3.png new file mode 100644 index 0000000..22fa654 Binary files /dev/null and b/rapport/img/vtk-unstructuredgrid-3.png differ diff --git a/rapport/img/vtk-unstructuredgrid.png b/rapport/img/vtk-unstructuredgrid.png new file mode 100644 index 0000000..4c99de7 Binary files /dev/null and b/rapport/img/vtk-unstructuredgrid.png differ diff --git a/rapport/slides.tex b/rapport/slides.tex index 7c083b4..73b926a 100644 --- a/rapport/slides.tex +++ b/rapport/slides.tex @@ -1,15 +1,24 @@ \documentclass{beamer} -\usetheme{JuanLesPins} - \usepackage[french]{babel} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} +\usetheme{JuanLesPins} +\beamertemplatenavigationsymbolsempty +\setbeamertemplate{footline}[frame number] + +\makeatletter +\newlength\graphwidth +\setlength\graphwidth{10.5cm} +\newlength\graphheight +\setlength\graphheight{7cm} +\makeatother + \title{Approximation et amélioration de la qualité des maillages tétrahédriques} \author{Jérémy André, Cyril Colin, Christine Cozzolino} \institute{Aix-Marseille Université} \date{\today} -\logo{\includegraphics[width=2.5cm]{img/logo-gig.png}} +\titlegraphic{\includegraphics[width=2.5cm]{img/logo-gig.png}} \begin{document} @@ -32,10 +41,10 @@ \begin{frame}{Maillages volumiques} \centering \begin{tabular}{cc} - \includegraphics[width=5cm]{img/cow-00.png} & - \includegraphics[width=5cm]{img/cow-03.png} \\ - \includegraphics[width=5cm]{img/cow-06.png} & - \includegraphics[width=5cm]{img/cow-09.png} \\ + \includegraphics[width=4.5cm]{img/cow-00.png} & + \includegraphics[width=4.5cm]{img/cow-03.png} \\ + \includegraphics[width=4.5cm]{img/cow-06.png} & + \includegraphics[width=4.5cm]{img/cow-09.png} \\ \end{tabular} \end{frame} @@ -47,8 +56,8 @@ \begin{frame}{Anisotropie} \centering \begin{tabular}{cc} - \includegraphics[width=5cm]{img/isotropique.png} & - \includegraphics[width=5cm]{img/anisotropique.png} + \includegraphics[width=4.5cm]{img/isotropique.png} & + \includegraphics[width=4.5cm]{img/anisotropique.png} \end{tabular} \end{frame} @@ -89,47 +98,112 @@ \begin{frame}{Chaîne de traitement} \centering - \includegraphics[height=7cm]{img/pipeline.png} + \includegraphics[height=\graphheight]{img/pipeline.png} \end{frame} -\begin{frame}{Pré-traitement} +\subsection{Pré-traitement} + +\begin{frame} \begin{itemize} \item Suppression des cellules externes \item Détection des points de surface \end{itemize} \end{frame} -\begin{frame}{Projection des points} +\begin{frame}{Point-dans-polygone} + \centering + \includegraphics[height=\graphheight]{img/point_in_polygon.png} \end{frame} -\begin{frame}{« Modification proportionelle »} - \includegraphics[width=9.3cm]{img/influence-rayon-0-3.png} +\begin{frame}{Suppression des cellules externes} + \centering + \includegraphics[width=\graphwidth]{img/remove_external.png} \end{frame} -\begin{frame}{« Modification proportionelle »} - \includegraphics[width=9.3cm]{img/influence-rayon-5-20.png} +\subsection{Projection des points} + +\begin{frame} + \centering + \includegraphics[width=\graphwidth]{img/project.png} \end{frame} -\begin{frame}{Relaxation} - \includegraphics[width=9.3cm]{img/influence-relaxation.png} +\subsection{« Modification proportionelle »} + +\begin{frame}{Sans} + \centering + \includegraphics[height=\graphheight]{img/project_clip_no_displace.png} +\end{frame} + +\begin{frame}{Avec} + \centering + \includegraphics[height=\graphheight]{img/project_clip_displace.png} +\end{frame} + +\begin{frame}{Rayon d'influence} + \centering + \includegraphics[width=\graphwidth]{img/influence-rayon-0-3.png} +\end{frame} + +\begin{frame}{Rayon d'influence} + \centering + \includegraphics[width=\graphwidth]{img/influence-rayon-5-20.png} +\end{frame} + +\subsection{Relaxation} + +\begin{frame} + \centering + \includegraphics[width=\graphwidth]{img/influence-relaxation.png} \end{frame} \section{Implémentation} -\begin{frame}{VTK} +\begin{frame} + \centering + Bibliothèque de Kitware sous license libre pour la manipulation de + données scientifiques 3D. \end{frame} +\begin{frame}{VTK} + \centering + \includegraphics[width=\graphwidth]{img/vtk-unstructuredgrid-0.png} +\end{frame} + +\begin{frame}{VTK} + \centering + \includegraphics[width=\graphwidth]{img/vtk-unstructuredgrid-1.png} +\end{frame} + +\begin{frame}{VTK} + \centering + \includegraphics[width=\graphwidth]{img/vtk-unstructuredgrid-2.png} +\end{frame} + +\begin{frame}{VTK} + \centering + \includegraphics[width=\graphwidth]{img/vtk-unstructuredgrid-3.png} +\end{frame} + + \begin{frame}{Paraview} + \centering + \includegraphics[width=\graphwidth]{img/paraview.png} \end{frame} \section{Résultats} -\begin{frame}{Histogrammes} +\subsection{Cas dégénéré} + +\begin{frame} + \centering + \includegraphics[width=\graphwidth]{img/cas-échec.png} \end{frame} -\begin{frame}{Cas dégénérés} +\begin{frame} + \centering + \includegraphics[width=\graphwidth]{img/cas-échec-2.png} \end{frame}