From cf04772b27366011ec9b861ca8ce1fea7d1307cf Mon Sep 17 00:00:00 2001 From: Wouter Horlings Date: Thu, 12 Nov 2020 12:37:48 +0100 Subject: [PATCH 1/2] Update to Xelatex --- graphics/approach.tex | 22 +++++++++++++++------- graphics/design_flow.tex | 19 +++++++++++++++++-- graphics/design_flow.tikz | 16 ---------------- graphics/design_flow_analysis.tex | 17 ----------------- 4 files changed, 32 insertions(+), 42 deletions(-) delete mode 100644 graphics/design_flow.tikz delete mode 100644 graphics/design_flow_analysis.tex diff --git a/graphics/approach.tex b/graphics/approach.tex index c8add0f..520f844 100644 --- a/graphics/approach.tex +++ b/graphics/approach.tex @@ -1,19 +1,27 @@ %&tex \documentclass{standalone} \usepackage{tikz} -\usetikzlibrary {quotes,arrows.meta,graphs,graphdrawing} \usegdlibrary {layered} +\usepackage{siltex} +\usetikzlibrary {arrows.meta,positioning} \tikzset{nodes={text height=.7em, text width=2.7cm, align=center, draw=black!20, thick, fill=white, font=\footnotesize}, >={Stealth[round,sep]}, rounded corners, semithick} \begin{document} -\begin{tikzpicture} - -\graph [layered layout, level distance=1.2cm, sibling sep=.5em, sibling distance=1.5cm, sweep crossing minimization] { -{"Design Method", "System Engineering"} -> "Design Plan"; -{"Evaluation Plan", "Design Plan", "Subject of design"} -> "Case Study"; -}; +\begin{tikzpicture}[on grid,y=1.2cm,x=1.6cm] + \node (dm) {Design Method}; + \node (a1)[right = 1 of dm, draw=none, fill=none] {}; + \node (se)[right = 2 of dm] {Systems Engineering}; + \node (dp)[below = 1 of a1] {Design Plan}; + \node (ep)[left = 2 of dp] {Evaluation Plan}; + \node (sd)[right = 2 of dp] {Subject of Design}; + \node (cs)[below = 1 of dp] {Case Study}; + \path[->] (dm) edge (dp) + (se) edge (dp) + (ep) edge (cs) + (dp) edge (cs) + (sd) edge (cs); \end{tikzpicture} \end{document} diff --git a/graphics/design_flow.tex b/graphics/design_flow.tex index abe2224..f1acd80 100644 --- a/graphics/design_flow.tex +++ b/graphics/design_flow.tex @@ -1,6 +1,7 @@ \documentclass{standalone} \usepackage{tikz} -\usetikzlibrary {arrows.meta,graphs,graphdrawing,positioning} \usegdlibrary {layered, trees} +\usepackage{siltex} +\usetikzlibrary {arrows.meta,positioning} \tikzset{nodes={text height=.7em, text width=2.8cm, align=center, draw=black!50, thick, font=\footnotesize, fill=white}, >={Stealth[round,sep]}, rounded corners, semithick} @@ -9,7 +10,21 @@ draw=black!50, thick, font=\footnotesize, fill=white}, \begin{tikzpicture}[on grid,y=1.2cm,x=3.2cm] \draw[fill=lightgray] (-1.7cm , 0.5cm) rectangle (5cm, -2.8cm); \draw[fill=lightgray] (-1.7cm,-3cm) rectangle (5cm, -7.2cm); - \input{design_flow.tikz} + \node (pd) {Problem Description}; + \node (sp)[below=1 of pd] {System\\Requirements}; + \node (id)[below=1 of sp] {Initial Design}; + \node (fs)[below=1 of id] {Feature Definition}; + \node (ss)[below=1 of fs] {Feature Selection}; + \node (a1)[below=0.8 of ss,draw=none, fill=none] {}; + \node (rd)[below=0.8 of a1] {Rapid Development}; + \node (va)[right=1 of a1] {Variable Approach}; + \path[->] (pd) edge (sp) + (sp) edge (id) + (id) edge (fs) + (fs) edge (ss) + (ss) edge (rd) + (rd.east) edge[bend right] (va) + (va) edge[bend right] (ss.east); \draw (3.4cm,0cm) node[draw=none, fill=none,text width=2.9cm] (wf) {Systems Engineering:\\Waterfall}; \node (ridm)[right=1 of fs, fill=none, draw=none] {Rapid Iterative Design Method}; \end{tikzpicture} diff --git a/graphics/design_flow.tikz b/graphics/design_flow.tikz deleted file mode 100644 index 628113f..0000000 --- a/graphics/design_flow.tikz +++ /dev/null @@ -1,16 +0,0 @@ -%&tex - \node (pd) {Problem Description}; - \node (sp)[below=1 of pd] {System\\Requirements}; - \node (id)[below=1 of sp] {Initial Design}; - \node (fs)[below=1 of id] {Feature Definition}; - \node (ss)[below=1 of fs] {Feature Selection}; - \node (a1)[below=0.8 of ss,draw=none, fill=none] {}; - \node (rd)[below=0.8 of a1] {Rapid Development}; - \node (va)[right=1 of a1] {Variable Approach}; - \path[->] (pd) edge (sp) - (sp) edge (id) - (id) edge (fs) - (fs) edge (ss) - (ss) edge (rd) - (rd.east) edge[bend right] (va) - (va) edge[bend right] (ss.east); diff --git a/graphics/design_flow_analysis.tex b/graphics/design_flow_analysis.tex deleted file mode 100644 index b53c134..0000000 --- a/graphics/design_flow_analysis.tex +++ /dev/null @@ -1,17 +0,0 @@ -\documentclass{standalone} -\usepackage{tikz} -\usetikzlibrary {arrows.meta,graphs,graphdrawing,positioning} \usegdlibrary {layered, trees} -\tikzset{nodes={text height=.7em, text width=2.8cm, align=center, -draw=black!50, thick, font=\footnotesize, fill=white}, ->={Stealth[round,sep]}, rounded corners, semithick} - -\begin{document} -\begin{tikzpicture}[on grid,y=1.2cm,x=3.2cm] - \draw[fill=lightgray] (-1.7cm , 1.4cm) rectangle (1.7cm, -4.1cm); - \draw[fill=lightgray] (-1.7cm,-4.3cm) rectangle (5cm, -8.0cm); - \input{design_flow.tikz} - \node (prep)[above=0.7 of pd, draw=none, fill=none] {Preliminary Design}; - \node (b)[right=0.5 of rd,fill=none, draw=none] {}; - \node (ridm)[below=0.7 of b, fill=none, draw=none,text width=5cm] {Rapid Iterative Design Method}; -\end{tikzpicture} -\end{document} From f1692dab587ff3514fd61a334a8e288560ec88e1 Mon Sep 17 00:00:00 2001 From: Wouter Horlings Date: Thu, 12 Nov 2020 13:06:26 +0100 Subject: [PATCH 2/2] Add graphics folder as job trigger --- .gitlab-ci.yml | 1 + Makefile | 2 +- graphics/design_flow.tex | 2 +- graphics/feature_dependency.tex | 17 +++++++++++------ graphics/test_flow_graph.tex | 2 +- graphics/waterfall.tex | 17 ++++++++++++----- 6 files changed, 27 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f1f2921..e0a6788 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,6 +29,7 @@ final_report: - include/references.bib - report.tex - content/*.tex + - graphics/*.tex rro: stage: rro diff --git a/Makefile b/Makefile index bd5b662..f9da5db 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ $(TARGET): $(SOURCE) $(GRPH_TARGET) $(CONTENT_SOURCE) $(LATEXMK) $(LATEXMK_OPTS) $(LATEXMK_TARGET) $< $(GRPH_DIR)/%.pdf: $(GRPH_DIR)/%.tex - $(LATEXMK) -lualatex -outdir=$(GRPH_DIR) $(LATEXMK_OPTS) $< + $(LATEXMK) $(LATEXMK_TARGET) -outdir=$(GRPH_DIR) $(LATEXMK_OPTS) $< .PHONY: clean Clean clean: diff --git a/graphics/design_flow.tex b/graphics/design_flow.tex index f1acd80..af82e71 100644 --- a/graphics/design_flow.tex +++ b/graphics/design_flow.tex @@ -11,7 +11,7 @@ draw=black!50, thick, font=\footnotesize, fill=white}, \draw[fill=lightgray] (-1.7cm , 0.5cm) rectangle (5cm, -2.8cm); \draw[fill=lightgray] (-1.7cm,-3cm) rectangle (5cm, -7.2cm); \node (pd) {Problem Description}; - \node (sp)[below=1 of pd] {System\\Requirements}; + \node (sp)[below=1 of pd] {Specifications}; \node (id)[below=1 of sp] {Initial Design}; \node (fs)[below=1 of id] {Feature Definition}; \node (ss)[below=1 of fs] {Feature Selection}; diff --git a/graphics/feature_dependency.tex b/graphics/feature_dependency.tex index ad3cae6..3c3341a 100644 --- a/graphics/feature_dependency.tex +++ b/graphics/feature_dependency.tex @@ -1,16 +1,21 @@ \documentclass{standalone} \usepackage{tikz} -\usetikzlibrary {arrows.meta,graphs,graphdrawing} \usegdlibrary {layered} +\usepackage{siltex} +\usetikzlibrary {arrows.meta,positioning} \tikzset{nodes={text height=.7em, text width=1.2cm, align=center, draw=black!50, thick, font=\footnotesize, fill=white}, >={Stealth[round,sep]}, rounded corners, semithick} \begin{document} -\begin{tikzpicture} - \graph [layered layout, level distance=1.2cm, sibling sep=.5em, sibling distance=1.5cm, sweep crossing minimization] { - "Feat. A" -> {"Feat. B", "Feat. C"}; - "Feat. D" ->[edges=white!99] "Feat. C" -> "Feat. E"; - }; +\begin{tikzpicture}[on grid, y = 1.5cm, x = 1.8cm] + \node (a) {Feature A}; + \node (d) [right = 1 of a]{Feature D}; + \node (b) [below = 1 of a]{Feature B}; + \node (c) [below = 1 of d]{Feature C}; + \node (e) [below = 1 of c]{Feature E}; + \path[->] (a) edge (b) + (a) edge (c) + (c) edge (e); \end{tikzpicture} \end{document} diff --git a/graphics/test_flow_graph.tex b/graphics/test_flow_graph.tex index 77def6a..ea9ff02 100644 --- a/graphics/test_flow_graph.tex +++ b/graphics/test_flow_graph.tex @@ -1,6 +1,6 @@ %&tex \documentclass{standalone} -%\usepackage[]{siltex} +\usepackage{siltex} \usepackage{tikz} \usetikzlibrary {arrows.meta,graphs,positioning,shapes.geometric} \tikzset{nodes={text height=.7em, text width=1.7cm, align=center, diff --git a/graphics/waterfall.tex b/graphics/waterfall.tex index 495ee88..a32c462 100644 --- a/graphics/waterfall.tex +++ b/graphics/waterfall.tex @@ -1,16 +1,23 @@ \documentclass{standalone} \usepackage{tikz} -\usetikzlibrary {arrows.meta,graphs,graphdrawing} \usegdlibrary {layered} +\usepackage{siltex} +\usetikzlibrary {arrows.meta,positioning} \tikzset{nodes={text height=.7em, text width=2.8cm, align=center, draw=black!50, thick, font=\footnotesize, fill=white}, >={Stealth[round,sep]}, rounded corners, semithick} \begin{document} -\begin{tikzpicture} - \graph [layered layout, level distance=1.2cm, sibling sep=.5em, sibling distance=1.5cm, sweep crossing minimization] { - pd [as=Problem Description] -> "Specifications" -> "Initial Design" -> "Implementation" -> "Testing"; - }; +\begin{tikzpicture}[on grid,y=1.2cm,x=3.2cm] + \node (pd) {Problem Description}; + \node (sp)[below=1 of pd] {Specifications}; + \node (id)[below=1 of sp] {Initial Design}; + \node (im)[below=1 of id] {Implementation}; + \node (te)[below=1 of im] {Testing}; + \path[->] (pd) edge (sp) + (sp) edge (id) + (id) edge (im) + (im) edge (te); \end{tikzpicture} \end{document}