scstudio-commits Mailing List for Sequence Chart Studio

Status: Beta

Brought to you by: gotthardp, lkorenciak, madzin, obouda, and 2 others

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

Flat | Threaded

1 2 3 .. 77 > >> (Page 1 of 77)

[Scstudio-commits] SF.net SVN: scstudio:[1913] trunk/CHANGELOG

From: <xr...@us...> - 2016-01-14 17:42:16

Revision: 1913
          http://sourceforge.net/p/scstudio/code/1913
Author:   xrehak
Date:     2016-01-14 17:42:13 +0000 (Thu, 14 Jan 2016)
Log Message:
-----------
typo in CHANGELOG

Modified Paths:
--------------
    trunk/CHANGELOG

Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2016-01-14 17:38:50 UTC (rev 1912)
+++ trunk/CHANGELOG	2016-01-14 17:42:13 UTC (rev 1913)
@@ -9,17 +9,17 @@
 
 
 ######################
-# Version 0.5.4
+# Version 0.5.4.1
 
-  20-Jan_2014, svn revision 1912
+  20-Jan_2014, svn revision 1913
 
 * bug No. 100 fixed
 * added install registers for Visio 2013 and 2016 
-( unfortunatelly, SCStudio is unreachable from Visio menu :( )
+( unfortunatelly, SCStudio is not compatible with these versions :( )
   
 
 ######################
-# Version 0.5.4.1
+# Version 0.5.4
 
   14-Jan_2014, svn revision 1885
   

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1912] trunk

From: <xr...@us...> - 2016-01-14 17:38:52

Revision: 1912
          http://sourceforge.net/p/scstudio/code/1912
Author:   xrehak
Date:     2016-01-14 17:38:50 +0000 (Thu, 14 Jan 2016)
Log Message:
-----------
Ready for release 0.5.4.1

Modified Paths:
--------------
    trunk/CHANGELOG
    trunk/src/view/visio/addon/dllmodule.rc
    trunk/src/view/visio/scstudio.nsi

Modified: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG	2016-01-12 16:33:11 UTC (rev 1911)
+++ trunk/CHANGELOG	2016-01-14 17:38:50 UTC (rev 1912)
@@ -11,8 +11,18 @@
 ######################
 # Version 0.5.4
 
-  20-Jan_2014, svn revision 1885
+  20-Jan_2014, svn revision 1912
+
+* bug No. 100 fixed
+* added install registers for Visio 2013 and 2016 
+( unfortunatelly, SCStudio is unreachable from Visio menu :( )
   
+
+######################
+# Version 0.5.4.1
+
+  14-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)

Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc	2016-01-12 16:33:11 UTC (rev 1911)
+++ trunk/src/view/visio/addon/dllmodule.rc	2016-01-14 17:38:50 UTC (rev 1912)
@@ -593,8 +593,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,5,4,0
- PRODUCTVERSION 0,5,4,0
+ FILEVERSION 0,5,4,1
+ PRODUCTVERSION 0,5,4,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x9L
@@ -611,13 +611,13 @@
         BEGIN
             VALUE "CompanyName", "Masaryk University Brno"
             VALUE "FileDescription", "Microsoft Visio add-on for design and verification of Message Sequence Charts (MSC)."
-            VALUE "FileVersion", "0.5.4"
+            VALUE "FileVersion", "0.5.4.1"
             VALUE "InternalName", "scstudio.vsl"
             VALUE "LegalCopyright", "(c) Lubos Korenciak. All rights reserved."
             VALUE "OriginalFilename", "scstudio.vsl"
             VALUE "PrivateBuild", "$Revision$"
             VALUE "ProductName", "Sequence Chart Studio"
-            VALUE "ProductVersion", "0.5.4"
+            VALUE "ProductVersion", "0.5.4.1"
         END
     END
     BLOCK "VarFileInfo"

Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi	2016-01-12 16:33:11 UTC (rev 1911)
+++ trunk/src/view/visio/scstudio.nsi	2016-01-14 17:38:50 UTC (rev 1912)
@@ -34,9 +34,16 @@
 !define RegChecksPath "Software\Sequence Chart Studio\Checks"
 !define RegMsgNumberingPath "Software\Sequence Chart Studio\MessageNumbering"
 
+; Visio 2003 add-on paths
 !define Visio11RegPath "Software\Microsoft\Office\11.0\Visio"
+; Visio 2007 add-on paths
 !define Visio12RegPath "Software\Microsoft\Office\12.0\Visio"
+; Visio 2010 add-on paths
 !define Visio14RegPath "Software\Microsoft\Office\14.0\Visio"
+; Visio 2013 add-on paths
+!define Visio15RegPath "Software\Microsoft\Office\15.0\Visio"
+; Visio 2016 add-on paths
+!define Visio16RegPath "Software\Microsoft\Office\16.0\Visio"
 
 RequestExecutionLevel admin
 
@@ -203,6 +210,8 @@
   ${RemoveMatchedFileLines} "Microsoft\Visio\content.dat" "scstudio"
   ${RemoveMatchedFileLines} "Microsoft\Visio\content12.dat" "scstudio"
   ${RemoveMatchedFileLines} "Microsoft\Visio\content14.dat" "scstudio"
+  ${RemoveMatchedFileLines} "Microsoft\Visio\content15.dat" "scstudio"
+  ${RemoveMatchedFileLines} "Microsoft\Visio\content16.dat" "scstudio"
   Delete "$TEMP\nsis.dll"
 
   SetOutPath $INSTDIR\bin
@@ -216,6 +225,8 @@
   ${AppendRegStr} ${Visio11RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
   ${AppendRegStr} ${Visio12RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
   ${AppendRegStr} ${Visio14RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
+  ${AppendRegStr} ${Visio15RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
+  ${AppendRegStr} ${Visio16RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
 
   SetOutPath $INSTDIR\help
   File /r "..\..\..\doc\help\*.html"
@@ -239,6 +250,12 @@
   ; modify Visio 2010 add-on paths
   ${AppendRegStr} ${Visio14RegPath} "Application" "StencilPath" "$INSTDIR\stencils"
   ${AppendRegStr} ${Visio14RegPath} "Application" "TemplatePath" "$INSTDIR\stencils"
+  ; modify Visio 2013 add-on paths
+  ${AppendRegStr} ${Visio15RegPath} "Application" "StencilPath" "$INSTDIR\stencils"
+  ${AppendRegStr} ${Visio15RegPath} "Application" "TemplatePath" "$INSTDIR\stencils"
+  ; modify Visio 2016 add-on paths
+  ${AppendRegStr} ${Visio16RegPath} "Application" "StencilPath" "$INSTDIR\stencils"
+  ${AppendRegStr} ${Visio16RegPath} "Application" "TemplatePath" "$INSTDIR\stencils"
 
   ; remove old modules
   ; FIXME: remove modules with the "sc_" prefix
@@ -467,6 +484,14 @@
   ${RemoveRegStr} ${Visio14RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
   ${RemoveRegStr} ${Visio14RegPath} "Application" "StencilPath" "$INSTDIR\stencils"
   ${RemoveRegStr} ${Visio14RegPath} "Application" "TemplatePath" "$INSTDIR\stencils"
+  ; modify Visio 2013 add-on paths
+  ${RemoveRegStr} ${Visio15RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
+  ${RemoveRegStr} ${Visio15RegPath} "Application" "StencilPath" "$INSTDIR\stencils"
+  ${RemoveRegStr} ${Visio15RegPath} "Application" "TemplatePath" "$INSTDIR\stencils"
+  ; modify Visio 2016 add-on paths
+  ${RemoveRegStr} ${Visio16RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
+  ${RemoveRegStr} ${Visio16RegPath} "Application" "StencilPath" "$INSTDIR\stencils"
+  ${RemoveRegStr} ${Visio16RegPath} "Application" "TemplatePath" "$INSTDIR\stencils"
 
   ; unregister modules
   DeleteRegKey HKCU "Software\Sequence Chart Studio"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1911] trunk/tests

From: <xr...@us...> - 2016-01-12 16:33:14

Revision: 1911
          http://sourceforge.net/p/scstudio/code/1911
Author:   xrehak
Date:     2016-01-12 16:33:11 +0000 (Tue, 12 Jan 2016)
Log Message:
-----------
mpr svn:eol-style property

Modified Paths:
--------------
    trunk/tests/diff/flow12_1.mpr
    trunk/tests/diff/flow12_2.mpr
    trunk/tests/diff/spec12.mpr
    trunk/tests/membership/partial_mem_easy.mpr
    trunk/tests/membership/partial_mem_easy_pat3.mpr
    trunk/tests/membership/partial_mem_easy_pat4.mpr
    trunk/tests/membership/test_bmsc35.mpr
    trunk/tests/membership/test_hmsc35.mpr
    trunk/tests/membership/test_hmsc36.mpr
    trunk/tests/race/race_pos_2_actions.mpr
    trunk/tests/race/race_pos_3_action_small.mpr
    trunk/tests/time/consistency/cons_neg_37.mpr
    trunk/tests/time/consistency/cons_pos_21.mpr
    trunk/tests/time/consistency/cons_pos_22.mpr
    trunk/tests/time/consistency/cons_pos_23.mpr
    trunk/tests/time/consistency/cons_pos_24.mpr
    trunk/tests/time/time_race/race_cond_neg1.mpr
    trunk/tests/time/time_race/race_cond_neg2.mpr
    trunk/tests/time/time_race/race_cond_pos2.mpr
    trunk/tests/time/time_race/race_cond_pos3.mpr
    trunk/tests/time/time_race/race_pos_2_actions.mpr
    trunk/tests/time/time_race/race_pos_3_action_small.mpr
    trunk/tests/time_relevant_ordering/tro_test00.mpr
    trunk/tests/time_relevant_ordering/tro_test01.mpr
    trunk/tests/time_relevant_ordering/tro_test02.mpr
    trunk/tests/time_relevant_ordering/tro_test03.mpr
    trunk/tests/time_relevant_ordering/tro_test04.mpr
    trunk/tests/time_relevant_ordering/tro_test05.mpr
    trunk/tests/time_relevant_ordering/tro_test06.mpr
    trunk/tests/time_relevant_ordering/tro_test07.mpr
    trunk/tests/time_relevant_ordering/tro_test08.mpr
    trunk/tests/time_relevant_ordering/tro_test09.mpr
    trunk/tests/time_relevant_ordering/tro_test10.mpr
    trunk/tests/z120_test/z120_test94.mpr
    trunk/tests/z120_test/z120_time50.mpr
    trunk/tests/z120_test/z120_time51.mpr
    trunk/tests/z120_test/z120_time52.mpr

Property Changed:
----------------
    trunk/tests/diff/coregion.mpr
    trunk/tests/diff/coregion_flow.mpr
    trunk/tests/diff/flow01.mpr
    trunk/tests/diff/flow02_1.mpr
    trunk/tests/diff/flow02_2.mpr
    trunk/tests/diff/flow02_3.mpr
    trunk/tests/diff/flow02_4.mpr
    trunk/tests/diff/flow04_5.mpr
    trunk/tests/diff/flow04_6.mpr
    trunk/tests/diff/flow05_1.mpr
    trunk/tests/diff/flow05_2.mpr
    trunk/tests/diff/flow05_3.mpr
    trunk/tests/diff/flow06_1.mpr
    trunk/tests/diff/flow06_2.mpr
    trunk/tests/diff/flow06_3.mpr
    trunk/tests/diff/flow07_1.mpr
    trunk/tests/diff/flow07_2.mpr
    trunk/tests/diff/flow08_1.mpr
    trunk/tests/diff/flow09_1.mpr
    trunk/tests/diff/flow10.mpr
    trunk/tests/diff/flow11.mpr
    trunk/tests/diff/flow12_1.mpr
    trunk/tests/diff/flow12_2.mpr
    trunk/tests/diff/spec01.mpr
    trunk/tests/diff/spec02.mpr
    trunk/tests/diff/spec05.mpr
    trunk/tests/diff/spec06.mpr
    trunk/tests/diff/spec07.mpr
    trunk/tests/diff/spec08.mpr
    trunk/tests/diff/spec09.mpr
    trunk/tests/diff/spec10.mpr
    trunk/tests/diff/spec11.mpr
    trunk/tests/diff/spec12.mpr
    trunk/tests/membership/BMSCxBMSC1.mpr
    trunk/tests/membership/BMSCxBMSC2.mpr
    trunk/tests/membership/BMSCxBMSC3.mpr
    trunk/tests/membership/BMSCxBMSC4.mpr
    trunk/tests/membership/absolut_time_bmsc01_1.mpr
    trunk/tests/membership/absolut_time_bmsc01_2.mpr
    trunk/tests/membership/absolut_time_bmsc02_1.mpr
    trunk/tests/membership/absolut_time_bmsc02_2.mpr
    trunk/tests/membership/absolut_time_hmsc01.mpr
    trunk/tests/membership/absolut_time_hmsc02.mpr
    trunk/tests/membership/bmsc_absolute_pat1_1.mpr
    trunk/tests/membership/bmsc_absolute_pat1_2.mpr
    trunk/tests/membership/bmsc_absolute_pat2_1.mpr
    trunk/tests/membership/bmsc_absolute_pat2_2.mpr
    trunk/tests/membership/bmsc_absolute_pat2_3.mpr
    trunk/tests/membership/bmsc_absolute_pat2_4.mpr
    trunk/tests/membership/bmsc_absolute_pat2_5.mpr
    trunk/tests/membership/complete1.mpr
    trunk/tests/membership/complete_partial_pat1.mpr
    trunk/tests/membership/complete_partial_pat2.mpr
    trunk/tests/membership/complete_pat5.mpr
    trunk/tests/membership/complete_pat6_1.mpr
    trunk/tests/membership/complete_pat6_2.mpr
    trunk/tests/membership/complete_pat6_3.mpr
    trunk/tests/membership/complete_pat6_4.mpr
    trunk/tests/membership/complete_pat6_5.mpr
    trunk/tests/membership/complete_pat6_6.mpr
    trunk/tests/membership/complete_pat8_1.mpr
    trunk/tests/membership/complete_pat8_2.mpr
    trunk/tests/membership/partial_mem_easy.mpr
    trunk/tests/membership/partial_mem_easy_pat2.mpr
    trunk/tests/membership/partial_mem_easy_pat3.mpr
    trunk/tests/membership/partial_mem_easy_pat4.mpr
    trunk/tests/membership/rozcvicka_bmsc1.mpr
    trunk/tests/membership/rozcvicka_bmsc2.mpr
    trunk/tests/membership/test_bmsc29_1.mpr
    trunk/tests/membership/test_bmsc29_2.mpr
    trunk/tests/membership/test_bmsc30_1.mpr
    trunk/tests/membership/test_bmsc30_2.mpr
    trunk/tests/membership/test_bmsc31_1.mpr
    trunk/tests/membership/test_bmsc32.mpr
    trunk/tests/membership/test_bmsc32_1.mpr
    trunk/tests/membership/test_bmsc32_2.mpr
    trunk/tests/membership/test_bmsc33.mpr
    trunk/tests/membership/test_bmsc33_1.mpr
    trunk/tests/membership/test_bmsc34.mpr
    trunk/tests/membership/test_bmsc35.mpr
    trunk/tests/membership/test_bmsc36.mpr
    trunk/tests/membership/test_hmsc29.mpr
    trunk/tests/membership/test_hmsc30.mpr
    trunk/tests/membership/test_hmsc31.mpr
    trunk/tests/membership/test_hmsc33.mpr
    trunk/tests/membership/test_hmsc35.mpr
    trunk/tests/membership/test_hmsc36.mpr
    trunk/tests/membership/time_cycle_pos2_hmsc.mpr
    trunk/tests/membership/time_cycle_pos2_pat.mpr
    trunk/tests/membership/time_hard_bmsc_pat03.mpr
    trunk/tests/membership/time_hard_bmsc_pat04.mpr
    trunk/tests/membership/time_hard_bmsc_pat05.mpr
    trunk/tests/race/race_pos_2_actions.mpr
    trunk/tests/race/race_pos_3_action_small.mpr
    trunk/tests/time/consistency/cons_neg_37.mpr
    trunk/tests/time/consistency/cons_pos_21.mpr
    trunk/tests/time/consistency/cons_pos_22.mpr
    trunk/tests/time/consistency/cons_pos_23.mpr
    trunk/tests/time/consistency/cons_pos_24.mpr
    trunk/tests/time/time_race/race_cond_neg1.mpr
    trunk/tests/time/time_race/race_cond_neg2.mpr
    trunk/tests/time/time_race/race_cond_pos1.mpr
    trunk/tests/time/time_race/race_cond_pos2.mpr
    trunk/tests/time/time_race/race_cond_pos3.mpr
    trunk/tests/time/time_race/race_pos_2_actions.mpr
    trunk/tests/time/time_race/race_pos_3_action_small.mpr
    trunk/tests/time_relevant_ordering/tro_test00.mpr
    trunk/tests/time_relevant_ordering/tro_test01.mpr
    trunk/tests/time_relevant_ordering/tro_test02.mpr
    trunk/tests/time_relevant_ordering/tro_test03.mpr
    trunk/tests/time_relevant_ordering/tro_test04.mpr
    trunk/tests/time_relevant_ordering/tro_test05.mpr
    trunk/tests/time_relevant_ordering/tro_test06.mpr
    trunk/tests/time_relevant_ordering/tro_test07.mpr
    trunk/tests/time_relevant_ordering/tro_test08.mpr
    trunk/tests/time_relevant_ordering/tro_test09.mpr
    trunk/tests/time_relevant_ordering/tro_test10.mpr
    trunk/tests/time_relevant_ordering/tro_test11.mpr
    trunk/tests/time_relevant_ordering/tro_test12.mpr
    trunk/tests/time_relevant_ordering/tro_test13.mpr
    trunk/tests/time_relevant_ordering/tro_test14.mpr
    trunk/tests/time_relevant_ordering/tro_test15.mpr
    trunk/tests/time_relevant_ordering/tro_test16.mpr
    trunk/tests/time_relevant_ordering/tro_test17.mpr
    trunk/tests/time_relevant_ordering/tro_test18.mpr
    trunk/tests/time_relevant_ordering/tro_test19.mpr
    trunk/tests/time_relevant_ordering/tro_test20.mpr
    trunk/tests/time_relevant_ordering/tro_test21.mpr
    trunk/tests/time_relevant_ordering/tro_test22.mpr
    trunk/tests/time_relevant_ordering/tro_test23.mpr
    trunk/tests/time_relevant_ordering/tro_test24.mpr
    trunk/tests/time_relevant_ordering/tro_test25.mpr
    trunk/tests/time_relevant_ordering/tro_test26.mpr
    trunk/tests/time_relevant_ordering/tro_test27.mpr
    trunk/tests/time_relevant_ordering/tro_test28.mpr
    trunk/tests/time_relevant_ordering/tro_test29.mpr
    trunk/tests/time_relevant_ordering/tro_test30.mpr
    trunk/tests/z120_test/z120_test88.mpr
    trunk/tests/z120_test/z120_test89.mpr
    trunk/tests/z120_test/z120_test90.mpr
    trunk/tests/z120_test/z120_test91.mpr
    trunk/tests/z120_test/z120_test92.mpr
    trunk/tests/z120_test/z120_test93.mpr
    trunk/tests/z120_test/z120_test94.mpr
    trunk/tests/z120_test/z120_time32.mpr
    trunk/tests/z120_test/z120_time33.mpr
    trunk/tests/z120_test/z120_time34.mpr
    trunk/tests/z120_test/z120_time35.mpr
    trunk/tests/z120_test/z120_time36.mpr
    trunk/tests/z120_test/z120_time37.mpr
    trunk/tests/z120_test/z120_time38.mpr
    trunk/tests/z120_test/z120_time39.mpr
    trunk/tests/z120_test/z120_time40.mpr
    trunk/tests/z120_test/z120_time41.mpr
    trunk/tests/z120_test/z120_time42.mpr
    trunk/tests/z120_test/z120_time43.mpr
    trunk/tests/z120_test/z120_time44.mpr
    trunk/tests/z120_test/z120_time45.mpr
    trunk/tests/z120_test/z120_time46.mpr
    trunk/tests/z120_test/z120_time47.mpr
    trunk/tests/z120_test/z120_time48.mpr
    trunk/tests/z120_test/z120_time49.mpr
    trunk/tests/z120_test/z120_time50.mpr
    trunk/tests/z120_test/z120_time51.mpr
    trunk/tests/z120_test/z120_time52.mpr

Index: trunk/tests/diff/coregion.mpr
===================================================================
--- trunk/tests/diff/coregion.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/coregion.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/coregion.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/coregion_flow.mpr
===================================================================
--- trunk/tests/diff/coregion_flow.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/coregion_flow.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/coregion_flow.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow01.mpr
===================================================================
--- trunk/tests/diff/flow01.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow01.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow01.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow02_1.mpr
===================================================================
--- trunk/tests/diff/flow02_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow02_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow02_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow02_2.mpr
===================================================================
--- trunk/tests/diff/flow02_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow02_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow02_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow02_3.mpr
===================================================================
--- trunk/tests/diff/flow02_3.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow02_3.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow02_3.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow02_4.mpr
===================================================================
--- trunk/tests/diff/flow02_4.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow02_4.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow02_4.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow04_5.mpr
===================================================================
--- trunk/tests/diff/flow04_5.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow04_5.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow04_5.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow04_6.mpr
===================================================================
--- trunk/tests/diff/flow04_6.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow04_6.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow04_6.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow05_1.mpr
===================================================================
--- trunk/tests/diff/flow05_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow05_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow05_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow05_2.mpr
===================================================================
--- trunk/tests/diff/flow05_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow05_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow05_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow05_3.mpr
===================================================================
--- trunk/tests/diff/flow05_3.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow05_3.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow05_3.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow06_1.mpr
===================================================================
--- trunk/tests/diff/flow06_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow06_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow06_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow06_2.mpr
===================================================================
--- trunk/tests/diff/flow06_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow06_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow06_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow06_3.mpr
===================================================================
--- trunk/tests/diff/flow06_3.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow06_3.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow06_3.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow07_1.mpr
===================================================================
--- trunk/tests/diff/flow07_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow07_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow07_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow07_2.mpr
===================================================================
--- trunk/tests/diff/flow07_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow07_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow07_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow08_1.mpr
===================================================================
--- trunk/tests/diff/flow08_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow08_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow08_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow09_1.mpr
===================================================================
--- trunk/tests/diff/flow09_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow09_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow09_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow10.mpr
===================================================================
--- trunk/tests/diff/flow10.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow10.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow10.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/flow11.mpr
===================================================================
--- trunk/tests/diff/flow11.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow11.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/flow11.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/tests/diff/flow12_1.mpr
===================================================================
--- trunk/tests/diff/flow12_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow12_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)
@@ -1,15 +1,15 @@
-mscdocument Drawing7;
-msc Page_1;
-inst A;
-inst B;
-A: instance;
-out a,0 to B;
-out a,1 to B;
-out a,2 to B;
-endinstance;
-B: instance;
-in a,2 from A;
-in a,0 from A;
-in a,1 from A;
-endinstance;
-endmsc;
+mscdocument Drawing7;
+msc Page_1;
+inst A;
+inst B;
+A: instance;
+out a,0 to B;
+out a,1 to B;
+out a,2 to B;
+endinstance;
+B: instance;
+in a,2 from A;
+in a,0 from A;
+in a,1 from A;
+endinstance;
+endmsc;


Property changes on: trunk/tests/diff/flow12_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/tests/diff/flow12_2.mpr
===================================================================
--- trunk/tests/diff/flow12_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/flow12_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)
@@ -1,15 +1,15 @@
-mscdocument Drawing9;
-msc Page_1;
-inst A;
-inst B;
-A: instance;
-out a,0 to B;
-out a,1 to B;
-out a,2 to B;
-endinstance;
-B: instance;
-in a,1 from A;
-in a,2 from A;
-in a,0 from A;
-endinstance;
-endmsc;
+mscdocument Drawing9;
+msc Page_1;
+inst A;
+inst B;
+A: instance;
+out a,0 to B;
+out a,1 to B;
+out a,2 to B;
+endinstance;
+B: instance;
+in a,1 from A;
+in a,2 from A;
+in a,0 from A;
+endinstance;
+endmsc;


Property changes on: trunk/tests/diff/flow12_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/spec01.mpr
===================================================================
--- trunk/tests/diff/spec01.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/spec01.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/spec01.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/spec02.mpr
===================================================================
--- trunk/tests/diff/spec02.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/spec02.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/spec02.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/spec05.mpr
===================================================================
--- trunk/tests/diff/spec05.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/spec05.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/spec05.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/spec06.mpr
===================================================================
--- trunk/tests/diff/spec06.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/spec06.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/spec06.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/spec07.mpr
===================================================================
--- trunk/tests/diff/spec07.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/spec07.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/spec07.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/spec08.mpr
===================================================================
--- trunk/tests/diff/spec08.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/spec08.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/spec08.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/spec09.mpr
===================================================================
--- trunk/tests/diff/spec09.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/spec09.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/spec09.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/spec10.mpr
===================================================================
--- trunk/tests/diff/spec10.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/spec10.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/spec10.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/diff/spec11.mpr
===================================================================
--- trunk/tests/diff/spec11.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/spec11.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/diff/spec11.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/tests/diff/spec12.mpr
===================================================================
--- trunk/tests/diff/spec12.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/diff/spec12.mpr	2016-01-12 16:33:11 UTC (rev 1911)
@@ -1,13 +1,13 @@
-mscdocument Drawing5;
-msc Page_1;
-inst A;
-inst B;
-A: instance;
-out a,0 to B;
-out a,1 to B;
-endinstance;
-B: instance;
-in a,0 from A;
-in a,1 from A;
-endinstance;
-endmsc;
+mscdocument Drawing5;
+msc Page_1;
+inst A;
+inst B;
+A: instance;
+out a,0 to B;
+out a,1 to B;
+endinstance;
+B: instance;
+in a,0 from A;
+in a,1 from A;
+endinstance;
+endmsc;


Property changes on: trunk/tests/diff/spec12.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/BMSCxBMSC1.mpr
===================================================================
--- trunk/tests/membership/BMSCxBMSC1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/BMSCxBMSC1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/BMSCxBMSC1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/BMSCxBMSC2.mpr
===================================================================
--- trunk/tests/membership/BMSCxBMSC2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/BMSCxBMSC2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/BMSCxBMSC2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/BMSCxBMSC3.mpr
===================================================================
--- trunk/tests/membership/BMSCxBMSC3.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/BMSCxBMSC3.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/BMSCxBMSC3.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/BMSCxBMSC4.mpr
===================================================================
--- trunk/tests/membership/BMSCxBMSC4.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/BMSCxBMSC4.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/BMSCxBMSC4.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/absolut_time_bmsc01_1.mpr
===================================================================
--- trunk/tests/membership/absolut_time_bmsc01_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/absolut_time_bmsc01_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/absolut_time_bmsc01_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/absolut_time_bmsc01_2.mpr
===================================================================
--- trunk/tests/membership/absolut_time_bmsc01_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/absolut_time_bmsc01_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/absolut_time_bmsc01_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/absolut_time_bmsc02_1.mpr
===================================================================
--- trunk/tests/membership/absolut_time_bmsc02_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/absolut_time_bmsc02_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/absolut_time_bmsc02_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/absolut_time_bmsc02_2.mpr
===================================================================
--- trunk/tests/membership/absolut_time_bmsc02_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/absolut_time_bmsc02_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/absolut_time_bmsc02_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/absolut_time_hmsc01.mpr
===================================================================
--- trunk/tests/membership/absolut_time_hmsc01.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/absolut_time_hmsc01.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/absolut_time_hmsc01.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/absolut_time_hmsc02.mpr
===================================================================
--- trunk/tests/membership/absolut_time_hmsc02.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/absolut_time_hmsc02.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/absolut_time_hmsc02.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/bmsc_absolute_pat1_1.mpr
===================================================================
--- trunk/tests/membership/bmsc_absolute_pat1_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/bmsc_absolute_pat1_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/bmsc_absolute_pat1_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/bmsc_absolute_pat1_2.mpr
===================================================================
--- trunk/tests/membership/bmsc_absolute_pat1_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/bmsc_absolute_pat1_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/bmsc_absolute_pat1_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/bmsc_absolute_pat2_1.mpr
===================================================================
--- trunk/tests/membership/bmsc_absolute_pat2_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/bmsc_absolute_pat2_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/bmsc_absolute_pat2_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/bmsc_absolute_pat2_2.mpr
===================================================================
--- trunk/tests/membership/bmsc_absolute_pat2_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/bmsc_absolute_pat2_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/bmsc_absolute_pat2_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/bmsc_absolute_pat2_3.mpr
===================================================================
--- trunk/tests/membership/bmsc_absolute_pat2_3.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/bmsc_absolute_pat2_3.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/bmsc_absolute_pat2_3.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/bmsc_absolute_pat2_4.mpr
===================================================================
--- trunk/tests/membership/bmsc_absolute_pat2_4.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/bmsc_absolute_pat2_4.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/bmsc_absolute_pat2_4.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/bmsc_absolute_pat2_5.mpr
===================================================================
--- trunk/tests/membership/bmsc_absolute_pat2_5.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/bmsc_absolute_pat2_5.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/bmsc_absolute_pat2_5.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete1.mpr
===================================================================
--- trunk/tests/membership/complete1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete_partial_pat1.mpr
===================================================================
--- trunk/tests/membership/complete_partial_pat1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete_partial_pat1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete_partial_pat1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete_partial_pat2.mpr
===================================================================
--- trunk/tests/membership/complete_partial_pat2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete_partial_pat2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete_partial_pat2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete_pat5.mpr
===================================================================
--- trunk/tests/membership/complete_pat5.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete_pat5.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete_pat5.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete_pat6_1.mpr
===================================================================
--- trunk/tests/membership/complete_pat6_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete_pat6_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete_pat6_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete_pat6_2.mpr
===================================================================
--- trunk/tests/membership/complete_pat6_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete_pat6_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete_pat6_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete_pat6_3.mpr
===================================================================
--- trunk/tests/membership/complete_pat6_3.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete_pat6_3.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete_pat6_3.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete_pat6_4.mpr
===================================================================
--- trunk/tests/membership/complete_pat6_4.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete_pat6_4.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete_pat6_4.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete_pat6_5.mpr
===================================================================
--- trunk/tests/membership/complete_pat6_5.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete_pat6_5.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete_pat6_5.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete_pat6_6.mpr
===================================================================
--- trunk/tests/membership/complete_pat6_6.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete_pat6_6.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete_pat6_6.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete_pat8_1.mpr
===================================================================
--- trunk/tests/membership/complete_pat8_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete_pat8_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete_pat8_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/complete_pat8_2.mpr
===================================================================
--- trunk/tests/membership/complete_pat8_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/complete_pat8_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/complete_pat8_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/tests/membership/partial_mem_easy.mpr
===================================================================
--- trunk/tests/membership/partial_mem_easy.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/partial_mem_easy.mpr	2016-01-12 16:33:11 UTC (rev 1911)
@@ -1,20 +1,20 @@
-mscdocument partial_mem_easy.vsd;
-msc Page_1;
-inst A;
-inst B;
-inst C;
-A: instance;
-out a,0 to B;
-in e,1 from B;
-endinstance;
-B: instance;
-in a,0 from A;
-out b,2 to C;
-in c,3 from C;
-out e,1 to A;
-endinstance;
-C: instance;
-in b,2 from B;
-out c,3 to B;
-endinstance;
-endmsc;
+mscdocument partial_mem_easy.vsd;
+msc Page_1;
+inst A;
+inst B;
+inst C;
+A: instance;
+out a,0 to B;
+in e,1 from B;
+endinstance;
+B: instance;
+in a,0 from A;
+out b,2 to C;
+in c,3 from C;
+out e,1 to A;
+endinstance;
+C: instance;
+in b,2 from B;
+out c,3 to B;
+endinstance;
+endmsc;


Property changes on: trunk/tests/membership/partial_mem_easy.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/partial_mem_easy_pat2.mpr
===================================================================
--- trunk/tests/membership/partial_mem_easy_pat2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/partial_mem_easy_pat2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/partial_mem_easy_pat2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/tests/membership/partial_mem_easy_pat3.mpr
===================================================================
--- trunk/tests/membership/partial_mem_easy_pat3.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/partial_mem_easy_pat3.mpr	2016-01-12 16:33:11 UTC (rev 1911)
@@ -1,20 +1,20 @@
-mscdocument partial_mem_easy.vsd;
-msc Page_1;
-inst A;
-inst B;
-inst C;
-A: instance;
-out a,0 to B;
-in e,1 from B;
-endinstance;
-B: instance;
-in a,0 from A;
-out b,2 to C;
-in c,3 from C;
-out e,1 to A;
-endinstance;
-C: instance;
-in b,2 from B;
-out c,3 to B;
-endinstance;
-endmsc;
+mscdocument partial_mem_easy.vsd;
+msc Page_1;
+inst A;
+inst B;
+inst C;
+A: instance;
+out a,0 to B;
+in e,1 from B;
+endinstance;
+B: instance;
+in a,0 from A;
+out b,2 to C;
+in c,3 from C;
+out e,1 to A;
+endinstance;
+C: instance;
+in b,2 from B;
+out c,3 to B;
+endinstance;
+endmsc;


Property changes on: trunk/tests/membership/partial_mem_easy_pat3.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/tests/membership/partial_mem_easy_pat4.mpr
===================================================================
--- trunk/tests/membership/partial_mem_easy_pat4.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/partial_mem_easy_pat4.mpr	2016-01-12 16:33:11 UTC (rev 1911)
@@ -1,20 +1,20 @@
-mscdocument partial_mem_easy.vsd;
-msc Page_1;
-inst A;
-inst B;
-inst C;
-A: instance;
-out a,0 to B;
-in e,1 from B;
-endinstance;
-B: instance;
-in a,0 from A;
-out b,2 to C;
-in c,3 from C;
-out e,1 to A;
-endinstance;
-C: instance;
-in b,2 from B;
-out c,3 to B;
-endinstance;
-endmsc;
+mscdocument partial_mem_easy.vsd;
+msc Page_1;
+inst A;
+inst B;
+inst C;
+A: instance;
+out a,0 to B;
+in e,1 from B;
+endinstance;
+B: instance;
+in a,0 from A;
+out b,2 to C;
+in c,3 from C;
+out e,1 to A;
+endinstance;
+C: instance;
+in b,2 from B;
+out c,3 to B;
+endinstance;
+endmsc;


Property changes on: trunk/tests/membership/partial_mem_easy_pat4.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/rozcvicka_bmsc1.mpr
===================================================================
--- trunk/tests/membership/rozcvicka_bmsc1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/rozcvicka_bmsc1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/rozcvicka_bmsc1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/rozcvicka_bmsc2.mpr
===================================================================
--- trunk/tests/membership/rozcvicka_bmsc2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/rozcvicka_bmsc2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/rozcvicka_bmsc2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc29_1.mpr
===================================================================
--- trunk/tests/membership/test_bmsc29_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc29_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc29_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc29_2.mpr
===================================================================
--- trunk/tests/membership/test_bmsc29_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc29_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc29_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc30_1.mpr
===================================================================
--- trunk/tests/membership/test_bmsc30_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc30_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc30_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc30_2.mpr
===================================================================
--- trunk/tests/membership/test_bmsc30_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc30_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc30_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc31_1.mpr
===================================================================
--- trunk/tests/membership/test_bmsc31_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc31_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc31_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc32.mpr
===================================================================
--- trunk/tests/membership/test_bmsc32.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc32.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc32.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc32_1.mpr
===================================================================
--- trunk/tests/membership/test_bmsc32_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc32_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc32_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc32_2.mpr
===================================================================
--- trunk/tests/membership/test_bmsc32_2.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc32_2.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc32_2.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc33.mpr
===================================================================
--- trunk/tests/membership/test_bmsc33.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc33.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc33.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc33_1.mpr
===================================================================
--- trunk/tests/membership/test_bmsc33_1.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc33_1.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc33_1.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc34.mpr
===================================================================
--- trunk/tests/membership/test_bmsc34.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc34.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc34.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/tests/membership/test_bmsc35.mpr
===================================================================
--- trunk/tests/membership/test_bmsc35.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc35.mpr	2016-01-12 16:33:11 UTC (rev 1911)
@@ -1,19 +1,19 @@
-mscdocument Membership_help_bmsc.vsd;
-msc Page_1;
-inst A;
-inst B;
-A: instance;
-label e0;
-out request,0 to B;
-time e1 [1], e2 [7];
-label e2;
-in response,1 from B;
-endinstance;
-B: instance;
-label e1;
-in request,0 from A;
-time e3 [2];
-label e3;
-out response,1 to A;
-endinstance;
-endmsc;
+mscdocument Membership_help_bmsc.vsd;
+msc Page_1;
+inst A;
+inst B;
+A: instance;
+label e0;
+out request,0 to B;
+time e1 [1], e2 [7];
+label e2;
+in response,1 from B;
+endinstance;
+B: instance;
+label e1;
+in request,0 from A;
+time e3 [2];
+label e3;
+out response,1 to A;
+endinstance;
+endmsc;


Property changes on: trunk/tests/membership/test_bmsc35.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_bmsc36.mpr
===================================================================
--- trunk/tests/membership/test_bmsc36.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_bmsc36.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_bmsc36.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_hmsc29.mpr
===================================================================
--- trunk/tests/membership/test_hmsc29.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_hmsc29.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_hmsc29.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_hmsc30.mpr
===================================================================
--- trunk/tests/membership/test_hmsc30.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_hmsc30.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_hmsc30.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_hmsc31.mpr
===================================================================
--- trunk/tests/membership/test_hmsc31.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_hmsc31.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_hmsc31.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/test_hmsc33.mpr
===================================================================
--- trunk/tests/membership/test_hmsc33.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_hmsc33.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/test_hmsc33.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/tests/membership/test_hmsc35.mpr
===================================================================
--- trunk/tests/membership/test_hmsc35.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_hmsc35.mpr	2016-01-12 16:33:11 UTC (rev 1911)
@@ -1,46 +1,46 @@
-mscdocument membership_help_bug.vsd;
-msc Page_1;
-initial connect L0;
-L0: connect L1, L2;
-L1: reference bmsc2 time [0,4);
- connect L3;
-L2: reference bmsc1 top top L4 [0,12];
- bottom top L4 [0,3);
- connect L4;
-L3: connect L5;
-L4: reference bmsc3 connect L3;
-L5: final;
-endmsc;
-msc bmsc1;
-inst A;
-inst B;
-A: instance;
-label e0;
-out request,0 to B;
-time e1 [0,2);
-endinstance;
-B: instance;
-label e1;
-in request,0 from A;
-endinstance;
-endmsc;
-msc bmsc3;
-inst A;
-inst B;
-A: instance;
-in response,0 from B;
-endinstance;
-B: instance;
-out response,0 to A;
-endinstance;
-endmsc;
-msc bmsc2;
-inst A;
-inst B;
-A: instance;
-out Sip,0 to B;
-endinstance;
-B: instance;
-in Sip,0 from A;
-endinstance;
-endmsc;
+mscdocument membership_help_bug.vsd;
+msc Page_1;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference bmsc2 time [0,4);
+ connect L3;
+L2: reference bmsc1 top top L4 [0,12];
+ bottom top L4 [0,3);
+ connect L4;
+L3: connect L5;
+L4: reference bmsc3 connect L3;
+L5: final;
+endmsc;
+msc bmsc1;
+inst A;
+inst B;
+A: instance;
+label e0;
+out request,0 to B;
+time e1 [0,2);
+endinstance;
+B: instance;
+label e1;
+in request,0 from A;
+endinstance;
+endmsc;
+msc bmsc3;
+inst A;
+inst B;
+A: instance;
+in response,0 from B;
+endinstance;
+B: instance;
+out response,0 to A;
+endinstance;
+endmsc;
+msc bmsc2;
+inst A;
+inst B;
+A: instance;
+out Sip,0 to B;
+endinstance;
+B: instance;
+in Sip,0 from A;
+endinstance;
+endmsc;


Property changes on: trunk/tests/membership/test_hmsc35.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/tests/membership/test_hmsc36.mpr
===================================================================
--- trunk/tests/membership/test_hmsc36.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/test_hmsc36.mpr	2016-01-12 16:33:11 UTC (rev 1911)
@@ -1,33 +1,33 @@
-mscdocument Drawing1;
-msc HMSC;
-initial connect L0, L1;
-L0: reference MSC01 connect L2;
-L1: reference MSC02 connect L2;
-L2: final;
-endmsc;
-msc MSC01;
-inst A;
-inst B;
-A: instance;
-label e0;
-out ask,0 to B;
-time e1 [10,11);
-endinstance;
-B: instance;
-label e1;
-in ask,0 from A;
-endinstance;
-endmsc;
-msc MSC02;
-inst A;
-inst B;
-A: instance;
-label e0;
-out ask,0 to B;
-time e1 [0,7);
-endinstance;
-B: instance;
-label e1;
-in ask,0 from A;
-endinstance;
-endmsc;
+mscdocument Drawing1;
+msc HMSC;
+initial connect L0, L1;
+L0: reference MSC01 connect L2;
+L1: reference MSC02 connect L2;
+L2: final;
+endmsc;
+msc MSC01;
+inst A;
+inst B;
+A: instance;
+label e0;
+out ask,0 to B;
+time e1 [10,11);
+endinstance;
+B: instance;
+label e1;
+in ask,0 from A;
+endinstance;
+endmsc;
+msc MSC02;
+inst A;
+inst B;
+A: instance;
+label e0;
+out ask,0 to B;
+time e1 [0,7);
+endinstance;
+B: instance;
+label e1;
+in ask,0 from A;
+endinstance;
+endmsc;


Property changes on: trunk/tests/membership/test_hmsc36.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/time_cycle_pos2_hmsc.mpr
===================================================================
--- trunk/tests/membership/time_cycle_pos2_hmsc.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/time_cycle_pos2_hmsc.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/time_cycle_pos2_hmsc.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/time_cycle_pos2_pat.mpr
===================================================================
--- trunk/tests/membership/time_cycle_pos2_pat.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/time_cycle_pos2_pat.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/time_cycle_pos2_pat.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/time_hard_bmsc_pat03.mpr
===================================================================
--- trunk/tests/membership/time_hard_bmsc_pat03.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/time_hard_bmsc_pat03.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/time_hard_bmsc_pat03.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/time_hard_bmsc_pat04.mpr
===================================================================
--- trunk/tests/membership/time_hard_bmsc_pat04.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/time_hard_bmsc_pat04.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/time_hard_bmsc_pat04.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Index: trunk/tests/membership/time_hard_bmsc_pat05.mpr
===================================================================
--- trunk/tests/membership/time_hard_bmsc_pat05.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/membership/time_hard_bmsc_pat05.mpr	2016-01-12 16:33:11 UTC (rev 1911)

Property changes on: trunk/tests/membership/time_hard_bmsc_pat05.mpr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/tests/race/race_pos_2_actions.mpr
===================================================================
--- trunk/tests/race/race_pos_2_actions.mpr	2016-01-12 15:44:55 UTC (rev 1910)
+++ trunk/tests/race/race_pos_2_actions.mpr	2016-01-12 16:33:11 UTC (rev 1911)
@@ -1,59 +1,59 @@
-mscdocument actions_failure.vsd;
-msc Stranka_1;
-inst Alice;
-inst Bob;
-inst Public_network_blockchains;
-text 'The one who has lower `px` generates `x`. Let us WLOG assume it is Bob.';
-Alice: instance;
-out Order_publish,0 to Public_network_blockchains;
-in Proposes_a_trade_sends_hash_px_,1 from Bob;
-action 'Generates_px_';
-out Accepts_proposal_sends_hash_px_,2 to Bob;
-in Sends_px_,3 from Bob;
-out Sends_px_,4 to Bob;
-in Sends_pubkey_and_hash_x_,5 from Bob;
-action 'Generates_new_key_pair';
-out Sends_pubkey,6 to Bob;
-in Sends_request_for_signing_tx2_,7 from Bob;
-action 'Verifies_tx2_and_signs_it';
-out Sends_signature_for_tx2_,8 to Bob;
-in _tx1_is_verified_and_safely_stored_in_its_blockchain,9 from Public_network_blockchains;
-action 'Generates_tx3_tx4_';
-out Sends_request_for_signing_tx4_,10 to Bob;
-in Sends_signature_for_tx4_,11 from Bob;
-out Broadcasts_tx3_,12 to Public_network_blockchains;
-in Spots_tx5_and_extracts_x_,13 from Public_network_blockchains;
-out Claims_funds_from_tx1_using_x_in_tx6_,14 to Public_network_blockchains;
-endinstance;
-Bob: instance;
-in Order_read,15 from Public_network_blockchains;
-action 'Generates_px_';
-out Proposes_a_trade_sends_hash_px_,1 to Alice;
-in Accepts_proposal_sends_hash_px_,2 from Alice;
-out Sends_px_,3 to ...
 
[truncated message content]

[Scstudio-commits] SF.net SVN: scstudio:[1910] trunk/src/check

From: <xr...@us...> - 2016-01-12 15:44:57

Revision: 1910
          http://sourceforge.net/p/scstudio/code/1910
Author:   xrehak
Date:     2016-01-12 15:44:55 +0000 (Tue, 12 Jan 2016)
Log Message:
-----------
local actions repaired in local-choice ... more testing needed!
and in race and time-race (the problem was in causal closure initiator).

Modified Paths:
--------------
    trunk/src/check/localchoice/local_choice_checker.cpp
    trunk/src/check/pseudocode/causal_closure_initiator.cpp
    trunk/src/check/race/race_checker.cpp

Modified: trunk/src/check/localchoice/local_choice_checker.cpp
===================================================================
--- trunk/src/check/localchoice/local_choice_checker.cpp	2016-01-12 15:39:52 UTC (rev 1909)
+++ trunk/src/check/localchoice/local_choice_checker.cpp	2016-01-12 15:44:55 UTC (rev 1910)
@@ -81,6 +81,7 @@
       {
         if(e->is_minimal())
         {
+          // Local Actions are not allowed in a coregions
           MessageEvent* me = dynamic_cast<MessageEvent*>(e);
           if(me != NULL && me->is_send())
             m_mep = true;
@@ -99,11 +100,16 @@
         MessageEvent* me = dynamic_cast<MessageEvent*>(e);
         if(me != NULL && me->is_send())
           m_mep = true;
+
+        LocalActionEvent* la = dynamic_cast<LocalActionEvent*>(e);
+        if(la != NULL)
+          m_mep = true;
       }
     }
   }
   m_idle = false;  //any event found -> instance is not idle
 }
+
 void IterationListener::on_white_node_found(HMscNode *n)
 {
   if(!dynamic_cast<ReferenceNode*>(n) && !dynamic_cast<StartNode*>(n))

Modified: trunk/src/check/pseudocode/causal_closure_initiator.cpp
===================================================================
--- trunk/src/check/pseudocode/causal_closure_initiator.cpp	2016-01-12 15:39:52 UTC (rev 1909)
+++ trunk/src/check/pseudocode/causal_closure_initiator.cpp	2016-01-12 15:44:55 UTC (rev 1910)
@@ -63,11 +63,13 @@
     {
       Event* j_event = events[j];
       MessageEvent* j_msg_event = dynamic_cast<MessageEvent*>(j_event);
+      LocalActionEvent* j_la_event = dynamic_cast<LocalActionEvent*>(j_event);
       
       if(i_event->get_instance()==j_event->get_instance() && 
-        j_msg_event != NULL && !j_msg_event->is_receive() && i_visual_closure[j])
+        ( j_la_event != NULL || ( 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 and j_event are from the same instance, j_event is send or local action event and
         //i_event < j_event
         i_causal_closure[j] = true;
       }

Modified: trunk/src/check/race/race_checker.cpp
===================================================================
--- trunk/src/check/race/race_checker.cpp	2016-01-12 15:39:52 UTC (rev 1909)
+++ trunk/src/check/race/race_checker.cpp	2016-01-12 15:44:55 UTC (rev 1910)
@@ -272,12 +272,14 @@
   BMscDuplicator duplicator;
   BMscPtr original = e1->get_instance()->get_bmsc();
   
-  // NOTE: race should only occur with message events; just for sure...
+  e1->set_marked();
+  e2->set_marked();
+
+  // NOTE: race should occur with message events and local actions
+  // if it is a message:
   MessageEvent* me1 = dynamic_cast<MessageEvent*>(e1);
   MessageEvent* me2 = dynamic_cast<MessageEvent*>(e2);
 
-  e1->set_marked();
-  e2->set_marked();
   if (me1 != NULL) me1->get_message().get()->set_marked();
   if (me2 != NULL) me2->get_message().get()->set_marked();
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1909] trunk/tests

From: <xr...@us...> - 2016-01-12 15:39:54

Revision: 1909
          http://sourceforge.net/p/scstudio/code/1909
Author:   xrehak
Date:     2016-01-12 15:39:52 +0000 (Tue, 12 Jan 2016)
Log Message:
-----------
Repair of the tests/race/race_pos_2_actions.vsd
Both new race_pos_2_actions and race_pos_3_action_small added to time/time_race.

Modified Paths:
--------------
    trunk/tests/race/race_pos_2_actions.vsd
    trunk/tests/time/time_race/CMakeLists.txt

Added Paths:
-----------
    trunk/tests/time/time_race/race_pos_2_actions.mpr
    trunk/tests/time/time_race/race_pos_2_actions.vsd
    trunk/tests/time/time_race/race_pos_3_action_small.mpr
    trunk/tests/time/time_race/race_pos_3_action_small.vsd

Modified: trunk/tests/race/race_pos_2_actions.vsd
===================================================================
(Binary files differ)

Modified: trunk/tests/time/time_race/CMakeLists.txt
===================================================================
--- trunk/tests/time/time_race/CMakeLists.txt	2016-01-12 15:22:19 UTC (rev 1908)
+++ trunk/tests/time/time_race/CMakeLists.txt	2016-01-12 15:39:52 UTC (rev 1909)
@@ -44,3 +44,8 @@
 
 ADD_CHECKER_TEST(sctime "Time Race" race_cond_neg1.mpr 0)
 ADD_CHECKER_TEST(sctime "Time Race" race_cond_neg2.mpr 0)
+
+
+ADD_CHECKER_TEST(sctime "Time Race" race_pos_2_actions.mpr 1)
+ADD_CHECKER_TEST(sctime "Time Race" race_pos_3_action_small.mpr 1)
+

Added: trunk/tests/time/time_race/race_pos_2_actions.mpr
===================================================================
--- trunk/tests/time/time_race/race_pos_2_actions.mpr	                        (rev 0)
+++ trunk/tests/time/time_race/race_pos_2_actions.mpr	2016-01-12 15:39:52 UTC (rev 1909)
@@ -0,0 +1,59 @@
+mscdocument actions_failure.vsd;
+msc Stranka_1;
+inst Alice;
+inst Bob;
+inst Public_network_blockchains;
+text 'The one who has lower `px` generates `x`. Let us WLOG assume it is Bob.';
+Alice: instance;
+out Order_publish,0 to Public_network_blockchains;
+in Proposes_a_trade_sends_hash_px_,1 from Bob;
+action 'Generates_px_';
+out Accepts_proposal_sends_hash_px_,2 to Bob;
+in Sends_px_,3 from Bob;
+out Sends_px_,4 to Bob;
+in Sends_pubkey_and_hash_x_,5 from Bob;
+action 'Generates_new_key_pair';
+out Sends_pubkey,6 to Bob;
+in Sends_request_for_signing_tx2_,7 from Bob;
+action 'Verifies_tx2_and_signs_it';
+out Sends_signature_for_tx2_,8 to Bob;
+in _tx1_is_verified_and_safely_stored_in_its_blockchain,9 from Public_network_blockchains;
+action 'Generates_tx3_tx4_';
+out Sends_request_for_signing_tx4_,10 to Bob;
+in Sends_signature_for_tx4_,11 from Bob;
+out Broadcasts_tx3_,12 to Public_network_blockchains;
+in Spots_tx5_and_extracts_x_,13 from Public_network_blockchains;
+out Claims_funds_from_tx1_using_x_in_tx6_,14 to Public_network_blockchains;
+endinstance;
+Bob: instance;
+in Order_read,15 from Public_network_blockchains;
+action 'Generates_px_';
+out Proposes_a_trade_sends_hash_px_,1 to Alice;
+in Accepts_proposal_sends_hash_px_,2 from Alice;
+out Sends_px_,3 to Alice;
+in Sends_px_,4 from Alice;
+action 'Generates_new_key_pair';
+out Sends_pubkey_and_hash_x_,5 to Alice;
+in Sends_pubkey,6 from Alice;
+action 'Generates_tx1_tx2_';
+out Sends_request_for_signing_tx2_,7 to Alice;
+in Sends_signature_for_tx2_,8 from Alice;
+out Broadcasts_tx1_,16 to Public_network_blockchains;
+in Sends_request_for_signing_tx4_,10 from Alice;
+action 'Verifies_tx4_and_signs_it';
+out Sends_signature_for_tx4_,11 to Alice;
+in _tx3_is_verified_and_safely_stored_in_its_blockchain,17 from Public_network_blockchains;
+out Claims_funds_from_tx3_by_revealing_x_in_tx5_,18 to Public_network_blockchains;
+endinstance;
+Public_network_blockchains: instance;
+in Order_publish,0 from Alice;
+out Order_read,15 to Bob;
+in Broadcasts_tx1_,16 from Bob;
+out _tx1_is_verified_and_safely_stored_in_its_blockchain,9 to Alice;
+in Broadcasts_tx3_,12 from Alice;
+out _tx3_is_verified_and_safely_stored_in_its_blockchain,17 to Bob;
+in Claims_funds_from_tx3_by_revealing_x_in_tx5_,18 from Bob;
+out Spots_tx5_and_extracts_x_,13 to Alice;
+in Claims_funds_from_tx1_using_x_in_tx6_,14 from Alice;
+endinstance;
+endmsc;

Added: trunk/tests/time/time_race/race_pos_2_actions.vsd
===================================================================
(Binary files differ)

Index: trunk/tests/time/time_race/race_pos_2_actions.vsd
===================================================================
--- trunk/tests/time/time_race/race_pos_2_actions.vsd	2016-01-12 15:22:19 UTC (rev 1908)
+++ trunk/tests/time/time_race/race_pos_2_actions.vsd	2016-01-12 15:39:52 UTC (rev 1909)

Property changes on: trunk/tests/time/time_race/race_pos_2_actions.vsd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/vsd
\ No newline at end of property
Added: trunk/tests/time/time_race/race_pos_3_action_small.mpr
===================================================================
--- trunk/tests/time/time_race/race_pos_3_action_small.mpr	                        (rev 0)
+++ trunk/tests/time/time_race/race_pos_3_action_small.mpr	2016-01-12 15:39:52 UTC (rev 1909)
@@ -0,0 +1,17 @@
+mscdocument actions_failure_small.vsd;
+msc Stranka_1;
+inst Alice;
+inst Bob;
+inst Public_network_blockchains;
+Alice: instance;
+out Order_publish,0 to Public_network_blockchains;
+endinstance;
+Bob: instance;
+in Order_read,1 from Public_network_blockchains;
+action 'Generates_px_';
+endinstance;
+Public_network_blockchains: instance;
+in Order_publish,0 from Alice;
+out Order_read,1 to Bob;
+endinstance;
+endmsc;

Added: trunk/tests/time/time_race/race_pos_3_action_small.vsd
===================================================================
(Binary files differ)

Index: trunk/tests/time/time_race/race_pos_3_action_small.vsd
===================================================================
--- trunk/tests/time/time_race/race_pos_3_action_small.vsd	2016-01-12 15:22:19 UTC (rev 1908)
+++ trunk/tests/time/time_race/race_pos_3_action_small.vsd	2016-01-12 15:39:52 UTC (rev 1909)

Property changes on: trunk/tests/time/time_race/race_pos_3_action_small.vsd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/vsd
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1908] trunk/tests/race

From: <xr...@us...> - 2016-01-12 15:22:21

Revision: 1908
          http://sourceforge.net/p/scstudio/code/1908
Author:   xrehak
Date:     2016-01-12 15:22:19 +0000 (Tue, 12 Jan 2016)
Log Message:
-----------
new test and typo in race/race_pos_2_actions.mpr "let's" causes error during import

Modified Paths:
--------------
    trunk/tests/race/CMakeLists.txt
    trunk/tests/race/race_pos_2_actions.mpr

Added Paths:
-----------
    trunk/tests/race/race_pos_3_action_small.mpr
    trunk/tests/race/race_pos_3_action_small.vsd

Modified: trunk/tests/race/CMakeLists.txt
===================================================================
--- trunk/tests/race/CMakeLists.txt	2016-01-08 14:31:25 UTC (rev 1907)
+++ trunk/tests/race/CMakeLists.txt	2016-01-12 15:22:19 UTC (rev 1908)
@@ -1,6 +1,7 @@
 # Positive test-cases
 ADD_CHECKER_TEST(scrace "Race Free" race_pos_1.mpr 1)
 ADD_CHECKER_TEST(scrace "Race Free" race_pos_2_actions.mpr 1)
+ADD_CHECKER_TEST(scrace "Race Free" race_pos_3_action_small.mpr 1)
 # Negative test-cases
 ADD_CHECKER_TEST(scrace "Race Free" race_neg_1.mpr 0)
 ADD_CHECKER_TEST(scrace "Race Free" race_neg_2.mpr 0)

Modified: trunk/tests/race/race_pos_2_actions.mpr
===================================================================
--- trunk/tests/race/race_pos_2_actions.mpr	2016-01-08 14:31:25 UTC (rev 1907)
+++ trunk/tests/race/race_pos_2_actions.mpr	2016-01-12 15:22:19 UTC (rev 1908)
@@ -3,7 +3,7 @@
 inst Alice;
 inst Bob;
 inst Public_network_blockchains;
-text 'The one who has lower `px` generates `x`. Lets WLOG assume its Bob.';
+text 'The one who has lower `px` generates `x`. Let us WLOG assume it is Bob.';
 Alice: instance;
 out Order_publish,0 to Public_network_blockchains;
 in Proposes_a_trade_sends_hash_px_,1 from Bob;

Added: trunk/tests/race/race_pos_3_action_small.mpr
===================================================================
--- trunk/tests/race/race_pos_3_action_small.mpr	                        (rev 0)
+++ trunk/tests/race/race_pos_3_action_small.mpr	2016-01-12 15:22:19 UTC (rev 1908)
@@ -0,0 +1,17 @@
+mscdocument actions_failure_small.vsd;
+msc Stranka_1;
+inst Alice;
+inst Bob;
+inst Public_network_blockchains;
+Alice: instance;
+out Order_publish,0 to Public_network_blockchains;
+endinstance;
+Bob: instance;
+in Order_read,1 from Public_network_blockchains;
+action 'Generates_px_';
+endinstance;
+Public_network_blockchains: instance;
+in Order_publish,0 from Alice;
+out Order_read,1 to Bob;
+endinstance;
+endmsc;

Added: trunk/tests/race/race_pos_3_action_small.vsd
===================================================================
(Binary files differ)

Index: trunk/tests/race/race_pos_3_action_small.vsd
===================================================================
--- trunk/tests/race/race_pos_3_action_small.vsd	2016-01-08 14:31:25 UTC (rev 1907)
+++ trunk/tests/race/race_pos_3_action_small.vsd	2016-01-12 15:22:19 UTC (rev 1908)

Property changes on: trunk/tests/race/race_pos_3_action_small.vsd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/vsd
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1907] trunk/src/check/race

From: <lko...@us...> - 2016-01-08 14:31:28

Revision: 1907
          http://sourceforge.net/p/scstudio/code/1907
Author:   lkorenciak
Date:     2016-01-08 14:31:25 +0000 (Fri, 08 Jan 2016)
Log Message:
-----------
=fixing race cchecker on actions 1-st part

Modified Paths:
--------------
    trunk/src/check/race/race_checker.cpp
    trunk/src/check/race/race_checker.h

Modified: trunk/src/check/race/race_checker.cpp
===================================================================
--- trunk/src/check/race/race_checker.cpp	2015-12-14 23:57:15 UTC (rev 1906)
+++ trunk/src/check/race/race_checker.cpp	2016-01-08 14:31:25 UTC (rev 1907)
@@ -488,7 +488,10 @@
 
   //mark elements
   e.get_first()->get_complete_message()->set_marked();
-  e.get_second()->get_complete_message()->set_marked();
+  MessageEvent* me = dynamic_cast<MessageEvent*>(e.get_second());
+  if (me != NULL) {
+    me->get_complete_message()->set_marked();
+  }
   e.get_first()->set_marked();
   e.get_second()->set_marked();
 
@@ -498,7 +501,9 @@
   
   //Unmark elements in the original BMsc
   e.get_first()->get_complete_message()->set_marked(NONE);
-  e.get_second()->get_complete_message()->set_marked(NONE);
+  if (me != NULL) {
+    me->get_complete_message()->set_marked(NONE);
+  }
   e.get_first()->set_marked(NONE);
   e.get_second()->set_marked(NONE);
 
@@ -617,15 +622,32 @@
         for(a=fooprint_edi[i].begin();a!=fooprint_edi[i].end();a++)
         {
           MessageEvent* a_event = dynamic_cast<MessageEvent*>((*a)->get_event());
-          if (a_event == NULL)
+          if (a_event != NULL) {
+            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()));
+            }
+            else if(a_event->is_send())
+            {
+              const BoolVector& a_instances = (*a)->get_instances();
+              size_t j = 0;
+              for(; j<a_instances.size(); j++)
+              {
+                if(a_instances[j] && b_instances[j])
+                {
+                  break;
+                }
+              }
+              if(j==a_instances.size())
+              {
+                m_counterexamples.push_back(RaceInHMscException(f,b_event,a_event,get_reached_elements().back()));
+              }
+            }
             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()));
-          }
-          else if(a_event->is_send())
-          {
+          LocalActionEvent* la_event = dynamic_cast<LocalActionEvent*>((*a)->get_event());
+          if (la_event != NULL) {
             const BoolVector& a_instances = (*a)->get_instances();
             size_t j = 0;
             for(; j<a_instances.size(); j++)
@@ -637,8 +659,9 @@
             }
             if(j==a_instances.size())
             {
-              m_counterexamples.push_back(RaceInHMscException(f,b_event,a_event,get_reached_elements().back()));
+              m_counterexamples.push_back(RaceInHMscException(f,b_event,la_event,get_reached_elements().back()));
             }
+            continue;
           }
         }
       }
