Repository : ssh://git@open-mesh.org/doc
On branches: batman-adv-doc,master
commit 54436d8fbb648d96712d677bd2bbc2abd7a601a2 Author: Sven Eckelmann sven.eckelmann@gmx.de Date: Thu Jan 22 13:17:30 2009 +0100
Include graphics as LaTeX pgf
54436d8fbb648d96712d677bd2bbc2abd7a601a2 .gitignore | 2 +- batmand_howto.tex | 29 ++++++---- img/Makefile | 12 ++-- img/announce_networks.dia | 102 +++++++++++++-------------------- img/multiple_announces.dia | 59 +++++++++++-------- img/multiple_clients.dia | 140 +++++++++++++++++++++++++++------------------ 6 files changed, 181 insertions(+), 163 deletions(-)
diff --git a/.gitignore b/.gitignore index e5ae50c1..f6da6668 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ *.pdf -*.eps *.aux *.log *.out *~ +img/*.tex !img/by-nc-sa.pdf diff --git a/batmand_howto.tex b/batmand_howto.tex index 26db2293..a6efa2aa 100644 --- a/batmand_howto.tex +++ b/batmand_howto.tex @@ -33,8 +33,7 @@
\usepackage[utf8x]{inputenc}
-\usepackage{graphicx} -\graphicspath{{img/}} +\usepackage{graphicx, tikz} \usepackage{hyperref} \usepackage{listings}
@@ -173,9 +172,11 @@ ip-address/netmask. For example, if you are the node A, and you can connect to \emph{other network}, then you can execute a to announce the gateway.
-\begin{center} -\includegraphics[scale=0.5]{announce_networks} -\end{center} +\begin{figure}[H] + \begin{center} + \input{img/announce_networks} + \end{center} +\end{figure}
If the other nodes in the B.A.T.M.A.N. network want to connect to node B after receiving the announce network information form node A, then they will know they @@ -200,9 +201,11 @@ In this case, it means that node A can connect to the whole 192.168.100.x network, because your parameter is /24. So, if you use different netmask values, then the results are different.
-\begin{center} -\includegraphics[scale=0.5]{multiple_announces} -\end{center} +\begin{figure}[H] + \begin{center} + \input{img/multiple_announces} + \end{center} +\end{figure}
Node A can announce more than one network. To announce two networks execute the following command: @@ -236,9 +239,11 @@ like. Deploy it without any arguments to get the current configuration even if changed at runtime.
-\begin{center} -\includegraphics[scale=0.25]{multiple_clients} -\end{center} +\begin{figure}[h] + \begin{center} + \input{img/multiple_clients} + \end{center} +\end{figure}
\begin{verbatim} $ batmand eth1 @@ -460,7 +465,7 @@ Note that you don't set the default route by yourself. \vfill \section*{Copyright} \begin{center} - \includegraphics[scale=0.5]{by-nc-sa} + \includegraphics[scale=0.5]{img/by-nc-sa} \end{center} This work is licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 License. To view a copy of this license, visit diff --git a/img/Makefile b/img/Makefile index 35e7f620..69558d10 100644 --- a/img/Makefile +++ b/img/Makefile @@ -1,16 +1,14 @@ # -*- makefile -*-
DIA_IMAGES = announce_networks.dia multiple_announces.dia multiple_clients.dia -PDF_IMAGES = $(DIA_IMAGES:.dia=.pdf) +TEX_IMAGES = $(DIA_IMAGES:.dia=.tex)
-all: $(PDF_IMAGES) +all: $(TEX_IMAGES)
-.SUFFIXES: .dia .eps .pdf +.SUFFIXES: .dia .tex
-.dia.eps: +.dia.tex: /usr/bin/dia -e $@ $< -.eps.pdf: - /usr/bin/epstopdf --outfile=$@ $<
clean: - rm -f $(PDF_IMAGES) $(PDF_IMAGES:.pdf=.eps) + rm -f $(PDF_IMAGES) $(TEX_IMAGES) diff --git a/img/announce_networks.dia b/img/announce_networks.dia index ba1a16f6..260566fe 100644 --- a/img/announce_networks.dia +++ b/img/announce_networks.dia @@ -65,10 +65,10 @@ <dia:layer name="Background" visible="true"> <dia:object type="Standard - Text" version="1" id="O0"> <dia:attribute name="obj_pos"> - <dia:point val="11.8,6.7"/> + <dia:point val="15.6,7.25"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="11.8,6.00125;19.4212,7.2375"/> + <dia:rectangle val="11.8,6.01375;19.4212,7.25"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -82,26 +82,29 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="11.8,6.7"/> + <dia:point val="15.6,6.7125"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> </dia:attribute> <dia:attribute name="alignment"> - <dia:enum val="0"/> + <dia:enum val="1"/> </dia:attribute> </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="1"/> </dia:attribute> + dia:connections + <dia:connection handle="0" to="O2" connection="1"/> + </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O1"> <dia:attribute name="obj_pos"> - <dia:point val="23.4981,6.625"/> + <dia:point val="26.08,7.14"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.4981,5.9475;28.6406,7.12"/> + <dia:rectangle val="23.5088,5.90375;28.6725,7.14"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -115,19 +118,22 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="23.4981,6.625"/> + <dia:point val="26.08,6.6025"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> </dia:attribute> <dia:attribute name="alignment"> - <dia:enum val="0"/> + <dia:enum val="1"/> </dia:attribute> </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="1"/> </dia:attribute> + dia:connections + <dia:connection handle="0" to="O3" connection="1"/> + </dia:connections> </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O2"> <dia:attribute name="obj_pos"> @@ -211,10 +217,10 @@ </dia:object> <dia:object type="Standard - Text" version="1" id="O6"> <dia:attribute name="obj_pos"> - <dia:point val="16.85,10.05"/> + <dia:point val="17.5,9.97847"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="16.8181,9.00056;17.6,10.8564"/> + <dia:rectangle val="16.9787,9.36035;17.5,10.5966"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -225,76 +231,43 @@ <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="1.5"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="16.85,10.05"/> + <dia:point val="17.5,10.0591"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> </dia:attribute> <dia:attribute name="alignment"> - <dia:enum val="0"/> + <dia:enum val="2"/> </dia:attribute> </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="2"/> </dia:attribute> </dia:object> <dia:object type="Standard - Text" version="1" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="23.3,9.65"/> + <dia:point val="22.85,9.52847"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.2681,8.60056;24.05,10.4564"/> + <dia:rectangle val="22.8288,8.91035;28.93,10.1466"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#B#</dia:string> + dia:string#B 192.168.1.101#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="1.5"/> - </dia:attribute> - <dia:attribute name="pos"> - <dia:point val="23.3,9.65"/> - </dia:attribute> - <dia:attribute name="color"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="alignment"> - <dia:enum val="0"/> - </dia:attribute> - </dia:composite> - </dia:attribute> - <dia:attribute name="valign"> - <dia:enum val="3"/> - </dia:attribute> - </dia:object> - <dia:object type="Standard - Text" version="1" id="O8"> - <dia:attribute name="obj_pos"> - <dia:point val="23.9525,10.725"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="23.9525,10.1654;28.2246,11.1566"/> - </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - dia:string#192.168.1.101#</dia:string> - </dia:attribute> - <dia:attribute name="font"> - <dia:font family="sans" style="0" name="Helvetica"/> - </dia:attribute> - <dia:attribute name="height"> - <dia:real val="0.80000000000000004"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="23.9525,10.725"/> + <dia:point val="22.85,9.6091"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -305,15 +278,18 @@ </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="2"/> </dia:attribute> + dia:connections + <dia:connection handle="0" to="O5" connection="4"/> + </dia:connections> </dia:object> - <dia:object type="Standard - Line" version="0" id="O9"> + <dia:object type="Standard - Line" version="0" id="O8"> <dia:attribute name="obj_pos"> <dia:point val="18.325,9.92847"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="18.2707,9.04421;22.5961,10.0492"/> + <dia:rectangle val="18.2707,9.0442;22.5961,10.0492"/> </dia:attribute> <dia:attribute name="conn_endpoints"> <dia:point val="18.325,9.92847"/> @@ -336,7 +312,7 @@ <dia:connection handle="1" to="O5" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O10"> + <dia:object type="Standard - Ellipse" version="0" id="O9"> <dia:attribute name="obj_pos"> <dia:point val="13.9751,8.63125"/> </dia:attribute> @@ -359,7 +335,7 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O11"> + <dia:object type="Standard - Ellipse" version="0" id="O10"> <dia:attribute name="obj_pos"> <dia:point val="15.2751,9.33125"/> </dia:attribute> @@ -382,7 +358,7 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O12"> + <dia:object type="Standard - Ellipse" version="0" id="O11"> <dia:attribute name="obj_pos"> <dia:point val="14.1251,9.78125"/> </dia:attribute> @@ -405,7 +381,7 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O13"> + <dia:object type="Standard - Ellipse" version="0" id="O12"> <dia:attribute name="obj_pos"> <dia:point val="15.5251,8.13125"/> </dia:attribute> @@ -428,7 +404,7 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O14"> + <dia:object type="Standard - Ellipse" version="0" id="O13"> <dia:attribute name="obj_pos"> <dia:point val="15.3251,10.2312"/> </dia:attribute> @@ -451,7 +427,7 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O15"> + <dia:object type="Standard - Ellipse" version="0" id="O14"> <dia:attribute name="obj_pos"> <dia:point val="12.9501,9.05625"/> </dia:attribute> diff --git a/img/multiple_announces.dia b/img/multiple_announces.dia index 8d7444e5..8547b819 100644 --- a/img/multiple_announces.dia +++ b/img/multiple_announces.dia @@ -65,16 +65,16 @@ <dia:layer name="Background" visible="true"> <dia:object type="Standard - Ellipse" version="0" id="O0"> <dia:attribute name="obj_pos"> - <dia:point val="9.27648,3.3675"/> + <dia:point val="9.30148,3.5225"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="9.22648,3.3175;16.3115,7.5925"/> + <dia:rectangle val="9.25148,3.4725;17.8135,7.7475"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="9.27648,3.3675"/> + <dia:point val="9.30148,3.5225"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="6.9849999999999941"/> + <dia:real val="8.4620400000000089"/> </dia:attribute> <dia:attribute name="elem_height"> <dia:real val="4.1749999999999998"/> @@ -82,16 +82,16 @@ </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O1"> <dia:attribute name="obj_pos"> - <dia:point val="9.27648,-0.9575"/> + <dia:point val="9.30148,-0.9075"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="9.22648,-1.0075;16.3115,3.2675"/> + <dia:rectangle val="9.25148,-0.9575;17.8135,3.3175"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="9.27648,-0.9575"/> + <dia:point val="9.30148,-0.9075"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="6.9849999999999941"/> + <dia:real val="8.4620400000000089"/> </dia:attribute> <dia:attribute name="elem_height"> <dia:real val="4.1749999999999998"/> @@ -116,10 +116,10 @@ </dia:object> <dia:object type="Standard - Text" version="1" id="O3"> <dia:attribute name="obj_pos"> - <dia:point val="0.475,0.975"/> + <dia:point val="3.9325,1.275"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="0.475,0.2975;8.075,1.47"/> + <dia:rectangle val="0.1325,0.03875;7.75375,1.275"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -133,26 +133,29 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="0.475,0.975"/> + <dia:point val="3.9325,0.7375"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> </dia:attribute> <dia:attribute name="alignment"> - <dia:enum val="0"/> + <dia:enum val="1"/> </dia:attribute> </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="1"/> </dia:attribute> + dia:connections + <dia:connection handle="0" to="O2" connection="1"/> + </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O4"> <dia:attribute name="obj_pos"> - <dia:point val="10.275,1.3"/> + <dia:point val="10.121,1.23603"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="10.275,0.740437;15.8721,1.73162"/> + <dia:rectangle val="10.121,0.740436;15.718,1.73162"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -166,7 +169,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="10.275,1.3"/> + <dia:point val="10.121,1.3"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -177,15 +180,18 @@ </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="2"/> </dia:attribute> + dia:connections + <dia:connection handle="0" to="O7" connection="4"/> + </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O5"> <dia:attribute name="obj_pos"> - <dia:point val="10.3,5.7"/> + <dia:point val="10.046,5.63603"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="10.3,5.14044;15.9046,6.13162"/> + <dia:rectangle val="10.046,5.14044;15.6505,6.13162"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -199,7 +205,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="10.3,5.7"/> + <dia:point val="10.046,5.7"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -210,8 +216,11 @@ </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="2"/> </dia:attribute> + dia:connections + <dia:connection handle="0" to="O8" connection="4"/> + </dia:connections> </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O6"> <dia:attribute name="obj_pos"> @@ -494,7 +503,7 @@ <dia:point val="6.83107,3.66331"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6.76073,0.816332;10.1749,3.73364"/> + <dia:rectangle val="6.76074,0.816331;10.1749,3.73364"/> </dia:attribute> <dia:attribute name="conn_endpoints"> <dia:point val="6.83107,3.66331"/> @@ -522,7 +531,7 @@ <dia:point val="6.575,3.61937"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6.525,3.56937;6.925,3.96938"/> + <dia:rectangle val="6.525,3.56937;6.925,3.96937"/> </dia:attribute> <dia:attribute name="elem_corner"> <dia:point val="6.575,3.61937"/> @@ -545,7 +554,7 @@ <dia:point val="6.89561,3.86738"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6.82734,3.79912;10.0823,5.98843"/> + <dia:rectangle val="6.82735,3.79912;10.0823,5.98843"/> </dia:attribute> <dia:attribute name="conn_endpoints"> <dia:point val="6.89561,3.86738"/> @@ -573,7 +582,7 @@ <dia:point val="5.575,3.85"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="5.55375,3.15125;6.075,4.3875"/> + <dia:rectangle val="5.575,3.1725;6.075,4.345"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> diff --git a/img/multiple_clients.dia b/img/multiple_clients.dia index 670dc02f..0df4ed9a 100644 --- a/img/multiple_clients.dia +++ b/img/multiple_clients.dia @@ -65,10 +65,10 @@ <dia:layer name="Background" visible="true"> <dia:object type="Standard - Text" version="1" id="O0"> <dia:attribute name="obj_pos"> - <dia:point val="4.3,6.2"/> + <dia:point val="5.7125,3.6"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.3,4.845;13.085,7.19"/> + <dia:rectangle val="3.51125,2.4275;7.91375,3.6"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -79,38 +79,44 @@ <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="2"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="4.3,6.2"/> + <dia:point val="5.7125,3.105"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> </dia:attribute> <dia:attribute name="alignment"> - <dia:enum val="0"/> + <dia:enum val="1"/> </dia:attribute> </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="1"/> </dia:attribute> + dia:connections + <dia:connection handle="0" to="O1" connection="1"/> + </dia:connections> </dia:object> <dia:object type="Standard - Box" version="0" id="O1"> <dia:attribute name="obj_pos"> - <dia:point val="3.7,6.8"/> + <dia:point val="2.7,3.6"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="3.65,6.75;13.6,24.4"/> + <dia:rectangle val="2.675,3.575;8.75,12.4"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="3.7,6.8"/> + <dia:point val="2.7,3.6"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="9.8499999999999996"/> + <dia:real val="6.0250000000000021"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="17.550000000000001"/> + <dia:real val="8.7750000000000004"/> + </dia:attribute> + <dia:attribute name="border_width"> + <dia:real val="0.050000000000000003"/> </dia:attribute> <dia:attribute name="show_background"> <dia:boolean val="true"/> @@ -118,44 +124,50 @@ </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O2"> <dia:attribute name="obj_pos"> - <dia:point val="11.7248,10.15"/> + <dia:point val="7.8124,5.275"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="11.6748,10.1;15.3748,20.3"/> + <dia:rectangle val="7.7874,5.25;9.6374,10.35"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="11.7248,10.15"/> + <dia:point val="7.8124,5.275"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="3.6000000000000014"/> + <dia:real val="1.8000000000000007"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="10.1"/> + <dia:real val="5.0499999999999998"/> + </dia:attribute> + <dia:attribute name="border_width"> + <dia:real val="0.050000000000000003"/> </dia:attribute> </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O3"> <dia:attribute name="obj_pos"> - <dia:point val="19.6098,4.0375"/> + <dia:point val="11.7549,2.21875"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19.5598,3.9875;33.8098,8.9875"/> + <dia:rectangle val="11.7299,2.19375;18.8549,4.69375"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="19.6098,4.0375"/> + <dia:point val="11.7549,2.21875"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="14.149999999999999"/> + <dia:real val="7.0749999999999993"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="4.8999999999999995"/> + <dia:real val="2.4500000000000002"/> + </dia:attribute> + <dia:attribute name="border_width"> + <dia:real val="0.050000000000000003"/> </dia:attribute> </dia:object> <dia:object type="Standard - Text" version="1" id="O4"> <dia:attribute name="obj_pos"> - <dia:point val="26.6848,6.4875"/> + <dia:point val="15.2924,3.44375"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.8786,5.25125;29.5336,7.72375"/> + <dia:rectangle val="13.8874,2.82562;16.7187,4.06188"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -166,10 +178,10 @@ <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="2"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="26.6848,6.64875"/> + <dia:point val="15.2924,3.52438"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -188,27 +200,30 @@ </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O5"> <dia:attribute name="obj_pos"> - <dia:point val="19.6098,12.745"/> + <dia:point val="11.7549,6.5725"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19.5598,12.695;33.8098,17.695"/> + <dia:rectangle val="11.7299,6.5475;18.8549,9.0475"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="19.6098,12.745"/> + <dia:point val="11.7549,6.5725"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="14.149999999999999"/> + <dia:real val="7.0749999999999993"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="4.8999999999999995"/> + <dia:real val="2.4500000000000002"/> + </dia:attribute> + <dia:attribute name="border_width"> + <dia:real val="0.050000000000000003"/> </dia:attribute> </dia:object> <dia:object type="Standard - Text" version="1" id="O6"> <dia:attribute name="obj_pos"> - <dia:point val="26.6848,15.195"/> + <dia:point val="15.2924,7.7975"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.8786,13.9587;29.5336,16.4312"/> + <dia:rectangle val="13.8874,7.21125;16.6974,8.38375"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -219,10 +234,10 @@ <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="2"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="26.6848,15.3562"/> + <dia:point val="15.2924,7.88875"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -241,27 +256,30 @@ </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="19.6098,21.44"/> + <dia:point val="11.7549,10.92"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19.5598,21.39;33.8098,26.39"/> + <dia:rectangle val="11.7299,10.895;18.8549,13.395"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="19.6098,21.44"/> + <dia:point val="11.7549,10.92"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="14.149999999999999"/> + <dia:real val="7.0749999999999993"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="4.8999999999999995"/> + <dia:real val="2.4499999999999993"/> + </dia:attribute> + <dia:attribute name="border_width"> + <dia:real val="0.050000000000000003"/> </dia:attribute> </dia:object> <dia:object type="Standard - Text" version="1" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="26.6635,23.89"/> + <dia:point val="15.2924,12.145"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.8573,22.6538;29.5123,25.1263"/> + <dia:rectangle val="13.8874,11.5588;16.6974,12.7313"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -272,10 +290,10 @@ <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="2"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="26.6635,24.0513"/> + <dia:point val="15.2924,12.2363"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -288,21 +306,27 @@ <dia:attribute name="valign"> <dia:enum val="2"/> </dia:attribute> + dia:connections + <dia:connection handle="0" to="O7" connection="8"/> + </dia:connections> </dia:object> <dia:object type="Standard - Line" version="0" id="O9"> <dia:attribute name="obj_pos"> - <dia:point val="23.3575,21.6928"/> + <dia:point val="13.6313,11.0481"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.0012,15.9396;23.4267,21.7621"/> + <dia:rectangle val="9.31282,7.96117;13.666,11.0828"/> </dia:attribute> <dia:attribute name="conn_endpoints"> - <dia:point val="23.3575,21.6928"/> - <dia:point val="15.3184,16.3844"/> + <dia:point val="13.6313,11.0481"/> + <dia:point val="9.6092,8.39219"/> </dia:attribute> <dia:attribute name="numcp"> <dia:int val="1"/> </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.050000000000000003"/> + </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="22"/> </dia:attribute> @@ -319,18 +343,21 @@ </dia:object> <dia:object type="Standard - Line" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="19.5598,15.1977"/> + <dia:point val="11.7309,7.79885"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.2224,14.6993;19.6098,15.6994"/> + <dia:rectangle val="9.56112,7.29966;11.7559,8.29968"/> </dia:attribute> <dia:attribute name="conn_endpoints"> - <dia:point val="19.5598,15.1977"/> - <dia:point val="15.2726,15.1993"/> + <dia:point val="11.7309,7.79885"/> + <dia:point val="9.58631,7.79967"/> </dia:attribute> <dia:attribute name="numcp"> <dia:int val="1"/> </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.050000000000000003"/> + </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="22"/> </dia:attribute> @@ -347,18 +374,21 @@ </dia:object> <dia:object type="Standard - Line" version="0" id="O11"> <dia:attribute name="obj_pos"> - <dia:point val="23.3639,8.6861"/> + <dia:point val="13.6329,4.54238"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.0007,8.61681;23.4332,14.4571"/> + <dia:rectangle val="9.31234,4.50774;13.6676,7.63699"/> </dia:attribute> <dia:attribute name="conn_endpoints"> - <dia:point val="23.3639,8.6861"/> - <dia:point val="15.3184,14.0126"/> + <dia:point val="13.6329,4.54238"/> + <dia:point val="9.6092,7.20628"/> </dia:attribute> <dia:attribute name="numcp"> <dia:int val="1"/> </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.050000000000000003"/> + </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="22"/> </dia:attribute>