Skip to content

Commit

Permalink
added boxes around images
Browse files Browse the repository at this point in the history
  • Loading branch information
@Bilchreis
Bilchreis committed Jun 26, 2024
1 parent 265d997 commit 35e6b3a
Show file tree
Hide file tree
Showing 8 changed files with 78 additions and 33 deletions.
48 changes: 31 additions & 17 deletions motivation/motivation.tex
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\documentclass[margin=10pt,convert=pdf2svg]{standalone}
\documentclass[margin=10pt]{standalone}
\usepackage{color,xcolor}

\usepackage[utf8]{inputenc}
Expand All @@ -12,7 +12,7 @@
minimum width = 3em, align=center, inner sep=1em,node distance=1em,font = \huge},
group/.style = {color=black,thin,rounded corners=0.8em, line width=1pt,rectangle,fill = black!5},
objectinst/.style = {fill=white,draw, thick,line width=1.5pt, rectangle, minimum height = 3em,
minimum width = 3em, align=center, inner sep=1em,node distance=3.8cm,font = \large},
minimum width = 3em, align=center, inner sep=1em,node distance=2.5cm,font = \large},
objectecs/.style = {fill=white,draw, thick,line width=1.5pt, rectangle, minimum height = 3em,
minimum width = 3em, align=center, inner sep=1em,node distance=3.8cm,font = \large },
instarr/.style = {latex-latex,line width = 2.5pt, draw = black!50 },
Expand All @@ -24,9 +24,10 @@



\begin{tikzpicture}[auto, line width=2pt, node distance=2cm, >=triangle 45,scale=1.7, every node/.style={scale=1.3},font = \large]
\draw [rounded corners=15pt,fill = black!4](-4.9,-12.6) rectangle (17.0,1.3);
\makeGroup{\larger Experimental Control Systems}{5.5}{-3.1}{10.5}{10.5} {blue!5}
\begin{tikzpicture}[auto, node distance=2cm, >=triangle 45,font = \large]
\draw [box](-6.2,-17) rectangle (24.5,1.7);

\makeGroup{\Large Experimental Control Systems}{8}{-3.1}{14.5}{15} {blue!5}
\draw


Expand All @@ -42,43 +43,56 @@
node at (0,0)[object] (seeover){\textbf{Mobile}\\Sample Environment Equipment}


% BLUESKY LOGO
node [objectecs,right = of see,yshift = -4cm,xshift = 0.2cm](blueskyhzb){\includegraphics[height=1.5cm]{../img/bluesky-logo-dark.eps}}

% TANGO LOGO
node [objectecs,below = of blueskyhzb.west,anchor=west](tangodesy){\includegraphics[height=1.5cm]{../img/1200px-TANGO_controls_logo.png}}

% NICOS LOGO
node [objectecs, below = of tangodesy.west,anchor=west , yshift = -1.5cm](nicos){\includegraphics[height=1.5cm]{../img/nicos-text.eps}}

%node [objectecs,below = of nicosjülich.west,anchor=west](blueskydotdot){\includegraphics[height=1.5cm]{poster/bluesky-logo-dark.eps}}


%% #### Integrations #####
node [object, left = of blueskyhzb](sohzb){\Large SECoP-Ophyd}
%node [object, left = of blueskydotdot](sodotdot){\textbf{SECoP-Ophyd}}
node [object, left = of tangodesy](stdesy){\Large SECoP-Tango}


node [object, left = of nicos](snpsi){\Large native\\\Large Integration}


node [objectinst,right = of blueskyhzb,anchor=west,xshift = -2.8cm](hzb){\includegraphics[height=1.5cm]{../img/HZB_Logo_A4_RGB.jpg}}
node [objectinst,below = of hzb.west,anchor=west](desy){\includegraphics[height=1.5cm]{../img/desy_logo_3c_web.eps}}

node [objectinst,below = of desy.west,anchor=west,yshift= -0.5cm](psi){\includegraphics[height=1.5cm]{../img/psi.eps}}
node [objectinst,below = of psi.west,anchor=west,yshift = 0.95cm,xshift = -0.4cm](ess){\includegraphics[height=1.5cm]{../img/ess.png}}
node [objectinst,below = of ess.west,anchor=west,yshift = 0.95cm,xshift = -0.4cm](jülich){\includegraphics[height=1.6cm]{../img/mlz-logo.png}}

