diff --git a/doc/mainDocument/img/SoftwareArch.jpg b/doc/mainDocument/img/SoftwareArch.jpg new file mode 100644 index 0000000000000000000000000000000000000000..13d21576a20ac2b261382cb8017068ee6d9bb7e6 Binary files /dev/null and b/doc/mainDocument/img/SoftwareArch.jpg differ diff --git a/doc/mainDocument/mainDocument.tex b/doc/mainDocument/mainDocument.tex index 3b8fbf99c7f9f4bf3d900b2e19e13dd8da3a9ff8..66b8974bacdd212bbfd5dc95cc076b90f187548b 100644 --- a/doc/mainDocument/mainDocument.tex +++ b/doc/mainDocument/mainDocument.tex @@ -16,6 +16,7 @@ \usepackage{verbatim} % makes multiline comments possible via \begin{comment}\end{comment} \usepackage{ifthen, tikz, xstring, calc, pgfopts} % required for tikz-uml \usepackage{../tikz-uml} + \usepackage{geometry} %\geometry{scale = 0.5} %for class diagram??? diff --git a/doc/mainDocument/sections/02_organisation.tex b/doc/mainDocument/sections/02_organisation.tex index 1ebf0f516debdcdf1ce31a8e33dc67d3ab5ef74a..941e0b1e11fa06cc4b25a479aaf50d9a0d6609f9 100644 --- a/doc/mainDocument/sections/02_organisation.tex +++ b/doc/mainDocument/sections/02_organisation.tex @@ -99,4 +99,20 @@ Assystem \subsection{Aufbau des Dokuments} % V Bild von Franz +%\begin{comment} +\begin{tikzpicture} + \node[draw,circle,fill=gray,text=white,label=right:{3. Ausbaustufen und Abnahmetests}] (AS) at (0,0) {}; + \node[draw,circle,fill=gray,text=white,label=right:{4. Use Cases}] (UC) at (1,-2) {}; + \node[draw,circle,fill=gray,text=white,label={[align=left, left]5. Architektur und\\Integrationstests}] (Architektur) at (2,-4) {}; + \node[draw,circle,fill=gray,text=white,label=right:{6. Modulspezifikation}] (ModSpez) at (4,-8) {}; + \node[draw,circle,fill=gray,text=white,label=right:{7. Testauswertung, Integration}] (Test) at (6,-4) {}; + \node[draw,circle,fill=gray,text=white,label=right:{8. Auswertung}] (Auswertung) at (8,0) {}; + + \draw[->,draw=blue] (AS) to (UC); + \draw[->,draw=blue] (UC) to (Architektur); + \draw[->,draw=blue] (Architektur) to (ModSpez); + \draw[->,draw=blue] (ModSpez) to (Test); + \draw[->,draw=blue] (Test) to (Auswertung); + \end{tikzpicture} +%\end{comment} \end{document} \ No newline at end of file diff --git a/doc/mainDocument/sections/05_architektur.tex b/doc/mainDocument/sections/05_architektur.tex index fe71b9822cb1a55504ca1745968e256b04c1691e..8a51ec6e2d87fb1d74c19073860a8ef659c76aad 100644 --- a/doc/mainDocument/sections/05_architektur.tex +++ b/doc/mainDocument/sections/05_architektur.tex @@ -68,7 +68,7 @@ } { - calc\_$v_P$($v_R$) : Integer\\ - %- getEnvoirment() : (Integer, Integer)\\ + %- getEnvironment() : (Integer, Integer)\\ %- getMavLink() : (Integer, Integer)\\ %- getCurseControl : Integer } (EgoMotion) @@ -96,10 +96,10 @@ - send\_PHM() : ? } \umlclass[scale = 0.5, xshift = -9cm, yshift = -20cm] - {Envoirment} + {Environment} { - USS-Data : Integer\\ - + $d_O$ : Interger\\ + + $d_O$ : Integer\\ + $v_R$ : Integer\\ + PlatoonPrevID : ? } @@ -159,7 +159,7 @@ } %arrows - \umlinherit [geometry=-| ,anchors= 0 and 250] {Camera}{Envoirment} + \umlinherit [geometry=-| ,anchors= 0 and 250] {Camera}{Environment} \umlinherit [geometry=|- ,anchors= 90 and 180] {Camera}{Lane-Keeping} \umlinherit [geometry=|- ,anchors= 90 and 25] {Cruise-Control}{MAV-Link} \umlinherit [geometry=|- ,anchors= 217 and 50] {Cruise-Control}{Egomotion} @@ -167,7 +167,7 @@ \umlinherit [geometry=|- ,anchors= -35 and 152] {Egomotion}{PlatoonController} \umlinherit [geometry=-| ,anchors= 115 and 300] {Egomotion}{Lane-Keeping} \umlinherit [geometry=-|] {Egomotion}{Logging} - \umlinherit [geometry=|-|,anchors=90 and 245] {Envoirment}{Egomotion} + \umlinherit [geometry=|-|,anchors=90 and 245] {Environment}{Egomotion} \umlinherit [geometry=--] {Lane-Keeping}{MAV-Link} \umlinherit [geometry=-| ,anchors= 300 and 115] {Lane-Keeping}{Egomotion} \umlinherit [geometry=|- ,anchors= -55 and 222] {Logging}{Network} @@ -177,9 +177,13 @@ \umlinherit [geometry=|- ,anchors= 240 and 25] {PlatoonController}{Logging} \umlinherit [geometry=-|, anchors= 300 and 85] {PlatoonController}{Network} \umlinherit [geometry=-|, anchors= 85 and 300] {Network}{PlatoonController} - \umlinherit [geometry=-| ,anchors= 0 and 290] {Ultrasonic}{Envoirment} + \umlinherit [geometry=-| ,anchors= 0 and 290] {Ultrasonic}{Environment} \end{umlpackage} \end{umlpackage} \end{tikzpicture} +\subsection{Softwarearchitktur} +%tikz oder drawio +\includegraphics[width=\textwidth]{SoftwareArch} + \end{document} \ No newline at end of file