Browse Source

added circular-sector-centroid; added new dependency

Martin Thoma 12 years ago
parent
commit
eb8176a4e2

+ 35 - 0
tikz/circular-sector-centroid/Makefile

@@ -0,0 +1,35 @@
+SOURCE = circular-sector-centroid
+DELAY = 80
+DENSITY = 300
+WIDTH = 512
+
+make:
+	pdflatex $(SOURCE).tex -output-format=pdf
+	make clean
+
+clean:
+	rm -rf  $(TARGET) *.class *.html *.log *.aux *.data *.gnuplot
+
+gif:
+	pdfcrop $(SOURCE).pdf
+	convert -verbose -delay $(DELAY) -loop 0 -density $(DENSITY) $(SOURCE)-crop.pdf $(SOURCE).gif
+	make clean
+
+png:
+	make
+	make svg
+	inkscape $(SOURCE).svg -w $(WIDTH) --export-png=$(SOURCE).png
+
+transparentGif:
+	convert $(SOURCE).pdf -transparent white result.gif
+	make clean
+
+svg:
+	make
+	#inkscape $(SOURCE).pdf --export-plain-svg=$(SOURCE).svg
+	pdf2svg $(SOURCE).pdf $(SOURCE).svg
+	# Necessary, as pdf2svg does not always create valid svgs:
+	inkscape $(SOURCE).svg --export-plain-svg=$(SOURCE).svg
+	rsvg-convert -a -w $(WIDTH) -f svg $(SOURCE).svg -o $(SOURCE)2.svg
+	inkscape $(SOURCE)2.svg --export-plain-svg=$(SOURCE).svg
+	rm $(SOURCE)2.svg

BIN
tikz/circular-sector-centroid/circular-sector-centroid.pdf


+ 35 - 0
tikz/circular-sector-centroid/circular-sector-centroid.tex

@@ -0,0 +1,35 @@
+\documentclass{article}
+\usepackage[pdftex,active,tightpage]{preview}
+\setlength\PreviewBorder{2mm}
+\usepackage{tikz}
+\usetikzlibrary{shapes, calc, shapes,snakes} 
+\usepackage{amsmath,amssymb}
+
+\begin{document}
+\begin{preview}
+\begin{tikzpicture}
+    \newcommand\ALPHA{65}
+    \newcommand\R{2.5cm}
+    \newcommand\Add{0.5cm}
+    \draw[fill=black!10, thick] (0,0) -- (90+\ALPHA:\R) node [sloped,midway,below] {$r$} arc (90+\ALPHA:90-\ALPHA:\R) -- cycle;
+    \draw[<-, thick] (90+\ALPHA:\R+\Add/2) arc (90+\ALPHA:95:\R+\Add/2);
+    \draw[->, thick] (85:\R+\Add/2) arc (85:90-\ALPHA:\R+\Add/2);
+    \draw[<->]  (90+\ALPHA:\R/2) arc (90+\ALPHA:90:\R/2); % sloped \alpha didnt work
+    \node at (90+\ALPHA/2:\R/2-\Add/2) {$\alpha$};
+    \node at (90-\ALPHA/2:\R/2-\Add/2) {$\alpha$};
+    \draw[<->]  (90:\R/2) arc (90:90-\ALPHA:\R/2);
+    \node at (0,\R) [above] (b) {$b$};
+    \draw[dotted] (0,0) -- (90+\ALPHA:\R+\Add/2);
+    \draw[dotted] (0,0) -- (90-\ALPHA:\R+\Add/2);
+    \draw (0,0) -- (b);
+    \draw[thick, <->] (-{sin(\ALPHA)*\R},-\Add/2) -- ({sin(\ALPHA)*\R},-\Add/2);
+    \draw[dashed] (-{sin(\ALPHA)*\R},-\Add/2) -- (90+\ALPHA:\R);
+    \draw[dashed] ( {sin(\ALPHA)*\R},-\Add/2) -- (90-\ALPHA:\R);
+    \node[below] at (0,-\Add/2) (l) {$l$};
+    \draw[dashed] (0,0) -- (\R/2,0) -- (\R/2, {2*\R*\R*sin(\ALPHA)/(2*pi*\ALPHA/360*2*\R)}) node[pos=0.7,right] {$y_s$} -- 
+       (0, {2*\R*\R*sin(\ALPHA)/(2*pi*\ALPHA/360*2*\R)}) node [thick,draw=blue,cross out,solid,inner sep=0pt,minimum width=4pt,minimum height=4pt] {};
+    \node[left] at (0, {2*\R*\R*sin(\ALPHA)/(2*pi*\ALPHA/360*2*\R)}) {$S$};
+    \node[thick,draw=blue,cross out,solid,inner sep=0pt,minimum width=4pt,minimum height=4pt] (0,0) {};
+\end{tikzpicture}
+\end{preview}
+\end{document}

+ 5 - 5
tikz/informatikstudium-kit-abhaengigkeitsgraph/informatikstudium-kit-abhaengigkeitsgraph.tex

@@ -62,20 +62,20 @@ soft/.style ={rectangle, draw=red, thick, fill=red!20,align=center, rounded corn
     % Connect vertices with edges and draw weights
     \path[->] (gbi)     edge[thick] node[anchor=center,above,sloped] {\tiny{Automaten}} (tgi);
     \path[->] (algi)    edge node {} (algii);
-    \path[->] (tgi)     edge node {} (algii);
+    \path[->] (tgi)     edge node[anchor=center,above,sloped] {\tiny{ILP}} (algii);
     \path[->] (wt)      edge node[anchor=center,above,sloped] {\tiny{Randomisierte Algorithmen}} (algii);
     \path[->] (dt)      edge node {} (ro);
     \path[->] (lai)     edge[ultra thick] node {} (laii);
     \path[<->] (lai)    edge node {} (gbi);
     \path[->] (anai)    edge[ultra thick] node {} (anaii);
-    \path[->] (laii)    edge[bend left] node {} (algii);
+    \path[->] (laii)    edge[bend left] node[anchor=center,above,sloped] {\tiny{Mathematische Strukturen}} (algii);
     \path[->] (programmieren)    edge[very thick] node {} (swti);
     \path[->] (programmieren)    edge[bend left] node {} (pse);
     \path[->] (programmieren)    edge node {} (os);
     \path[->] (swti)    edge node {} (pse);
-    \path[<->] (ro)     edge node {} (os);
+    \path[<->] (ro)     edge node[anchor=center,above,sloped] {\tiny{Assembler}} (os);
     \path[<->] (algii)  edge [very thick] node {} (icpc);
-    \path[->] (swti)    edge node {} (web);
+    \path[->] (swti)    edge node[anchor=center,above,sloped] {\tiny{Prozessmodelle}} (web);
     \path[<->] (pse)    edge[red] node {} (tse);
 
     \path[->] (laii)    edge[red] node {} (pse);
@@ -84,7 +84,7 @@ soft/.style ={rectangle, draw=red, thick, fill=red!20,align=center, rounded corn
     \path[->] (algi)    edge[red] node {} (pse);
     \path[->] (swti)    edge[red, bend right] node {} (pse);
     \path[->] (gbi)     edge[red] node {} (pse);
-    \path[<->] (os)     edge node[anchor=center,above,sloped] {\tiny{Caches}} (algii);
+    \path[<->] (os)     edge node[anchor=center,above,sloped] {\tiny{Paging}} (algii);
 
     \begin{customlegend}[legend entries={Pflichtmodul,Wahlmodul,Softskill,Inhaltliche Abhängigkeit,Harte Abhängigkeit},legend style={at={(-3,-12)},anchor=center}]
     \addlegendimage{blue,fill=blue!20,area legend}