@@ -648,7 +671,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-RaceInHMscException::RaceInHMscException(FootprintPtr& footprint,MessageEvent* first, MessageEvent* second,
+RaceInHMscException::RaceInHMscException(FootprintPtr& footprint,MessageEvent* first, Event* second,
                                          const MscElementPList& path_to_second):
   m_footprint(footprint),m_first(first),
    m_second(second),m_path_to_second(path_to_second)
@@ -665,7 +688,7 @@
   return m_first;
 }
 
-MessageEvent* RaceInHMscException::get_second()
+Event* RaceInHMscException::get_second()
 {
   return m_second;
 }

Modified: trunk/src/check/race/race_checker.h
===================================================================
--- trunk/src/check/race/race_checker.h	2015-12-14 23:57:15 UTC (rev 1906)
+++ trunk/src/check/race/race_checker.h	2016-01-08 14:31:25 UTC (rev 1907)
@@ -380,12 +380,12 @@
   
   FootprintPtr m_footprint;
   MessageEvent* m_first;
-  MessageEvent* m_second;
+  Event* m_second;
   MscElementPList m_path_to_second;
   
 public:
   
-  RaceInHMscException(FootprintPtr& footprint,MessageEvent* first, MessageEvent* second, 
+  RaceInHMscException(FootprintPtr& footprint,MessageEvent* first, Event* second, 
     const MscElementPList& path_to_second);
   
   ~RaceInHMscException() throw ()
@@ -395,7 +395,7 @@
 
   FootprintPtr& get_footprint();
   MessageEvent* get_first();
-  MessageEvent* get_second();
+  Event* get_second();
   MscElementPList& get_path_to_second();
 };
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1906] trunk/tests/race

