From 55a372ca4a16cc6920fd63daba291631052955c6 Mon Sep 17 00:00:00 2001 From: Thomas Pietrzak Date: Fri, 8 Apr 2022 23:09:52 +0200 Subject: [PATCH] Fixed figures with MacTex 2022, adjusted lof style, removing overfull hbox --- figures/activibesets.tex | 220 ++++++++++++++++---------------- figures/adaptativeprocedure.tex | 13 +- figures/buttonfeedback.tex | 16 +-- figures/flexuralstiffnesses.tex | 20 +-- figures/hapticpath.tex | 6 +- figures/lexical.tex | 27 ++-- figures/motorpath.tex | 7 +- figures/piezotrigger.tex | 8 +- figures/semantic.tex | 14 +- figures/sevenstages.tex | 2 +- figures/stimtacpatterns.tex | 37 +++--- figures/syntactic.tex | 14 +- figures/tactileillusions.tex | 8 +- figures/tactilepattern.tex | 15 +-- figures/tactiletexture.tex | 13 +- hdrmain.tex | 6 +- mystyle.sty | 48 ++++++- tex/00-tocs.tex | 8 +- tex/2-output.tex | 2 - tex/3-input.tex | 8 +- 20 files changed, 258 insertions(+), 234 deletions(-) diff --git a/figures/activibesets.tex b/figures/activibesets.tex index d175d66..536f9f7 100644 --- a/figures/activibesets.tex +++ b/figures/activibesets.tex @@ -11,12 +11,12 @@ ({4*\x*#1+4*#1},0); } } + \def\s{0.03} + \def\nl{11} + \def\labely{-40} + \def\labelw{0.7} \tikzexternalenable \begin{tikzpicture} - \def\s{0.03} - \def\nl{11} - \def\labely{-40} - \def\labelw{0.7} \pgfmathsetmacro{\setwidth}{(18-\labelw)/6} \begin{scope}[xshift=-2mm]%[xshift=-\labelw cm] \foreach \x in {1,...,10} @@ -26,134 +26,128 @@ \end{scope} } \end{scope} - \begin{scope}[xshift=0cm] %Set A - \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set A}; - \foreach \x in {1,...,10} - { - \begin{scope}[yshift=(-(\x-1)*\nl)] - \foreach \y in {1,...,\x} - { - \begin{scope}[xshift=(\y*6)] - \sine{\s}{.10}{1} - \end{scope} - } - \end{scope} - } - \end{scope} - \begin{scope}[xshift=\setwidth cm] %Set B - \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set B}; - \foreach \x in {1,...,10} - { - \begin{scope}[yshift=(-(\x-1)*\nl)] - \sine{\s}{.10}{\x} - \end{scope} - } - \end{scope} - \begin{scope}[xshift=2*\setwidth cm] %Set C - \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set C}; - \foreach \x in {1,...,10} - { - \begin{scope}[yshift=(-(\x-1)*\nl)] - \pgfmathtruncatemacro{\l}{20-2*\x} - \ifnum \x < 10 - \sine{\s}{.10}{\l} - \fi - \pgfmathsetmacro{\ll}{\l*\s*40-1} - \begin{scope}[xshift=\ll mm] - \foreach \y in {1,...,\x} { - \pgfmathsetmacro{\m}{\y*\s*80} - \begin{scope}[xshift=\m mm] - \sine{\s}{.10}{1} - \end{scope} - } + \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set A}; + \foreach \x in {1,...,10} + { + \begin{scope}[yshift=(-(\x-1)*\nl)] + \foreach \y in {1,...,\x} + { + \begin{scope}[xshift=(\y*6)] + \sine{\s}{.10}{1} \end{scope} - \end{scope} - } - \end{scope} - \begin{scope}[xshift=3*\setwidth cm] %Set D - \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set D}; - \foreach \x in {10,...,1} - { - \begin{scope}[yshift=(-(10-\x)*\nl)] - \foreach \y in {1,...,\x} { - \pgfmathsetmacro{\m}{\y*\s*80} - \begin{scope}[xshift=\m mm] - \sine{\s}{.10}{1} - \end{scope} - } - \pgfmathtruncatemacro{\l}{20-2*\x} - \pgfmathsetmacro{\ll}{\x*\s*80+2} - \ifnum \x < 10 - \begin{scope}[xshift=\ll mm] - \sine{\s}{.10}{\l} - \end{scope} - \fi - \end{scope} - } - \end{scope} - \begin{scope}[xshift=4*\setwidth cm] %Set E - \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set E}; - \foreach \x in {1,...,10} - { - \begin{scope}[yshift=(-(\x-1)*\nl)] + } + \end{scope} + } + \end{tikzpicture}\hfill + \begin{tikzpicture} % Set B + \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set B}; + \foreach \x in {1,...,10} + { + \begin{scope}[yshift=(-(\x-1)*\nl)] + \sine{\s}{.10}{\x} + \end{scope} + } + \end{tikzpicture}\hfill + \begin{tikzpicture} %Set C + \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set C}; + \foreach \x in {1,...,10} + { + \begin{scope}[yshift=(-(\x-1)*\nl)] + \pgfmathtruncatemacro{\l}{20-2*\x} + \ifnum \x < 10 + \sine{\s}{.10}{\l} + \fi + \pgfmathsetmacro{\ll}{\l*\s*40-1} + \begin{scope}[xshift=\ll mm] \foreach \y in {1,...,\x} { \pgfmathsetmacro{\m}{\y*\s*80} \begin{scope}[xshift=\m mm] \sine{\s}{.10}{1} \end{scope} } - \pgfmathtruncatemacro{\l}{20-2*\x} - \pgfmathsetmacro{\ll}{\x*\s*80+2} - \ifnum \x < 10 - \begin{scope}[xshift=\ll mm] - \sine{\s}{.10}{\l} - \end{scope} - \fi \end{scope} - } + \end{scope} + } + \end{tikzpicture}\hfill + \begin{tikzpicture} %Set D + \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set D}; + \foreach \x in {10,...,1} + { + \begin{scope}[yshift=(-(10-\x)*\nl)] + \foreach \y in {1,...,\x} { + \pgfmathsetmacro{\m}{\y*\s*80} + \begin{scope}[xshift=\m mm] + \sine{\s}{.10}{1} + \end{scope} + } + \pgfmathtruncatemacro{\l}{20-2*\x} + \pgfmathsetmacro{\ll}{\x*\s*80+2} + \ifnum \x < 10 + \begin{scope}[xshift=\ll mm] + \sine{\s}{.10}{\l} + \end{scope} + \fi + \end{scope} + } + \end{tikzpicture}\hfill + \begin{tikzpicture} %Set E + \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set E}; + \foreach \x in {1,...,10} + { + \begin{scope}[yshift=(-(\x-1)*\nl)] + \foreach \y in {1,...,\x} { + \pgfmathsetmacro{\m}{\y*\s*80} + \begin{scope}[xshift=\m mm] + \sine{\s}{.10}{1} + \end{scope} + } + \pgfmathtruncatemacro{\l}{20-2*\x} + \pgfmathsetmacro{\ll}{\x*\s*80+2} + \ifnum \x < 10 + \begin{scope}[xshift=\ll mm] + \sine{\s}{.10}{\l} + \end{scope} + \fi + \end{scope} + } + \end{tikzpicture}\hfill + \begin{tikzpicture} %Set F + \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set F}; + \foreach \x in {1,...,4} + { + \pgfmathtruncatemacro{\xx}{\x-1} + \begin{scope}[yshift=(-\xx*\nl)] + \foreach \y in {0,...,\xx} + { + \begin{scope}[xshift=(\y*6)] + \sine{\s}{.10}{1} + \end{scope} + } + \end{scope} + } + \begin{scope}[yshift=-4*\nl] + \sine{\s}{.10}{7} \end{scope} - \begin{scope}[xshift=5*\setwidth cm] %Set F - \node[x=1mm,y=1mm, anchor=center] () at (14,\labely){Set F}; - \foreach \x in {1,...,4} - { - \pgfmathtruncatemacro{\xx}{\x-1} - \begin{scope}[yshift=(-\xx*\nl)] - \foreach \y in {0,...,\xx} + \foreach \x in {1,...,4} + { + \begin{scope}[yshift=(-(\x+4)*\nl)] + \sine{\s}{.10}{7} + \begin{scope}[xshift=22] + \foreach \y in {1,...,\x} { \begin{scope}[xshift=(\y*6)] \sine{\s}{.10}{1} \end{scope} } \end{scope} - } - \begin{scope}[yshift=-4*\nl] - \sine{\s}{.10}{7} \end{scope} - \foreach \x in {1,...,4} - { - \begin{scope}[yshift=(-(\x+4)*\nl)] - \sine{\s}{.10}{7} - \begin{scope}[xshift=22] - \foreach \y in {1,...,\x} - { - \begin{scope}[xshift=(\y*6)] - \sine{\s}{.10}{1} - \end{scope} - } - \end{scope} - \end{scope} - } - \begin{scope}[yshift=-9*\nl] + } + \begin{scope}[yshift=-9*\nl] + \sine{\s}{.10}{7} + \begin{scope}[xshift=28] \sine{\s}{.10}{7} - \begin{scope}[xshift=28] - \sine{\s}{.10}{7} - \end{scope} \end{scope} \end{scope} -% \node[x=1mm,y=1mm, anchor=center] () at (70,-36){Set C}; -% \node[x=1mm,y=1mm, anchor=center] () at (103,-36){Set D}; -% \node[x=1mm,y=1mm, anchor=center] () at (136,-36){Set E}; -% \node[x=1mm,y=1mm, anchor=center] () at (160,-36){Set F}; \end{tikzpicture} \tikzexternaldisable \caption[6 pattern sets evaluated in Activibe.]{Visual representation of the 6 pattern sets we evaluated in two laboratory studies, and a longitudinal study.} diff --git a/figures/adaptativeprocedure.tex b/figures/adaptativeprocedure.tex index 1ebd64f..90f03a9 100644 --- a/figures/adaptativeprocedure.tex +++ b/figures/adaptativeprocedure.tex @@ -1,24 +1,22 @@ %!TEX root = ../hdrmain.tex \begin{figure}[htb] - \definecolor{cellred}{rgb} {0.98,0.17,0.15} - \definecolor{cellblue}{rgb} {0.17,0.60,0.99} \def\sx{4.7mm} \def\sy{10mm} \def\revthickness{1.5pt} \newcommand{\good}[1]{ - \node[x=\sx,y=\sy, inner sep=1mm,circle,fill=cellblue] at (#1) {}; + \node[x=\sx,y=\sy, inner sep=1mm,circle,fill=myblue] at (#1) {}; } \newcommand{\goodrev}[1]{ - \node[x=\sx,y=\sy, inner sep=1mm,circle,fill=cellblue, line width=\revthickness, draw=black] at (#1) {}; + \node[x=\sx,y=\sy, inner sep=1mm,circle,fill=myblue, line width=\revthickness, draw=black] at (#1) {}; } \newcommand{\wrong}[1]{ - \node[x=\sx,y=\sy, inner sep=1mm,circle,fill=cellred] at (#1) {}; + \node[x=\sx,y=\sy, inner sep=1mm,circle,fill=myred] at (#1) {}; } \newcommand{\wrongrev}[1]{ - \node[x=\sx,y=\sy, inner sep=1mm,circle,fill=cellred, line width=\revthickness, draw=black] at (#1) {}; + \node[x=\sx,y=\sy, inner sep=1mm,circle,fill=myred, line width=\revthickness, draw=black] at (#1) {}; } \newcommand{\rev}[1]{ \node[x=\sx,y=\sy, inner sep=1mm,circle,line width=\revthickness, draw=black] at (#1) {}; @@ -26,7 +24,7 @@ \def\values{{4,4,3,3,2,2,1,2,2,1,1.3,1.3,1.6,1.6,1.3,1.3,1,1.3,1.3,1,1.3,1.3,1,1.3,1.6,1.6,1.3,1.6,1.6,1.3}} \def\vtypes{{0,0,0,0,0,0,3,0,1,3,0,2,0,1,0,0,3,0,1,3,0,1,3,2,0,1,3,0,1,3}} - + \tikzexternalenable \begin{tikzpicture} %Axis \draw[x=1mm,y=1mm, <->] @@ -56,6 +54,7 @@ % \node[x=1mm,y=1mm, anchor=center] () at (160,-36){Set F}; \end{tikzpicture} + \tikzexternaldisable \caption[Adaptative procedure.]{Example of an adaptative procedure.} \label{fig:adaptativeprocedure} \end{figure} diff --git a/figures/buttonfeedback.tex b/figures/buttonfeedback.tex index 828523a..e5d6a87 100644 --- a/figures/buttonfeedback.tex +++ b/figures/buttonfeedback.tex @@ -1,8 +1,6 @@ %!TEX root = ../hdrmain.tex \begin{figure}[htb] - \definecolor{cellred}{rgb} {0.98,0.17,0.15} - \definecolor{cellblue}{rgb} {0.17,0.60,0.99} \def\scale{1mm} \newcommand{\nodec}[3]{\node[x=1mm,y=1mm, draw, fill=white, circle, align=center, text width=4mm, minimum size=1mm] (#3) at (#1) {\small #2};} @@ -21,19 +19,19 @@ \nodec{45,10}{$3$}{three}; \nodec{0,10}{$3'$}{threeb}; - \draw[x=\scale, y=\scale, ->, -stealth', draw=cellred, ultra thick] (0,20) -- (one); - \draw[x=\scale, y=\scale, ->, -stealth', draw=cellred, ultra thick] (one) -- (45,20) -- (oneb); - \draw[x=\scale, y=\scale, ->, -stealth', draw=cellred, ultra thick] (oneb) -- (two); + \draw[x=\scale, y=\scale, ->, -stealth', draw=myred, ultra thick] (0,20) -- (one); + \draw[x=\scale, y=\scale, ->, -stealth', draw=myred, ultra thick] (one) -- (45,20) -- (oneb); + \draw[x=\scale, y=\scale, ->, -stealth', draw=myred, ultra thick] (oneb) -- (two); - \draw[x=\scale, y=\scale, ->, -stealth', draw=cellblue, ultra thick] (two) -- (three); - \draw[x=\scale, y=\scale, ->, -stealth', draw=cellblue, ultra thick] (three) -- (15,20) -- (threeb); + \draw[x=\scale, y=\scale, ->, -stealth', draw=myblue, ultra thick] (two) -- (three); + \draw[x=\scale, y=\scale, ->, -stealth', draw=myblue, ultra thick] (three) -- (15,20) -- (threeb); \draw[x=\scale, y=\scale, draw, ultra thick, dashed] (one) -- (oneb); \draw[x=\scale, y=\scale, draw, ultra thick, dashed] (three) -- (threeb); - \draw[x=\scale, y=\scale, draw=cellred, ultra thick] (90,40) -- (98,40); + \draw[x=\scale, y=\scale, draw=myred, ultra thick] (90,40) -- (98,40); \node[x=\scale, y=\scale, anchor=west] () at (100,40){Press curve}; - \draw[x=\scale, y=\scale, draw=cellblue, ultra thick] (90,32) -- (98,32); + \draw[x=\scale, y=\scale, draw=myblue, ultra thick] (90,32) -- (98,32); \node[x=\scale, y=\scale, anchor=west] () at (100,32){Release curve}; \draw[x=\scale, y=\scale, draw, ultra thick, dashed] (90,24) -- (98,24); \node[x=\scale, y=\scale, anchor=west] () at (100,24){Jump}; diff --git a/figures/flexuralstiffnesses.tex b/figures/flexuralstiffnesses.tex index ef5e0f2..7b3792b 100644 --- a/figures/flexuralstiffnesses.tex +++ b/figures/flexuralstiffnesses.tex @@ -81,9 +81,9 @@ \barrel{11.2}{20}{10}{9}{myblue} \screw{9}{2}{0.5}{5}{myblue!50} \end{scope} - \draw[size] (-4.5,-21.5) -- (4.5,-21.5) node[midway, below, inner sep=0mm, outer sep=1.5mm]{\scriptsize $9mm$}; + \draw[size] (-4.5,-21.5) -- (4.5,-21.5) node[midway, below, inner sep=0mm, outer sep=1.5mm]{\scriptsize \qty{9}{\mm}}; \node[anchor=north] (soft) at (0,-25) {Soft}; - \node[below of=soft] (softstiffness) {\scriptsize $0.1N/mm$}; + \node[below of=soft] (softstiffness) {\scriptsize \qty{0.1}{\newton\per\metre}}; \end{scope} % Medium soft @@ -92,9 +92,9 @@ \barrel{11.2}{20}{10}{8}{myblue} \screw{9}{2}{0.5}{5}{myblue!50} \end{scope} - \draw[size] (-4,-21.5) -- (4,-21.5) node[midway, below, inner sep=0mm, outer sep=1.5mm]{\scriptsize $8mm$}; + \draw[size] (-4,-21.5) -- (4,-21.5) node[midway, below, inner sep=0mm, outer sep=1.5mm]{\scriptsize \qty{8}{\mm}}; \node[anchor=north] (mediumsoft) at (0,-25) {Medium soft}; - \node[below of=mediumsoft] (mediumsoftstiffness) {\scriptsize $0.123N/mm$}; + \node[below of=mediumsoft] (mediumsoftstiffness) {\scriptsize \qty{0.123}{\newton\per\metre}}; \end{scope} % Medium @@ -103,9 +103,9 @@ \barrel{11.2}{20}{10}{7.5}{myblue} \screw{9}{2}{0.5}{5}{myblue!50} \end{scope} - \draw[size] (-3.75,-21.5) -- (3.75,-21.5) node[midway, below, inner sep=0mm, outer sep=1.5mm]{\scriptsize $7.5mm$}; + \draw[size] (-3.75,-21.5) -- (3.75,-21.5) node[midway, below, inner sep=0mm, outer sep=1.5mm]{\scriptsize \qty{7.5}{\mm}}; \node[anchor=north] (medium) at (0,-25) {Medium}; - \node[below of=medium] (mediumstiffness) {\scriptsize $0.129N/mm$}; + \node[below of=medium] (mediumstiffness) {\scriptsize \qty{0.129}{\newton\per\metre}}; \end{scope} % Medium hard @@ -114,9 +114,9 @@ \barrel{11.2}{20}{10}{7}{myblue} \screw{9}{2}{0.5}{5}{myblue!50} \end{scope} - \draw[size] (-3.5,-21.5) -- (3.5,-21.5) node[midway, below, inner sep=0mm, outer sep=1.5mm]{\scriptsize $7mm$}; + \draw[size] (-3.5,-21.5) -- (3.5,-21.5) node[midway, below, inner sep=0mm, outer sep=1.5mm]{\scriptsize \qty{7}{\mm}}; \node[anchor=north] (mediumhard) at (0,-25) {Medium hard}; - \node[below of=mediumhard] (mediumhardstiffness) {\scriptsize $0.134N/mm$}; + \node[below of=mediumhard] (mediumhardstiffness) {\scriptsize \qty{0.134}{\newton\per\metre}}; \end{scope} % Hard @@ -125,9 +125,9 @@ \barrel{11.2}{20}{10}{6}{myblue} \screw{9}{2}{0.5}{5}{myblue!50} \end{scope} - \draw[size] (-3,-21.5) -- (3,-21.5) node[midway, below, inner sep=0mm, outer sep=1.5mm]{\scriptsize $6mm$}; + \draw[size] (-3,-21.5) -- (3,-21.5) node[midway, below, inner sep=0mm, outer sep=1.5mm]{\scriptsize \qty{6}{\mm}}; \node[anchor=north] (hard) at (0,-25) {Hard}; - \node[below of=hard] (hardstiffness) {\scriptsize $0.139N/mm$}; + \node[below of=hard] (hardstiffness) {\scriptsize \qty{0.139}{\newton\per\metre}}; \end{scope} \end{tikzpicture} diff --git a/figures/hapticpath.tex b/figures/hapticpath.tex index f68b97c..7110075 100644 --- a/figures/hapticpath.tex +++ b/figures/hapticpath.tex @@ -2,17 +2,15 @@ \begin{figure}[htb] \centering -\definecolor{cellred}{rgb} {0.98,0.17,0.15} -\definecolor{cellblue}{rgb} {0.17,0.60,0.99} \newcommand{\labelcell}[2]{ \node[minimum width=1.0cm, minimum height=.75cm,text width=3.0cm, align=center, outer sep=0, column sep=0cm](#1) {\textbf{#2}}; } \newcommand{\bluecell}[2]{ - \node[minimum width=3.0cm, minimum height=1.3cm,fill=cellblue, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; + \node[minimum width=3.0cm, minimum height=1.3cm,fill=myblue, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; } \newcommand{\redcell}[2]{ - \node[minimum width=3.0cm, minimum height=1.3cm,fill=cellred, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; + \node[minimum width=3.0cm, minimum height=1.3cm,fill=myred, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; } \tikzexternalenable \begin{tikzpicture} diff --git a/figures/lexical.tex b/figures/lexical.tex index fea0fc9..5c53559 100644 --- a/figures/lexical.tex +++ b/figures/lexical.tex @@ -16,33 +16,36 @@ (12,0) sin (15,10) cos (18,0) sin (21,-10) cos (24,0); \node[x=1mm,y=1mm, anchor=center] () at (20,-9){Frequency}; - - \draw[x=\sx,y=\sy, xshift=55mm, ultra thick] + \end{tikzpicture}\hfill + \begin{tikzpicture} + \draw[x=\sx,y=\sy, ultra thick] (0,0) sin (1,10) cos (2,0) sin (3,-10) cos (4,0) sin (5,10) cos (6,0) sin (7,-10) cos (8,0) sin (9,10) cos (10,0) sin (11,-10) cos (12,0); \draw[x=\sx,y=\sy, ultra thick] - (70,0) sin (71,5) cos (72,0) sin (73,-5) cos (74,0) sin (75,5) cos (76,0) sin (77,-5) cos (78,0) sin (79,5) cos (80,0) sin (81,-5) cos (82,0); - \node[x=1mm,y=1mm, anchor=center] () at (68,-9){Amplitude}; - + (15,0) sin (16,5) cos (17,0) sin (18,-5) cos (19,0) sin (19,5) cos (20,0) sin (21,-5) cos (22,0) sin (23,5) cos (24,0) sin (25,-5) cos (26,0); + \node[x=1mm,y=1mm, anchor=center] () at (13,-9){Amplitude}; + \end{tikzpicture}\hfill + \begin{tikzpicture} + \draw[x=\sx,y=\sy, ultra thick] + (0,0) sin (1,10) cos (2,0) sin (3,-10) cos (4,0) sin (5,10) cos (6,0) sin (7,-10) cos (8,0); \draw[x=\sx,y=\sy, ultra thick] - (99,0) sin (100,10) cos (101,0) sin (102,-10) cos (103,0) sin (104,10) cos (105,0) sin (106,-10) cos (107,0); + (11,0) sin (12,10) cos (13,0) sin (14,-10) cos (15,0) sin (16,10) cos (17,0) sin (18,-10) cos (19,0) sin (20,10) cos (21,0) sin (22,-10) cos (23,0) sin (24,10) cos (25,0) sin (26,-10) cos (27,0); + \node[x=1mm,y=1mm, anchor=center] () at (13,-9){Duration}; + \end{tikzpicture}\hfill + \begin{tikzpicture} \draw[x=\sx,y=\sy, ultra thick] - (110,0) sin (111,10) cos (112,0) sin (113,-10) cos (114,0) sin (115,10) cos (116,0) sin (117,-10) cos (118,0) sin (119,10) cos (120,0) sin (121,-10) cos (122,0) sin (123,10) cos (124,0) sin (125,-10) cos (126,0); - \node[x=1mm,y=1mm, anchor=center] () at (112,-9){Duration}; - - \draw[x=\sx,y=\sy, xshift=140mm, ultra thick] (0,0) sin (1,10) cos (2,0) sin (3,-10) cos (4,0) sin (5,10) cos (6,0) sin (7,-10) cos (8,0) sin (9,10) cos (10,0) sin (11,-10) cos (12,0); - \draw[x=\sx,y=\sy, xshift=155mm, ultra thick] + \draw[x=\sx,y=\sy, xshift=15mm, ultra thick] (0,0) -- (0,10) -- (2,10) -- (2,-10) -- (4,-10) -- (4,10) -- (6,10) -- (6,-10) -- (8,-10) -- (8,10) -- (10,10) -- (10,-10) -- (12,-10) -- (12,0); - \node[x=1mm,y=1mm, anchor=center] () at (153,-9){Shape}; + \node[x=1mm,y=1mm, anchor=center] () at (13,-9){Shape}; \end{tikzpicture} \tikzexternaldisable \caption[Haptic vocabulary.]{Four parameters of the vibrotactile output vocabulary: frequency, amplitude, duration and shape.} diff --git a/figures/motorpath.tex b/figures/motorpath.tex index c81b731..8e8bf04 100644 --- a/figures/motorpath.tex +++ b/figures/motorpath.tex @@ -2,17 +2,14 @@ \begin{figure}[htb] \centering - \definecolor{cellred}{rgb} {0.98,0.17,0.15} - \definecolor{cellblue}{rgb} {0.17,0.60,0.99} - \newcommand{\labelcell}[2]{ \node[minimum width=1.0cm, minimum height=.75cm,text width=3.0cm, align=center, outer sep=0, column sep=0cm](#1) {\textbf{#2}}; } \newcommand{\bluecell}[2]{ - \node[minimum width=3.0cm, minimum height=1.3cm,fill=cellblue, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; + \node[minimum width=3.0cm, minimum height=1.3cm,fill=myblue, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; } \newcommand{\redcell}[2]{ - \node[minimum width=3.0cm, minimum height=1.3cm,fill=cellred, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; + \node[minimum width=3.0cm, minimum height=1.3cm,fill=myred, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; } \tikzexternalenable \begin{tikzpicture} diff --git a/figures/piezotrigger.tex b/figures/piezotrigger.tex index bf7db8a..d077b1e 100644 --- a/figures/piezotrigger.tex +++ b/figures/piezotrigger.tex @@ -8,7 +8,7 @@ \tikzexternalenable \begin{tikzpicture}[x=1mm,y=1mm] \small - \coordinate (threshold) at (0,45); + \coordinate (threshold) at (13,45); \coordinate (fingerpoint) at (28.8,26); \coordinate (buttonpoint) at (56.1,27); \coordinate (piezopoint) at (83,45); @@ -17,7 +17,7 @@ \coordinate (piezobottom) at ($(piezopoint) - (0,32)$); % \node[anchor=south west,inner sep=0,outer sep=0] (oscillo) { - \includegraphics[width=\columnwidth]{figures/piezotrigger.png} + \includegraphics[width=0.98\columnwidth]{figures/piezotrigger.png} }; %\draw[help lines] (0,0) grid (170,80); \node[customblue, anchor=north] (finger) at (fingerbottom) {Finger contact}; @@ -26,8 +26,8 @@ % Threshold - \draw[draw=violet, ultra thick] (threshold) to ($(threshold) + (168,0)$); - \node[violet, anchor=south east] () at ($(threshold) + (160,0)$) {$1.5V$ Threshold}; + \draw[draw=violet, ultra thick] (threshold) to ($(threshold) + (147,0)$); + \node[violet, anchor=south east] () at ($(threshold) + (135,0)$) {\qty{1.5}{\volt} Threshold}; % Arrows \draw[draw=customblue, -stealth', very thick, anchor=north] (fingerbottom) to (fingerpoint); diff --git a/figures/semantic.tex b/figures/semantic.tex index f76cb5c..0af749b 100644 --- a/figures/semantic.tex +++ b/figures/semantic.tex @@ -2,29 +2,27 @@ \begin{figure}[htb] \centering - \definecolor{cellred}{rgb} {0.98,0.17,0.15} - \definecolor{cellblue}{rgb} {0.17,0.60,0.99} % \newcommand{\labelcell}[2]{ \node[minimum width=1.0cm, minimum height=.75cm,text width=3.0cm, align=center, outer sep=0, column sep=0cm](#1) {\textbf{#2}}; } \newcommand{\bluecell}[2]{ - \node[minimum width=3.0cm, minimum height=1cm,fill=cellblue, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; + \node[minimum width=3.0cm, minimum height=1cm,fill=myblue, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; } \newcommand{\redcell}[2]{ - \node[minimum width=3.0cm, minimum height=1cm,fill=cellred, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; + \node[minimum width=3.0cm, minimum height=1cm,fill=myred, text=white,text width=3.5cm, align=center, rounded corners=2ex, outer sep=0](#1) {#2}; } \newcommand{\mediumbluecell}[2]{ - \node[minimum width=2.0cm, minimum height=6mm,fill=cellblue, text=white,text width=2.0cm, align=center, rounded corners=2mm, outer sep=0](#1) {\footnotesize #2}; + \node[minimum width=2.0cm, minimum height=6mm,fill=myblue, text=white,text width=2.0cm, align=center, rounded corners=2mm, outer sep=0](#1) {\footnotesize #2}; } \newcommand{\mediumredcell}[2]{ - \node[minimum width=2.0cm, minimum height=6mm,fill=cellred, text=white,text width=2.0cm, align=center, rounded corners=2mm, outer sep=0](#1) {\footnotesize #2}; + \node[minimum width=2.0cm, minimum height=6mm,fill=myred, text=white,text width=2.0cm, align=center, rounded corners=2mm, outer sep=0](#1) {\footnotesize #2}; } \newcommand{\smallbluecell}[2]{ - \node[minimum width=8mm, minimum height=5mm,fill=cellblue, text=white,text width=8mm, align=center, rounded corners=1mm, outer sep=0](#1) {\scriptsize #2}; + \node[minimum width=8mm, minimum height=5mm,fill=myblue, text=white,text width=8mm, align=center, rounded corners=1mm, outer sep=0](#1) {\scriptsize #2}; } \newcommand{\smallredcell}[2]{ - \node[minimum width=8mm, minimum height=5mm,fill=cellred, text=white,text width=8mm, align=center, rounded corners=1mm, outer sep=0](#1) {\scriptsize #2}; + \node[minimum width=8mm, minimum height=5mm,fill=myred, text=white,text width=8mm, align=center, rounded corners=1mm, outer sep=0](#1) {\scriptsize #2}; } \tikzexternalenable \begin{tikzpicture} diff --git a/figures/sevenstages.tex b/figures/sevenstages.tex index bf88a9a..f04c5d6 100644 --- a/figures/sevenstages.tex +++ b/figures/sevenstages.tex @@ -35,6 +35,6 @@ % \node[anchor=south, minimum height=0.6cm, minimum width=6cm, thick, draw=black!20,fill=black!20] at (nd.north east) {Computing affordance}; \end{tikzpicture} \tikzexternaldisable - \caption{Norman's seven stages of action~\protect\cite{norman02}. It describes how people interact with their environment.} + \caption[Seven stages of action]{Norman's seven stages of action~\protect\cite{norman02}. It describes how people interact with their environment.} \label{fig:sevenstages} \end{figure} diff --git a/figures/stimtacpatterns.tex b/figures/stimtacpatterns.tex index fb30d02..32fd77b 100644 --- a/figures/stimtacpatterns.tex +++ b/figures/stimtacpatterns.tex @@ -1,7 +1,7 @@ %!TEX root = ../hdrmain.tex \begin{figure}[htb] - \definecolor{cellblue}{rgb} {0.17,0.60,0.99} + \definecolor{myblue}{rgb} {0.17,0.60,0.99} \def\dx{80} \def\dy{40} \def\spacing{5} @@ -9,7 +9,6 @@ \linespread{1.0} \def\n{7} \pgfmathsetmacro{\nn}{\n - 1} - \centering \tikzexternalenable @@ -22,7 +21,7 @@ \pgfmathsetmacro{\d}{\dx / \m} \pgfmathsetmacro{\mm}{\m - 1} \foreach \j in {0,...,\mm} { - \fill[x=\scale,y=\scale,color=cellblue] (\j*\d,0) rectangle (\j*\d + \d/2,\dy); + \fill[x=\scale,y=\scale,color=myblue] (\j*\d,0) rectangle (\j*\d + \d/2,\dy); } \draw[x=\scale,y=\scale,color=black] (0,0) rectangle (\dx,\dy); \end{scope} @@ -41,7 +40,7 @@ \pgfmathsetmacro{\d}{\dy / \m} \pgfmathsetmacro{\mm}{\m - 1} \foreach \j in {0,...,\mm} { - \fill[x=\scale,y=\scale,color=cellblue] (0,\dy - \j*\d) rectangle (\dx,\dy - \j*\d - \d/2); + \fill[x=\scale,y=\scale,color=myblue] (0,\dy - \j*\d) rectangle (\dx,\dy - \j*\d - \d/2); } \draw[x=\scale,y=\scale,color=black] (0,0) rectangle (\dx,\dy); \end{scope} @@ -51,22 +50,24 @@ \vspace{1mm} - \begin{tikzpicture} %squares + \begin{tikzpicture}[x=\scale,y=\scale] %squares \foreach \i in {0,...,\nn} { \pgfmathsetmacro{\xs}{\i*(\dx+\spacing)*\scale} \begin{scope}[xshift=\xs] %\clip[x=\scale,y=\scale,draw] (0,0) rectangle (\dx,\dy); - \pgfmathsetmacro{\mx}{2^(\i+1)} - \pgfmathsetmacro{\my}{2^\i} - \pgfmathsetmacro{\d}{\dx / \mx} - \pgfmathsetmacro{\mxx}{\mx-1} - \pgfmathsetmacro{\myy}{\my-1} - \foreach \j in {0,...,\mxx} { - \foreach \k in {0,...,\myy} { - \pgfmathsetmacro{\res}{int(Mod(\j + \k, 2))} - \ifthenelse{\res = 0}{ - \fill[x=\scale,y=\scale,color=cellblue] (\j*\d,\dy - \k*\d) rectangle (\j*\d + \d,\dy - \k*\d - \d); - }{} + \pgfmathsetmacro{\max}{2 * 2^\i} + \pgfmathsetmacro{\d}{\dx / \max} + \pgfmathsetmacro{\nb}{4^\i - 1} + \pgfmathsetmacro{\maxrow}{2^(\i+1)} + \foreach \j in {0,...,\nb} { + \pgfmathsetmacro{\px}{int(Mod(\j * 2, \maxrow)) * \d} + \pgfmathsetmacro{\ry}{int(\j * 2/ \maxrow)} + \pgfmathsetmacro{\py}{\ry * \d} + \pgfmathsetmacro{\res}{int(Mod(\ry, 2))} + \ifthenelse{\res = 0}{ + \fill[color=myblue] (\px,\dy-\py) rectangle ++(\d,-\d); + }{ + \fill[color=myblue] (\d+\px,\dy-\py) rectangle ++(\d,-\d); } } \draw[x=\scale,y=\scale,color=black] (0,0) rectangle (\dx,\dy); @@ -93,7 +94,7 @@ \pgfmathsetmacro{\res}{int(Mod(\j + \k, 2))} \pgfmathsetmacro{\resb}{int(Mod(\k, 2))} \ifthenelse{\res = 0 \AND \resb = 0}{ - \fill [x=\scale,y=\scale,color=cellblue] (\j*\d+\dd,\dy-\k*\d-\dd) circle (\dd); + \fill [x=\scale,y=\scale,color=myblue] (\j*\d+\dd,\dy-\k*\d-\dd) circle (\dd); }{} } } @@ -128,7 +129,7 @@ \wlog{\i ; \j ; nbc \nbc ; cs \cs ; ci \ci ; d \d} %\node[x=\scale,y=\scale, anchor=center] () at (10,(\i*10)) {\ci}; \ifthenelse{\res = 1}{ - \fill [x=\scale,y=\scale,color=cellblue] (\dx / 2,\dy / 2) circle (\d); + \fill [x=\scale,y=\scale,color=myblue] (\dx / 2,\dy / 2) circle (\d); }{ \fill [x=\scale,y=\scale,color=white] (\dx / 2,\dy / 2) circle (\d); } diff --git a/figures/syntactic.tex b/figures/syntactic.tex index c7aace0..a1544c1 100644 --- a/figures/syntactic.tex +++ b/figures/syntactic.tex @@ -14,8 +14,9 @@ (38,0) sin (41,10) cos (44,0) sin (48,-10) cos (52,0) sin (57,10) cos (62,0); \node[x=1mm,y=1mm, anchor=center] () at (18,-13){Frequency modulation}; - - \draw[x=\sx,y=\sy, xshift=71mm, ultra thick] + \end{tikzpicture}\hfill + \begin{tikzpicture} + \draw[x=\sx,y=\sy, ultra thick] (0,0) sin (1,5) cos (2,0) sin (3,-5) cos (4,0) sin (5,7) cos (6,0) sin (7,-7) cos (8,0) sin (9,9) cos (10,0) sin (11,-9) cos @@ -24,9 +25,10 @@ (20,0) sin (21,7) cos (22,0) sin (23,-7) cos (24,0) sin (25,5) cos (26,0) sin (27,-5) cos (28,0); - \node[x=1mm,y=1mm, anchor=center] () at (84,-13){Amplitude modulation}; - - \draw[x=0.5mm,y=\sy, xshift=140mm, ultra thick] + \node[x=1mm,y=1mm, anchor=center] () at (14,-13){Amplitude modulation}; + \end{tikzpicture}\hfill + \begin{tikzpicture} + \draw[x=0.5mm,y=\sy, ultra thick] (0,0) sin (1,10) cos (2,0) sin (3,-10) cos (4,0) sin (5,10) cos (6,0) sin (7,-10) cos (8,0) sin (9,10) cos (10,0) sin (11,-10) cos @@ -39,7 +41,7 @@ (48,0) sin (49,10) cos (50,0) sin (51,-10) cos (52,0) sin (53,10) cos (54,0) sin (55,-10) cos (56,0); - \node[x=1mm,y=1mm, anchor=center] () at (154,-13){Rhythm}; + \node[x=1mm,y=1mm, anchor=center] () at (14,-13){Rhythm}; \end{tikzpicture} \tikzexternaldisable \caption[Haptic phrases.]{Three examples of haptic phrases: frequency modulation, amplitude modulation and rhythm.} diff --git a/figures/tactileillusions.tex b/figures/tactileillusions.tex index 67494aa..fe0d269 100644 --- a/figures/tactileillusions.tex +++ b/figures/tactileillusions.tex @@ -1,10 +1,6 @@ %!TEX root = ../hdrmain.tex -\begin{figure}[htb] - \definecolor{cellred}{rgb} {0.98,0.17,0.15} - \definecolor{virt}{rgb} {0.98,0.17,0.15} - \definecolor{cellblue}{rgb} {0.17,0.60,0.99} - +\begin{figure}[htb] \newcommand{\actuator}[3]{\node[fill=#3, text=white, circle, minimum size=1cm] at (#1) {#2};} \newcommand{\vibrdot}[2]{\node[fill=#2, circle, minimum size=1mm] at (#1) {};} \tikzexternalenable @@ -46,7 +42,7 @@ (0,12) -- (0,0) -- (64,0) node [below, xshift=-5] {$time$}; \node[anchor=west] () at (2,12){Sensation}; \foreach \x in {0,...,8} { - \vibrdot{\x * 8, \x}{virt} + \vibrdot{\x * 8, \x}{myred} } \node[anchor=center] () at (32,-5){Saltation or Cutaneous rabbit illusion}; \end{scope} diff --git a/figures/tactilepattern.tex b/figures/tactilepattern.tex index 5682dc4..4b5f487 100644 --- a/figures/tactilepattern.tex +++ b/figures/tactilepattern.tex @@ -1,7 +1,6 @@ %!TEX root = ../hdrmain.tex \begin{figure}[htb] - \definecolor{cellblue}{rgb} {0.17,0.60,0.99} \def\dx{75} \def\dy{40} \def\scale{0.26mm} @@ -13,20 +12,20 @@ \begin{scope}[] \node[x=\scale,y=\scale, anchor=center] () at (\dx/2,-10){Constant}; - \fill[x=\scale,y=\scale,color=cellblue] (0,0) rectangle (\dx,\dy); + \fill[x=\scale,y=\scale,color=myblue] (0,0) rectangle (\dx,\dy); \draw[x=\scale,y=\scale,color=black] (0,0) rectangle (\dx,\dy); \end{scope} \begin{scope}[xshift=3cm] \pgfmathsetmacro{\x}{\dx/2} - \fill[x=\scale,y=\scale,color=cellblue] (0,0) rectangle (\x,\dy); + \fill[x=\scale,y=\scale,color=myblue] (0,0) rectangle (\x,\dy); \node[x=\scale,y=\scale, anchor=center] () at (\dx/2,-10){Step}; \draw[x=\scale,y=\scale,color=black] (0,0) rectangle (\dx,\dy); \end{scope} \begin{scope}[xshift=6cm] \pgfmathsetmacro{\x}{\dx/2} - \fill[x=\scale,y=\scale,color=cellblue] (\x-3,0) rectangle (\x+3,\dy); + \fill[x=\scale,y=\scale,color=myblue] (\x-3,0) rectangle (\x+3,\dy); \node[x=\scale,y=\scale, anchor=center] () at (\dx/2,-10){Shape}; \draw[x=\scale,y=\scale,color=black] (0,0) rectangle (\dx,\dy); \end{scope} @@ -37,10 +36,10 @@ \pgfmathsetmacro{\p}{\dx / (\n + \dc - 1)} \pgfmathsetmacro{\w}{\dc*\p} \pgfmathsetmacro{\nn}{\n-1} - \fill[x=\scale,y=\scale,color=cellblue] (0,0) rectangle (\w,\dy); + \fill[x=\scale,y=\scale,color=myblue] (0,0) rectangle (\w,\dy); \foreach \i in {1,...,\nn} { \pgfmathsetmacro{\d}{\i*\p} - \fill[x=\scale,y=\scale,color=cellblue] (\d,0) rectangle (\d+\w,\dy); + \fill[x=\scale,y=\scale,color=myblue] (\d,0) rectangle (\d+\w,\dy); } \node[x=\scale,y=\scale, anchor=center] () at (\dx/2,-10){Field}; \draw[x=\scale,y=\scale,color=black] (0,0) rectangle (\dx,\dy); @@ -54,7 +53,7 @@ \pgfmathsetmacro{\d}{0} \foreach \i [remember=\dd as \d (initially 0)] in {1,...,\n} { \pgfmathsetmacro{\w}{\dc * \p * \s^\i} - \fill[x=\scale,y=\scale,color=cellblue] (\d,0) rectangle (\d+\w,\dy); + \fill[x=\scale,y=\scale,color=myblue] (\d,0) rectangle (\d+\w,\dy); \pgfmathsetmacro{\dd}{\d + \p * \s^\i} } \node[x=\scale,y=\scale, anchor=center] () at (\dx/2,-10){Gradient}; @@ -67,7 +66,7 @@ \foreach \i in {1,...,\n} { \pgfmathrandominteger{\r}{0}{1} \ifthenelse{\r = 0}{ - \fill[x=\scale,y=\scale,color=cellblue] (\i*\w,0) rectangle (\i*\w+\w,\dy); + \fill[x=\scale,y=\scale,color=myblue] (\i*\w,0) rectangle (\i*\w+\w,\dy); }{} } \node[x=\scale,y=\scale, anchor=center] () at (\dx/2,-10){Random}; diff --git a/figures/tactiletexture.tex b/figures/tactiletexture.tex index f85eda5..801d02b 100644 --- a/figures/tactiletexture.tex +++ b/figures/tactiletexture.tex @@ -1,7 +1,6 @@ %!TEX root = ../hdrmain.tex \begin{figure}[htb] - \definecolor{cellblue}{rgb} {0.17,0.60,0.99} \def\dx{654} \def\dy{40} \def\scale{0.26mm} @@ -16,7 +15,7 @@ \def\dc{0.4} \foreach \i in {0,...,\n} { \pgfmathsetmacro{\d}{\i*\w} - \fill[x=\scale,y=\scale,color=cellblue] (\d,0) rectangle (\d+\w*\dc,\dy); + \fill[x=\scale,y=\scale,color=myblue] (\d,0) rectangle (\d+\w*\dc,\dy); } \end{scope} @@ -28,7 +27,7 @@ \pgfmathsetmacro{\d}{0} \foreach \i [remember=\dd as \d (initially 0)] in {1,...,\n} { \pgfmathsetmacro{\w}{\dc * \p * \s^\i} - \fill[x=\scale,y=\scale,color=cellblue] (\d,0) rectangle (\d+\w,\dy); + \fill[x=\scale,y=\scale,color=myblue] (\d,0) rectangle (\d+\w,\dy); \pgfmathsetmacro{\dd}{\d + \p * \s^\i} } \end{scope} @@ -39,7 +38,7 @@ \foreach \i in {1,...,\n} { \pgfmathrandominteger{\r}{0}{1} \ifthenelse{\r = 0}{ - \fill[x=\scale,y=\scale,color=cellblue] (\i*\w,0) rectangle (\i*\w+\w,\dy); + \fill[x=\scale,y=\scale,color=myblue] (\i*\w,0) rectangle (\i*\w+\w,\dy); }{} } \end{scope} @@ -50,7 +49,7 @@ \def\dc{0.6} \foreach \i in {0,...,\n} { \pgfmathsetmacro{\d}{\i*\w} - \fill[x=\scale,y=\scale,color=cellblue] (\d,0) rectangle (\d+\w*\dc,\dy); + \fill[x=\scale,y=\scale,color=myblue] (\d,0) rectangle (\d+\w*\dc,\dy); } \end{scope} @@ -62,7 +61,7 @@ \pgfmathsetmacro{\d}{0} \foreach \i [remember=\dd as \d (initially 0)] in {1,...,\n} { \pgfmathsetmacro{\w}{\dc * \p * \s^\i} - \fill[x=\scale,y=\scale,color=cellblue] (\d,0) rectangle (\d+\w,\dy); + \fill[x=\scale,y=\scale,color=myblue] (\d,0) rectangle (\d+\w,\dy); \pgfmathsetmacro{\dd}{\d + \p * \s^\i} } \end{scope} @@ -79,7 +78,7 @@ \pgfmathsetmacro{\mm}{\m - 1} \foreach \i in {0,...,\nn} { \foreach \j in {0,...,\mm} { - \fill[x=\scale,y=\scale,color=cellblue] (\i * \nw + \j * \mw,0) rectangle (\i * \nw + \j * \mw + \mw * \mdc,\dy); + \fill[x=\scale,y=\scale,color=myblue] (\i * \nw + \j * \mw,0) rectangle (\i * \nw + \j * \mw + \mw * \mdc,\dy); } } \draw[x=\scale,y=\scale,color=black] (0,0) rectangle (\dx,\dy); diff --git a/hdrmain.tex b/hdrmain.tex index 47683d6..a3130fa 100644 --- a/hdrmain.tex +++ b/hdrmain.tex @@ -7,8 +7,8 @@ \author{\Large Thomas Pietrzak} \date{} -%\includeonly{tex/0-titre,tex/2-output,tex/3-input} -\includeonly{tex/0-titre,tex/4-loop} +%\includeonly{tex/0-titre,tex/00-tocs.tex,tex/2-output,tex/3-input} +\includeonly{tex/0-titre,tex/00-tocs.tex,tex/4-loop} \begin{document} @@ -16,8 +16,6 @@ \include{tex/0-titre} \include{tex/00-tocs.tex} - %à supprimer dans la version finale - \tableofcontents \include{tex/00-remerciements} \mainmatter diff --git a/mystyle.sty b/mystyle.sty index 1205102..2ec47cb 100644 --- a/mystyle.sty +++ b/mystyle.sty @@ -16,7 +16,7 @@ \usepackage{lipsum} \usepackage{siunitx} -\sisetup{number-mode=match, per-mode=fraction, range-phrase={--}, range-units = single, product-units = single, list-units = single, output-decimal-marker = {.}} +\sisetup{mode=match, per-mode=symbol, range-phrase={--}, range-units = single, product-units = single, list-units = single, output-decimal-marker = {.}} \usepackage{pgfplots} \usepackage{tikz} @@ -310,7 +310,51 @@ }%chapitres numérotés { }%chapitres non numérotés - {\hfill\contentspage} %numéro de page pour les titres de chapitre + {\hfill\contentspage} %numéro de page + [\addvspace{0cm}]%dessous + + \titlecontents{section} [0pc] + { \addvspace{0pc} }%avant + { + \hspace{3pc}\contentslabel[\thecontentslabel]{2pc}% + }%sections numérotés + {}%sections non numérotés + {% + \titlerule*[0.75em]{.} + \contentspage} %numéro de page + [\addvspace{0cm}]%dessous + + \titlecontents{subsection} [0pc] + { \addvspace{0pc} }%avant + { + \hspace{4.5pc}\contentslabel[\thecontentslabel]{2.5pc}% + }%subsections numérotés + {}%subsections non numérotés + {% + \titlerule*[0.75em]{.} + \contentspage} %numéro de page + [\addvspace{0cm}]%dessous + + \titlecontents{subsubsection} [0pc] + { \addvspace{0pc} }%avant + { + \hspace{6.5pc}\contentslabel[\thecontentslabel]{3.5pc}% + }%subsubsections numérotés + {}%subsubsections non numérotés + {% + \titlerule*[0.75em]{.} + \contentspage} %numéro de page + [\addvspace{0cm}]%dessous + +\titlecontents{figure} [0pc] + { \addvspace{0pc} }%avant + { + \hspace{3pc}\contentslabel[\thecontentslabel]{3pc}% + }%figures numérotés + {}%figures non numérotés + {% + \hspace{2mm}\titlerule*[0.75em]{.} + \contentspage} %numéro de page [\addvspace{0cm}]%dessous \makeatother diff --git a/tex/00-tocs.tex b/tex/00-tocs.tex index e595dff..07403df 100644 --- a/tex/00-tocs.tex +++ b/tex/00-tocs.tex @@ -6,8 +6,8 @@ \listoffigures \cleardoublepage -\listoftables -\cleardoublepage +% \listoftables +% \cleardoublepage -\listofdefinitions -\cleardoublepage +% \listofdefinitions +% \cleardoublepage diff --git a/tex/2-output.tex b/tex/2-output.tex index bc775ee..bfb21e6 100644 --- a/tex/2-output.tex +++ b/tex/2-output.tex @@ -424,8 +424,6 @@ We distinguish two variations. In set A, each value is represented by a series of short pulses, separated by short pauses. In set B, a continuous vibration represents each value with the duration corresponding to the value. -\newpage - The disadvantage of representing only the value is that even if the user has an idea of the current value, there is no clue about the distance between this value and the maximum value. Introducing a scale enables the positioning of a value relative to the beginning and the end of a progression. Sets C-E represent both the value and the scale of a progression in several ways. diff --git a/tex/3-input.tex b/tex/3-input.tex index 76a91ad..be7e37d 100644 --- a/tex/3-input.tex +++ b/tex/3-input.tex @@ -463,12 +463,12 @@ We evaluate the interaction with the device to make sure that users can use it t However, we want to let such serendipitous behavior happen because it makes interaction with the device richer. \begin{figure}[htb] - \includegraphics[height=5cm]{figures/flexstylus-pengrip} + \includegraphics[height=48mm]{figures/flexstylus-pengrip} \hfill - \includegraphics[height=5cm]{figures/flexstylus-joystickgrip} + \includegraphics[height=48mm]{figures/flexstylus-joystickgrip} \hfill - \includegraphics[height=3cm]{figures/flexstylus-rollgrip} - \caption[Flexible pen grips]{Three example of grips with a flexible pen. The pen grip, the joystick grip and the rool grip.} + \includegraphics[height=29mm]{figures/flexstylus-rollgrip} + \caption[Flexible pen grips]{Three types of grips with a flexible pen. The pen grip, the joystick grip and the rool grip.} \label{fig:flexstylus} \end{figure} -- 2.30.2