aboutsummaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
Diffstat (limited to 'tex')
-rw-r--r--tex/img/icon-collaboration.pdf (renamed from tex/img/collaboration-icon.pdf)bin2855 -> 2855 bytes
-rw-r--r--tex/img/icon-complete.pdfbin0 -> 2409 bytes
-rw-r--r--tex/img/icon-processing.pdfbin0 -> 3852 bytes
-rw-r--r--tex/img/paper-icon.pdfbin2165 -> 0 bytes
-rw-r--r--tex/src/figure-branching.tex138
5 files changed, 72 insertions, 66 deletions
diff --git a/tex/img/collaboration-icon.pdf b/tex/img/icon-collaboration.pdf
index 7bb5795..7bb5795 100644
--- a/tex/img/collaboration-icon.pdf
+++ b/tex/img/icon-collaboration.pdf
Binary files differ
diff --git a/tex/img/icon-complete.pdf b/tex/img/icon-complete.pdf
new file mode 100644
index 0000000..a19970f
--- /dev/null
+++ b/tex/img/icon-complete.pdf
Binary files differ
diff --git a/tex/img/icon-processing.pdf b/tex/img/icon-processing.pdf
new file mode 100644
index 0000000..d69cee2
--- /dev/null
+++ b/tex/img/icon-processing.pdf
Binary files differ
diff --git a/tex/img/paper-icon.pdf b/tex/img/paper-icon.pdf
deleted file mode 100644
index db7660c..0000000
--- a/tex/img/paper-icon.pdf
+++ /dev/null
Binary files differ
diff --git a/tex/src/figure-branching.tex b/tex/src/figure-branching.tex
index bc6fb41..e264746 100644
--- a/tex/src/figure-branching.tex
+++ b/tex/src/figure-branching.tex
@@ -31,110 +31,116 @@
%% Just for a reference (so the image size always remains fixed). It also
%% helps in defining easy coordinates for all the other elements.
- \draw [white] (0,0) -- (0,10cm);
+ \draw [white] (0,0) -- (0,8cm);
\draw [white] (0,0) -- (\linewidth,0);
%% Maneage branch line.
- \draw [black!40!white, dashed, line width=2mm] (2cm,0) -- (2cm,0.6cm);
- \draw [->, black!40!white, line width=2mm] (2cm,0.6cm) -- (2cm,7.9cm);
- \draw [anchor=south, black!20!white] (2cm,4cm) node [rotate=90, scale=2]
- {\bf Maneage branch};
+ \draw [black!40!white, dashed, line width=2mm] (1.5cm,0) -- (1.5cm,0.6cm);
+ \draw [->, black!40!white, line width=2mm] (1.5cm,0.6cm) -- (1.5cm,7.9cm);
+ \draw [anchor=north, black!40!white] (1.5cm,0.1cm) node [scale=1.5]
+ {\bf Maneage};
%% Project branch line.
\draw [->, black!40!white, rounded corners, line width=2mm]
- (2cm,2cm) -- (3.5cm,2.5cm) -- (3.5cm,7.9cm);
- \draw [black!40!white, line width=2mm] (2cm,5cm) -- (3.5cm,5.5cm);
- \draw [anchor=south, black!20!white] (3.5cm,5cm) node [rotate=90, scale=2]
- {\bf Project branch};
+ (1.5cm,2cm) -- (3cm,2.5cm) -- (3cm,7.9cm);
+ \draw [black!40!white, line width=2mm] (1.5cm,5cm) -- (3cm,5.5cm);
+ \draw [anchor=north, black!40!white] (3cm,2.3cm) node [scale=1.5]
+ {\bf Project};
%% Derivative project
\draw [black!40!white, rounded corners, line width=2mm]
- (3.5cm,4.5cm) -- (5cm,5cm) -- (5cm,6cm) -- (3.5cm,6.5cm);
+ (3cm,4.5cm) -- (4.5cm,5cm) -- (4.5cm,6cm) -- (3cm,6.5cm);
%% Maneage commits.
- \branchcommit{green!70!blue}{2cm}{1cm}{1d72e26}
- \branchcommit{green!70!blue}{2cm}{2cm}{0c120cb}
- \branchcommit{green!70!blue}{2cm}{3cm}{5781173}
- \branchcommit{green!70!blue}{2cm}{4cm}{0774aac}
- \branchcommit{green!70!blue}{2cm}{5cm}{3c05235}
- \branchcommit{green!70!blue}{2cm}{6cm}{6ec4881}
- \branchcommit{green!70!blue}{2cm}{7cm}{852d996}
+ \branchcommit{green!70!blue}{1.5cm}{1cm}{1d72e26}
+ \branchcommit{green!70!blue}{1.5cm}{2cm}{0c120cb}
+ \branchcommit{green!70!blue}{1.5cm}{3cm}{5781173}
+ \branchcommit{green!70!blue}{1.5cm}{4cm}{0774aac}
+ \branchcommit{green!70!blue}{1.5cm}{5cm}{3c05235}
+ \branchcommit{green!70!blue}{1.5cm}{6cm}{6ec4881}
+ \branchcommit{green!70!blue}{1.5cm}{7cm}{852d996}
%% Project commits.
- \branchcommit{red!60!green}{3.5cm}{2.5cm}{4483a81}
- \branchcommit{red!60!green}{3.5cm}{3.5cm}{5e830f5}
- \branchcommit{red!60!green}{3.5cm}{4.5cm}{01dd812}
- \branchcommit{red!60!green}{3.5cm}{5.5cm}{2ed0c82}
- \branchcommit{red!60!green}{3.5cm}{6.5cm}{f62596e}
+ \branchcommit{red!60!green}{3cm}{2.5cm}{4483a81}
+ \branchcommit{red!60!green}{3cm}{3.5cm}{5e830f5}
+ \branchcommit{red!60!green}{3cm}{4.5cm}{01dd812}
+ \branchcommit{red!60!green}{3cm}{5.5cm}{2ed0c82}
+ \branchcommit{red!60!green}{3cm}{6.5cm}{f62596e}
%% Derivate project commits.
- \branchcommit{red!60!green}{5cm}{5cm}{f69e1f4}
- \branchcommit{red!60!green}{5cm}{6cm}{716b56b}
- \node[inner sep=0pt] at (4.5cm,7cm)
- {\includegraphics[width=9mm]{tex/img/collaboration-icon.pdf}};
+ \branchcommit{red!60!green}{4.5cm}{5cm}{f69e1f4}
+ \branchcommit{red!60!green}{4.5cm}{6cm}{716b56b}
+ \node[inner sep=0pt] at (3.92cm,5.55cm)
+ {\includegraphics[width=6.5mm]{tex/img/icon-collaboration.pdf}};
+ %% Paper being processed icon. The white rectangle over it is to blend it
+ %% into the background.
+ \node[anchor=south,inner sep=0pt] at (3.92cm,6.7cm)
+ {\includegraphics[width=1cm]{tex/img/icon-processing.pdf}};
+ \draw[white, fill=white, opacity=0.7] (3.42cm,6.7) rectangle (5cm,7.7cm);
%% Description of this scenario:
- \draw [anchor=west, black] (2.7cm,1.5cm) node {\textbf{Scenario 1} (pre-publication):};
- \draw [anchor=west, black] (2.8cm,1.1cm) node {\small Collaborating on a project while};
- \draw [anchor=west, black] (2.8cm,0.7cm) node {\small working in parallel, then merging.};
+ \draw [rounded corners, fill=black!10!white] (3.1cm,0) rectangle (7.5cm,1.25cm);
+ \draw [anchor=west, black] (3.1cm,1.0cm) node {\small \textbf{Phase 1} (pre-publication):};
+ \draw [anchor=west, black] (3.3cm,0.6cm) node {\footnotesize Collaborating on a project while};
+ \draw [anchor=west, black] (3.3cm,0.2cm) node {\footnotesize working in parallel, then merging.};
+
+
+
- %% Middle line.
- \draw [black] (8cm,0.5) -- (8cm,7.5cm);
%% Maneage branch line.
- \draw [black!40!white, dashed, line width=2mm] (10cm,0) -- (10cm,0.6cm);
- \draw [->, black!40!white, line width=2mm] (10cm,0.6cm) -- (10cm,9.9cm);
- \draw [anchor=south, black!20!white] (10cm,4cm) node [rotate=90, scale=2]
- {\bf Maneage branch};
+ \draw [black!40!white, dashed, line width=2mm] (9.5cm,0) -- (9.5cm,0.6cm);
+ \draw [black!40!white, line width=2mm] (9.5cm,0.6cm) -- (9.5cm,2.5cm);
+ \draw [black!40!white, line width=2mm, dashed] (9.5cm,2.5cm) -- (9.5cm,3.5cm);
+ \draw [->,black!40!white, line width=2mm] (9.5cm,3.5cm) -- (9.5cm,7.9cm);
+ \draw [anchor=north, black!40!white] (9.5cm,0.1cm) node [scale=1.5]
+ {\bf Maneage};
%% Project branch line.
\draw [black!40!white, rounded corners, line width=2mm]
- (10cm,2cm) -- (11.5cm,2.5cm) -- (11.5cm,6.9cm);
- \draw [black!40!white, line width=2mm] (10cm,5cm) -- (11.5cm,5.5cm);
- \draw [anchor=south, black!20!white] (11.5cm,5cm) node [rotate=90, scale=2]
- {\bf Project branch};
+ (9.5cm,2cm) -- (11cm,2.5cm) -- (11cm,3cm);
+ \draw [black!40!white, line width=2mm, dashed] (11cm,3cm) -- (11cm,4cm);
+ \draw [black!40!white, line width=2mm, dashed] (9.5cm,3cm) -- (11cm,3.5cm);
+ \draw [black!40!white, line width=2mm] (11cm,4cm) -- (11cm,4.9cm);
+ \draw [anchor=north, black!40!white] (11cm,2.3cm) node [scale=1.5]
+ {\bf Project};
%% Derivative project
\draw [->, black!40!white, rounded corners, line width=2mm]
- (11.5cm,6.5cm) -- (13cm,7cm) -- (13cm,9.9cm);
- \draw [black!40!white, line width=2mm] (10cm,8cm) -- (13cm,9cm);
- \draw [anchor=south, black!20!white] (13cm,6.5cm) node [rotate=90, scale=2]
- {\bf Derivative branch};
+ (11cm,4.5cm) -- (12.5cm,5cm) -- (12.5cm,7.9cm);
+ \draw [black!40!white, line width=2mm] (9.5cm,6cm) -- (12.5cm,7cm);
+ \draw [anchor=north, black!40!white] (12.7cm,4.8cm) node [scale=1.5]
+ {\bf Derivative};
+ \draw [anchor=north, black!40!white] (12.7cm,4.4cm) node [scale=1.5]
+ {\bf project};
%% Maneage commits.
- \branchcommit{green!70!blue}{10cm}{1cm}{1d72e26}
- \branchcommit{green!70!blue}{10cm}{2cm}{0c120cb}
- \branchcommit{green!70!blue}{10cm}{3cm}{5781173}
- \branchcommit{green!70!blue}{10cm}{4cm}{0774aac}
- \branchcommit{green!70!blue}{10cm}{5cm}{3c05235}
- \branchcommit{green!70!blue}{10cm}{6cm}{6ec4881}
- \branchcommit{green!70!blue}{10cm}{7cm}{852d996}
- \branchcommit{green!70!blue}{10cm}{8cm}{13a1881}
- \branchcommit{green!70!blue}{10cm}{9cm}{61b6b01}
+ \branchcommit{green!70!blue}{9.5cm}{1cm}{1d72e26}
+ \branchcommit{green!70!blue}{9.5cm}{2cm}{0c120cb}
+ \branchcommit{green!70!blue}{9.5cm}{4cm}{b47b2a3}
+ \branchcommit{green!70!blue}{9.5cm}{5cm}{340a7ec}
+ \branchcommit{green!70!blue}{9.5cm}{6cm}{a92b25a}
+ \branchcommit{green!70!blue}{9.5cm}{7cm}{6e1e3ff}
%% Project commits.
- \branchcommit{red!60!green}{11.5cm}{2.5cm}{4483a81}
- \branchcommit{red!60!green}{11.5cm}{3.5cm}{5e830f5}
- \branchcommit{red!60!green}{11.5cm}{4.5cm}{01dd812}
- \branchcommit{red!60!green}{11.5cm}{5.5cm}{2ed0c82}
- \branchcommit{red!60!green}{11.5cm}{6.5cm}{f62596e}
- \node[inner sep=0pt] at (11.5cm,7.2cm) {\includegraphics[width=9mm]{tex/img/paper-icon.pdf}};
- \draw [anchor=north, black] (11.5cm,8cm) node {\scriptsize Published};
+ \branchcommit{red!60!green}{11cm}{2.5cm}{4483a81}
+ \branchcommit{red!60!green}{11cm}{4.5cm}{\projectversion}
+ \node[anchor=south, inner sep=0pt, color=white] at (11.05cm,4.8cm) {\includegraphics[width=1cm]{tex/img/icon-complete.pdf}};
%% Derivate project commits.
- \branchcommit{purple!60!yellow}{13cm}{7cm}{b177c7e}
- \branchcommit{purple!60!yellow}{13cm}{8cm}{5ae1fdc}
- \branchcommit{purple!60!yellow}{13cm}{9cm}{bcf4512}
+ \branchcommit{purple!60!yellow}{12.5cm}{5cm}{b177c7e}
+ \branchcommit{purple!60!yellow}{12.5cm}{6cm}{5ae1fdc}
+ \branchcommit{purple!60!yellow}{12.5cm}{7cm}{bcf4512}
%% Description of this scenario:
- \draw [anchor=west, black] (10.7cm,1.5cm) node {\textbf{Scenario 2} (post-publication):};
- \draw [anchor=west, black] (10.8cm,1.1cm) node {\small Other researchers building upon};
- \draw [anchor=west, black] (10.8cm,0.7cm) node {\small previously published work.};
-
+ \draw [rounded corners, fill=black!10!white] (11.1cm,0) rectangle (15.3cm,1.25cm);
+ \draw [anchor=west, black] (11.1cm,1.0cm) node {\small \textbf{Phase 2} (post-publication):};
+ \draw [anchor=west, black] (11.3cm,0.6cm) node {\footnotesize Other researchers building upon};
+ \draw [anchor=west, black] (11.3cm,0.2cm) node {\footnotesize previously published work.};
\end{tikzpicture}