From: <xr...@us...> - 2015-12-14 23:57:16

Revision: 1906
          http://sourceforge.net/p/scstudio/code/1906
Author:   xrehak
Date:     2015-12-14 23:57:15 +0000 (Mon, 14 Dec 2015)
Log Message:
-----------
new test for race based on bug #100

Modified Paths:
--------------
    trunk/tests/race/CMakeLists.txt

Added Paths:
-----------
    trunk/tests/race/race_pos_2_actions.mpr
    trunk/tests/race/race_pos_2_actions.vsd

Modified: trunk/tests/race/CMakeLists.txt
===================================================================
--- trunk/tests/race/CMakeLists.txt	2014-04-03 09:24:40 UTC (rev 1905)
+++ trunk/tests/race/CMakeLists.txt	2015-12-14 23:57:15 UTC (rev 1906)
@@ -1,5 +1,6 @@
 # Positive test-cases
 ADD_CHECKER_TEST(scrace "Race Free" race_pos_1.mpr 1)
+ADD_CHECKER_TEST(scrace "Race Free" race_pos_2_actions.mpr 1)
 # Negative test-cases
 ADD_CHECKER_TEST(scrace "Race Free" race_neg_1.mpr 0)
 ADD_CHECKER_TEST(scrace "Race Free" race_neg_2.mpr 0)

