diff --git a/doc/V1/~$35_Projet_Camera_-Rapport-v1.docx b/doc/V1/~$35_Projet_Camera_-Rapport-v1.docx new file mode 100644 index 000000000..8f3b6d454 Binary files /dev/null and b/doc/V1/~$35_Projet_Camera_-Rapport-v1.docx differ diff --git a/doc/V2/Rapport/2135_AnalysPicture_Report.pdf b/doc/V2/Rapport/2135_AnalysPicture_Report.pdf new file mode 100644 index 000000000..d5d1733b7 Binary files /dev/null and b/doc/V2/Rapport/2135_AnalysPicture_Report.pdf differ diff --git a/doc/V2/Rapport/main.tex b/doc/V2/Rapport/2135_AnalysPicture_Report.tex similarity index 72% rename from doc/V2/Rapport/main.tex rename to doc/V2/Rapport/2135_AnalysPicture_Report.tex index 9bc3de4b9..0f897c1c3 100644 --- a/doc/V2/Rapport/main.tex +++ b/doc/V2/Rapport/2135_AnalysPicture_Report.tex @@ -34,27 +34,6 @@ \newdateformat{monthyeardate}{% \monthname[\THEMONTH], \THEYEAR} -\pgfpagesdeclarelayout{boxed} -{ - \edef\pgfpageoptionborder{0pt} -} -{ - \pgfpagesphysicalpageoptions - {% - logical pages=1,% - } - \pgfpageslogicalpageoptions{1} - { - border code=\pgfsetlinewidth{1pt}\pgfstroke,% - border shrink=\pgfpageoptionborder,% - resized width=.98\pgfphysicalwidth,% - resized height=.98\pgfphysicalheight,% - center=\pgfpoint{.5\pgfphysicalwidth}{.5\pgfphysicalheight}% - }% -} -\pgfpagesuselayout{boxed} -\setlength{\columnsep}{0.5cm} - % \renewcommand\thesubsection{\Alph{subsection}} \begin{document} @@ -62,7 +41,6 @@ \lhead{PROJET 2135} \chead {\today} \rhead{Analyseur d'images} -\fontsize{14}{14}\selectfont % ------------------------- TITLE PAGE INSERTION ------------------------ \input{Pages/titlepage} @@ -87,7 +65,7 @@ \newpage \nocite{*} -\bibliography{Biblio-Proj} -\bibliographystyle{ieeetr} +%\bibliography{Biblio-Proj} +%\bibliographystyle{ieeetr} \end{document} diff --git a/doc/V2/Rapport/Pages/Initial.tex b/doc/V2/Rapport/Pages/Initial.tex index 350ce9140..43615264d 100644 --- a/doc/V2/Rapport/Pages/Initial.tex +++ b/doc/V2/Rapport/Pages/Initial.tex @@ -1,38 +1,38 @@ % ------------------------- MAIN TASK --------------------------------- -\section{Développement du PCB} +\section{Reprise du projet} -\subsection{Footprints} \label{ssec:Footprints} -{} -\clearpage +\subsection{État initial du projet} + +\subsection{Méthode et objectifs de la reprise} -\subsection{Bill of materials} \label{ssec:BOM} -{} -\clearpage -\subsection{Mécanique du projet} \label{ssec:mechProjet} -{} +%--- \clearpage +\section{Programmation Python} -\subsection{Restrictions mécaniques} \label{ssec:RestrictionMech} -{} -\clearpage +\subsection{Test implémentation OpenCV} -\subsection{Planification PCB} \label{ssec:planifPCB} -{} -\clearpage +\subsection{Reconnaissance de formes - dataset} -\subsection{Placement des composants} \label{ssec:placementComp} -{} -\clearpage + \subsubsection{Base de donnée} -\subsection{Routage} \label{ssec:routage} -{} -\clearpage + \subsubsection{Explication du code} + + \subsubsection{Essais et étalonnage} + +%--- +\clearpage +\subsection{Reconnaissance de formes - image réelles} + + \subsubsection{Images utilisées} + + \subsubsection{Explication du code} + + \subsubsection{Essais et étalonnage} + +\subsection{Création de l'interface} -\subsection{Points d'améliorations} \label{ssec:pointAmel} -{} +%--- \clearpage +\section{Conclusion} -\subsection{Conclusion du projet} \label{ssec:conclusionG} -{} -\clearpage \ No newline at end of file diff --git a/doc/V2/Rapport/Pages/titlepage.tex b/doc/V2/Rapport/Pages/titlepage.tex index 8283d0141..e010956db 100644 --- a/doc/V2/Rapport/Pages/titlepage.tex +++ b/doc/V2/Rapport/Pages/titlepage.tex @@ -2,7 +2,7 @@ \begin{center} \vspace*{1cm} \LARGE - {\Huge \textbf{Localisation sous-marine}} + {\Huge \textbf{2135 Analyse Picture}} \vspace{0.3cm} Processing d'images avec OpenCV pour implémentation sur Raspberry PI. diff --git a/doc/V2/Rapport/main.pdf b/doc/V2/Rapport/main.pdf deleted file mode 100644 index b89a498a2..000000000 Binary files a/doc/V2/Rapport/main.pdf and /dev/null differ diff --git a/soft/V2/Python/2-ShapeDetection-Dataset/ShapesBatchN1.png b/soft/V2/Python/2-ShapeDetection-Dataset/ShapesBatchN1.png index 358ea0d56..2666ec52a 100644 Binary files a/soft/V2/Python/2-ShapeDetection-Dataset/ShapesBatchN1.png and b/soft/V2/Python/2-ShapeDetection-Dataset/ShapesBatchN1.png differ diff --git a/soft/V2/Python/2-ShapeDetection-Dataset/ShapesBatchN2.png b/soft/V2/Python/2-ShapeDetection-Dataset/ShapesBatchN2.png index 9f4af9c02..8ba348e78 100644 Binary files a/soft/V2/Python/2-ShapeDetection-Dataset/ShapesBatchN2.png and b/soft/V2/Python/2-ShapeDetection-Dataset/ShapesBatchN2.png differ