node [objectecs,left = of ess.west,anchor=west,xshift = -3.5cm ](nicospsi){\includegraphics[height=1.5cm]{../img/nicos-text.eps}}
%### Institutes ####
% HZB
node [objectinst,right = of blueskyhzb.west,anchor=west, xshift = 5cm](hzb){\includegraphics[height=1.5cm]{../img/HZB_Logo_A4_RGB.jpg}}

node [object, left = of nicospsi](snpsi){\Large native\\\Large Integration}
% DESY
node [objectinst,right = of tangodesy.west,anchor=west, xshift = 5cm](desy){\includegraphics[height=1.5cm]{../img/desy_logo_3c_web.eps}}


% PSI & ESS & MLZ
node [objectinst,right = of nicos.west,anchor=west, xshift = 5.5cm,yshift = 1.8cm](psi){\includegraphics[height=1.5cm]{../img/psi.eps}}
node [objectinst,right = of nicos.west,anchor=west, xshift = 5cm](ess){\includegraphics[height=1.5cm]{../img/ess.png}}
node [objectinst,right = of nicos.west,anchor=west, xshift = 4.5cm,yshift = -1.8cm](jülich){\includegraphics[height=1.6cm]{../img/mlz-logo.png}}



;


\draw[instarr] (see.south) to [in = 180,out = 270] (snpsi.west);
\draw[instarr,color=SECoPProtocol] (see.south) to [in = 180,out = 270] (snpsi.west);


\draw[instarr] (see.south) to [in = 180,out = 270] (stdesy.west);
\draw[instarr,color=SECoPProtocol] (see.south) to [in = 180,out = 270] (stdesy.west);
%\draw[instarr] (see.south) to [in = 180,out = 270] (sodotdot.west);
\draw[instarr] (see.south) to [in = 180,out = 270] (sohzb.west);
\draw[instarr,color=SECoPProtocol] (see.south) to [in = 180,out = 270] (sohzb.west);

\draw[instarr,-] (sohzb) -- (blueskyhzb);
\draw[instarr,-] (stdesy) -- (tangodesy);
\draw[instarr,-] (snpsi) -- (nicospsi);
\draw[instarr,-] (snpsi) -- (nicos);



Expand Down
4 changes: 2 additions & 2 deletions secop-node-structure/secop-node-structure.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