Added: trunk/tests/race/race_pos_2_actions.mpr
===================================================================
--- trunk/tests/race/race_pos_2_actions.mpr	                        (rev 0)
+++ trunk/tests/race/race_pos_2_actions.mpr	2015-12-14 23:57:15 UTC (rev 1906)
@@ -0,0 +1,59 @@
+mscdocument actions_failure.vsd;
+msc Stranka_1;
+inst Alice;
+inst Bob;
+inst Public_network_blockchains;
+text 'The one who has lower `px` generates `x`. Lets WLOG assume its Bob.';
+Alice: instance;
+out Order_publish,0 to Public_network_blockchains;
+in Proposes_a_trade_sends_hash_px_,1 from Bob;
+action 'Generates_px_';
+out Accepts_proposal_sends_hash_px_,2 to Bob;
+in Sends_px_,3 from Bob;
+out Sends_px_,4 to Bob;
+in Sends_pubkey_and_hash_x_,5 from Bob;
+action 'Generates_new_key_pair';
+out Sends_pubkey,6 to Bob;
+in Sends_request_for_signing_tx2_,7 from Bob;
+action 'Verifies_tx2_and_signs_it';
+out Sends_signature_for_tx2_,8 to Bob;
+in _tx1_is_verified_and_safely_stored_in_its_blockchain,9 from Public_network_blockchains;
+action 'Generates_tx3_tx4_';
+out Sends_request_for_signing_tx4_,10 to Bob;
+in Sends_signature_for_tx4_,11 from Bob;
+out Broadcasts_tx3_,12 to Public_network_blockchains;
+in Spots_tx5_and_extracts_x_,13 from Public_network_blockchains;
+out Claims_funds_from_tx1_using_x_in_tx6_,14 to Public_network_blockchains;
+endinstance;
+Bob: instance;
+in Order_read,15 from Public_network_blockchains;
+action 'Generates_px_';
+out Proposes_a_trade_sends_hash_px_,1 to Alice;
+in Accepts_proposal_sends_hash_px_,2 from Alice;
+out Sends_px_,3 to Alice;
+in Sends_px_,4 from Alice;
+action 'Generates_new_key_pair';
+out Sends_pubkey_and_hash_x_,5 to Alice;
+in Sends_pubkey,6 from Alice;
+action 'Generates_tx1_tx2_';
+out Sends_request_for_signing_tx2_,7 to Alice;
+in Sends_signature_for_tx2_,8 from Alice;
+out Broadcasts_tx1_,16 to Public_network_blockchains;
+in Sends_request_for_signing_tx4_,10 from Alice;
+action 'Verifies_tx4_and_signs_it';
+out Sends_signature_for_tx4_,11 to Alice;
+in _tx3_is_verified_and_safely_stored_in_its_blockchain,17 from Public_network_blockchains;
+out Claims_funds_from_tx3_by_revealing_x_in_tx5_,18 to Public_network_blockchains;
+endinstance;
+Public_network_blockchains: instance;
+in Order_publish,0 from Alice;
+out Order_read,15 to Bob;
+in Broadcasts_tx1_,16 from Bob;
+out _tx1_is_verified_and_safely_stored_in_its_blockchain,9 to Alice;
+in Broadcasts_tx3_,12 from Alice;
+out _tx3_is_verified_and_safely_stored_in_its_blockchain,17 to Bob;
+in Claims_funds_from_tx3_by_revealing_x_in_tx5_,18 from Bob;
+out Spots_tx5_and_extracts_x_,13 to Alice;
+in Claims_funds_from_tx1_using_x_in_tx6_,14 from Alice;
+endinstance;
+endmsc;

Added: trunk/tests/race/race_pos_2_actions.vsd
===================================================================
(Binary files differ)

Index: trunk/tests/race/race_pos_2_actions.vsd
===================================================================
--- trunk/tests/race/race_pos_2_actions.vsd	2014-04-03 09:24:40 UTC (rev 1905)
+++ trunk/tests/race/race_pos_2_actions.vsd	2015-12-14 23:57:15 UTC (rev 1906)

Property changes on: trunk/tests/race/race_pos_2_actions.vsd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/vsd
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1905] trunk

From: <xf...@us...> - 2014-04-03 09:24:43

Revision: 1905
          http://sourceforge.net/p/scstudio/code/1905
Author:   xfarmad
Date:     2014-04-03 09:24:40 +0000 (Thu, 03 Apr 2014)
Log Message:
-----------
FIX: VS2010 dll files redistribute 

Modified Paths:
--------------
    trunk/src/view/visio/scstudio.nsi
    trunk/src/view/visio/setup-nsis/certificates.cpp

Added Paths:
-----------
    trunk/third-party-sw/redistribute/atl100.dll
    trunk/third-party-sw/redistribute/msvcp100.dll
    trunk/third-party-sw/redistribute/msvcr100.dll

Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi	2014-02-23 09:26:33 UTC (rev 1904)
+++ trunk/src/view/visio/scstudio.nsi	2014-04-03 09:24:40 UTC (rev 1905)
@@ -180,15 +180,11 @@
 
   SetOutPath $INSTDIR\bin
   DetailPrint "Installing Microsoft libraries"
-  File "..\..\..\third-party-sw\redistribute\Microsoft.VC90.ATL.manifest"
-  File "..\..\..\third-party-sw\redistribute\Microsoft.VC90.ATL.manifest"
-  File "..\..\..\third-party-sw\redistribute\atl90.dll"
-  File "..\..\..\third-party-sw\redistribute\Microsoft.VC90.CRT.manifest"
-  File "..\..\..\third-party-sw\redistribute\msvcm90.dll"
-  File "..\..\..\third-party-sw\redistribute\msvcp90.dll"
-  File "..\..\..\third-party-sw\redistribute\msvcr90.dll"
+  File "..\..\..\third-party-sw\redistribute\atl100.dll"
+  File "..\..\..\third-party-sw\redistribute\msvcp100.dll"
+  File "..\..\..\third-party-sw\redistribute\msvcr100.dll"
   File "..\..\..\third-party-sw\lpsolve\lib\lpsolve55.dll"
-  File "..\..\..\third-party-sw\redistribute\capicom.dll"
+  File "..\..\..\third-party-sw\redistribute\CapiCom.dll"
   ExecWait 'regsvr32.exe /s "$INSTDIR\capicom.dll"'
 
   SetOutPath $TEMP

Modified: trunk/src/view/visio/setup-nsis/certificates.cpp
===================================================================
--- trunk/src/view/visio/setup-nsis/certificates.cpp	2014-02-23 09:26:33 UTC (rev 1904)
+++ trunk/src/view/visio/setup-nsis/certificates.cpp	2014-04-03 09:24:40 UTC (rev 1905)
@@ -27,7 +27,7 @@
 
 // include Microsoft CAPICOM 2.0
 // http://go.microsoft.com/fwlink/?linkid=84567
-#import "capicom.dll"
+#import "..\..\..\..\third-party-sw\redistribute\capicom.dll"
 
 extern "C" __declspec(dllexport)
 void __cdecl InstallPublisherCertificate(HWND hwndParent,

Added: trunk/third-party-sw/redistribute/atl100.dll
===================================================================
(Binary files differ)

Index: trunk/third-party-sw/redistribute/atl100.dll
===================================================================
--- trunk/third-party-sw/redistribute/atl100.dll	2014-02-23 09:26:33 UTC (rev 1904)
+++ trunk/third-party-sw/redistribute/atl100.dll	2014-04-03 09:24:40 UTC (rev 1905)

Property changes on: trunk/third-party-sw/redistribute/atl100.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/third-party-sw/redistribute/msvcp100.dll
===================================================================
(Binary files differ)

Index: trunk/third-party-sw/redistribute/msvcp100.dll
===================================================================
--- trunk/third-party-sw/redistribute/msvcp100.dll	2014-02-23 09:26:33 UTC (rev 1904)
+++ trunk/third-party-sw/redistribute/msvcp100.dll	2014-04-03 09:24:40 UTC (rev 1905)

Property changes on: trunk/third-party-sw/redistribute/msvcp100.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/third-party-sw/redistribute/msvcr100.dll
===================================================================
(Binary files differ)

Index: trunk/third-party-sw/redistribute/msvcr100.dll
===================================================================
--- trunk/third-party-sw/redistribute/msvcr100.dll	2014-02-23 09:26:33 UTC (rev 1904)
+++ trunk/third-party-sw/redistribute/msvcr100.dll	2014-04-03 09:24:40 UTC (rev 1905)

Property changes on: trunk/third-party-sw/redistribute/msvcr100.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1904] trunk

From: <xb...@us...> - 2014-02-23 09:26:37

Revision: 1904
          http://sourceforge.net/p/scstudio/code/1904
Author:   xborza
Date:     2014-02-23 09:26:33 +0000 (Sun, 23 Feb 2014)
Log Message:
-----------
Added NSIS files and debug libraries for easier compilation 

Added Paths:
-----------
    trunk/src/view/visio/setup-nsis/COPYING_NSIS
    trunk/src/view/visio/setup-nsis/README
    trunk/src/view/visio/setup-nsis/api.h
    trunk/src/view/visio/setup-nsis/pluginapi.c
    trunk/src/view/visio/setup-nsis/pluginapi.h
    trunk/third-party-sw/redistribute/Microsoft.VC90.DebugCRT.manifest
    trunk/third-party-sw/redistribute/msvcm90d.dll
    trunk/third-party-sw/redistribute/msvcp90d.dll
    trunk/third-party-sw/redistribute/msvcr90d.dll

Added: trunk/src/view/visio/setup-nsis/COPYING_NSIS
===================================================================
--- trunk/src/view/visio/setup-nsis/COPYING_NSIS	                        (rev 0)
+++ trunk/src/view/visio/setup-nsis/COPYING_NSIS	2014-02-23 09:26:33 UTC (rev 1904)
@@ -0,0 +1,144 @@
+COPYRIGHT
+---------
+
+Copyright (C) 1995-2009 Contributors
+
+More detailed copyright information can be found in the individual source code files.
+
+APPLICABLE LICENSES
+-------------------
+
+* All NSIS source code, plug-ins, documentation, examples, header files and graphics, with the exception of the compression modules and where otherwise noted, are licensed under the zlib/libpng license.
+
+* The zlib compression module for NSIS is licensed under the zlib/libpng license.
+
+* The bzip2 compression module for NSIS is licensed under the bzip2 license.
+
+* The LZMA compression module for NSIS is licensed under the Common Public License version 1.0.
+
+ZLIB/LIBPNG LICENSE
+-------------------
+
+This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+
+      1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+      2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+      3. This notice may not be removed or altered from any source distribution.
+
+BZIP2 LICENSE
+-------------
+
+This program, "bzip2" and associated library "libbzip2", are copyright (C) 1996-2000 Julian R Seward. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+      1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    
+      2. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+
+      3. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+
+      4. The name of the author may not be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Julian Seward, Cambridge, UK.
+
+js...@ac...
+
+COMMON PUBLIC LICENSE VERSION 1.0
+---------------------------------
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+      a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+      b) in the case of each subsequent Contributor:
+
+      i) changes to the Program, and
+
+      ii) additions to the Program;
+
+      where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+      a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+
+      b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
+
+      c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+
+      d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+      a) it complies with the terms and conditions of this Agreement; and
+
+      b) its license agreement:
+
+      i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
+
+      ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
+
+      iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+
+      iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
+
+When the Program is made available in source code form:
+
+      a) it must be made available under this Agreement; and 
+
+      b) a copy of this Agreement must be included with each copy of the Program. 
+
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
+
+SPECIAL EXCEPTION FOR LZMA COMPRESSION MODULE
+---------------------------------------------
+
+Igor Pavlov and Amir Szekely, the authors of the LZMA compression module for NSIS, expressly permit you to statically or dynamically link your code (or bind by name) to the files from the LZMA compression module for NSIS without subjecting your linked code to the terms of the Common Public license version 1.0. Any modifications or additions to files from the LZMA compression module for NSIS, however, are subject to the terms of the Common Public License version 1.0.

Added: trunk/src/view/visio/setup-nsis/README
===================================================================
--- trunk/src/view/visio/setup-nsis/README	                        (rev 0)
+++ trunk/src/view/visio/setup-nsis/README	2014-02-23 09:26:33 UTC (rev 1904)
@@ -0,0 +1,4 @@
+
+Files "api.h", "pluginapi.h" and "pluginapi.c" are parts of
+NSIS 2.46 distribution downloaded from
+http://nsis.sourceforge.net/Download 
\ No newline at end of file

Added: trunk/src/view/visio/setup-nsis/api.h
===================================================================
--- trunk/src/view/visio/setup-nsis/api.h	                        (rev 0)
+++ trunk/src/view/visio/setup-nsis/api.h	2014-02-23 09:26:33 UTC (rev 1904)
@@ -0,0 +1,83 @@
+/*
+ * api.h
+ * 
+ * This file is a part of NSIS.
+ * 
+ * Copyright (C) 1999-2009 Nullsoft and Contributors
+ * 
+ * Licensed under the zlib/libpng license (the "License");
+ * you may not use this file except in compliance with the License.
+ * 
+ * Licence details can be found in the file COPYING_NSIS.
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty.
+ */
+
+#ifndef _NSIS_EXEHEAD_API_H_
+#define _NSIS_EXEHEAD_API_H_
+
+// Starting with NSIS 2.42, you can check the version of the plugin API in exec_flags->plugin_api_version
+// The format is 0xXXXXYYYY where X is the major version and Y is the minor version (MAKELONG(y,x))
+// When doing version checks, always remember to use >=, ex: if (pX->exec_flags->plugin_api_version >= NSISPIAPIVER_1_0) {}
+
+#define NSISPIAPIVER_1_0 0x00010000
+#define NSISPIAPIVER_CURR NSISPIAPIVER_1_0
+
+// NSIS Plug-In Callback Messages
+enum NSPIM 
+{
+	NSPIM_UNLOAD,    // This is the last message a plugin gets, do final cleanup
+	NSPIM_GUIUNLOAD, // Called after .onGUIEnd
+};
+
+// Prototype for callbacks registered with extra_parameters->RegisterPluginCallback()
+// Return NULL for unknown messages
+// Should always be __cdecl for future expansion possibilities
+typedef UINT_PTR (*NSISPLUGINCALLBACK)(enum NSPIM);
+
+// extra_parameters data structures containing other interesting stuff
+// but the stack, variables and HWND passed on to plug-ins.
+typedef struct
+{
+  int autoclose;
+  int all_user_var;
+  int exec_error;
+  int abort;
+  int exec_reboot; // NSIS_SUPPORT_REBOOT
+  int reboot_called; // NSIS_SUPPORT_REBOOT
+  int XXX_cur_insttype; // depreacted
+  int plugin_api_version; // see NSISPIAPIVER_CURR
+                          // used to be XXX_insttype_changed
+  int silent; // NSIS_CONFIG_SILENT_SUPPORT
+  int instdir_error;
+  int rtl;
+  int errlvl;
+  int alter_reg_view;
+  int status_update;
+} exec_flags_t;
+
+#ifndef NSISCALL
+#  define NSISCALL __stdcall
+#endif
+
+typedef struct {
+  exec_flags_t *exec_flags;
+  int (NSISCALL *ExecuteCodeSegment)(int, HWND);
+  void (NSISCALL *validate_filename)(char *);
+  int (NSISCALL *RegisterPluginCallback)(HMODULE, NSISPLUGINCALLBACK); // returns 0 on success, 1 if already registered and < 0 on errors
+} extra_parameters;
+
+// Definitions for page showing plug-ins
+// See Ui.c to understand better how they're used
+
+// sent to the outer window to tell it to go to the next inner window
+#define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)
+
+// custom pages should send this message to let NSIS know they're ready
+#define WM_NOTIFY_CUSTOM_READY (WM_USER+0xd)
+
+// sent as wParam with WM_NOTIFY_OUTER_NEXT when user cancels - heed its warning
+#define NOTIFY_BYE_BYE 'x'
+
+#endif /* _PLUGIN_H_ */

Added: trunk/src/view/visio/setup-nsis/pluginapi.c
===================================================================
--- trunk/src/view/visio/setup-nsis/pluginapi.c	                        (rev 0)
+++ trunk/src/view/visio/setup-nsis/pluginapi.c	2014-02-23 09:26:33 UTC (rev 1904)
@@ -0,0 +1,207 @@
+/*
+ * pluginapi.c
+ * 
+ * This file is a part of NSIS.
+ * 
+ * Copyright (C) 1999-2009 Nullsoft and Contributors
+ * 
+ * Licensed under the zlib/libpng license (the "License");
+ * you may not use this file except in compliance with the License.
+ * 
+ * Licence details can be found in the file COPYING_NSIS.
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty.
+ */
+
+#include <windows.h>
+
+#include "pluginapi.h"
+
+unsigned int g_stringsize;
+stack_t **g_stacktop;
+char *g_variables;
+
+// utility functions (not required but often useful)
+
+int NSISCALL popstring(char *str)
+{
+  stack_t *th;
+  if (!g_stacktop || !*g_stacktop) return 1;
+  th=(*g_stacktop);
+  if (str) lstrcpyA(str,th->text);
+  *g_stacktop = th->next;
+  GlobalFree((HGLOBAL)th);
+  return 0;
+}
+
+int NSISCALL popstringn(char *str, int maxlen)
+{
+  stack_t *th;
+  if (!g_stacktop || !*g_stacktop) return 1;
+  th=(*g_stacktop);
+  if (str) lstrcpynA(str,th->text,maxlen?maxlen:g_stringsize);
+  *g_stacktop = th->next;
+  GlobalFree((HGLOBAL)th);
+  return 0;
+}
+
+void NSISCALL pushstring(const char *str)
+{
+  stack_t *th;
+  if (!g_stacktop) return;
+  th=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t)+g_stringsize);
+  lstrcpynA(th->text,str,g_stringsize);
+  th->next=*g_stacktop;
+  *g_stacktop=th;
+}
+
+char * NSISCALL getuservariable(const int varnum)
+{
+  if (varnum < 0 || varnum >= __INST_LAST) return NULL;
+  return g_variables+varnum*g_stringsize;
+}
+
+void NSISCALL setuservariable(const int varnum, const char *var)
+{
+	if (var != NULL && varnum >= 0 && varnum < __INST_LAST) 
+		lstrcpyA(g_variables + varnum*g_stringsize, var);
+}
+
+// playing with integers
+
+int NSISCALL myatoi(const char *s)
+{
+  int v=0;
+  if (*s == '0' && (s[1] == 'x' || s[1] == 'X'))
+  {
+    s++;
+    for (;;)
+    {
+      int c=*(++s);
+      if (c >= '0' && c <= '9') c-='0';
+      else if (c >= 'a' && c <= 'f') c-='a'-10;
+      else if (c >= 'A' && c <= 'F') c-='A'-10;
+      else break;
+      v<<=4;
+      v+=c;
+    }
+  }
+  else if (*s == '0' && s[1] <= '7' && s[1] >= '0')
+  {
+    for (;;)
+    {
+      int c=*(++s);
+      if (c >= '0' && c <= '7') c-='0';
+      else break;
+      v<<=3;
+      v+=c;
+    }
+  }
+  else
+  {
+    int sign=0;
+    if (*s == '-') sign++; else s--;
+    for (;;)
+    {
+      int c=*(++s) - '0';
+      if (c < 0 || c > 9) break;
+      v*=10;
+      v+=c;
+    }
+    if (sign) v = -v;
+  }
+
+  return v;
+}
+
+unsigned NSISCALL myatou(const char *s)
+{
+  unsigned int v=0;
+
+  for (;;)
+  {
+    unsigned int c=*s++;
+    if (c >= '0' && c <= '9') c-='0';
+    else break;
+    v*=10;
+    v+=c;
+  }
+  return v;
+}
+
+int NSISCALL myatoi_or(const char *s)
+{
+  int v=0;
+  if (*s == '0' && (s[1] == 'x' || s[1] == 'X'))
+  {
+    s++;
+    for (;;)
+    {
+      int c=*(++s);
+      if (c >= '0' && c <= '9') c-='0';
+      else if (c >= 'a' && c <= 'f') c-='a'-10;
+      else if (c >= 'A' && c <= 'F') c-='A'-10;
+      else break;
+      v<<=4;
+      v+=c;
+    }
+  }
+  else if (*s == '0' && s[1] <= '7' && s[1] >= '0')
+  {
+    for (;;)
+    {
+      int c=*(++s);
+      if (c >= '0' && c <= '7') c-='0';
+      else break;
+      v<<=3;
+      v+=c;
+    }
+  }
+  else
+  {
+    int sign=0;
+    if (*s == '-') sign++; else s--;
+    for (;;)
+    {
+      int c=*(++s) - '0';
+      if (c < 0 || c > 9) break;
+      v*=10;
+      v+=c;
+    }
+    if (sign) v = -v;
+  }
+
+  // Support for simple ORed expressions
+  if (*s == '|') 
+  {
+      v |= myatoi_or(s+1);
+  }
+
+  return v;
+}
+
+int NSISCALL popint()
+{
+  char buf[128];
+  if (popstringn(buf,sizeof(buf)))
+    return 0;
+
+  return myatoi(buf);
+}
+
+int NSISCALL popint_or()
+{
+  char buf[128];
+  if (popstringn(buf,sizeof(buf)))
+    return 0;
+
+  return myatoi_or(buf);
+}
+
+void NSISCALL pushint(int value)
+{
+	char buffer[1024];
+	wsprintf(buffer, "%d", value);
+	pushstring(buffer);
+}

Added: trunk/src/view/visio/setup-nsis/pluginapi.h
===================================================================
--- trunk/src/view/visio/setup-nsis/pluginapi.h	                        (rev 0)
+++ trunk/src/view/visio/setup-nsis/pluginapi.h	2014-02-23 09:26:33 UTC (rev 1904)
@@ -0,0 +1,90 @@
+/*
+ * pluginapi.h
+ * 
+ * This file is a part of NSIS.
+ * 
+ * Copyright (C) 1999-2009 Nullsoft and Contributors
+ * 
+ * Licensed under the zlib/libpng license (the "License");
+ * you may not use this file except in compliance with the License.
+ * 
+ * Licence details can be found in the file COPYING_NSIS.
+ * 
+ * This software is provided 'as-is', without any express or implied
+ * warranty.
+ */
+
+#ifndef ___NSIS_PLUGIN__H___
+#define ___NSIS_PLUGIN__H___
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "api.h"
+
+#ifndef NSISCALL
+#  define NSISCALL __stdcall
+#endif
+
+#define EXDLL_INIT()           {  \
+        g_stringsize=string_size; \
+        g_stacktop=stacktop;      \
+        g_variables=variables; }
+
+typedef struct _stack_t {
+  struct _stack_t *next;
+  char text[1]; // this should be the length of string_size
+} stack_t;
+
+enum
+{
+INST_0,         // $0
+INST_1,         // $1
+INST_2,         // $2
+INST_3,         // $3
+INST_4,         // $4
+INST_5,         // $5
+INST_6,         // $6
+INST_7,         // $7
+INST_8,         // $8
+INST_9,         // $9
+INST_R0,        // $R0
+INST_R1,        // $R1
+INST_R2,        // $R2
+INST_R3,        // $R3
+INST_R4,        // $R4
+INST_R5,        // $R5
+INST_R6,        // $R6
+INST_R7,        // $R7
+INST_R8,        // $R8
+INST_R9,        // $R9
+INST_CMDLINE,   // $CMDLINE
+INST_INSTDIR,   // $INSTDIR
+INST_OUTDIR,    // $OUTDIR
+INST_EXEDIR,    // $EXEDIR
+INST_LANG,      // $LANGUAGE
+__INST_LAST
+};
+
+extern unsigned int g_stringsize;
+extern stack_t **g_stacktop;
+extern char *g_variables;
+
+int NSISCALL popstring(char *str); // 0 on success, 1 on empty stack
+int NSISCALL popstringn(char *str, int maxlen); // with length limit, pass 0 for g_stringsize
+int NSISCALL popint(); // pops an integer
+int NSISCALL popint_or(); // with support for or'ing (2|4|8)
+int NSISCALL myatoi(const char *s); // converts a string to an integer
+unsigned NSISCALL myatou(const char *s); // converts a string to an unsigned integer, decimal only
+int NSISCALL myatoi_or(const char *s); // with support for or'ing (2|4|8)
+void NSISCALL pushstring(const char *str);
+void NSISCALL pushint(int value);
+char * NSISCALL getuservariable(const int varnum);
+void NSISCALL setuservariable(const int varnum, const char *var);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif//!___NSIS_PLUGIN__H___

Added: trunk/third-party-sw/redistribute/Microsoft.VC90.DebugCRT.manifest
===================================================================
--- trunk/third-party-sw/redistribute/Microsoft.VC90.DebugCRT.manifest	                        (rev 0)
+++ trunk/third-party-sw/redistribute/Microsoft.VC90.DebugCRT.manifest	2014-02-23 09:26:33 UTC (rev 1904)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- Copyright (c) Microsoft Corporation.  All rights reserved. -->
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+    <noInheritable/>
+    <assemblyIdentity
+        type="win32"
+        name="Microsoft.VC90.DebugCRT"
+        version="9.0.21022.8"
+        processorArchitecture="x86"
+        publicKeyToken="1fc8b3b9a1e18e3b"
+    />
+    <file name="msvcr90d.dll" /> <file name="msvcp90d.dll" /> <file name="msvcm90d.dll" />
+</assembly>

Added: trunk/third-party-sw/redistribute/msvcm90d.dll
===================================================================
(Binary files differ)

Index: trunk/third-party-sw/redistribute/msvcm90d.dll
===================================================================
--- trunk/third-party-sw/redistribute/msvcm90d.dll	2014-02-04 20:48:12 UTC (rev 1903)
+++ trunk/third-party-sw/redistribute/msvcm90d.dll	2014-02-23 09:26:33 UTC (rev 1904)

Property changes on: trunk/third-party-sw/redistribute/msvcm90d.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/third-party-sw/redistribute/msvcp90d.dll
===================================================================
(Binary files differ)

Index: trunk/third-party-sw/redistribute/msvcp90d.dll
===================================================================
--- trunk/third-party-sw/redistribute/msvcp90d.dll	2014-02-04 20:48:12 UTC (rev 1903)
+++ trunk/third-party-sw/redistribute/msvcp90d.dll	2014-02-23 09:26:33 UTC (rev 1904)

Property changes on: trunk/third-party-sw/redistribute/msvcp90d.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: trunk/third-party-sw/redistribute/msvcr90d.dll
===================================================================
(Binary files differ)

Index: trunk/third-party-sw/redistribute/msvcr90d.dll
===================================================================
--- trunk/third-party-sw/redistribute/msvcr90d.dll	2014-02-04 20:48:12 UTC (rev 1903)
+++ trunk/third-party-sw/redistribute/msvcr90d.dll	2014-02-23 09:26:33 UTC (rev 1904)

Property changes on: trunk/third-party-sw/redistribute/msvcr90d.dll
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1903] trunk/src/data/beautify/layout_optimizer.cpp

From: <xf...@us...> - 2014-02-04 20:48:16

Revision: 1903
          http://sourceforge.net/p/scstudio/code/1903
Author:   xfarmad
Date:     2014-02-04 20:48:12 +0000 (Tue, 04 Feb 2014)
Log Message:
-----------
LayoutOptimizer.cpp coregions memory leak fix

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-02-04 14:11:51 UTC (rev 1902)
+++ trunk/src/data/beautify/layout_optimizer.cpp	2014-02-04 20:48:12 UTC (rev 1903)
@@ -846,6 +846,14 @@
 	}
 }
 
+void remove_cor_attributes(CoregionAreaList coregions)
+{
+	//remove attributes of coregions
+	for(CoregionAreaList::const_iterator cor_it=coregions.begin(); cor_it!=coregions.end(); cor_it++)
+	{
+        	(*cor_it)->remove_attribute<unsigned>("id");
+	}
+}
 
 //==========================loading registry beutify======================================
 void LayoutOptimizer::load_registry_beautify()
@@ -1137,7 +1145,7 @@
 
   // to delete instace attributes created in index_instances() function
   remove_inst_cor_attributes(instances);
-  
+  remove_cor_attributes(coregions);
   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.

[Scstudio-commits] SF.net SVN: scstudio:[1902] trunk/tests

From: <xf...@us...> - 2014-02-04 14:11:55

Revision: 1902
          http://sourceforge.net/p/scstudio/code/1902
Author:   xfarmad
Date:     2014-02-04 14:11:51 +0000 (Tue, 04 Feb 2014)
Log Message:
-----------
new test results for export_tex

Modified Paths:
--------------
    trunk/tests/exporttex_position_test/exporttex_position_test.tex.result
    trunk/tests/exporttex_test/exporttex_test02.tex.result
    trunk/tests/exporttex_test/exporttex_test04.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_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_test38.tex.result
    trunk/tests/exporttex_test/exporttex_test39.tex.result
    trunk/tests/exporttex_test/exporttex_test40.tex.result
    trunk/tests/exporttex_test/exporttex_test42.tex.result
    trunk/tests/exporttex_test/exporttex_test49.tex.result
    trunk/tests/exporttex_test/exporttex_test50.tex.result
    trunk/tests/exporttex_test/exporttex_test52.tex.result
    trunk/tests/exporttex_test/exporttex_test56.tex.result
    trunk/tests/exporttex_test/exporttex_test63.tex.result
    trunk/tests/exporttex_test/exporttex_test65.tex.result
    trunk/tests/exporttex_test/exporttex_test67.tex.result
    trunk/tests/exporttex_test/exporttex_test75.tex.result
    trunk/tests/exporttex_test/exporttex_test76.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_test85.tex.result
    trunk/tests/exporttex_test/exporttex_test87.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_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_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

Modified: trunk/tests/exporttex_position_test/exporttex_position_test.tex.result
===================================================================
--- trunk/tests/exporttex_position_test/exporttex_position_test.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_position_test/exporttex_position_test.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -1062,12 +1062,17 @@
 
 
 %%%% Width of comment:
-\def\commentWidthA{3mm*\real{\mscScaleX}}
-\def\commentWidthC{5mm*\real{\mscScaleX}}
-\def\commentWidthB{7mm*\real{\mscScaleX}}
+\def\commentWidthA{25mm*\real{\mscScaleX}}
 
-\setlength{\msccommentdist}{\commentWidthA}
+\setlength{\msccommentwidth}{\commentWidthA}
 
+%%%% Distance of comment from instance:
+\def\commentInstDistA{3mm*\real{\mscScaleX}}
+\def\commentInstDistC{5mm*\real{\mscScaleX}}
+\def\commentInstDistB{7mm*\real{\mscScaleX}}
+
+\setlength{\msccommentdist}{\commentInstDistA}
+
 %%%% Comment slope: 
 \def\commentSlopeD{-8mm*\real{\mscScaleY}}
 \def\commentSlopeB{-7mm*\real{\mscScaleY}}
@@ -1112,23 +1117,23 @@
 \declinst{0_inst}{1}[colorA]{}
 \declinst{1_inst}{2}[colorA]{}
 
-\setlength{\msccommentdist}{\commentWidthA}
+\setlength{\msccommentdist}{\commentInstDistA}
 \setlength{\levelheight}{\commentSlopeA}
 \msccomment{Comment}{0_inst}[-1]
 \setlength{\levelheight}{\slopeA}
 \mess{hi1}{0_inst}[0.3]{1_inst}[1]
-\setlength{\msccommentdist}{\commentWidthC}
+\setlength{\msccommentdist}{\commentInstDistC}
 \setlength{\levelheight}{\commentSlopeC}
 \msccomment[r]{Comment}{1_inst}[-1]
 \setlength{\levelheight}{\levelA}
 \nextlevel
 
-\setlength{\msccommentdist}{\commentWidthB}
+\setlength{\msccommentdist}{\commentInstDistB}
 \setlength{\levelheight}{\commentSlopeB}
 \msccomment{Comment}{0_inst}[-1]
 \setlength{\levelheight}{\slopeA}
 \mess{hi1}{0_inst}[0.3]{1_inst}[1]
-\setlength{\msccommentdist}{\commentWidthB}
+\setlength{\msccommentdist}{\commentInstDistB}
 \setlength{\levelheight}{\commentSlopeD}
 \msccomment[r]{Comment}{1_inst}[-1]
 \end{msc}
@@ -1458,6 +1463,12 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+%%%% Width of comment:
+\def\commentWidthA{20mm*\real{\mscScaleX}}
+
+\setlength{\hmsccommentwidth}{\commentWidthA}
+
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test02.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test02.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test02.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -62,6 +62,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test04.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test04.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test04.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test16.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test16.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test16.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test17.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test17.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test17.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test18.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test18.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test18.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test19.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test19.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test19.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test20.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test20.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test20.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test21.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test21.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test21.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test22.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test22.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test22.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test25.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test25.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test25.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 
@@ -190,6 +191,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test26.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test26.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test26.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 
@@ -190,6 +191,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test27.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test27.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test27.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test28.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test28.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test28.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test29.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test29.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test29.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test30.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test30.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test30.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test31.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test31.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test31.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test38.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test38.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test38.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 
@@ -259,6 +260,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test39.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test39.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test39.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test40.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test40.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test40.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 
@@ -190,6 +191,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test42.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test42.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test42.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test49.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test49.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test49.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test50.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test50.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test50.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test52.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test52.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test52.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test56.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test56.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test56.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test63.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test63.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test63.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test65.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test65.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test65.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 
@@ -119,6 +120,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test67.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test67.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test67.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test75.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test75.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test75.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test76.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test76.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test76.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 
@@ -259,6 +260,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test78.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test78.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test78.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test79.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test79.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test79.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test80.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test80.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test80.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test81.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test81.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test81.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test82.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test82.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test82.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test83.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test83.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test83.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test85.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test85.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test85.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test87.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test87.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test87.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_test90.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test90.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test90.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -49,10 +49,15 @@
 
 
 %%%% Width of comment:
-\def\commentWidthA{50mm*\real{\mscScaleX}}
+\def\commentWidthA{20mm*\real{\mscScaleX}}
 
-\setlength{\msccommentdist}{\commentWidthA}
+\setlength{\msccommentwidth}{\commentWidthA}
 
+%%%% Distance of comment from instance:
+\def\commentInstDistA{50mm*\real{\mscScaleX}}
+
+\setlength{\msccommentdist}{\commentInstDistA}
+
 %%%% Comment slope: 
 \def\commentSlopeA{5mm*\real{\mscScaleY}}
 
@@ -97,7 +102,7 @@
 
 \setlength{\levelheight}{\slopeA}
 \mess{1}{0_inst}[0.3]{2_inst}[1]
-\setlength{\msccommentdist}{\commentWidthA}
+\setlength{\msccommentdist}{\commentInstDistA}
 \setlength{\levelheight}{\commentSlopeA}
 \msccomment{Event }{2_inst}[-1]
 \nextlevel

Modified: trunk/tests/exporttex_test/exporttex_test92.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test92.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test92.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -49,10 +49,15 @@
 
 
 %%%% Width of comment:
-\def\commentWidthA{50mm*\real{\mscScaleX}}
+\def\commentWidthA{20mm*\real{\mscScaleX}}
 
-\setlength{\msccommentdist}{\commentWidthA}
+\setlength{\msccommentwidth}{\commentWidthA}
 
+%%%% Distance of comment from instance:
+\def\commentInstDistA{50mm*\real{\mscScaleX}}
+
+\setlength{\msccommentdist}{\commentInstDistA}
+
 %%%% Comment slope: 
 \def\commentSlopeA{5mm*\real{\mscScaleY}}
 
@@ -97,7 +102,7 @@
 
 \setlength{\levelheight}{\slopeA}
 \mess{1}{0_inst}[0.3]{2_inst}[1]
-\setlength{\msccommentdist}{\commentWidthA}
+\setlength{\msccommentdist}{\commentInstDistA}
 \setlength{\levelheight}{\commentSlopeA}
 \msccomment{Ev''ent }{2_inst}[-1]
 \nextlevel

Modified: trunk/tests/exporttex_test/exporttex_test93.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_test93.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_test93.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -49,10 +49,15 @@
 
 
 %%%% Width of comment:
-\def\commentWidthA{50mm*\real{\mscScaleX}}
+\def\commentWidthA{20mm*\real{\mscScaleX}}
 
-\setlength{\msccommentdist}{\commentWidthA}
+\setlength{\msccommentwidth}{\commentWidthA}
 
+%%%% Distance of comment from instance:
+\def\commentInstDistA{50mm*\real{\mscScaleX}}
+
+\setlength{\msccommentdist}{\commentInstDistA}
+
 %%%% Comment slope: 
 \def\commentSlopeA{5mm*\real{\mscScaleY}}
 
@@ -97,7 +102,7 @@
 
 \setlength{\levelheight}{\slopeA}
 \mess{1}{0_inst}[0.3]{2_inst}[1]
-\setlength{\msccommentdist}{\commentWidthA}
+\setlength{\msccommentdist}{\commentInstDistA}
 \setlength{\levelheight}{\commentSlopeA}
 \msccomment{Event}{2_inst}[-1]
 \nextlevel

