Merge

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}
 \usepackage{pdflscape}
 %\geometry{scale = 0.5} %for class diagram???

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. Zielvorstellungen/Ausbaustufen}] (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. Testplan}] (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

doc/mainDocument/sections/05_architektur.tex

@@ -85,7 +85,7 @@
 				}
 				{
 					- calc\_$v_P$($v_R$) : Integer\\
-					%- getEnvoirment() : (Integer, Integer)\\
+					%- getEnvironment() : (Integer, Integer)\\
 					%- getMavLink() : (Integer, Integer)\\
 					%- getCurseControl : Integer
 				} (EgoMotion)
@@ -113,10 +113,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 : ?
 				}
@@ -176,7 +176,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}
@@ -184,7 +184,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}
@@ -194,9 +194,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}
 
-\end{document}
+\subsection{Softwarearchitktur}
+%tikz oder drawio
+\includegraphics[width=\textwidth]{SoftwareArch}
+
+\end{document}
\ No newline at end of file