Menu
▾
▴
scstudio-commits — Automatic notifications for all changes made to the source code repository
You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
(7) |
Apr
(42) |
May
(45) |
Jun
(5) |
Jul
(2) |
Aug
(6) |
Sep
|
Oct
(4) |
Nov
(12) |
Dec
(18) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(38) |
Feb
(15) |
Mar
(17) |
Apr
(25) |
May
(9) |
Jun
(8) |
Jul
(18) |
Aug
(3) |
Sep
(114) |
Oct
(58) |
Nov
(49) |
Dec
(42) |
| 2010 |
Jan
(20) |
Feb
(80) |
Mar
(72) |
Apr
(26) |
May
(76) |
Jun
(6) |
Jul
(19) |
Aug
(28) |
Sep
(119) |
Oct
(6) |
Nov
(11) |
Dec
(15) |
| 2011 |
Jan
(10) |
Feb
(25) |
Mar
(22) |
Apr
(11) |
May
(14) |
Jun
(12) |
Jul
(55) |
Aug
(18) |
Sep
(14) |
Oct
(9) |
Nov
(6) |
Dec
(39) |
| 2012 |
Jan
(53) |
Feb
(18) |
Mar
(35) |
Apr
(34) |
May
(5) |
Jun
(40) |
Jul
(8) |
Aug
(4) |
Sep
(30) |
Oct
(19) |
Nov
(8) |
Dec
(23) |
| 2013 |
Jan
(28) |
Feb
(39) |
Mar
(146) |
Apr
(5) |
May
(79) |
Jun
(11) |
Jul
(21) |
Aug
|
Sep
(5) |
Oct
(4) |
Nov
(10) |
Dec
(1) |
| 2014 |
Jan
(18) |
Feb
(8) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2016 |
Jan
(7) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <xf...@us...> - 2014-01-20 18:28:27
|
Revision: 1888
http://sourceforge.net/p/scstudio/code/1888
Author: xfarmad
Date: 2014-01-20 18:28:25 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
Mistake in tagging procedure
Removed Paths:
-------------
tags/0.5.4/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2014-01-20 18:25:50
|
Revision: 1887
http://sourceforge.net/p/scstudio/code/1887
Author: xfarmad
Date: 2014-01-20 18:25:47 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
Tagging release 0.5.4
Added Paths:
-----------
tags/0.5.4/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2014-01-20 18:23:17
|
Revision: 1886
http://sourceforge.net/p/scstudio/code/1886
Author: xfarmad
Date: 2014-01-20 18:23:12 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
Prepared for release 0.5.4
Modified Paths:
--------------
trunk/CHANGELOG
trunk/doc/scstudio-instructions.rtf
trunk/make_build.bat
trunk/src/view/visio/addon/dllmodule.rc
Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG 2014-01-20 17:50:08 UTC (rev 1885)
+++ trunk/CHANGELOG 2014-01-20 18:23:12 UTC (rev 1886)
@@ -7,6 +7,12 @@
$Date$, svn revision $Rev$
+
+######################
+# Version 0.5.4
+
+ 20-Jan_2014, svn revision 1885
+
* refactoring of internal structure (done)
* extend import from Z120 by large numbers in time intervals e.g. 1e+10
* feature requests No. 41 solved (default option to the Import dialog)
@@ -30,10 +36,10 @@
* ordering arrow automaticly change direction of its arrow
* hmsc connection shape behavior improvment
* hmsc connection arraw shape automatic snapping
-* bug No. 76,75,68,64,61,60,36,53,26,88,83,82,55,94 fixed
+* bug No. 76,75,68,64,61,60,36,53,26,88,87,83,82,55,94 fixed
* message automatic drawing behavior improvment (message interleaving not
possible now)
-* feature requests No. 35,13 solved
+* feature requests No. 35,13,41,37,32,30 solved
######################
Modified: trunk/doc/scstudio-instructions.rtf
===================================================================
--- trunk/doc/scstudio-instructions.rtf 2014-01-20 17:50:08 UTC (rev 1885)
+++ trunk/doc/scstudio-instructions.rtf 2014-01-20 18:23:12 UTC (rev 1886)
@@ -1,168156 +1,266351 @@
-{\rtf1\adeflang1025\ansi\ansicpg1250\uc1\adeff1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1029\deflangfe1029\themelang1029\themelangfe0\themelangcs0{\fonttbl{\f0\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f1\fbidi \fswiss\fcharset238\fprq2{\*\panose 020b0604020202020204}Arial;}
-{\f2\fbidi \fmodern\fcharset238\fprq1{\*\panose 02070309020205020404}Courier New;}{\f3\fbidi \froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol;}{\f10\fbidi \fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings;}
-{\f34\fbidi \froman\fcharset1\fprq2{\*\panose 02040503050406030204}Cambria Math;}{\f36\fbidi \froman\fcharset238\fprq2{\*\panose 02040503050406030204}Cambria;}{\f38\fbidi \fswiss\fcharset238\fprq2{\*\panose 020b0604030504040204}Tahoma;}
-{\flomajor\f31500\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbmajor\f31501\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fhimajor\f31502\fbidi \froman\fcharset238\fprq2{\*\panose 02040503050406030204}Cambria;}{\fbimajor\f31503\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\flominor\f31504\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\fdbminor\f31505\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}
-{\fhiminor\f31506\fbidi \fswiss\fcharset238\fprq2{\*\panose 020f0502020204030204}Calibri;}{\fbiminor\f31507\fbidi \froman\fcharset238\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f41\fbidi \froman\fcharset0\fprq2 Times New Roman;}
-{\f40\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\f42\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\f43\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\f44\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\f45\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f46\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\f47\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\f51\fbidi \fswiss\fcharset0\fprq2 Arial;}
-{\f50\fbidi \fswiss\fcharset204\fprq2 Arial Cyr;}{\f52\fbidi \fswiss\fcharset161\fprq2 Arial Greek;}{\f53\fbidi \fswiss\fcharset162\fprq2 Arial Tur;}{\f54\fbidi \fswiss\fcharset177\fprq2 Arial (Hebrew);}
-{\f55\fbidi \fswiss\fcharset178\fprq2 Arial (Arabic);}{\f56\fbidi \fswiss\fcharset186\fprq2 Arial Baltic;}{\f57\fbidi \fswiss\fcharset163\fprq2 Arial (Vietnamese);}{\f61\fbidi \fmodern\fcharset0\fprq1 Courier New;}
-{\f60\fbidi \fmodern\fcharset204\fprq1 Courier New Cyr;}{\f62\fbidi \fmodern\fcharset161\fprq1 Courier New Greek;}{\f63\fbidi \fmodern\fcharset162\fprq1 Courier New Tur;}{\f64\fbidi \fmodern\fcharset177\fprq1 Courier New (Hebrew);}
-{\f65\fbidi \fmodern\fcharset178\fprq1 Courier New (Arabic);}{\f66\fbidi \fmodern\fcharset186\fprq1 Courier New Baltic;}{\f67\fbidi \fmodern\fcharset163\fprq1 Courier New (Vietnamese);}{\f401\fbidi \froman\fcharset0\fprq2 Cambria;}
-{\f400\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\f402\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\f403\fbidi \froman\fcharset162\fprq2 Cambria Tur;}{\f406\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}
-{\f407\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\f421\fbidi \fswiss\fcharset0\fprq2 Tahoma;}{\f420\fbidi \fswiss\fcharset204\fprq2 Tahoma Cyr;}{\f422\fbidi \fswiss\fcharset161\fprq2 Tahoma Greek;}
-{\f423\fbidi \fswiss\fcharset162\fprq2 Tahoma Tur;}{\f424\fbidi \fswiss\fcharset177\fprq2 Tahoma (Hebrew);}{\f425\fbidi \fswiss\fcharset178\fprq2 Tahoma (Arabic);}{\f426\fbidi \fswiss\fcharset186\fprq2 Tahoma Baltic;}
-{\f427\fbidi \fswiss\fcharset163\fprq2 Tahoma (Vietnamese);}{\f428\fbidi \fswiss\fcharset222\fprq2 Tahoma (Thai);}{\flomajor\f31510\fbidi \froman\fcharset0\fprq2 Times New Roman;}{\flomajor\f31509\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\flomajor\f31511\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flomajor\f31512\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flomajor\f31513\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\flomajor\f31514\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flomajor\f31515\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flomajor\f31516\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fdbmajor\f31520\fbidi \froman\fcharset0\fprq2 Times New Roman;}{\fdbmajor\f31519\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbmajor\f31521\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
-{\fdbmajor\f31522\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbmajor\f31523\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbmajor\f31524\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\fdbmajor\f31525\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbmajor\f31526\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhimajor\f31530\fbidi \froman\fcharset0\fprq2 Cambria;}
-{\fhimajor\f31529\fbidi \froman\fcharset204\fprq2 Cambria Cyr;}{\fhimajor\f31531\fbidi \froman\fcharset161\fprq2 Cambria Greek;}{\fhimajor\f31532\fbidi \froman\fcharset162\fprq2 Cambria Tur;}
-{\fhimajor\f31535\fbidi \froman\fcharset186\fprq2 Cambria Baltic;}{\fhimajor\f31536\fbidi \froman\fcharset163\fprq2 Cambria (Vietnamese);}{\fbimajor\f31540\fbidi \froman\fcharset0\fprq2 Times New Roman;}
-{\fbimajor\f31539\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbimajor\f31541\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbimajor\f31542\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\fbimajor\f31543\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbimajor\f31544\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbimajor\f31545\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\fbimajor\f31546\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\flominor\f31550\fbidi \froman\fcharset0\fprq2 Times New Roman;}{\flominor\f31549\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}
-{\flominor\f31551\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\flominor\f31552\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\flominor\f31553\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}
-{\flominor\f31554\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\flominor\f31555\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\flominor\f31556\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
-{\fdbminor\f31560\fbidi \froman\fcharset0\fprq2 Times New Roman;}{\fdbminor\f31559\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fdbminor\f31561\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}
-{\fdbminor\f31562\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}{\fdbminor\f31563\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fdbminor\f31564\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}
-{\fdbminor\f31565\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}{\fdbminor\f31566\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}{\fhiminor\f31570\fbidi \fswiss\fcharset0\fprq2 Calibri;}
-{\fhiminor\f31569\fbidi \fswiss\fcharset204\fprq2 Calibri Cyr;}{\fhiminor\f31571\fbidi \fswiss\fcharset161\fprq2 Calibri Greek;}{\fhiminor\f31572\fbidi \fswiss\fcharset162\fprq2 Calibri Tur;}
-{\fhiminor\f31575\fbidi \fswiss\fcharset186\fprq2 Calibri Baltic;}{\fhiminor\f31576\fbidi \fswiss\fcharset163\fprq2 Calibri (Vietnamese);}{\fbiminor\f31580\fbidi \froman\fcharset0\fprq2 Times New Roman;}
-{\fbiminor\f31579\fbidi \froman\fcharset204\fprq2 Times New Roman Cyr;}{\fbiminor\f31581\fbidi \froman\fcharset161\fprq2 Times New Roman Greek;}{\fbiminor\f31582\fbidi \froman\fcharset162\fprq2 Times New Roman Tur;}
-{\fbiminor\f31583\fbidi \froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\fbiminor\f31584\fbidi \froman\fcharset178\fprq2 Times New Roman (Arabic);}{\fbiminor\f31585\fbidi \froman\fcharset186\fprq2 Times New Roman Baltic;}
-{\fbiminor\f31586\fbidi \froman\fcharset163\fprq2 Times New Roman (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;
-\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\*\defchp \fs22 }{\*\defpap
-\ql \li0\ri0\sa200\sl276\slmult1\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 }\noqfpromote {\stylesheet{\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs20\alang1025
-\ltrch\fcs0 \f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 \snext0 \sqformat \spriority0 \styrsid6893578 Normal;}{\s1\ql \li2268\ri0\sb120\sa240\sl280\slmult0
-\keepn\pagebb\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin2268\itap0 \rtlch\fcs1 \ab\af1\afs28\alang1025 \ltrch\fcs0 \b\f1\fs28\lang1033\langfe1029\kerning32\cgrid\langnp1033\langfenp1029
-\sbasedon17 \snext17 \slink15 \sqformat \styrsid12978455 heading 1;}{\s2\ql \li2268\ri0\sb360\sa60\sl280\slmult0\keepn\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel1\adjustright\rin0\lin2268\itap0 \rtlch\fcs1 \ab\af1\afs24\alang1025
-\ltrch\fcs0 \b\f1\fs24\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 \sbasedon17 \snext17 \slink16 \sqformat \styrsid10886401 heading 2;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
-\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv \ql \li0\ri0\sa200\sl276\slmult1
-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af0\afs22\alang1025 \ltrch\fcs0 \fs22\lang1029\langfe1029\cgrid\langnp1029\langfenp1029 \snext11 \ssemihidden \sunhideused \sqformat Normal Table;}{\*\cs15 \additive
-\rtlch\fcs1 \ab\af0\afs32 \ltrch\fcs0 \b\f36\fs32\lang0\langfe1029\kerning32\langnp0\langfenp1029 \sbasedon10 \slink1 \slocked Nadpis 1 Char;}{\*\cs16 \additive \rtlch\fcs1 \ab\ai\af0\afs28 \ltrch\fcs0 \b\i\f36\fs28\lang0\langfe1029\langnp0\langfenp1029
-\sbasedon10 \slink2 \slocked \ssemihidden Nadpis 2 Char;}{\s17\ql \li2268\ri0\sb120\sa120\sl280\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0
-\f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 \sbasedon0 \snext17 \styrsid4814744 Paragraph;}{\s18\ql \fi-2268\li2268\ri0\sb120\sa120\sl280\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0 \rtlch\fcs1
-\af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 \sbasedon17 \snext18 \styrsid10750423 Paragraph w Sidehead;}{\*\ts19\tsrowd\trbrdrt\brdrs\brdrw10 \trbrdrl\brdrs\brdrw10 \trbrdrb\brdrs\brdrw10 \trbrdrr
-\brdrs\brdrw10 \trbrdrh\brdrs\brdrw10 \trbrdrv\brdrs\brdrw10 \trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tblind0\tblindtype0\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv
-\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \sbasedon11 \snext19 \styrsid14371250 Table Grid;}{\*\cs20
-\additive \rtlch\fcs1 \af0 \ltrch\fcs0 \ul\cf2 \sbasedon10 \styrsid3177514 Hyperlink;}{\s21\ql \li2268\ri0\sl280\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0 \rtlch\fcs1 \af2\afs18\alang1025 \ltrch\fcs0
-\f2\fs18\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 \sbasedon17 \snext21 \styrsid7881996 Example;}{\s22\ql \li0\ri0\widctlpar\brdrt\brdrs\brdrw10\brsp20 \tqc\tx4536\tqr\tx9072\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0
-\rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 \sbasedon0 \snext22 \slink23 \styrsid12473112 footer;}{\*\cs23 \additive \rtlch\fcs1 \af1\afs20 \ltrch\fcs0
-\f1\fs20\lang0\langfe1029\langnp0\langfenp1029 \sbasedon10 \slink22 \slocked \ssemihidden Z\'e1pat\'ed Char;}{\*\cs24 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \sbasedon10 \styrsid12473112 page number;}{\s25\ql \li0\ri0\widctlpar
-\tqc\tx4536\tqr\tx9072\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 \sbasedon0 \snext25 \slink26 \styrsid12473112 header;}{\*\cs26
-\additive \rtlch\fcs1 \af1\afs20 \ltrch\fcs0 \f1\fs20\lang0\langfe1029\langnp0\langfenp1029 \sbasedon10 \slink25 \slocked \ssemihidden Z\'e1hlav\'ed Char;}{\*\cs27 \additive \rtlch\fcs1 \af0\afs16 \ltrch\fcs0 \fs16
-\sbasedon10 \ssemihidden \styrsid14681692 annotation reference;}{\s28\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0
-\f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 \sbasedon0 \snext28 \slink29 \ssemihidden \styrsid14681692 annotation text;}{\*\cs29 \additive \rtlch\fcs1 \af1\afs20 \ltrch\fcs0 \f1\fs20\lang0\langfe1029\langnp0\langfenp1029
-\sbasedon10 \slink28 \slocked \ssemihidden Text koment\'e1\'f8e Char;}{\s30\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \ab\af1\afs20\alang1025 \ltrch\fcs0
-\b\f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 \sbasedon28 \snext28 \slink31 \ssemihidden \styrsid14681692 annotation subject;}{\*\cs31 \additive \rtlch\fcs1 \ab\af1\afs20 \ltrch\fcs0 \b\f1\fs20\lang0\langfe1029\langnp0\langfenp1029
-\sbasedon29 \slink30 \slocked \ssemihidden P\'f8edm\'ect koment\'e1\'f8e Char;}{\s32\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af38\afs16\alang1025 \ltrch\fcs0
-\f38\fs16\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 \sbasedon0 \snext32 \slink33 \ssemihidden \styrsid14681692 Balloon Text;}{\*\cs33 \additive \rtlch\fcs1 \af38\afs16 \ltrch\fcs0 \f38\fs16\lang0\langfe1029\langnp0\langfenp1029
-\sbasedon10 \slink32 \slocked \ssemihidden Text bubliny Char;}{\*\cs34 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \f2\fs20 \sbasedon10 \styrsid8486799 Keyboard Shortcut;}{\*\cs35 \additive \rtlch\fcs1 \af0 \ltrch\fcs0 \sbasedon10 \styrsid3303158 mw-headline;}
-}{\*\listtable{\list\listtemplateid-318340160\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0
-\fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li1440
-\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li2160
-\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2880
-\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3600
-\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4320
-\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5040
-\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5760
-\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6480
-\jclisttab\tx6480\lin6480 }{\listname ;}\listid88896242}{\list\listtemplateid-2435210\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid-598469796
-\'01\'96;}{\levelnumbers;}\f0\fbias0\hres0\chhres0 \fi-311\li3033\jclisttab\tx3033\lin3033 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers
-;}\f2\fbias0\hres0\chhres0 \fi-360\li3708\jclisttab\tx3708\lin3708 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fbias0\hres0\chhres0 \fi-360\li4428\jclisttab\tx4428\lin4428 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}
-\f3\fbias0\hres0\chhres0 \fi-360\li5148\jclisttab\tx5148\lin5148 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}
-\f2\fbias0\hres0\chhres0 \fi-360\li5868\jclisttab\tx5868\lin5868 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fbias0\hres0\chhres0 \fi-360\li6588\jclisttab\tx6588\lin6588 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}
-\f3\fbias0\hres0\chhres0 \fi-360\li7308\jclisttab\tx7308\lin7308 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}
-\f2\fbias0\hres0\chhres0 \fi-360\li8028\jclisttab\tx8028\lin8028 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fbias0\hres0\chhres0 \fi-360\li8748\jclisttab\tx8748\lin8748 }{\listname ;}\listid218248755}{\list\listtemplateid-707857544\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0
-{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2988\jclisttab\tx2988\lin2988 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
-\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3708\jclisttab\tx3708\lin3708 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67436549
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4428\jclisttab\tx4428\lin4428 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67436545
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5148\jclisttab\tx5148\lin5148 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67436547
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5868\jclisttab\tx5868\lin5868 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67436549
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6588\jclisttab\tx6588\lin6588 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67436545
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li7308\jclisttab\tx7308\lin7308 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67436547
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li8028\jclisttab\tx8028\lin8028 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67436549
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li8748\jclisttab\tx8748\lin8748 }{\listname ;}\listid380901966}{\list\listtemplateid-2075480342{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360
-\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2988\jclisttab\tx2988\lin2988 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3708\jclisttab\tx3708\lin3708 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fbias0\hres0\chhres0 \fi-360\li4428\jclisttab\tx4428\lin4428 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5148
-\jclisttab\tx5148\lin5148 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5868\jclisttab\tx5868\lin5868 }{\listlevel
-\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6588\jclisttab\tx6588\lin6588 }{\listlevel\levelnfc23\levelnfcn23\leveljc0
-\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li7308\jclisttab\tx7308\lin7308 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace360\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li8028\jclisttab\tx8028\lin8028 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li8748\jclisttab\tx8748\lin8748 }{\listname ;}\listid407309104}{\list\listtemplateid-234069712\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace454\levelindent0{\leveltext\leveltemplateid-598469796\'01\'96;}{\levelnumbers;}\f0\fbias0\hres0\chhres0 \fi-311\li3033\jclisttab\tx3033\lin3033 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454
-\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3708\jclisttab\tx3708\lin3708 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext
-\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4428\jclisttab\tx4428\lin4428 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext
-\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5148\jclisttab\tx5148\lin5148 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext
-\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5868\jclisttab\tx5868\lin5868 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6588\jclisttab\tx6588\lin6588 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436545
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li7308\jclisttab\tx7308\lin7308 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436547
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li8028\jclisttab\tx8028\lin8028 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li8748\jclisttab\tx8748\lin8748 }{\listname ;}\listid432867918}{\list\listtemplateid-1494471816\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace454\levelindent0{\leveltext\leveltemplateid-598469796\'01\'96;}{\levelnumbers;}\f0\fbias0\hres0\chhres0 \fi-311\li3033\jclisttab\tx3033\lin3033 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454
-\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3708\jclisttab\tx3708\lin3708 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext
-\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4428\jclisttab\tx4428\lin4428 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext
-\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5148\jclisttab\tx5148\lin5148 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext
-\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5868\jclisttab\tx5868\lin5868 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6588\jclisttab\tx6588\lin6588 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436545
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li7308\jclisttab\tx7308\lin7308 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436547
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li8028\jclisttab\tx8028\lin8028 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li8748\jclisttab\tx8748\lin8748 }{\listname ;}\listid501548701}{\list\listtemplateid1339591888\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace454\levelindent0{\leveltext\leveltemplateid-598469796\'01\'96;}{\levelnumbers;}\f0\fbias0\hres0\chhres0 \fi-311\li3033\jclisttab\tx3033\lin3033 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454
-\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3708\jclisttab\tx3708\lin3708 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext
-\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4428\jclisttab\tx4428\lin4428 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext
-\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5148\jclisttab\tx5148\lin5148 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext
-\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5868\jclisttab\tx5868\lin5868 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6588\jclisttab\tx6588\lin6588 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436545
-\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li7308\jclisttab\tx7308\lin7308 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436547
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li8028\jclisttab\tx8028\lin8028 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549
-\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li8748\jclisttab\tx8748\lin8748 }{\listname ;}\listid739594883}{\list\listtemplateid-1331897098{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0
-\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fs20\fbias0\hres0\chhres0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext
-\'01o;}{\levelnumbers;}\f2\fs20\fbias0\hres0\chhres0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fs20\fbias0\hres0\chhres0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fs20\fbias0\hres0\chhres0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fs20\fbias0\hres0\chhres0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fs20\fbias0\hres0\chhres0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace0\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fs20\fbias0\hres0\chhres0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid981424174}{\list\listtemplateid-1733764864{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat2\levelspace360\levelindent0{\leveltext
-\'01-;}{\levelnumbers;}\f38\fbias0\hres0\chhres0 \fi-360\li2988\jclisttab\tx2988\lin2988 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01o;}{\levelnumbers;}
-\f2\fbias0\hres0\chhres0 \fi-360\li3708\jclisttab\tx3708\lin3708 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4428
-\jclisttab\tx4428\lin4428 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5148\jclisttab\tx5148\lin5148 }{\listlevel
-\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5868\jclisttab\tx5868\lin5868 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
-\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6588\jclisttab\tx6588\lin6588 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\levelspace360\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li7308\jclisttab\tx7308\lin7308 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext
-\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li8028\jclisttab\tx8028\lin8028 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fbias0\hres0\chhres0 \fi-360\li8748\jclisttab\tx8748\lin8748 }{\listname ;}\listid1328678781}{\list\listtemplateid-2075480342\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0
-{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2988\jclisttab\tx2988\lin2988 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0
-{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3708\jclisttab\tx3708\lin3708 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
-\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4428\jclisttab\tx4428\lin4428 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
-\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5148\jclisttab\tx5148\lin5148 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
-\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5868\jclisttab\tx5868\lin5868 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
-\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6588\jclisttab\tx6588\lin6588 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
-\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li7308\jclisttab\tx7308\lin7308 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
-\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li8028\jclisttab\tx8028\lin8028 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext
-\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li8748\jclisttab\tx8748\lin8748 }{\listname ;}\listid1349017134}{\list\listtemplateid-1733764864\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0
-\levelfollow0\levelstartat2\levelspace360\levelindent0{\leveltext\leveltemplateid3\'01-;}{\levelnumbers;}\f38\fbias0\hres0\chhres0 \fi-360\li2988\jclisttab\tx2988\lin2988 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3708\jclisttab\tx3708\lin3708 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4428\jclisttab\tx4428\lin4428 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5148\jclisttab\tx5148\lin5148 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5868\jclisttab\tx5868\lin5868 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6588\jclisttab\tx6588\lin6588 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li7308\jclisttab\tx7308\lin7308 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li8028\jclisttab\tx8028\lin8028 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1
-\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li8748\jclisttab\tx8748\lin8748 }{\listname ;}\listid1904482310}{\list\listtemplateid-608415532\listhybrid
-{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li2988\jclisttab\tx2988\lin2988 }{\listlevel
-\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li3708\jclisttab\tx3708\lin3708 }{\listlevel\levelnfc23
-\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li4428\jclisttab\tx4428\lin4428 }{\listlevel\levelnfc23
-\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li5148\jclisttab\tx5148\lin5148 }{\listlevel\levelnfc23
-\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li5868\jclisttab\tx5868\lin5868 }{\listlevel\levelnfc23
-\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li6588\jclisttab\tx6588\lin6588 }{\listlevel\levelnfc23
-\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0\hres0\chhres0 \fi-360\li7308\jclisttab\tx7308\lin7308 }{\listlevel\levelnfc23
-\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}\f2\fbias0\hres0\chhres0 \fi-360\li8028\jclisttab\tx8028\lin8028 }{\listlevel\levelnfc23
-\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\lvltentative\levelspace360\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0\hres0\chhres0 \fi-360\li8748\jclisttab\tx8748\lin8748 }{\listname
-;}\listid1972054121}{\list\listtemplateid-1248031176\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid-598469796\'01\'96;}{\levelnumbers;}
-\f0\fbias0\hres0\chhres0 \fi-311\li3033\jclisttab\tx3033\lin3033 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}
-\f2\fbias0\hres0\chhres0 \fi-360\li3708\jclisttab\tx3708\lin3708 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fbias0\hres0\chhres0 \fi-360\li4428\jclisttab\tx4428\lin4428 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}
-\f3\fbias0\hres0\chhres0 \fi-360\li5148\jclisttab\tx5148\lin5148 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}
-\f2\fbias0\hres0\chhres0 \fi-360\li5868\jclisttab\tx5868\lin5868 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fbias0\hres0\chhres0 \fi-360\li6588\jclisttab\tx6588\lin6588 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436545\'01\u-3913 ?;}{\levelnumbers;}
-\f3\fbias0\hres0\chhres0 \fi-360\li7308\jclisttab\tx7308\lin7308 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436547\'01o;}{\levelnumbers;}
-\f2\fbias0\hres0\chhres0 \fi-360\li8028\jclisttab\tx8028\lin8028 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace454\levelindent0{\leveltext\leveltemplateid67436549\'01\u-3929 ?;}{\levelnumbers;}
-\f10\fbias0\hres0\chhres0 \fi-360\li8748\jclisttab\tx8748\lin8748 }{\listname ;}\listid2076125862}}{\*\listoverridetable{\listoverride\listid2076125862\listoverridecount0\ls1}{\listoverride\listid432867918\listoverridecount0\ls2}
-{\listoverride\listid739594883\listoverridecount0\ls3}{\listoverride\listid218248755\listoverridecount0\ls4}{\listoverride\listid501548701\listoverridecount0\ls5}{\listoverride\listid380901966\listoverridecount0\ls6}{\listoverride\listid1349017134
-\listoverridecount0\ls7}{\listoverride\listid407309104\listoverridecount0\ls8}{\listoverride\listid1904482310\listoverridecount0\ls9}{\listoverride\listid1328678781\listoverridecount0\ls10}{\listoverride\listid1972054121\listoverridecount0\ls11}
-{\listoverride\listid981424174\listoverridecount0\ls12}{\listoverride\listid88896242\listoverridecount0\ls13}}{\*\pgptbl {\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}{\pgp\ipgp0\itap0\li0\ri0\sb0\sa0}}{\*\rsidtbl \rsid1153\rsid6329\rsid78755\rsid138456\rsid158382
-\rsid207537\rsid208100\rsid283657\rsid355835\rsid417463\rsid532805\rsid544631\rsid748793\rsid928042\rsid1060359\rsid1115237\rsid1145060\rsid1184427\rsid1189032\rsid1198657\rsid1200420\rsid1247296\rsid1386866\rsid1451320\rsid1526286\rsid1527281\rsid1534536
-\rsid1534669\rsid1653280\rsid1658535\rsid1668394\rsid1789316\rsid1793135\rsid1837012\rsid1839383\rsid1852931\rsid1982595\rsid1982842\rsid2054570\rsid2359869\rsid2432204\rsid2506586\rsid2520116\rsid2561267\rsid2628187\rsid2715337\rsid2719440\rsid2843034
-\rsid2847067\rsid2850772\rsid2959513\rsid3103346\rsid3108205\rsid3177514\rsid3233981\rsid3303158\rsid3428059\rsid3736257\rsid3804408\rsid3810493\rsid3820566\rsid3933740\rsid3949746\rsid3953972\rsid4094820\rsid4130532\rsid4131279\rsid4326945\rsid4472726
-\rsid4481497\rsid4748508\rsid4814744\rsid4940536\rsid5399799\rsid5401344\rsid5576153\rsid5637750\rsid5666866\rsid5668484\rsid5857558\rsid5917523\rsid6256377\rsid6299183\rsid6301483\rsid6436109\rsid6514959\rsid6561873\rsid6634305\rsid6753214\rsid6777262
-\rsid6893578\rsid6962018\rsid7044809\rsid7086414\rsid7087670\rsid7233454\rsid7420305\rsid7484693\rsid7547637\rsid7568372\rsid7607628\rsid7619295\rsid7749931\rsid7764085\rsid7881996\rsid7932293\rsid7948186\rsid8021506\rsid8091258\rsid8132093\rsid8261731
-\rsid8269589\rsid8406248\rsid8486799\rsid8530379\rsid8666915\rsid8729496\rsid8734266\rsid8866891\rsid8914882\rsid8994097\rsid9008039\rsid9010942\rsid9186898\rsid9310574\rsid9379152\rsid9403438\rsid9520058\rsid9522630\rsid9526003\rsid9583014\rsid9661686
-\rsid9700070\rsid9717137\rsid9723817\rsid9767255\rsid10042125\rsid10098737\rsid10107112\rsid10178064\rsid10224828\rsid10238307\rsid10244522\rsid10297237\rsid10303369\rsid10307595\rsid10308084\rsid10315301\rsid10448614\rsid10695344\rsid10750065
-\rsid10750423\rsid10754876\rsid10762876\rsid10776927\rsid10813733\rsid10822502\rsid10886401\rsid10961598\rsid10975923\rsid11156372\rsid11172552\rsid11235996\rsid11287005\rsid11477381\rsid11565583\rsid11680598\rsid11868043\rsid11892435\rsid11999752
-\rsid12062193\rsid12130369\rsid12151659\rsid12218861\rsid12264738\rsid12279077\rsid12468081\rsid12473112\rsid12600295\rsid12609323\rsid12722781\rsid12739663\rsid12809264\rsid12862699\rsid12931206\rsid12933266\rsid12978455\rsid12983740\rsid12988393
-\rsid13054807\rsid13065259\rsid13132849\rsid13444795\rsid13531745\rsid13574099\rsid13632752\rsid13633324\rsid13779014\rsid13788729\rsid13913761\rsid14095596\rsid14183277\rsid14187722\rsid14223932\rsid14290469\rsid14297020\rsid14317108\rsid14358812
-\rsid14371250\rsid14487269\rsid14504946\rsid14508912\rsid14568714\rsid14580253\rsid14637882\rsid14681692\rsid14690017\rsid14708439\rsid14842001\rsid14885393\rsid15085573\rsid15104946\rsid15141024\rsid15170639\rsid15210557\rsid15343946\rsid15352731
-\rsid15472224\rsid15474480\rsid15483544\rsid15489831\rsid15729457\rsid16012817\rsid16060728\rsid16140264\rsid16143072\rsid16144532\rsid16198976\rsid16340342\rsid16462823\rsid16649700}{\mmathPr\mmathFont34\mbrkBin0\mbrkBinSub0\msmallFrac0\mdispDef1
-\mlMargin0\mrMargin0\mdefJc1\mwrapIndent1440\mintLim0\mnaryLim1}{\info{\title Sequence Chart Studio}{\author Petr Gotthard}{\operator xrehak}{\creatim\yr2008\mo12\dy30\hr22\min21}{\revtim\yr2013\mo3\dy21\hr23\min46}{\printim\yr2012\mo1\dy7\hr4\min20}
-{\version93}{\edmins13557}{\nofpages17}{\nofwords3062}{\nofchars18069}{\*\company Brno}{\nofcharsws21089}{\vern32773}}{\*\xmlnstbl {\xmlns1 http://schemas.microsoft.com/office/word/2003/wordml}{\xmlns2 urn:schemas-microsoft-com:office:smarttags}{\xmlns3 u
-rn:schemas:contacts}}\paperw11906\paperh16838\margl1701\margr1418\margt1701\margb1418\gutter0\ltrsect
-\deftab709\widowctrl\ftnbj\aenddoc\hyphhotz425\trackmoves1\trackformatting1\donotembedsysfont0\relyonvml0\donotembedlingdata1\grfdocevents0\validatexml0\showplaceholdtext0\ignoremixedcontent0\saveinvalidxml0
-\showxmlerrors0\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\hyphcaps0\formshade\horzdoc\dgmargin\dghspace180\dgvspace180\dghorigin1701\dgvorigin1701\dghshow1\dgvshow1
-\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
-\asianbrkrule\rsidroot8734266\newtblstyruls\nogrowautofit \fet0{\*\wgrffmtfilter 013f}\ilfomacatclnup0{\*\ftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1
-\af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid15352731 \chftnsep
-\par }}{\*\ftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1
-\ltrch\fcs0 \insrsid15352731 \chftnsepc
-\par }}{\*\aftnsep \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1
-\ltrch\fcs0 \insrsid15352731 \chftnsep
-\par }}{\*\aftnsepc \ltrpar \pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1
-\ltrch\fcs0 \insrsid15352731 \chftnsepc
-\par }}\ltrpar \sectd \ltrsect\linex0\headery709\footery709\colsx708\endnhere\titlepg\sectlinegrid360\sectdefaultcl\sectrsid1145060\sftnbj {\footerr \ltrpar \pard\plain \ltrpar\s22\ql \li0\ri0\widctlpar\brdrt\brdrs\brdrw10\brsp20
-\tqc\tx4536\tqr\tx9072\pvpara\phmrg\posxr\posy0\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid9379152 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\field{\*\fldinst {
-\rtlch\fcs1 \af1 \ltrch\fcs0 \cs24\insrsid1527281 PAGE }}{\fldrslt {\rtlch\fcs1 \af1 \ltrch\fcs0 \cs24\lang1024\langfe1024\noproof\insrsid5668484 17}}}\sectd \ltrsect\linex0\headery708\footery708\colsx708\endnhere\sectdefaultcl\sftnbj {\rtlch\fcs1 \af1
-\ltrch\fcs0 \cs24\insrsid1527281
-\par }\pard \ltrpar\s22\ql \li0\ri0\widctlpar\brdrt\brdrs\brdrw10\brsp20 \tqc\tx4536\tqr\tx9072\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid12473112 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid1527281\charrsid12473112
-\par }}{\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}
-{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8
-\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain \ltrpar\s17\ql \li2268\ri0\sb120\sa120\sl280\slmult0
-\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0\pararsid10107112 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1\afs40 \ltrch\fcs0 \fs40\insrsid4094820
-
-\par
-\par
-\par }{\rtlch\fcs1 \af1\afs40 \ltrch\fcs0 \fs40\insrsid4094820\charrsid4094820
-\par }{\rtlch\fcs1 \ab\af1\afs40 \ltrch\fcs0 \b\fs40\insrsid10107112\charrsid10107112 Sequence Chart Studio}{\rtlch\fcs1 \ab\af1\afs40 \ltrch\fcs0 \b\fs40\insrsid10107112
-\par }{\rtlch\fcs1 \af1\afs40 \ltrch\fcs0 \fs40\insrsid10107112\charrsid10107112 User }{\rtlch\fcs1 \af1\afs40 \ltrch\fcs0 \fs40\insrsid10107112 Instructions
-\par }{\rtlch\fcs1 \af1\afs40 \ltrch\fcs0 \fs40\insrsid11868043
-\par Version 0.}{\rtlch\fcs1 \af1\afs40 \ltrch\fcs0 \fs40\insrsid10307595 5}{\rtlch\fcs1 \af1\afs40 \ltrch\fcs0 \fs40\insrsid14690017 .3}{\rtlch\fcs1 \af1\afs40 \ltrch\fcs0 \fs40\insrsid11868043\charrsid10107112
-\par }\pard\plain \ltrpar\ql \li0\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid1982595 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0 \f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1
-\ltrch\fcs0 \insrsid3933740
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par
-\par }\pard \ltrpar\ql \li2268\ri0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0\pararsid8269589 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid13574099 Copyright (c) 2008\endash 20}{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid8269589 10}{
-\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid13574099 Petr Gotthard}{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid3933740
-\par }\pard\plain \ltrpar\s17\ql \li2268\ri0\sb120\sa120\sl280\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0\pararsid8866891 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0
-\f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid1982595 Copyright (c) }{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid3933740 20}{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid13574099 1}{\rtlch\fcs1 \af1 \ltrch\fcs0
-\insrsid8269589 1}{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid3933740 \endash }{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid1982595 20}{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid13574099 1}{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid748793 3}{\rtlch\fcs1 \af1 \ltrch\fcs0
-\insrsid1982595 }{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid13574099 Ond\'f8ej Bouda}{\rtlch\fcs1 \af1 \ltrch\fcs0 \lang1029\langfe1029\langnp1029\insrsid1982595\charrsid13574099
-\par }\pard \ltrpar\s17\ql \li2268\ri0\sb120\sa120\sl280\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0\pararsid3933740 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid3933740 All rights reserved. }{\rtlch\fcs1 \af1 \ltrch\fcs0
-\insrsid1982595 Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License version 1.3, as published by the Free Software Foundation; with no Invariant Sections, no Front-Cover
-Texts, and no Back-Cover Texts.
-\par }\pard\plain \ltrpar\s1\ql \li2268\ri0\sb120\sa240\sl280\slmult0\keepn\pagebb\widctlpar\wrapdefault\aspalpha\aspnum\faauto\outlinelevel0\adjustright\rin0\lin2268\itap0\pararsid10107112 \rtlch\fcs1 \ab\af1\afs28\alang1025 \ltrch\fcs0
-\b\f1\fs28\lang1033\langfe1029\kerning32\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1\afs36 \ltrch\fcs0 \fs36\insrsid1534669\charrsid3953972 Introduction
-\par }\pard\plain \ltrpar\s17\ql \li2268\ri0\sb120\sa120\sl280\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0\pararsid2054570 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0
-\f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid7044809 The Sequence Chart Studio (or SCStudio, for short) is a user-friendly drawing and verification tool for Message Sequence Charts (MSC).}{\rtlch\fcs1
-\af1 \ltrch\fcs0 \insrsid2054570
-\par }\pard \ltrpar\s17\ql \li2268\ri0\sb120\sa120\sl280\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0\pararsid13531745 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid2054570
-The first part of this document describes the SCStudio graphical user interface.}{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid16340342 As it is implemented as a Microsoft Visio add-on, it }{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid13531745
-requires Microsoft Visio 2003 or higher and runs on Microsoft Windows only.}{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid2054570
-\par }{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid16340342 Besides the graphical frontend, a command-line interface is also available for verifying and manipulation with MSCs in the ITU-T Z.120 textual representation. See the Command-Line Interface }{\rtlch\fcs1
-\af1 \ltrch\fcs0 \insrsid13531745 part of this document.}{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid16340342
-\par }\pard \ltrpar\s17\ql \li2268\ri0\sb120\sa120\sl280\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0\pararsid16340342 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid16340342\charrsid13444795
-\par }\pard\plain \ltrpar\s18\ql \fi-2268\li2268\ri0\sb120\sa120\sl280\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0\pararsid16340342 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0
-\f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid16340342 Download\tab The latest version of SCStudio can be freely downloaded from }{\field\flddirty{\*\fldinst {\rtlch\fcs1 \af1 \ltrch\fcs0
-\insrsid16340342 HYPERLINK "http://scstudio.sourceforge.net" }{\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid355835 {\*\datafield
-00d0c9ea79f9bace118c8200aa004ba90b02000000170000002000000068007400740070003a002f002f0073006300730074007500640069006f002e0073006f00750072006300650066006f007200670065002e006e00650074000000e0c9ea79f9bace118c8200aa004ba90b4200000068007400740070003a002f002f00
-73006300730074007500640069006f002e0073006f00750072006300650066006f007200670065002e006e00650074002f000000000000000000000000000000000096060000000000e189390406000000000000c2}}}{\fldrslt {\rtlch\fcs1 \af1 \ltrch\fcs0
-\cs20\ul\cf2\insrsid16340342\charrsid7484693 http://scstudio.sourceforge.net}}}\sectd \ltrsect\linex0\headery709\footery709\colsx708\endnhere\titlepg\sectlinegrid360\sectdefaultcl\sectrsid1145060\sftnbj {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid16340342
-
-\par }\pard\plain \ltrpar\s17\ql \li2268\ri0\sb120\sa120\sl280\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0\pararsid13531745 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0
-\f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid13531745
-\par }\pard\plain \ltrpar\s18\ql \fi-2268\li2268\ri0\sb120\sa120\sl280\slmult0\widctlpar\wrapdefault\aspalpha\aspnum\faauto\adjustright\rin0\lin2268\itap0\pararsid13531745 \rtlch\fcs1 \af1\afs20\alang1025 \ltrch\fcs0
-\f1\fs20\lang1033\langfe1029\cgrid\langnp1033\langfenp1029 {\rtlch\fcs1 \af1 \ltrch\fcs0 \insrsid13531745 User Support\tab If you need help:
-\par {\listtext\pard\plain\ltrpar \s17 \rtlch\fcs1 \af1\afs20 \ltrch\fcs0 \fs20\lang1033\langfe1029\langnp1033\insrsid13531745 \loch\af0\dbch\af0\hich\f0 \'96\tab}}\pard\plain \ltrpar\s17\ql \fi-311\li3033\ri0\sb120\sa120\sl280\slmult0\widctlpar
-\jclisttab\tx3033\wrapdefault\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin3033\itap0\pararsid13531745 \rtlch\fc...
[truncated message content] |
|
From: <xf...@us...> - 2014-01-20 17:50:11
|
Revision: 1885
http://sourceforge.net/p/scstudio/code/1885
Author: xfarmad
Date: 2014-01-20 17:50:08 +0000 (Mon, 20 Jan 2014)
Log Message:
-----------
new test results for windows testing (slightly different time labels)
Modified Paths:
--------------
trunk/tests/time_relevant_ordering/tro_test15.tex.result1
Added Paths:
-----------
trunk/tests/exporttex_test/exporttex_time26.tex.result1
trunk/tests/exporttex_test/exporttex_time27.tex.result1
trunk/tests/exporttex_test/exporttex_time28.tex.result1
trunk/tests/exporttex_test/exporttex_time29.tex.result1
trunk/tests/exporttex_test/exporttex_time30.tex.result1
trunk/tests/time_relevant_ordering/tro_test24.tex.result1
trunk/tests/time_relevant_ordering/tro_test25.tex.result1
Added: trunk/tests/exporttex_test/exporttex_time26.tex.result1
===================================================================
--- trunk/tests/exporttex_test/exporttex_time26.tex.result1 (rev 0)
+++ trunk/tests/exporttex_test/exporttex_time26.tex.result1 2014-01-20 17:50:08 UTC (rev 1885)
@@ -0,0 +1,206 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% You can download Msc5.sty package from:
+%%%% http://is.muni.cz/www/374320/msc5.sty
+%%%% Documentation:
+%%%% http://is.muni.cz/www/374320/manualNew.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\documentclass{article}
+\usepackage{msc5}
+\usepackage[a4paper]{geometry}
+\begin{document}
+\drawframe{no}
+\section*{exporttex\_time26}
+\sethmsckeyword{Main}
+\begin{hmsc}{}(0,0)(3,11)
+
+%%%%%%%%%%%%%%%%%%
+%%%% Configuration
+%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+
+%%%% Width of reference node:
+\def\referenceWidthA{20mm*\real{\mscScaleX}}
+
+\setlength{\hmscreferencewidth}{\referenceWidthA}
+
+
+%%%% Height of reference node:
+\def\referenceHeightA{10mm*\real{\mscScaleY}}
+
+\setlength{\hmscreferenceheight}{\referenceHeightA}
+
+
+%%%% Width of condition:
+\def\conditionWidthA{20mm*\real{\mscScaleX}}
+
+\setlength{\hmscconditionwidth}{\conditionWidthA}
+
+
+%%%% Height of condition:
+\def\conditionHeightA{10mm*\real{\mscScaleY}}
+
+\setlength{\hmscconditionheight}{\conditionHeightA}
+
+
+%%%% Radius of connection symbol:
+\def\connectionRadiusA{1mm*\real{\mscScaleY}}
+
+\setlength{\hmscconnectionradius}{\connectionRadiusA}
+
+
+%%%% Width of time interval:
+\def\timeintervalWidthA{14mm*\real{\mscScaleX}}
+
+
+
+
+%%%%%%%%%%%%%%%%%%
+%%%% End configuration
+%%%%%%%%%%%%%%%%%%
+
+\hmscstartsymbol{0}(1.5,9.5)
+\hmscconnection{1}(1.5,7.5)
+\hmscreference{2}{Subprocess}(1.5,5.5)
+\hmscreference{3}{Subprocess}(1.5,3.5)
+\hmscendsymbol{4}(1.5,1.5)
+\arrow{0}{1}
+\arrow{1}{2}
+\arrow{1}{3}
+\arrow{2}{4}
+\hmscmeasure{[3,4]}[\timeintervalWidthA]{3}[top]{3}[bottom]
+\hmscmeasure{[1,2)}[\timeintervalWidthA]{3}[top]{3}[bottom]
+\hmscmeasure[yes]{(1,10)}[\timeintervalWidthA]{3}[top]{2}[bottom]
+\arrow{3}{2}
+\end{hmsc}
+\newpage
+\setmsckeyword{Subprocess}
+\begin{msc}{}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+%%%% Picture box width:
+\setlength{\envinstdist}{15mm*\real{\mscScaleX}}
+
+%%%% Picture box y-padding:
+\setlength{\topheaddist}{\topheaddist}
+\setlength{\bottomfootdist}{\bottomfootdist}
+
+%%%% Instance first and last level height:
+\setlength{\firstlevelheight}{5mm*\real{\mscScaleY}}
+\setlength{\lastlevelheight}{5mm*\real{\mscScaleY}}
+
+%%%% Levels:
+\def\levelA{5mm*\real{\mscScaleY}}
+
+\setlength{\levelheight}{\levelA}
+
+
+%%%% Slope:
+\def\slopeA{0mm*\real{\mscScaleY}}
+
+
+%%%% Coregin first levels:
+\def\coregionFirstA{5mm*\real{\mscScaleY}}
+
+
+%%%% Coregion last levels:
+\def\coregionLastA{5mm*\real{\mscScaleY}}
+
+
+%%%% Width of coregion's body:
+\def\coregionWidthA{10mm*\real{\mscScaleX}}
+
+\setlength{\regionwidth}{\coregionWidthA}
+
+%%%% Width od time interval:
+\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
+
+
+
+%%%% Time interval slope:
+\def\timeIntervalSlopeA{\coregionLastA+\levelA}
+\def\timeIntervalSlopeB{\levelA+\coregionLastA+\levelA}
+\def\timeIntervalSlopeC{\levelA}
+%%%% Ordering width:
+\def\orderingWidthA{3mm*\real{\mscScaleX}}
+
+
+
+%%%% Order slope:
+\def\orderSlopeA{\levelA}
+%%%% Width of instance head/foot:
+\def\instanceWidthA{10mm*\real{\mscScaleX}}
+
+\setlength{\instwidth}{\instanceWidthA}
+
+%%%% Height of instance head/foot:
+\def\instanceHeightA{3mm*\real{\mscScaleY}}
+
+\setlength{\instheadheight}{\instanceHeightA}
+
+\setlength{\instfootheight}{\instheadheight}
+
+%%%% Space between instances:
+\def\instanceSpaceA{25mm*\real{\mscScaleX}}
+
+\setlength{\instdist}{\instanceSpaceA}
+
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% End of configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\declinst{0_inst}{P1}[colorA]{}
+\declinst{1_inst}{P2}[colorA]{}
+
+\regionstart{coregion}[colorA]{1_inst}
+\nextlevel
+
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeB}
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[12]}{1_inst}{1_inst}[1][-\coregionWidthA*\real{0.5}]
+
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[4]}{1_inst}{1_inst}[1]
+\setlength{\selfmesswidth}{\orderingWidthA}
+\order*[l]{1_inst}{1_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[7]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\coregionLastA}
+\nextlevel
+
+\regionend{1_inst}
+\nextlevel
+
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{1_inst}[0.3]{0_inst}[1]
+\end{msc}
+\end{document}
Added: trunk/tests/exporttex_test/exporttex_time27.tex.result1
===================================================================
--- trunk/tests/exporttex_test/exporttex_time27.tex.result1 (rev 0)
+++ trunk/tests/exporttex_test/exporttex_time27.tex.result1 2014-01-20 17:50:08 UTC (rev 1885)
@@ -0,0 +1,206 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% You can download Msc5.sty package from:
+%%%% http://is.muni.cz/www/374320/msc5.sty
+%%%% Documentation:
+%%%% http://is.muni.cz/www/374320/manualNew.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\documentclass{article}
+\usepackage{msc5}
+\usepackage[a4paper]{geometry}
+\begin{document}
+\drawframe{no}
+\section*{exporttex\_time27}
+\sethmsckeyword{Main}
+\begin{hmsc}{}(0,0)(3,11)
+
+%%%%%%%%%%%%%%%%%%
+%%%% Configuration
+%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+
+%%%% Width of reference node:
+\def\referenceWidthA{20mm*\real{\mscScaleX}}
+
+\setlength{\hmscreferencewidth}{\referenceWidthA}
+
+
+%%%% Height of reference node:
+\def\referenceHeightA{10mm*\real{\mscScaleY}}
+
+\setlength{\hmscreferenceheight}{\referenceHeightA}
+
+
+%%%% Width of condition:
+\def\conditionWidthA{20mm*\real{\mscScaleX}}
+
+\setlength{\hmscconditionwidth}{\conditionWidthA}
+
+
+%%%% Height of condition:
+\def\conditionHeightA{10mm*\real{\mscScaleY}}
+
+\setlength{\hmscconditionheight}{\conditionHeightA}
+
+
+%%%% Radius of connection symbol:
+\def\connectionRadiusA{1mm*\real{\mscScaleY}}
+
+\setlength{\hmscconnectionradius}{\connectionRadiusA}
+
+
+%%%% Width of time interval:
+\def\timeintervalWidthA{14mm*\real{\mscScaleX}}
+
+
+
+
+%%%%%%%%%%%%%%%%%%
+%%%% End configuration
+%%%%%%%%%%%%%%%%%%
+
+\hmscstartsymbol{0}(1.5,9.5)
+\hmscconnection{1}(1.5,7.5)
+\hmscreference{2}{Subprocess}(1.5,5.5)
+\hmscreference{3}{Subprocess}(1.5,3.5)
+\hmscendsymbol{4}(1.5,1.5)
+\arrow{0}{1}
+\arrow{1}{2}
+\arrow{1}{3}
+\arrow{2}{4}
+\hmscmeasure{[3,4]}[\timeintervalWidthA]{3}[top]{3}[bottom]
+\hmscmeasure{[1,2)}[\timeintervalWidthA]{3}[top]{3}[bottom]
+\hmscmeasure[yes]{(1,10)}[\timeintervalWidthA]{3}[top]{2}[bottom]
+\arrow{3}{2}
+\end{hmsc}
+\newpage
+\setmsckeyword{Subprocess}
+\begin{msc}{}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+%%%% Picture box width:
+\setlength{\envinstdist}{15mm*\real{\mscScaleX}}
+
+%%%% Picture box y-padding:
+\setlength{\topheaddist}{\topheaddist}
+\setlength{\bottomfootdist}{\bottomfootdist}
+
+%%%% Instance first and last level height:
+\setlength{\firstlevelheight}{5mm*\real{\mscScaleY}}
+\setlength{\lastlevelheight}{5mm*\real{\mscScaleY}}
+
+%%%% Levels:
+\def\levelA{5mm*\real{\mscScaleY}}
+
+\setlength{\levelheight}{\levelA}
+
+
+%%%% Slope:
+\def\slopeA{0mm*\real{\mscScaleY}}
+
+
+%%%% Coregin first levels:
+\def\coregionFirstA{5mm*\real{\mscScaleY}}
+
+
+%%%% Coregion last levels:
+\def\coregionLastA{5mm*\real{\mscScaleY}}
+
+
+%%%% Width of coregion's body:
+\def\coregionWidthA{10mm*\real{\mscScaleX}}
+
+\setlength{\regionwidth}{\coregionWidthA}
+
+%%%% Width od time interval:
+\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
+
+
+
+%%%% Time interval slope:
+\def\timeIntervalSlopeA{\coregionLastA+\levelA}
+\def\timeIntervalSlopeB{\levelA+\coregionLastA+\levelA}
+\def\timeIntervalSlopeC{\levelA}
+%%%% Ordering width:
+\def\orderingWidthA{3mm*\real{\mscScaleX}}
+
+
+
+%%%% Order slope:
+\def\orderSlopeA{\levelA}
+%%%% Width of instance head/foot:
+\def\instanceWidthA{10mm*\real{\mscScaleX}}
+
+\setlength{\instwidth}{\instanceWidthA}
+
+%%%% Height of instance head/foot:
+\def\instanceHeightA{3mm*\real{\mscScaleY}}
+
+\setlength{\instheadheight}{\instanceHeightA}
+
+\setlength{\instfootheight}{\instheadheight}
+
+%%%% Space between instances:
+\def\instanceSpaceA{25mm*\real{\mscScaleX}}
+
+\setlength{\instdist}{\instanceSpaceA}
+
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% End of configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\declinst{0_inst}{P1}[colorA]{}
+\declinst{1_inst}{P2}[colorA]{}
+
+\regionstart{coregion}[colorA]{1_inst}
+\nextlevel
+
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeB}
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[12]}{1_inst}{1_inst}[1][-\coregionWidthA*\real{0.5}]
+
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[4]}{1_inst}{1_inst}[1]
+\setlength{\selfmesswidth}{\orderingWidthA}
+\order*[l]{1_inst}{1_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[7]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\coregionLastA}
+\nextlevel
+
+\regionend{1_inst}
+\nextlevel
+
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{1_inst}[0.3]{0_inst}[1]
+\end{msc}
+\end{document}
Added: trunk/tests/exporttex_test/exporttex_time28.tex.result1
===================================================================
--- trunk/tests/exporttex_test/exporttex_time28.tex.result1 (rev 0)
+++ trunk/tests/exporttex_test/exporttex_time28.tex.result1 2014-01-20 17:50:08 UTC (rev 1885)
@@ -0,0 +1,206 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% You can download Msc5.sty package from:
+%%%% http://is.muni.cz/www/374320/msc5.sty
+%%%% Documentation:
+%%%% http://is.muni.cz/www/374320/manualNew.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\documentclass{article}
+\usepackage{msc5}
+\usepackage[a4paper]{geometry}
+\begin{document}
+\drawframe{no}
+\section*{exporttex\_time28}
+\sethmsckeyword{Main}
+\begin{hmsc}{}(0,0)(3,11)
+
+%%%%%%%%%%%%%%%%%%
+%%%% Configuration
+%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+
+%%%% Width of reference node:
+\def\referenceWidthA{20mm*\real{\mscScaleX}}
+
+\setlength{\hmscreferencewidth}{\referenceWidthA}
+
+
+%%%% Height of reference node:
+\def\referenceHeightA{10mm*\real{\mscScaleY}}
+
+\setlength{\hmscreferenceheight}{\referenceHeightA}
+
+
+%%%% Width of condition:
+\def\conditionWidthA{20mm*\real{\mscScaleX}}
+
+\setlength{\hmscconditionwidth}{\conditionWidthA}
+
+
+%%%% Height of condition:
+\def\conditionHeightA{10mm*\real{\mscScaleY}}
+
+\setlength{\hmscconditionheight}{\conditionHeightA}
+
+
+%%%% Radius of connection symbol:
+\def\connectionRadiusA{1mm*\real{\mscScaleY}}
+
+\setlength{\hmscconnectionradius}{\connectionRadiusA}
+
+
+%%%% Width of time interval:
+\def\timeintervalWidthA{14mm*\real{\mscScaleX}}
+
+
+
+
+%%%%%%%%%%%%%%%%%%
+%%%% End configuration
+%%%%%%%%%%%%%%%%%%
+
+\hmscstartsymbol{0}(1.5,9.5)
+\hmscconnection{1}(1.5,7.5)
+\hmscreference{2}{Subprocess}(1.5,5.5)
+\hmscreference{3}{Subprocess}(1.5,3.5)
+\hmscendsymbol{4}(1.5,1.5)
+\arrow{0}{1}
+\arrow{1}{2}
+\arrow{1}{3}
+\arrow{2}{4}
+\hmscmeasure{[3,4]}[\timeintervalWidthA]{3}[top]{3}[bottom]
+\hmscmeasure{[1,2)}[\timeintervalWidthA]{3}[top]{3}[bottom]
+\hmscmeasure[yes]{(1,10)}[\timeintervalWidthA]{3}[top]{2}[bottom]
+\arrow{3}{2}
+\end{hmsc}
+\newpage
+\setmsckeyword{Subprocess}
+\begin{msc}{}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+%%%% Picture box width:
+\setlength{\envinstdist}{15mm*\real{\mscScaleX}}
+
+%%%% Picture box y-padding:
+\setlength{\topheaddist}{\topheaddist}
+\setlength{\bottomfootdist}{\bottomfootdist}
+
+%%%% Instance first and last level height:
+\setlength{\firstlevelheight}{5mm*\real{\mscScaleY}}
+\setlength{\lastlevelheight}{5mm*\real{\mscScaleY}}
+
+%%%% Levels:
+\def\levelA{5mm*\real{\mscScaleY}}
+
+\setlength{\levelheight}{\levelA}
+
+
+%%%% Slope:
+\def\slopeA{0mm*\real{\mscScaleY}}
+
+
+%%%% Coregin first levels:
+\def\coregionFirstA{5mm*\real{\mscScaleY}}
+
+
+%%%% Coregion last levels:
+\def\coregionLastA{5mm*\real{\mscScaleY}}
+
+
+%%%% Width of coregion's body:
+\def\coregionWidthA{10mm*\real{\mscScaleX}}
+
+\setlength{\regionwidth}{\coregionWidthA}
+
+%%%% Width od time interval:
+\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
+
+
+
+%%%% Time interval slope:
+\def\timeIntervalSlopeA{\coregionLastA+\levelA}
+\def\timeIntervalSlopeB{\levelA+\coregionLastA+\levelA}
+\def\timeIntervalSlopeC{\levelA}
+%%%% Ordering width:
+\def\orderingWidthA{3mm*\real{\mscScaleX}}
+
+
+
+%%%% Order slope:
+\def\orderSlopeA{\levelA}
+%%%% Width of instance head/foot:
+\def\instanceWidthA{10mm*\real{\mscScaleX}}
+
+\setlength{\instwidth}{\instanceWidthA}
+
+%%%% Height of instance head/foot:
+\def\instanceHeightA{3mm*\real{\mscScaleY}}
+
+\setlength{\instheadheight}{\instanceHeightA}
+
+\setlength{\instfootheight}{\instheadheight}
+
+%%%% Space between instances:
+\def\instanceSpaceA{25mm*\real{\mscScaleX}}
+
+\setlength{\instdist}{\instanceSpaceA}
+
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% End of configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\declinst{0_inst}{P1}[colorA]{}
+\declinst{1_inst}{P2}[colorA]{}
+
+\regionstart{coregion}[colorA]{1_inst}
+\nextlevel
+
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeB}
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[12]}{1_inst}{1_inst}[1][-\coregionWidthA*\real{0.5}]
+
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[4]}{1_inst}{1_inst}[1]
+\setlength{\selfmesswidth}{\orderingWidthA}
+\order*[l]{1_inst}{1_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[7]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\coregionLastA}
+\nextlevel
+
+\regionend{1_inst}
+\nextlevel
+
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{1_inst}[0.3]{0_inst}[1]
+\end{msc}
+\end{document}
Added: trunk/tests/exporttex_test/exporttex_time29.tex.result1
===================================================================
--- trunk/tests/exporttex_test/exporttex_time29.tex.result1 (rev 0)
+++ trunk/tests/exporttex_test/exporttex_time29.tex.result1 2014-01-20 17:50:08 UTC (rev 1885)
@@ -0,0 +1,206 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% You can download Msc5.sty package from:
+%%%% http://is.muni.cz/www/374320/msc5.sty
+%%%% Documentation:
+%%%% http://is.muni.cz/www/374320/manualNew.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\documentclass{article}
+\usepackage{msc5}
+\usepackage[a4paper]{geometry}
+\begin{document}
+\drawframe{no}
+\section*{exporttex\_time29}
+\sethmsckeyword{Main}
+\begin{hmsc}{}(0,0)(3,11)
+
+%%%%%%%%%%%%%%%%%%
+%%%% Configuration
+%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+
+%%%% Width of reference node:
+\def\referenceWidthA{20mm*\real{\mscScaleX}}
+
+\setlength{\hmscreferencewidth}{\referenceWidthA}
+
+
+%%%% Height of reference node:
+\def\referenceHeightA{10mm*\real{\mscScaleY}}
+
+\setlength{\hmscreferenceheight}{\referenceHeightA}
+
+
+%%%% Width of condition:
+\def\conditionWidthA{20mm*\real{\mscScaleX}}
+
+\setlength{\hmscconditionwidth}{\conditionWidthA}
+
+
+%%%% Height of condition:
+\def\conditionHeightA{10mm*\real{\mscScaleY}}
+
+\setlength{\hmscconditionheight}{\conditionHeightA}
+
+
+%%%% Radius of connection symbol:
+\def\connectionRadiusA{1mm*\real{\mscScaleY}}
+
+\setlength{\hmscconnectionradius}{\connectionRadiusA}
+
+
+%%%% Width of time interval:
+\def\timeintervalWidthA{14mm*\real{\mscScaleX}}
+
+
+
+
+%%%%%%%%%%%%%%%%%%
+%%%% End configuration
+%%%%%%%%%%%%%%%%%%
+
+\hmscstartsymbol{0}(1.5,9.5)
+\hmscconnection{1}(1.5,7.5)
+\hmscreference{2}{Subprocess}(1.5,5.5)
+\hmscreference{3}{Subprocess}(1.5,3.5)
+\hmscendsymbol{4}(1.5,1.5)
+\arrow{0}{1}
+\arrow{1}{2}
+\arrow{1}{3}
+\arrow{2}{4}
+\hmscmeasure{[3,4]}[\timeintervalWidthA]{3}[top]{3}[bottom]
+\hmscmeasure{[1,2)}[\timeintervalWidthA]{3}[top]{3}[bottom]
+\hmscmeasure[yes]{(1,10)}[\timeintervalWidthA]{3}[top]{2}[bottom]
+\arrow{3}{2}
+\end{hmsc}
+\newpage
+\setmsckeyword{Subprocess}
+\begin{msc}{}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+%%%% Picture box width:
+\setlength{\envinstdist}{15mm*\real{\mscScaleX}}
+
+%%%% Picture box y-padding:
+\setlength{\topheaddist}{\topheaddist}
+\setlength{\bottomfootdist}{\bottomfootdist}
+
+%%%% Instance first and last level height:
+\setlength{\firstlevelheight}{5mm*\real{\mscScaleY}}
+\setlength{\lastlevelheight}{5mm*\real{\mscScaleY}}
+
+%%%% Levels:
+\def\levelA{5mm*\real{\mscScaleY}}
+
+\setlength{\levelheight}{\levelA}
+
+
+%%%% Slope:
+\def\slopeA{0mm*\real{\mscScaleY}}
+
+
+%%%% Coregin first levels:
+\def\coregionFirstA{5mm*\real{\mscScaleY}}
+
+
+%%%% Coregion last levels:
+\def\coregionLastA{5mm*\real{\mscScaleY}}
+
+
+%%%% Width of coregion's body:
+\def\coregionWidthA{10mm*\real{\mscScaleX}}
+
+\setlength{\regionwidth}{\coregionWidthA}
+
+%%%% Width od time interval:
+\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
+
+
+
+%%%% Time interval slope:
+\def\timeIntervalSlopeA{\coregionLastA+\levelA}
+\def\timeIntervalSlopeB{\levelA+\coregionLastA+\levelA}
+\def\timeIntervalSlopeC{\levelA}
+%%%% Ordering width:
+\def\orderingWidthA{3mm*\real{\mscScaleX}}
+
+
+
+%%%% Order slope:
+\def\orderSlopeA{\levelA}
+%%%% Width of instance head/foot:
+\def\instanceWidthA{10mm*\real{\mscScaleX}}
+
+\setlength{\instwidth}{\instanceWidthA}
+
+%%%% Height of instance head/foot:
+\def\instanceHeightA{3mm*\real{\mscScaleY}}
+
+\setlength{\instheadheight}{\instanceHeightA}
+
+\setlength{\instfootheight}{\instheadheight}
+
+%%%% Space between instances:
+\def\instanceSpaceA{25mm*\real{\mscScaleX}}
+
+\setlength{\instdist}{\instanceSpaceA}
+
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% End of configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\declinst{0_inst}{P1}[colorA]{}
+\declinst{1_inst}{P2}[colorA]{}
+
+\regionstart{coregion}[colorA]{1_inst}
+\nextlevel
+
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeB}
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[12]}{1_inst}{1_inst}[1][-\coregionWidthA*\real{0.5}]
+
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[4]}{1_inst}{1_inst}[1]
+\setlength{\selfmesswidth}{\orderingWidthA}
+\order*[l]{1_inst}{1_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[7]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\coregionLastA}
+\nextlevel
+
+\regionend{1_inst}
+\nextlevel
+
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{1_inst}[0.3]{0_inst}[1]
+\end{msc}
+\end{document}
Added: trunk/tests/exporttex_test/exporttex_time30.tex.result1
===================================================================
--- trunk/tests/exporttex_test/exporttex_time30.tex.result1 (rev 0)
+++ trunk/tests/exporttex_test/exporttex_time30.tex.result1 2014-01-20 17:50:08 UTC (rev 1885)
@@ -0,0 +1,206 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% You can download Msc5.sty package from:
+%%%% http://is.muni.cz/www/374320/msc5.sty
+%%%% Documentation:
+%%%% http://is.muni.cz/www/374320/manualNew.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\documentclass{article}
+\usepackage{msc5}
+\usepackage[a4paper]{geometry}
+\begin{document}
+\drawframe{no}
+\section*{exporttex\_time30}
+\sethmsckeyword{Main}
+\begin{hmsc}{}(0,0)(3,11)
+
+%%%%%%%%%%%%%%%%%%
+%%%% Configuration
+%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+
+%%%% Width of reference node:
+\def\referenceWidthA{20mm*\real{\mscScaleX}}
+
+\setlength{\hmscreferencewidth}{\referenceWidthA}
+
+
+%%%% Height of reference node:
+\def\referenceHeightA{10mm*\real{\mscScaleY}}
+
+\setlength{\hmscreferenceheight}{\referenceHeightA}
+
+
+%%%% Width of condition:
+\def\conditionWidthA{20mm*\real{\mscScaleX}}
+
+\setlength{\hmscconditionwidth}{\conditionWidthA}
+
+
+%%%% Height of condition:
+\def\conditionHeightA{10mm*\real{\mscScaleY}}
+
+\setlength{\hmscconditionheight}{\conditionHeightA}
+
+
+%%%% Radius of connection symbol:
+\def\connectionRadiusA{1mm*\real{\mscScaleY}}
+
+\setlength{\hmscconnectionradius}{\connectionRadiusA}
+
+
+%%%% Width of time interval:
+\def\timeintervalWidthA{14mm*\real{\mscScaleX}}
+
+
+
+
+%%%%%%%%%%%%%%%%%%
+%%%% End configuration
+%%%%%%%%%%%%%%%%%%
+
+\hmscstartsymbol{0}(1.5,9.5)
+\hmscconnection{1}(1.5,7.5)
+\hmscreference{2}{Subprocess}(1.5,5.5)
+\hmscreference{3}{Subprocess}(1.5,3.5)
+\hmscendsymbol{4}(1.5,1.5)
+\arrow{0}{1}
+\arrow{1}{2}
+\arrow{1}{3}
+\arrow{2}{4}
+\hmscmeasure{[3,4]}[\timeintervalWidthA]{3}[top]{3}[bottom]
+\hmscmeasure{[1,2)}[\timeintervalWidthA]{3}[top]{3}[bottom]
+\hmscmeasure[yes]{(1,10)}[\timeintervalWidthA]{3}[top]{2}[bottom]
+\arrow{3}{2}
+\end{hmsc}
+\newpage
+\setmsckeyword{Subprocess}
+\begin{msc}{}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+%%%% Picture box width:
+\setlength{\envinstdist}{15mm*\real{\mscScaleX}}
+
+%%%% Picture box y-padding:
+\setlength{\topheaddist}{\topheaddist}
+\setlength{\bottomfootdist}{\bottomfootdist}
+
+%%%% Instance first and last level height:
+\setlength{\firstlevelheight}{5mm*\real{\mscScaleY}}
+\setlength{\lastlevelheight}{5mm*\real{\mscScaleY}}
+
+%%%% Levels:
+\def\levelA{5mm*\real{\mscScaleY}}
+
+\setlength{\levelheight}{\levelA}
+
+
+%%%% Slope:
+\def\slopeA{0mm*\real{\mscScaleY}}
+
+
+%%%% Coregin first levels:
+\def\coregionFirstA{5mm*\real{\mscScaleY}}
+
+
+%%%% Coregion last levels:
+\def\coregionLastA{5mm*\real{\mscScaleY}}
+
+
+%%%% Width of coregion's body:
+\def\coregionWidthA{10mm*\real{\mscScaleX}}
+
+\setlength{\regionwidth}{\coregionWidthA}
+
+%%%% Width od time interval:
+\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
+
+
+
+%%%% Time interval slope:
+\def\timeIntervalSlopeA{\coregionLastA+\levelA}
+\def\timeIntervalSlopeB{\levelA+\coregionLastA+\levelA}
+\def\timeIntervalSlopeC{\levelA}
+%%%% Ordering width:
+\def\orderingWidthA{3mm*\real{\mscScaleX}}
+
+
+
+%%%% Order slope:
+\def\orderSlopeA{\levelA}
+%%%% Width of instance head/foot:
+\def\instanceWidthA{10mm*\real{\mscScaleX}}
+
+\setlength{\instwidth}{\instanceWidthA}
+
+%%%% Height of instance head/foot:
+\def\instanceHeightA{3mm*\real{\mscScaleY}}
+
+\setlength{\instheadheight}{\instanceHeightA}
+
+\setlength{\instfootheight}{\instheadheight}
+
+%%%% Space between instances:
+\def\instanceSpaceA{25mm*\real{\mscScaleX}}
+
+\setlength{\instdist}{\instanceSpaceA}
+
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% End of configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\declinst{0_inst}{P1}[colorA]{}
+\declinst{1_inst}{P2}[colorA]{}
+
+\regionstart{coregion}[colorA]{1_inst}
+\nextlevel
+
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeB}
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[12]}{1_inst}{1_inst}[1][-\coregionWidthA*\real{0.5}]
+
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[4]}{1_inst}{1_inst}[1]
+\setlength{\selfmesswidth}{\orderingWidthA}
+\order*[l]{1_inst}{1_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[7]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\coregionLastA}
+\nextlevel
+
+\regionend{1_inst}
+\nextlevel
+
+\setlength{\levelheight}{\slopeA}
+\mess{NAME}{1_inst}[0.3]{0_inst}[1]
+\end{msc}
+\end{document}
Modified: trunk/tests/time_relevant_ordering/tro_test15.tex.result1
===================================================================
--- trunk/tests/time_relevant_ordering/tro_test15.tex.result1 2014-01-19 15:10:07 UTC (rev 1884)
+++ trunk/tests/time_relevant_ordering/tro_test15.tex.result1 2014-01-20 17:50:08 UTC (rev 1885)
@@ -1,324 +1,327 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%% You can download Msc5.sty package from:
-%%%% http://is.muni.cz/www/374320/msc5.sty
-%%%% Documentation:
-%%%% http://is.muni.cz/www/374320/manualNew.pdf
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-
-\documentclass{article}
-\usepackage{msc5}
-\usepackage[a4paper]{geometry}
-\begin{document}
-\drawframe{no}
-\section*{tro\_test15}
-\setmsckeyword{Pcap}
-\begin{msc}{}
-
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%% Configuration header
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%%%% Scale:
-\def\mscScaleX{1.0}
-\def\mscScaleY{1.0}
-
-%%%% Lines width:
-\pgfsetlinewidth{0.4pt}
-
-%%%% Picture box width:
-\setlength{\envinstdist}{18mm*\real{\mscScaleX}}
-
-%%%% Picture box y-padding:
-\setlength{\topheaddist}{\topheaddist}
-\setlength{\bottomfootdist}{\bottomfootdist}
-
-%%%% Instance first and last level height:
-\setlength{\firstlevelheight}{13mm*\real{\mscScaleY}}
-\setlength{\lastlevelheight}{11mm*\real{\mscScaleY}}
-
-%%%% Levels:
-\def\levelA{8mm*\real{\mscScaleY}}
-\def\levelB{14mm*\real{\mscScaleY}}
-
-\setlength{\levelheight}{\levelA}
-
-
-%%%% Slope:
-\def\slopeA{0mm*\real{\mscScaleY}}
-\def\slopeB{\levelB+\levelA}
-
-
-%%%% Width od time interval:
-\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
-
-
-
-%%%% Time interval slope:
-\def\timeIntervalSlopeA{\levelA}
-\def30mm{\levelA+\levelA+\levelB+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+11mm+29.6766mm}
-\def\timeIntervalSlopeC{\def\timeIntervalSlopeD{\def22mm{\levelA+\levelB+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+11mm+21.6766mm}
-\def\timeIntervalSlopeF{\def\timeIntervalSlopeG{\def\timeIntervalSlopeH{%%%% Ordering width:
-\def\orderingWidthA{3mm*\real{\mscScaleX}}
-
-
-%%%% Width of instance head/foot:
-\def\instanceWidthA{15mm*\real{\mscScaleX}}
-
-\setlength{\instwidth}{\instanceWidthA}
-
-%%%% Height of instance head/foot:
-\def\instanceHeightA{3mm*\real{\mscScaleY}}
-
-\setlength{\instheadheight}{\instanceHeightA}
-
-\setlength{\instfootheight}{\instheadheight}
-
-%%%% Space between instances:
-\def\instanceSpaceA{30mm*\real{\mscScaleX}}
-
-\setlength{\instdist}{\instanceSpaceA}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%%%% End of configuration header
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-\declinst{0_inst}{192.168.170.8}{}
-\declinst{1_inst}{224.0.0.5}{}
-\declinst{2_inst}{192.168.170.2}{}
-\declinst{3_inst}{224.0.0.6}{}
-
-\setlength{\selfmesswidth}{\timeIntervalWidthA}
-\measure[l]{[10.011142]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{1\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[10.011142]}{1_inst}{1_inst}[1]
-\nextlevel
-
-\measure[l]{[10.011116]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{2\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[10.011116]}{1_inst}{1_inst}[1]
-\nextlevel
-
-\measure[l]{[10.011156]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{3\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[10.011156]}{1_inst}{1_inst}[1]
-\nextlevel
-
-\measure[l]{[10.011142]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{4\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[10.011142]}{1_inst}{1_inst}[1]
-\nextlevel
-
-\measure[l]{[10.011138]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{5\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[10.011138]}{1_inst}{1_inst}[1]
-\nextlevel
-
-\setlength{\levelheight}{30mm}
-\measure[l]{[3.32039]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{6\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[2.182577]}{1_inst}{1_inst}[1]
-\nextlevel
-
-\setlength{\levelheight}{22mm}
-\measure[l]{[1.137813]}{1_inst}{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[2.139944]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{7\_OSPFIGP\_}{2_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\setlength{\levelheight}{30mm}
-\measure[l]{[0.027497]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeB}
-\mess{9\_OSPFIGP\_}{2_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\levelB}
-\nextlevel
-
-\setlength{\levelheight}{\timeIntervalSlopeC}
-\measure[l]{[1.029628]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{8\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[1.002131]}{1_inst}{1_inst}[1]
-\nextlevel
-
-\setlength{\levelheight}{\timeIntervalSlopeF}
-\measure[l]{[0.031377]}{1_inst}{1_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\measure[l]{[0.001413]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{10\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[0.001413]}{2_inst}{2_inst}[1]
-\nextlevel
-
-\measure[l]{[0.000341]}{0_inst}{0_inst}[1]
-\measure[l]{[0.000341]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{11\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\measure[l]{[0.000231]}{0_inst}{0_inst}[1]
-\measure[l]{[0.000231]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{12\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\measure[l]{[0.000609]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{13\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[0.000609]}{2_inst}{2_inst}[1]
-\nextlevel
-
-\measure[l]{[0.000195]}{0_inst}{0_inst}[1]
-\measure[l]{[0.000195]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{14\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\measure[l]{[0.000627]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{15\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[0.000627]}{2_inst}{2_inst}[1]
-\nextlevel
-
-\measure[l]{[0.00011]}{0_inst}{0_inst}[1]
-\measure[l]{[0.00011]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{16\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\measure[l]{[0.000255]}{0_inst}{0_inst}[1]
-\measure[l]{[0.000255]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{17\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\measure[l]{[9.9e-005]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{18\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeC}
-\measure[l]{[0.002201]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\setlength{\levelheight}{\timeIntervalSlopeD}
-\measure[l]{[0.03172]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{19\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeD}
-\measure[l]{[0.03172]}{1_inst}{1_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\measure[l]{[0.000239]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{20\_OSPFIGP\_}{2_inst}[0.3]{3_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[0.000239]}{3_inst}{3_inst}[1]
-\nextlevel
-
-\setlength{\levelheight}{\timeIntervalSlopeH}
-\measure[l]{[4.007151]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{21\_OSPFIGP\_}{2_inst}[0.3]{3_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeH}
-\measure[l]{[4.007151]}{3_inst}{3_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\measure[l]{[8.4e-005]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{22\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[8.4e-005]}{1_inst}{1_inst}[1]
-\nextlevel
-
-\measure[l]{[0.785083]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{23\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[0.785083]}{1_inst}{1_inst}[1]
-\nextlevel
-
-\setlength{\levelheight}{\timeIntervalSlopeC}
-\measure[l]{[4.040254]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{24\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeC}
-\measure[l]{[4.040254]}{1_inst}{1_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\setlength{\levelheight}{\timeIntervalSlopeC}
-\measure[l]{[0.989974]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{25\_OSPFIGP\_}{2_inst}[0.3]{3_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeH}
-\measure[l]{[2.430157]}{3_inst}{3_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\measure[l]{[0.142325]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{26\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeG}
-\measure[l]{[4.120461]}{1_inst}{1_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\measure[l]{[0.000266]}{0_inst}{0_inst}[1]
-\measure[l]{[0.000266]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{27\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\setlength{\levelheight}{\timeIntervalSlopeC}
-\measure[l]{[1.440233]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{28\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
-\setlength{\levelheight}{\timeIntervalSlopeA}
-\measure[l]{[1.439917]}{2_inst}{2_inst}[1]
-\nextlevel
-
-\measure[l]{[0.000316]}{2_inst}{2_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{29\_OSPFIGP\_}{2_inst}[0.3]{3_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\measure[l]{[2.537637]}{0_inst}{0_inst}[1]
-\setlength{\levelheight}{\slopeA}
-\mess{30\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
-\setlength{\levelheight}{\levelA}
-\nextlevel
-
-\setlength{\levelheight}{\slopeA}
-\mess{31\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
-\end{msc}
-\end{document}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% You can download Msc5.sty package from:
+%%%% http://is.muni.cz/www/374320/msc5.sty
+%%%% Documentation:
+%%%% http://is.muni.cz/www/374320/manualNew.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\documentclass{article}
+\usepackage{msc5}
+\usepackage[a4paper]{geometry}
+\begin{document}
+\drawframe{no}
+\section*{tro\_test15}
+\setmsckeyword{Pcap}
+\begin{msc}{}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+%%%% Picture box width:
+\setlength{\envinstdist}{18mm*\real{\mscScaleX}}
+
+%%%% Picture box y-padding:
+\setlength{\topheaddist}{\topheaddist}
+\setlength{\bottomfootdist}{\bottomfootdist}
+
+%%%% Instance first and last level height:
+\setlength{\firstlevelheight}{13mm*\real{\mscScaleY}}
+\setlength{\lastlevelheight}{11mm*\real{\mscScaleY}}
+
+%%%% Levels:
+\def\levelA{8mm*\real{\mscScaleY}}
+\def\levelB{14mm*\real{\mscScaleY}}
+
+\setlength{\levelheight}{\levelA}
+
+
+%%%% Slope:
+\def\slopeA{0mm*\real{\mscScaleY}}
+\def\slopeB{\levelB+\levelA}
+
+
+%%%% Width od time interval:
+\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
+
+
+
+%%%% Time interval slope:
+\def\timeIntervalSlopeA{\levelA}
+\def30mm{\levelA+\levelA+\levelB+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+11mm+29.6766mm}
+\def\timeIntervalSlopeC{\def\timeIntervalSlopeD{\def22mm{\levelA+\levelB+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+\levelA+11mm+21.6766mm}
+\def\timeIntervalSlopeF{\def\timeIntervalSlopeG{\def\timeIntervalSlopeH{%%%% Ordering width:
+\def\orderingWidthA{3mm*\real{\mscScaleX}}
+
+
+%%%% Width of instance head/foot:
+\def\instanceWidthA{15mm*\real{\mscScaleX}}
+
+\setlength{\instwidth}{\instanceWidthA}
+
+%%%% Height of instance head/foot:
+\def\instanceHeightA{3mm*\real{\mscScaleY}}
+
+\setlength{\instheadheight}{\instanceHeightA}
+
+\setlength{\instfootheight}{\instheadheight}
+
+%%%% Space between instances:
+\def\instanceSpaceA{30mm*\real{\mscScaleX}}
+
+\setlength{\instdist}{\instanceSpaceA}
+
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% End of configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\declinst{0_inst}{192.168.170.8}[colorA]{}
+\declinst{1_inst}{224.0.0.5}[colorA]{}
+\declinst{2_inst}{192.168.170.2}[colorA]{}
+\declinst{3_inst}{224.0.0.6}[colorA]{}
+
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[10.011142]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{1\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[10.011142]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\measure[l]{[10.011116]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{2\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[10.011116]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\measure[l]{[10.011156]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{3\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[10.011156]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\measure[l]{[10.011142]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{4\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[10.011142]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\measure[l]{[10.011138]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{5\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[10.011138]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{30mm}
+\measure[l]{[3.32039]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{6\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[2.182577]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{22mm}
+\measure[l]{[1.137813]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[2.139944]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{7\_OSPFIGP\_}{2_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\levelheight}{30mm}
+\measure[l]{[0.027497]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeB}
+\mess{9\_OSPFIGP\_}{2_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\levelB}
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[1.029628]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{8\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[1.002131]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeF}
+\measure[l]{[0.031377]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.001413]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{10\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[0.001413]}{2_inst}{2_inst}[1]
+\nextlevel
+
+\measure[l]{[0.000341]}{0_inst}{0_inst}[1]
+\measure[l]{[0.000341]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{11\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.000231]}{0_inst}{0_inst}[1]
+\measure[l]{[0.000231]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{12\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.000609]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{13\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[0.000609]}{2_inst}{2_inst}[1]
+\nextlevel
+
+\measure[l]{[0.000195]}{0_inst}{0_inst}[1]
+\measure[l]{[0.000195]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{14\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.000627]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{15\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[0.000627]}{2_inst}{2_inst}[1]
+\nextlevel
+
+\measure[l]{[0.00011]}{0_inst}{0_inst}[1]
+\measure[l]{[0.00011]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{16\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.000255]}{0_inst}{0_inst}[1]
+\measure[l]{[0.000255]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{17\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[9.9e-005]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{18\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[0.002201]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeD}
+\measure[l]{[0.03172]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{19\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeD}
+\measure[l]{[0.03172]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.000239]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{20\_OSPFIGP\_}{2_inst}[0.3]{3_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[0.000239]}{3_inst}{3_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeH}
+\measure[l]{[4.007151]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{21\_OSPFIGP\_}{2_inst}[0.3]{3_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeH}
+\measure[l]{[4.007151]}{3_inst}{3_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[8.4e-005]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{22\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[8.4e-005]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\measure[l]{[0.785083]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{23\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[0.785083]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[4.040254]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{24\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[4.040254]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[0.989974]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{25\_OSPFIGP\_}{2_inst}[0.3]{3_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeH}
+\measure[l]{[2.430157]}{3_inst}{3_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.142325]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{26\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeG}
+\measure[l]{[4.120461]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.000266]}{0_inst}{0_inst}[1]
+\measure[l]{[0.000266]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{27\_OSPFIGP\_}{2_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[1.440233]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{28\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[1.439917]}{2_inst}{2_inst}[1]
+\nextlevel
+
+\measure[l]{[0.000316]}{2_inst}{2_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{29\_OSPFIGP\_}{2_inst}[0.3]{3_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[2.537637]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{30\_OSPFIGP\_}{0_inst}[0.3]{2_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\levelheight}{\slopeA}
+\mess{31\_OSPFIGP\_}{0_inst}[0.3]{1_inst}[1]
+\end{msc}
+\end{document}
Added: trunk/tests/time_relevant_ordering/tro_test24.tex.result1
===================================================================
--- trunk/tests/time_relevant_ordering/tro_test24.tex.result1 (rev 0)
+++ trunk/tests/time_relevant_ordering/tro_test24.tex.result1 2014-01-20 17:50:08 UTC (rev 1885)
@@ -0,0 +1,183 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% You can download Msc5.sty package from:
+%%%% http://is.muni.cz/www/374320/msc5.sty
+%%%% Documentation:
+%%%% http://is.muni.cz/www/374320/manualNew.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\documentclass{article}
+\usepackage{msc5}
+\usepackage[a4paper]{geometry}
+\begin{document}
+\drawframe{no}
+\section*{tro\_test24}
+\setmsckeyword{Pcap}
+\begin{msc}{}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+%%%% Picture box width:
+\setlength{\envinstdist}{20mm*\real{\mscScaleX}}
+
+%%%% Picture box y-padding:
+\setlength{\topheaddist}{\topheaddist}
+\setlength{\bottomfootdist}{\bottomfootdist}
+
+%%%% Instance first and last level height:
+\setlength{\firstlevelheight}{13mm*\real{\mscScaleY}}
+\setlength{\lastlevelheight}{11mm*\real{\mscScaleY}}
+
+%%%% Levels:
+\def\levelA{8mm*\real{\mscScaleY}}
+
+\setlength{\levelheight}{\levelA}
+
+
+%%%% Slope:
+\def\slopeA{0mm*\real{\mscScaleY}}
+
+
+%%%% Width of absolute time:
+\def\absoluteTimeWidthA{10mm*\real{\mscScaleX}}
+
+
+%%%% Absolute time slope:
+\def\absoluteTimeSlopeA{5mm*\real{\mscScaleY}}
+
+\setlength{\markdist}{\absoluteTimeSlopeA}
+
+%%%% Width od time interval:
+\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
+
+
+%%%% Ordering width:
+\def\orderingWidthA{3mm*\real{\mscScaleX}}
+
+
+%%%% Width of instance head/foot:
+\def\instanceWidthA{15mm*\real{\mscScaleX}}
+
+\setlength{\instwidth}{\instanceWidthA}
+
+%%%% Height of instance head/foot:
+\def\instanceHeightA{3mm*\real{\mscScaleY}}
+
+\setlength{\instheadheight}{\instanceHeightA}
+
+\setlength{\instfootheight}{\instheadheight}
+
+%%%% Space between instances:
+\def\instanceSpaceA{30mm*\real{\mscScaleX}}
+
+\setlength{\instdist}{\instanceSpaceA}
+
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% End of configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\declinst{0_inst}{192.168.69.2}[colorA]{}
+\declinst{1_inst}{192.168.69.1}[colorA]{}
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0]}{0_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_34059\_DST\_80\_TCP\_SYN\_SEQ\_0\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0]}{1_inst}
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[5.9e-005]}{0_inst}
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[5.9e-005]}{1_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_80\_DST\_34059\_TCP\_SYN\_ACK\_SEQ\_0\_ACK\_1\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.000153]}{0_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_34059\_DST\_80\_TCP\_ACK\_SEQ\_1\_ACK\_1\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.000153]}{1_inst}
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.000282]}{0_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_I\_SRC\_34059\_DST\_80\_TCP\_PSH\_ACK\_SEQ\_1\_ACK\_1\_HTTP\_GET\_cerberus\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.000282]}{1_inst}
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.00033]}{0_inst}
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.00033]}{1_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_80\_DST\_34059\_TCP\_ACK\_SEQ\_1\_ACK\_446\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.021452]}{0_inst}
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.021452]}{1_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_I\_SRC\_80\_DST\_34059\_TCP\_PSH\_ACK\_SEQ\_1\_ACK\_446\_HTTP\_STATUS\_CODE\_200\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.021629]}{0_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_34059\_DST\_80\_TCP\_ACK\_SEQ\_446\_ACK\_403\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.021629]}{1_inst}
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.021755]}{0_inst}
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.021755]}{1_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_80\_DST\_34059\_TCP\_FIN\_ACK\_SEQ\_403\_ACK\_446\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.022677]}{0_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_34059\_DST\_80\_TCP\_FIN\_ACK\_SEQ\_446\_ACK\_404\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.022677]}{1_inst}
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tl]{@[0.022715]}{0_inst}
+\setlength{\selfmesswidth}{\absoluteTimeWidthA}
+\mscmark[tr]{@[0.022715]}{1_inst}
+\setlength{\levelheight}{\slopeA}
+\mess{Ethernet\_II.\_I\_IPv4\_SRC\_80\_DST\_34059\_TCP\_ACK\_SEQ\_404\_ACK\_447\_}{1_inst}[0.3]{0_inst}[1]
+\end{msc}
+\end{document}
Added: trunk/tests/time_relevant_ordering/tro_test25.tex.result1
===================================================================
--- trunk/tests/time_relevant_ordering/tro_test25.tex.result1 (rev 0)
+++ trunk/tests/time_relevant_ordering/tro_test25.tex.result1 2014-01-20 17:50:08 UTC (rev 1885)
@@ -0,0 +1,162 @@
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% You can download Msc5.sty package from:
+%%%% http://is.muni.cz/www/374320/msc5.sty
+%%%% Documentation:
+%%%% http://is.muni.cz/www/374320/manualNew.pdf
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+
+\documentclass{article}
+\usepackage{msc5}
+\usepackage[a4paper]{geometry}
+\begin{document}
+\drawframe{no}
+\section*{tro\_test25}
+\setmsckeyword{Pcap}
+\begin{msc}{}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% Configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%% Scale:
+\def\mscScaleX{1.0}
+\def\mscScaleY{1.0}
+
+%%%% Lines width:
+\pgfsetlinewidth{0.4pt}
+
+%%%% Picture box width:
+\setlength{\envinstdist}{18mm*\real{\mscScaleX}}
+
+%%%% Picture box y-padding:
+\setlength{\topheaddist}{\topheaddist}
+\setlength{\bottomfootdist}{\bottomfootdist}
+
+%%%% Instance first and last level height:
+\setlength{\firstlevelheight}{13mm*\real{\mscScaleY}}
+\setlength{\lastlevelheight}{11mm*\real{\mscScaleY}}
+
+%%%% Levels:
+\def\levelA{8mm*\real{\mscScaleY}}
+
+\setlength{\levelheight}{\levelA}
+
+
+%%%% Slope:
+\def\slopeA{0mm*\real{\mscScaleY}}
+\def\slopeB{\levelA+\levelA+\levelA}
+\def\slopeC{\levelA+\levelA}
+
+
+%%%% Width od time interval:
+\def\timeIntervalWidthA{7mm*\real{\mscScaleX}}
+
+
+
+%%%% Time interval slope:
+\def\timeIntervalSlopeA{\levelA}
+\def\timeIntervalSlopeB{\levelA+\levelA}
+\def\timeIntervalSlopeC{0mm*\real{\mscScaleY}}
+%%%% Ordering width:
+\def\orderingWidthA{3mm*\real{\mscScaleX}}
+
+
+%%%% Width of instance head/foot:
+\def\instanceWidthA{15mm*\real{\mscScaleX}}
+
+\setlength{\instwidth}{\instanceWidthA}
+
+%%%% Height of instance head/foot:
+\def\instanceHeightA{3mm*\real{\mscScaleY}}
+
+\setlength{\instheadheight}{\instanceHeightA}
+
+\setlength{\instfootheight}{\instheadheight}
+
+%%%% Space between instances:
+\def\instanceSpaceA{30mm*\real{\mscScaleX}}
+
+\setlength{\instdist}{\instanceSpaceA}
+
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%% End of configuration header
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\declinst{0_inst}{192.168.69.2}[colorA]{}
+\declinst{1_inst}{192.168.69.1}[colorA]{}
+
+\setlength{\selfmesswidth}{\timeIntervalWidthA}
+\measure[l]{[5.9e-005]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{1\_TCP\_SYN\_SEQ\_0\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[5.9e-005]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\measure[l]{[9.4e-005]}{0_inst}{0_inst}[1]
+\measure[l]{[9.4e-005]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{2\_TCP\_SYN\_ACK\_SEQ\_0\_ACK\_1\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.000129]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{3\_TCP\_ACK\_SEQ\_1\_ACK\_1\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[0.000129]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\measure[l]{[4.8e-005]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{4\_HTTP\_GET\_cerberus\_ALL\_DATA\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[4.8e-005]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\measure[l]{[0.021122]}{0_inst}{0_inst}[1]
+\measure[l]{[0.021122]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{5\_TCP\_ACK\_SEQ\_1\_ACK\_446\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeB}
+\measure[l]{[0.001225]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[0.000303]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\slopeA}
+\mess{6\_HTTP\_STATUS\_CODE\_200\_ALL\_DATA\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.000922]}{1_inst}{1_inst}[1]
+\setlength{\levelheight}{\slopeB}
+\mess{8\_TCP\_FIN\_ACK\_SEQ\_403\_ACK\_446\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\setlength{\levelheight}{\timeIntervalSlopeB}
+\measure[l]{[0.000126]}{0_inst}{0_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeC}
+\measure[l]{[0.001048]}{0_inst}{1_inst}[1]
+\mess{9\_TCP\_FIN\_ACK\_SEQ\_446\_ACK\_404\_2\_packets\_}{0_inst}[0.3]{1_inst}[1]
+\setlength{\levelheight}{\timeIntervalSlopeA}
+\measure[l]{[3.8e-005]}{1_inst}{1_inst}[1]
+\nextlevel
+
+\setlength{\levelheight}{\slopeC}
+\mess{10\_TCP\_ACK\_SEQ\_404\_ACK\_447\_}{1_inst}[0.3]{0_inst}[1]
+\setlength{\levelheight}{\levelA}
+\nextlevel
+
+\measure[l]{[0.00096]}{0_inst}{0_inst}[1]
+\nextlevel
+
+\end{msc}
+\end{document}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xm...@us...> - 2014-01-19 15:10:11
|
Revision: 1884
http://sourceforge.net/p/scstudio/code/1884
Author: xmalota
Date: 2014-01-19 15:10:07 +0000 (Sun, 19 Jan 2014)
Log Message:
-----------
problem with connection point removed (connection arrow snapping)
Modified Paths:
--------------
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2014-01-18 19:16:54 UTC (rev 1883)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2014-01-19 15:10:07 UTC (rev 1884)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='4A84CE0E6985FB77D5BB66C65CCC78BAA480301653F3144FFBAD19F6F9E1BBB9DE685214277F4D1992F667765E7A59B1FD960C26034C941556801AB68568A994' start='190' metric='0' DocLangID='1029' buildnum='4518' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>806228390</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-11-28T12:15:28</TimeSaved><TimeEdited>2013-11-28T12:14:48</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1029</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1029</LangID></Char><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout></StyleSheet><StyleSheet ID='6' NameU='Basic' Name='Basic' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign F='Inh'>1</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='7' NameU='Visio 00' Name='Visio 00' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='HSL(0,0,0)'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='HSL(144,116,225)'>#e8eef7</FillForegnd><FillBkgnd F='HSL(144,106,193)'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='HSL(144,116,125)'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='8' NameU='Connector' Name='Connector' LineStyle='9' FillStyle='9' TextStyle='9'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>0</FillForegnd><FillBkgnd F='Inh'>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin Unit='PT' F='Inh'>0.05555555555555555</TopMargin><BottomMargin Unit='PT' F='Inh'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd>2</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='9' NameU='Visio 90' Name='Visio 90' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd>0</FillForegnd><FillBkgnd>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='10' NameU='Callout' Name='Callout' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet></StyleSheets><DocumentSheet NameU='TheDoc' Name='TheDoc' LineStyle='0' FillStyle='0' TextStyle='0'><DocProps><OutputFormat>0</OutputFormat><LockPreview>0</LockPreview><AddMarkup>0</AddMarkup><ViewMarkup>0</ViewMarkup><PreviewQuality>0</PreviewQuality><PreviewScope>1</PreviewScope><DocLangID>1029</DocLangID></DocProps></DocumentSheet><Masters><Master ID='0' NameU='Connection Point' Name='Connection Point' Prompt='' IconSize='1' AlignName='2' MatchByName='0' IconUpdate='0' UniqueID='{1F1B4BA3-0000-0000-8E40-00608CF305B2}' BaseID='{064F35E2-6C39-464C-B35F-F08A8DBDE3F3}' PatternFlags='0' Hidden='0'><PageSheet LineStyle='0' FillStyle='0' TextStyle='0'><PageProps><PageWidth>0.1968503937007888</PageWidth><PageHeight>0.1968503937007888</PageHeight><ShdwOffsetX Unit='IN'>0.125</ShdwOffsetX><ShdwOffsetY Unit='IN'>-0.125</ShdwOffsetY><PageScale Unit='MM'>0.03937007874015748</PageScale><DrawingScale Unit='MM'>0.03937007874015748</DrawingScale><DrawingSizeType>4</DrawingSizeType><DrawingScaleType>0</DrawingScaleType><InhibitSnap>0</InhibitSnap><UIVisibility>0</UIVisibility><ShdwType>0</ShdwType><ShdwObliqueAngle>0</ShdwObliqueAngle><ShdwScaleFactor>1</ShdwScaleFactor></PageProps><v14:PageProps xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:DrawingResizeType>1</v14:DrawingResizeType></v14:PageProps></PageSheet><Shapes><Shape ID='5' NameU='Circle' Name='Connection Point' Type='Shape' LineStyle='6' FillStyle='6' TextStyle='6'><XForm><PinX>0.09842519685039441</PinX><PinY>0.09842519685039441</PinY><Width>0.1968503937007888</Width><Height>0.1968503937007888</Height><LocPinX F='Width*0.5'>0.0984251968503944</LocPinX><LocPinY F='Height*0.5'>0.0984251968503944</LocPinY><Angle Unit='DEG'>0</Angle><FlipX>0</FlipX><FlipY>0</FlipY><ResizeMode>0</ResizeMode></XForm><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='RUNADDONWARGS("Sequence Chart Studio","/event=100")'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Fill><FillForegnd>1</FillForegnd><FillBkgnd F='Inh'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextXForm><TxtPinX F='Width*0.5'>0.0984251968503944</TxtPinX><TxtPinY F='Height*0.5'>0.0984251968503944</TxtPinY><TxtWidth F='Width*0.875'>0.1722440944881902</TxtWidth><TxtHeight F='Height*0.75'>0.1476377952755916</TxtHeight><TxtLocPinX F='TxtWidth*0.5'>0.0861220472440951</TxtLocPinX><TxtLocPinY F='TxtHeight*0.5'>0.0738188976377958</TxtLocPinY><TxtAngle>0</TxtAngle></TextXForm><Protection><LockWidth F='Inh'>0</LockWidth><LockHeight F='Inh'>0</LockHeight><LockMoveX F='Inh'>0</LockMoveX><LockMoveY F='Inh'>0</LockMoveY><LockAspect>1</LockAspect><LockDelete F='Inh'>0</LockDelete><LockBegin F='Inh'>0</LockBegin><LockEnd F='Inh'>0</LockEnd><LockRotate>1</LockRotate><LockCrop F='Inh'>0</LockCrop><LockVtxEdit F='Inh'>0</LockVtxEdit><LockTextEdit>1</LockTextEdit><LockFormat F='Inh'>0</LockFormat><LockGroup F='Inh'>0</LockGroup><LockCalcWH F='Inh'>0</LockCalcWH><LockSelect F='Inh'>0</LockSelect><LockCustProp F='Inh'>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat F='Inh'>0</vx:LockFromGroupFormat><vx:LockThemeColors F='Inh'>0</vx:LockThemeColors><vx:LockThemeEffects F='Inh'>0</vx:LockThemeEffects></vx:Protection><Help><HelpTopic V='null'/><Copyright>See http://scstudio.sourceforge.net</Copyright></Help><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting F='Inh'>0</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType>8</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID>1033</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX F='Inh'>0</ShapePermeableX><ShapePermeableY F='Inh'>0</ShapePermeableY><ShapePermeablePlace F='Inh'>0</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit>1</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><User NameU='visVersion' ID='2'><Value>11</Value><Prompt F='No Formula'/></User><User NameU='mscSymbol' ID='3'><Value Unit='STR'>hmsc.connection</Value><Prompt F='No Formula'/></User><Connection IX='0'><X F='GUARD(Width*0.5)'>0.0984251968503944</X><Y F='GUARD(Height*0)'>0</Y><DirX>0</DirX><DirY Unit='MM'>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='1'><X F='GUARD(Width*0)'>0</X><Y F='GUARD(Height*0.5)'>0.0984251968503944</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='2'><X F='GUARD(Width*1)'>0.1968503937007888</X><Y F='GUARD(Height*0.5)'>0.0984251968503944</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='3'><X F='GUARD(Width*0.5)'>0.0984251968503944</X><Y F='GUARD(Height*1)'>0.1968503937007888</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Geom IX='0'><NoFill>0</NoFill><NoLine>0</NoLine><NoShow>0</NoShow><NoSnap>1</NoSnap><MoveTo IX='1'><X F='Width*0'>0</X><Y F='Height*0.5'>0.0984251968503944</Y></MoveTo><EllipticalArcTo IX='2'><X F='Width*1'>0.1968503937007888</X><Y F='Height*0.5'>0.0984251968503944</Y><A Unit='DL' F='Width*0.5'>0.0984251968503944</A><B Unit='DL' F='Height*1'>0.1968503937007888</B><C Unit='DA'>0</C><D F='Width/Height*1'>1</D></EllipticalArcTo><EllipticalArcTo IX='3'><X F='Geometry1.X1'>0</X><Y F='Geometry1.Y1'>0.0984251968503944</Y><A Unit='DL' F='Width*0.5'>0.0984251968503944</A><B Unit='DL' F='Height*0'>0</B><C Unit='DA'>0</C><D F='Width/Height*1'>1</D></EllipticalArcTo></Geom><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout><v14:Geom IX='0' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:NoQuickDrag F='No Formula'>0</v14:NoQuickDrag></v14:Geom></Shape></Shapes><Icon>
+<VisioDocument key='561EF1F3D4002A6B5105D97846E560ED6B141910E4DA72AD6A0390CE12FEF41A9A9C8915B68F2E0C6637C1D06A4F5FE88A89F6AAA36110D3B4F8FE0CCE947F6B' start='190' metric='0' DocLangID='1029' buildnum='7100' version='14.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>939531196</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2014-01-15T09:46:43</TimeSaved><TimeEdited>2014-01-15T09:46:41</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01041666666666667</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships>0</v14:Relationships><v14:DisplayLevel>0</v14:DisplayLevel></v14:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><v14:PageLayout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:AvoidPageBreaks>0</v14:AvoidPageBreaks></v14:PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><v14:PageProps xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:DrawingResizeType F='No Formula'>0</v14:DrawingResizeType></v14:PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01041666666666667</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01041666666666667</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1029</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</Co...
[truncated message content] |
|
From: <xf...@us...> - 2014-01-18 19:17:00
|
Revision: 1883
http://sourceforge.net/p/scstudio/code/1883
Author: xfarmad
Date: 2014-01-18 19:16:54 +0000 (Sat, 18 Jan 2014)
Log Message:
-----------
New test results for colors in export_tex
Modified Paths:
--------------
trunk/tests/exporttex_position_test/exporttex_position_test.tex.result
trunk/tests/exporttex_test/exporttex_test00.tex.result
trunk/tests/exporttex_test/exporttex_test01.tex.result
trunk/tests/exporttex_test/exporttex_test02.tex.result
trunk/tests/exporttex_test/exporttex_test03.tex.result
trunk/tests/exporttex_test/exporttex_test04.tex.result
trunk/tests/exporttex_test/exporttex_test05.tex.result
trunk/tests/exporttex_test/exporttex_test06.tex.result
trunk/tests/exporttex_test/exporttex_test07.tex.result
trunk/tests/exporttex_test/exporttex_test08.tex.result
trunk/tests/exporttex_test/exporttex_test09.tex.result
trunk/tests/exporttex_test/exporttex_test10.tex.result
trunk/tests/exporttex_test/exporttex_test11.tex.result
trunk/tests/exporttex_test/exporttex_test13.tex.result
trunk/tests/exporttex_test/exporttex_test15.tex.result
trunk/tests/exporttex_test/exporttex_test16.tex.result
trunk/tests/exporttex_test/exporttex_test17.tex.result
trunk/tests/exporttex_test/exporttex_test18.tex.result
trunk/tests/exporttex_test/exporttex_test19.tex.result
trunk/tests/exporttex_test/exporttex_test20.tex.result
trunk/tests/exporttex_test/exporttex_test21.tex.result
trunk/tests/exporttex_test/exporttex_test22.tex.result
trunk/tests/exporttex_test/exporttex_test23.tex.result
trunk/tests/exporttex_test/exporttex_test24.tex.result
trunk/tests/exporttex_test/exporttex_test25.tex.result
trunk/tests/exporttex_test/exporttex_test26.tex.result
trunk/tests/exporttex_test/exporttex_test27.tex.result
trunk/tests/exporttex_test/exporttex_test28.tex.result
trunk/tests/exporttex_test/exporttex_test29.tex.result
trunk/tests/exporttex_test/exporttex_test30.tex.result
trunk/tests/exporttex_test/exporttex_test31.tex.result
trunk/tests/exporttex_test/exporttex_test32.tex.result
trunk/tests/exporttex_test/exporttex_test33.tex.result
trunk/tests/exporttex_test/exporttex_test34.tex.result
trunk/tests/exporttex_test/exporttex_test35.tex.result
trunk/tests/exporttex_test/exporttex_test36.tex.result
trunk/tests/exporttex_test/exporttex_test37.tex.result
trunk/tests/exporttex_test/exporttex_test38.tex.result
trunk/tests/exporttex_test/exporttex_test39.tex.result
trunk/tests/exporttex_test/exporttex_test40.tex.result
trunk/tests/exporttex_test/exporttex_test41.tex.result
trunk/tests/exporttex_test/exporttex_test42.tex.result
trunk/tests/exporttex_test/exporttex_test45.tex.result
trunk/tests/exporttex_test/exporttex_test47.tex.result
trunk/tests/exporttex_test/exporttex_test49.tex.result
trunk/tests/exporttex_test/exporttex_test50.tex.result
trunk/tests/exporttex_test/exporttex_test51.tex.result
trunk/tests/exporttex_test/exporttex_test52.tex.result
trunk/tests/exporttex_test/exporttex_test53.tex.result
trunk/tests/exporttex_test/exporttex_test54.tex.result
trunk/tests/exporttex_test/exporttex_test55.tex.result
trunk/tests/exporttex_test/exporttex_test56.tex.result
trunk/tests/exporttex_test/exporttex_test58.tex.result
trunk/tests/exporttex_test/exporttex_test59.tex.result
trunk/tests/exporttex_test/exporttex_test60.tex.result
trunk/tests/exporttex_test/exporttex_test61.tex.result
trunk/tests/exporttex_test/exporttex_test62.tex.result
trunk/tests/exporttex_test/exporttex_test63.tex.result
trunk/tests/exporttex_test/exporttex_test64.tex.result
trunk/tests/exporttex_test/exporttex_test65.tex.result
trunk/tests/exporttex_test/exporttex_test66.tex.result
trunk/tests/exporttex_test/exporttex_test67.tex.result
trunk/tests/exporttex_test/exporttex_test68.tex.result
trunk/tests/exporttex_test/exporttex_test69.tex.result
trunk/tests/exporttex_test/exporttex_test70.tex.result
trunk/tests/exporttex_test/exporttex_test72.tex.result
trunk/tests/exporttex_test/exporttex_test73.tex.result
trunk/tests/exporttex_test/exporttex_test74.tex.result
trunk/tests/exporttex_test/exporttex_test75.tex.result
trunk/tests/exporttex_test/exporttex_test76.tex.result
trunk/tests/exporttex_test/exporttex_test77.tex.result
trunk/tests/exporttex_test/exporttex_test78.tex.result
trunk/tests/exporttex_test/exporttex_test79.tex.result
trunk/tests/exporttex_test/exporttex_test80.tex.result
trunk/tests/exporttex_test/exporttex_test81.tex.result
trunk/tests/exporttex_test/exporttex_test82.tex.result
trunk/tests/exporttex_test/exporttex_test83.tex.result
trunk/tests/exporttex_test/exporttex_test84.tex.result
trunk/tests/exporttex_test/exporttex_test85.tex.result
trunk/tests/exporttex_test/exporttex_test86.tex.result
trunk/tests/exporttex_test/exporttex_test87.tex.result
trunk/tests/exporttex_test/exporttex_test88.tex.result
trunk/tests/exporttex_test/exporttex_test89.tex.result
trunk/tests/exporttex_test/exporttex_test90.tex.result
trunk/tests/exporttex_test/exporttex_test92.tex.result
trunk/tests/exporttex_test/exporttex_test93.tex.result
trunk/tests/exporttex_test/exporttex_test94.tex.result
trunk/tests/exporttex_test/exporttex_time01.tex.result
trunk/tests/exporttex_test/exporttex_time02.tex.result
trunk/tests/exporttex_test/exporttex_time03.tex.result
trunk/tests/exporttex_test/exporttex_time04.tex.result
trunk/tests/exporttex_test/exporttex_time05.tex.result
trunk/tests/exporttex_test/exporttex_time06.tex.result
trunk/tests/exporttex_test/exporttex_time07.tex.result
trunk/tests/exporttex_test/exporttex_time08.tex.result
trunk/tests/exporttex_test/exporttex_time09.tex.result
trunk/tests/exporttex_test/exporttex_time10.tex.result
trunk/tests/exporttex_test/exporttex_time11.tex.result
trunk/tests/exporttex_test/exporttex_time12.tex.result
trunk/tests/exporttex_test/exporttex_time13.tex.result
trunk/tests/exporttex_test/exporttex_time14.tex.result
trunk/tests/exporttex_test/exporttex_time15.tex.result
trunk/tests/exporttex_test/exporttex_time16.tex.result
trunk/tests/exporttex_test/exporttex_time17.tex.result
trunk/tests/exporttex_test/exporttex_time18.tex.result
trunk/tests/exporttex_test/exporttex_time19.tex.result
trunk/tests/exporttex_test/exporttex_time20.tex.result
trunk/tests/exporttex_test/exporttex_time21.tex.result
trunk/tests/exporttex_test/exporttex_time22.tex.result
trunk/tests/exporttex_test/exporttex_time23.tex.result
trunk/tests/exporttex_test/exporttex_time24.tex.result
trunk/tests/exporttex_test/exporttex_time25.tex.result
trunk/tests/exporttex_test/exporttex_time26.tex.result
trunk/tests/exporttex_test/exporttex_time27.tex.result
trunk/tests/exporttex_test/exporttex_time28.tex.result
trunk/tests/exporttex_test/exporttex_time29.tex.result
trunk/tests/exporttex_test/exporttex_time30.tex.result
trunk/tests/exporttex_test/exporttex_time31.tex.result
trunk/tests/exporttex_test/exporttex_time32.tex.result
trunk/tests/exporttex_test/exporttex_time33.tex.result
trunk/tests/exporttex_test/exporttex_time34.tex.result
trunk/tests/exporttex_test/exporttex_time35.tex.result
trunk/tests/exporttex_test/exporttex_time36.tex.result
trunk/tests/exporttex_test/exporttex_time37.tex.result
trunk/tests/exporttex_test/exporttex_time38.tex.result
trunk/tests/exporttex_test/exporttex_time39.tex.result
trunk/tests/exporttex_test/exporttex_time40.tex.result
trunk/tests/exporttex_test/exporttex_time41.tex.result
trunk/tests/exporttex_test/exporttex_time42.tex.result
trunk/tests/exporttex_test/exporttex_time43.tex.result
trunk/tests/exporttex_test/exporttex_time44.tex.result
trunk/tests/exporttex_test/exporttex_time45.tex.result
trunk/tests/exporttex_test/exporttex_time46.tex.result
trunk/tests/exporttex_test/exporttex_time47.tex.result
trunk/tests/exporttex_test/exporttex_time48.tex.result
trunk/tests/exporttex_test/exporttex_time49.tex.result
trunk/tests/time_relevant_ordering/tro_test00.tex.result
trunk/tests/time_relevant_ordering/tro_test01.tex.result
trunk/tests/time_relevant_ordering/tro_test02.tex.result
trunk/tests/time_relevant_ordering/tro_test03.tex.result
trunk/tests/time_relevant_ordering/tro_test04.tex.result
trunk/tests/time_relevant_ordering/tro_test05.tex.result
trunk/tests/time_relevant_ordering/tro_test06.tex.result
trunk/tests/time_relevant_ordering/tro_test07.tex.result
trunk/tests/time_relevant_ordering/tro_test08.tex.result
trunk/tests/time_relevant_ordering/tro_test09.tex.result
trunk/tests/time_relevant_ordering/tro_test10.tex.result
trunk/tests/time_relevant_ordering/tro_test11.tex.result
trunk/tests/time_relevant_ordering/tro_test12.tex.result
trunk/tests/time_relevant_ordering/tro_test13.tex.result
trunk/tests/time_relevant_ordering/tro_test14.tex.result
trunk/tests/time_relevant_ordering/tro_test15.tex.result
trunk/tests/time_relevant_ordering/tro_test16.tex.result
trunk/tests/time_relevant_ordering/tro_test17.tex.result
trunk/tests/time_relevant_ordering/tro_test18.tex.result
trunk/tests/time_relevant_ordering/tro_test19.tex.result
trunk/tests/time_relevant_ordering/tro_test20.tex.result
trunk/tests/time_relevant_ordering/tro_test21.tex.result
trunk/tests/time_relevant_ordering/tro_test22.tex.result
trunk/tests/time_relevant_ordering/tro_test23.tex.result
trunk/tests/time_relevant_ordering/tro_test24.tex.result
trunk/tests/time_relevant_ordering/tro_test25.tex.result
trunk/tests/time_relevant_ordering/tro_test28.tex.result
trunk/tests/time_relevant_ordering/tro_test29.tex.result
trunk/tests/time_relevant_ordering/tro_test30.tex.result
Modified: trunk/tests/exporttex_position_test/exporttex_position_test.tex.result
===================================================================
--- trunk/tests/exporttex_position_test/exporttex_position_test.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_position_test/exporttex_position_test.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -73,22 +73,25 @@
\setlength{\instdist}{\instanceSpaceC}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{1}{}
+\declinst{0_inst}{1}[colorA]{}
\setlength{\instdist}{\instanceSpaceA}
-\declinst{1_inst}{2}{}
+\declinst{1_inst}{2}[colorA]{}
\setlength{\instdist}{\instanceSpaceB}
\dummyinst{2_inst}
\setlength{\instdist}{\instanceSpaceC}
\dummyinst{3_inst}
-\create{}{}{3_inst}{4}{}
+\create{}{}{3_inst}{4}{}[colorA]
\nextlevel
-\create{}{}{2_inst}{3}{}
+\create{}{}{2_inst}{3}{}[colorA]
\setlength{\levelheight}{\levelB}
\nextlevel
@@ -168,14 +171,17 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{1}{}
-\declinst{1_inst}{2}{}
+\declinst{0_inst}{1}[colorA]{}
+\declinst{1_inst}{2}[colorA]{}
\setlength{\instdist}{\instanceSpaceB}
-\declinst{2_inst}{3}{}
+\declinst{2_inst}{3}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
@@ -292,12 +298,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{1}{}
-\declinst{1_inst}{2}{}
+\declinst{0_inst}{1}[colorA]{}
+\declinst{1_inst}{2}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
@@ -434,12 +443,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{1}{}
-\declinst{1_inst}{2}{}
+\declinst{0_inst}{1}[colorA]{}
+\declinst{1_inst}{2}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{hi1}{0_inst}[0.3]{1_inst}[1]
@@ -590,11 +602,14 @@
\setlength{\instfootheight}{\instheadheight}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{1}{}
+\declinst{0_inst}{1}[colorA]{}
\setlength{\selfmesswidth}{\lostFoundWidthA}
\lost[r]{im}{}[\incSlopeA]{0_inst}
@@ -714,12 +729,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{1}{}
-\declinst{1_inst}{2}{}
+\declinst{0_inst}{1}[colorA]{}
+\declinst{1_inst}{2}[colorA]{}
\setlength{\levelheight}{\timeIntervalSlopeA}
\setlength{\selfmesswidth}{\timeIntervalWidthA}
@@ -818,18 +836,21 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{1}{}
-\declinst{1_inst}{2}{}
+\declinst{0_inst}{1}[colorA]{}
+\declinst{1_inst}{2}[colorA]{}
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\setlength{\levelheight}{\coregionFirstA}
\nextlevel
-\regionstart{coregion}{1_inst}[\coregionWidthC]
+\regionstart{coregion}[colorA]{1_inst}[\coregionWidthC]
\setlength{\levelheight}{\coregionLastA}
\nextlevel
@@ -837,7 +858,7 @@
\setlength{\levelheight}{\levelA}
\nextlevel
-\regionstart{coregion}{0_inst}[\coregionWidthB]
+\regionstart{coregion}[colorA]{0_inst}[\coregionWidthB]
\setlength{\levelheight}{\coregionLastB}
\nextlevel
@@ -929,15 +950,18 @@
\setlength{\instdist}{\instanceSpaceB}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{1}{}
+\declinst{0_inst}{1}[colorA]{}
\setlength{\instdist}{\instanceSpaceA}
-\declinst{1_inst}{2}{}
+\declinst{1_inst}{2}[colorA]{}
\setlength{\instdist}{\instanceSpaceB}
-\declinst{2_inst}{3}{}
+\declinst{2_inst}{3}[colorA]{}
\setlength{\levelheight}{\slopeB}
\mess{hi1}{2_inst}[0.3]{0_inst}[1][\coregionWidthA*\real{0.5}]
@@ -945,7 +969,7 @@
\setlength{\levelheight}{\levelA}
\nextlevel
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\setlength{\levelheight}{\coregionFirstA}
\nextlevel
@@ -960,7 +984,7 @@
\setlength{\levelheight}{\levelB}
\nextlevel
-\regionstart{coregion}{1_inst}
+\regionstart{coregion}[colorA]{1_inst}
\setlength{\levelheight}{\coregionFirstB}
\nextlevel
@@ -975,7 +999,7 @@
\setlength{\levelheight}{\levelA}
\nextlevel
-\regionstart{coregion}{2_inst}
+\regionstart{coregion}[colorA]{2_inst}
\setlength{\levelheight}{\coregionLastA}
\nextlevel
@@ -1076,14 +1100,17 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\setlength{\mscglobalcommentwidth}{25mm}
\mscglobalcomment{Comment}(4,-2.5)
-\declinst{0_inst}{1}{}
-\declinst{1_inst}{2}{}
+\declinst{0_inst}{1}[colorA]{}
+\declinst{1_inst}{2}[colorA]{}
\setlength{\msccommentdist}{\commentWidthA}
\setlength{\levelheight}{\commentSlopeA}
@@ -1188,12 +1215,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{1}{}
-\declinst{1_inst}{2}{}
+\declinst{0_inst}{1}[colorA]{}
+\declinst{1_inst}{2}[colorA]{}
\setlength{\selfmesswidth}{\absoluteTimeWidthA}
\setlength{\markdist}{\absoluteTimeSlopeA}
@@ -1311,13 +1341,16 @@
\setlength{\instfootheight}{\instheadheight}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{1}{}
+\declinst{0_inst}{1}[colorA]{}
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\setlength{\levelheight}{\coregionFirstA}
\nextlevel
@@ -1430,6 +1463,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -1503,11 +1537,14 @@
\setlength{\instfootheight}{\instheadheight}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{1}{}
+\declinst{0_inst}{1}[colorA]{}
\end{msc}
\end{document}
Modified: trunk/tests/exporttex_test/exporttex_test00.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test00.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test00.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -94,12 +94,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\setlength{\selfmesswidth}{\lostFoundWidthA}
\found{A}{}[\incSlopeA]{0_inst}
@@ -110,7 +113,7 @@
\setlength{\levelheight}{\levelA}
\nextlevel
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
Modified: trunk/tests/exporttex_test/exporttex_test01.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test01.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test01.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -83,14 +83,17 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\setlength{\mscglobalcommentwidth}{20mm}
\mscglobalcomment{Comment}(0,-0)
-\declinst{0_inst}{ONE}{}
-\declinst{1_inst}{TWO}{}
+\declinst{0_inst}{ONE}[colorA]{}
+\declinst{1_inst}{TWO}[colorA]{}
\setlength{\selfmesswidth}{\lostFoundWidthA}
\found{LEFT}{}[\incSlopeA]{0_inst}
Modified: trunk/tests/exporttex_test/exporttex_test02.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test02.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test02.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -67,6 +67,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test03.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test03.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test03.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -94,12 +94,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\setlength{\selfmesswidth}{\lostFoundWidthA}
\found{A}{}[\incSlopeA]{0_inst}
@@ -110,7 +113,7 @@
\setlength{\levelheight}{\levelA}
\nextlevel
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
Modified: trunk/tests/exporttex_test/exporttex_test04.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test04.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test04.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test05.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test05.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test05.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -73,12 +73,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{p1}{}
-\declinst{1_inst}{p2}{}
+\declinst{0_inst}{p1}[colorA]{}
+\declinst{1_inst}{p2}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{a}{0_inst}[0.3]{1_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test06.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test06.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test06.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -73,12 +73,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{I1}{}
-\declinst{1_inst}{I2}{}
+\declinst{0_inst}{I1}[colorA]{}
+\declinst{1_inst}{I2}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{M1}{0_inst}[0.3]{1_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test07.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test07.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test07.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -73,12 +73,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{M1}{0_inst}[0.3]{1_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test08.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test08.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test08.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -90,14 +90,17 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{NAME1}{}
-\declinst{1_inst}{NAME2}{}
+\declinst{0_inst}{NAME1}[colorA]{}
+\declinst{1_inst}{NAME2}[colorA]{}
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\setlength{\levelheight}{\slopeB}
\mess{a}{1_inst}[0.3]{0_inst}[1]
\setlength{\levelheight}{\coregionFirstA}
Modified: trunk/tests/exporttex_test/exporttex_test09.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test09.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test09.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -63,12 +63,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{NAME}{}
-\declinst{1_inst}{NAME}{}
+\declinst{0_inst}{NAME}[colorA]{}
+\declinst{1_inst}{NAME}[colorA]{}
\end{msc}
\end{document}
Modified: trunk/tests/exporttex_test/exporttex_test10.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test10.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test10.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -73,12 +73,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{W}{}
-\declinst{1_inst}{Q}{}
+\declinst{0_inst}{W}[colorA]{}
+\declinst{1_inst}{Q}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{a}{0_inst}[0.3]{1_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test11.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test11.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test11.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -90,12 +90,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{PC}{}
-\declinst{1_inst}{Server}{}
+\declinst{0_inst}{PC}[colorA]{}
+\declinst{1_inst}{Server}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{SYN}{0_inst}[0.3]{1_inst}[1]
@@ -113,7 +116,7 @@
\nextlevel
\mess{request\_a}{0_inst}[0.3]{1_inst}[1]
-\regionstart{coregion}{1_inst}
+\regionstart{coregion}[colorA]{1_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
Modified: trunk/tests/exporttex_test/exporttex_test13.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test13.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test13.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -91,12 +91,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{PC}{}
-\declinst{1_inst}{Server}{}
+\declinst{0_inst}{PC}[colorA]{}
+\declinst{1_inst}{Server}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{SYN}{0_inst}[0.3]{1_inst}[1]
@@ -115,7 +118,7 @@
\setlength{\levelheight}{\slopeB}
\mess{request\_a}{0_inst}[0.3]{1_inst}[1]
-\regionstart{coregion}{1_inst}
+\regionstart{coregion}[colorA]{1_inst}
\setlength{\levelheight}{\coregionFirstA}
\nextlevel
Modified: trunk/tests/exporttex_test/exporttex_test15.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test15.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test15.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -94,14 +94,17 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{client}{}
-\declinst{1_inst}{server}{}
+\declinst{0_inst}{client}[colorA]{}
+\declinst{1_inst}{server}[colorA]{}
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
@@ -109,7 +112,7 @@
\setlength{\levelheight}{\levelA}
\nextlevel
-\regionstart{coregion}{1_inst}
+\regionstart{coregion}[colorA]{1_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
@@ -125,8 +128,8 @@
\lost[r]{yes}{}[\incSlopeA]{0_inst}
\nextlevel
-\regionstart{coregion}{0_inst}
-\regionstart{coregion}{1_inst}
+\regionstart{coregion}[colorA]{0_inst}
+\regionstart{coregion}[colorA]{1_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
Modified: trunk/tests/exporttex_test/exporttex_test16.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test16.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test16.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -136,12 +137,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{yes}{0_inst}[0.3]{1_inst}[1]
\end{msc}
@@ -202,12 +206,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{no}{1_inst}[0.3]{0_inst}[1]
\end{msc}
@@ -273,12 +280,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{no}{1_inst}[0.3]{0_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test17.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test17.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test17.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -136,12 +137,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{yes}{0_inst}[0.3]{1_inst}[1]
\end{msc}
@@ -202,12 +206,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{no}{1_inst}[0.3]{0_inst}[1]
\end{msc}
@@ -273,12 +280,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{no}{1_inst}[0.3]{0_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test18.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test18.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test18.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -134,12 +135,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{no}{1_inst}[0.3]{0_inst}[1]
@@ -206,12 +210,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{yes}{0_inst}[0.3]{1_inst}[1]
\end{msc}
@@ -272,12 +279,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{no}{1_inst}[0.3]{0_inst}[1]
\end{msc}
Modified: trunk/tests/exporttex_test/exporttex_test19.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test19.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test19.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -136,12 +137,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{yes}{0_inst}[0.3]{1_inst}[1]
\end{msc}
@@ -202,12 +206,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{no}{1_inst}[0.3]{0_inst}[1]
\end{msc}
@@ -273,12 +280,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{no}{1_inst}[0.3]{0_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test20.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test20.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test20.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -132,12 +133,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{yes}{0_inst}[0.3]{1_inst}[1]
\end{msc}
@@ -198,12 +202,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{no}{1_inst}[0.3]{0_inst}[1]
\end{msc}
Modified: trunk/tests/exporttex_test/exporttex_test21.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test21.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test21.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -137,12 +138,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{no}{1_inst}[0.3]{0_inst}[1]
@@ -209,12 +213,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{yes}{0_inst}[0.3]{1_inst}[1]
\end{msc}
@@ -275,12 +282,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{no}{1_inst}[0.3]{0_inst}[1]
\end{msc}
Modified: trunk/tests/exporttex_test/exporttex_test22.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test22.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test22.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test23.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test23.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test23.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -66,11 +66,14 @@
\setlength{\instfootheight}{\instheadheight}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{ONE}{}
+\declinst{0_inst}{ONE}[colorA]{}
\setlength{\selfmesswidth}{\lostFoundWidthA}
\found{LEFT}{}{0_inst}
Modified: trunk/tests/exporttex_test/exporttex_test24.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test24.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test24.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -73,12 +73,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{NAME}{}
-\declinst{1_inst}{NAME}{}
+\declinst{0_inst}{NAME}[colorA]{}
+\declinst{1_inst}{NAME}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{a}{0_inst}[0.3]{0_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test25.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test25.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test25.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -131,12 +132,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{Second}{}
-\declinst{1_inst}{First}{}
+\declinst{0_inst}{Second}[colorA]{}
+\declinst{1_inst}{First}[colorA]{}
\mess{true}{0_inst}[0.3]{1_inst}[1]
\end{msc}
@@ -191,6 +195,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -258,12 +263,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{NAME}{}
-\declinst{1_inst}{NAME}{}
+\declinst{0_inst}{NAME}[colorA]{}
+\declinst{1_inst}{NAME}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{NAME}{0_inst}[0.3]{0_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test26.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test26.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test26.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -131,12 +132,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{Second}{}
-\declinst{1_inst}{First}{}
+\declinst{0_inst}{Second}[colorA]{}
+\declinst{1_inst}{First}[colorA]{}
\mess{true}{0_inst}[0.3]{1_inst}[1]
\end{msc}
@@ -191,6 +195,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test27.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test27.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test27.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -129,12 +130,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{NAME}{}
-\declinst{1_inst}{NAME}{}
+\declinst{0_inst}{NAME}[colorA]{}
+\declinst{1_inst}{NAME}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{NAME}{0_inst}[0.3]{0_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test28.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test28.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test28.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test29.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test29.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test29.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test30.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test30.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test30.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test31.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test31.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test31.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test32.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test32.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test32.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -90,14 +90,17 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{NAME1}{}
-\declinst{1_inst}{NAME2}{}
+\declinst{0_inst}{NAME1}[colorA]{}
+\declinst{1_inst}{NAME2}[colorA]{}
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\setlength{\levelheight}{\slopeB}
\mess{a}{1_inst}[0.3]{0_inst}[1]
\setlength{\levelheight}{\coregionFirstA}
Modified: trunk/tests/exporttex_test/exporttex_test33.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test33.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test33.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -90,14 +90,17 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{NAME1}{}
-\declinst{1_inst}{NAME2}{}
+\declinst{0_inst}{NAME1}[colorA]{}
+\declinst{1_inst}{NAME2}[colorA]{}
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\setlength{\levelheight}{\slopeB}
\mess{a}{1_inst}[0.3]{0_inst}[1]
\setlength{\levelheight}{\coregionFirstA}
Modified: trunk/tests/exporttex_test/exporttex_test34.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test34.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test34.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -90,14 +90,17 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{NAME1}{}
-\declinst{1_inst}{NAME2}{}
+\declinst{0_inst}{NAME1}[colorA]{}
+\declinst{1_inst}{NAME2}[colorA]{}
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\setlength{\levelheight}{\slopeB}
\mess{a}{1_inst}[0.3]{0_inst}[1]
\setlength{\levelheight}{\coregionFirstA}
Modified: trunk/tests/exporttex_test/exporttex_test35.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test35.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test35.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -90,14 +90,17 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{NAME1}{}
-\declinst{1_inst}{NAME2}{}
+\declinst{0_inst}{NAME1}[colorA]{}
+\declinst{1_inst}{NAME2}[colorA]{}
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\setlength{\levelheight}{\slopeB}
\mess{a}{1_inst}[0.3]{0_inst}[1]
\setlength{\levelheight}{\coregionFirstA}
Modified: trunk/tests/exporttex_test/exporttex_test36.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test36.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test36.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -74,12 +74,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{ONE}{}
-\declinst{1_inst}{TWO}{}
+\declinst{0_inst}{ONE}[colorA]{}
+\declinst{1_inst}{TWO}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{M}{0_inst}[0.3]{1_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test37.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test37.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test37.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -68,12 +68,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{ONE}{}
-\declinst{1_inst}{TWO}{}
+\declinst{0_inst}{ONE}[colorA]{}
+\declinst{1_inst}{TWO}[colorA]{}
\mess{}{0_inst}[0.3]{1_inst}[1]
\end{msc}
Modified: trunk/tests/exporttex_test/exporttex_test38.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test38.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test38.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -131,12 +132,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{NAME}{}
-\declinst{1_inst}{NAME2}{}
+\declinst{0_inst}{NAME}[colorA]{}
+\declinst{1_inst}{NAME2}[colorA]{}
\mess{NAME}{0_inst}[0.3]{1_inst}[1]
\end{msc}
@@ -197,12 +201,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{Second}{}
-\declinst{1_inst}{First}{}
+\declinst{0_inst}{Second}[colorA]{}
+\declinst{1_inst}{First}[colorA]{}
\mess{true}{0_inst}[0.3]{1_inst}[1]
\end{msc}
@@ -257,6 +264,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test39.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test39.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test39.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test40.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test40.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test40.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -131,12 +132,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{Second}{}
-\declinst{1_inst}{First}{}
+\declinst{0_inst}{Second}[colorA]{}
+\declinst{1_inst}{First}[colorA]{}
\mess{true}{0_inst}[0.3]{1_inst}[1]
\end{msc}
@@ -191,6 +195,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test41.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test41.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test41.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -71,12 +71,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{ONE}{}
-\declinst{1_inst}{TWO}{}
+\declinst{0_inst}{ONE}[colorA]{}
+\declinst{1_inst}{TWO}[colorA]{}
\setlength{\selfmesswidth}{\lostFoundWidthA}
\lost[r]{}{}{0_inst}
Modified: trunk/tests/exporttex_test/exporttex_test42.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test42.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test42.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
@@ -129,12 +130,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\mess{no}{1_inst}[0.3]{0_inst}[1]
\end{msc}
Modified: trunk/tests/exporttex_test/exporttex_test45.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test45.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test45.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -94,19 +94,22 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\setlength{\selfmesswidth}{\lostFoundWidthA}
\found{A}{}[\incSlopeA]{0_inst}
\found{jedna}{}[\incSlopeA]{1_inst}
\nextlevel
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
Modified: trunk/tests/exporttex_test/exporttex_test47.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test47.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test47.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -94,12 +94,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\setlength{\selfmesswidth}{\lostFoundWidthA}
\found{A}{}[\incSlopeA]{0_inst}
@@ -110,7 +113,7 @@
\setlength{\levelheight}{\levelA}
\nextlevel
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
Modified: trunk/tests/exporttex_test/exporttex_test49.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test49.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test49.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test50.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test50.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test50.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test51.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test51.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test51.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -94,12 +94,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{A}{}
-\declinst{1_inst}{B}{}
+\declinst{0_inst}{A}[colorA]{}
+\declinst{1_inst}{B}[colorA]{}
\setlength{\selfmesswidth}{\lostFoundWidthA}
\found{A}{}[\incSlopeA]{0_inst}
@@ -108,7 +111,7 @@
\lost[r]{jedna}{}[\incSlopeA]{0_inst}
\nextlevel
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
Modified: trunk/tests/exporttex_test/exporttex_test52.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test52.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test52.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test53.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test53.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test53.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -73,12 +73,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{W}{}
-\declinst{1_inst}{Q}{}
+\declinst{0_inst}{W}[colorA]{}
+\declinst{1_inst}{Q}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{a}{0_inst}[0.3]{1_inst}[1]
Modified: trunk/tests/exporttex_test/exporttex_test54.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test54.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test54.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -94,12 +94,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{B}{}
-\declinst{1_inst}{A}{}
+\declinst{0_inst}{B}[colorA]{}
+\declinst{1_inst}{A}[colorA]{}
\setlength{\selfmesswidth}{\lostFoundWidthA}
\found{A}{}[\incSlopeA]{1_inst}
@@ -110,7 +113,7 @@
\setlength{\levelheight}{\levelA}
\nextlevel
-\regionstart{coregion}{1_inst}
+\regionstart{coregion}[colorA]{1_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
Modified: trunk/tests/exporttex_test/exporttex_test55.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test55.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test55.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -94,12 +94,15 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{B}{}
-\declinst{1_inst}{A}{}
+\declinst{0_inst}{B}[colorA]{}
+\declinst{1_inst}{A}[colorA]{}
\setlength{\levelheight}{\slopeA}
\mess{A}{0_inst}[0.3]{1_inst}[1]
@@ -111,7 +114,7 @@
\setlength{\levelheight}{\levelA}
\nextlevel
-\regionstart{coregion}{1_inst}
+\regionstart{coregion}[colorA]{1_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
Modified: trunk/tests/exporttex_test/exporttex_test56.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test56.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test56.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -62,6 +62,7 @@
+
%%%%%%%%%%%%%%%%%%
%%%% End configuration
%%%%%%%%%%%%%%%%%%
Modified: trunk/tests/exporttex_test/exporttex_test58.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test58.tex.result 2014-01-18 14:07:22 UTC (rev 1882)
+++ trunk/tests/exporttex_test/exporttex_test58.tex.result 2014-01-18 19:16:54 UTC (rev 1883)
@@ -94,14 +94,17 @@
\setlength{\instdist}{\instanceSpaceA}
+%%% Colors:
+\definecolor{colorA}{rgb}{0, 0, 0}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% End of configuration header
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\declinst{0_inst}{client}{}
-\declinst{1_inst}{server}{}
+\declinst{0_inst}{client}[colorA]{}
+\declinst{1_inst}{server}[colorA]{}
-\regionstart{coregion}{0_inst}
+\regionstart{coregion}[colorA]{0_inst}
\nextlevel
\setlength{\levelheight}{\slopeA}
@@ -109,7 +112,7 @@
\setlength{\levelheight}{\levelA}
\nextlevel
-\regionstart{coregion}{1_inst}
+\regionstart{coregion}[colo...
[truncated message content] |
|
From: <xf...@us...> - 2014-01-18 14:07:24
|
Revision: 1882
http://sourceforge.net/p/scstudio/code/1882
Author: xfarmad
Date: 2014-01-18 14:07:22 +0000 (Sat, 18 Jan 2014)
Log Message:
-----------
fix: layout_optimizer.cpp memory-leak
Modified Paths:
--------------
trunk/src/data/beautify/layout_optimizer.cpp
Modified: trunk/src/data/beautify/layout_optimizer.cpp
===================================================================
--- trunk/src/data/beautify/layout_optimizer.cpp 2014-01-16 21:35:00 UTC (rev 1881)
+++ trunk/src/data/beautify/layout_optimizer.cpp 2014-01-18 14:07:22 UTC (rev 1882)
@@ -810,12 +810,31 @@
return max_y;
}
+void remove_inst_cor_attributes(InstancePtrVector instances)
+{
+ //remove attributes of instances
+ for(InstancePtrVector::const_iterator it = instances.begin(); it != instances.end(); it++)
+ {
+ (*it)->remove_attribute<unsigned>("be_id");
+ (*it)->remove_attribute<unsigned>("id");
+
+ const EventAreaPtrList& areas = (*it)->get_areas();
+ for (EventAreaPtrList::const_iterator i = areas.begin(); i != areas.end(); ++i)
+ {
+ CoregionAreaPtr coregion = boost::dynamic_pointer_cast<CoregionArea>(*it);
+ if(coregion != NULL)
+ coregion->remove_attribute<unsigned>("id");
+ }
+ }
+}
+
void remove_inst_cor_attributes(InstancePtrList instances)
{
//remove attributes of instances
for(InstancePtrList::const_iterator it = instances.begin(); it != instances.end(); it++)
{
(*it)->remove_attribute<unsigned>("be_id");
+ (*it)->remove_attribute<unsigned>("id");
const EventAreaPtrList& areas = (*it)->get_areas();
for (EventAreaPtrList::const_iterator i = areas.begin(); i != areas.end(); ++i)
@@ -1115,6 +1134,9 @@
(*it)->set_line_end(MscPoint((*it)->get_line_end().get_x(),
(*it)-> get_line_begin().get_y() + max_instance_length));
}
+
+ // to delete instace attributes created in index_instances() function
+ remove_inst_cor_attributes(instances);
remove_inst_cor_attributes(bmsc->get_instances());
delete[] var;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xb...@us...> - 2014-01-16 21:35:03
|
Revision: 1881
http://sourceforge.net/p/scstudio/code/1881
Author: xborza
Date: 2014-01-16 21:35:00 +0000 (Thu, 16 Jan 2014)
Log Message:
-----------
Duplicate and drop shape into mouse position feature + HELP updated (added Keyboard accelerators section)
Modified Paths:
--------------
trunk/doc/help/frontend/shortcuts.body.htm
trunk/doc/help/menu.htm
trunk/doc/help/menui.htm
trunk/src/view/visio/addon/addon.cpp
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/document.h
Modified: trunk/doc/help/frontend/shortcuts.body.htm
===================================================================
--- trunk/doc/help/frontend/shortcuts.body.htm 2014-01-11 21:04:52 UTC (rev 1880)
+++ trunk/doc/help/frontend/shortcuts.body.htm 2014-01-16 21:35:00 UTC (rev 1881)
@@ -56,6 +56,14 @@
<a href="message_numbering.html">Delete message numbering</a>
</td>
</tr>
+ <tr>
+ <td>
+ <code>Ctrl+Alt+X</code>
+ </td>
+ <td>
+ Duplicate and drop selected shape into mouse position
+ </td>
+ </tr>
</table>
</div>
</body>
Modified: trunk/doc/help/menu.htm
===================================================================
--- trunk/doc/help/menu.htm 2014-01-11 21:04:52 UTC (rev 1880)
+++ trunk/doc/help/menu.htm 2014-01-16 21:35:00 UTC (rev 1881)
@@ -24,6 +24,9 @@
<li>
<a href="frontend/settings.html">Options</a>
</li>
+ <li>
+ <a href="frontend/shortcuts.html">Keyboard accelerators</a>
+ </li>
</ul>
</li>
<li>
Modified: trunk/doc/help/menui.htm
===================================================================
--- trunk/doc/help/menui.htm 2014-01-11 21:04:52 UTC (rev 1880)
+++ trunk/doc/help/menui.htm 2014-01-16 21:35:00 UTC (rev 1881)
@@ -24,6 +24,9 @@
<li>
<a href="../frontend/settings.html">Options</a>
</li>
+ <li>
+ <a href="../frontend/shortcuts.html">Keyboard accelerators</a>
+ </li>
</ul>
</li>
<li>
Modified: trunk/src/view/visio/addon/addon.cpp
===================================================================
--- trunk/src/view/visio/addon/addon.cpp 2014-01-11 21:04:52 UTC (rev 1880)
+++ trunk/src/view/visio/addon/addon.cpp 2014-01-16 21:35:00 UTC (rev 1881)
@@ -392,6 +392,11 @@
TRACE("CStudioAddon::Run() disable message enumeration");
return pDocumentMonitor->OnMenuDisableMessageEnumeration(vsoApp);
+ //case 3xx events - shortcuts events
+ case CDocumentMonitor::SHORT_DROP_INST:
+ TRACE("CStudioAddon::Run() SHORT DROP INSTANCE");
+ return pDocumentMonitor->OnShortcutDropInstace(vsoApp);
+
default:
TRACE("CStudioAddon::Run() unexpected event id=" << iEvent);
return VAORC_FAILURE;
@@ -1215,6 +1220,7 @@
// being monitored for this document.
pDocumentMonitor = new CDocumentMonitor(this, vsoApp, vsoDocument);
pDocumentMonitor->InitMenu();
+ pDocumentMonitor->InitShortcuts();
pDocumentMonitor->InitToolbar();
// register BeforeDocumentClose
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2014-01-11 21:04:52 UTC (rev 1880)
+++ trunk/src/view/visio/addon/document.cpp 2014-01-16 21:35:00 UTC (rev 1881)
@@ -410,6 +410,22 @@
return m_vsoApp->GetBuiltInToolbars(0);
}
+void CDocumentMonitor::InitShortcuts()
+{
+ //create accelerators
+ Visio::IVUIObjectPtr vsoMenus = m_vsoDocument->GetCustomMenus();
+ Visio::IVAccelTablePtr accelTable = vsoMenus->AccelTables->ItemAtID[Visio::visUIObjSetDrawing];
+
+ //Select Instances
+ Visio::IVAccelItemPtr accelItemSelectInstances = accelTable->AccelItems->Add();
+ //accelItemSelectInstances->CmdNum = SHORT_SELECT_INST;
+ accelItemSelectInstances->Key = 'X';
+ accelItemSelectInstances->Control = true;
+ accelItemSelectInstances->Alt = true;
+ accelItemSelectInstances->AddOnArgs = stringize() << L"/event=" << SHORT_DROP_INST;
+ accelItemSelectInstances->AddOnName = ADDON_NAME;
+}
+
void CDocumentMonitor::InitMenu()
{
Visio::IVUIObjectPtr vsoMenus = GetMostCustomMenus();
@@ -1297,6 +1313,66 @@
vsoApp->ActiveWindow->Selection = selection;
}
+VAORC CDocumentMonitor::OnShortcutDropInstace(Visio::IVApplicationPtr vsoApp)
+{
+ //get selected shape
+ int count = vsoApp->ActiveWindow->Selection->Count;
+ if(count != 1)
+ {
+ MessageBox(GetActiveWindow(),
+ _T("To use duplicate-&-drop feature, you must choose exactly one shape on active page."),
+ _T("Error"), MB_OK | MB_ICONEXCLAMATION);
+ return VAORC_FAILURE;
+ }
+ //Visio::IVShapePtr shape = vsoApp->ActiveWindow->Selection->Item[1];
+ Visio::IVShapePtr shape = vsoApp->ActiveWindow->Selection->Item[1];
+ //get mouse position
+ double xPos = 0;
+ double yPos = 0;
+
+ // need to conver units?
+ xPos = m_addon->GetMousePosX();
+ yPos = m_addon->GetMousePosY();
+ //drop the master identic to selected shape
+ Visio::IVPagePtr vsoPage = vsoApp->ActivePage;
+ CDrawingVisualizer visualizer(vsoApp);
+ TShapeType shape_type = get_shape_type(shape);
+ Visio::IVMasterPtr master = visualizer.find_master(shape_type);
+ //drop
+ Visio::IVShapePtr new_shape = vsoPage->Drop(master,xPos,yPos);
+ // check if shape is message, if it is LEFT MESSAGE then swith the direction
+ if(isMessageShape(shape) && CShapeUtils::getMsgDirection(shape) == MSG_RIGHT)
+ {
+ std::vector<_bstr_t> formulas;
+ long scopeId = vsoApp->BeginUndoScope("Flip direction");
+ vsoApp->EventsEnabled = false;
+ //flip message direction
+ for(int i = 0; i < 4; i++)
+ formulas.push_back(new_shape->GetCellsSRC(visSectionObject, visRowXForm1D, i)->FormulaU);
+ try {
+ for(int i = 0; i < 2; i++)
+ {
+ new_shape->GetCellsSRC(visSectionObject, visRowXForm1D, i)->FormulaU = formulas.at(i+2);
+ new_shape->GetCellsSRC(visSectionObject, visRowXForm1D, i+2)->FormulaU = formulas.at(i);
+ }
+ }
+ catch(_com_error err){
+ MessageBox(GetActiveWindow(), L"Exception occurred", L"", MB_OK);
+ }
+ formulas.clear();
+ //Flip lost and found messages
+ if(shape_type == ST_BMSC_MESSAGE_FOUND || shape_type == ST_BMSC_MESSAGE_LOST)
+ {
+ CMessageJump::changeMsgType(new_shape, (TShapeType)((shape_type == 3) ? 2 : 3));
+ CMessageSnapping::resnap(new_shape, vsoApp->ActivePage->Shapes, 0.0001);
+ }
+ vsoApp->EventsEnabled = true;
+ vsoApp->EndUndoScope(scopeId, true);
+ }
+
+ return VAORC_SUCCESS;
+}
+
VAORC CDocumentMonitor::OnMenuSelectAllInstances(Visio::IVApplicationPtr vsoApp, SelectionType selType)
{
selectAll(vsoApp, true, selType);
Modified: trunk/src/view/visio/addon/document.h
===================================================================
--- trunk/src/view/visio/addon/document.h 2014-01-11 21:04:52 UTC (rev 1880)
+++ trunk/src/view/visio/addon/document.h 2014-01-16 21:35:00 UTC (rev 1881)
@@ -58,6 +58,7 @@
VAORC OnOpenReference(int iDocumentIndex, int iPageIndex, _bstr_t sShapeU);
void InitMenu();
+ void InitShortcuts();
void InitToolbar();
enum MenuItems
@@ -95,6 +96,11 @@
MENU_THIN_LINES,
};
+ enum ShortCutItems
+ {
+ SHORT_DROP_INST = 401
+ };
+
VAORC OnMenuWindowsReporter(Visio::IVApplicationPtr vsoApp);
VAORC OnMenuImport(Visio::IVApplicationPtr vsoApp);
VAORC OnMenuExport(Visio::IVApplicationPtr vsoApp);
@@ -116,6 +122,9 @@
VAORC OnMenuFlipMessageDirection(Visio::IVApplicationPtr vsoApp);
VAORC OnHelp();
+ //shortcuts for dropping shapes
+ VAORC OnShortcutDropInstace(Visio::IVApplicationPtr vsoApp);
+
void ShowReportView();
void OnHideReportView();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2014-01-11 21:04:54
|
Revision: 1880
http://sourceforge.net/p/scstudio/code/1880
Author: xfarmad
Date: 2014-01-11 21:04:52 +0000 (Sat, 11 Jan 2014)
Log Message:
-----------
bug fix: visualizing diagram with show button in verification report doesn't work
Modified Paths:
--------------
trunk/src/view/visio/addon/shapeutils.cpp
Modified: trunk/src/view/visio/addon/shapeutils.cpp
===================================================================
--- trunk/src/view/visio/addon/shapeutils.cpp 2014-01-04 19:21:28 UTC (rev 1879)
+++ trunk/src/view/visio/addon/shapeutils.cpp 2014-01-11 21:04:52 UTC (rev 1880)
@@ -159,9 +159,9 @@
std::ostringstream color_str;
color_str << "RGB(" << color.getRed() << "," << color.getGreen() << "," << color.getBlue() << ")";
// line color from MscColor struct
- shape->CellsSRC[visSectionObject][visRowLine][visLineColor]->Formula = color_str.str().c_str();
+ shape->CellsSRC[visSectionObject][visRowLine][visLineColor]->FormulaU = color_str.str().c_str();
// text color from MscColor struct
- shape->CellsSRC[visSectionCharacter][visRowCharacter][visCharacterColor]->Formula = color_str.str().c_str();
+ shape->CellsSRC[visSectionCharacter][visRowCharacter][visCharacterColor]->FormulaU = color_str.str().c_str();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2014-01-04 19:21:30
|
Revision: 1879
http://sourceforge.net/p/scstudio/code/1879
Author: xfarmad
Date: 2014-01-04 19:21:28 +0000 (Sat, 04 Jan 2014)
Log Message:
-----------
VS2010 project files for add-on compilation
Added Paths:
-----------
trunk/src/view/visio/addon/scstudio.vcxproj
trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj
Added: trunk/src/view/visio/addon/scstudio.vcxproj
===================================================================
--- trunk/src/view/visio/addon/scstudio.vcxproj (rev 0)
+++ trunk/src/view/visio/addon/scstudio.vcxproj 2014-01-04 19:21:28 UTC (rev 1879)
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Template|Win32">
+ <Configuration>Template</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{0E00282C-F48B-4984-A274-5B59E1E2AD49}</ProjectGuid>
+ <RootNamespace>scstudio</RootNamespace>
+ <Keyword>AtlProj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfAtl>Dynamic</UseOfAtl>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfAtl>Dynamic</UseOfAtl>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+ <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PostBuildEventUseInBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+ <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</PostBuildEventUseInBuild>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(VISIOSDK_ROOT)\Libraries\TypeLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <MkTypLibCompatible>false</MkTypLibCompatible>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <GenerateStublessProxies>true</GenerateStublessProxies>
+ <TypeLibraryName>$(IntDir)scstudio.tlb</TypeLibraryName>
+ <HeaderFileName>scstudio.h</HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ <InterfaceIdentifierFileName>scstudio_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName>scstudio_p.c</ProxyFileName>
+ <ValidateAllParameters>false</ValidateAllParameters>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\src;..\..\..\..\third-party-sw\boost;$(VISIOSDK_ROOT)\Libraries\CPP\Include;$(VISIOSDK_ROOT)\Libraries\CPP\Source;$(VISIOSDK_ROOT)\Libraries\TypeLib;..\..\..\..\third-party-sw\wtl\include;..\..\..\..\third-party-sw\simpleopt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0500;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>version.lib;scmsc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).vsl</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\..\$(OutDir);..\..\..\..\third-party-sw\boost\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>.\dllmodule.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <PostBuildEvent>
+ <Message>Signing code...</Message>
+ <Command>signtool sign /a $(OutDir)$(ProjectName).vsl</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(VISIOSDK_ROOT)\Libraries\TypeLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <MkTypLibCompatible>false</MkTypLibCompatible>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <GenerateStublessProxies>true</GenerateStublessProxies>
+ <TypeLibraryName>$(IntDir)scstudio.tlb</TypeLibraryName>
+ <HeaderFileName>scstudio.h</HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ <InterfaceIdentifierFileName>scstudio_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName>scstudio_p.c</ProxyFileName>
+ <ValidateAllParameters>false</ValidateAllParameters>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\src;..\..\..\..\third-party-sw\boost;$(VISIOSDK_ROOT)\Libraries\CPP\Include;$(VISIOSDK_ROOT)\Libraries\CPP\Source;$(VISIOSDK_ROOT)\Libraries\TypeLib;..\..\..\..\third-party-sw\wtl\include;..\..\..\..\third-party-sw\simpleopt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0500;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>version.lib;scmsc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).vsl</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\..\$(OutDir);..\..\..\..\third-party-sw\boost\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>.\dllmodule.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <PostBuildEvent>
+ <Message>Signing code...</Message>
+ <Command>signtool sign /a $(OutDir)$(ProjectName).vsl</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="aboutdlg.h" />
+ <ClInclude Include="addon.h" />
+ <ClInclude Include="connectionArrowSnapping.h" />
+ <ClInclude Include="dllmodule.h" />
+ <ClInclude Include="document.h" />
+ <ClInclude Include="enums.h" />
+ <ClInclude Include="errors.h" />
+ <ClInclude Include="extract.h" />
+ <ClInclude Include="messageJump.h" />
+ <ClInclude Include="messageSnapping.h" />
+ <ClInclude Include="numberEditBox.h" />
+ <ClInclude Include="orderSnapping.h" />
+ <ClInclude Include="registryManager.h" />
+ <ClInclude Include="reportmessage.h" />
+ <ClInclude Include="reportview.h" />
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="settingsDialog.h" />
+ <ClInclude Include="stdafx.h" />
+ <ClInclude Include="beautifySettingADlg.h" />
+ <ClInclude Include="beautifySettingGDlg.h" />
+ <ClInclude Include="beautifySettingTimesDlg.h" />
+ <ClInclude Include="beautifySettingWidthsDlg.h" />
+ <ClInclude Include="enumerationDlg.h" />
+ <ClInclude Include="finddlg.h" />
+ <ClInclude Include="instancesfielddlg.h" />
+ <ClInclude Include="messagesequencedlg.h" />
+ <ClInclude Include="numberingGlobalDlg.h" />
+ <ClInclude Include="optionsdlg.h" />
+ <ClInclude Include="pcapSettingADlg.h" />
+ <ClInclude Include="pcapSettingAggregDlg.h" />
+ <ClInclude Include="pcapSettingGDlg.h" />
+ <ClInclude Include="pcapSettingViewDlg.h" />
+ <ClInclude Include="protectionGlobalDlg.h" />
+ <ClInclude Include="settingsDlg.h" />
+ <ClInclude Include="simulatordlg.h" />
+ <ClInclude Include="snapGlobalDlg.h" />
+ <ClInclude Include="dirent.h" />
+ <ClInclude Include="enumerateUtils.h" />
+ <ClInclude Include="pageutils.h" />
+ <ClInclude Include="shapeutils.h" />
+ <ClInclude Include="timeSnapping.h" />
+ <ClInclude Include="visualize.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="addon.cpp" />
+ <ClCompile Include="connectionArrowSnapping.cpp" />
+ <ClCompile Include="dllmodule.cpp" />
+ <ClCompile Include="document.cpp" />
+ <ClCompile Include="document_check.cpp" />
+ <ClCompile Include="document_simulation.cpp" />
+ <ClCompile Include="errors.cpp" />
+ <ClCompile Include="extract.cpp" />
+ <ClCompile Include="messageJump.cpp" />
+ <ClCompile Include="messageSnapping.cpp" />
+ <ClCompile Include="orderSnapping.cpp" />
+ <ClCompile Include="registryManager.cpp" />
+ <ClCompile Include="reportmessage.cpp" />
+ <ClCompile Include="reportview.cpp" />
+ <ClCompile Include="stdafx.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="timeSnapping.cpp" />
+ <ClCompile Include="visualize.cpp" />
+ <ClCompile Include="beautifySettingADlg.cpp" />
+ <ClCompile Include="beautifySettingGDlg.cpp" />
+ <ClCompile Include="beautifySettingTimesDlg.cpp" />
+ <ClCompile Include="beautifySettingWidthsDlg.cpp" />
+ <ClCompile Include="enumerationDlg.cpp" />
+ <ClCompile Include="finddlg.cpp" />
+ <ClCompile Include="instancesfielddlg.cpp" />
+ <ClCompile Include="messagesequencedlg.cpp" />
+ <ClCompile Include="numberingGlobalDlg.cpp" />
+ <ClCompile Include="optionsdlg.cpp" />
+ <ClCompile Include="pcapSettingADlg.cpp" />
+ <ClCompile Include="pcapSettingAggregDlg.cpp" />
+ <ClCompile Include="pcapSettingGDlg.cpp" />
+ <ClCompile Include="pcapSettingViewDlg.cpp" />
+ <ClCompile Include="protectionGlobalDlg.cpp" />
+ <ClCompile Include="settingsDlg.cpp" />
+ <ClCompile Include="simulatordlg.cpp" />
+ <ClCompile Include="snapGlobalDlg.cpp" />
+ <ClCompile Include="enumerateUtils.cpp" />
+ <ClCompile Include="pageutils.cpp" />
+ <ClCompile Include="shapeutils.cpp" />
+ <ClCompile Include="eventsink_i.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="dllmodule.def" />
+ <None Include="abs_times.bmp" />
+ <None Include="dllmodule.rgs" />
+ <None Include="icon_add_instances.ico" />
+ <None Include="icon_beautify.ico" />
+ <None Include="icon_check.ico" />
+ <None Include="icon_findflow.ico" />
+ <None Include="icon_jump_left_messages.ico" />
+ <None Include="icon_jump_left_messages_copy.ico" />
+ <None Include="icon_jump_right_messages.ico" />
+ <None Include="icon_jump_right_messages_copy.ico" />
+ <None Include="icon_message_enumeration.ico" />
+ <None Include="icon_message_enumeration_disable.ico" />
+ <None Include="icon_message_select_group.ico" />
+ <None Include="icon_message_sequence.ico" />
+ <None Include="icon_reverse_message.ico" />
+ <None Include="icon_select_add_instances.ico" />
+ <None Include="icon_select_add_messages.ico" />
+ <None Include="icon_select_instances.ico" />
+ <None Include="icon_select_messages.ico" />
+ <None Include="icon_simulation_start.ico" />
+ <None Include="icon_simulation_stop.ico" />
+ <None Include="icon_tighten_time.ico" />
+ <None Include="instance.bmp" />
+ <None Include="intervals.bmp" />
+ <None Include="..\..\..\..\..\..\bitmaps\intervals.bmp" />
+ <None Include="spacing .bmp" />
+ </ItemGroup>
+ <ItemGroup>
+ <Midl Include="eventsink.idl">
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">eventsink.h</HeaderFileName>
+ <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">eventsink_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">eventsink_p.c</ProxyFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">eventsink.h</HeaderFileName>
+ <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">eventsink_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">eventsink_p.c</ProxyFileName>
+ </Midl>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="dllmodule.rc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+ <ProjectExtensions>
+ <VisualStudio>
+ <UserProperties RESOURCE_FILE="dllmodule.rc" />
+ </VisualStudio>
+ </ProjectExtensions>
+</Project>
\ No newline at end of file
Added: trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj
===================================================================
--- trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj (rev 0)
+++ trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj 2014-01-04 19:21:28 UTC (rev 1879)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}</ProjectGuid>
+ <RootNamespace>setup-nsis</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>C:\Program Files\Microsoft Platform SDK for Windows XP SP2\Bin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)nsis.dll</OutputFile>
+ <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)nsis.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>C:\Program Files\Microsoft Platform SDK for Windows XP SP2\Bin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)nsis.dll</OutputFile>
+ <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="certificates.cpp" />
+ <ClCompile Include="filefix.cpp" />
+ <ClCompile Include="pluginapi.c">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ </PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ </PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="stdafx.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="stdafx.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2013-12-05 14:13:53
|
Revision: 1878
http://sourceforge.net/p/scstudio/code/1878
Author: xfarmad
Date: 2013-12-05 14:13:49 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
basic MSC colors
Modified Paths:
--------------
trunk/make_build.bat
trunk/src/data/CMakeLists.txt
trunk/src/data/exporttex/exportTex.cpp
trunk/src/data/msc/CoregionArea.cpp
trunk/src/data/msc/CoregionArea.h
trunk/src/data/msc/MscElement.h
trunk/src/data/msc.h
trunk/src/data/msc_types.h
trunk/src/view/visio/addon/extract.cpp
trunk/src/view/visio/addon/extract.h
trunk/src/view/visio/addon/shapeutils.cpp
trunk/src/view/visio/addon/shapeutils.h
trunk/src/view/visio/addon/visualize.cpp
trunk/src/view/visio/addon/visualize.h
Added Paths:
-----------
trunk/src/data/msc/MscColor.h
Modified: trunk/make_build.bat
===================================================================
--- trunk/make_build.bat 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/make_build.bat 2013-12-05 14:13:49 UTC (rev 1878)
@@ -8,8 +8,8 @@
set ACTION=build
REM set the following to Release or to Debug
-set TARGET=Release
-rem set TARGET=Debug
+rem set TARGET=Release
+set TARGET=Debug
echo %ACTION% in %TARGET% mode into scstudio-setup-%VERSION%.exe
echo(
@@ -19,11 +19,11 @@
REM Even explicitelly specified address is without qoutes here.
set PROJECT_TRUNK_DIR=%CD%
REM Contrary to the previous one, others are in qoutes!
-set DEVENV_COMMAND="C:\Program Files (x86)\Microsoft Visual Studio 9.0\Common7\IDE\devenv.com"
+set DEVENV_COMMAND="C:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\devenv.com"
set CMAKE_EXE="C:\Program Files (x86)\CMake 2.8\bin\cmake.exe"
set CMAKE_EXE_GUI="C:\Program Files (x86)\CMake 2.8\bin\cmake-gui.exe"
-set NSIS_EXE="C:\Program Files\NSIS\makensis.exe"
-set SIGN_TOOL_EXE="C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\signtool.exe"
+set NSIS_EXE="C:\Program Files (x86)\NSIS\makensis.exe"
+set SIGN_TOOL_EXE="C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Bin\signtool.exe"
echo Cmake...
IF "%ACTION%"=="rebuild" (
Modified: trunk/src/data/CMakeLists.txt
===================================================================
--- trunk/src/data/CMakeLists.txt 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/data/CMakeLists.txt 2013-12-05 14:13:49 UTC (rev 1878)
@@ -75,6 +75,7 @@
msc/LocalAction.h
msc/LocalActionEvent.h
msc/Msc.h
+ msc/MscColor.h
msc/MscElement.h
msc/MscElementTmpl.h
msc/MscMessage.h
Modified: trunk/src/data/exporttex/exportTex.cpp
===================================================================
--- trunk/src/data/exporttex/exportTex.cpp 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/data/exporttex/exportTex.cpp 2013-12-05 14:13:49 UTC (rev 1878)
@@ -48,6 +48,116 @@
typedef boost::shared_ptr<Coordinate> CoordinatePtr;
+class ColorMap{
+private:
+ std::map<MscColor,int> color_map;
+ MscColor m_last;
+ std::string m_name;
+ std::string m_description;
+ std::string m_length_name;
+public:
+
+ ColorMap()
+ {
+
+ }
+
+ ColorMap(std::string name)
+ {
+ m_name.append(name);
+ }
+
+ void setName(std::string name)
+ {
+ m_name.clear();
+ m_name.append(name);
+ }
+
+ void setLengthName(std::string name)
+ {
+ m_length_name.clear();
+ m_length_name.append(name);
+ }
+
+ void setDescription(std::string description)
+ {
+ m_description.clear();
+ m_description.append(description);
+ }
+
+ void addColor(MscColor color)
+ {
+ if(color_map.find(color)==color_map.end())
+ {
+ color_map.insert( std::make_pair<MscColor,int>(color, color_map.size()));
+ }
+ }
+
+ std::string getId(MscColor color)
+ {
+ std::ostringstream result;
+ if(color_map.find(color)!=color_map.end())
+ {
+ result << m_name;
+ int range = 'Z' - 'A' + 1;
+ int identificator = color_map.find(color)->second;
+ std::string id;
+ do{
+ id.push_back(('A'+(identificator%range)));
+ identificator /= range;
+ }while(identificator != 0);
+ for(std::string::reverse_iterator it = id.rbegin(); it != id.rend(); it++)
+ {
+ result << *it;
+ }
+ }
+ else
+ {
+ throw std::runtime_error("ExportTex: Undefined color in diagram!");
+ }
+ return result.str();
+ }
+
+ std::string printOptParam(MscColor color){
+ std::ostringstream result;
+ result << "[" << getId(color) << "]";
+ return result.str();
+ }
+
+ std::string printColor(MscColor color){
+ std::ostringstream result;
+ if(color!=m_last)
+ {
+ result << "\\mscsetcolor{" << getId(color) << "}" << std::endl;
+ m_last = color;
+ }
+ return result.str();
+ }
+
+
+ std::string print()
+ {
+ std::ostringstream result;
+ if(!color_map.empty()){
+ result << m_description << std::endl;
+ double red, green, blue;
+ for(std::map<MscColor,int>::iterator it = color_map.begin(); it!=color_map.end(); it++)
+ {
+ it->first.getColorD(red,green,blue);
+ result << "\\definecolor{" << getId(it->first) << "}{rgb}{" << red << ", "
+ << green << ", " << blue << "}" << std::endl;
+ }
+ result << std::endl;
+ }
+
+ return result.str();
+ }
+
+ bool empty(){
+ return color_map.empty();
+ }
+};
+
class DistanceMap{
private:
//coordinate - size, int - number to distinguish names of sizes
@@ -299,6 +409,7 @@
DistanceMap m_instance_spacing_map;
DistanceMap m_slope_size_map;//! map of slope values
DistanceMap m_incomlete_mess_slope_map;
+ ColorMap m_colors;
std::list<std::pair<Coordinate,Coordinate> > m_slope_coordinates_map;//! list of (start,end) coordinates of slope
std::list<std::pair<Coordinate,Coordinate> > m_time_interval_slope_coordinates_map;//! list of (start,end) coordinates of slope
std::list<std::pair<Coordinate,Coordinate> > m_order_slope_coordinates_map;//! list of (start,end) coordinates of slope
@@ -334,38 +445,15 @@
return cor;
}
- void print_color(const MarkType& mark){
- if(mark == m_last_mark){
- //nothing to change
- return;
- }
- switch(mark)
- {
- case NONE: print_color_change("black"); break;
- case REMOVED:
- case MARKED: print_color_change("red"); break;
- case ADDED: print_color_change("green"); break;
- default: throw std::runtime_error("Error: unexpected behaviour");
- }
- m_last_mark = mark;
+ void print_color(const MscColor& color){
+ m_stream << m_colors.printColor(color);
}
- void print_opt_color(const MarkType& mark)
+ std::string print_opt_color(const MscColor& color)
{
- switch(mark)
- {
- case NONE: break;
- case REMOVED:
- case MARKED: m_stream << "[red]"; break;
- case ADDED: m_stream << "[green]"; break;
- default: throw std::runtime_error("Error: unexpected behaviour");
- }
+ return m_colors.printOptParam(color);
}
- void print_color_change(std::string color){
- m_stream << "\\mscsetcolor{" << color << "}" << std::endl;
- }
-
bool findPtr(MscElementPtrList list, MscElementPtr element)
{
for (MscElementPtrList::iterator nextIt = list.begin(); list.end() != nextIt ; nextIt++)
@@ -404,7 +492,7 @@
CoregEventRelPtrVector rels = coregion->get_successor_rels(event.get());
for(CoregEventRelPtrVector::const_iterator spos = rels.begin(); spos != rels.end(); spos++)
{
- print_color((*spos)->get_marked());
+ print_color((*spos)->get_color());
print_order(event, (*spos)->get_successor());
}
}
@@ -433,7 +521,7 @@
receiveY += Compare::round(coregion_receive_event->get_area()->get_begin_height());
}
receiveY += complete_message->get_receive_event()->get_instance()->get_line_begin().get_y();
- print_color(complete_message->get_marked());
+ print_color(complete_message->get_color());
m_stream << m_slope_size_map.printLength(sendY,receiveY,true);
m_stream << "\\mess{" << ExportTex::print_wchar(complete_message->get_label())
<< "}{"<< m_instance_id_map.get_id(inst_pos(complete_message->get_sender())) << "_inst}[0.3]{"
@@ -452,16 +540,12 @@
}
}
- //only complete message is printed on send event (receive event is skipped)
- //for all other items we can print color
- print_color(event->get_marked());
-
if (msg_event != NULL)
{
IncompleteMessagePtr incomplete_message = msg_event->get_incomplete_message();
if(incomplete_message != NULL)
{
- print_color(incomplete_message->get_marked());
+ print_color(incomplete_message->get_color());
//get_dot_position() distance from event
m_stream << m_lostfound_width_map.printLength(fabs(incomplete_message_width_corection(incomplete_message->get_dot_position().get_x())));
if(incomplete_message->is_lost())
@@ -482,6 +566,7 @@
if (act != NULL)
{
assert(lae->get_instance() != NULL);
+ print_color(act->get_color());
m_stream << m_local_action_width_map.printLength(act->get_width());
m_stream << m_local_action_height_map.printLength(act->get_height());
m_stream << "\\action*{" << ExportTex::print_wchar(act->get_statement()) << "}{" << m_instance_id_map.get_id(inst_pos(lae->get_instance())) << "_inst}" << std::endl;
@@ -494,6 +579,7 @@
if(cond != NULL)
{
assert(ce->get_instance() != NULL);
+ print_color(cond->get_color());
m_stream << m_local_condition_height_map.printLength(cond->get_height());
m_stream << m_local_condition_width_map.printLength(cond->get_width()/2);
m_stream << "\\condition*{" << ExportTex::print_wchar(cond->get_text()) << "}{" << m_instance_id_map.get_id(inst_pos(ce->get_instance())) << "_inst}" << std::endl;
@@ -511,10 +597,8 @@
Coordinate cor = coregionArea->get_begin_height() + coregionArea->get_instance()->get_line_begin().get_y();
if(Compare::equal(cor, coordinate))
{
- print_color(coregionArea->get_marked());
- m_stream << "\\regionstart{coregion}";
- print_opt_color(coregionArea->get_marked());
- m_stream << "{" << m_instance_id_map.get_id(inst_pos(coregionArea->get_instance())) << "_inst}"
+ m_stream << "\\regionstart{coregion}" << print_opt_color(coregionArea->get_color())
+ << "{" << m_instance_id_map.get_id(inst_pos(coregionArea->get_instance())) << "_inst}"
<< m_coregion_width_map.printOptParam(coregionArea->get_width()) << std::endl;
return;
}
@@ -583,7 +667,7 @@
for(CommentPtrSet::const_iterator cpos = event->get_comments().begin();
cpos != event->get_comments().end(); cpos++)
{
- print_color((*cpos)->get_marked());
+ print_color((*cpos)->get_color());
m_stream << m_comment_width_map.printLength(event->get_instance()->get_line_begin().get_x(),(*cpos)->get_position().get_x(),true);
m_stream << m_comment_slope_map.printLength((*cpos)->get_position().get_y(),event->get_position().get_y()+coordinate);
m_stream << "\\msccomment";
@@ -627,10 +711,8 @@
}
if(Compare::equal((*min)->get_line_begin().get_y(),first))
{
- print_color((*min)->get_marked());
m_stream << "\\declinst" << m_instance_width_map.printOptParam((*min)->get_width()) << "{" << m_instance_id_map.get_id(inst_pos((*min))) << "_inst}"
- << m_instance_height_map.printOptParam(3) << "{" << ExportTex::print_wchar((*min)->get_label()) << "}";
- print_opt_color((*min)->get_marked());
+ << m_instance_height_map.printOptParam(3) << "{" << ExportTex::print_wchar((*min)->get_label()) << "}" << print_opt_color((*min)->get_color());
m_stream << "{}" << std::endl;
}
else
@@ -655,8 +737,8 @@
{
m_stream << "\\create{}{}{" << m_instance_id_map.get_id(inst_pos(instance)) << "_inst}"
<< m_instance_width_map.printOptParam(instance->get_width()) << "{"
- << ExportTex::print_wchar(instance->get_label()) << "}" << m_instance_height_map.printOptParam(3) << "{}";
- print_opt_color(instance->get_marked());
+ << ExportTex::print_wchar(instance->get_label()) << "}" << m_instance_height_map.printOptParam(3) << "{}"
+ << print_opt_color(instance->get_color());
m_stream << std::endl;
return;
}
@@ -675,7 +757,7 @@
for(AbsoluteTimePtrList::const_iterator apos = absolute_times.begin();
apos != absolute_times.end(); apos++)
{
- print_color((*apos)->get_marked());
+ print_color((*apos)->get_color());
m_stream << m_absolutetime_width_map.printLength((*apos)->get_position().get_x(),event->get_instance()->get_line_begin().get_x(),true);
m_stream << m_absolutetime_slope_map.printLength((*apos)->get_position().get_y(),coordinate+event->get_position().get_y(),true);
m_stream << "\\mscmark[";
@@ -705,7 +787,7 @@
{
if((*rpos)->get_event_a()==event)
{
- print_color((*rpos)->get_marked());
+ print_color((*rpos)->get_color());
m_stream << m_timeinterval_slope_map.printLength(getTimeRelationSlope(*rpos));
m_stream << m_timeinterval_width_map.printLength(7);
m_stream << "\\measure[";
@@ -733,7 +815,7 @@
cpos != m_bmsc->get_comments().end(); cpos++)
{
//position is x = middle of comment, y = up side, width is width of whole comment
- print_color((*cpos)->get_marked());
+ print_color((*cpos)->get_color());
Coordinate bmsc_begin_x = m_bmsc->get_instances().begin()->get()->get_line_begin().get_x();
Coordinate bmsc_begin_y = m_bmsc->get_instances().begin()->get()->get_line_begin().get_y();
if(!Compare::equal(last_width,(*cpos)->get_width())){
@@ -834,6 +916,8 @@
m_stream << m_instance_spacing_map.print();
+ m_stream << m_colors.print();
+
//print end
m_stream << "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" << std::endl
<< "%%%% End of configuration header" << std::endl
@@ -868,6 +952,7 @@
Coordinate cor = comment->get_position().get_y()+coordinate;
edge_point(comment->get_position().get_x(),comment->get_width());
insert_pointer(comment,cor);
+ m_colors.addColor(comment->get_color());
};
void insert_event(EventPtr event, Coordinate coordinate = 0)
@@ -876,6 +961,8 @@
LocalActionEventPtr local_action_event = boost::dynamic_pointer_cast<LocalActionEvent>(event);
ConditionEventPtr condition_event = boost::dynamic_pointer_cast<ConditionEvent>(event);
+ m_colors.addColor(event->get_color());
+
Coordinate coor = event->get_position().get_y()+coordinate; //! event absolute position in diagram
CoregionArea* coregion = dynamic_cast<CoregionArea*>(event->get_area());
@@ -929,6 +1016,7 @@
CompleteMessagePtr complete_message = msg_event->get_complete_message();
if(complete_message != NULL)
{
+ m_colors.addColor(complete_message->get_color());
if(complete_message->get_send_event() == msg_event)
{
Coordinate send_y = Compare::round(complete_message->get_send_event()->get_position().get_y());
@@ -957,6 +1045,7 @@
IncompleteMessagePtr incomplete_message = msg_event->get_incomplete_message();
if(incomplete_message != NULL)
{
+ m_colors.addColor(incomplete_message->get_color());
edge_point(incomplete_message->get_event()->get_instance()->get_line_begin().get_x()+incomplete_message->get_dot_position().get_x());
m_incomlete_mess_slope_map.addDistance(incomplete_message->get_dot_position().get_y());
m_lostfound_width_map.addDistance(fabs(incomplete_message_width_corection(incomplete_message->get_dot_position().get_x())));
@@ -967,6 +1056,7 @@
LocalActionPtr act = local_action_event->get_local_action();
if (act != NULL)
{
+ m_colors.addColor(act->get_color());
assert(local_action_event->get_instance() != NULL);
edge_point(local_action_event->get_instance()->get_line_begin().get_x(), act->get_width());
m_local_action_width_map.addDistance(act->get_width());
@@ -978,6 +1068,7 @@
ConditionPtr cond = condition_event->get_condition();
if (cond != NULL)
{
+ m_colors.addColor(cond->get_color());
assert(condition_event->get_instance() != NULL);
edge_point(condition_event->get_instance()->get_line_begin().get_x(), cond->get_width());
m_local_condition_width_map.addDistance(cond->get_width()/2);
@@ -992,6 +1083,7 @@
void insert_coregion_area(CoregionAreaPtr coregion_area, Coordinate coordinate = 0)
{
+ m_colors.addColor(coregion_area->get_color());
edge_point(coregion_area->get_instance()->get_line_begin().get_x(),coregion_area->get_width());
//coregion_end_Width_map insert coregion end width
insert_pointer(coregion_area,coregion_area->get_begin_height()+coordinate);
@@ -1008,6 +1100,7 @@
for(AbsoluteTimePtrList::const_iterator apos = absolute_times.begin();
apos != absolute_times.end(); apos++)
{
+ m_colors.addColor((*apos)->get_color());
edge_point((*apos)->get_position().get_x());
m_absolutetime_width_map.addDistance((*apos)->get_position().get_x(),event->get_instance()->get_line_begin().get_x(),true);
m_absolutetime_slope_map.addDistance((*apos)->get_position().get_y(),coordinate,true);
@@ -1016,6 +1109,7 @@
for(TimeRelationEventPtrList::const_iterator rpos = relations.begin();
rpos != relations.end(); rpos++)
{
+ m_colors.addColor((*rpos)->get_color());
// for each "event a" we print the time relation to "event b"
// we thus skip all "events b"
if((*rpos)->get_event_a() != event)
@@ -1059,6 +1153,7 @@
void insert_instance(const InstancePtr instance)
{
+ m_colors.addColor(instance->get_color());
m_instance_width_map.addDistance(instance->get_width());
insert_pointer(instance,instance->get_line_begin().get_y());
insert_pointer(instance,instance->get_line_end().get_y());
@@ -1611,6 +1706,9 @@
m_incomlete_mess_slope_map.setDescription("%%%% Incomplete message slope:");
m_incomlete_mess_slope_map.setLengthName("levelheight");
m_incomlete_mess_slope_map.setIsLength(false);
+ m_colors.setName("color");
+ m_colors.setDescription("%%% Colors:");
+ m_colors.setLengthName("color");
m_last_mark = NONE;
// not in structure lengths
m_instance_height_map.addDistance(3);
@@ -1658,6 +1756,7 @@
ipos != m_bmsc->get_instances().end(); ipos++)
{
insert_instance((*ipos));
+
Coordinate inst_start = (*ipos)->get_line_begin().get_y();
//find edge instances
@@ -1676,7 +1775,9 @@
{
const EventPtrList& events = strict_area->get_events();
for (EventPtrList::const_iterator it = events.begin(); it != events.end(); ++it)
+ {
insert_event(*it, inst_start);
+ }
}
//coredionArea
@@ -1695,7 +1796,7 @@
for(EventPtrList::const_iterator epos = event_stack.begin(); epos != event_stack.end(); epos++)
{
insert_event(*epos,coregion_area->get_begin_height()+inst_start);
-
+
// process forward links
CoregEventRelPtrVector rels = coregion_area->get_successor_rels(epos->get());
for(CoregEventRelPtrVector::const_iterator spos = rels.begin(); spos != rels.end(); spos++)
@@ -1805,29 +1906,14 @@
DistanceMap m_conection_radius;
DistanceMap m_time_interval_width;
DistanceMap m_start_symbol_width;
+ ColorMap m_colors;
MarkType m_last_mark;
PtrIDMap<HMscNodePtr> node_id_map; // node identifiers
- void print_color(const MarkType& mark){
- if(mark == m_last_mark){
- //nothing to change
- return;
- }
- switch(mark)
- {
- case NONE: print_color_change("black"); break;
- case REMOVED:
- case MARKED: print_color_change("red"); break;
- case ADDED: print_color_change("green"); break;
- default: throw std::runtime_error("Error: unexpected behaviour");
- }
- m_last_mark = mark;
+ void print_color(const MscColor& color){
+ m_stream << m_colors.printColor(color);
}
- void print_color_change(std::string color){
- m_stream << "\\mscsetcolor{" << color << "}" << std::endl;
- }
-
/*
* In structure is position system left most = the lowest value && right most = the highest value (same as in tex)
* bottom most = the lowest value && upper most = the highest value (opposite as in tex)
@@ -1957,7 +2043,8 @@
<< m_condition_width.print() << std::endl
<< m_condition_height.print() << std::endl
<< m_conection_radius.print() << std::endl
- << m_time_interval_width.print() << std::endl;
+ << m_time_interval_width.print() << std::endl
+ << m_colors.print() << std::endl;
m_stream << "%%%%%%%%%%%%%%%%%%" << std::endl
@@ -1975,7 +2062,7 @@
// phase 1: print only constraints applied to this single node
if((*rpos)->get_ref_node_a() != (*rpos)->get_ref_node_b())
continue;
- print_color((*rpos)->get_marked());
+ print_color((*rpos)->get_color());
m_stream << "\\hmscmeasure" << ((*rpos)->is_directed() ? "[yes]" : "") << "{" << (*rpos)->get_label() << "}"
//<< Compare::round((*rpos)->get_width()) << "]{" << node_id_map.get_id((*rpos)->get_ref_node_a()) //width is not stored in structure
<< m_time_interval_width.printOptParam(14) << "{" << node_id_map.get_id((*rpos)->get_ref_node_a())
@@ -2014,7 +2101,7 @@
//i think it's better simple
width = 11;
- print_color((*rpos)->get_marked());
+ print_color((*rpos)->get_color());
m_stream << "\\hmscmeasure" << ((*rpos)->is_directed() ? "[yes]" : "") << "{" << (*rpos)->get_label() << "}"
<< m_time_interval_width.printOptParam(14) << "{" << node_id_map.get_id((*rpos)->get_ref_node_a())
<< "}[" << ((*rpos)->get_ref_node_a()->is_time_relation_bottom(*rpos) ? "bottom" : "top") << "]{"
@@ -2058,6 +2145,9 @@
m_start_symbol_width.setName("startSymbolWidth");
m_start_symbol_width.setLengthName("hmscstartsymbolwidth");
m_start_symbol_width.setIsVerticalLength(false);
+ m_colors.setName("color");
+ m_colors.setDescription("%%% Colors:");
+ m_colors.setLengthName("color");
//default lengths
m_reference_height.addDistance(10);
m_reference_width.addDistance(20);
@@ -2081,7 +2171,7 @@
for(CommentPtrSet::const_iterator cpos = m_hmsc->get_comments().begin();
cpos != m_hmsc->get_comments().end(); cpos++)
{
- print_color((*cpos)->get_marked());
+ print_color((*cpos)->get_color());
m_stream << m_global_comment_width.printLength((*cpos)->get_width());
m_stream << "\\mscglobalcomment{"
<< ExportTex::print_wchar((*cpos)->get_text()) << "}(" << get_pos_x((*cpos)->get_position().get_x() - ((*cpos)->get_width()/2)) << ","
@@ -2108,7 +2198,7 @@
StartNodePtr start_node = boost::dynamic_pointer_cast<StartNode>(*npos);
if(start_node != NULL)
{
- print_color(start_node->get_marked());
+ print_color(start_node->get_color());
m_stream << "\\hmscstartsymbol{" << node_id_map.get_id(*npos) << "}(" << get_pos_x(start_node->get_position().get_x())
<< "," << get_pos_y(start_node->get_position().get_y()) << ")"<< std::endl;
}
@@ -2116,7 +2206,7 @@
ConditionNodePtr condition_node = boost::dynamic_pointer_cast<ConditionNode>(*npos);
if(condition_node != NULL)
{
- print_color(condition_node->get_marked());
+ print_color(condition_node->get_color());
m_stream << "\\hmsccondition{" << node_id_map.get_id(*npos)
<< "}{" << ExportTex::print_string(condition_node->get_label()) << "}(" << get_pos_x(condition_node->get_position().get_x())
<< "," << get_pos_y(condition_node->get_position().get_y()) << ")" << std::endl;
@@ -2125,7 +2215,7 @@
ConnectionNodePtr connection_node = boost::dynamic_pointer_cast<ConnectionNode>(*npos);
if(connection_node != NULL)
{
- print_color(connection_node->get_marked());
+ print_color(connection_node->get_color());
m_stream << "\\hmscconnection{" << node_id_map.get_id(*npos)
<< "}(" << get_pos_x(connection_node->get_position().get_x())
<< "," << get_pos_y(connection_node->get_position().get_y()) << ")" << std::endl;
@@ -2136,7 +2226,7 @@
{
if(reference_node->get_msc() != NULL)
{
- print_color(reference_node->get_marked());
+ print_color(reference_node->get_color());
m_stream << "\\hmscreference{" << node_id_map.get_id(*npos)
<< "}{" << ExportTex::print_wchar(reference_node->get_msc()->get_label())
<< "}(" << get_pos_x(reference_node->get_position().get_x())
@@ -2150,7 +2240,7 @@
EndNodePtr end_node = boost::dynamic_pointer_cast<EndNode>(*npos);
if(end_node != NULL)
{
- print_color(end_node->get_marked());
+ print_color(end_node->get_color());
m_stream << "\\hmscendsymbol{" << node_id_map.get_id(*npos)
<< "}(" << get_pos_x(end_node->get_position().get_x())
<< "," << get_pos_y(end_node->get_position().get_y()) << ")" << std::endl;
@@ -2175,7 +2265,7 @@
for(CommentPtrSet::const_iterator cpos = (*npos)->get_comments().begin();
cpos != (*npos)->get_comments().end(); cpos++)
{
- print_color((*cpos)->get_marked());
+ print_color((*cpos)->get_color());
m_stream << "\\hmsccomment{"
<< ExportTex::print_wchar((*cpos)->get_text()) << "}(" << get_pos_x((*cpos)->get_position().get_x())
<< "," << get_pos_y((*cpos)->get_position().get_y()) << "){"
@@ -2226,7 +2316,7 @@
SuccessorNode *successor = (*spos)->get_successor();
HMscNode *successor_node = dynamic_cast<HMscNode*>(successor);
- print_color((*spos)->get_marked());
+ print_color((*spos)->get_color());
m_stream << "\\arrow{" << node_id_map.get_id(*npos) << "}";
std::list<MscPoint> line = (*spos)->get_line().get_points();
if(!line.empty())
Modified: trunk/src/data/msc/CoregionArea.cpp
===================================================================
--- trunk/src/data/msc/CoregionArea.cpp 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/data/msc/CoregionArea.cpp 2013-12-05 14:13:49 UTC (rev 1878)
@@ -90,14 +90,22 @@
return maxes;
}
-void CoregionArea::add_successor_rel(Event* predecessor, Event* successor)
+ CoregEventRelPtr CoregionArea::add_successor_rel(Event* predecessor, Event* successor)
{
vertex_t u = get_vertex(predecessor);
vertex_t v = get_vertex(successor);
edge_t e = boost::add_edge(u, v, m_events).first;
m_events[e] = new CoregionEventRelation(predecessor, successor);
+ return m_events[e];
}
+CoregEventRelPtr CoregionArea::add_successor_rel(Event* predecessor, Event* successor, MscColor color)
+{
+ CoregEventRelPtr result = add_successor_rel(predecessor, successor);
+ result->set_color(color);
+ return result;
+}
+
CoregEventRelPtrVector CoregionArea::get_successor_rels(const Event* e) const
{
CoregEventRelPtrVector result;
Modified: trunk/src/data/msc/CoregionArea.h
===================================================================
--- trunk/src/data/msc/CoregionArea.h 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/data/msc/CoregionArea.h 2013-12-05 14:13:49 UTC (rev 1878)
@@ -116,8 +116,10 @@
* After the operation, %predecessor will have %successor as its successor in the coregion.
* NOTE: both events must already exist in the coregion area
*/
- void add_successor_rel(Event* predecessor, Event* successor);
+ CoregEventRelPtr add_successor_rel(Event* predecessor, Event* successor);
+ CoregEventRelPtr add_successor_rel(Event* predecessor, Event* successor, MscColor color);
+
void remove_event(Event* e);
InstanceAxisForm get_form() const
Added: trunk/src/data/msc/MscColor.h
===================================================================
--- trunk/src/data/msc/MscColor.h (rev 0)
+++ trunk/src/data/msc/MscColor.h 2013-12-05 14:13:49 UTC (rev 1878)
@@ -0,0 +1,130 @@
+/*
+ * scstudio - Sequence Chart Studio
+ * http://scstudio.sourceforge.net
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * Copyright (c) 2013 Adrian Farmadin <far...@ma...>
+ *
+ * $Id: MscElement.h 1724 2013-03-21 18:08:46Z obouda $
+ */
+
+#ifndef _MSCCOLOR_H
+#define _MSCCOLOR_H
+
+/**
+ * \brief Common basic class for color value
+ */
+class SCMSC_EXPORT MscColor
+{
+ private:
+ int m_R;
+ int m_G;
+ int m_B;
+ double m_color;
+
+ public:
+
+ MscColor()
+ {
+ clear();
+ };
+
+ void setColor(int R, int G, int B)
+ {
+ m_R=R;
+ m_G=G;
+ m_B=B;
+ };
+
+ void setColor(double color)
+ {
+ m_color=color;
+ };
+
+ void setColor(MscColor color)
+ {
+ setColor(color.m_R, color.m_G, color.m_B);
+ m_color = color.m_color;
+ };
+
+ double getColor() const
+ {
+ return m_color;
+ };
+
+ void getColor(int &R, int &G, int &B) const
+ {
+ R=m_R;
+ G=m_G;
+ B=m_B;
+ };
+
+#define color_round(x) floor(double(x)/255*1000)/1000
+
+ void getColorD(double &R, double &G, double &B) const
+ {
+ R=color_round(m_R);
+ G=color_round(m_G);
+ B=color_round(m_B);
+ };
+
+ int getRed() const
+ {
+ return m_R;
+ };
+
+ int getGreen() const
+ {
+ return m_G;
+ };
+
+ int getBlue() const
+ {
+ return m_B;
+ };
+
+ bool operator < (const MscColor& color) const {
+ if(color.m_color >=0 && m_color >=0)
+ {
+ return m_color < color.m_color;
+ }
+
+ int sum1,sum2;
+ sum1 = m_R + m_G +m_B;
+ sum2 = color.m_R + color.m_G + color.m_B;
+ return sum1 < sum2;
+ };
+
+ bool operator ==(const MscColor& color) const {
+ if(color.m_color >=0 && m_color >=0)
+ {
+ return m_color == color.m_color;
+ }
+
+ int sum1,sum2;
+ sum1 = m_R + m_G +m_B;
+ sum2 = color.m_R + color.m_G + color.m_B;
+ return sum1 == sum2;
+ };
+
+ bool operator !=(const MscColor& color) const {
+ return !(color==*this);
+ };
+
+ void clear()
+ {
+ setColor(0,0,0);
+ m_color = -1;
+ };
+};
+
+
+#endif // #ifndef _MSCCOLOR_H
Modified: trunk/src/data/msc/MscElement.h
===================================================================
--- trunk/src/data/msc/MscElement.h 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/data/msc/MscElement.h 2013-12-05 14:13:49 UTC (rev 1878)
@@ -38,6 +38,8 @@
//! Determines whether this element is in some way interesting for creator.
enum MarkType m_marked;
+ MscColor m_color;
+
protected:
MscElement()
@@ -190,6 +192,21 @@
m_marked = marked;
}
+ MscColor get_color() const
+ {
+ return m_color;
+ }
+
+ void set_color(MscColor color)
+ {
+ m_color.setColor(color);
+ }
+
+ void clear_color()
+ {
+ m_color.clear();
+ }
+
/**
* \brief See MscElementTmpl for details about attribute original
*/
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/data/msc.h 2013-12-05 14:13:49 UTC (rev 1878)
@@ -43,6 +43,7 @@
#include "data/time.h"
#include "data/export.h"
+class MscColor;
class MscElement;
class Comment;
class Commentable;
@@ -82,6 +83,7 @@
// end time extensions
+typedef boost::intrusive_ptr<MscColor> MscColorPtr;
typedef boost::intrusive_ptr<MscElement> MscElementPtr;
typedef boost::intrusive_ptr<Comment> CommentPtr;
@@ -178,6 +180,8 @@
enum MarkType {NONE, MARKED, ADDED, REMOVED, NOT_COVER, NOT_FULL_COVER, PATH};
+
+#include "msc/MscColor.h"
#include "data/msc/MscElement.h"
#include "data/msc/MscElementTmpl.h"
#include "data/msc/Comment.h"
Modified: trunk/src/data/msc_types.h
===================================================================
--- trunk/src/data/msc_types.h 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/data/msc_types.h 2013-12-05 14:13:49 UTC (rev 1878)
@@ -175,6 +175,11 @@
{
return m_points;
}
+
+ void push_back_point(MscPoint point)
+ {
+ m_points.push_back(point);
+ }
};
Modified: trunk/src/view/visio/addon/extract.cpp
===================================================================
--- trunk/src/view/visio/addon/extract.cpp 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/view/visio/addon/extract.cpp 2013-12-05 14:13:49 UTC (rev 1878)
@@ -437,6 +437,7 @@
std::set<long> relations;
CoregionAreaPtr area = new CoregionArea();
+ area->set_color(CShapeUtils::ExtractShapeColor(coregion));
// assert there is no connection to inner shapes of the coregion group
assert_no_nested_FromConnects(coregion);
@@ -666,9 +667,9 @@
{
// the position is determined from the X coordinate
if(pos1.m_x < pos2.m_x)
- area->add_successor_rel(event1->second.get(), event2->second.get());
+ area->add_successor_rel(event1->second.get(), event2->second.get(), CShapeUtils::ExtractShapeColor(line));
else if(pos2.m_x < pos1.m_x)
- area->add_successor_rel(event2->second.get(), event1->second.get());
+ area->add_successor_rel(event2->second.get(), event1->second.get(), CShapeUtils::ExtractShapeColor(line));
else
{
PrintError(stringize() << page_name << ": "
@@ -702,6 +703,13 @@
return area;
}
+InstancePtr CDrawingExtractor::new_instance_ptr(Visio::IVShapePtr shape, MscColor color)
+{
+ InstancePtr result = new_instance_ptr(shape);
+ result->set_color(color);
+ return result;
+}
+
InstancePtr CDrawingExtractor::new_instance_ptr(Visio::IVShapePtr shape)
{
InstancePtr result = new Instance((const wchar_t*)shape->Text);
@@ -737,7 +745,7 @@
for(int i = 1; i <= vsoPage->Shapes->Count; i++)
{
Visio::IVShapePtr shape = vsoPage->Shapes->Item[i];
-
+ MscColor shape_color = CShapeUtils::ExtractShapeColor(shape);
try
{
TShapeType type = get_shape_type(shape);
@@ -745,10 +753,14 @@
{
case ST_BMSC_INSTANCE:
instances[shape->ID] = new_instance_ptr(shape);
+ instances[shape->ID]->set_color(shape_color);
+ TRACE("INSTANCE COLOR: " << shape->CellsSRC[visSectionObject][visRowLine][visLineColor]->ResultStrU[visUnitsColor].GetBSTR());
+ TRACE("INSTANCE COLOR NUMBER: " << shape->CellsSRC[visSectionObject][visRowLine][visLineColor]->ResultIU);
break;
case ST_BMSC_MESSAGE:
elements[shape->ID] = new CompleteMessage((const wchar_t*)shape->Text);
+ elements[shape->ID]->set_color(shape_color);
break;
case ST_BMSC_MESSAGE_LOST:
{
@@ -756,6 +768,7 @@
// lost message: glued on begin, dot on end
new_message->set_dot_position(GetLineEnd(shape)-GetLineBegin(shape));
elements[shape->ID] = new_message;
+ elements[shape->ID]->set_color(shape_color);
break;
}
case ST_BMSC_MESSAGE_FOUND:
@@ -764,6 +777,7 @@
// found message: glued on end, dot on begin
new_message->set_dot_position(GetLineBegin(shape)-GetLineEnd(shape));
elements[shape->ID] = new_message;
+ elements[shape->ID]->set_color(shape_color);
break;
}
@@ -776,6 +790,7 @@
//new_local_action->set_width(GetControlPos(shape, _T("Height")));
//new_local_action->set_height(GetControlPos(shape, _T("Width")));
elements[shape->ID] = new_local_action;
+ elements[shape->ID]->set_color(shape_color);
break;
}
@@ -788,6 +803,7 @@
//new_local_condition->set_width(GetControlPos(shape, _T("Height")));
//new_local_condition->set_height(GetControlPos(shape, _T("Width")));
elements[shape->ID] = new_condition;
+ elements[shape->ID]->set_color(shape_color);
break;
}
@@ -798,6 +814,7 @@
//new_relation->set_directed(type == ST_TIME_DIRECTED);
new_relation->set_width(GetControlPos(shape, _T("Height")));
time_relations[shape->ID] = new_relation;
+ time_relations[shape->ID]->set_color(shape_color);
break;
}
@@ -814,6 +831,7 @@
// note: this shape is rotated by 90 degrees
new_comment->set_width(GetHeight(shape));
comments[shape->ID] = new_comment;
+ comments[shape->ID]->set_color(shape_color);
break;
}
case ST_TIME_ABSOLUTE:
@@ -825,6 +843,7 @@
//create absolute time interval
AbsoluteTimePtr abs = new AbsoluteTime(*(new MscTimeIntervalSet<double>(abs_s)));
+ abs->set_color(shape_color);
abs->set_position(GetLineEnd(shape));
// note: this shape is rotated by 90 degrees
abs->set_width(GetHeight(shape));
@@ -847,6 +866,7 @@
Comment* new_comment = new Comment((const wchar_t*)shape->Text);
new_comment->set_position(GetPinPos(shape));
new_comment->set_width(GetWidth(shape));
+ new_comment->set_color(shape_color);
bmsc->add_comment(new_comment);
break;
}
@@ -1223,6 +1243,7 @@
ipos->second->add_area(coregion_area = create_coregion_area(events, elements, shape));
coregion_area->set_begin_height(ConvertCoordinate(instance, epos->event_height));
coregion_area->set_width(shape->CellsSRC[visSectionObject][visRowXFormOut][visXFormHeight]->Result[visMillimeters]);
+ coregion_area->set_color(CShapeUtils::ExtractShapeColor(shape));
}
else
{
@@ -1634,6 +1655,7 @@
for(int i = 1; i <= vsoPage->Shapes->Count; i++)
{
Visio::IVShapePtr shape = vsoPage->Shapes->Item[i];
+ MscColor shape_color = CShapeUtils::ExtractShapeColor(shape);
try
{
@@ -1655,6 +1677,7 @@
new_comment->set_position(GetLineEnd(shape));
// note: this shape is rotated by 90 degrees
new_comment->set_width(GetHeight(shape));
+ new_comment->set_color(shape_color);
comments[shape->ID] = new_comment;
break;
}
@@ -1663,6 +1686,7 @@
Comment* new_comment = new Comment((const wchar_t*)shape->Text);
new_comment->set_position(GetPinPos(shape));
new_comment->set_width(GetWidth(shape));
+ new_comment->set_color(shape_color);
hmsc->add_comment(new_comment);
break;
}
@@ -1671,7 +1695,7 @@
{
ConnectionNode *new_connection = new ConnectionNode();
new_connection->set_position(GetPinPos(shape));
-
+ new_connection->set_color(shape_color);
hmsc->add_node(new_connection);
nodes[shape->ID] = new_connection;
break;
@@ -1688,6 +1712,7 @@
}
StartNode *new_start = new StartNode();
new_start->set_position(GetPinPos(shape));
+ new_start->set_color(shape_color);
hmsc->set_start(new_start);
nodes[shape->ID] = new_start;
@@ -1697,6 +1722,7 @@
{
EndNode *new_end = new EndNode();
new_end->set_position(GetPinPos(shape));
+ new_end->set_color(shape_color);
hmsc->add_node(new_end);
nodes[shape->ID] = new_end;
@@ -1706,6 +1732,7 @@
{
ReferenceNode *new_node = new ReferenceNode();
new_node->set_position(GetPinPos(shape));
+ new_node->set_color(shape_color);
hmsc->add_node(new_node);
nodes[shape->ID] = new_node;
@@ -1725,6 +1752,7 @@
{
ConditionNode *new_condition = new ConditionNode((const char*)shape->Text);
new_condition->set_position(GetPinPos(shape));
+ new_condition->set_color(shape_color);
hmsc->add_node(new_condition);
nodes[shape->ID] = new_condition;
@@ -1733,8 +1761,20 @@
case ST_HMSC_LINE:
case ST_HMSC_ARROW:
- relations[shape->ID] = new NodeRelation();
+ {
+ NodeRelation *new_node_relation = new NodeRelation();
+ new_node_relation->set_color(shape_color);
+ PolyLine line;
+ short rows = shape->RowCount[visSectionFirstComponent]-1;
+ for(short i = 2; i<rows; i++)
+ {
+ MscPoint point(shape->CellsSRC[visSectionFirstComponent][i][0]->Result[visMillimeters], shape->CellsSRC[visSectionFirstComponent][i][1]->Result[visMillimeters]);
+ line.push_back_point(point);
+ }
+ new_node_relation->set_line(line);
+ relations[shape->ID] = new_node_relation;
break;
+ }
case ST_TIME_INTERVAL:
//case ST_TIME_DIRECTED:
@@ -1742,6 +1782,7 @@
TimeRelationRefNode *new_relation = new TimeRelationRefNode((const char*)shape->Text);
//new_relation->set_directed(type == ST_TIME_DIRECTED);
new_relation->set_width(GetControlPos(shape, _T("Height")));
+ new_relation->set_color(shape_color);
time_relations[shape->ID] = new_relation;
break;
}
@@ -1794,6 +1835,7 @@
continue;
}
+
Visio::IVConnectPtr connect1 = line->Connects->Item[1];
Visio::IVShapePtr shape1 = connect1->ToSheet;
Modified: trunk/src/view/visio/addon/extract.h
===================================================================
--- trunk/src/view/visio/addon/extract.h 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/view/visio/addon/extract.h 2013-12-05 14:13:49 UTC (rev 1878)
@@ -215,6 +215,7 @@
};
InstancePtr new_instance_ptr(Visio::IVShapePtr shape);
+ InstancePtr new_instance_ptr(Visio::IVShapePtr shape, MscColor color);
//! process the given page and build a relevant BMsc
BMscPtr extract_bmsc(Visio::IVPagePtr vsoPage);
Modified: trunk/src/view/visio/addon/shapeutils.cpp
===================================================================
--- trunk/src/view/visio/addon/shapeutils.cpp 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/view/visio/addon/shapeutils.cpp 2013-12-05 14:13:49 UTC (rev 1878)
@@ -19,6 +19,7 @@
#include "messageSnapping.h"
#include "visualize.h"
#include "enumerateUtils.h"
+#include <sstream>
void CShapeUtils::GlueBeginConector(Visio::IVShapePtr connector, Visio::IVShapePtr coreg, const MscPoint& point)
{
@@ -127,6 +128,75 @@
}
}
+void CShapeUtils::ChangeShapeColor(Visio::IVShapePtr shape, MscElementPtr element)
+{
+ if(element->get_marked() == NONE)
+ {
+ ChangeShapeColor(shape, element->get_color());
+ }
+}
+
+void CShapeUtils::ChangeShapeColor(Visio::IVShapePtr shape, MscColor color)
+{
+
+ if (shape->Type == Visio::visTypeGroup)
+ {
+ for(long i = 1; i <= shape->Shapes->Count; i++)
+ {
+ ChangeShapeColor(shape->Shapes->Item[i], color);
+ }
+ }
+ if(color.getColor() >= 0)
+ {
+ // line color from MscColor struct
+ shape->CellsSRC[visSectionObject][visRowLine][visLineColor]->ResultIU = color.getColor();
+ // text color from MscColor struct
+ shape->CellsSRC[visSectionCharacter][visRowCharacter][visCharacterColor]->ResultIU = color.getColor();
+ }
+ else
+ {
+ //set color from RGB
+ std::ostringstream color_str;
+ color_str << "RGB(" << color.getRed() << "," << color.getGreen() << "," << color.getBlue() << ")";
+ // line color from MscColor struct
+ shape->CellsSRC[visSectionObject][visRowLine][visLineColor]->Formula = color_str.str().c_str();
+ // text color from MscColor struct
+ shape->CellsSRC[visSectionCharacter][visRowCharacter][visCharacterColor]->Formula = color_str.str().c_str();
+ }
+}
+
+MscColor CShapeUtils::ExtractShapeColor(Visio::IVShapePtr shape)
+{
+ MscColor result;
+ //store color ID for Visio
+ result.setColor(shape->CellsSRC[visSectionObject][visRowLine][visLineColor]->ResultIU);
+
+ Visio::IVCellPtr cell = shape->CellsSRC[visSectionObject][visRowLine][visLineColor];
+
+ BSTR str = cell->ResultStrU[visUnitsColor].GetBSTR();
+ wchar_t *endP;
+ //parse string RGB(r, g, b) into numbers r,g,b
+ endP = wcsstr(str,L"RGB");
+ if(endP!= NULL)
+ {
+ endP = wcstok(str,L"( "); //throw RGB away
+ endP = wcstok(NULL,L"( ");
+ int red = wcstol(endP,&endP,10);
+ endP = wcstok(NULL,L"( ");
+ int green = wcstol(endP,&endP,10);
+ endP = wcstok(NULL,L"( ");
+ int blue = wcstol(endP,&endP,10);
+ result.setColor(red,green,blue);
+ }
+ else
+ {
+ long color_index = wcstol(str,&endP,10);
+ Visio::IVColorPtr color = shape->Document->Colors->Item[color_index];
+ result.setColor(color->GetRed(), color->GetGreen(), color->GetBlue());
+ }
+ return result;
+}
+
void CShapeUtils::UnmarkShape(Visio::IVShapePtr shape)
{
MarkShape(shape, SC_BLACK);
Modified: trunk/src/view/visio/addon/shapeutils.h
===================================================================
--- trunk/src/view/visio/addon/shapeutils.h 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/view/visio/addon/shapeutils.h 2013-12-05 14:13:49 UTC (rev 1878)
@@ -55,6 +55,15 @@
static void UnmarkShape(Visio::IVShapePtr shape);
/**
+ * Shape color
+ * @param shape the shape to be colored
+ * @param color the color the shape will be colored with
+ */
+ static void ChangeShapeColor(Visio::IVShapePtr shape, MscElementPtr element);
+ static void ChangeShapeColor(Visio::IVShapePtr shape, MscColor color);
+ static MscColor CShapeUtils::ExtractShapeColor(Visio::IVShapePtr shape);
+
+ /**
* Get a coregion connected to shape, crossing yPos.
* @param shape the shape on which to find a coregion
* @param yPos the Y-position relative to the page in internal units
Modified: trunk/src/view/visio/addon/visualize.cpp
===================================================================
--- trunk/src/view/visio/addon/visualize.cpp 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/view/visio/addon/visualize.cpp 2013-12-05 14:13:49 UTC (rev 1878)
@@ -19,8 +19,8 @@
#include "stdafx.h"
#include "dllmodule.h"
#include "document.h"
+#include "visualize.h"
#include "extract.h"
-#include "visualize.h"
#include "errors.h"
#include "data/msc/CoregionArea.h"
@@ -284,6 +284,10 @@
case REMOVED: CShapeUtils::MarkShape(shape, SC_RED); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
+ if(element->get_marked() == NONE)
+ {
+ CShapeUtils::ChangeShapeColor(shape, element->get_color());
+ }
if (boost::dynamic_pointer_cast<MscMessage>(element) != NULL)
shape->Text = boost::dynamic_pointer_cast<MscMessage>(element)->get_label().c_str();
@@ -309,7 +313,7 @@
if(complete_message != NULL)
{
Visio::IVShapePtr msg = drop_shape(vsoPage, shapes, complete_message, find_master(ST_BMSC_MESSAGE));
-
+
if(complete_message->get_send_event() == event)
CShapeUtils::GlueBeginToPos(msg, parent, event->get_position());
else if(complete_message->get_receive_event() == event)
@@ -383,6 +387,7 @@
CShapeUtils::GlueBeginToPos(comment, parent, event->get_position());
SetLineEnd(comment, (*cpos)->get_position());
+
}
AbsoluteTimePtrList at_list = event->get_absolut_times();
@@ -420,7 +425,7 @@
else
connector->CellsSRC[visSectionControls][visRowControl][visCtlX]->Result[visMillimeters] = -5.0;
}
-
+
return connector;
}
@@ -449,6 +454,10 @@
case NOT_FULL_COVER: CShapeUtils::MarkShape(result, SC_BLUE); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
+ if(time_relation->get_marked() == NONE)
+ {
+ CShapeUtils::ChangeShapeColor(result, time_relation->get_color());
+ }
result->Text = time_relation->get_label().c_str();
@@ -508,6 +517,12 @@
case REMOVED: CShapeUtils::MarkShape(text, SC_RED); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
+
+ if((*cpos)->get_marked() == NONE)
+ {
+ CShapeUtils::ChangeShapeColor(text, (*cpos)->get_color());
+ }
+
}
BMscPtr bmsc = boost::dynamic_pointer_cast<BMsc>(msc);
@@ -538,6 +553,10 @@
case REMOVED: CShapeUtils::MarkShape(inst, SC_RED); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
+ if((*ipos)->get_marked() == NONE)
+ {
+ CShapeUtils::ChangeShapeColor(inst, (*ipos)->get_color());
+ }
inst->Text = (*ipos)->get_label().c_str();
SetControlPos(inst, _T("mscHeadWidth"), (*ipos)->get_width()/2.0);
@@ -588,6 +607,10 @@
case REMOVED: CShapeUtils::MarkShape(coregion, SC_RED); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
+ if(coregion_area->get_marked() == NONE)
+ {
+ CShapeUtils::ChangeShapeColor(coregion, coregion_area->get_color());
+ }
CShapeUtils::GlueBeginToPos(coregion, inst, MscPoint(0,coregion_area->get_begin_height()));
CShapeUtils::GlueEndToPos(coregion, inst, MscPoint(0,coregion_area->get_end_height()));
@@ -633,6 +656,11 @@
case REMOVED: CShapeUtils::MarkShape(connector, SC_RED); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
+ if((*spos)->get_marked() == NONE)
+ {
+ CShapeUtils::ChangeShapeColor(connector, (*spos)->get_color());
+ }
+
}
}
}
@@ -662,9 +690,9 @@
shape = vsoPage->Drop(find_master(ST_MSC_CONDITION), 0, 0);
// move shape to the right position
shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginX]->Result[visMillimeters] = condition_node->get_position().get_x();
- shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginY]->Result[visMillimeters] = page_height - condition_node->get_position().get_y();
+ shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginY]->Result[visMillimeters] = page_height - condition_node->get_position().get_y() + 5;
shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndX]->Result[visMillimeters] = condition_node->get_position().get_x();
- shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndY]->Result[visMillimeters] = page_height - condition_node->get_position().get_y() - 10;
+ shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndY]->Result[visMillimeters] = page_height - condition_node->get_position().get_y() - 5;
shape->Text = condition_node->get_label().c_str();
}
@@ -704,6 +732,10 @@
case PATH: CShapeUtils::MarkShape(shape, SC_DARK_GREEN); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
+ if(node->get_marked() == NONE)
+ {
+ CShapeUtils::ChangeShapeColor(shape, node->get_color());
+ }
nodes[node] = shape;
@@ -799,6 +831,10 @@
case PATH: CShapeUtils::MarkShape(connector, SC_DARK_GREEN); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
+ if( (*spos)->get_marked() == NONE )
+ {
+ CShapeUtils::ChangeShapeColor(connector, (*spos)->get_color());
+ }
Visio::IVCellPtr from_cell = connector->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginX];
if(get_shape_type(shape) == ST_MSC_CONDITION)
{
@@ -817,7 +853,7 @@
{
to_cell->GlueToPos(successor_shape, 0.5, 1.0);
}
-
+
// add successors of this node to the stack
// note: std::list<>::push_back doesn't invalidate iterators
push_back_if_unique<HMscNodePtr>(node_stack, successor_node);
@@ -860,6 +896,10 @@
default: throw std::runtime_error("Error: unexpected behaviour");
}
// CShapeUtils::MarkShape(commentShape);
+ if(reference_node->get_marked() == NONE)
+ {
+ CShapeUtils::ChangeShapeColor(commentShape, reference_node->get_color());
+ }
}
}
}
Modified: trunk/src/view/visio/addon/visualize.h
===================================================================
--- trunk/src/view/visio/addon/visualize.h 2013-11-28 23:27:31 UTC (rev 1877)
+++ trunk/src/view/visio/addon/visualize.h 2013-12-05 14:13:49 UTC (rev 1878)
@@ -90,7 +90,11 @@
case REMOVED: CShapeUtils::MarkShape(result, SC_RED); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
-
+ if(comment->get_marked() == NONE)
+ {
+ CShapeUtils::ChangeShapeColor(result, comment->get_color());
+ }
+
return result;
}
@@ -110,6 +114,10 @@
case NOT_FULL_COVER: CShapeUtils::MarkShape(result, SC_BLUE); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
+ if(at->get_marked() == NONE)
+ {
+ CShapeUtils::ChangeShapeColor(result, at->get_color());
+ }
return result;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xb...@us...> - 2013-11-28 23:27:34
|
Revision: 1877
http://sourceforge.net/p/scstudio/code/1877
Author: xborza
Date: 2013-11-28 23:27:31 +0000 (Thu, 28 Nov 2013)
Log Message:
-----------
ordering arrow repaint correction
Modified Paths:
--------------
trunk/src/view/visio/addon/extract.cpp
Modified: trunk/src/view/visio/addon/extract.cpp
===================================================================
--- trunk/src/view/visio/addon/extract.cpp 2013-11-28 12:18:20 UTC (rev 1876)
+++ trunk/src/view/visio/addon/extract.cpp 2013-11-28 23:27:31 UTC (rev 1877)
@@ -662,7 +662,7 @@
}
TShapeType line_type = get_shape_type(line);
- if(line_type == ST_BMSC_ORDER_LINE)
+ if(line_type == ST_BMSC_ORDER_LINE || line_type == ST_BMSC_ORDER_ARROW)
{
// the position is determined from the X coordinate
if(pos1.m_x < pos2.m_x)
@@ -676,7 +676,7 @@
shapelist() << line);
}
}
- else if(line_type == ST_BMSC_ORDER_ARROW)
+ /*else if(line_type == ST_BMSC_ORDER_ARROW)
{
// the position is determined from the arrow
if(connect1->FromPart == visBegin && connect2->FromPart == visEnd)
@@ -691,7 +691,7 @@
<< "Cannot determine event order.",
shapelist() << line);
}
- }
+ }*/
else
{
// this should never happen
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xm...@us...> - 2013-11-28 12:18:23
|
Revision: 1876
http://sourceforge.net/p/scstudio/code/1876
Author: xmalota
Date: 2013-11-28 12:18:20 +0000 (Thu, 28 Nov 2013)
Log Message:
-----------
time shapes are automatically disconnected from unfitting shapes, also bug with end point of absolute time removed
Modified Paths:
--------------
trunk/src/view/visio/addon/timeSnapping.cpp
Modified: trunk/src/view/visio/addon/timeSnapping.cpp
===================================================================
--- trunk/src/view/visio/addon/timeSnapping.cpp 2013-11-28 11:23:22 UTC (rev 1875)
+++ trunk/src/view/visio/addon/timeSnapping.cpp 2013-11-28 12:18:20 UTC (rev 1876)
@@ -31,7 +31,6 @@
switch(get_shape_type(shape))
{
case ST_HMSC_REFERENCE:
- case ST_MSC_CONDITION:
case ST_BMSC_MESSAGE:
case ST_BMSC_MESSAGE_FOUND:
case ST_BMSC_MESSAGE_LOST:
@@ -67,19 +66,38 @@
{
pointX = CShapeUtils::getShapeCell(timeShape, "BeginX");
pointY = CShapeUtils::getShapeCell(timeShape, "BeginY");
+
+ switch(get_shape_type(to))
+ {
+ case ST_MSC_CONDITION:
+ pointY -= 1;
+ break;
+ case ST_HMSC_CONNECTION:
+ pointY -= 1;
+ }
}
else
{
pointX = CShapeUtils::getShapeCell(timeShape, "EndX");
pointY = CShapeUtils::getShapeCell(timeShape, "EndY");
+
+ switch(get_shape_type(to))
+ {
+ case ST_MSC_CONDITION:
+ pointY += 1;
+ break;
+ case ST_HMSC_CONNECTION:
+ pointY += 1;
+ break;
+ }
}
switch(get_shape_type(to))
{
case ST_HMSC_START:
- pointY -= 5;
+ pointY -= 1;
break;
case ST_HMSC_END:
- pointY += 5;
+ pointY += 1;
break;
}
if(begin)
@@ -100,20 +118,18 @@
if(!timeShape)
return;
- bool interval = get_shape_type(timeShape) == ST_TIME_INTERVAL;
-
+ bool interval;
+ interval = get_shape_type(timeShape) == ST_TIME_INTERVAL;
+ //Both shapes has begin and end connection points
//Check if shape is already connected
Visio::IVConnectsPtr connects = timeShape->Connects;
- Visio::IVCellPtr beginCell = timeShape->GetCells("BeginX");
- Visio::IVCellPtr endCell;
+ Visio::IVCellPtr beginCell, endCell;
+ beginCell = timeShape->GetCells("BeginX");
+ endCell = timeShape->GetCells("EndX");
+
bool badBegin = true, badEnd = true;
- if(interval)
- {
- endCell = timeShape->GetCells("EndX");
- }
-
Visio::IVCellPtr from;
for (int i=connects->Count; i>0; --i)
@@ -134,20 +150,17 @@
}
continue;
}
- if(interval)
+ if(_tcsicmp(from->Name, endCell->Name) == 0)
{
- if(_tcsicmp(from->Name, endCell->Name) == 0)
+ if (isTimeAcceptingShape(connShape))
{
- if (isTimeAcceptingShape(connShape))
- {
- badEnd = false;
- }
- else
- {
- //unglue shape
- disconnectShape(timeShape,false,connShape);
- }
+ badEnd = false;
}
+ else
+ {
+ //unglue shape
+ disconnectShape(timeShape,false,connShape);
+ }
}
}
@@ -160,13 +173,9 @@
//get time shape coordinates
beginX = CShapeUtils::getShapeCell(timeShape, "BeginX");
beginY = CShapeUtils::getShapeCell(timeShape, "BeginY");
+ endX = CShapeUtils::getShapeCell(timeShape, "EndX");
+ endY = CShapeUtils::getShapeCell(timeShape, "EndY");
- if(interval)
- {
- endX = CShapeUtils::getShapeCell(timeShape, "EndX");
- endY = CShapeUtils::getShapeCell(timeShape, "EndY");
- }
-
std::pair<double,Visio::IVCellPtr> closestBegin, closestEnd;
closestBegin.first = 0;
closestBegin.second = NULL;
@@ -185,12 +194,6 @@
connectionDownX = CShapeUtils::getShapeCell(*it, "PinX");
connectionDownY = CShapeUtils::getShapeCell(*it, "PinY") - CShapeUtils::getShapeCell(*it, "Height")/2;
break;
- case ST_MSC_CONDITION:
- connectionUpX = CShapeUtils::getShapeCell(*it, "PinX");
- connectionUpY = CShapeUtils::getShapeCell(*it, "PinY") + CShapeUtils::getShapeCell(*it, "Width")/2;
- connectionDownX = CShapeUtils::getShapeCell(*it, "PinX");
- connectionDownY = CShapeUtils::getShapeCell(*it, "PinY") - CShapeUtils::getShapeCell(*it, "Width")/2;
- break;
case ST_BMSC_MESSAGE:
connectionUpX = CShapeUtils::getShapeCell(*it, "BeginX");
connectionUpY = CShapeUtils::getShapeCell(*it, "BeginY");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xm...@us...> - 2013-11-28 11:23:25
|
Revision: 1875
http://sourceforge.net/p/scstudio/code/1875
Author: xmalota
Date: 2013-11-28 11:23:22 +0000 (Thu, 28 Nov 2013)
Log Message:
-----------
removed bug with connection points on HMSC connection point
Modified Paths:
--------------
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-11-27 22:59:00 UTC (rev 1874)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-11-28 11:23:22 UTC (rev 1875)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='950BEE75A7B469162F64760C75BE08145B75FB6CCD000567483C212C63F8B9B7F7C339EC353A48DB6EBE0BE34F2F1FF4E98BFC0C6BA8381F9C430FDAE3272240' start='190' metric='0' DocLangID='1029' buildnum='4518' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>806228390</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-11-20T12:25:30</TimeSaved><TimeEdited>2013-11-20T12:25:17</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1029</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1029</LangID></Char><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout></StyleSheet><StyleSheet ID='6' NameU='Basic' Name='Basic' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign F='Inh'>1</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='7' NameU='Visio 00' Name='Visio 00' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='HSL(0,0,0)'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='HSL(144,116,225)'>#e8eef7</FillForegnd><FillBkgnd F='HSL(144,106,193)'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='HSL(144,116,125)'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='8' NameU='Connector' Name='Connector' LineStyle='9' FillStyle='9' TextStyle='9'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>0</FillForegnd><FillBkgnd F='Inh'>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin Unit='PT' F='Inh'>0.05555555555555555</TopMargin><BottomMargin Unit='PT' F='Inh'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd>2</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='9' NameU='Visio 90' Name='Visio 90' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd>0</FillForegnd><FillBkgnd>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='10' NameU='Callout' Name='Callout' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet></StyleSheets><DocumentSheet NameU='TheDoc' Name='TheDoc' LineStyle='0' FillStyle='0' TextStyle='0'><DocProps><OutputFormat>0</OutputFormat><LockPreview>0</LockPreview><AddMarkup>0</AddMarkup><ViewMarkup>0</ViewMarkup><PreviewQuality>0</PreviewQuality><PreviewScope>1</PreviewScope><DocLangID>1029</DocLangID></DocProps></DocumentSheet><Masters><Master ID='0' NameU='Connection Point' Name='Connection Point' Prompt='' IconSize='1' AlignName='2' MatchByName='0' IconUpdate='0' UniqueID='{0102DF4B-0000-0000-8E40-00608CF305B2}' BaseID='{064F35E2-6C39-464C-B35F-F08A8DBDE3F3}' PatternFlags='0' Hidden='0'><PageSheet LineStyle='0' FillStyle='0' TextStyle='0'><PageProps><PageWidth>0.1968503937007888</PageWidth><PageHeight>0.1968503937007888</PageHeight><ShdwOffsetX Unit='IN'>0.125</ShdwOffsetX><ShdwOffsetY Unit='IN'>-0.125</ShdwOffsetY><PageScale Unit='MM'>0.03937007874015748</PageScale><DrawingScale Unit='MM'>0.03937007874015748</DrawingScale><DrawingSizeType>4</DrawingSizeType><DrawingScaleType>0</DrawingScaleType><InhibitSnap>0</InhibitSnap><UIVisibility>0</UIVisibility><ShdwType>0</ShdwType><ShdwObliqueAngle>0</ShdwObliqueAngle><ShdwScaleFactor>1</ShdwScaleFactor></PageProps><v14:PageProps xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:DrawingResizeType>1</v14:DrawingResizeType></v14:PageProps></PageSheet><Shapes><Shape ID='5' NameU='Circle' Name='Connection Point' Type='Shape' LineStyle='6' FillStyle='6' TextStyle='6'><XForm><PinX>0.09842519685039441</PinX><PinY>0.09842519685039441</PinY><Width>0.1968503937007888</Width><Height>0.1968503937007888</Height><LocPinX F='Width*0.5'>0.0984251968503944</LocPinX><LocPinY F='Height*0.5'>0.0984251968503944</LocPinY><Angle Unit='DEG'>0</Angle><FlipX>0</FlipX><FlipY>0</FlipY><ResizeMode>0</ResizeMode></XForm><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='RUNADDONWARGS("Sequence Chart Studio","/event=100")'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Fill><FillForegnd>1</FillForegnd><FillBkgnd F='Inh'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextXForm><TxtPinX F='Width*0.5'>0.0984251968503944</TxtPinX><TxtPinY F='Height*0.5'>0.0984251968503944</TxtPinY><TxtWidth F='Width*0.875'>0.1722440944881902</TxtWidth><TxtHeight F='Height*0.75'>0.1476377952755916</TxtHeight><TxtLocPinX F='TxtWidth*0.5'>0.0861220472440951</TxtLocPinX><TxtLocPinY F='TxtHeight*0.5'>0.0738188976377958</TxtLocPinY><TxtAngle>0</TxtAngle></TextXForm><Protection><LockWidth F='Inh'>0</LockWidth><LockHeight F='Inh'>0</LockHeight><LockMoveX F='Inh'>0</LockMoveX><LockMoveY F='Inh'>0</LockMoveY><LockAspect>1</LockAspect><LockDelete F='Inh'>0</LockDelete><LockBegin F='Inh'>0</LockBegin><LockEnd F='Inh'>0</LockEnd><LockRotate>1</LockRotate><LockCrop F='Inh'>0</LockCrop><LockVtxEdit F='Inh'>0</LockVtxEdit><LockTextEdit>1</LockTextEdit><LockFormat F='Inh'>0</LockFormat><LockGroup F='Inh'>0</LockGroup><LockCalcWH F='Inh'>0</LockCalcWH><LockSelect F='Inh'>0</LockSelect><LockCustProp F='Inh'>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat F='Inh'>0</vx:LockFromGroupFormat><vx:LockThemeColors F='Inh'>0</vx:LockThemeColors><vx:LockThemeEffects F='Inh'>0</vx:LockThemeEffects></vx:Protection><Help><HelpTopic V='null'/><Copyright>See http://scstudio.sourceforge.net</Copyright></Help><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting F='Inh'>0</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType>8</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID>1033</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX F='Inh'>0</ShapePermeableX><ShapePermeableY F='Inh'>0</ShapePermeableY><ShapePermeablePlace F='Inh'>0</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit>1</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><User NameU='visVersion' ID='2'><Value>11</Value><Prompt F='No Formula'/></User><User NameU='mscSymbol' ID='3'><Value Unit='STR'>hmsc.connection</Value><Prompt F='No Formula'/></User><Connection IX='0'><X F='Width*0.5'>0.0984251968503944</X><Y F='Height*0'>0</Y><DirX>0</DirX><DirY Unit='MM'>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='1'><X F='Width*0'>0</X><Y F='Height*0.5'>0.0984251968503944</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='2'><X F='Width*1'>0.1968503937007888</X><Y F='Height*0.5'>0.0984251968503944</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='3'><X F='Width*0.5'>0.0984251968503944</X><Y F='Height*1'>0.1968503937007888</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Geom IX='0'><NoFill>0</NoFill><NoLine>0</NoLine><NoShow>0</NoShow><NoSnap>1</NoSnap><MoveTo IX='1'><X F='Width*0'>0</X><Y F='Height*0.5'>0.0984251968503944</Y></MoveTo><EllipticalArcTo IX='2'><X F='Width*1'>0.1968503937007888</X><Y F='Height*0.5'>0.0984251968503944</Y><A Unit='DL' F='Width*0.5'>0.0984251968503944</A><B Unit='DL' F='Height*1'>0.1968503937007888</B><C Unit='DA'>0</C><D F='Width/Height*1'>1</D></EllipticalArcTo><EllipticalArcTo IX='3'><X F='Geometry1.X1'>0</X><Y F='Geometry1.Y1'>0.0984251968503944</Y><A Unit='DL' F='Width*0.5'>0.0984251968503944</A><B Unit='DL' F='Height*0'>0</B><C Unit='DA'>0</C><D F='Width/Height*1'>1</D></EllipticalArcTo></Geom><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout><v14:Geom IX='0' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:NoQuickDrag F='No Formula'>0</v14:NoQuickDrag></v14:Geom></Shape></Shapes><Icon>
+<VisioDocument key='4A84CE0E6985FB77D5BB66C65CCC78BAA480301653F3144FFBAD19F6F9E1BBB9DE685214277F4D1992F667765E7A59B1FD960C26034C941556801AB68568A994' start='190' metric='0' DocLangID='1029' buildnum='4518' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>806228390</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-11-28T12:15:28</TimeSaved><TimeEdited>2013-11-28T12:14:48</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1029</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1029</LangID></Char><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout></StyleSheet><StyleSheet ID='6' NameU='Basic' Name='Basic' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>...
[truncated message content] |
|
From: <xb...@us...> - 2013-11-27 22:59:03
|
Revision: 1874
http://sourceforge.net/p/scstudio/code/1874
Author: xborza
Date: 2013-11-27 22:59:00 +0000 (Wed, 27 Nov 2013)
Log Message:
-----------
multiple events, ordering lines in coregion repaint..
Modified Paths:
--------------
trunk/src/view/visio/addon/extract.cpp
trunk/src/view/visio/addon/extract.h
trunk/src/view/visio/addon/shapeutils.cpp
trunk/src/view/visio/addon/shapeutils.h
trunk/src/view/visio/addon/visualize.cpp
Modified: trunk/src/view/visio/addon/extract.cpp
===================================================================
--- trunk/src/view/visio/addon/extract.cpp 2013-11-26 14:27:03 UTC (rev 1873)
+++ trunk/src/view/visio/addon/extract.cpp 2013-11-27 22:59:00 UTC (rev 1874)
@@ -20,6 +20,7 @@
#include <set>
#include "extract.h"
#include "errors.h"
+#include "shapeutils.h"
void RemoveKnownSymbols(Visio::IVPagePtr page)
{
@@ -343,10 +344,44 @@
return result;
}
-CDrawingExtractor::SPoint
-CDrawingExtractor::point_to_page(Visio::IVShapePtr shape, const CDrawingExtractor::SPoint& point)
+CDrawingExtractor::SPoint CDrawingExtractor::get_conpoint_order(Visio::IVShapePtr coregion,Visio::IVConnectPtr connect)
{
SPoint result; // [visio internal units]
+ //get message shape, to which order elements is connected
+ Visio::IVShapePtr msg = connect->ToSheet;
+ TShapeType type = get_shape_type(msg);
+ if(type != ST_BMSC_MESSAGE && type != ST_BMSC_MESSAGE_FOUND && type != ST_BMSC_MESSAGE_LOST)
+ {
+ //something is wrong
+ return result;
+ }
+
+ short cellrow = 0;
+ //go through fromConnects and check
+ for(int i=1; i <= msg->Connects->Count; i++)
+ {
+ Visio::IVConnectPtr con = msg->Connects->Item[i];
+
+ if(con->ToSheet->ID == coregion->ID)
+ {
+ cellrow = con->ToCell->Row;
+ break;
+ }
+ }
+
+ result.m_x = coregion->CellsSRC[visSectionConnectionPts][cellrow][visX]->Result[0];
+ result.m_y = coregion->CellsSRC[visSectionConnectionPts][cellrow][visY]->Result[0];
+
+ result.m_from_id = connect->FromSheet->ID;
+ result.m_to_id = coregion->ID;
+
+ return result;
+}
+
+
+CDrawingExtractor::SPoint CDrawingExtractor::point_to_page(Visio::IVShapePtr shape, const CDrawingExtractor::SPoint& point)
+{
+ SPoint result; // [visio internal units]
shape->XYToPage(point.m_x, point.m_y, &result.m_x, &result.m_y);
return result;
@@ -423,6 +458,27 @@
{
case ST_BMSC_MESSAGE:
{
+ //check for ordering elements
+ for(int i = 1; i <= shape->FromConnects->Count; i++)
+ {
+ Visio::IVConnectPtr connect = shape->FromConnects->Item[i];
+ // shape connected to this point
+ Visio::IVShapePtr shp = connect->FromSheet;
+ // connect the message
+ TShapeType type = get_shape_type(shp);
+ if(type == ST_BMSC_ORDER_LINE || type == ST_BMSC_ORDER_ARROW)
+ {
+ //check if the ordering Arrow/Line lies in THIS coregion
+ MscPoint order_point;
+ order_point.set_x(CShapeUtils::getShapeCell(shp, "BeginX"));
+ order_point.set_y(CShapeUtils::getShapeCell(shp, "BeginY"));
+ if(CShapeUtils::isPointOnCoregionSide(order_point,coregion))
+ {
+ relations.insert(shp->ID);
+ }
+ }
+ }
+
CompleteMessagePtr message = find_element<CompleteMessage>(elements, shape->ID);
if(message == NULL)
continue;
@@ -451,6 +507,29 @@
case ST_BMSC_MESSAGE_LOST:
{
+ //check for ordering elements
+ for(int i = 1; i <= shape->FromConnects->Count; i++)
+ {
+ Visio::IVConnectPtr connect = shape->FromConnects->Item[i];
+ // shape connected to this point
+ Visio::IVShapePtr shp = connect->FromSheet;
+ // connect the message
+ TShapeType type = get_shape_type(shp);
+ if(type == ST_BMSC_ORDER_LINE || type == ST_BMSC_ORDER_ARROW)
+ {
+ //check if the ordering Arrow/Line lies in THIS coregion
+ MscPoint order_point;
+ order_point.set_x(CShapeUtils::getShapeCell(shp, "BeginX"));
+ order_point.set_y(CShapeUtils::getShapeCell(shp, "BeginY"));
+ if(CShapeUtils::isPointOnCoregionSide(order_point,coregion))
+ {
+ relations.insert(shp->ID);
+ }
+ }
+ }
+
+
+ //
IncompleteMessagePtr message = find_element<IncompleteMessage>(elements, shape->ID);
if(message == NULL)
continue;
@@ -472,6 +551,26 @@
}
case ST_BMSC_MESSAGE_FOUND:
{
+ //check for ordering elements
+ for(int i = 1; i <= shape->FromConnects->Count; i++)
+ {
+ Visio::IVConnectPtr connect = shape->FromConnects->Item[i];
+ // shape connected to this point
+ Visio::IVShapePtr shp = connect->FromSheet;
+ // connect the message
+ TShapeType type = get_shape_type(shp);
+ if(type == ST_BMSC_ORDER_LINE || type == ST_BMSC_ORDER_ARROW)
+ {
+ //check if the ordering Arrow/Line lies in THIS coregion
+ MscPoint order_point;
+ order_point.set_x(CShapeUtils::getShapeCell(shp, "BeginX"));
+ order_point.set_y(CShapeUtils::getShapeCell(shp, "BeginY"));
+ if(CShapeUtils::isPointOnCoregionSide(order_point,coregion))
+ {
+ relations.insert(shp->ID);
+ }
+ }
+ }
IncompleteMessagePtr message = find_element<IncompleteMessage>(elements, shape->ID);
if(message == NULL)
continue;
@@ -545,9 +644,11 @@
}
Visio::IVConnectPtr connect1 = line->Connects->Item[1];
- SPoint pos1 = get_connect_point(connect1);
+ SPoint pos1 = get_conpoint_order(coregion,connect1);
+ //SPoint pos1 = get_connect_point(connect1);
Visio::IVConnectPtr connect2 = line->Connects->Item[2];
- SPoint pos2 = get_connect_point(connect2);
+ SPoint pos2 = get_conpoint_order(coregion,connect2);
+ //SPoint pos2 = get_connect_point(connect2);
TCoregionEvents::const_iterator event1 = coregion_events.find(pos1);
TCoregionEvents::const_iterator event2 = coregion_events.find(pos2);
@@ -937,23 +1038,42 @@
}
// check for collisional shapes
- for(TEventSet::iterator epos = strict_events.begin();
- epos != strict_events.end(); epos = strict_events.upper_bound(*epos))
+ // check for multiple events
+ struct classcomp {
+
+ bool operator() (const SStrictOrder& s1, const SStrictOrder& s2) const
+ {
+ int cres = fcmp(s1.event_height, s2.event_height);
+ // no other connection allowed with coregion begin/end
+ if(s1.shape_type == ST_BMSC_COREGION || s2.shape_type == ST_BMSC_COREGION)
+ return cres < 0;
+ // old event < new event, incoming event == outgoing event ONLY FOR MULTIPLE EVENTS CHECK
+ return cres < 0;
+ }
+ };
+
+ typedef std::multiset<SStrictOrder,classcomp> TMultiEventSet;
+ TMultiEventSet multi_events;
+ multi_events.insert(strict_events.begin(),strict_events.end());
+
+ for(TMultiEventSet::iterator epos = multi_events.begin();
+ epos != multi_events.end(); epos = multi_events.upper_bound(*epos))
{
- if(strict_events.count(*epos) > 1)
+ if(multi_events.count(*epos) > 1)
{
shapelist this_shapelist;
- std::pair<TEventSet::iterator, TEventSet::iterator> collision =
- strict_events.equal_range(*epos);
- for(TEventSet::iterator cpos = collision.first;
+ std::pair<TMultiEventSet::iterator, TMultiEventSet::iterator> collision =
+ multi_events.equal_range(*epos);
+ for(TMultiEventSet::iterator cpos = collision.first;
cpos != collision.second; cpos++)
{
this_shapelist << vsoPage->Shapes->ItemFromID[cpos->shape_id];
}
- PrintError(stringize() << page_name << ": " << "Multiple events cannot be attached to one point.",
- this_shapelist << instance);
+ PrintError(stringize() << page_name << ": "
+ << "Multiple events cannot be attached to one point.",
+ this_shapelist << instance);
}
}
Modified: trunk/src/view/visio/addon/extract.h
===================================================================
--- trunk/src/view/visio/addon/extract.h 2013-11-26 14:27:03 UTC (rev 1873)
+++ trunk/src/view/visio/addon/extract.h 2013-11-27 22:59:00 UTC (rev 1874)
@@ -135,6 +135,10 @@
//! get coordinates of the given Connect element
SPoint get_connect_point(Visio::IVConnectPtr connect);
+
+ // get coordinates of the given element, use only for order elements (line,arrow)
+ SPoint get_conpoint_order(Visio::IVShapePtr coregion, Visio::IVConnectPtr connect);
+
SPoint point_to_page(Visio::IVShapePtr shape, const SPoint& point);
Coordinate ConvertCoordinate(Visio::IVShapePtr shape, double val) const
Modified: trunk/src/view/visio/addon/shapeutils.cpp
===================================================================
--- trunk/src/view/visio/addon/shapeutils.cpp 2013-11-26 14:27:03 UTC (rev 1873)
+++ trunk/src/view/visio/addon/shapeutils.cpp 2013-11-27 22:59:00 UTC (rev 1874)
@@ -20,6 +20,65 @@
#include "visualize.h"
#include "enumerateUtils.h"
+void CShapeUtils::GlueBeginConector(Visio::IVShapePtr connector, Visio::IVShapePtr coreg, const MscPoint& point)
+{
+ double pos_x=0, pos_y = 0;
+ short row_index = 0;
+ // check all messages on coregion, whether they are
+ for(int i=1; i <= coreg->FromConnects->Count;i++)
+ {
+ Visio::IVConnectPtr connect = coreg->FromConnects->Item[i];
+ // shape connected to this point
+ Visio::IVShapePtr shp = connect->FromSheet;
+
+ TShapeType type = get_shape_type(shp);
+ if((type == ST_BMSC_MESSAGE || type == ST_BMSC_MESSAGE_FOUND ||
+ type == ST_BMSC_MESSAGE_LOST) && get_shape_type(connect->ToSheet) == ST_BMSC_COREGION)
+ {
+ row_index = connect->ToCell->ContainingRow->Index;
+ pos_x = coreg->CellsSRC[visSectionConnectionPts][row_index][visX]->Result[70];
+ pos_y = coreg->CellsSRC[visSectionConnectionPts][row_index][visY]->Result[70];
+ if(fabs(pos_x - point.get_y()) < 0.01 && fabs(pos_y - point.get_x()) < 0.01)
+ {
+ // get cell from connector
+ Visio::IVCellPtr cell = connector->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginX];
+ cell->GlueTo(connect->FromCell);
+ break;
+ }
+ }
+ }
+}
+
+void CShapeUtils::GlueEndConector(Visio::IVShapePtr connector, Visio::IVShapePtr coreg, const MscPoint& point)
+{
+ double pos_x=0, pos_y = 0;
+ short row_index = 0;
+ // check all messages on coregion, whether they are
+ for(int i=1; i <= coreg->FromConnects->Count;i++)
+ {
+ Visio::IVConnectPtr connect = coreg->FromConnects->Item[i];
+ // shape connected to this point
+ Visio::IVShapePtr shp = connect->FromSheet;
+
+ TShapeType type = get_shape_type(shp);
+ if((type == ST_BMSC_MESSAGE || type == ST_BMSC_MESSAGE_FOUND ||
+ type == ST_BMSC_MESSAGE_LOST) && get_shape_type(connect->ToSheet) == ST_BMSC_COREGION)
+ {
+ row_index = connect->ToCell->ContainingRow->Index;
+ pos_x = coreg->CellsSRC[visSectionConnectionPts][row_index][visX]->Result[70];
+ pos_y = coreg->CellsSRC[visSectionConnectionPts][row_index][visY]->Result[70];
+ if(fabs(pos_x - point.get_y()) < 0.01 && fabs(pos_y - point.get_x()) < 0.01)
+ {
+ // get cell from connector
+ Visio::IVCellPtr cell = connector->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndX];
+ cell->GlueTo(connect->FromCell);
+ break;
+ }
+ }
+ }
+}
+
+
void CShapeUtils::GlueBeginToPos(Visio::IVShapePtr what, Visio::IVShapePtr where, const MscPoint& pos)
{
double height = where->CellsSRC[visSectionObject][visRowXFormOut][visXFormHeight]->Result[visMillimeters];
@@ -296,6 +355,29 @@
return false;
}
+bool CShapeUtils::isPointOnCoregionSide(const MscPoint& point, Visio::IVShapePtr coregShape)
+{
+ double coregBegX, coregEndX, coregBegY, coregEndY;
+
+ double dif = CShapeUtils::getCoregionHeight(coregShape);
+ coregBegX = CShapeUtils::getShapeCell(coregShape, "BeginX") - dif;
+ coregEndX = CShapeUtils::getShapeCell(coregShape, "EndX") + dif;
+ coregBegY = CShapeUtils::getShapeCell(coregShape, "BeginY");
+ coregEndY = CShapeUtils::getShapeCell(coregShape, "EndY");
+
+ //check if MscPoint lies on one of the coregion's sides
+ bool x_coordinate = false, y_coordinate = false;
+ x_coordinate = fabs(point.get_x() - coregBegX) < 0.01 || fabs(point.get_x() - coregEndX) < 0.01;
+ y_coordinate = point.get_y() <= coregBegY && point.get_y() >= coregEndY;
+
+ if(x_coordinate && y_coordinate)
+ return true;
+
+ return false;
+}
+
+
+
bool CShapeUtils::isPointOnCoregion(const MscPoint& point, Visio::IVShapePtr instShape)
{
double coregBegX, coregEndX, coregBegY, coregEndY;
Modified: trunk/src/view/visio/addon/shapeutils.h
===================================================================
--- trunk/src/view/visio/addon/shapeutils.h 2013-11-26 14:27:03 UTC (rev 1873)
+++ trunk/src/view/visio/addon/shapeutils.h 2013-11-27 22:59:00 UTC (rev 1874)
@@ -42,6 +42,9 @@
static void GlueBeginToShape(Visio::IVShapePtr what, Visio::IVShapePtr where);
static void GlueEndToPos(Visio::IVShapePtr what, Visio::IVShapePtr where, const MscPoint& pos);
+ static void GlueBeginConector(Visio::IVShapePtr connector, Visio::IVShapePtr coreg, const MscPoint& point);
+ static void GlueEndConector(Visio::IVShapePtr connector, Visio::IVShapePtr coreg, const MscPoint& point);
+
/**
* Marking, unmarking shapes
*
@@ -75,6 +78,11 @@
static bool isPointInCoregionArea(const MscPoint& point, Visio::IVShapePtr instShape);
/**
+ * Check if point lies on some side of given coregion
+ */
+ static bool isPointOnCoregionSide(const MscPoint& point, Visio::IVShapePtr coregShape);
+
+ /**
*
*/
static bool isPointOnInstancesLine(const MscPoint& point, Visio::IVShapePtr instShape,VisUnitCodes units = visPageUnits);
Modified: trunk/src/view/visio/addon/visualize.cpp
===================================================================
--- trunk/src/view/visio/addon/visualize.cpp 2013-11-26 14:27:03 UTC (rev 1873)
+++ trunk/src/view/visio/addon/visualize.cpp 2013-11-27 22:59:00 UTC (rev 1874)
@@ -408,8 +408,8 @@
else
connector = vsoPage->Drop(find_master(ST_BMSC_ORDER_LINE), 0, 0);
- CShapeUtils::GlueBeginToPos(connector, parent, pred_event->get_position());
- CShapeUtils::GlueEndToPos(connector, parent, succ_event->get_position());
+ CShapeUtils::GlueBeginConector(connector, parent, pred_event->get_position());
+ CShapeUtils::GlueEndConector(connector, parent, succ_event->get_position());
// events are on the same side
if(fcmp(pred_event->get_position().get_x(), succ_event->get_position().get_x()) == 0)
@@ -609,7 +609,20 @@
for(CoregEventRelPtrVector::const_iterator spos = rels.begin(); spos != rels.end(); spos++)
{
EventPtr successor = (*spos)->get_successor();
+ // add successors of this event to the stack
+ // note: std::list<>::push_back doesn't invalidate iterators
+ push_back_if_unique<EventPtr>(event_stack, successor);
+ }
+ }
+ //create connections as ordering lines and arrows
+ for(EventPtrList::const_iterator epos = event_stack.begin(); epos != event_stack.end(); epos++)
+ {
+ CoregEventRelPtrVector rels = coregion_area->get_successor_rels(epos->get());
+ for(CoregEventRelPtrVector::const_iterator spos = rels.begin(); spos != rels.end(); spos++)
+ {
+ EventPtr successor = (*spos)->get_successor();
+
Visio::IVShapePtr connector = connect_events(vsoPage, coregion, *epos, successor);
switch((*spos)->get_marked())
@@ -620,10 +633,6 @@
case REMOVED: CShapeUtils::MarkShape(connector, SC_RED); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
-
- // add successors of this event to the stack
- // note: std::list<>::push_back doesn't invalidate iterators
- push_back_if_unique<EventPtr>(event_stack, successor);
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2013-11-26 14:27:09
|
Revision: 1873
http://sourceforge.net/p/scstudio/code/1873
Author: xfarmad
Date: 2013-11-26 14:27:03 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
--- developing under Visual studio 2010
Modified Paths:
--------------
trunk/src/view/visio/scstudio.nsi
trunk/src/view/visio/scstudio.sln
Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi 2013-11-26 14:24:58 UTC (rev 1872)
+++ trunk/src/view/visio/scstudio.nsi 2013-11-26 14:27:03 UTC (rev 1873)
@@ -211,7 +211,7 @@
SetOutPath $INSTDIR\bin
File "addon\${BUILD_TYPE}\scstudio.vsl"
- File "addon\${BUILD_TYPE}\scstudio.vsl.intermediate.manifest"
+ File "addon\${BUILD_TYPE}\scstudio.dll.intermediate.manifest"
;File "addon\Release\scstudio.vsl.intermediate.manifest"
;File "..\..\..\doc\help\scstudio.chm"
File "..\..\..\${BUILD_TYPE}\*.dll"
Modified: trunk/src/view/visio/scstudio.sln
===================================================================
--- trunk/src/view/visio/scstudio.sln 2013-11-26 14:24:58 UTC (rev 1872)
+++ trunk/src/view/visio/scstudio.sln 2013-11-26 14:27:03 UTC (rev 1873)
@@ -1,9 +1,9 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scstudio", "addon\scstudio.vcproj", "{0E00282C-F48B-4984-A274-5B59E1E2AD49}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scstudio", "addon\scstudio.vcxproj", "{0E00282C-F48B-4984-A274-5B59E1E2AD49}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setup-nsis", "setup-nsis\setup-nsis.vcproj", "{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setup-nsis", "setup-nsis\setup-nsis.vcxproj", "{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2013-11-26 14:25:04
|
Revision: 1872
http://sourceforge.net/p/scstudio/code/1872
Author: xfarmad
Date: 2013-11-26 14:24:58 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
Modified Paths:
--------------
trunk/CHANGELOG
Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG 2013-11-23 12:37:37 UTC (rev 1871)
+++ trunk/CHANGELOG 2013-11-26 14:24:58 UTC (rev 1872)
@@ -7,11 +7,35 @@
$Date$, svn revision $Rev$
-* refactoring of internal structure (in progress)
+* refactoring of internal structure (done)
* extend import from Z120 by large numbers in time intervals e.g. 1e+10
* feature requests No. 41 solved (default option to the Import dialog)
* absolute time in time relevant ordering
+* common shapes in BMSC and HMSC can be used in both diagrams types
+* comment stretching fixed
+* coregion behavior improvment (resizing, message snapping, worng message
+connection bug fixed)
+* automatic message resnapping when a message is attached behind action or
+condition
+* action behavior improvment (resizing, message snapping, worng message
+connection bug fixed)
+* lost/found message shape behavior fixed (resizing)
+* automatic snapping of ordering element, behavior improvment (order's are
+moving with message which are attached to)
+* time interval united (now is only one time interval shape)
+* ordering arrow can now be attach only to event
+* bug No. 88 fixed : more ordering arrow on coregion
+* orders names changed
+* no text on ordering shapes
+* ordering arrow automaticly change direction of its arrow
+* hmsc connection shape behavior improvment
+* hmsc connection arraw shape automatic snapping
+* bug No. 76,75,68,64,61,60,36,53,26,88,83,82,55,94 fixed
+* message automatic drawing behavior improvment (message interleaving not
+possible now)
+* feature requests No. 35,13 solved
+
######################
# Version 0.5.3
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xm...@us...> - 2013-11-23 12:37:40
|
Revision: 1871
http://sourceforge.net/p/scstudio/code/1871
Author: xmalota
Date: 2013-11-23 12:37:37 +0000 (Sat, 23 Nov 2013)
Log Message:
-----------
behavior of zoom when new page added changed, now is always 100 % instead of 40 or 45 % (previous behavior)
Modified Paths:
--------------
trunk/src/view/visio/addon/addon.cpp
Modified: trunk/src/view/visio/addon/addon.cpp
===================================================================
--- trunk/src/view/visio/addon/addon.cpp 2013-11-20 11:49:44 UTC (rev 1870)
+++ trunk/src/view/visio/addon/addon.cpp 2013-11-23 12:37:37 UTC (rev 1871)
@@ -675,6 +675,11 @@
Visio::IVShapePtr sheet = vsoPage->PageSheet;
//creates new section = action
sheet->AddSection((short)Visio::visSectionAction);
+
+ //seting of zoom to 100prc instead of some random visio value
+ sheet->GetDocument()->ZoomBehavior = Visio::visZoomVisioExact;
+ sheet->GetDocument()->GetApplication()->ActiveWindow->Zoom = 1.00;
+ sheet->GetDocument()->ZoomBehavior = Visio::visZoomNone;
//creates rows in action section where definition of context menu is stored
sheet->AddNamedRow((short)Visio::visSectionAction,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xm...@us...> - 2013-11-20 11:49:48
|
Revision: 1870
http://sourceforge.net/p/scstudio/code/1870
Author: xmalota
Date: 2013-11-20 11:49:44 +0000 (Wed, 20 Nov 2013)
Log Message:
-----------
connection arrow snapping in HMSC implemented, bug with comment removed
Modified Paths:
--------------
trunk/src/view/visio/addon/connectionArrowSnapping.cpp
trunk/src/view/visio/addon/connectionArrowSnapping.h
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
Modified: trunk/src/view/visio/addon/connectionArrowSnapping.cpp
===================================================================
--- trunk/src/view/visio/addon/connectionArrowSnapping.cpp 2013-11-08 16:22:38 UTC (rev 1869)
+++ trunk/src/view/visio/addon/connectionArrowSnapping.cpp 2013-11-20 11:49:44 UTC (rev 1870)
@@ -149,7 +149,6 @@
{
if(_tcsicmp(from->Name,_T("BeginX")) == 0)
{
- //decide which point is the most appropriate
from->GlueTo(to->GetCells("Connections.X1"));
}
if(_tcsicmp(from->Name,_T("EndX")) == 0)
@@ -195,14 +194,94 @@
}
+bool CConnectionArrowSnapping::shouldBeSnapped(double xPosition, double yPosition, Visio::IVShapePtr shapeToSnapped)
+{
+ double pinx, piny, width, height;
+ pinx = CShapeUtils::getShapeCell(shapeToSnapped, "PinX");
+ piny = CShapeUtils::getShapeCell(shapeToSnapped, "PinY");
+ width = CShapeUtils::getShapeCell(shapeToSnapped, "Width");
+ height = CShapeUtils::getShapeCell(shapeToSnapped, "Height");
+
+ if(((pinx-(width/2)) <= xPosition) && (xPosition <= (pinx+(width/2))))
+ {
+ if(((piny-(height/2)) <= yPosition) && (yPosition <= (piny+(height/2))))
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+Visio::IVCellPtr CConnectionArrowSnapping::getProperConnectionPoint(double xPosition, double yPosition, Visio::IVShapePtr shapeToSnapped)
+{
+ if(!shapeToSnapped || get_shape_type(shapeToSnapped) != ST_HMSC_CONNECTION)
+ return NULL;
+
+ double pinx, piny, width;
+ pinx = CShapeUtils::getShapeCell(shapeToSnapped, "PinX");
+ piny = CShapeUtils::getShapeCell(shapeToSnapped, "PinY");
+ width = CShapeUtils::getShapeCell(shapeToSnapped, "Width");
+
+ if(xPosition >= pinx + width/2)
+ return shapeToSnapped->GetCells("Connections.X3");
+ else if(xPosition <= pinx - width/2)
+ return shapeToSnapped->GetCells("Connections.X2");
+ else
+ return shapeToSnapped->GetCells("Connections.X1");
+}
+
void CConnectionArrowSnapping::snap(Visio::IVShapePtr connectionShape)
{
if(!connectionShape)
return;
- //Check if shape is already connected
+ Visio::IVCellPtr beginCell, endCell;
+ beginCell = connectionShape->GetCells("BeginX");
+ endCell = connectionShape->GetCells("EndX");
+
+ double beginCellX, beginCellY;
+ double endCellX, endCellY;
+
+ beginCellX = CShapeUtils::getShapeCell(connectionShape, "BeginX");
+ endCellX = CShapeUtils::getShapeCell(connectionShape, "EndX");
+ beginCellY = CShapeUtils::getShapeCell(connectionShape, "BeginY");
+ endCellY = CShapeUtils::getShapeCell(connectionShape, "EndY");
+
+ Visio::IVShapesPtr shapes;
+ shapes = connectionShape->ContainingPage->GetShapes();
+
+ if((_tcsicmp(beginCell->Name,_T("BeginX")) == 0) || (_tcsicmp(beginCell->Name,_T("EndX")) == 0))
+ {
+ //depends on the type of shape
+ for(int i=1; i<=shapes->Count; i++)
+ {
+ Visio::IVShapePtr shape = shapes->Item[i];
+ if(isHmscShape(shape))
+ {
+ if(shouldBeSnapped(beginCellX, beginCellY, shape))
+ {
+ if(get_shape_type(shape) == ST_HMSC_REFERENCE || get_shape_type(shape) == ST_MSC_CONDITION)
+ beginCell->GlueTo(shape->GetCells("Connections.X2"));
+ else if(get_shape_type(shape) == ST_HMSC_CONNECTION)
+ {
+ Visio::IVCellPtr connectionPoint = getProperConnectionPoint(endCellX, endCellY, shape);
+ if(connectionPoint)
+ beginCell->GlueTo(connectionPoint);
+ //beginCell->GlueTo(shape->GetCells("Connections.X1"));
+ }
+ else
+ beginCell->GlueTo(shape->GetCells("Connections.X1"));
+ }
+ if(shouldBeSnapped(endCellX, endCellY, shape))
+ {
+ endCell->GlueTo(shape->GetCells("Connections.X1"));
+ }
+ }
+ }
+ }
+
Visio::IVConnectsPtr connects = connectionShape->Connects;
- Visio::IVCellPtr beginCell = connectionShape->GetCells("BeginX"), endCell = connectionShape->GetCells("EndX");
for(int i=connects->Count; i>0; --i)
{
Modified: trunk/src/view/visio/addon/connectionArrowSnapping.h
===================================================================
--- trunk/src/view/visio/addon/connectionArrowSnapping.h 2013-11-08 16:22:38 UTC (rev 1869)
+++ trunk/src/view/visio/addon/connectionArrowSnapping.h 2013-11-20 11:49:44 UTC (rev 1870)
@@ -41,6 +41,14 @@
* connect connection arrow correctly to shape
*/
static void connectArrowCorretly(Visio::IVCellPtr from, Visio::IVShapePtr to);
+ /**
+ * check whether connection point occurs in the area of snapable shape
+ */
+ static bool shouldBeSnapped(double xPosition, double yPosition, Visio::IVShapePtr shape);
+ /**
+ * find the best connection point where connection arrow should be connected
+ */
+ static Visio::IVCellPtr getProperConnectionPoint(double xPosition, double yPosition, Visio::IVShapePtr shapeToSnapped);
public:
/**
* automatically snaps current connection shape to nearest HMSC shape
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2013-11-08 16:22:38 UTC (rev 1869)
+++ trunk/src/view/visio/addon/document.cpp 2013-11-20 11:49:44 UTC (rev 1870)
@@ -302,23 +302,28 @@
case ST_BMSC_ORDER_LINE:
case ST_BMSC_ORDER_ARROW:
// orderShape snapping
- posX = CShapeUtils::getShapeCell(vsoShape,"PinX");
+ posX = CShapeUtils::getShapeCell(vsoShape,"PinX");
posY = CShapeUtils::getShapeCell(vsoShape,"PinY");
COrderSnapping::snapToCoregEvents(vsoShape,posX,posY);
- break;
+ break;
case ST_COMMENT:
+ {
+ if(vsoShape->Text.length() == 0)
+ vsoShape->Text = _T("NAME");
+
+ //putting limits on the size of comment
+ Visio::IVCellPtr tmp;
+ tmp = vsoShape->GetCells("Height");
+ tmp->FormulaU = "BOUND(20 mm, 0, FALSE, 0.01 mm, 10000000 mm)";
+ }
+ break;
+
case ST_TEXT:
- {
- if(vsoShape->Text.length() == 0)
- vsoShape->Text = _T("NAME");
-
- //putting limits on the size of comment
- Visio::IVCellPtr tmp;
- tmp = vsoShape->GetCells("Height");
- tmp->FormulaU = "BOUND(20 mm, 0, FALSE, 0.01 mm, 10000000 mm)";
- break;
- }
+ if(vsoShape->Text.length() == 0)
+ vsoShape->Text = _T("NAME");
+ break;
+
case ST_HMSC_REFERENCE:
if(vsoShape->Text.length() == 0)
vsoShape->Text = _T("NAME");
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-11-08 16:22:38 UTC (rev 1869)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-11-20 11:49:44 UTC (rev 1870)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='D697245E5748EADF20CC9CC84813927D85ED4409401FDBFC4654D14A58BBC41F74C2AA2031422FAF64EBD33D134AD3A404E33035DE8AC38E1AD448A942E6EA85' start='190' metric='0' DocLangID='1029' buildnum='4518' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>806228390</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-10-30T10:22:40</TimeSaved><TimeEdited>2013-10-30T10:22:37</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1029</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1029</LangID></Char><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout></StyleSheet><StyleSheet ID='6' NameU='Basic' Name='Basic' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign F='Inh'>1</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='7' NameU='Visio 00' Name='Visio 00' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='HSL(0,0,0)'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='HSL(144,116,225)'>#e8eef7</FillForegnd><FillBkgnd F='HSL(144,106,193)'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='HSL(144,116,125)'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='8' NameU='Connector' Name='Connector' LineStyle='9' FillStyle='9' TextStyle='9'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>0</FillForegnd><FillBkgnd F='Inh'>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin Unit='PT' F='Inh'>0.05555555555555555</TopMargin><BottomMargin Unit='PT' F='Inh'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd>2</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='9' NameU='Visio 90' Name='Visio 90' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd>0</FillForegnd><FillBkgnd>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='10' NameU='Callout' Name='Callout' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet></StyleSheets><DocumentSheet NameU='TheDoc' Name='TheDoc' LineStyle='0' FillStyle='0' TextStyle='0'><DocProps><OutputFormat>0</OutputFormat><LockPreview>0</LockPreview><AddMarkup>0</AddMarkup><ViewMarkup>0</ViewMarkup><PreviewQuality>0</PreviewQuality><PreviewScope>1</PreviewScope><DocLangID>1029</DocLangID></DocProps></DocumentSheet><Masters><Master ID='0' NameU='Connection Point' Name='Connection Point' Prompt='' IconSize='1' AlignName='2' MatchByName='0' IconUpdate='0' UniqueID='{0102DF4B-0000-0000-8E40-00608CF305B2}' BaseID='{064F35E2-6C39-464C-B35F-F08A8DBDE3F3}' PatternFlags='0' Hidden='0'><PageSheet LineStyle='0' FillStyle='0' TextStyle='0'><PageProps><PageWidth>0.1968503937007888</PageWidth><PageHeight>0.1968503937007888</PageHeight><ShdwOffsetX Unit='IN'>0.125</ShdwOffsetX><ShdwOffsetY Unit='IN'>-0.125</ShdwOffsetY><PageScale Unit='MM'>0.03937007874015748</PageScale><DrawingScale Unit='MM'>0.03937007874015748</DrawingScale><DrawingSizeType>4</DrawingSizeType><DrawingScaleType>0</DrawingScaleType><InhibitSnap>0</InhibitSnap><UIVisibility>0</UIVisibility><ShdwType>0</ShdwType><ShdwObliqueAngle>0</ShdwObliqueAngle><ShdwScaleFactor>1</ShdwScaleFactor></PageProps><v14:PageProps xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:DrawingResizeType>1</v14:DrawingResizeType></v14:PageProps></PageSheet><Shapes><Shape ID='5' NameU='Circle' Name='Connection Point' Type='Shape' LineStyle='6' FillStyle='6' TextStyle='6'><XForm><PinX>0.09842519685039441</PinX><PinY>0.09842519685039441</PinY><Width>0.1968503937007888</Width><Height>0.1968503937007888</Height><LocPinX F='Width*0.5'>0.0984251968503944</LocPinX><LocPinY F='Height*0.5'>0.0984251968503944</LocPinY><Angle Unit='DEG'>0</Angle><FlipX>0</FlipX><FlipY>0</FlipY><ResizeMode>0</ResizeMode></XForm><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='RUNADDONWARGS("Sequence Chart Studio","/event=100")'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Fill><FillForegnd>1</FillForegnd><FillBkgnd F='Inh'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextXForm><TxtPinX F='Width*0.5'>0.0984251968503944</TxtPinX><TxtPinY F='Height*0.5'>0.0984251968503944</TxtPinY><TxtWidth F='Width*0.875'>0.1722440944881902</TxtWidth><TxtHeight F='Height*0.75'>0.1476377952755916</TxtHeight><TxtLocPinX F='TxtWidth*0.5'>0.0861220472440951</TxtLocPinX><TxtLocPinY F='TxtHeight*0.5'>0.0738188976377958</TxtLocPinY><TxtAngle>0</TxtAngle></TextXForm><Protection><LockWidth F='Inh'>0</LockWidth><LockHeight F='Inh'>0</LockHeight><LockMoveX F='Inh'>0</LockMoveX><LockMoveY F='Inh'>0</LockMoveY><LockAspect>1</LockAspect><LockDelete F='Inh'>0</LockDelete><LockBegin F='Inh'>0</LockBegin><LockEnd F='Inh'>0</LockEnd><LockRotate>1</LockRotate><LockCrop F='Inh'>0</LockCrop><LockVtxEdit F='Inh'>0</LockVtxEdit><LockTextEdit>1</LockTextEdit><LockFormat F='Inh'>0</LockFormat><LockGroup F='Inh'>0</LockGroup><LockCalcWH F='Inh'>0</LockCalcWH><LockSelect F='Inh'>0</LockSelect><LockCustProp F='Inh'>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat F='Inh'>0</vx:LockFromGroupFormat><vx:LockThemeColors F='Inh'>0</vx:LockThemeColors><vx:LockThemeEffects F='Inh'>0</vx:LockThemeEffects></vx:Protection><Help><HelpTopic V='null'/><Copyright>See http://scstudio.sourceforge.net</Copyright></Help><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting F='Inh'>0</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType>8</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID>1033</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX F='Inh'>0</ShapePermeableX><ShapePermeableY F='Inh'>0</ShapePermeableY><ShapePermeablePlace F='Inh'>0</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit>1</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><User NameU='visVersion' ID='2'><Value>11</Value><Prompt F='No Formula'/></User><User NameU='mscSymbol' ID='3'><Value Unit='STR'>hmsc.connection</Value><Prompt F='No Formula'/></User><Connection IX='0'><X F='Width*0.5'>0.0984251968503944</X><Y F='Height*0'>0</Y><DirX>0</DirX><DirY Unit='MM'>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='1'><X F='Width*0'>0</X><Y F='Height*0.5'>0.0984251968503944</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='2'><X F='Width*1'>0.1968503937007888</X><Y F='Height*0.5'>0.0984251968503944</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='3'><X F='Width*0.5'>0.0984251968503944</X><Y F='Height*1'>0.1968503937007888</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Geom IX='0'><NoFill>0</NoFill><NoLine>0</NoLine><NoShow>0</NoShow><NoSnap>1</NoSnap><MoveTo IX='1'><X F='Width*0'>0</X><Y F='Height*0.5'>0.0984251968503944</Y></MoveTo><EllipticalArcTo IX='2'><X F='Width*1'>0.1968503937007888</X><Y F='Height*0.5'>0.0984251968503944</Y><A Unit='DL' F='Width*0.5'>0.0984251968503944</A><B Unit='DL' F='Height*1'>0.1968503937007888</B><C Unit='DA'>0</C><D F='Width/Height*1'>1</D></EllipticalArcTo><EllipticalArcTo IX='3'><X F='Geometry1.X1'>0</X><Y F='Geometry1.Y1'>0.0984251968503944</Y><A Unit='DL' F='Width*0.5'>0.0984251968503944</A><B Unit='DL' F='Height*0'>0</B><C Unit='DA'>0</C><D F='Width/Height*1'>1</D></EllipticalArcTo></Geom><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout><v14:Geom IX='0' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:NoQuickDrag F='No Formula'>0</v14:NoQuickDrag></v14:Geom></Shape></Shapes><Icon>
+<VisioDocument key='950BEE75A7B469162F64760C75BE08145B75FB6CCD000567483C212C63F8B9B7F7C339EC353A48DB6EBE0BE34F2F1FF4E98BFC0C6BA8381F9C430FDAE3272240' start='190' metric='0' DocLangID='1029' buildnum='4518' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>806228390</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-11-20T12:25:30</TimeSaved><TimeEdited>2013-11-20T12:25:17</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0<...
[truncated message content] |
|
From: <xb...@us...> - 2013-11-08 16:22:41
|
Revision: 1869
http://sourceforge.net/p/scstudio/code/1869
Author: xborza
Date: 2013-11-08 16:22:38 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
Automatic message drawing attaching messages to the same conpoint fixed
Modified Paths:
--------------
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/resource.h
trunk/src/view/visio/addon/shapeutils.cpp
trunk/src/view/visio/addon/shapeutils.h
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2013-11-08 10:30:47 UTC (rev 1868)
+++ trunk/src/view/visio/addon/document.cpp 2013-11-08 16:22:38 UTC (rev 1869)
@@ -1560,7 +1560,16 @@
_T("Error"), MB_OK | MB_ICONEXCLAMATION);
return VAORC_FAILURE;
}
-
+ // check if position on startPosY is free
+ Visio::IVShapePtr instance = *(instList.begin());
+ if(CShapeUtils::isMessageOnGivenPoistion( dlg.m_start_pos_y, instance))
+ {
+ MessageBox(GetActiveWindow(),
+ _T("There is already a message on \"Starting-Y\" position, please choose another Y-start position."),
+ _T("Error"), MB_OK | MB_ICONEXCLAMATION);
+ return VAORC_FAILURE;
+ }
+
// step 4.1: turn off message snapping
bool snapStatus = CMessageSnapping::isEnabled();
CMessageSnapping::setEnabled(false);
Modified: trunk/src/view/visio/addon/resource.h
===================================================================
--- trunk/src/view/visio/addon/resource.h 2013-11-08 10:30:47 UTC (rev 1868)
+++ trunk/src/view/visio/addon/resource.h 2013-11-08 16:22:38 UTC (rev 1869)
@@ -312,6 +312,7 @@
#define IDC_HTTP_SPLITTED_N 435
#define IDC_HTTP_REASSEMBLE_N 436
#define IDC_IPADDRESS1 438
+#define IDC_MSG_ON_POS 439
// Next default values for new objects
//
Modified: trunk/src/view/visio/addon/shapeutils.cpp
===================================================================
--- trunk/src/view/visio/addon/shapeutils.cpp 2013-11-08 10:30:47 UTC (rev 1868)
+++ trunk/src/view/visio/addon/shapeutils.cpp 2013-11-08 16:22:38 UTC (rev 1869)
@@ -186,6 +186,43 @@
return shapes;
}
+bool CShapeUtils::isMessageOnGivenPoistion(double posY, Visio::IVShapePtr instShape)
+{
+ if(!instShape->GetSectionExists(7,true))
+ {
+ return false;
+ }
+
+ Visio::IVSectionPtr con = instShape->GetSection(/*Visio::VisSectionIndices::visSectionConnectionPts*/7);
+ if(con->GetCount() == 0)
+ return false;
+
+ //get beginY position on instance
+ double insBegY = instShape->GetCellsSRC(visSectionObject,visRowXForm1D,vis1DBeginY)->GetResult(70);
+ double conPointY,localY;
+
+ Visio::IVConnectsPtr connections = instShape->FromConnects;
+ for(int i=1; i <= connections->Count; i++)
+ {
+ Visio::IVConnectPtr con = connections->Item[i];
+ Visio::IVShapePtr shape = con->ToSheet;
+ short cellrow = con->ToCell->Row;
+
+ localY = shape->GetCellsSRC(visSectionConnectionPts,cellrow,visX)->GetResult(70);
+ conPointY = insBegY - localY;
+
+ //tolerance for 0.001 mm
+ if(abs(conPointY - posY) < 0.001)
+ {
+ //check if it is message
+ TShapeType type = get_shape_type(con->FromSheet);
+ if(type == ST_BMSC_MESSAGE || type == ST_BMSC_MESSAGE_FOUND || type == ST_BMSC_MESSAGE_FOUND)
+ return true;
+ }
+ }
+ return false;
+}
+
MsgDirection CShapeUtils::getMsgDirection(Visio::IVShapePtr msgShape)
{
double BeginX = CShapeUtils::getShapeCell(msgShape,"BeginX");
Modified: trunk/src/view/visio/addon/shapeutils.h
===================================================================
--- trunk/src/view/visio/addon/shapeutils.h 2013-11-08 10:30:47 UTC (rev 1868)
+++ trunk/src/view/visio/addon/shapeutils.h 2013-11-08 16:22:38 UTC (rev 1869)
@@ -101,6 +101,8 @@
* @param connectedShapeType filter for connected shapes (e.g. coregions, messages, etc.)
*/
static std::vector<Visio::IVShapePtr> getConnectedShapes(Visio::IVShapePtr shape, TShapeType connectedShapeType);
+
+ static bool isMessageOnGivenPoistion(double posY, Visio::IVShapePtr instShape);
/**
* Returns the direction of given message
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xb...@us...> - 2013-11-08 10:30:49
|
Revision: 1868
http://sourceforge.net/p/scstudio/code/1868
Author: xborza
Date: 2013-11-08 10:30:47 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
found an fixed error in help
Modified Paths:
--------------
trunk/doc/help/CMakeLists.txt
Modified: trunk/doc/help/CMakeLists.txt
===================================================================
--- trunk/doc/help/CMakeLists.txt 2013-10-30 09:36:06 UTC (rev 1867)
+++ trunk/doc/help/CMakeLists.txt 2013-11-08 10:30:47 UTC (rev 1868)
@@ -19,6 +19,7 @@
frontend/automatic_drawing.html
frontend/flip_message_direction.html
frontend/message_numbering.html
+ frontend/message_jumping.html
frontend/settings.html
frontend/shape_selection.html
frontend/shortcuts.html
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xm...@us...> - 2013-10-30 09:36:09
|
Revision: 1867
http://sourceforge.net/p/scstudio/code/1867
Author: xmalota
Date: 2013-10-30 09:36:06 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
reconnection of all wrongly connected arrows in HMSC revised, removed bug with condition
Modified Paths:
--------------
trunk/src/view/visio/addon/connectionArrowSnapping.cpp
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
Modified: trunk/src/view/visio/addon/connectionArrowSnapping.cpp
===================================================================
--- trunk/src/view/visio/addon/connectionArrowSnapping.cpp 2013-10-30 00:17:02 UTC (rev 1866)
+++ trunk/src/view/visio/addon/connectionArrowSnapping.cpp 2013-10-30 09:36:06 UTC (rev 1867)
@@ -42,7 +42,7 @@
Visio::IVShapePtr shape = connect->ToSheet;
if(!isHmscShape(shape))
- return false;
+ return false;
TShapeType type = get_shape_type(shape);
@@ -81,7 +81,27 @@
if(type == ST_HMSC_CONNECTION)
{
- return true;
+ if(_tcsicmp(connect->FromCell->Name,_T("BeginX")) == 0)
+ {
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X1")) == 0)
+ return true;
+ }
+ if(_tcsicmp(connect->FromCell->Name,_T("BeginX")) == 0)
+ {
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X2")) == 0)
+ return true;
+ }
+ if(_tcsicmp(connect->FromCell->Name,_T("BeginX")) == 0)
+ {
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X3")) == 0)
+ return true;
+ }
+ if(_tcsicmp(connect->FromCell->Name,_T("EndX")) == 0)
+ {
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X4")) == 0)
+ return true;
+ }
+ return false;
}
return false;
@@ -124,6 +144,19 @@
else
return;
}
+
+ if(type == ST_HMSC_CONNECTION)
+ {
+ if(_tcsicmp(from->Name,_T("BeginX")) == 0)
+ {
+ //decide which point is the most appropriate
+ from->GlueTo(to->GetCells("Connections.X1"));
+ }
+ if(_tcsicmp(from->Name,_T("EndX")) == 0)
+ {
+ from->GlueTo(to->GetCells("Connections.X4"));
+ }
+ }
}
void CConnectionArrowSnapping::disconnectShape(Visio::IVShapePtr connectionShape, Visio::IVCellPtr fromCell, Visio::IVShapePtr to)
@@ -171,16 +204,16 @@
Visio::IVConnectsPtr connects = connectionShape->Connects;
Visio::IVCellPtr beginCell = connectionShape->GetCells("BeginX"), endCell = connectionShape->GetCells("EndX");
- for(int i=connects->Count; i>0; --i)
- {
- if(!isCorrectConnected(connectionShape, connects->Item[i]))
- {
- Visio::IVCellPtr from = connects->Item[i]->FromCell;
- Visio::IVShapePtr to = connects->Item[i]->ToSheet;
- disconnectShape(connectionShape, connects->Item[i]->FromCell, connects->Item[i]->ToSheet);
- connectArrowCorretly(from, to);
- }
- }
+ for(int i=connects->Count; i>0; --i)
+ {
+ if(!isCorrectConnected(connectionShape, connects->Item[i]))
+ {
+ Visio::IVCellPtr from = connects->Item[i]->FromCell;
+ Visio::IVShapePtr to = connects->Item[i]->ToSheet;
+ disconnectShape(connectionShape, connects->Item[i]->FromCell, connects->Item[i]->ToSheet);
+ connectArrowCorretly(from, to);
+ }
+ }
}
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-10-30 00:17:02 UTC (rev 1866)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-10-30 09:36:06 UTC (rev 1867)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='CC0AAEEE784F2857CD9A8871856F6ECDA77CB1157377B8BF6C7655B745E113409B669ECDCB64772F5EA2E810F617887D4204F5280DC69E135501A6FC5EB48DD4' start='190' metric='0' DocLangID='1029' buildnum='4518' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>806228390</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-10-23T14:16:45</TimeSaved><TimeEdited>2013-10-23T14:16:12</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1029</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1029</LangID></Char><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout></StyleSheet><StyleSheet ID='6' NameU='Basic' Name='Basic' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign F='Inh'>1</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='7' NameU='Visio 00' Name='Visio 00' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='HSL(0,0,0)'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='HSL(144,116,225)'>#e8eef7</FillForegnd><FillBkgnd F='HSL(144,106,193)'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='HSL(144,116,125)'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='8' NameU='Connector' Name='Connector' LineStyle='9' FillStyle='9' TextStyle='9'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>0</FillForegnd><FillBkgnd F='Inh'>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin Unit='PT' F='Inh'>0.05555555555555555</TopMargin><BottomMargin Unit='PT' F='Inh'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd>2</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='9' NameU='Visio 90' Name='Visio 90' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd>0</FillForegnd><FillBkgnd>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='10' NameU='Callout' Name='Callout' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet></StyleSheets><DocumentSheet NameU='TheDoc' Name='TheDoc' LineStyle='0' FillStyle='0' TextStyle='0'><DocProps><OutputFormat>0</OutputFormat><LockPreview>0</LockPreview><AddMarkup>0</AddMarkup><ViewMarkup>0</ViewMarkup><PreviewQuality>0</PreviewQuality><PreviewScope>1</PreviewScope><DocLangID>1029</DocLangID></DocProps></DocumentSheet><Masters><Master ID='0' NameU='Connection Point' Name='Connection Point' Prompt='' IconSize='1' AlignName='2' MatchByName='0' IconUpdate='0' UniqueID='{0102DF4B-0000-0000-8E40-00608CF305B2}' BaseID='{064F35E2-6C39-464C-B35F-F08A8DBDE3F3}' PatternFlags='0' Hidden='0'><PageSheet LineStyle='0' FillStyle='0' TextStyle='0'><PageProps><PageWidth>0.1968503937007888</PageWidth><PageHeight>0.1968503937007888</PageHeight><ShdwOffsetX Unit='IN'>0.125</ShdwOffsetX><ShdwOffsetY Unit='IN'>-0.125</ShdwOffsetY><PageScale Unit='MM'>0.03937007874015748</PageScale><DrawingScale Unit='MM'>0.03937007874015748</DrawingScale><DrawingSizeType>4</DrawingSizeType><DrawingScaleType>0</DrawingScaleType><InhibitSnap>0</InhibitSnap><UIVisibility>0</UIVisibility><ShdwType>0</ShdwType><ShdwObliqueAngle>0</ShdwObliqueAngle><ShdwScaleFactor>1</ShdwScaleFactor></PageProps><v14:PageProps xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:DrawingResizeType>1</v14:DrawingResizeType></v14:PageProps></PageSheet><Shapes><Shape ID='5' NameU='Circle' Name='Connection Point' Type='Shape' LineStyle='6' FillStyle='6' TextStyle='6'><XForm><PinX>0.09842519685039441</PinX><PinY>0.09842519685039441</PinY><Width>0.1968503937007888</Width><Height>0.1968503937007888</Height><LocPinX F='Width*0.5'>0.0984251968503944</LocPinX><LocPinY F='Height*0.5'>0.0984251968503944</LocPinY><Angle Unit='DEG'>0</Angle><FlipX>0</FlipX><FlipY>0</FlipY><ResizeMode>0</ResizeMode></XForm><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='RUNADDONWARGS("Sequence Chart Studio","/event=100")'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Fill><FillForegnd>1</FillForegnd><FillBkgnd F='Inh'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextXForm><TxtPinX F='Width*0.5'>0.0984251968503944</TxtPinX><TxtPinY F='Height*0.5'>0.0984251968503944</TxtPinY><TxtWidth F='Width*0.875'>0.1722440944881902</TxtWidth><TxtHeight F='Height*0.75'>0.1476377952755916</TxtHeight><TxtLocPinX F='TxtWidth*0.5'>0.0861220472440951</TxtLocPinX><TxtLocPinY F='TxtHeight*0.5'>0.0738188976377958</TxtLocPinY><TxtAngle>0</TxtAngle></TextXForm><Protection><LockWidth F='Inh'>0</LockWidth><LockHeight F='Inh'>0</LockHeight><LockMoveX F='Inh'>0</LockMoveX><LockMoveY F='Inh'>0</LockMoveY><LockAspect>1</LockAspect><LockDelete F='Inh'>0</LockDelete><LockBegin F='Inh'>0</LockBegin><LockEnd F='Inh'>0</LockEnd><LockRotate>1</LockRotate><LockCrop F='Inh'>0</LockCrop><LockVtxEdit F='Inh'>0</LockVtxEdit><LockTextEdit>1</LockTextEdit><LockFormat F='Inh'>0</LockFormat><LockGroup F='Inh'>0</LockGroup><LockCalcWH F='Inh'>0</LockCalcWH><LockSelect F='Inh'>0</LockSelect><LockCustProp F='Inh'>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat F='Inh'>0</vx:LockFromGroupFormat><vx:LockThemeColors F='Inh'>0</vx:LockThemeColors><vx:LockThemeEffects F='Inh'>0</vx:LockThemeEffects></vx:Protection><Help><HelpTopic V='null'/><Copyright>See http://scstudio.sourceforge.net</Copyright></Help><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting F='Inh'>0</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType>8</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID>1033</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX F='Inh'>0</ShapePermeableX><ShapePermeableY F='Inh'>0</ShapePermeableY><ShapePermeablePlace F='Inh'>0</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit>1</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><User NameU='visVersion' ID='2'><Value>11</Value><Prompt F='No Formula'/></User><User NameU='mscSymbol' ID='3'><Value Unit='STR'>hmsc.connection</Value><Prompt F='No Formula'/></User><Connection IX='0'><X F='Width*0.5'>0.0984251968503944</X><Y F='Height*0'>0</Y><DirX>0</DirX><DirY Unit='MM'>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='1'><X F='Width*0'>0</X><Y F='Height*0.5'>0.0984251968503944</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='2'><X F='Width*1'>0.1968503937007888</X><Y F='Height*0.5'>0.0984251968503944</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Connection IX='3'><X F='Width*0.5'>0.0984251968503944</X><Y F='Height*1'>0.1968503937007888</Y><DirX>0</DirX><DirY>0</DirY><Type>0</Type><AutoGen>0</AutoGen><Prompt F='No Formula'/></Connection><Geom IX='0'><NoFill>0</NoFill><NoLine>0</NoLine><NoShow>0</NoShow><NoSnap>1</NoSnap><MoveTo IX='1'><X F='Width*0'>0</X><Y F='Height*0.5'>0.0984251968503944</Y></MoveTo><EllipticalArcTo IX='2'><X F='Width*1'>0.1968503937007888</X><Y F='Height*0.5'>0.0984251968503944</Y><A Unit='DL' F='Width*0.5'>0.0984251968503944</A><B Unit='DL' F='Height*1'>0.1968503937007888</B><C Unit='DA'>0</C><D F='Width/Height*1'>1</D></EllipticalArcTo><EllipticalArcTo IX='3'><X F='Geometry1.X1'>0</X><Y F='Geometry1.Y1'>0.0984251968503944</Y><A Unit='DL' F='Width*0.5'>0.0984251968503944</A><B Unit='DL' F='Height*0'>0</B><C Unit='DA'>0</C><D F='Width/Height*1'>1</D></EllipticalArcTo></Geom><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout><v14:Geom IX='0' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:NoQuickDrag F='No Formula'>0</v14:NoQuickDrag></v14:Geom></Shape></Shapes><Icon>
+<VisioDocument key='D697245E5748EADF20CC9CC84813927D85ED4409401FDBFC4654D14A58BBC41F74C2AA2031422FAF64EBD33D134AD3A404E33035DE8AC38E1AD448A942E6EA85' start='190' metric='0' DocLangID='1029' buildnum='4518' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>806228390</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-10-30T10:22:40</TimeSaved><TimeEdited>2013-10-30T10:22:37</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><...
[truncated message content] |
|
From: <xb...@us...> - 2013-10-30 00:17:09
|
Revision: 1866
http://sourceforge.net/p/scstudio/code/1866
Author: xborza
Date: 2013-10-30 00:17:02 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
message snapping endpoint in coregion area
Modified Paths:
--------------
trunk/src/view/visio/addon/messageJump.cpp
trunk/src/view/visio/addon/messageSnapping.cpp
Modified: trunk/src/view/visio/addon/messageJump.cpp
===================================================================
--- trunk/src/view/visio/addon/messageJump.cpp 2013-10-23 12:26:11 UTC (rev 1865)
+++ trunk/src/view/visio/addon/messageJump.cpp 2013-10-30 00:17:02 UTC (rev 1866)
@@ -149,6 +149,10 @@
{
if(*it == shape)
continue;
+
+ //If point lies in coregionarea, return instance immediately
+ if(CShapeUtils::isPointInCoregionArea(pointOnShape,*it))
+ return *it;
boost::shared_ptr<MscPoint> intPoint (CMessageSnapping::getIntersectionWithInstance(MscPoint(pointOnShape.get_x()-1, pointOnShape.get_y()),
MscPoint(pointOnShape.get_x(), pointOnShape.get_y()), *it));
Modified: trunk/src/view/visio/addon/messageSnapping.cpp
===================================================================
--- trunk/src/view/visio/addon/messageSnapping.cpp 2013-10-23 12:26:11 UTC (rev 1865)
+++ trunk/src/view/visio/addon/messageSnapping.cpp 2013-10-30 00:17:02 UTC (rev 1866)
@@ -530,9 +530,9 @@
return NULL;
bool isBegin = _tcsicmp(endPointX,_T("BeginX")) == 0;
- //NOTE: If user snap message by himself (using red rectangle), we are done
- if(msgShape->GetCells(isBegin ? "BegTrigger" : "EndTrigger")->ResultInt[visNone][visTruncate] == 2)
- return NULL;
+ //NOTE: If user snap message by himself (using red rectangle), we are done (commented because of possible wrong connections)
+ /*if(msgShape->GetCells(isBegin ? "BegTrigger" : "EndTrigger")->ResultInt[visNone][visTruncate] == 2)
+ return NULL;*/
MscPoint endPoint(CShapeUtils::getShapeCell(msgShape,endPointX),
CShapeUtils::getShapeCell(msgShape,isBegin ? "BeginY" : "EndY"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xm...@us...> - 2013-10-23 12:26:15
|
Revision: 1865
http://sourceforge.net/p/scstudio/code/1865
Author: xmalota
Date: 2013-10-23 12:26:11 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
HMSC shapes unified, remove walking glue behavior, shapes prepared for implementation of snapping
Modified Paths:
--------------
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2013-10-11 09:27:00 UTC (rev 1864)
+++ trunk/src/view/visio/addon/document.cpp 2013-10-23 12:26:11 UTC (rev 1865)
@@ -309,10 +309,16 @@
case ST_COMMENT:
case ST_TEXT:
- if(vsoShape->Text.length() == 0)
- vsoShape->Text = _T("NAME");
- break;
-
+ {
+ if(vsoShape->Text.length() == 0)
+ vsoShape->Text = _T("NAME");
+
+ //putting limits on the size of comment
+ Visio::IVCellPtr tmp;
+ tmp = vsoShape->GetCells("Height");
+ tmp->FormulaU = "BOUND(20 mm, 0, FALSE, 0.01 mm, 10000000 mm)";
+ break;
+ }
case ST_HMSC_REFERENCE:
if(vsoShape->Text.length() == 0)
vsoShape->Text = _T("NAME");
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-10-11 09:27:00 UTC (rev 1864)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-10-23 12:26:11 UTC (rev 1865)
@@ -1,8 +1,22 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='4E091781EA959B024A88A0AB3A89A7A4F42333A7151A480676C5554E09FE47FAB3BEC8378314F014DE06E65220914DB01B515A6386D2DD3EF7AC3CDCD02E96BF' start='190' metric='0' DocLangID='1029' buildnum='6676' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>805313044</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-07-29T22:48:58</TimeSaved><TimeEdited>2013-07-29T22:27:29</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1029</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1029</LangID></Char><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout></StyleSheet><StyleSheet ID='6' NameU='Basic' Name='Basic' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign F='Inh'>1</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='7' NameU='Visio 00' Name='Visio 00' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='HSL(0,0,0)'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='HSL(144,116,225)'>#e8eef7</FillForegnd><FillBkgnd F='HSL(144,106,193)'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='HSL(144,116,125)'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='8' NameU='Connector' Name='Connector' LineStyle='9' FillStyle='9' TextStyle='9'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>0</FillForegnd><FillBkgnd F='Inh'>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin Unit='PT' F='Inh'>0.05555555555555555</TopMargin><BottomMargin Unit='PT' F='Inh'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd>2</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='9' NameU='Visio 90' Name='Visio 90' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd>0</FillForegnd><FillBkgnd>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='10' NameU='Callout' Name='Callout' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet></StyleSheets><DocumentSheet NameU='TheDoc' Name='TheDoc' LineStyle='0' FillStyle='0' TextStyle='0'><DocProps><OutputFormat>0</OutputFormat><LockPreview>0</LockPreview><AddMarkup>0</AddMarkup><ViewMarkup>0</ViewMarkup><PreviewQuality>0</PreviewQuality><PreviewScope>1</PreviewScope><DocLangID>1029</DocLangID></DocProps></DocumentSheet><Masters><Master ID='1' NameU='Start Symbol' Name='Start Symbol' Prompt='' IconSize='1' AlignName='2' MatchByName='0' IconUpdate='0' UniqueID='{02F181CB-0001-0000-8E40-00608CF305B2}' BaseID='{0CD140F3-B0DA-4C91-92C8-5A71AB7FFCA2}' PatternFlags='0' Hidden='0'><PageSheet LineStyle='0' FillStyle='0' TextStyle='0'><PageProps><PageWidth>0.3937007874015768</PageWidth><PageHeight>0.1968503937007871</PageHeight><ShdwOffsetX Unit='IN'>0.125</ShdwOffsetX><ShdwOffsetY Unit='IN'>-0.125</ShdwOffsetY><PageScale Unit='MM'>0.03937007874015748</PageScale><DrawingScale Unit='MM'>0.03937007874015748</DrawingScale><DrawingSizeType>4</DrawingSizeType><DrawingScaleType>0</DrawingScaleType><InhibitSnap>0</InhibitSnap><UIVisibility>0</UIVisibility><ShdwType>0</ShdwType><ShdwObliqueAngle>0</ShdwObliqueAngle><ShdwScaleFactor>1</ShdwScaleFactor></PageProps><v14:PageProps xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:DrawingResizeType>1</v14:DrawingResizeType></v14:PageProps></PageSheet><Shapes><Shape ID='5' NameU='Triangle.10' Name='Start Symbol' Type='Shape' LineStyle='6' FillStyle='6' TextStyle='6'><XForm><PinX>0.1968503937007884</PinX><PinY>0.06561679790025998</PinY><Width>0.3937007874015768</Width><Height>0.1968503937007871</Height><LocPinX F='Width*0.5'>0.1968503937007884</LocPinX><LocPinY F='Height*0.33333333333333'>0.0656167979002617</LocPinY><Angle Unit='DEG'>0</Angle><FlipX>0</FlipX><FlipY>0</FlipY><ResizeMode>0</ResizeMode></XForm><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='RUNADDONWARGS("Sequence Chart Studio","/event=100")'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><TextXForm><TxtPinX F='Width*0.5'>0.1968503937007884</TxtPinX><TxtPinY F='Height*0.33333333333333'>0.0656167979002617</TxtPinY><TxtWidth F='Width*1'>0.3937007874015768</TxtWidth><TxtHeight F='Height*0.66666666666667'>0.1312335958005254</TxtHeight><TxtLocPinX F='TxtWidth*0.5'>0.1968503937007884</TxtLocPinX><TxtLocPinY F='TxtHeight*0.5'>0.06561679790026269</TxtLocPinY><TxtAngle>0</TxtAngle></TextXForm><Fill><FillForegnd>1</FillForegnd><FillBkgnd F='Inh'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Protection><LockWidth F='Inh'>0</LockWidth><LockHeight F='Inh'>0</LockHeight><LockMoveX F='Inh'>0</LockMoveX><LockMoveY F='Inh'>0</LockMoveY><LockAspect F='Inh'>0</LockAspect><LockDelete F='Inh'>0</LockDelete><LockBegin F='Inh'>0</LockBegin><LockEnd F='Inh'>0</LockEnd><LockRotate F='Inh'>0</LockRotate><LockCrop F='Inh'>0</LockCrop><LockVtxEdit F='Inh'>0</LockVtxEdit><LockTextEdit>1</LockTextEdit><LockFormat F='Inh'>0</LockFormat><LockGroup F='Inh'>0</LockGroup><LockCalcWH>1</LockCalcWH><LockSelect F='Inh'>0</LockSelect><LockCustProp F='Inh'>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat F='Inh'>0</vx:LockFromGroupFormat><vx:LockThemeColors F='Inh'>0</vx:LockThemeColors><vx:LockThemeEffects F='Inh'>0</vx:LockThemeEffects></vx:Protection><Help><HelpTopic V='null'/><Copyright>See http://scstudio.sourceforge.net</Copyright></Help><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting F='Inh'>0</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID>1033</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX F='Inh'>0</ShapePermeableX><ShapePermeableY F='Inh'>0</ShapePermeableY><ShapePermeablePlace F='Inh'>0</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit>1</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Connection IX='0'><X F='Width*0.5'>0.1968503937007884</X><Y F='Height*0'>0</Y><DirX>0</DirX><DirY>0.03937007874015748</DirY><Type F='No Formula'>0</Type><AutoGen F='No Formula'>0</AutoGen><Prompt F='No Formula'/></Connection><User NameU='visVersion' ID='2'><Value>11</Value><Prompt F='No Formula'/></User><User NameU='mscSymbol' ID='3'><Value Unit='STR'>hmsc.start</Value><Prompt F='No Formula'/></User><Geom IX='0'><NoFill>0</NoFill><NoLine F='No Formula'>0</NoLine><NoShow F='No Formula'>0</NoShow><NoSnap>1</NoSnap><MoveTo IX='1'><X F='Width*1'>0.3937007874015768</X><Y F='Height*1'>0.1968503937007871</Y></MoveTo><LineTo IX='2'><X F='Width*0.5'>0.1968503937007884</X><Y F='Height*0'>0</Y></LineTo><LineTo IX='3'><X F='Width*0'>0</X><Y F='Height*1'>0.1968503937007871</Y></LineTo><LineTo IX='4'><X F='Geometry1.X1'>0.3937007874015768</X><Y F='Geometry1.Y1'>0.1968503937007871</Y></LineTo></Geom><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout><v14:Geom IX='0' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:NoQuickDrag F='No Formula'>0</v14:NoQuickDrag></v14:Geom></Shape></Shapes><Icon>
+<VisioDocument key='CC0AAEEE784F2857CD9A8871856F6ECDA77CB1157377B8BF6C7655B745E113409B669ECDCB64772F5EA2E810F617887D4204F5280DC69E135501A6FC5EB48DD4' start='190' metric='0' DocLangID='1029' buildnum='4518' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>806228390</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-10-23T14:16:45</TimeSaved><TimeEdited>2013-10-23T14:16:12</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1029</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1029</LangID></Char><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout></StyleSheet><StyleSheet ID='6' NameU='Basic' Name='Basic' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><...
[truncated message content] |
|
From: <xb...@us...> - 2013-10-11 09:27:09
|
Revision: 1864
http://sourceforge.net/p/scstudio/code/1864
Author: xborza
Date: 2013-10-11 09:27:00 +0000 (Fri, 11 Oct 2013)
Log Message:
-----------
/trunk merged with with ondra/conditions branch
Modified Paths:
--------------
trunk/doc/help/CMakeLists.txt
trunk/doc/help/frontend/automatic_drawing.body.htm
trunk/src/check/localchoice/local_choice_checker.cpp
trunk/src/check/localchoice/local_choice_checker.h
trunk/src/check/order/acyclic_checker.cpp
trunk/src/check/order/acyclic_checker.h
trunk/src/check/order/fifo_checker.cpp
trunk/src/check/order/fifo_checker.h
trunk/src/check/pseudocode/causal_closure_initiator.cpp
trunk/src/check/pseudocode/causal_closure_initiator.h
trunk/src/check/pseudocode/communication_graph.cpp
trunk/src/check/pseudocode/communication_graph.h
trunk/src/check/pseudocode/msc_duplicators.cpp
trunk/src/check/pseudocode/msc_duplicators.h
trunk/src/check/pseudocode/utils.h
trunk/src/check/pseudocode/visual_closure_initiator.cpp
trunk/src/check/pseudocode/visual_closure_initiator.h
trunk/src/check/race/footprint.cpp
trunk/src/check/race/footprint.h
trunk/src/check/race/race_checker.cpp
trunk/src/check/race/race_checker.h
trunk/src/check/time/constraint_syntax.cpp
trunk/src/check/time/hmsc_all_paths.cpp
trunk/src/check/time/hmsc_all_paths.h
trunk/src/check/time/module.cpp
trunk/src/check/time/pcap_time.cpp
trunk/src/check/time/tightening.cpp
trunk/src/check/time/tightening.h
trunk/src/check/time/time_consistency.h
trunk/src/check/time/time_pseudocode.cpp
trunk/src/check/time/time_pseudocode.h
trunk/src/check/time/time_trace_race.h
trunk/src/check/time/traverse_erase.cpp
trunk/src/check/time/traverse_erase.h
trunk/src/data/CMakeLists.txt
trunk/src/data/Z120/Context.cpp
trunk/src/data/Z120/Context_Impl.h
trunk/src/data/Z120/z120.h
trunk/src/data/Z120/z120_save.cpp
trunk/src/data/beautify/layout_optimizer.cpp
trunk/src/data/beautify/time_transformer.cpp
trunk/src/data/dfs_area_traverser.cpp
trunk/src/data/dfs_area_traverser.h
trunk/src/data/dfs_events_traverser.cpp
trunk/src/data/dfs_events_traverser.h
trunk/src/data/dfs_instance_events_traverser.cpp
trunk/src/data/dfs_instance_events_traverser.h
trunk/src/data/engmann/engmann.cpp
trunk/src/data/exporttex/exportTex.cpp
trunk/src/data/modelchecking/divine.cpp
trunk/src/data/modelchecking/divine.h
trunk/src/data/msc/BMsc.cpp
trunk/src/data/msc/BMsc.h
trunk/src/data/msc/Condition.h
trunk/src/data/msc/ConditionNode.cpp
trunk/src/data/msc/ConditionNode.h
trunk/src/data/msc/CoregionArea.cpp
trunk/src/data/msc/CoregionArea.h
trunk/src/data/msc/CoregionEventRelation.h
trunk/src/data/msc/Event.cpp
trunk/src/data/msc/Event.h
trunk/src/data/msc/EventArea.cpp
trunk/src/data/msc/EventArea.h
trunk/src/data/msc/EventTmpl.h
trunk/src/data/msc/Instance.cpp
trunk/src/data/msc/Instance.h
trunk/src/data/msc/LocalAction.h
trunk/src/data/msc/MessageEvent.cpp
trunk/src/data/msc/MessageEvent.h
trunk/src/data/msc/MscMessage.h
trunk/src/data/msc/StrictOrderArea.cpp
trunk/src/data/msc/StrictOrderArea.h
trunk/src/data/msc/time/TimeRelationEvent.cpp
trunk/src/data/msc/time/TimeRelationEvent.h
trunk/src/data/msc.h
trunk/src/data/msc_types.h
trunk/src/data/mscgen/MscgenContext.cpp
trunk/src/data/pcap/pcap_handler.cpp
trunk/src/data/pcap/pcap_handler.h
trunk/src/data/time_relevant_ordering/dfs_backward_traverser.cpp
trunk/src/data/time_relevant_ordering/dfs_backward_traverser.h
trunk/src/data/time_relevant_ordering/time_order_optimizer.cpp
trunk/src/data/time_relevant_ordering/time_order_optimizer.h
trunk/src/data/time_relevant_ordering/time_relevant_ordering.cpp
trunk/src/data/time_relevant_ordering/time_relevant_ordering.h
trunk/src/membership/diff_impl.cpp
trunk/src/membership/membership_additional.cpp
trunk/src/membership/membership_additional.h
trunk/src/membership/membership_alg.cpp
trunk/src/membership/membership_base.h
trunk/src/membership/membership_time.cpp
trunk/src/montecarlo/montecarlo.cpp
trunk/src/montecarlo/montecarlo.h
trunk/src/view/visio/addon/extract.cpp
trunk/src/view/visio/addon/extract.h
trunk/src/view/visio/addon/visualize.cpp
trunk/src/view/visio/addon/visualize.h
trunk/tests/acyclic_checker_test.cpp
trunk/tests/bmsc_matrix_converter_test.cpp
trunk/tests/bmsc_tightening_test.cpp
trunk/tests/constrain_check_test.cpp
trunk/tests/exporttex_position_test/exporttex_position_test.cpp
trunk/tests/fifo_checker_test.cpp
trunk/tests/hmsc_all_paths_test.cpp
trunk/tests/local_choice_checker_test.cpp
trunk/tests/max_tightener_test.cpp
trunk/tests/race_checker_test.cpp
trunk/tests/tighten_hmsc_test.cpp
trunk/tests/tighten_msc_test.cpp
trunk/tests/time/time_race/CMakeLists.txt
trunk/tests/universal_boundedness_checker_test.cpp
Added Paths:
-----------
trunk/src/data/msc/Condition.cpp
trunk/src/data/msc/ConditionEvent.h
trunk/src/data/msc/LocalAction.cpp
trunk/src/data/msc/LocalActionEvent.h
trunk/tests/time/time_race/race_cond_neg1.mpr
trunk/tests/time/time_race/race_cond_neg1.mpr.result
trunk/tests/time/time_race/race_cond_neg1.vsd
trunk/tests/time/time_race/race_cond_neg2.mpr
trunk/tests/time/time_race/race_cond_neg2.mpr.result
trunk/tests/time/time_race/race_cond_neg2.vsd
trunk/tests/time/time_race/race_cond_pos1.mpr
trunk/tests/time/time_race/race_cond_pos1.vsd
trunk/tests/time/time_race/race_cond_pos2.mpr
trunk/tests/time/time_race/race_cond_pos2.vsd
trunk/tests/time/time_race/race_cond_pos3.mpr
trunk/tests/time/time_race/race_cond_pos3.vsd
Removed Paths:
-------------
trunk/src/data/msc/MscMessage.cpp
Property Changed:
----------------
trunk/doc/help/frontend/
trunk/src/data/msc/EventArea.cpp
trunk/src/data/msc/MessageEvent.h
trunk/src/data/msc/StrictOrderArea.cpp
Modified: trunk/doc/help/CMakeLists.txt
===================================================================
--- trunk/doc/help/CMakeLists.txt 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/doc/help/CMakeLists.txt 2013-10-11 09:27:00 UTC (rev 1864)
@@ -18,7 +18,6 @@
fifo/fifo.html
frontend/automatic_drawing.html
frontend/flip_message_direction.html
- frontend/message_jumping.html
frontend/message_numbering.html
frontend/settings.html
frontend/shape_selection.html
Index: trunk/doc/help/frontend
===================================================================
--- trunk/doc/help/frontend 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/doc/help/frontend 2013-10-11 09:27:00 UTC (rev 1864)
Property changes on: trunk/doc/help/frontend
___________________________________________________________________
Added: svn:global-ignores
## -0,0 +1 ##
+message_jumping.body.htm
Modified: trunk/doc/help/frontend/automatic_drawing.body.htm
===================================================================
--- trunk/doc/help/frontend/automatic_drawing.body.htm 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/doc/help/frontend/automatic_drawing.body.htm 2013-10-11 09:27:00 UTC (rev 1864)
@@ -75,11 +75,15 @@
</p>
<ul>
<li>
- if there are no instances selected, all instances on the page are taken (there have to be at least 2 instances on the page);
+ if there are no instances selected, all instances on the page are taken;
</li>
<li>
- otherwise, all selected instances (at least 2) are taken into account.
+ if there is exactly one instance selected, then SCStudio waits for
+ another instance to be selected;
</li>
+ <li>
+ otherwise, all selected instances are taken into account.
+ </li>
</ul>
From all of these instances, the leftmost and the rightmost instances are
recognized as the first and last instance in the message sequence. (During
Modified: trunk/src/check/localchoice/local_choice_checker.cpp
===================================================================
--- trunk/src/check/localchoice/local_choice_checker.cpp 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/localchoice/local_choice_checker.cpp 2013-10-11 09:27:00 UTC (rev 1864)
@@ -67,7 +67,7 @@
current_node->set_attribute(LocalChoiceChecker::lc_nip_attribute, nip);
}
-void BMscInitListener::on_white_event_found(MessageEvent *e)
+void BMscInitListener::on_white_event_found(Event *e)
{
if(m_first) //Still looking for a possibly first event in the instance
{
@@ -81,7 +81,8 @@
{
if(e->is_minimal())
{
- if(e->is_send())
+ MessageEvent* me = dynamic_cast<MessageEvent*>(e);
+ if(me != NULL && me->is_send())
m_mep = true;
}
else //the event is not minimal
@@ -95,7 +96,8 @@
m_first = false;
if(m_first_coregion == NULL)
{
- if(e->is_send())
+ MessageEvent* me = dynamic_cast<MessageEvent*>(e);
+ if(me != NULL && me->is_send())
m_mep = true;
}
}
Modified: trunk/src/check/localchoice/local_choice_checker.h
===================================================================
--- trunk/src/check/localchoice/local_choice_checker.h 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/localchoice/local_choice_checker.h 2013-10-11 09:27:00 UTC (rev 1864)
@@ -105,7 +105,7 @@
bool m_mep;
CoregionArea *m_first_coregion;
public:
- void on_white_event_found(MessageEvent *e);
+ void on_white_event_found(Event *e);
BMscInitListener(void)
:m_idle(true),m_first(true),m_mep(false), m_first_coregion(NULL)
{}
Modified: trunk/src/check/order/acyclic_checker.cpp
===================================================================
--- trunk/src/check/order/acyclic_checker.cpp 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/order/acyclic_checker.cpp 2013-10-11 09:27:00 UTC (rev 1864)
@@ -57,8 +57,8 @@
BMscDuplicator duplicator;
for(it = bmsc->get_instances().begin(); it != bmsc->get_instances().end(); it++)
{
- const MessageEventPList min_events = (*it)->get_minimal_events();
- for (MessageEventPList::const_iterator i = min_events.begin(); i != min_events.end(); ++i)
+ const EventPList min_events = (*it)->get_minimal_events();
+ for (EventPList::const_iterator i = min_events.begin(); i != min_events.end(); ++i)
{
ConnectionNode* node = (*i)->get_attribute<ConnectionNode*>("ACC_node", NULL);
start->add_successor(node);
@@ -80,7 +80,7 @@
cono = dynamic_cast<ConnectionNode*>((*eit));
if(cono)
{
- MessageEventP e = cono->get_attribute<MessageEventP>("ACC_event", NULL);
+ EventP e = cono->get_attribute<EventP>("ACC_event", NULL);
duplicator.get_copy(e)->set_marked(MARKED);
}
nore = dynamic_cast<NodeRelation*>((*eit));
Modified: trunk/src/check/order/acyclic_checker.h
===================================================================
--- trunk/src/check/order/acyclic_checker.h 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/order/acyclic_checker.h 2013-10-11 09:27:00 UTC (rev 1864)
@@ -49,7 +49,7 @@
AssignHMscListener(HMsc *hmsc)
:m_hmsc(hmsc)
{}
- void on_white_event_found(MessageEvent *e)
+ void on_white_event_found(Event *e)
{
ConnectionNode *node = new ConnectionNode();
m_hmsc->add_node(node);
@@ -75,7 +75,7 @@
class InstanceSuccessors: public EventSuccessorListener
{
public:
- void on_event_successor(MessageEvent *event, MessageEvent *successor)
+ void on_event_successor(Event *event, Event *successor)
{
ConnectionNode *first, *second;
first = event->get_attribute("ACC_node", second);
@@ -87,7 +87,7 @@
class CleanHMscListener: public WhiteEventFoundListener
{
public:
- void on_white_event_found(MessageEvent *e)
+ void on_white_event_found(Event *e)
{
ConnectionNode *node, *dummy;
NodeRelation* nr;
@@ -98,7 +98,7 @@
nr->remove_attribute<MscMessage*>("ACC_message");
e->remove_attribute<NodeRelation*>("ACC_relation");
}
- node->remove_attribute<MessageEvent*>("ACC_event");
+ node->remove_attribute<Event*>("ACC_event");
e->remove_attribute<ConnectionNode*>("ACC_node");
}
};
Modified: trunk/src/check/order/fifo_checker.cpp
===================================================================
--- trunk/src/check/order/fifo_checker.cpp 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/order/fifo_checker.cpp 2013-10-11 09:27:00 UTC (rev 1864)
@@ -40,6 +40,7 @@
{
//event is surely complete
MessageEvent* copy = duplicator.get_event_copy(events[i]);
+ assert(copy->get_complete_message() != NULL); // better way of saying something is sure
copy->get_complete_message()->set_marked(MARKED);
}
return new_bmsc;
@@ -53,8 +54,7 @@
DFSEventsTraverser traverser;
traverser.add_event_finished_listener(&topology_listener);
traverser.traverse(bmsc);
- MessageEventPVector topology(topology_listener.get_topology().size());
- topology.assign(
+ EventPVector topology(
topology_listener.get_topology().begin(),
topology_listener.get_topology().end()
);
@@ -65,13 +65,16 @@
BoolVector& closure_e = closure_initiator.get_visual_closure(topology[e]);
for(size_t f=0; f<topology.size(); f++)
{
- if(topology[e]->is_receive() && topology[f]->is_receive() &&
- topology[e]->is_matched() && topology[f]->is_matched() &&
- mapper->same_channel(topology[e],topology[f]) && closure_e[f] &&
- !closure_initiator.get_visual_closure(topology[e]->get_matching_event())[
- closure_initiator.get_topology_index(topology[f]->get_matching_event())])
+ MessageEventP me = dynamic_cast<MessageEventP>(topology[e]);
+ MessageEventP mf = dynamic_cast<MessageEventP>(topology[f]);
+
+ if(me != NULL && mf != NULL &&
+ me->is_receive() && mf->is_receive() &&
+ me->is_matched() && mf->is_matched() &&
+ mapper->same_channel(me, mf) && closure_e[f] &&
+ !closure_initiator.get_visual_closure(me->get_matching_event())[closure_initiator.get_topology_index(mf->get_matching_event())])
{
- result.push_back(create_counter_example(bmsc,topology[e],topology[f]));
+ result.push_back(create_counter_example(bmsc, me, mf));
}
}
}
@@ -83,7 +86,7 @@
{
while(!m_modified_events.empty())
{
- MessageEvent* e = m_modified_events.top();
+ Event* e = m_modified_events.top();
m_modified_events.pop();
e->remove_attribute<size_t>(channel_id_attribute);
}
Modified: trunk/src/check/order/fifo_checker.h
===================================================================
--- trunk/src/check/order/fifo_checker.h 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/order/fifo_checker.h 2013-10-11 09:27:00 UTC (rev 1864)
@@ -55,7 +55,7 @@
/**
* Events with modified dynamic attributes
*/
- MessageEventPStack m_modified_events;
+ EventPStack m_modified_events;
BMscPtr create_counter_example(BMscPtr& bmsc, MessageEvent* receive1, MessageEvent* receive2);
@@ -65,7 +65,7 @@
* An e1 is supposed to be before e2. If this holds true is returned, false
* otherwise.
*/
- bool consistent_order(VisualClosureInitiator& initiator, MessageEvent* e1, MessageEvent* e2)
+ bool consistent_order(VisualClosureInitiator& initiator, Event* e1, Event* e2)
{
BoolVector& e1_closure = initiator.get_visual_closure(e1);
size_t e2_index = initiator.get_topology_index(e2);
@@ -130,7 +130,7 @@
/**
* Setter of channel id attribute of message.
*/
- void set_channel_id(MessageEvent* e, size_t id)
+ void set_channel_id(Event* e, size_t id)
{
e->set_attribute<size_t>(channel_id_attribute,id);
}
@@ -138,7 +138,7 @@
/**
* Getter of channel id attribute of m.
*/
- size_t get_channel_id(MessageEvent* e)
+ size_t get_channel_id(Event* e)
{
return e->get_attribute<size_t>(channel_id_attribute,0);
}
@@ -148,9 +148,10 @@
*
* MessageEvent should be checked if it is receive event and has matching event.
*/
- static bool should_be_checked(MessageEvent* e)
+ static bool should_be_checked(Event* e)
{
- return e->is_receive() && e->is_matched();
+ MessageEvent* me = dynamic_cast<MessageEvent*>(e);
+ return (me != NULL && me->is_receive() && me->is_matched());
}
};
Modified: trunk/src/check/pseudocode/causal_closure_initiator.cpp
===================================================================
--- trunk/src/check/pseudocode/causal_closure_initiator.cpp 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/pseudocode/causal_closure_initiator.cpp 2013-10-11 09:27:00 UTC (rev 1864)
@@ -24,23 +24,22 @@
{
while(!m_modified_events.empty())
{
- MessageEvent* e = m_modified_events.top();
+ Event* e = m_modified_events.top();
e->remove_attribute<BoolVector>(m_causal_closure_attribute);
m_modified_events.pop();
}
}
-void CausalClosureInitiator::initialize(const MessageEventPVector& events,
+void CausalClosureInitiator::initialize(const EventPVector& events,
VisualClosureInitiator& visual_closure_init, ChannelMapperPtr mapper)
{
//initialize matrix
size_t events_count = events.size();
- MessageEventPList::const_iterator i;
//closure[x][y]==true <=> x << y
std::vector<BoolVector*> closure(events_count);
for(size_t i=0;i<events_count;i++)
{
- MessageEvent* i_event = events[i];
+ Event* i_event = events[i];
BoolVector& causal_closure = get_causal_closure(i_event);
causal_closure.resize(events_count,false);
closure[i] = &causal_closure;
@@ -48,33 +47,40 @@
//for any event e: e << e
causal_closure[i] = true;
//send event << receive matching event
- if(i_event->is_send() && i_event->is_matched())
- causal_closure[visual_closure_init.get_topology_index(
- i_event->get_matching_event())] = true;
+ MessageEvent* i_msg_event = dynamic_cast<MessageEvent*>(i_event);
+ if(i_msg_event != NULL && i_msg_event->is_send() && i_msg_event->is_matched())
+ {
+ size_t topo_index = visual_closure_init.get_topology_index(i_msg_event->get_matching_event());
+ causal_closure[topo_index] = true;
+ }
}
for(size_t i=0;i<events_count;i++)
{
- MessageEvent* i_event = events[i];
+ Event* i_event = events[i];
BoolVector& i_causal_closure = *closure[i];
BoolVector& i_visual_closure = visual_closure_init.get_visual_closure(i_event);
for(size_t j = 0; j < events_count; j++)
{
- MessageEvent* j_event = events[j];
- //i_event and j_event are from the same instance, j_event is send event and
- //i_event < j_event
+ Event* j_event = events[j];
+ MessageEvent* j_msg_event = dynamic_cast<MessageEvent*>(j_event);
+
if(i_event->get_instance()==j_event->get_instance() &&
- !j_event->is_receive() && i_visual_closure[j])
+ j_msg_event != NULL && !j_msg_event->is_receive() && i_visual_closure[j])
{
+ //i_event and j_event are from the same instance, j_event is send event and
+ //i_event < j_event
i_causal_closure[j] = true;
}
- //i_event and j_event are send events of the same channel and i_event<j_event
- if(i_event->is_send() && i_event->is_matched() &&
- j_event->is_send() && j_event->is_matched() &&
- mapper->same_channel(i_event,j_event) && i_visual_closure[j])
+
+ MessageEvent* i_msg_event = dynamic_cast<MessageEvent*>(i_event);
+ if(i_msg_event != NULL && j_msg_event != NULL &&
+ i_msg_event->is_send() && i_msg_event->is_matched() &&
+ j_msg_event->is_send() && j_msg_event->is_matched() &&
+ mapper->same_channel(i_msg_event,j_msg_event) && i_visual_closure[j])
{
- get_causal_closure(i_event->get_matching_event())[
- visual_closure_init.get_topology_index(j_event->get_matching_event())
- ] = true;
+ //i_event and j_event are send events of the same channel and i_event<j_event
+ size_t topo_index = visual_closure_init.get_topology_index(j_msg_event->get_matching_event());
+ get_causal_closure(i_msg_event->get_matching_event())[topo_index] = true;
}
}
}
Modified: trunk/src/check/pseudocode/causal_closure_initiator.h
===================================================================
--- trunk/src/check/pseudocode/causal_closure_initiator.h 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/pseudocode/causal_closure_initiator.h 2013-10-11 09:27:00 UTC (rev 1864)
@@ -35,7 +35,7 @@
/**
* Used for cleaning up attributes.
*/
- MessageEventPStack m_modified_events;
+ EventPStack m_modified_events;
/**
* Name of causal closure attribute.
@@ -75,7 +75,7 @@
/**
* Getter of causal closure attribute of e.
*/
- BoolVector& get_causal_closure(MessageEvent* e)
+ BoolVector& get_causal_closure(Event* e)
{
static BoolVector empty(1,false);
return e->get_attribute<BoolVector>(m_causal_closure_attribute,empty);
@@ -90,7 +90,7 @@
* @param events - topologically sorted events used for visual_closure_init's initialization
* @param visual_closure_init - initialized VisualClosureInitiator
*/
- void initialize(const MessageEventPVector& events,
+ void initialize(const EventPVector& events,
VisualClosureInitiator& visual_closure_init, ChannelMapperPtr mapper);
/**
Modified: trunk/src/check/pseudocode/communication_graph.cpp
===================================================================
--- trunk/src/check/pseudocode/communication_graph.cpp 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/pseudocode/communication_graph.cpp 2013-10-11 09:27:00 UTC (rev 1864)
@@ -20,17 +20,16 @@
const std::string CommunicationGraph::lexical_order_attribute = "lexical_order";
-void CommunicationGraphListener::on_white_event_found(MessageEvent *e)
+void CommunicationGraphListener::on_white_event_found(Event *e)
{
unsigned from, to;
bool status;
-
- if(e->is_send())
+ MessageEvent* me = dynamic_cast<MessageEvent*>(e);
+
+ if(me != NULL && me->is_send() && me->is_matched())
{
- if(!e->is_matched())
- return;
- from = e->get_instance()->get_attribute(m_index_attribute, 0, status);
- to = e->get_matching_event()->get_instance()->get_attribute(m_index_attribute, 0, status);
+ from = me->get_instance()->get_attribute(m_index_attribute, 0, status);
+ to = me->get_matching_event()->get_instance()->get_attribute(m_index_attribute, 0, status);
m_graph.at(from).at(to) += 1;
}
}
Modified: trunk/src/check/pseudocode/communication_graph.h
===================================================================
--- trunk/src/check/pseudocode/communication_graph.h 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/pseudocode/communication_graph.h 2013-10-11 09:27:00 UTC (rev 1864)
@@ -88,7 +88,7 @@
Graph& m_graph;
std::string m_index_attribute;
public:
- void on_white_event_found(MessageEvent *e);
+ void on_white_event_found(Event *e);
CommunicationGraphListener(Graph& destination, std::string index_attribute)
:m_graph(destination), m_index_attribute(index_attribute)
{}
Modified: trunk/src/check/pseudocode/msc_duplicators.cpp
===================================================================
--- trunk/src/check/pseudocode/msc_duplicators.cpp 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/pseudocode/msc_duplicators.cpp 2013-10-11 09:27:00 UTC (rev 1864)
@@ -105,12 +105,6 @@
return new_bmsc;
}
-MessageEvent* BMscDuplicator::get_event_copy(MessageEvent* e)
-{
- MscElement* elem = get_copy(e);
- return dynamic_cast<MessageEvent*>(elem);
-}
-
BMscDuplicator::~BMscDuplicator()
{
}
@@ -369,7 +363,7 @@
}
-void EventsCreatorListener::on_white_event_found(MessageEvent* e)
+void EventsCreatorListener::on_white_event_found(Event* e)
{
if(m_last_instance!=e->get_instance())
{
@@ -395,14 +389,14 @@
m_last_area = e->get_area();
}
- MessageEventPtr new_e = new MessageEvent(e);
+ EventPtr new_e = e->clone();
m_duplicator->set_copy(e,new_e.get());
m_last_new_area->add_event(new_e);
create_successor(e);
}
-MessageEvent* EventsCreatorListener::get_preceding_event()
+Event* EventsCreatorListener::get_preceding_event()
{
const MscElementPList& elements = m_traverser->get_reached_elements();
if(elements.size()>1)
@@ -413,31 +407,31 @@
if(dynamic_cast<CoregionEventRelation*>(*i))
{
i--;
- return dynamic_cast<MessageEvent*>(*i);
+ return dynamic_cast<Event*>(*i);
}
}
return NULL;
}
-void EventsCreatorListener::on_gray_event_found(MessageEvent* e)
+void EventsCreatorListener::on_gray_event_found(Event* e)
{
create_successor(e);
}
-void EventsCreatorListener::on_black_event_found(MessageEvent* e)
+void EventsCreatorListener::on_black_event_found(Event* e)
{
create_successor(e);
}
-void EventsCreatorListener::create_successor(MessageEvent* e)
+void EventsCreatorListener::create_successor(Event* e)
{
- MessageEvent* coreg_new = m_duplicator->get_event_copy(e);
+ Event* coreg_new = m_duplicator->get_event_copy(e);
if(coreg_new->in_coregion_area())
{
- MessageEvent* preceding = get_preceding_event();
+ Event* preceding = get_preceding_event();
if(preceding)
{
- MessageEvent* preceding_new = m_duplicator->get_event_copy(preceding);
+ Event* preceding_new = m_duplicator->get_event_copy(preceding);
CoregionArea* coregion = dynamic_cast<CoregionArea*>(preceding_new->get_area());
coregion->add_successor_rel(preceding_new, coreg_new);
}
@@ -452,25 +446,29 @@
}
-void MessagesCreatorListener::on_white_event_found(MessageEvent* e)
+void MessagesCreatorListener::on_white_event_found(Event* e)
{
- MessageEvent* event_copy = m_duplicator->get_event_copy(e);
- if(e->is_matched())
+ MessageEvent* me = dynamic_cast<MessageEvent*>(e);
+ if (me == NULL)
+ return; // events of other types ignored
+
+ MessageEvent* event_copy = m_duplicator->get_event_copy(me);
+ if(me->is_matched())
{
- if(e->is_send())
+ if(me->is_send())
{
- MessageEvent* matching_copy = m_duplicator->get_event_copy(e->get_matching_event());
- MscMessagePtr complete = new CompleteMessage(event_copy,matching_copy,e->get_complete_message().get());
+ MessageEvent* matching_copy = m_duplicator->get_event_copy(me->get_matching_event());
+ MscMessagePtr complete = new CompleteMessage(event_copy,matching_copy,me->get_complete_message().get());
event_copy->set_message(complete);
matching_copy->set_message(complete);
- m_duplicator->set_copy(e->get_message().get(),complete.get());
+ m_duplicator->set_copy(me->get_message().get(),complete.get());
}
}
else
{
- MscMessagePtr incomplete = new IncompleteMessage(e->get_incomplete_message().get());
+ MscMessagePtr incomplete = new IncompleteMessage(me->get_incomplete_message().get());
event_copy->set_message(incomplete);
- m_duplicator->set_copy(e->get_message().get(),incomplete.get());
+ m_duplicator->set_copy(me->get_message().get(),incomplete.get());
}
}
@@ -482,7 +480,7 @@
}
-void TimeRelationCreatorListener::on_white_event_found(MessageEvent* e)
+void TimeRelationCreatorListener::on_white_event_found(Event* e)
{
TimeRelationEventPtrList relations = e->get_time_relations();
TimeRelationEventPtrList::iterator it;
@@ -491,16 +489,15 @@
if((*it)->get_event_a()!=e)
continue;
- MessageEvent* a_copy = m_duplicator->get_event_copy((*it)->get_event_a());
- MessageEvent* b_copy = m_duplicator->get_event_copy((*it)->get_event_b());
- TimeRelationEventPtr relation = new TimeRelationEvent((*it).get());
+ Event* a_copy = m_duplicator->get_event_copy((*it)->get_event_a());
+ Event* b_copy = m_duplicator->get_event_copy((*it)->get_event_b());
+ TimeRelationEventPtr relation = new TimeRelationEvent(it->get());
relation->glue_events(a_copy, b_copy);
m_duplicator->set_copy((*it).get(),relation.get());
if((it->get())->get_marked() == MARKED)
relation->set_marked();
}
-
}
////////////////////////////////////////////////////////////////////////
Modified: trunk/src/check/pseudocode/msc_duplicators.h
===================================================================
--- trunk/src/check/pseudocode/msc_duplicators.h 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/pseudocode/msc_duplicators.h 2013-10-11 09:27:00 UTC (rev 1864)
@@ -42,6 +42,7 @@
virtual ~Duplicator();
+ // TODO: make this (and possibly others) a template method returning the same type it accepts, so that dynamic casts are not necessary
MscElement*& get_copy(MscElement* e);
SuccessorNode* get_copy(SuccessorNode* s)
@@ -118,17 +119,17 @@
DFSAreaTraverser* m_traverser;
- void create_successor(MessageEvent* e);
+ void create_successor(Event* e);
- MessageEvent* get_preceding_event();
+ Event* get_preceding_event();
public:
EventsCreatorListener(BMscDuplicator* duplicator, DFSAreaTraverser* traverser, BMsc* bmsc);
- void on_white_event_found(MessageEvent* e);
- void on_gray_event_found(MessageEvent* e);
- void on_black_event_found(MessageEvent* e);
+ void on_white_event_found(Event* e);
+ void on_gray_event_found(Event* e);
+ void on_black_event_found(Event* e);
};
@@ -142,7 +143,7 @@
MessagesCreatorListener(BMscDuplicator* duplicator);
- void on_white_event_found(MessageEvent* e);
+ void on_white_event_found(Event* e);
};
@@ -157,7 +158,7 @@
TimeRelationCreatorListener(BMscDuplicator* duplicator);
- void on_white_event_found(MessageEvent* e);
+ void on_white_event_found(Event* e);
};
@@ -180,13 +181,19 @@
~BMscDuplicator();
- MessageEvent* get_event_copy(MessageEvent* e);
+ template <typename EventType>
+ EventType* get_event_copy(EventType* e)
+ {
+ MscElement* elem = get_copy(e);
+ EventType* copy = dynamic_cast<EventType*>(elem);
+ assert(copy != NULL);
+ return copy;
+ }
};
/**
* \brief HMscDuplicator creates exact copy of HMsc
*/
-
class SCPSEUDOCODE_EXPORT HMscDuplicator:
public Duplicator
{
@@ -447,12 +454,12 @@
~HMscFlatPathToBMscDuplicator();
BMscPtr duplicate_path(const MscElementPList& path);
+
+ // TODO: make this a template method returning the same type it accepts, so that dynamic casts are not necessary
MscElement* get_copy_with_occurence(MscElement* element, int occurence);
+ // TODO: make this a template method returning the same type it accepts, so that dynamic casts are not necessary
MscElement* get_copy_by_ref_node(MscElement* element, ReferenceNode* ref);
-
-
-
};
Modified: trunk/src/check/pseudocode/utils.h
===================================================================
--- trunk/src/check/pseudocode/utils.h 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/pseudocode/utils.h 2013-10-11 09:27:00 UTC (rev 1864)
@@ -37,16 +37,19 @@
/**
* \brief Returns event's next first successors
* if event is a send one, returns also its match event
- * TODO: move the functionality to MessageEvent
+ * TODO: move the functionality to Event, or MessageEvent, respectivelly (which would override it)
*/
class SCPSEUDOCODE_EXPORT EventFirstSuccessors
{
public:
- static MessageEventPSet get(MessageEvent* e)
+ static EventPSet get(const EventP e)
{
- MessageEventPSet events = e->get_instance()->get_successor_events(e);
- if(e->is_send() && e->get_matching_event())
- events.insert(e->get_matching_event());
+ EventPSet events = e->get_instance()->get_successor_events(e);
+
+ MessageEventP me = dynamic_cast<MessageEventP>(e);
+ if (me != NULL && me->is_send() && me->get_matching_event())
+ events.insert(me->get_matching_event());
+
return events;
}
}; // EventFirstSuccessors
@@ -82,31 +85,21 @@
class TopologyOrderListener:public EventFinishedListener
{
- MessageEventPList* m_topology;
+ EventPList* m_topology;
public:
- TopologyOrderListener(MessageEventPList* topology)
+ TopologyOrderListener(EventPList* topology)
{
m_topology = topology;
}
- void on_event_finished(MessageEvent* e)
+ void on_event_finished(Event* e)
{
m_topology->push_front(e);
}
};
-class EventRecognizer
-{
-public:
-
- static bool is_matched_receive(MessageEvent* e)
- {
- return e->is_matched() && e->is_receive();
- }
-};
-
/**
* \brief Handles visual closure on bmsc
* Init DFSEventsTraverser, TopologicalOrderListener
@@ -117,7 +110,7 @@
{
private:
BMscPtr m_bmsc;
- MessageEventPList m_event_topology;
+ EventPList m_event_topology;
ChannelMapperPtr m_mapper;
VisualClosureInitiator* m_p_visual_closure_initiator;
@@ -132,8 +125,10 @@
traverser.traverse(m_bmsc);
m_event_topology = topology_listener.get_topology();
- MessageEventPVector topology(topology_listener.get_topology().size());
- topology.assign(topology_listener.get_topology().begin(),topology_listener.get_topology().end());
+ EventPVector topology(
+ topology_listener.get_topology().begin(),
+ topology_listener.get_topology().end()
+ );
m_p_visual_closure_initiator = new VisualClosureInitiator();
m_p_visual_closure_initiator->initialize(topology); //here should be topologically sorted elements
@@ -185,7 +180,7 @@
/**
* \return true if a is less then b (a<b) or equal (a=b)
*/
- bool visual_is_leq(MessageEvent* a,MessageEvent *b)
+ bool visual_is_leq(Event* a, Event *b)
{
BoolVector vector = m_p_visual_closure_initiator->get_visual_closure(a);
@@ -195,7 +190,7 @@
/**
* \return true if a is less then b (a<b) or equal (a=b)
*/
- bool causal_is_leq(MessageEvent* a,MessageEvent *b)
+ bool causal_is_leq(Event* a, Event *b)
{
if(!m_p_causal_closure_initiator)
throw std::runtime_error("Causal closure hasnt been initialized!");
@@ -208,11 +203,9 @@
/**
* \return vector of topologically sorted events according to visual order
*/
- const MessageEventPVector get_topology()
+ const EventPVector get_topology()
{
- MessageEventPVector topology(m_event_topology.size());
- topology.assign(m_event_topology.begin(),m_event_topology.end());
- return topology;
+ return EventPVector(m_event_topology.begin(),m_event_topology.end());
}
};
@@ -316,7 +309,7 @@
* pick up all events
* (WhiteNodeFoundListener)
*/
-class AllReachableEventPVector:public std::vector<MessageEventP>, public WhiteEventFoundListener
+class AllReachableEventPVector:public std::vector<EventP>, public WhiteEventFoundListener
{
private:
DFSEventsTraverser m_traverser;
@@ -341,7 +334,7 @@
m_traverser.remove_white_event_found_listeners();
}
- void on_white_event_found(MessageEvent* e)
+ void on_white_event_found(Event* e)
{
this->push_back(e);
}
@@ -352,7 +345,7 @@
* Go through the vector of all events using AllReachableEventPVector
* and using EventTopologyHandler choose minimal events
*/
-class MinimalEventPList: public std::list<MessageEventP>
+class MinimalEventPList: public std::list<EventP>
{
private:
AllReachableEventPVector m_events;
@@ -361,8 +354,8 @@
public:
MinimalEventPList(BMscPtr bmsc):m_events(bmsc),m_event_top(bmsc)
{
- MessageEventPVector::iterator it;
- MessageEventPVector::iterator it_b;
+ EventPVector::iterator it;
+ EventPVector::iterator it_b;
for (it=m_events.begin();it!=m_events.end();it++)
{
bool is_minimal = true;
@@ -385,7 +378,7 @@
* Go through the vector of all events using AllReachableEventPVector
* and using EventTopologyHandler choose maximal events
*/
-class MaximalEventPList: public std::list<MessageEventP>
+class MaximalEventPList: public std::list<EventP>
{
private:
AllReachableEventPVector m_events;
@@ -394,8 +387,8 @@
public:
MaximalEventPList(BMscPtr bmsc):m_events(bmsc),m_event_top(bmsc)
{
- MessageEventPVector::iterator it;
- MessageEventPVector::iterator it_b;
+ EventPVector::iterator it;
+ EventPVector::iterator it_b;
for (it=m_events.begin();it!=m_events.end();it++)
{
bool is_maximal = true;
Modified: trunk/src/check/pseudocode/visual_closure_initiator.cpp
===================================================================
--- trunk/src/check/pseudocode/visual_closure_initiator.cpp 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/pseudocode/visual_closure_initiator.cpp 2013-10-11 09:27:00 UTC (rev 1864)
@@ -39,8 +39,8 @@
return; // nothing to do, there is no non-empty predecessor area
}
- MessageEventPList max_events = pred_area->get_maximal_events();
- for (MessageEventPList::const_iterator it = max_events.begin(); it != max_events.end(); ++it)
+ EventPList max_events = pred_area->get_maximal_events();
+ for (EventPList::const_iterator it = max_events.begin(); it != max_events.end(); ++it)
make_closure(closure_matrix, succ_index, get_topology_index(*it));
}
@@ -51,7 +51,7 @@
void VisualClosureInitiator::cleanup_attributes()
{
- MessageEventPList::iterator e;
+ EventPList::iterator e;
for(e=m_modified_events.begin();e!=m_modified_events.end();e++)
{
(*e)->remove_attribute<size_t>(m_topology_index_attribute);
@@ -60,14 +60,14 @@
m_modified_events.erase(m_modified_events.begin(),m_modified_events.end());
}
-void VisualClosureInitiator::initialize(const MessageEventPVector& event_topology)
+void VisualClosureInitiator::initialize(const EventPVector& event_topology)
{
//initialize vectors of visual closure of events
//closure[x][y]==true <=> x<*y
std::vector<BoolVector*> closure(event_topology.size());
for(size_t i=0;i<event_topology.size();i++)
{
- MessageEvent* event = event_topology[i];
+ Event* event = event_topology[i];
BoolVector& event_closure = get_visual_closure(event);
event_closure.resize(event_topology.size(),false);
set_topology_index(event,i);
@@ -75,25 +75,28 @@
m_modified_events.push_back(event);
}
//compute visual closures of events' ordering
- make_closure(closure,event_topology);
+ make_closure(closure, event_topology);
}
-void VisualClosureInitiator::make_closure(std::vector<BoolVector*>& closure, const MessageEventPVector& event_topology)
+void VisualClosureInitiator::make_closure(std::vector<BoolVector*>& closure_matrix, const EventPVector& event_topology)
{
for(size_t e=0; e<event_topology.size(); e++)
{
- (*closure[e])[e] = true;
- MessageEvent* event_e = event_topology[e];
+ (*closure_matrix[e])[e] = true;
+ Event* event_e = event_topology[e];
+
//send event is predecessor
- if(event_e->is_receive() && event_e->is_matched())
+ MessageEvent* msg_event_e = dynamic_cast<MessageEvent*>(event_e);
+ if(msg_event_e != NULL && msg_event_e->is_receive() && msg_event_e->is_matched())
{
- make_closure(closure,e,get_topology_index(event_e->get_matching_event()));
+ make_closure(closure_matrix,e,get_topology_index(msg_event_e->get_matching_event()));
}
- make_closure(closure,e,event_e);
+
+ make_closure(closure_matrix,e,event_e);
}
}
-void VisualClosureInitiator::make_closure(std::vector<BoolVector*>& closure, size_t e, MessageEvent* event_e)
+void VisualClosureInitiator::make_closure(std::vector<BoolVector*>& closure, size_t e, Event* event_e)
{
if (event_e->is_minimal())
{
@@ -102,18 +105,18 @@
}
else
{
- MessageEventPSet preds = event_e->get_predecessor_events();
- for (MessageEventPSet::const_iterator it = preds.begin(); it != preds.end(); ++it)
+ EventPSet preds = event_e->get_predecessor_events();
+ for (EventPSet::const_iterator it = preds.begin(); it != preds.end(); ++it)
make_closure(closure, e, get_topology_index(*it));
}
}
-size_t VisualClosureInitiator::get_topology_index(MessageEvent* e)
+size_t VisualClosureInitiator::get_topology_index(Event* e)
{
return e->get_attribute<size_t>(m_topology_index_attribute,0);
}
-void VisualClosureInitiator::set_topology_index(MessageEvent* e,size_t i)
+void VisualClosureInitiator::set_topology_index(Event* e,size_t i)
{
e->set_attribute<size_t>(m_topology_index_attribute,i);
}
Modified: trunk/src/check/pseudocode/visual_closure_initiator.h
===================================================================
--- trunk/src/check/pseudocode/visual_closure_initiator.h 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/pseudocode/visual_closure_initiator.h 2013-10-11 09:27:00 UTC (rev 1864)
@@ -37,16 +37,16 @@
protected:
- MessageEventPList m_topology;
+ EventPList m_topology;
public:
- const MessageEventPList& get_topology()
+ const EventPList& get_topology()
{
return m_topology;
}
- virtual void on_event_finished(MessageEvent* event)
+ virtual void on_event_finished(Event* event)
{
m_topology.push_front(event);
}
@@ -61,7 +61,7 @@
/**
* Events with modified attributes
*/
- MessageEventPList m_modified_events;
+ EventPList m_modified_events;
/**
* Name of topology attribute.
@@ -86,12 +86,12 @@
/**
* Completes closure_matrix for topologicaly sorted event - event_topology
*/
- void make_closure(std::vector<BoolVector*>& closure_matrix, const MessageEventPVector& event_topology);
+ void make_closure(std::vector<BoolVector*>& closure_matrix, const EventPVector& event_topology);
/**
* Completes closure_matrix for event_e with index e
*/
- void make_closure(std::vector<BoolVector*>& closure_matrix, size_t e, MessageEvent* event_e);
+ void make_closure(std::vector<BoolVector*>& closure_matrix, size_t e, Event* event_e);
public:
@@ -118,12 +118,12 @@
* @param event_topology - topologically sorted events of BMsc
* (i<j <=> (event_topology[i]<event_topology[j] or event_topology[i]||event_topology[j]).
*/
- void initialize(const MessageEventPVector& event_topology);
+ void initialize(const EventPVector& event_topology);
/**
* Getter of visual closure attribute of e.
*/
- BoolVector& get_visual_closure(MessageEvent* e)
+ BoolVector& get_visual_closure(Event* e)
{
static BoolVector empty(1,false);
return e->get_attribute<BoolVector>(m_visual_closure_attribute,empty);
@@ -132,12 +132,12 @@
/**
* Getter of topology index attribute of e.
*/
- size_t get_topology_index(MessageEvent* e);
+ size_t get_topology_index(Event* e);
/**
* Setter of topology index attribute of e.
*/
- void set_topology_index(MessageEvent* e,size_t i);
+ void set_topology_index(Event* e,size_t i);
/**
* Cleans up set attributes.
Modified: trunk/src/check/race/footprint.cpp
===================================================================
--- trunk/src/check/race/footprint.cpp 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/race/footprint.cpp 2013-10-11 09:27:00 UTC (rev 1864)
@@ -28,7 +28,7 @@
return a->operator <(*b.get());
}
-EventDependentInstances::EventDependentInstances(MessageEvent* event,size_t instances_count)
+EventDependentInstances::EventDependentInstances(Event* event,size_t instances_count)
{
m_event = event;
m_instances = BoolVector(instances_count,false);
@@ -63,7 +63,7 @@
return m_instances;
}
-MessageEvent* EventDependentInstances::get_event()
+Event* EventDependentInstances::get_event()
{
return m_event;
}
Modified: trunk/src/check/race/footprint.h
===================================================================
--- trunk/src/check/race/footprint.h 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/race/footprint.h 2013-10-11 09:27:00 UTC (rev 1864)
@@ -54,7 +54,7 @@
/**
* Represents dependent Instances -- contain lesser/greater (depends on chosen semantic)
- * MessageEvent then the MessageEvent with specified m_event in this class.
+ * Event then the Event with specified m_event in this class.
*/
class EventDependentInstances
{
@@ -62,14 +62,14 @@
private:
/**
- * This instance of DependetInstances represents dependet instances of an MessageEvent
+ * This instance of DependetInstances represents dependent instances of an Event
* of this attribute
*/
- MessageEvent* m_event;
+ Event* m_event;
/**
* Each Instance i must have its own number. For this vector m_instances holds:
- * m_instances[i]==true iff i contains any greater/lesser MessageEvent than the MessageEvent
+ * m_instances[i]==true iff i contains any greater/lesser Event than the Event
* m_event.
*/
BoolVector m_instances;
@@ -79,7 +79,7 @@
/**
*
*/
- EventDependentInstances(MessageEvent* event,size_t instances_count);
+ EventDependentInstances(Event* event,size_t instances_count);
/**
* Used in std::set as comparision method
@@ -97,7 +97,7 @@
const BoolVector& get_instances();
- MessageEvent* get_event();
+ Event* get_event();
};
@@ -107,7 +107,7 @@
protected:
/**
- * Holds greater/lesser Instances of Events accessible under id of MessageEvent's
+ * Holds greater/lesser Instances of Events accessible under id of Event's
* Instance.
*/
EDInstancesPtrSetVector m_events_instances;
Modified: trunk/src/check/race/race_checker.cpp
===================================================================
--- trunk/src/check/race/race_checker.cpp 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/race/race_checker.cpp 2013-10-11 09:27:00 UTC (rev 1864)
@@ -47,7 +47,7 @@
bmsc->add_instance(i);
StrictOrderAreaPtr a(new StrictOrderArea());
i->add_area(a);
- MessageEventPtr e = a->add_event();
+ MessageEventPtr e = a->add_event(new MessageEvent());
IncompleteMessagePtr m(new IncompleteMessage(LOST));
m->glue_event(e);
}
@@ -72,15 +72,15 @@
BMscPtr b = node->get_bmsc();
const InstancePtrList& instances = b->get_instances();
//compute minimal Events of Instances
- MessageEventPList minimal_events;
+ EventPList minimal_events;
InstancePtrList::const_iterator i;
for(i=instances.begin();i!=instances.end();i++)
{
- MessageEventPListPtr events = DFSInstanceEventsTraverser::topology_order((*i).get());
- MessageEventPList::const_iterator e1;
+ EventPListPtr events = DFSInstanceEventsTraverser::topology_order(i->get());
+ EventPList::const_iterator e1;
for(e1 = events->begin();e1!=events->end();e1++)
{
- MessageEventPList::const_iterator e2;
+ EventPList::const_iterator e2;
for(e2 = events->begin();e2!=events->end();e2++)
{
if(e1!=e2)
@@ -91,27 +91,26 @@
if(e2_causal[e1_index]) break;
}
}
- //'while loop' hasn't found any MessageEvent e2 to be less than e1
+ //'while loop' hasn't found any Event e2 to be less than e1
if(e2==events->end())
minimal_events.push_back(*e1);
}
}
/*
- For each MessageEvent e1 from minimal_events find Instances containing less Events
- than MessageEvent e1 in minimal_events.
- Note that if there exists any MessageEvent e2<e1 at Instance i, e2 must be grater
- or equal to some MessageEvent e3 in minimal_events, therefore we will use only
+ For each Event e1 from minimal_events find Instances containing less Events
+ than Event e1 in minimal_events.
+ Note that if there exists any Event e2<e1 at Instance i, e2 must be grater
+ or equal to some Event e3 in minimal_events, therefore we will use only
minimal_events to seek.
*/
- MessageEventPList::const_iterator e;
+ EventPList::const_iterator e;
ExtremeEvents& extreme_events = get_events(b.get());
m_modified_bmscs.push_back(b.get());
for(e=minimal_events.begin();e!=minimal_events.end();e++)
{
- EDInstancesPtr e_instances(
- new EventDependentInstances(*e,m_instance_marker->get_count()));
+ EDInstancesPtr e_instances(new EventDependentInstances(*e,m_instance_marker->get_count()));
size_t e_index = m_vis_initiator->get_topology_index(*e);
- MessageEventPList::const_iterator f;
+ EventPList::const_iterator f;
for(f=minimal_events.begin();f!=minimal_events.end();f++)
{
//if f is less than e (not equal) then Instance of f must be inserted
@@ -156,16 +155,16 @@
BMscPtr b = node->get_bmsc();
const InstancePtrList& instances = b->get_instances();
//compute maximal Events of Instances
- MessageEventPList maximal_events;
+ EventPList maximal_events;
InstancePtrList::const_iterator i;
for(i=instances.begin();i!=instances.end();i++)
{
- MessageEventPListPtr events = DFSInstanceEventsTraverser::topology_order((*i).get());
- MessageEventPList::const_iterator e1 = events->begin();
+ EventPListPtr events = DFSInstanceEventsTraverser::topology_order((*i).get());
+ EventPList::const_iterator e1 = events->begin();
while(e1!=events->end())
{
BoolVector& e1_causal = m_caus_initiator->get_causal_closure(*e1);
- MessageEventPList::const_iterator e2 = events->begin();
+ EventPList::const_iterator e2 = events->begin();
while(e2!=events->end())
{
//we are looking only for different events to be greater
@@ -177,30 +176,28 @@
}
e2++;
}
- //'while loop' hasn't found any MessageEvent e2 to be greater than e1
+ //'while loop' hasn't found any Event e2 to be greater than e1
if(e2==events->end())
maximal_events.push_back(*e1);
e1++;
}
}
/*
- * For any MessageEvent e1 from maximal_events find Instances containing any MessageEvent e2
- * such that e2<<e1 and instances containing any MessageEvent e3 such that e1<<e3.
+ * For any Event e1 from maximal_events find Instances containing any Event e2
+ * such that e2<<e1 and instances containing any Event e3 such that e1<<e3.
*/
- MessageEventPList::const_iterator e;
+ EventPList::const_iterator e;
ExtremeEvents& extreme_events_greater = get_events_greater(b.get());
ExtremeEvents& extreme_events_less = get_events_less(b.get());
m_modified_bmscs.push_back(b.get());
- MessageEventPListPtr events = DFSEventsTraverser::topology_order(b);
+ EventPListPtr events = DFSEventsTraverser::topology_order(b);
for(e=maximal_events.begin();e!=maximal_events.end();e++)
{
- EDInstancesPtr e_instances_greater(
- new EventDependentInstances(*e,m_instance_marker->get_count()));
- EDInstancesPtr e_instances_less(
- new EventDependentInstances(*e,m_instance_marker->get_count()));
+ EDInstancesPtr e_instances_greater(new EventDependentInstances(*e,m_instance_marker->get_count()));
+ EDInstancesPtr e_instances_less(new EventDependentInstances(*e,m_instance_marker->get_count()));
size_t e_index = m_vis_initiator->get_topology_index(*e);
const BoolVector& e_closure = m_caus_initiator->get_causal_closure(*e);
- MessageEventPList::const_iterator f;
+ EventPList::const_iterator f;
/*
Note that in the article only Events from MinP (used D \in MinP notation in
the article) are supposed to be checked. Nothing changes if we check all
@@ -270,26 +267,30 @@
return result;
}
-BMscPtr RaceChecker::create_counter_example(MessageEvent* e1, MessageEvent* e2)
+BMscPtr RaceChecker::create_counter_example(Event* e1, Event* e2)
{
BMscDuplicator duplicator;
BMscPtr original = e1->get_instance()->get_bmsc();
+
+ // NOTE: race should only occur with message events; just for sure...
+ MessageEvent* me1 = dynamic_cast<MessageEvent*>(e1);
+ MessageEvent* me2 = dynamic_cast<MessageEvent*>(e2);
e1->set_marked();
e2->set_marked();
- e1->get_message().get()->set_marked();
- e2->get_message().get()->set_marked();
+ if (me1 != NULL) me1->get_message().get()->set_marked();
+ if (me2 != NULL) me2->get_message().get()->set_marked();
BMscPtr copy = duplicator.duplicate_bmsc(original);
e1->set_marked(NONE);
e2->set_marked(NONE);
- e1->get_message().get()->set_marked(NONE);
- e2->get_message().get()->set_marked(NONE);
+ if (me1 != NULL) me1->get_message().get()->set_marked(NONE);
+ if (me2 != NULL) me2->get_message().get()->set_marked(NONE);
return copy;
}
-bool RaceChecker::check_events(MessageEvent* e1, MessageEvent* e2)
+bool RaceChecker::check_events(Event* e1, Event* e2)
{
//e1<e2 or they are unordered because of topology order with respect to <
BoolVector& e1_visual_order = m_visual_initiator.get_visual_closure(e1);
@@ -305,11 +306,8 @@
std::list<BMscPtr> RaceChecker::check_bmsc(BMscPtr bmsc, ChannelMapperPtr mapper)
{
- MessageEventPListPtr t = DFSEventsTraverser::topology_order(bmsc);
- MessageEventPVector topology(
- t->begin(),
- t->end()
- );
+ EventPListPtr t = DFSEventsTraverser::topology_order(bmsc);
+ EventPVector topology(t->begin(), t->end());
m_visual_initiator.initialize(topology);
m_causal_initiator.initialize(topology,m_visual_initiator,mapper);
std::list<BMscPtr> result;
@@ -610,15 +608,18 @@
EDInstancesPtrSet::const_iterator b;
for(b=bmsc_edi[i].begin();b!=bmsc_edi[i].end();b++)
{
- MessageEvent* b_event = (*b)->get_event();
- if(b_event->is_receive())
+ MessageEvent* b_event = dynamic_cast<MessageEvent*>((*b)->get_event());
+ if(b_event != NULL && b_event->is_receive())
{
const BoolVector& b_instances = (*b)->get_instances();
const EDInstancesPtrSetVector& fooprint_edi = m_footprint->get_events_instances();
EDInstancesPtrSet::const_iterator a;
for(a=fooprint_edi[i].begin();a!=fooprint_edi[i].end();a++)
{
- MessageEvent* a_event = (*a)->get_event();
+ MessageEvent* a_event = dynamic_cast<MessageEvent*>((*a)->get_event());
+ if (a_event == NULL)
+ continue;
+
if(a_event->is_receive() && !m_mapper->same_channel(a_event,b_event))
{
m_counterexamples.push_back(RaceInHMscException(f,b_event,a_event,get_reached_elements().back()));
Modified: trunk/src/check/race/race_checker.h
===================================================================
--- trunk/src/check/race/race_checker.h 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/race/race_checker.h 2013-10-11 09:27:00 UTC (rev 1864)
@@ -89,7 +89,7 @@
* becomes members of new Footprint f2.
*
* When computing new Footprint it is neccessary to find relation between Events
- * in f1 and Events in MaxP of b in case there is some MessageEvent from f1 which belongs
+ * in f1 and Events in MaxP of b in case there is some Event from f1 which belongs
* to new f2 too. This listener prepares structure for this purpose too.
*
* Details are described in Lemma 15 of the article.
@@ -246,7 +246,7 @@
/**
* It was found that e1<e2 but not e1<<e2
*/
- BMscPtr create_counter_example(MessageEvent* e1, MessageEvent* e2);
+ BMscPtr create_counter_example(Event* e1, Event* e2);
/**
*
@@ -303,7 +303,7 @@
return true;
}
- bool check_events(MessageEvent* e1, MessageEvent* e2);
+ bool check_events(Event* e1, Event* e2);
};
class RaceInBMscException:public std::exception
Modified: trunk/src/check/time/constraint_syntax.cpp
===================================================================
--- trunk/src/check/time/constraint_syntax.cpp 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/time/constraint_syntax.cpp 2013-10-11 09:27:00 UTC (rev 1864)
@@ -360,8 +360,8 @@
std::set<TimeRelationEventPtr>::iterator rel;
for(rel=time_relations.begin();rel!=time_relations.end();rel++)
{
- MessageEvent* a = (*rel)->get_event_a();
- MessageEvent* b = (*rel)->get_event_b();
+ Event* a = (*rel)->get_event_a();
+ Event* b = (*rel)->get_event_b();
if(!events_top.visual_is_leq(a,b)&&!events_top.visual_is_leq(b,a))
m_broken_rel.push(*rel);
}
Modified: trunk/src/check/time/hmsc_all_paths.cpp
===================================================================
--- trunk/src/check/time/hmsc_all_paths.cpp 2013-09-26 12:48:24 UTC (rev 1863)
+++ trunk/src/check/time/hmsc_all_paths.cpp 2013-10-11 09:27:00 UTC (rev 1864)
@@ -1,4 +1,5 @@
#include "hmsc_all_paths.h"
+#include <vector>
void AllPaths::traverse()
{
@@ -14,10 +15,9 @@
}
-void AllPaths::all_paths(
-HMscNodePtr node,
-MscElementPList path_prefix2
-)
+//#define MYDBG
+
+void AllPaths::all_paths(HMscNodePtr node, MscElementPList path_prefix2, SystemState system_state)
{
HMscNodePtrSet::iterator last_it;
std::list<PathFoundListener*>::iterator listener_it;
@@ -46,7 +46,7 @@
}
}
- set_number(node,get_number(node)+1); //increment occurence counter of node
+ set_number(node, get_number(node, system_state)+1, system_state); //increment occurence counter of node
//check whether node has successors
PredecessorNode * pre;
@@ -58,10 +58,44 @@
//keep poping until reference node is reached
while(!dynamic_cast<HMscNode*>(path_prefix2.back()))
path_prefix2.pop_back();
- set_number(node, 0);
+ set_number(node, 0, system_state);
return;
}
+ // update the system state
+ // ...from condition nodes
+ ConditionNodePtr cond = boost::dynamic_pointer_cast<ConditionNode>(node);
+ if (cond != NULL)
+ {
+ const std::vector<std::string> names = cond->get_names();
+ switch (cond->get_type())
+ {
+ case ConditionNode::SETTING:
+ for (std::vector<std::string>::const_iterator i = names.begin(); i != names.end(); ++i)
+ system_state.insert(*i);
+ break;
+ case ConditionNode::UNSETTING:
+ for (std::vector<std::string>::const_iterator i = names.begin(); i != names.end(); ++i)
+ system_state.erase(*i);
+ break;
+ default:
+ ; // other condition types have no effect on the system state
+ }
+ }
+ // ... and reference nodes
+ ReferenceNodePtr ref = boost::dynamic_pointer_cast<ReferenceNode>(node);
+ if (ref != NULL)
+ {
+ BMscPtr bmsc = ref->get_bmsc();
+ if (bmsc != NULL)
+ {
+ std::pair<SystemState, SystemState> cond_effect = bmsc->get_condition_effect();
+ for (SystemState::const_iterator i = cond_effect.first.begin(); i != cond_effect.first.end(); ++i)
+ system_state.insert(*i);
+ for (SystemState::const_iterator i = cond_effect.second.begin(); i != cond_effect.second.end(); ++i)
+ system_state.erase(*i);
+ }
+ }
//traverse all successors which do not occur in path_prefix more than m_occurence
NodeRelationPtrVector set_succ = pre->get_successors();
@@ -69,15 +103,31 @@
for(rel=set_succ.begin(); rel!=set_succ.end();rel++)
{
const NodeRelationPtr& node_relation = *rel;
- HMscNodePtr new_node(dynamic_cast<HMscNode*>(node_relation.get()->get_successor()));
- if(get_number(new_node)<m_occurence)
+ HMscNodePtr new_node(dynamic_cast<HMscNode*>(node_relation->get_successor()));
+ if(get_number(new_node, system_state)<m_occurence)
{
-
- path_prefix2.push_back(node_relation.get()); //update attribute
- all_paths(new_node,path_prefix2);
-
+ // check for an unsatisfied guard
+ ConditionNodePtr new_cond_node = boost::dynamic_pointer_cast<ConditionNode>(new_node);
+ if (new_cond_node != NULL)
+ {
+ if (new_cond_node->get_type() == ConditionNode::GUARDING)
+ {
+ bool satisfied = false;
+ const std::vector<std::string> names = new_cond_node->get_names();
+ for (std::vector<std::string>::const_iterator i = names.begin(); i != names.end(); ++i)
+ if (system_state.find(*i) != system_state.end())
+ {
+ satisfied = true;
+ break;
+ }
+ if (!satisfied)
+ continue;
+ }
+ }
+
+ path_prefix2.push_back(node_relation.get()); //update attribute
+ all_paths(new_node,path_prefix2, system_state);
}
-
}
//all successors have been traversed-> update attributes and finish.
@@ -85,6 +135,6 @@
//keep poping until reference node is reached
while(!dynamic_cast<HMscNode*>(path_prefix2.back()))
path_prefix2.pop_back();
- set_number(node, get_number(node)-1);
+ set_number(node, get_number(node, system_state)-1, system_state);
...
[truncated message content] |