Commit f7b7b522 authored by Lukas Nagel's avatar Lukas Nagel
Browse files

add annotations to example graph

Fixes: #14
parent bc3762bd
Pipeline #141158 passed with stages
in 7 minutes and 46 seconds
......@@ -9,6 +9,7 @@ presentation=\
versionsgraphen=\
grafiken/example-graph.pdf \
grafiken/ex1-graph.pdf \
grafiken/ex1-graph-precommit.pdf \
grafiken/ex2-graph-precommit.pdf \
......
\documentclass{standalone}
\input{theme}
\input{versiongraph}
\tikzstyle{expl}=%
[ rectangle
, rounded corners=6pt
, draw=black!50!green
, dotted
, text=nontext!50!black
, font=\scriptsize\itshape
, fill=white!90!green
]
\tikzstyle{expledge}=%
[ draw=lightgreen!50!black
, dotted
]
\begin{document}
\begin{tikzpicture}[versionsgraph]
\commit{\rootcommit}{lightblue}{};
\commit[right=of \rootcommit]{\pepcommit}{lightblue}{\rootcommit};
\commit[above right=of \pepcommit]{\sortcommit}{lightred}{\pepcommit};
\commit[right=of \sortcommit]{\refactorcommit}{lightred}{\sortcommit};
\commit[right=of \pepcommit]{\proofcommit}{lightblue}{\pepcommit};
\commit[right=of \proofcommit, xshift=1.2cm]{\mergecommit}{lightblue}{\proofcommit,\refactorcommit};
\branch{master}{\mergecommit}
\branch[above right=of \refactorcommit]{alice/master}{\refactorcommit}
\message{\rootcommit}{initial}
\message{\pepcommit}{pep8}
\message[above=of \sortcommit]{\sortcommit}{presort}
\message[above=of \refactorcommit]{\refactorcommit}{refactor}
\message{\mergecommit}{merge alice/master into master}
\message{\proofcommit}{create proof}
\HEAD{master}
\node[expl, below left=0.3cm of presort]
(expl message) {commit Beschreibung};
\node[expl, above=0.3cm of \pepcommit, xshift=-0.8cm]
(expl commit) {commit};
\node[expl, above right=0.3cm of master]
(expl branch) {branch};
\node[expl, above right=0.3cm of \mergecommit]
(expl merge) {merge};
\draw[expledge] (expl message) edge[in=180, out=90] (presort);
\draw[expledge] (expl commit) edge[in=135, out=270] (\pepcommit);
\draw[expledge] (expl branch) edge[in=0, out=270] (master);
\draw[expledge] (expl merge) edge[in=0, out=270] (\mergecommit);
\end{tikzpicture}
\end{document}
......@@ -84,7 +84,7 @@
\end{itemize}
\center
\begin{image}
\img{../grafiken/ex4-graph}
\img{../grafiken/example-graph}
\end{image}
\end{frame}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment