Wrote 'Experiments' and started writing 'Design' chapters in report.

docs/data/server_scheme.tex → docs/data/diagram.tex

-\documentclass{minimal}
-
-\usepackage{tikz}
-\usetikzlibrary{shapes,arrows}
-
-\begin{document}
-\pagestyle{empty}
-
 % Block+line styles
 \tikzstyle{block} = [rectangle, draw, fill=blue!20, text width=5em,
     text centered, rounded corners, minimum height=4em]
@@ -17,18 +9,18 @@
 
 \begin{tikzpicture}[node distance = 7em, auto]
     % Servers
-    \node [block] (inputserver) {Input server};
-    \node [right of=inputserver] (inputserverdots) {$\cdots$};
+    \node [block] (eventserver) {Event server};
+    \node [right of=eventserver] (eventserverdots) {$\cdots$};
 
-    \node [impl, right of=inputserverdots] (tuioserver) {TUIO server};
+    \node [impl, right of=eventserverdots] (tuioserver) {TUIO server};
 
-    \node [block, below of=inputserver] (gestureserver) {Gesture server};
-    \path [line] (inputserver) -- node {triggers [down, move, up]}(gestureserver);
+    \node [block, below of=eventserver] (gestureserver) {Gesture erver};
+    \path [line] (eventserver) -- node {trigger events of all touch points}(gestureserver);
 
     % Window
     \node [block, below of=gestureserver] (window) {Window};
     \node [right of=window] (windowdots) {$\cdots$};
-    \path [line] (gestureserver) -- node {triggers [down, move, up]}(window);
+    \path [line] (gestureserver) -- node {trigger events of containing touch points}(window);
 
     \node [impl, right of=windowdots] (rectangularwindow) {Rectangular window};
     \node [impl, right of=rectangularwindow] (circularwindow) {Circular window};
@@ -36,7 +28,7 @@
     % Tracker
     \node [block, below of=window] (tracker) {Gesture tracker};
     \node [right of=tracker] (trackerdots) {$\cdots$};
-    \path [line] (window) -- node {triggers [down, move, up]}(tracker);
+    \path [line] (window) -- node {delegate events}(tracker);
 
     \node [impl, right of=trackerdots] (taptracker) {Tap tracker};
     \node [impl, right of=taptracker, text width=7em] (transformtracker) {Transformation tracker};
@@ -44,16 +36,12 @@
     % Gesture
     \node [block, below of=tracker] (gesture) {Gesture};
     \node [right of=gesture] (gesturedots) {$\cdots$};
-    \path [line] (tracker) -- node {triggers gesture}(gesture);
+    \path [line] (tracker) -- node {trigger by calling gesture handler}(gesture);
 
     % Client application
-    \node [app, left of=window, xshift=-14em] (app) {Client application};
-    \path [line, dashed] (app) -- node [near start] {binds gesture handler}(tracker);
-    \path [line, dashed] (tracker) -- node [near start] {triggers gesture handler}(app);
-
-    \path [line, dashed] (app) -- node [near start] {starts}(gestureserver);
-    \path [line, dashed] (app) -- node [near start] {adds to server}(window);
+    \node [app, left of=window, xshift=-11em] (app) {Client application};
+    \path [line, dashed] (app) -- node [left=20, near end] {add to window, bind gesture handler}(tracker);
 
+    \path [line, dashed] (app) -- node [near start] {start}(gestureserver);
+    \path [line, dashed] (app) -- node {add to gesture server}(window);
 \end{tikzpicture}
-
-\end{document}

docs/report.bib

@@ -51,3 +51,36 @@
    note = {10.1007/978-3-540-73110-8\_78},
    year = {2007}
 }
+
+@article{OSC,
+    author = {Wright, Matthew},
+    title = {Open Sound Control: an enabling technology for musical networking},
+    journal = {Org. Sound},
+    issue_date = {December 2005},
+    volume = {10},
+    number = {3},
+    month = {dec},
+    year = {2005},
+    issn = {1355-7718},
+    pages = {193--200},
+    numpages = {8},
+    url = {http://dx.doi.org/10.1017/S1355771805000932},
+    doi = {10.1017/S1355771805000932},
+    acmid = {1109064},
+    publisher = {Cambridge University Press},
+    address = {New York, NY, USA},
+}
+
+@misc{pyOSC,
+    author = {v2lab},
+    title = {pyOSC - A Simple OpenSoundControl implementation, in Pure Python.},
+    year = {2008},
+    howpublished = {\url{https://trac.v2.nl/wiki/pyOSC}}
+}
+
+@misc{pyTUIO,
+    author = {Jannis Leidel},
+    title = {pyTUIO - A Python library that understands the TUIO protocol.},
+    year = {2008},
+    howpublished = {\url{http://code.google.com/p/pytuio/}}
+}

docs/rules.mk

 REPORT := report
-SCHEME := data/server_scheme
+DIAGRAM := data/diagram
 PDFLATEX_FLAGS = -halt-on-error -interaction=nonstopmode \
 	-output-directory $(@D) -shell-escape
 LATEX = TEXINPUTS=$(d):$(b): pdflatex $(PDFLATEX_FLAGS)
@@ -19,11 +19,7 @@ $(b)%.pdf: $(d)%.tex
 		$(LATEX) $^; \
 	done
 
-$(b)$(REPORT).pdf: $(b)$(SCHEME).pdf
-
-$(b)$(SCHEME).pdf: $(d)$(SCHEME).tex
-	mkdir -p $(@D)
-	pdflatex $(PDFLATEX_FLAGS) $^
+$(b)$(REPORT).pdf: $(d)$(DIAGRAM).tex
 
 $(b)$(REPORT).bbl: $(d)$(REPORT).bib
 	BIBINPUTS=$(d) bibtex8 ${@:.bbl=.aux}