\tikzset{% NodeInstance
base/.style = {
thick,
line width = 0.13em,
draw = black,
rectangle,
minimum height = 3em,
Expand Down Expand Up @@ -125,7 +125,7 @@


\begin{pgfonlayer}{bbackground layer}
\node [block,draw = black,fill = black!5,thick,inner sep=2em,fit = {(accs_block)(mod_properties)(node_properties)(nodes)(modules)}] (all){};
\node [box,inner sep=2em,fit = {(accs_block)(mod_properties)(node_properties)(nodes)(modules)}] (all){};
\end{pgfonlayer}


Expand Down
10 changes: 9 additions & 1 deletion secop-ophyd-arch/secop-ophyd-arch.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@

\begin{document}


\pgfdeclarelayer{bbackground layer}
\pgfdeclarelayer{background layer}
\pgfdeclarelayer{foreground layer}
\pgfsetlayers{bbackground layer,background layer,main,foreground layer}

\footnotesize
\begin{tikzpicture}[auto, thick, node distance=2cm, >=triangle 45]
Expand Down Expand Up @@ -59,6 +62,11 @@

\draw[<->,draw = black!30] (bluesky)--(epics);
\draw[<->] (instrument) -- (server);


\begin{pgfonlayer}{bbackground layer}
\draw[box] (-10.5,-5.5)rectangle (6.5,2);
\end{pgfonlayer}
\end{tikzpicture}


Expand Down
11 changes: 9 additions & 2 deletions secop-sequence-activate/secop-sequence-activate.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,11 @@


\begin{document}
\pgfdeclarelayer{bbackground layer}
\pgfdeclarelayer{background layer}
\pgfdeclarelayer{foreground layer}
\pgfsetlayers{bbackground layer,background layer,main,foreground layer}

\begin{tikzpicture}


Expand All @@ -39,7 +44,7 @@

\draw

node[active,fill = \ecsscol,below = of node,minimum height = 4cm, yshift = -1cm] (activate){}
node[active,below = of node,minimum height = 4cm, yshift = -1cm] (activate){}



Expand Down Expand Up @@ -97,7 +102,9 @@
\p2= (ecs.south) in
([yshift = -8.5cm]\p1) -- node [messtext]{update t1:value [295.13,\{"t":1505396350.324752\}]}([yshift = -8.5cm]\x2,\y2 - 0.5cm);


\begin{pgfonlayer}{bbackground layer}
\draw [box] (-0.5,0.8)rectangle(9.2,-\lllength-1cm);
\end{pgfonlayer}

\end{tikzpicture}

Expand Down
12 changes: 10 additions & 2 deletions secop-sequence-connect/secop-sequence-connect.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@


\begin{document}

\pgfdeclarelayer{bbackground layer}
\pgfdeclarelayer{background layer}
\pgfdeclarelayer{foreground layer}
\pgfsetlayers{bbackground layer,background layer,main,foreground layer}
\begin{tikzpicture}


Expand All @@ -41,9 +46,9 @@

\draw

node[active,fill = \ecsscol,below = of node, yshift = -1cm] (idn){}
node[active,below = of node, yshift = -1cm] (idn){}

node[active,fill = \ecsscol,below = of idn, yshift = -2cm] (describe){}
node[active,below = of idn, yshift = -2cm] (describe){}

;

Expand All @@ -68,6 +73,9 @@
\p2= (ecs.south) in
(\p1) -- node [messtext]{describing . \{"modules":\{"t1":...\}...\}}(\x2,\y1 - 0.5cm);

\begin{pgfonlayer}{bbackground layer}
\draw [box] (-0.5,0.8)rectangle(9.2,-\lllength-1cm);
\end{pgfonlayer}


\end{tikzpicture}
Expand Down
13 changes: 8 additions & 5 deletions secop-sequence-target-change-2clients/secop-sequence-target-change-2clients.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
\begin{pgfonlayer}{foreground layer}
\draw

node[active,fill = \ecsscol,below = of node, yshift = -1cm] (readstat){}
node[active,below = of node, yshift = -1cm] (readstat){}

node[active,fill = \ecsscol,below = of readstat,minimum height = 4cm, yshift = -1.5cm] (changetarget){}
node[active,below = of readstat,minimum height = 4cm, yshift = -1.5cm] (changetarget){}

node[active,fill = \ecsscol,below = of changetarget, yshift = -2.5cm] (readstat2){}
node[active,below = of changetarget, yshift = -2.5cm] (readstat2){}

node[active,fill = \ecsscol,below = of readstat2, yshift = -2.5cm] (readstat3){}
node[active,below = of readstat2, yshift = -2.5cm] (readstat3){}

;
\end{pgfonlayer}
Expand Down Expand Up @@ -259,7 +259,10 @@
\end{pgfonlayer}



\begin{pgfonlayer}{bbackground layer}
\draw [box] (-0.5,1.5)rectangle(16.2,-\lllength-1cm);
\end{pgfonlayer}


\end{tikzpicture}

Expand Down
8 changes: 6 additions & 2 deletions secop-sequence-target-change-active/secop-sequence-target-change-active.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@

\draw

node[active,fill = \ecsscol,below = of node, yshift = -1cm] (readstat){}
node[active,below = of node, yshift = -1cm] (readstat){}

node[active,fill = \ecsscol,below = of readstat,minimum height = 4cm, yshift = -1.5cm] (changetarget){}
node[active,below = of readstat,minimum height = 4cm, yshift = -1.5cm] (changetarget){}



Expand Down Expand Up @@ -159,6 +159,10 @@
\p3= (ecs_idle_at_target.south) in
(\x2,\y1) -- (\x2,\y3);

\begin{pgfonlayer}{bbackground layer}
\draw [box] (-0.5,0.8)rectangle(9.2,-15);
\end{pgfonlayer}


\end{tikzpicture}

Expand Down
5 changes: 3 additions & 2 deletions tikz-include.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
draw,
minimum width = 0.2cm,
minimum height=1cm,
fill = gray!20,
fill = gray!50,
node distance = 1mm and 1cm
},%
lifeline/.style ={
Expand Down Expand Up @@ -128,7 +128,8 @@
},%
mess/.style ={
->,
>=angle 60
>=angle 60,
line width =0.08em
},%
messtext/.style ={
font= \scriptsize\ttfamily,
Expand Down

0 comments on commit 35e6b3a

Please sign in to comment.