Modified: trunk/tests/exporttex_test/exporttex_time01.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time01.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time01.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time02.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time02.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time02.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time03.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time03.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time03.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time04.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time04.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time04.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time05.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time05.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time05.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time06.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time06.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time06.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time07.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time07.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time07.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time08.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time08.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time08.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time09.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time09.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time09.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time10.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time10.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time10.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time11.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time11.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time11.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time12.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time12.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time12.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time13.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time13.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time13.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time14.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time14.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time14.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time15.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time15.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time15.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time16.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time16.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time16.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time17.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time17.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time17.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time18.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time18.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time18.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time20.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time20.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time20.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time21.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time21.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time21.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time22.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time22.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time22.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time23.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time23.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time23.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time24.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time24.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time24.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time25.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time25.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time25.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time26.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time26.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time26.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time27.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time27.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time27.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time28.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time28.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time28.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time29.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time29.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time29.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time30.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time30.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time30.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time31.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time31.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time31.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time32.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time32.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time32.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time33.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time33.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time33.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time34.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time34.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time34.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time35.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time35.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time35.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time36.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time36.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time36.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time37.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time37.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time37.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time38.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time38.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time38.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time39.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time39.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time39.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time40.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time40.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time40.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time41.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time41.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time41.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time42.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time42.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time42.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time43.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time43.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time43.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time44.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time44.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time44.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time45.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time45.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time45.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time46.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time46.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time46.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time47.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time47.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time47.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time48.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time48.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time48.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

Modified: trunk/tests/exporttex_test/exporttex_time49.tex.result
===================================================================
--- trunk/tests/exporttex_test/exporttex_time49.tex.result	2014-02-03 21:56:21 UTC (rev 1901)
+++ trunk/tests/exporttex_test/exporttex_time49.tex.result	2014-02-04 14:11:51 UTC (rev 1902)
@@ -57,6 +57,7 @@
 \setlength{\hmscconnectionradius}{\connectionRadiusA}
 
 
+
 %%%% Width of time interval:
 \def\timeintervalWidthA{14mm*\real{\mscScaleX}}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1901] trunk/src/data/msc

From: <xf...@us...> - 2014-02-03 21:56:24

Revision: 1901
          http://sourceforge.net/p/scstudio/code/1901
Author:   xfarmad
Date:     2014-02-03 21:56:21 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
#92 EventAreaPtr->get_next_area() fix

Modified Paths:
--------------
    trunk/src/data/msc/EventArea.cpp
    trunk/src/data/msc/EventArea.h

Modified: trunk/src/data/msc/EventArea.cpp
===================================================================
--- trunk/src/data/msc/EventArea.cpp	2014-02-03 14:36:12 UTC (rev 1900)
+++ trunk/src/data/msc/EventArea.cpp	2014-02-03 21:56:21 UTC (rev 1901)
@@ -19,14 +19,12 @@
 #include "data/msc.h"
 #include "data/msc/EventArea.h"
 
-const EventAreaPtr& EventArea::get_next_area() const
+const EventAreaPtr EventArea::get_next_area() const
 {
-  static const EventAreaPtr null_ptr;
-  const EventAreaPtrList event_areas = get_instance()->get_areas();
-  for (EventAreaPtrList::const_iterator i = event_areas.begin(); i != event_areas.end(); ++i) {
+  for (EventAreaPtrList::const_iterator i = get_instance()->get_areas().begin(); i != get_instance()->get_areas().end(); ++i) {
     if (i->get() == this) {
       ++i;
-      return (i == event_areas.end() ? null_ptr : *i); // NULL if this is the last event area on the instance
+      return (i == get_instance()->get_areas().end() ? NULL : *i); // NULL if this is the last event area on the instance
     }
   }
   throw std::runtime_error("the event area is not present in its instance area list");
@@ -34,11 +32,10 @@
 
 EventArea* EventArea::get_previous_area() const
 {
-  const EventAreaPtrList event_areas = get_instance()->get_areas();
-  for (EventAreaPtrList::const_reverse_iterator i = event_areas.rbegin(); i != event_areas.rend(); ++i) {
+  for (EventAreaPtrList::const_reverse_iterator i = get_instance()->get_areas().rbegin(); i != get_instance()->get_areas().rend(); ++i) {
     if (i->get() == this) {
       ++i;
-      return (i == event_areas.rend() ? NULL : i->get()); // NULL if this is the first event area on the instance
+      return (i == get_instance()->get_areas().rend() ? NULL : i->get()); // NULL if this is the first event area on the instance
     }
   }
   throw std::runtime_error("the event area is not present in its instance area list");

Modified: trunk/src/data/msc/EventArea.h
===================================================================
--- trunk/src/data/msc/EventArea.h	2014-02-03 14:36:12 UTC (rev 1900)
+++ trunk/src/data/msc/EventArea.h	2014-02-03 21:56:21 UTC (rev 1901)
@@ -73,7 +73,7 @@
    * Returns the next event area on the same instance, or intrusive NULL-pointer if this is the last one.
    * TODO: refactor out usages of this method where possible, use iteration instead
    */
-  const EventAreaPtr& get_next_area() const;
+  const EventAreaPtr get_next_area() const;
   
   /**
    * Returns the previous event area on the same instance, or intrusive NULL-pointer if this is the first one.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1900] trunk/src/view/visio/addon

From: <xm...@us...> - 2014-02-03 14:36:14

Revision: 1900
          http://sourceforge.net/p/scstudio/code/1900
Author:   xmalota
Date:     2014-02-03 14:36:12 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
Remove color function implemented

Modified Paths:
--------------
    trunk/src/view/visio/addon/addon.cpp
    trunk/src/view/visio/addon/document.cpp
    trunk/src/view/visio/addon/document.h

Modified: trunk/src/view/visio/addon/addon.cpp
===================================================================
--- trunk/src/view/visio/addon/addon.cpp	2014-02-03 14:15:15 UTC (rev 1899)
+++ trunk/src/view/visio/addon/addon.cpp	2014-02-03 14:36:12 UTC (rev 1900)
@@ -367,6 +367,9 @@
       case CDocumentMonitor::MENU_SELECT_ALL:
         TRACE("CStudioAddon::Run() menu item 'SCStudio--Drawing--Select--All'");
         return pDocumentMonitor->OnMenuSelectAll(vsoApp, SELECTION_REPLACE);
+      case CDocumentMonitor::MENU_REMOVE_COLORS:
+        TRACE("CStudioAddon::Run() menu item 'SCStudio--Drawing--Select--All'");
+        return pDocumentMonitor->OnMenuRemoveColors(vsoApp);
       case CDocumentMonitor::MENU_SELECT_ALL_MESSAGES:
         TRACE("CStudioAddon::Run() menu item 'SCStudio--Drawing--Select--All Messages'");
         return pDocumentMonitor->OnMenuSelectAllMessages(vsoApp, SELECTION_REPLACE);

Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp	2014-02-03 14:15:15 UTC (rev 1899)
+++ trunk/src/view/visio/addon/document.cpp	2014-02-03 14:36:12 UTC (rev 1900)
@@ -563,6 +563,7 @@
   Visio::IVMenuItemPtr itemRemoveColors = itemDrawing->MenuItems->Add();
   itemRemoveColors->Caption = "&Remove Colors";
   itemRemoveColors->AddOnName = ADDON_NAME;
+  itemRemoveColors->AddOnArgs = stringize() << L"/event=" << MENU_REMOVE_COLORS;
 
   std::vector<Transformer*> toBeAdded;
   toBeAdded.clear();
@@ -1413,6 +1414,18 @@
   return VAORC_SUCCESS;
 }
 
+VAORC CDocumentMonitor::OnMenuRemoveColors(Visio::IVApplicationPtr vsoApp)
+{
+  MscColor shape_color;
+  Visio::IVPagePtr page = vsoApp->ActivePage;
+  for(int i=1; i<=page->Shapes->Count; i++)
+  {
+    Visio::IVShapePtr shape = page->Shapes->Item[i];
+    CShapeUtils::ChangeShapeColor(shape, shape_color);
+  }
+  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-02-03 14:15:15 UTC (rev 1899)
+++ trunk/src/view/visio/addon/document.h	2014-02-03 14:36:12 UTC (rev 1900)
@@ -95,6 +95,7 @@
     MENU_THICKEN_LINES,
     MENU_THIN_LINES,
     MENU_SELECT_ALL,
+    MENU_REMOVE_COLORS,
   };
 
   enum ShortCutItems
@@ -110,6 +111,7 @@
   VAORC OnMenuThinLines(Visio::IVApplicationPtr vsoApp);
   VAORC OnMenuTransform(Visio::IVApplicationPtr vsoApp, int index);
   VAORC OnMenuSelectAll(Visio::IVApplicationPtr vsoApp, SelectionType selType);
+  VAORC OnMenuRemoveColors(Visio::IVApplicationPtr vsoApp);
   VAORC OnMenuSelectAllInstances(Visio::IVApplicationPtr vsoApp, SelectionType selType);
   VAORC OnMenuSelectAllMessages(Visio::IVApplicationPtr vsoApp, SelectionType selType);
   VAORC OnMenuMessageJump(Visio::IVApplicationPtr vsoApp, bool left, bool asCopy);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1899] trunk/src/view/visio/addon

From: <xm...@us...> - 2014-02-03 14:15:18

Revision: 1899
          http://sourceforge.net/p/scstudio/code/1899
Author:   xmalota
Date:     2014-02-03 14:15:15 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
Bug #87 HMSC connection fixed, also fixed HMSC reference and condition: connection points hold still default position

Modified Paths:
--------------
    trunk/src/view/visio/addon/addon.cpp
    trunk/src/view/visio/addon/shapeutils.cpp
    trunk/src/view/visio/addon/shapeutils.h

Modified: trunk/src/view/visio/addon/addon.cpp
===================================================================
--- trunk/src/view/visio/addon/addon.cpp	2014-02-03 13:23:45 UTC (rev 1898)
+++ trunk/src/view/visio/addon/addon.cpp	2014-02-03 14:15:15 UTC (rev 1899)
@@ -668,12 +668,12 @@
     m_bShapeChanged = true;
   }
 
-  /*if(get_shape_type(vsoShape) == ST_HMSC_CONNECTION ||
+  if(get_shape_type(vsoShape) == ST_HMSC_CONNECTION ||
     get_shape_type(vsoShape) == ST_HMSC_REFERENCE ||
     get_shape_type(vsoShape) == ST_MSC_CONDITION)
   {
     CShapeUtils::replaceConnectionPoints(vsoShape);
-  }*/
+  }
   
   //HACK: cell changed so update mouse position (because when changing end points, MouseMove event won't trigger)  
 

Modified: trunk/src/view/visio/addon/shapeutils.cpp
===================================================================
--- trunk/src/view/visio/addon/shapeutils.cpp	2014-02-03 13:23:45 UTC (rev 1898)
+++ trunk/src/view/visio/addon/shapeutils.cpp	2014-02-03 14:15:15 UTC (rev 1899)
@@ -173,7 +173,7 @@
 
   Visio::IVCellPtr cell = shape->CellsSRC[visSectionObject][visRowLine][visLineColor];
 
-  BSTR str = cell->ResultStrU[visUnitsColor].GetBSTR();
+  BSTR str = cell->ResultStr[visUnitsColor].GetBSTR();
   wchar_t *endP;
   //parse string RGB(r, g, b) into numbers r,g,b
   endP = wcsstr(str,L"RGB");
@@ -552,6 +552,54 @@
   return false;   
 }
 
+bool CShapeUtils::replaceConnectionPoints(Visio::IVShapePtr vsoShape)
+{
+  //(get_shape_type(vsoShape) == ST_HMSC_CONNECTION ||
+  //  get_shape_type(vsoShape) == ST_HMSC_REFERENCE ||
+  //  get_shape_type(vsoShape) == ST_MSC_CONDITION)
+  Visio::IVCellPtr connectionX1, connectionY1;
+  Visio::IVCellPtr connectionX2, connectionY2;
+  Visio::IVCellPtr connectionX3, connectionY3;
+  Visio::IVCellPtr connectionX4, connectionY4;
+
+  if(get_shape_type(vsoShape) == ST_HMSC_CONNECTION)
+  {
+    connectionX1 = vsoShape->GetCells("Connections.X1");
+    connectionY1 = vsoShape->GetCells("Connections.Y1");
+    connectionX2 = vsoShape->GetCells("Connections.X2");
+    connectionY2 = vsoShape->GetCells("Connections.Y2");
+    connectionX3 = vsoShape->GetCells("Connections.X3");
+    connectionY3 = vsoShape->GetCells("Connections.Y3");
+    connectionX4 = vsoShape->GetCells("Connections.X4");
+    connectionY4 = vsoShape->GetCells("Connections.Y4");
+
+    connectionX1->PutFormulaU("Width*0.5");
+    connectionY1->PutFormulaU("Width*0");
+    connectionX2->PutFormulaU("Width*0");
+    connectionY2->PutFormulaU("Width*0.5");
+    connectionX3->PutFormulaU("Width*1");
+    connectionY3->PutFormulaU("Width*0.5");
+    connectionX4->PutFormulaU("Width*0.5");
+    connectionY4->PutFormulaU("Width*1");
+  }
+
+  if(get_shape_type(vsoShape) == ST_HMSC_REFERENCE ||
+    get_shape_type(vsoShape) == ST_MSC_CONDITION)
+  {
+    connectionX1 = vsoShape->GetCells("Connections.X1");
+    connectionY1 = vsoShape->GetCells("Connections.Y1");
+    connectionX2 = vsoShape->GetCells("Connections.X2");
+    connectionY2 = vsoShape->GetCells("Connections.Y2");
+
+    connectionX1->PutFormulaU("Width*0.5");
+    connectionY1->PutFormulaU("Height*1");
+    connectionX2->PutFormulaU("Width*0.5");
+    connectionY2->PutFormulaU("Height*0");
+  }
+  
+  return true;
+}
+
 bool CShapeComparator::operator()(const Visio::IVShapePtr shapeOne, const Visio::IVShapePtr shapeTwo)
 {
   if (direction == ORDER_ASC)

Modified: trunk/src/view/visio/addon/shapeutils.h
===================================================================
--- trunk/src/view/visio/addon/shapeutils.h	2014-02-03 13:23:45 UTC (rev 1898)
+++ trunk/src/view/visio/addon/shapeutils.h	2014-02-03 14:15:15 UTC (rev 1899)
@@ -130,6 +130,11 @@
   */
   static bool unglueShape(Visio::IVShapePtr fromShape, const _bstr_t & fromCell, Visio::IVShapePtr toShape);
 
+  /*
+  * Replace connection point that is wrongly situated to the proper place
+  */
+  static bool CShapeUtils::replaceConnectionPoints(Visio::IVShapePtr vsoShape);
+
 };
 
 /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1898] trunk/src

From: <xm...@us...> - 2014-02-03 13:23:48

Revision: 1898
          http://sourceforge.net/p/scstudio/code/1898
Author:   xmalota
Date:     2014-02-03 13:23:45 +0000 (Mon, 03 Feb 2014)
Log Message:
-----------
SCStudio menu reorganized, menu items unified, select all function added 

Modified Paths:
--------------
    trunk/src/check/time/module.cpp
    trunk/src/check/time/pcap_time.h
    trunk/src/check/time/tightening.h
    trunk/src/data/pcap/pcap_load.cpp
    trunk/src/data/time_relevant_ordering/time_relevant_ordering.h
    trunk/src/view/visio/addon/addon.cpp
    trunk/src/view/visio/addon/document.cpp
    trunk/src/view/visio/addon/document.h

Modified: trunk/src/check/time/module.cpp
===================================================================
--- trunk/src/check/time/module.cpp	2014-02-02 17:36:08 UTC (rev 1897)
+++ trunk/src/check/time/module.cpp	2014-02-03 13:23:45 UTC (rev 1898)
@@ -43,10 +43,10 @@
 extern "C" SCTIME_EXPORT
 Transformer** init_transformers()
 {
-  Transformer **result = new Transformer* [2];
-//  result[0] = new Tighter();
-  result[0] = new AbsoluteTimeTighter();
-  result[1] = NULL;
+  Transformer **result = new Transformer* [3];
+  result[0] = new Tighter();
+  result[1] = new AbsoluteTimeTighter();
+  result[2] = NULL;
 
   return result;
 }

Modified: trunk/src/check/time/pcap_time.h
===================================================================
--- trunk/src/check/time/pcap_time.h	2014-02-02 17:36:08 UTC (rev 1897)
+++ trunk/src/check/time/pcap_time.h	2014-02-03 13:23:45 UTC (rev 1898)
@@ -36,7 +36,7 @@
 
     //! Human readable name of the transformation.
     virtual std::wstring get_name() const
-    { return L"AbsoluteTimeTightener"; }
+    { return L"Absolute Time Tightening"; }
 
 
     //! Returns a list of preconditions for this transformation.

Modified: trunk/src/check/time/tightening.h
===================================================================
--- trunk/src/check/time/tightening.h	2014-02-02 17:36:08 UTC (rev 1897)
+++ trunk/src/check/time/tightening.h	2014-02-03 13:23:45 UTC (rev 1898)
@@ -412,7 +412,7 @@
   //! Human readable name of the transformation.
   virtual std::wstring get_name() const
   {
-    return L"Tighten Time";
+    return L"Time Tightening";
   }
 
 

Modified: trunk/src/data/pcap/pcap_load.cpp
===================================================================
--- trunk/src/data/pcap/pcap_load.cpp	2014-02-02 17:36:08 UTC (rev 1897)
+++ trunk/src/data/pcap/pcap_load.cpp	2014-02-03 13:23:45 UTC (rev 1898)
@@ -175,7 +175,7 @@
 ImportFormatter::TransformationList Pcap::get_transformations(MscPtr msc) const
 {
   ImportFormatter::TransformationList result;
-  result.push_back(L"TimeRelevantOrdering");
+  result.push_back(L"Time Relevant Ordering");
   return result;
 }
 

Modified: trunk/src/data/time_relevant_ordering/time_relevant_ordering.h
===================================================================
--- trunk/src/data/time_relevant_ordering/time_relevant_ordering.h	2014-02-02 17:36:08 UTC (rev 1897)
+++ trunk/src/data/time_relevant_ordering/time_relevant_ordering.h	2014-02-03 13:23:45 UTC (rev 1898)
@@ -40,7 +40,7 @@
 
   //! Human readable name of the transformation.
   virtual std::wstring get_name() const
-  { return L"TimeRelevantOrdering"; }
+  { return L"Time Relevant Ordering"; }
 
   //! Returns a list of preconditions for this transformation.
   virtual PreconditionList get_preconditions(MscPtr msc) const;

Modified: trunk/src/view/visio/addon/addon.cpp
===================================================================
--- trunk/src/view/visio/addon/addon.cpp	2014-02-02 17:36:08 UTC (rev 1897)
+++ trunk/src/view/visio/addon/addon.cpp	2014-02-03 13:23:45 UTC (rev 1898)
@@ -364,6 +364,9 @@
       case CDocumentMonitor::MENU_SELECT_ALL_INSTANCES:
         TRACE("CStudioAddon::Run() menu item 'SCStudio--Drawing--Select--All Instances'");
         return pDocumentMonitor->OnMenuSelectAllInstances(vsoApp, SELECTION_REPLACE);
+      case CDocumentMonitor::MENU_SELECT_ALL:
+        TRACE("CStudioAddon::Run() menu item 'SCStudio--Drawing--Select--All'");
+        return pDocumentMonitor->OnMenuSelectAll(vsoApp, SELECTION_REPLACE);
       case CDocumentMonitor::MENU_SELECT_ALL_MESSAGES:
         TRACE("CStudioAddon::Run() menu item 'SCStudio--Drawing--Select--All Messages'");
         return pDocumentMonitor->OnMenuSelectAllMessages(vsoApp, SELECTION_REPLACE);
@@ -664,6 +667,13 @@
 
     m_bShapeChanged = true;
   }
+
+  /*if(get_shape_type(vsoShape) == ST_HMSC_CONNECTION ||
+    get_shape_type(vsoShape) == ST_HMSC_REFERENCE ||
+    get_shape_type(vsoShape) == ST_MSC_CONDITION)
+  {
+    CShapeUtils::replaceConnectionPoints(vsoShape);
+  }*/
   
   //HACK: cell changed so update mouse position (because when changing end points, MouseMove event won't trigger)  
 

Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp	2014-02-02 17:36:08 UTC (rev 1897)
+++ trunk/src/view/visio/addon/document.cpp	2014-02-03 13:23:45 UTC (rev 1898)
@@ -447,6 +447,29 @@
   m_reportMenuItem->AddOnName = ADDON_NAME;
   m_reportMenuItem->AddOnArgs = stringize() << L"/event=" << MENU_WINDOWS_REPORTER;
 
+  Visio::IVMenuItemPtr itemSelect = menu->MenuItems->Add();
+  itemSelect->Caption = "&Select";
+  itemSelect->CmdNum = Visio::visCmdHierarchical;
+
+  Visio::IVMenuItemPtr itemSelectAll = itemSelect->MenuItems->Add();
+  itemSelectAll->Caption = "&All";
+  itemSelectAll->AddOnName = ADDON_NAME;
+  itemSelectAll->AddOnArgs = stringize() << L"/event=" << MENU_SELECT_ALL;
+
+  Visio::IVMenuItemPtr itemSelectInstances = itemSelect->MenuItems->Add();
+  itemSelectInstances->Caption = "All &Instances";
+  itemSelectInstances->AddOnName = ADDON_NAME;
+  itemSelectInstances->AddOnArgs = stringize() << L"/event=" << MENU_SELECT_ALL_INSTANCES;
+  vslIconFile = vslFileName+_T(",2");
+  itemSelectInstances->IconFileName(vslIconFile.c_str());
+
+  Visio::IVMenuItemPtr itemSelectMessages = itemSelect->MenuItems->Add();
+  itemSelectMessages->Caption = "All &Messages";
+  itemSelectMessages->AddOnName = ADDON_NAME;
+  itemSelectMessages->AddOnArgs = stringize() << L"/event=" << MENU_SELECT_ALL_MESSAGES;
+  vslIconFile = vslFileName+_T(",3");
+  itemSelectMessages->IconFileName(vslIconFile.c_str());
+
   Visio::IVMenuItemPtr itemDrawing = menu->MenuItems->Add();
   itemDrawing->Caption = "&Drawing";
   itemDrawing->BeginGroup = true;
@@ -526,63 +549,61 @@
   vslIconFile = vslFileName+_T(",13");
   itemMessageJumpingRightCopy->IconFileName(vslIconFile.c_str());
 
-  Visio::IVMenuItemPtr itemSelect = itemDrawing->MenuItems->Add();
-  itemSelect->Caption = "&Select";
-  itemSelect->CmdNum = Visio::visCmdHierarchical;
-
-  Visio::IVMenuItemPtr itemSelectInstances = itemSelect->MenuItems->Add();
-  itemSelectInstances->Caption = "All &Instances";
-  itemSelectInstances->AddOnName = ADDON_NAME;
-  itemSelectInstances->AddOnArgs = stringize() << L"/event=" << MENU_SELECT_ALL_INSTANCES;
-  vslIconFile = vslFileName+_T(",2");
-  itemSelectInstances->IconFileName(vslIconFile.c_str());
-
-  Visio::IVMenuItemPtr itemSelectMessages = itemSelect->MenuItems->Add();
-  itemSelectMessages->Caption = "All &Messages";
-  itemSelectMessages->AddOnName = ADDON_NAME;
-  itemSelectMessages->AddOnArgs = stringize() << L"/event=" << MENU_SELECT_ALL_MESSAGES;
-  vslIconFile = vslFileName+_T(",3");
-  itemSelectMessages->IconFileName(vslIconFile.c_str());
-
-  Visio::IVMenuItemPtr itemRepaint = itemDrawing->MenuItems->Add();
-  itemRepaint->Caption = "&Repaint";
-  itemRepaint->AddOnName = ADDON_NAME;
-  itemRepaint->AddOnArgs = stringize() << L"/event=" << MENU_REPAINT;
-  itemRepaint->BeginGroup = true;
-
   Visio::IVMenuItemPtr itemThickenLines = itemDrawing->MenuItems->Add();
-  itemThickenLines->Caption = "&Thicken Lines";
+  itemThickenLines->Caption = "&Thicker Lines";
   itemThickenLines->AddOnName = ADDON_NAME;
   itemThickenLines->AddOnArgs = stringize() << L"/event=" << MENU_THICKEN_LINES;
+  itemThickenLines->BeginGroup = true;
 
   Visio::IVMenuItemPtr itemThinLines = itemDrawing->MenuItems->Add();
-  itemThinLines->Caption = "&Thin Lines";
+  itemThinLines->Caption = "&Thinner Lines";
   itemThinLines->AddOnName = ADDON_NAME;
   itemThinLines->AddOnArgs = stringize() << L"/event=" << MENU_THIN_LINES;
 
+  Visio::IVMenuItemPtr itemRemoveColors = itemDrawing->MenuItems->Add();
+  itemRemoveColors->Caption = "&Remove Colors";
+  itemRemoveColors->AddOnName = ADDON_NAME;
+
+  std::vector<Transformer*> toBeAdded;
+  toBeAdded.clear();
   for(TransformerPtrList::const_iterator tpos = m_transformers.begin();
     tpos != m_transformers.end(); tpos++)
   {
-    Visio::IVMenuItemPtr menuItem3x = itemDrawing->MenuItems->Add();
-    menuItem3x->Caption = (*tpos)->get_name().c_str();
-    menuItem3x->AddOnName = ADDON_NAME;
-    // note: event numbers 300-399 are reserved for transformers
-    menuItem3x->AddOnArgs =
-      stringize() << L"/event=" << 300+(tpos-m_transformers.begin());
-    //Make asociation with accelerator (Do it for every item you want shortcut to) and toolbar icon index
-    vslIconFile = L"";
-    if(!strcmp(menuItem3x->Caption,"Beautify"))
+    if((300+(tpos-m_transformers.begin())) == 301)
     {
+      Visio::IVMenuItemPtr menuItem3x = itemDrawing->MenuItems->Add();
+      menuItem3x->Caption = (*tpos)->get_name().c_str();
+      menuItem3x->AddOnName = ADDON_NAME;
+      //note: event numbers 300-399 are reserved for transformers
+      menuItem3x->AddOnArgs =
+        stringize() << L"/event=" << 300+(tpos-m_transformers.begin());
+      vslIconFile = L"";
       beautifyCmdNum = menuItem3x->CmdNum;
       beautifyIndex = tpos-m_transformers.begin();      
       vslIconFile = vslFileName+_T(",15");
+      menuItem3x->IconFileName(vslIconFile.c_str());
+      menuItem3x->BeginGroup = true;
+
+      Visio::IVMenuItemPtr itemRepaint = itemDrawing->MenuItems->Add();
+      itemRepaint->Caption = "&Repaint";
+      itemRepaint->AddOnName = ADDON_NAME;
+      itemRepaint->AddOnArgs = stringize() << L"/event=" << MENU_REPAINT;
     }
-    else if(!strcmp(menuItem3x->Caption,"Tighten Time"))
+  }
+
+  for(TransformerPtrList::const_iterator tpos = m_transformers.begin();
+    tpos != m_transformers.end(); tpos++)
+  {
+    if((300+(tpos-m_transformers.begin())) != 301)
     {
-      tightenTimeIndex = tpos-m_transformers.begin();
-      vslIconFile = vslFileName+_T(",18");
+      Visio::IVMenuItemPtr menuItem3x = itemDrawing->MenuItems->Add();
+      menuItem3x->Caption = (*tpos)->get_name().c_str();
+      menuItem3x->AddOnName = ADDON_NAME;
+      //note: event numbers 300-399 are reserved for transformers
+      menuItem3x->AddOnArgs =
+        stringize() << L"/event=" << 300+(tpos-m_transformers.begin());
+      vslIconFile = L"";
     }
-    menuItem3x->IconFileName(vslIconFile.c_str());
   }
 
   Visio::IVMenuItemPtr itemEnableEnumerating = itemMessageEnumerating->MenuItems->Add();
@@ -657,18 +678,21 @@
   // note: the accelerators must be created in this custom menu set
   // note: the accelerators are bound with menu items via CmdNum property
   Visio::IVAccelTablePtr accelTable = vsoMenus->AccelTables->ItemAtID[Visio::visUIObjSetDrawing];
+  
   //Select Instances
   Visio::IVAccelItemPtr accelItemSelectInstances = accelTable->AccelItems->Add();
   accelItemSelectInstances->CmdNum = itemSelectInstances->CmdNum;
   accelItemSelectInstances->Key = 'I';
   accelItemSelectInstances->Control = true;
   accelItemSelectInstances->Alt = true;
+  
   //Select Messages
   Visio::IVAccelItemPtr accelItemSelectMessages = accelTable->AccelItems->Add();
   accelItemSelectMessages->CmdNum = itemSelectMessages->CmdNum;
   accelItemSelectMessages->Key = 'M';
   accelItemSelectMessages->Control = true;
   accelItemSelectMessages->Alt = true;
+  
   //Add Instances
   Visio::IVAccelItemPtr accelItemAddInstances = accelTable->AccelItems->Add();
   accelItemAddInstances->CmdNum = itemAddInstances->CmdNum;
@@ -1373,6 +1397,22 @@
   return VAORC_SUCCESS;
 }
 
+VAORC CDocumentMonitor::OnMenuSelectAll(Visio::IVApplicationPtr vsoApp, SelectionType selType)
+{
+  Visio::IVPagePtr page = vsoApp->ActivePage;
+  Visio::IVSelectionPtr selection;
+  selection = page->CreateSelection(Visio::visSelTypeEmpty, Visio::visSelModeSkipSuper);
+
+  for(int i=1; i<=page->Shapes->Count; i++)
+  {
+    Visio::IVShapePtr shape = page->Shapes->Item[i];
+    selection->Select(shape, Visio::visSelect);
+  }
+
+  vsoApp->ActiveWindow->Selection = selection;
+  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-02-02 17:36:08 UTC (rev 1897)
+++ trunk/src/view/visio/addon/document.h	2014-02-03 13:23:45 UTC (rev 1898)
@@ -94,6 +94,7 @@
     MENU_DISABLE_MESSAGE_ENUMERATION,
     MENU_THICKEN_LINES,
     MENU_THIN_LINES,
+    MENU_SELECT_ALL,
   };
 
   enum ShortCutItems
@@ -108,6 +109,7 @@
   VAORC OnMenuThickenLines(Visio::IVApplicationPtr vsoApp);
   VAORC OnMenuThinLines(Visio::IVApplicationPtr vsoApp);
   VAORC OnMenuTransform(Visio::IVApplicationPtr vsoApp, int index);
+  VAORC OnMenuSelectAll(Visio::IVApplicationPtr vsoApp, SelectionType selType);
   VAORC OnMenuSelectAllInstances(Visio::IVApplicationPtr vsoApp, SelectionType selType);
   VAORC OnMenuSelectAllMessages(Visio::IVApplicationPtr vsoApp, SelectionType selType);
   VAORC OnMenuMessageJump(Visio::IVApplicationPtr vsoApp, bool left, bool asCopy);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1897] trunk/src/data/exporttex/exportTex.cpp

From: <xf...@us...> - 2014-02-02 17:36:12

Revision: 1897
          http://sourceforge.net/p/scstudio/code/1897
Author:   xfarmad
Date:     2014-02-02 17:36:08 +0000 (Sun, 02 Feb 2014)
Log Message:
-----------
Comment width is now exported in to latex

Modified Paths:
--------------
    trunk/src/data/exporttex/exportTex.cpp

Modified: trunk/src/data/exporttex/exportTex.cpp
===================================================================
--- trunk/src/data/exporttex/exportTex.cpp	2014-01-30 20:38:43 UTC (rev 1896)
+++ trunk/src/data/exporttex/exportTex.cpp	2014-02-02 17:36:08 UTC (rev 1897)
@@ -396,6 +396,7 @@
   DistanceMap m_local_condition_width_map;
   DistanceMap m_local_condition_height_map;
   DistanceMap m_lostfound_width_map;
+  DistanceMap m_comment_inst_dist_map;
   DistanceMap m_comment_width_map;
   DistanceMap m_comment_slope_map;
   DistanceMap m_absolutetime_width_map;
@@ -668,7 +669,8 @@
         cpos != event->get_comments().end(); cpos++)
       { 
         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_inst_dist_map.printLength(event->get_instance()->get_line_begin().get_x(),(*cpos)->get_position().get_x(),true);
+        m_stream << m_comment_width_map.printLength((*cpos)->get_width());
         m_stream << m_comment_slope_map.printLength((*cpos)->get_position().get_y(),event->get_position().get_y()+coordinate);
           m_stream << "\\msccomment";
           if((*cpos)->get_position().get_x() > event->get_instance()->get_line_begin().get_x())
@@ -902,6 +904,7 @@
     m_stream << m_local_condition_height_map.print();
     m_stream << m_lostfound_width_map.print();
     m_stream << m_comment_width_map.print();
+    m_stream << m_comment_inst_dist_map.print();
     m_stream << m_comment_slope_map.print();
     m_stream << m_absolutetime_width_map.print();
     m_stream << m_absolutetime_slope_map.print();
@@ -1007,7 +1010,8 @@
         //left
         edge_point((*cpos)->get_position().get_x()-(*cpos)->get_width());
       }
-		  m_comment_width_map.addDistance( event->get_instance()->get_line_begin().get_x(), (*cpos)->get_position().get_x(),true);
+      m_comment_width_map.addDistance((*cpos)->get_width());
+		  m_comment_inst_dist_map.addDistance( event->get_instance()->get_line_begin().get_x(), (*cpos)->get_position().get_x(),true);
       m_comment_slope_map.addDistance((*cpos)->get_position().get_y(),coor);
 	  }
 
@@ -1653,9 +1657,13 @@
     m_lostfound_width_map.setLengthName("selfmesswidth");
     m_lostfound_width_map.setIsLength(false);
     m_lostfound_width_map.setIsVerticalLength(false);
+    m_comment_inst_dist_map.setName("commentInstDist");
+    m_comment_inst_dist_map.setDescription("%%%% Distance of comment from instance:");
+    m_comment_inst_dist_map.setLengthName("msccommentdist");
+    m_comment_inst_dist_map.setIsVerticalLength(false);
     m_comment_width_map.setName("commentWidth");
     m_comment_width_map.setDescription("%%%% Width of comment:");
-    m_comment_width_map.setLengthName("msccommentdist");
+    m_comment_width_map.setLengthName("msccommentwidth");
     m_comment_width_map.setIsVerticalLength(false);
     m_comment_slope_map.setName("commentSlope");
     m_comment_slope_map.setDescription("%%%% Comment slope: ");
@@ -1904,6 +1912,7 @@
   DistanceMap m_condition_height;
   DistanceMap m_condition_width;
   DistanceMap m_conection_radius;
+  DistanceMap m_comment_width;
   DistanceMap m_time_interval_width;
   DistanceMap m_start_symbol_width;
   ColorMap m_colors;
@@ -1936,6 +1945,7 @@
     for(std::list<HMscNodePtr>::const_iterator npos = node_stack.begin();
       npos != node_stack.end(); npos++)
     {
+
       // process forward links
       PredecessorNode *predecessor_node = dynamic_cast<PredecessorNode*>(npos->get());
       if(predecessor_node != NULL)
@@ -1966,6 +1976,12 @@
         m_urCorner.set_x((*npos)->get_position().get_x());
       if((*npos)->get_position().get_y()>m_urCorner.get_y())
         m_urCorner.set_y((*npos)->get_position().get_y());
+
+      for(CommentPtrSet::const_iterator cpos = (*npos)->get_comments().begin();
+      cpos != (*npos)->get_comments().end(); cpos++)
+      {
+        m_comment_width.addDistance((*cpos)->get_width());
+      }
     }
     node_stack.clear();
   
@@ -2043,6 +2059,7 @@
      << m_condition_width.print() << std::endl
      << m_condition_height.print() << std::endl
      << m_conection_radius.print() << std::endl
+     << m_comment_width.print() << std::endl
      << m_time_interval_width.print() << std::endl
      << m_colors.print() << std::endl;
 
@@ -2136,6 +2153,10 @@
     m_conection_radius.setDescription("%%%% Radius of connection symbol:");
     m_conection_radius.setName("connectionRadius");
     m_conection_radius.setLengthName("hmscconnectionradius");
+    m_comment_width.setDescription("%%%% Width of comment:");
+    m_comment_width.setName("commentWidth");
+    m_comment_width.setLengthName("hmsccommentwidth");
+    m_comment_width.setIsVerticalLength(false);
     m_time_interval_width.setDescription("%%%% Width of time interval:");
     m_time_interval_width.setName("timeintervalWidth");
     m_time_interval_width.setLengthName("");
@@ -2266,6 +2287,7 @@
       cpos != (*npos)->get_comments().end(); cpos++)
       {
         print_color((*cpos)->get_color());
+        m_comment_width.printLength((*cpos)->get_width());
         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()) << "){"

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1896] trunk/src/view/visio/addon/extract.h

From: <xf...@us...> - 2014-01-30 20:38:47

Revision: 1896
          http://sourceforge.net/p/scstudio/code/1896
Author:   xfarmad
Date:     2014-01-30 20:38:43 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
Found message extraction from Visio fix 

Modified Paths:
--------------
    trunk/src/view/visio/addon/extract.h

Modified: trunk/src/view/visio/addon/extract.h
===================================================================
--- trunk/src/view/visio/addon/extract.h	2014-01-30 19:09:24 UTC (rev 1895)
+++ trunk/src/view/visio/addon/extract.h	2014-01-30 20:38:43 UTC (rev 1896)
@@ -128,8 +128,9 @@
 
     bool operator < (const SPoint& p2) const
     {
-      int resy = fcmp(m_y, p2.m_y);
-      return resy < 0 || (resy == 0 && fcmp(m_x, p2.m_x) < 0);
+      int resx = fcmp(m_x, p2.m_x, 0.0001);
+      int resy = fcmp(m_y, p2.m_y, 0.0001);
+      return resy < 0 || (resy == 0 && resx < 0);
     }
   };
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1895] trunk/doc/help/frontend

From: <xb...@us...> - 2014-01-30 19:09:28

Revision: 1895
          http://sourceforge.net/p/scstudio/code/1895
Author:   xborza
Date:     2014-01-30 19:09:24 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
help update

Modified Paths:
--------------
    trunk/doc/help/frontend/message_jumping.body.htm
    trunk/doc/help/frontend/message_numbering.body.htm
    trunk/doc/help/frontend/shortcuts.body.htm

Modified: trunk/doc/help/frontend/message_jumping.body.htm
===================================================================
--- trunk/doc/help/frontend/message_jumping.body.htm	2014-01-30 13:38:58 UTC (rev 1894)
+++ trunk/doc/help/frontend/message_jumping.body.htm	2014-01-30 19:09:24 UTC (rev 1895)
@@ -9,7 +9,7 @@
 	  message jumping - <code>Jump</code> and <code> Jump as Copy </code>.
 	  <ul>
 	    <li>
-		<h3>Jump</h3>
+		<h3 id="jump">Jump</h3>
 		This functionality is accessible via menu <code>SCStudio -> Drawing -> Message Jumping -> Jump Left/Right</code>
 		or via shortcut <code>left/right arrow</code>.</br>
 		The selected message is shifted in between the instances on the left or right side from the original message
@@ -25,7 +25,7 @@
 		
 		</li>
 		<li>
-		<h3>Jump as Copy</h3>
+		<h3 id="jump_copy">Jump as Copy</h3>
 		This functionality is accessible via menu <code>SCStudio -> Drawing -> Message Jumping -> Jump Left as Copy/Jump Right as Copy</code>
 		or via shortcut <code>Ctrl+Alt+left/right arrow</code>.</br>
 		The selected message is copied in between the instances on the left or right side from the original message

Modified: trunk/doc/help/frontend/message_numbering.body.htm
===================================================================
--- trunk/doc/help/frontend/message_numbering.body.htm	2014-01-30 13:38:58 UTC (rev 1894)
+++ trunk/doc/help/frontend/message_numbering.body.htm	2014-01-30 19:09:24 UTC (rev 1895)
@@ -30,7 +30,7 @@
 If no selection is used all numbering indexes will be deleted.
 </p>
 
-<h2>Numbering group selection</h2>
+<h2 id="numb_sel">Numbering group selection</h2>
 <p>When a group of messages is numbered, user can select it by right-click on any of numbered messages from group and choose <code>Select numbering group</code> from context menu. Example is shown in the following picture:</p>
 
 <p>

Modified: trunk/doc/help/frontend/shortcuts.body.htm
===================================================================
--- trunk/doc/help/frontend/shortcuts.body.htm	2014-01-30 13:38:58 UTC (rev 1894)
+++ trunk/doc/help/frontend/shortcuts.body.htm	2014-01-30 19:09:24 UTC (rev 1895)
@@ -40,12 +40,28 @@
           <a href="automatic_drawing.html#message_sequence">Message sequence</a>
         </td>
       </tr>
+	   <tr>
+        <td>
+          <code>Left/Right</code>
+        </td>
+        <td>
+          <a href="message_jumping.html#jump">Message jump left/right</a>
+        </td>
+      </tr>
+	   <tr>
+        <td>
+          <code>Ctrl+Alt+Left/Right</code>
+        </td>
+        <td>
+          <a href="message_jumping.html#jump_copy">Message jump left/right as copy</a>
+        </td>
+      </tr>
       <tr>
         <td>
           <code>Ctrl+Alt+E</code>
         </td>
         <td>
-          <a href="message_numbering.html">Message Numbering</a>
+          <a href="message_numbering.html">Message numbering</a>
         </td>
       </tr>
       <tr>
@@ -58,12 +74,52 @@
       </tr>
 	   <tr>
         <td>
+          <code>Ctrl+Alt+N</code>
+        </td>
+        <td>
+          <a href="message_numbering.html#numb_sel">Select numbering group</a>
+        </td>
+      </tr>
+	   <tr>
+        <td>
           <code>Ctrl+Alt+X</code>
         </td>
         <td>
-           <a href="shape_selection.html#duplicate_drop">Duplicate and drop selected shape into mouse position<>
+           <a href="shape_selection.html#duplicate_drop">Duplicate and drop selected shape into mouse position</a>
         </td>
       </tr>
+	   <tr>
+        <td>
+          <code>Ctrl+Alt+B</code>
+        </td>
+        <td>
+          <a href="../beautify/beautify.html">Beautify</a>
+        </td>
+      </tr>
+	   <tr>
+        <td>
+          <code>Ctrl+Alt+C</code>
+        </td>
+        <td>
+           Verify (view section Verification Algorithms)
+        </td>
+      </tr>
+	   <tr>
+        <td>
+          <code>Ctrl+Alt+T</code>
+        </td>
+        <td>
+           Thicker lines
+        </td>
+      </tr>
+	   <tr>
+        <td>
+          <code>Ctrl+Alt+R</code>
+        </td>
+        <td>
+           Thinner lines
+        </td>
+      </tr>
     </table>
 </div>
   </body>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1894] trunk/src/view/visio/addon/extract.cpp

From: <xf...@us...> - 2014-01-30 13:39:01

Revision: 1894
          http://sourceforge.net/p/scstudio/code/1894
Author:   xfarmad
Date:     2014-01-30 13:38:58 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
hmsc connection-line points extraction from Visio fixed

Modified Paths:
--------------
    trunk/src/view/visio/addon/extract.cpp

Modified: trunk/src/view/visio/addon/extract.cpp
===================================================================
--- trunk/src/view/visio/addon/extract.cpp	2014-01-30 11:17:49 UTC (rev 1893)
+++ trunk/src/view/visio/addon/extract.cpp	2014-01-30 13:38:58 UTC (rev 1894)
@@ -1764,11 +1764,12 @@
         {
           NodeRelation *new_node_relation = new NodeRelation();
           new_node_relation->set_color(shape_color);
-          PolyLine line;          
+          PolyLine line;
+          MscPoint start = GetLineBegin(shape);
           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]);
+            MscPoint point( shape->CellsSRC[visSectionFirstComponent][i][0]->Result[visMillimeters] + start.get_x(), start.get_y() - shape->CellsSRC[visSectionFirstComponent][i][1]->Result[visMillimeters]);
             line.push_back_point(point);
           }          
           new_node_relation->set_line(line);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1893] trunk/src/data/exporttex

From: <xf...@us...> - 2014-01-30 11:17:52

Revision: 1893
          http://sourceforge.net/p/scstudio/code/1893
Author:   xfarmad
Date:     2014-01-30 11:17:49 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
feature #52 implemented

Modified Paths:
--------------
    trunk/src/data/exporttex/exportTex.cpp
    trunk/src/data/exporttex/exportTex.h

Modified: trunk/src/data/exporttex/exportTex.cpp
===================================================================
--- trunk/src/data/exporttex/exportTex.cpp	2014-01-29 17:41:31 UTC (rev 1892)
+++ trunk/src/data/exporttex/exportTex.cpp	2014-01-30 11:17:49 UTC (rev 1893)
@@ -2443,7 +2443,7 @@
     return 1; // unexpected pointer
 }
 
-std::string ExportTex::print_wchar(const std::wstring &value)
+std::string ExportTex::print_wchar(const std::wstring &value, bool remove_white)
 {
   std::string new_value;
   // performance optimalization: allocate buffer for all characters
@@ -2451,11 +2451,29 @@
   //if it is begin of math mode printed
   bool math_mode = false;
   bool slash = false;
+  bool new_line = false;
 
   // step 1: character transliteration
   for(std::wstring::const_iterator pos = value.begin();
     pos != value.end(); pos++)
   {
+    if(new_line && isspace(*pos))
+      continue;
+    if(!new_line && *pos == '\n')
+    {
+      if(math_mode)
+      {
+        new_value.push_back('$');        
+        math_mode = false;
+      }
+      new_value.push_back('\\');
+      new_value.push_back('\\');
+      new_line = true;
+    }
+    else
+    {
+      new_line = false;
+    }
     if( *pos == '+' || *pos == '=' || *pos == '|' || *pos == '<' || *pos == '>' || *pos == '^'
       || *pos == L'¬' || *pos == L'°' || *pos == L'±' || *pos == L'µ' )
     {

Modified: trunk/src/data/exporttex/exportTex.h
===================================================================
--- trunk/src/data/exporttex/exportTex.h	2014-01-29 17:41:31 UTC (rev 1892)
+++ trunk/src/data/exporttex/exportTex.h	2014-01-30 11:17:49 UTC (rev 1893)
@@ -90,7 +90,7 @@
   virtual std::string get_description() const
   { return "TeX Files"; }
 
-  static std::string print_wchar(const std::wstring &name);
+  static std::string print_wchar(const std::wstring &name, bool remove_white = false);
 
   static std::string print_string(const std::string &name);
   

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1892] trunk/doc/help/frontend

From: <xb...@us...> - 2014-01-29 17:41:34

Revision: 1892
          http://sourceforge.net/p/scstudio/code/1892
Author:   xborza
Date:     2014-01-29 17:41:31 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
Keyboard shortcuts HELP update

Modified Paths:
--------------
    trunk/doc/help/frontend/shape_selection.body.htm
    trunk/doc/help/frontend/shortcuts.body.htm

Modified: trunk/doc/help/frontend/shape_selection.body.htm
===================================================================
--- trunk/doc/help/frontend/shape_selection.body.htm	2014-01-29 12:09:54 UTC (rev 1891)
+++ trunk/doc/help/frontend/shape_selection.body.htm	2014-01-29 17:41:31 UTC (rev 1892)
@@ -29,6 +29,30 @@
       all instances (or messages) to the current selection instead of making a
       new selection.
     </p>
+	<h2 id="duplicate_drop">
+      Duplicate and Drop Shape
+    </h2>
+    <p>
+	  The Duplicate and Drop Shape function enables comfortable drawing when it
+	  is needed to use the same shape repeatedly.<br/>
+	  In this case you don't have to drag and drop the necessary shape from
+	  menu again, just apply the following steps:
+	  <ol>
+	    <li>Select one shape lying on actual page in Visio. Otherwise the last dropped shape is usually selected.</li>
+		<li>Move the cursor exactly into the position, where you wish to drop the shape.</li>
+		<li>Invoke <i>Duplicate and Drop</i> function by <code>Ctrl+Alt+X</code> keyboard shortcut.</li>
+	  </ol>
+	  This feature is a bit similar to <code>copy and paste</code> function supported by Visio, but there are some important differences:
+	  <ul>
+	    <li>In contrast with <code>copy/paste</code>, shape is dropped <b>exactly</b> into position of your cursor.</li>
+		<li>Every shape dropped by <code>Ctrl+Alt+X</code> shortcut
+		has the same properties as it were dragged and dropped from menu (in contrast to <code>copy/paste</code>, where you get shape with copied properties of the selected one). You inform SCStudio about the type of requested shape by selecting the one on the page, not in menu. From that reason you can select only one shape on the page before using this function.</li>
+	  <ul>
+    </p>
+    <img src="pictures/dup_drop1.png" alt="Duplicate and Drop Shape" />
+	<img src="pictures/dup_drop3.png" alt="Duplicate and Drop Shape" />
+	<img src="pictures/dup_drop4.png" alt="Duplicate and Drop Shape" />
+   
   </div>
   </body>
 </html>

Modified: trunk/doc/help/frontend/shortcuts.body.htm
===================================================================
--- trunk/doc/help/frontend/shortcuts.body.htm	2014-01-29 12:09:54 UTC (rev 1891)
+++ trunk/doc/help/frontend/shortcuts.body.htm	2014-01-29 17:41:31 UTC (rev 1892)
@@ -61,7 +61,7 @@
           <code>Ctrl+Alt+X</code>
         </td>
         <td>
-          Duplicate and drop selected shape into mouse position
+           <a href="shape_selection.html#duplicate_drop">Duplicate and drop selected shape into mouse position<>
         </td>
       </tr>
     </table>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1891] trunk/src/view/visio

From: <xb...@us...> - 2014-01-29 12:09:57

Revision: 1891
          http://sourceforge.net/p/scstudio/code/1891
Author:   xborza
Date:     2014-01-29 12:09:54 +0000 (Wed, 29 Jan 2014)
Log Message:
-----------
feature #53 SCStudio menu-> options-> selelect/deselect all for the list of checkers implemented

Modified Paths:
--------------
    trunk/src/view/visio/addon/dllmodule.rc
    trunk/src/view/visio/addon/optionsdlg.cpp
    trunk/src/view/visio/addon/optionsdlg.h
    trunk/src/view/visio/addon/resource.h
    trunk/src/view/visio/addon/scstudio.vcxproj
    trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj

Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc	2014-01-22 10:26:17 UTC (rev 1890)
+++ trunk/src/view/visio/addon/dllmodule.rc	2014-01-29 12:09:54 UTC (rev 1891)
@@ -13,13 +13,11 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// Czech resources
+// Czech (Czech Republic) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY)
-#ifdef _WIN32
 LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
 #pragma code_page(1250)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -70,7 +68,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_MESSAGE_SEQUENCE_OPTIONS, DIALOG
     BEGIN
@@ -85,18 +83,16 @@
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // Czech resources
+#endif    // Czech (Czech Republic) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// Slovak resources
+// Slovak (Slovakia) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_SKY)
-#ifdef _WIN32
 LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
 #pragma code_page(1250)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -160,7 +156,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_PCAP_SETTINGS_VIEW, DIALOG
     BEGIN
@@ -213,18 +209,16 @@
 END
 #endif    // APSTUDIO_INVOKED
 
-#endif    // Slovak resources
+#endif    // Slovak (Slovakia) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.S.) resources
+// English (United States) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -253,6 +247,9 @@
     COMBOBOX        IDC_OUTPUTLEVEL,89,213,130,61,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "Properties to check:",IDC_STATIC,6,6,65,8
     GROUPBOX        "",IDC_STATIC,5,175,290,60
+    LTEXT           "Select:",IDC_STATIC,177,5,23,8
+    PUSHBUTTON      "All",IDC_BUTTON_ALL,203,5,34,10,BS_NOTIFY
+    PUSHBUTTON      "None",IDC_BUTTON_NONE,237,5,34,10,BS_NOTIFY
 END
 
 IDD_SIMULATOR_OPTIONS DIALOGEX 0, 0, 300, 93
@@ -437,7 +434,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_CHECK_OPTIONS, DIALOG
     BEGIN
@@ -657,7 +654,7 @@
 // String Table
 //
 
-STRINGTABLE 
+STRINGTABLE
 BEGIN
     IDS_ADDON_NAME          "Sequence Chart Studio"
     IDS_ERROR_VISIO_VERSION "This application requires Microsoft Office Visio 2003 or later."
@@ -665,18 +662,16 @@
     IDS_REPORT_VIEW         "Verification Report"
 END
 
-#endif    // English (U.S.) resources
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
-// English (U.K.) resources
+// English (United Kingdom) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
 #pragma code_page(1252)
-#endif //_WIN32
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -826,7 +821,7 @@
 //
 
 #ifdef APSTUDIO_INVOKED
-GUIDELINES DESIGNINFO 
+GUIDELINES DESIGNINFO
 BEGIN
     IDD_BEAUTIFY_SETTINGS_ADDITIONAL, DIALOG
     BEGIN
@@ -914,7 +909,7 @@
 IDB_SPACING_BMP         BITMAP                  "spacing .bmp"
 IDB_INTERVALS_BMP       BITMAP                  "intervals.bmp"
 IDB_ABSOLUTE_TIMES      BITMAP                  "abs_times.bmp"
-#endif    // English (U.K.) resources
+#endif    // English (United Kingdom) resources
 /////////////////////////////////////////////////////////////////////////////
 
 

Modified: trunk/src/view/visio/addon/optionsdlg.cpp
===================================================================
--- trunk/src/view/visio/addon/optionsdlg.cpp	2014-01-22 10:26:17 UTC (rev 1890)
+++ trunk/src/view/visio/addon/optionsdlg.cpp	2014-01-29 12:09:54 UTC (rev 1891)
@@ -185,4 +185,24 @@
   return TRUE;
 }
 
+LRESULT COptionsDlg::OnBnClickedButtonAll(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+{
+   
+  for(int item = 0; item < m_checklist.GetItemCount(); item++)
+  {
+    m_checklist.SetCheckState(item,true);
+  }
+   return 0;
+}
+
+LRESULT COptionsDlg::OnBnClickedButtonNone(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/)
+{
+  for(int item = 0; item < m_checklist.GetItemCount(); item++)
+  {
+    m_checklist.SetCheckState(item,false);
+  }
+  return 0;
+}
+
 // $Id$
+

Modified: trunk/src/view/visio/addon/optionsdlg.h
===================================================================
--- trunk/src/view/visio/addon/optionsdlg.h	2014-01-22 10:26:17 UTC (rev 1890)
+++ trunk/src/view/visio/addon/optionsdlg.h	2014-01-29 12:09:54 UTC (rev 1891)
@@ -49,6 +49,8 @@
 
 BEGIN_MSG_MAP(COptionsDlg)
   MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
+  COMMAND_HANDLER(IDC_BUTTON_ALL, BN_CLICKED, OnBnClickedButtonAll)
+  COMMAND_HANDLER(IDC_BUTTON_NONE, BN_CLICKED, OnBnClickedButtonNone)
 END_MSG_MAP()
 
 // Handler prototypes:
@@ -67,6 +69,8 @@
     return TRUE;
   }
 
+void OnSelectAllButtonClick();
+
 LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
   {
     DoDataExchange();
@@ -77,6 +81,9 @@
 
   int LoadRegistryData();
   int SaveRegistryData();
+public:
+  LRESULT OnBnClickedButtonAll(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
+  LRESULT OnBnClickedButtonNone(WORD /*wNotifyCode*/, WORD /*wID*/, HWND /*hWndCtl*/, BOOL& /*bHandled*/);
 };
 
 static const DWORD DEFAULT_CHECKER_PRIORITY = 0;

Modified: trunk/src/view/visio/addon/resource.h
===================================================================
--- trunk/src/view/visio/addon/resource.h	2014-01-22 10:26:17 UTC (rev 1890)
+++ trunk/src/view/visio/addon/resource.h	2014-01-29 12:09:54 UTC (rev 1891)
@@ -237,8 +237,11 @@
 #define IDC_FILTER_BOX                  377
 #define IDC_BUTTON1                     378
 #define IDC_SPIN_CONST_HEAD             378
+#define IDC_BUTTON_ALL                  378
 #define IDC_BUTTON2                     379
 #define IDC_VALUE_COREGION              379
+#define IDC_BUTTON                      379
+#define IDC_BUTTON_NONE                 379
 #define IDC_BUTTON3                     380
 #define IDC_VALUE_COREGION_TAIL         380
 #define IDC_SPIN_COREGION               381
@@ -320,7 +323,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        289
 #define _APS_NEXT_COMMAND_VALUE         32768
-#define _APS_NEXT_CONTROL_VALUE         439
+#define _APS_NEXT_CONTROL_VALUE         440
 #define _APS_NEXT_SYMED_VALUE           105
 #endif
 #endif

Modified: trunk/src/view/visio/addon/scstudio.vcxproj
===================================================================
--- trunk/src/view/visio/addon/scstudio.vcxproj	2014-01-22 10:26:17 UTC (rev 1890)
+++ trunk/src/view/visio/addon/scstudio.vcxproj	2014-01-29 12:09:54 UTC (rev 1891)
@@ -43,7 +43,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.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>
@@ -183,6 +183,8 @@
     <ClInclude Include="resource.h" />
     <ClInclude Include="settingsDialog.h" />
     <ClInclude Include="stdafx.h" />
+    <ClInclude Include="timeSnapping.h" />
+    <ClInclude Include="visualize.h" />
     <ClInclude Include="beautifySettingADlg.h" />
     <ClInclude Include="beautifySettingGDlg.h" />
     <ClInclude Include="beautifySettingTimesDlg.h" />
@@ -205,8 +207,6 @@
     <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" />

Modified: trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj
===================================================================
--- trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj	2014-01-22 10:26:17 UTC (rev 1890)
+++ trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj	2014-01-29 12:09:54 UTC (rev 1891)
@@ -38,7 +38,7 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <_ProjectFileVersion>10.0.40219.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>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1890] trunk

From: <xf...@us...> - 2014-01-22 10:26:20

Revision: 1890
          http://sourceforge.net/p/scstudio/code/1890
Author:   xfarmad
Date:     2014-01-22 10:26:17 +0000 (Wed, 22 Jan 2014)
Log Message:
-----------
Hmsc condition repaint fix + new doxygen configuration

Modified Paths:
--------------
    trunk/doc/doxygen/doxygen.config
    trunk/src/view/visio/addon/visualize.cpp

Modified: trunk/doc/doxygen/doxygen.config
===================================================================
--- trunk/doc/doxygen/doxygen.config	2014-01-20 18:35:07 UTC (rev 1889)
+++ trunk/doc/doxygen/doxygen.config	2014-01-22 10:26:17 UTC (rev 1890)
@@ -612,7 +612,11 @@
 # against the file with absolute path, so to exclude all test directories
 # for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = */doc/*
+EXCLUDE_PATTERNS       += */tests/*
+EXCLUDE_PATTERNS       += */third-party-sw/*
+EXCLUDE_PATTERNS       += */tools/*
+EXCLUDE_PATTERNS       += */.svn/*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the

Modified: trunk/src/view/visio/addon/visualize.cpp
===================================================================
--- trunk/src/view/visio/addon/visualize.cpp	2014-01-20 18:35:07 UTC (rev 1889)
+++ trunk/src/view/visio/addon/visualize.cpp	2014-01-22 10:26:17 UTC (rev 1890)
@@ -683,16 +683,7 @@
   ConditionNodePtr condition_node = boost::dynamic_pointer_cast<ConditionNode>(node);
   if(condition_node != NULL)
   {
-    //to support same master for HMSC and BMSC, condition muss have special drop
-    double page_height = get_page_height(vsoPage);
-    // drop the master to bottom-left corner
-    // note: drop coordinates are in Visio internal units
-    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() + 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() - 5;
+    shape = DropMaster(vsoPage, find_master(ST_MSC_CONDITION), condition_node->get_position());
     shape->Text = condition_node->get_label().c_str();
   }
 
@@ -836,24 +827,12 @@
           CShapeUtils::ChangeShapeColor(connector, (*spos)->get_color());
         }
         Visio::IVCellPtr from_cell = connector->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginX];
-        if(get_shape_type(shape) == ST_MSC_CONDITION)
-        {
-          from_cell->GlueToPos(shape, 1.0, 0.5);
-        }
-        else
-        {
-          from_cell->GlueToPos(shape, 0.5, 0.0);
-        }
+        from_cell->GlueToPos(shape, 0.5, 0.0);
+
         Visio::IVCellPtr to_cell = connector->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndX];
-        if(get_shape_type(successor_shape) == ST_MSC_CONDITION)
-        {
-          to_cell->GlueToPos(successor_shape, 0.0, 0.5);
-        }
-        else
-        {
-          to_cell->GlueToPos(successor_shape, 0.5, 1.0);
-        }
+        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);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Scstudio-commits] SF.net SVN: scstudio:[1889] tags/0.5.4/

From: <xf...@us...> - 2014-01-20 18:35:09

Revision: 1889
          http://sourceforge.net/p/scstudio/code/1889
Author:   xfarmad
Date:     2014-01-20 18:35:07 +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.

Flat | Threaded

1 2 3 .. 77 > >> (Page 1 of 77)