[FE training-materials-updates] android: Drop the mention of PixelFlinger and update to Jelly Bean
Maxime Ripard
maxime.ripard at free-electrons.com
Thu Aug 22 11:52:12 CEST 2013
Repository : git://git.free-electrons.com/training-materials.git
On branch : jelly-bean
Link : http://git.free-electrons.com/training-materials/commit/?id=7de9bb21802db8e4b098a0fb1db723bd0eef63df
>---------------------------------------------------------------
commit 7de9bb21802db8e4b098a0fb1db723bd0eef63df
Author: Maxime Ripard <maxime.ripard at free-electrons.com>
Date: Wed Aug 21 16:49:48 2013 +0200
android: Drop the mention of PixelFlinger and update to Jelly Bean
Signed-off-by: Maxime Ripard <maxime.ripard at free-electrons.com>
>---------------------------------------------------------------
7de9bb21802db8e4b098a0fb1db723bd0eef63df
.../android-native-layer-flingers.tex | 4 +-
.../surfaceflinger-architecture.dia | 353 +++++++-------------
2 files changed, 132 insertions(+), 225 deletions(-)
diff --git a/slides/android-native-layer-flingers/android-native-layer-flingers.tex b/slides/android-native-layer-flingers/android-native-layer-flingers.tex
index 5749b97..8e495b8 100644
--- a/slides/android-native-layer-flingers/android-native-layer-flingers.tex
+++ b/slides/android-native-layer-flingers/android-native-layer-flingers.tex
@@ -1,4 +1,4 @@
-\subsection{SurfaceFlinger and PixelFlinger}
+\subsection{SurfaceFlinger}
\begin{frame}
\frametitle{Introduction to graphical stacks}
\begin{center}
@@ -35,7 +35,7 @@
\end{frame}
\begin{frame}
- \frametitle{SurfaceFlinger and PixelFlinger}
+ \frametitle{SurfaceFlinger}
\begin{center}
\includegraphics[height=0.8\textheight]{slides/android-native-layer-flingers/surfaceflinger-architecture.pdf}
\end{center}
diff --git a/slides/android-native-layer-flingers/surfaceflinger-architecture.dia b/slides/android-native-layer-flingers/surfaceflinger-architecture.dia
index 3805feb..de6ad0c 100644
--- a/slides/android-native-layer-flingers/surfaceflinger-architecture.dia
+++ b/slides/android-native-layer-flingers/surfaceflinger-architecture.dia
@@ -65,16 +65,16 @@
<dia:layer name="Arrière-plan" visible="true" active="true">
<dia:object type="Standard - Box" version="0" id="O0">
<dia:attribute name="obj_pos">
- <dia:point val="5,7.5"/>
+ <dia:point val="4,8"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="4.95,7.45;16.05,10.55"/>
+ <dia:rectangle val="3.95,7.95;17.05,11.05"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="5,7.5"/>
+ <dia:point val="4,8"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="11"/>
+ <dia:real val="13"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="3"/>
@@ -94,10 +94,10 @@
</dia:object>
<dia:object type="Standard - Text" version="1" id="O1">
<dia:attribute name="obj_pos">
- <dia:point val="10.5,9"/>
+ <dia:point val="10.5,9.5"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="7.4375,8.50625;13.5625,9.49375"/>
+ <dia:rectangle val="7.4375,9.00625;13.5625,9.99375"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -111,7 +111,7 @@
<dia:real val="1.0583332926034927"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="10.5,9.29375"/>
+ <dia:point val="10.5,9.79375"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -130,19 +130,19 @@
</dia:object>
<dia:object type="Standard - Box" version="0" id="O2">
<dia:attribute name="obj_pos">
- <dia:point val="11,1.5"/>
+ <dia:point val="11,1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="10.95,1.45;16.05,3.025"/>
+ <dia:rectangle val="10.95,0.95;17.05,3.025"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="11,1.5"/>
+ <dia:point val="11,1"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="5"/>
+ <dia:real val="6"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="1.4749999999999979"/>
+ <dia:real val="1.9749999999999979"/>
</dia:attribute>
<dia:attribute name="border_width">
<dia:real val="0.10000000149011612"/>
@@ -159,10 +159,10 @@
</dia:object>
<dia:object type="Standard - Text" version="1" id="O3">
<dia:attribute name="obj_pos">
- <dia:point val="13.5,2.2375"/>
+ <dia:point val="14,1.9875"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="11.53,1.82625;15.47,2.64875"/>
+ <dia:rectangle val="12.03,1.57625;15.97,2.39875"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -176,7 +176,7 @@
<dia:real val="0.88194441050291061"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="13.5,2.48125"/>
+ <dia:point val="14,2.23125"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -195,16 +195,16 @@
</dia:object>
<dia:object type="Standard - Box" version="0" id="O4">
<dia:attribute name="obj_pos">
- <dia:point val="5,11.5"/>
+ <dia:point val="4,13"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="4.95,11.45;16.05,13.05"/>
+ <dia:rectangle val="3.95,12.95;10.05,14.55"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="5,11.5"/>
+ <dia:point val="4,13"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="11"/>
+ <dia:real val="6"/>
</dia:attribute>
<dia:attribute name="elem_height">
<dia:real val="1.5"/>
@@ -224,10 +224,10 @@
</dia:object>
<dia:object type="Standard - Text" version="1" id="O5">
<dia:attribute name="obj_pos">
- <dia:point val="10.5,12.25"/>
+ <dia:point val="7,13.75"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="9.2175,11.8763;11.7825,12.6238"/>
+ <dia:rectangle val="5.7175,13.3763;8.2825,14.1238"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -241,7 +241,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="10.5,12.4713"/>
+ <dia:point val="7,13.9713"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -260,14 +260,14 @@
</dia:object>
<dia:object type="Standard - Line" version="0" id="O6">
<dia:attribute name="obj_pos">
- <dia:point val="13.5,2.975"/>
+ <dia:point val="14,2.975"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="13.1382,2.925;13.8618,4.6118"/>
+ <dia:rectangle val="13.6382,2.925;14.3618,4.1118"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="13.5,2.975"/>
- <dia:point val="13.5,4.5"/>
+ <dia:point val="14,2.975"/>
+ <dia:point val="14,4"/>
</dia:attribute>
<dia:attribute name="numcp">
<dia:int val="1"/>
@@ -288,19 +288,19 @@
</dia:object>
<dia:object type="Standard - Box" version="0" id="O7">
<dia:attribute name="obj_pos">
- <dia:point val="5,4.5"/>
+ <dia:point val="4,4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="4.95,4.45;10.05,6.025"/>
+ <dia:rectangle val="3.95,3.95;10.05,6.025"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="5,4.5"/>
+ <dia:point val="4,4"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="5"/>
+ <dia:real val="6"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="1.4749999999999979"/>
+ <dia:real val="1.9749999999999979"/>
</dia:attribute>
<dia:attribute name="border_width">
<dia:real val="0.10000000149011612"/>
@@ -317,19 +317,19 @@
</dia:object>
<dia:object type="Standard - Box" version="0" id="O8">
<dia:attribute name="obj_pos">
- <dia:point val="11,4.5"/>
+ <dia:point val="11,4"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="10.95,4.45;16.05,6.025"/>
+ <dia:rectangle val="10.95,3.95;17.05,6.025"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="11,4.5"/>
+ <dia:point val="11,4"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="5"/>
+ <dia:real val="6"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="1.4749999999999979"/>
+ <dia:real val="1.9749999999999979"/>
</dia:attribute>
<dia:attribute name="border_width">
<dia:real val="0.10000000149011612"/>
@@ -346,16 +346,16 @@
</dia:object>
<dia:object type="Standard - ZigZagLine" version="1" id="O9">
<dia:attribute name="obj_pos">
- <dia:point val="7.5,5.975"/>
+ <dia:point val="7,5.975"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="7.45,5.925;10.8618,7.6118"/>
+ <dia:rectangle val="6.95,5.925;10.8618,8.1118"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="7.5,5.975"/>
- <dia:point val="7.5,6.7375"/>
- <dia:point val="10.5,6.7375"/>
- <dia:point val="10.5,7.5"/>
+ <dia:point val="7,5.975"/>
+ <dia:point val="7,6.9875"/>
+ <dia:point val="10.5,6.9875"/>
+ <dia:point val="10.5,8"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
@@ -381,16 +381,16 @@
</dia:object>
<dia:object type="Standard - ZigZagLine" version="1" id="O10">
<dia:attribute name="obj_pos">
- <dia:point val="13.5,5.975"/>
+ <dia:point val="14,5.975"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="10.1382,5.925;13.55,7.6118"/>
+ <dia:rectangle val="10.1382,5.925;14.05,8.1118"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="13.5,5.975"/>
- <dia:point val="13.5,6.7375"/>
- <dia:point val="10.5,6.7375"/>
- <dia:point val="10.5,7.5"/>
+ <dia:point val="14,5.975"/>
+ <dia:point val="14,6.9875"/>
+ <dia:point val="10.5,6.9875"/>
+ <dia:point val="10.5,8"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
@@ -416,10 +416,10 @@
</dia:object>
<dia:object type="Standard - Text" version="1" id="O11">
<dia:attribute name="obj_pos">
- <dia:point val="7.5,5.2375"/>
+ <dia:point val="7,4.9875"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="6.28,4.86375;8.72,5.61125"/>
+ <dia:rectangle val="5.78,4.61375;8.22,5.36125"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -433,7 +433,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="7.5,5.45875"/>
+ <dia:point val="7,5.20875"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -452,10 +452,10 @@
</dia:object>
<dia:object type="Standard - Text" version="1" id="O12">
<dia:attribute name="obj_pos">
- <dia:point val="13.5,5.2375"/>
+ <dia:point val="14,4.9875"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="12.28,4.86375;14.72,5.61125"/>
+ <dia:rectangle val="12.78,4.61375;15.22,5.36125"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -469,7 +469,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="13.5,5.45875"/>
+ <dia:point val="14,5.20875"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -486,49 +486,21 @@
<dia:connection handle="0" to="O8" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Line" version="0" id="O13">
+ <dia:object type="Standard - Box" version="0" id="O13">
<dia:attribute name="obj_pos">
- <dia:point val="10.5,10.5"/>
+ <dia:point val="4,1"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="10.1382,10.45;10.8618,11.6118"/>
- </dia:attribute>
- <dia:attribute name="conn_endpoints">
- <dia:point val="10.5,10.5"/>
- <dia:point val="10.5,11.5"/>
- </dia:attribute>
- <dia:attribute name="numcp">
- <dia:int val="1"/>
- </dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
- </dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O0" connection="6"/>
- <dia:connection handle="1" to="O4" connection="1"/>
- </dia:connections>
- </dia:object>
- <dia:object type="Standard - Box" version="0" id="O14">
- <dia:attribute name="obj_pos">
- <dia:point val="5,1.5"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="4.95,1.45;10.05,3.025"/>
+ <dia:rectangle val="3.95,0.95;10.05,3.025"/>
</dia:attribute>
<dia:attribute name="elem_corner">
- <dia:point val="5,1.5"/>
+ <dia:point val="4,1"/>
</dia:attribute>
<dia:attribute name="elem_width">
- <dia:real val="5"/>
+ <dia:real val="6"/>
</dia:attribute>
<dia:attribute name="elem_height">
- <dia:real val="1.4749999999999979"/>
+ <dia:real val="1.9749999999999979"/>
</dia:attribute>
<dia:attribute name="border_width">
<dia:real val="0.10000000149011612"/>
@@ -543,12 +515,12 @@
<dia:boolean val="true"/>
</dia:attribute>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O15">
+ <dia:object type="Standard - Text" version="1" id="O14">
<dia:attribute name="obj_pos">
- <dia:point val="7.5,2.2375"/>
+ <dia:point val="7,1.9875"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="5.53,1.82625;9.47,2.64875"/>
+ <dia:rectangle val="5.03,1.57625;8.97,2.39875"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
@@ -562,7 +534,7 @@
<dia:real val="0.88194441050291061"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="7.5,2.48125"/>
+ <dia:point val="7,2.23125"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -576,19 +548,19 @@
<dia:enum val="2"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O14" connection="8"/>
+ <dia:connection handle="0" to="O13" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Line" version="0" id="O16">
+ <dia:object type="Standard - Line" version="0" id="O15">
<dia:attribute name="obj_pos">
- <dia:point val="7.5,2.975"/>
+ <dia:point val="7,2.975"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="7.1382,2.925;7.8618,4.6118"/>
+ <dia:rectangle val="6.6382,2.925;7.3618,4.1118"/>
</dia:attribute>
<dia:attribute name="conn_endpoints">
- <dia:point val="7.5,2.975"/>
- <dia:point val="7.5,4.5"/>
+ <dia:point val="7,2.975"/>
+ <dia:point val="7,4"/>
</dia:attribute>
<dia:attribute name="numcp">
<dia:int val="1"/>
@@ -603,80 +575,22 @@
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O14" connection="6"/>
+ <dia:connection handle="0" to="O13" connection="6"/>
<dia:connection handle="1" to="O7" connection="1"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Box" version="0" id="O17">
- <dia:attribute name="obj_pos">
- <dia:point val="5,14.5"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="4.95,14.45;10.05,16.025"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="5,14.5"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="5"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="1.4749999999999979"/>
- </dia:attribute>
- <dia:attribute name="border_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="border_color">
- <dia:color val="#5cacff"/>
- </dia:attribute>
- <dia:attribute name="inner_color">
- <dia:color val="#add8e6"/>
- </dia:attribute>
- <dia:attribute name="show_background">
- <dia:boolean val="true"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - Box" version="0" id="O18">
+ <dia:object type="Standard - ZigZagLine" version="1" id="O16">
<dia:attribute name="obj_pos">
- <dia:point val="11,14.5"/>
+ <dia:point val="10.5,11"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="10.95,14.45;16.05,16.025"/>
- </dia:attribute>
- <dia:attribute name="elem_corner">
- <dia:point val="11,14.5"/>
- </dia:attribute>
- <dia:attribute name="elem_width">
- <dia:real val="5"/>
- </dia:attribute>
- <dia:attribute name="elem_height">
- <dia:real val="1.4749999999999979"/>
- </dia:attribute>
- <dia:attribute name="border_width">
- <dia:real val="0.10000000149011612"/>
- </dia:attribute>
- <dia:attribute name="border_color">
- <dia:color val="#5cacff"/>
- </dia:attribute>
- <dia:attribute name="inner_color">
- <dia:color val="#add8e6"/>
- </dia:attribute>
- <dia:attribute name="show_background">
- <dia:boolean val="true"/>
- </dia:attribute>
- </dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O19">
- <dia:attribute name="obj_pos">
- <dia:point val="10.5,13"/>
- </dia:attribute>
- <dia:attribute name="obj_bb">
- <dia:rectangle val="10.45,12.95;13.8618,14.6118"/>
+ <dia:rectangle val="6.6382,10.95;10.55,13.0614"/>
</dia:attribute>
<dia:attribute name="orth_points">
- <dia:point val="10.5,13"/>
- <dia:point val="10.5,13.75"/>
- <dia:point val="13.5,13.75"/>
- <dia:point val="13.5,14.5"/>
+ <dia:point val="10.5,11"/>
+ <dia:point val="10.5,11.9748"/>
+ <dia:point val="7,11.9748"/>
+ <dia:point val="7,12.9496"/>
</dia:attribute>
<dia:attribute name="orth_orient">
<dia:enum val="1"/>
@@ -696,56 +610,50 @@
<dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O4" connection="6"/>
- <dia:connection handle="1" to="O18" connection="1"/>
+ <dia:connection handle="0" to="O0" connection="6"/>
+ <dia:connection handle="1" to="O4" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - ZigZagLine" version="1" id="O20">
+ <dia:object type="Standard - Box" version="0" id="O17">
<dia:attribute name="obj_pos">
- <dia:point val="10.5,13"/>
+ <dia:point val="11,13"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="7.1382,12.95;10.55,14.6118"/>
+ <dia:rectangle val="10.95,12.95;17.05,14.55"/>
</dia:attribute>
- <dia:attribute name="orth_points">
- <dia:point val="10.5,13"/>
- <dia:point val="10.5,13.75"/>
- <dia:point val="7.5,13.75"/>
- <dia:point val="7.5,14.5"/>
+ <dia:attribute name="elem_corner">
+ <dia:point val="11,13"/>
</dia:attribute>
- <dia:attribute name="orth_orient">
- <dia:enum val="1"/>
- <dia:enum val="0"/>
- <dia:enum val="1"/>
+ <dia:attribute name="elem_width">
+ <dia:real val="6"/>
</dia:attribute>
- <dia:attribute name="autorouting">
- <dia:boolean val="true"/>
+ <dia:attribute name="elem_height">
+ <dia:real val="1.5"/>
</dia:attribute>
- <dia:attribute name="end_arrow">
- <dia:enum val="22"/>
+ <dia:attribute name="border_width">
+ <dia:real val="0.10000000149011612"/>
</dia:attribute>
- <dia:attribute name="end_arrow_length">
- <dia:real val="0.5"/>
+ <dia:attribute name="border_color">
+ <dia:color val="#868686"/>
</dia:attribute>
- <dia:attribute name="end_arrow_width">
- <dia:real val="0.5"/>
+ <dia:attribute name="inner_color">
+ <dia:color val="#e5e5e5"/>
+ </dia:attribute>
+ <dia:attribute name="show_background">
+ <dia:boolean val="true"/>
</dia:attribute>
- <dia:connections>
- <dia:connection handle="0" to="O4" connection="6"/>
- <dia:connection handle="1" to="O17" connection="1"/>
- </dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O21">
+ <dia:object type="Standard - Text" version="1" id="O18">
<dia:attribute name="obj_pos">
- <dia:point val="13.5,15.2375"/>
+ <dia:point val="14,13.75"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="11.6638,14.8637;15.3362,15.6112"/>
+ <dia:rectangle val="11.715,13.3482;16.3037,14.1518"/>
</dia:attribute>
<dia:attribute name="text">
<dia:composite type="text">
<dia:attribute name="string">
- <dia:string>#PixelFlinger#</dia:string>
+ <dia:string>#HW Composer#</dia:string>
</dia:attribute>
<dia:attribute name="font">
<dia:font family="sans" style="0" name="Helvetica"/>
@@ -754,7 +662,7 @@
<dia:real val="0.80000000000000004"/>
</dia:attribute>
<dia:attribute name="pos">
- <dia:point val="13.5,15.4587"/>
+ <dia:point val="14,13.9619"/>
</dia:attribute>
<dia:attribute name="color">
<dia:color val="#000000"/>
@@ -768,43 +676,42 @@
<dia:enum val="2"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O18" connection="8"/>
+ <dia:connection handle="0" to="O17" connection="8"/>
</dia:connections>
</dia:object>
- <dia:object type="Standard - Text" version="1" id="O22">
+ <dia:object type="Standard - ZigZagLine" version="1" id="O19">
<dia:attribute name="obj_pos">
- <dia:point val="7.5,15.2375"/>
+ <dia:point val="10.5,11"/>
</dia:attribute>
<dia:attribute name="obj_bb">
- <dia:rectangle val="5.95375,14.8637;9.04625,15.6112"/>
+ <dia:rectangle val="10.45,10.95;14.3618,13.1118"/>
</dia:attribute>
- <dia:attribute name="text">
- <dia:composite type="text">
- <dia:attribute name="string">
- <dia:string>#Hardware#</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:attribute>
- <dia:attribute name="pos">
- <dia:point val="7.5,15.4587"/>
- </dia:attribute>
- <dia:attribute name="color">
- <dia:color val="#000000"/>
- </dia:attribute>
- <dia:attribute name="alignment">
- <dia:enum val="1"/>
- </dia:attribute>
- </dia:composite>
+ <dia:attribute name="orth_points">
+ <dia:point val="10.5,11"/>
+ <dia:point val="10.5,12"/>
+ <dia:point val="14,12"/>
+ <dia:point val="14,13"/>
</dia:attribute>
- <dia:attribute name="valign">
- <dia:enum val="2"/>
+ <dia:attribute name="orth_orient">
+ <dia:enum val="1"/>
+ <dia:enum val="0"/>
+ <dia:enum val="1"/>
+ </dia:attribute>
+ <dia:attribute name="autorouting">
+ <dia:boolean val="true"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow">
+ <dia:enum val="22"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_length">
+ <dia:real val="0.5"/>
+ </dia:attribute>
+ <dia:attribute name="end_arrow_width">
+ <dia:real val="0.5"/>
</dia:attribute>
<dia:connections>
- <dia:connection handle="0" to="O17" connection="8"/>
+ <dia:connection handle="0" to="O0" connection="6"/>
+ <dia:connection handle="1" to="O17" connection="1"/>
</dia:connections>
</dia:object>
</dia:layer>
More information about the training-materials-updates
mailing list