Menu
▾
▴
scstudio-commits
|
From: <got...@us...> - 2010-03-06 12:19:52
|
Revision: 667
http://scstudio.svn.sourceforge.net/scstudio/?rev=667&view=rev
Author: gotthardp
Date: 2010-03-06 12:19:42 +0000 (Sat, 06 Mar 2010)
Log Message:
-----------
Fixed installer for beautify.
Modified Paths:
--------------
trunk/src/view/visio/addon/dllmodule.rc
trunk/src/view/visio/build-setup.bat
trunk/src/view/visio/scstudio.nsi
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2010-03-05 23:30:55 UTC (rev 666)
+++ trunk/src/view/visio/addon/dllmodule.rc 2010-03-06 12:19:42 UTC (rev 667)
@@ -149,8 +149,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,3,36,0
- PRODUCTVERSION 0,3,36,0
+ FILEVERSION 0,3,37,0
+ PRODUCTVERSION 0,3,37,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x9L
@@ -167,13 +167,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.3.36"
+ VALUE "FileVersion", "0.3.37"
VALUE "InternalName", "scstudio.vsl"
VALUE "LegalCopyright", "(c) Petr Gotthard. All rights reserved."
VALUE "OriginalFilename", "scstudio.vsl"
VALUE "PrivateBuild", "$Revision$"
VALUE "ProductName", "Sequence Chart Studio"
- VALUE "ProductVersion", "0.3.36"
+ VALUE "ProductVersion", "0.3.37"
END
END
BLOCK "VarFileInfo"
Modified: trunk/src/view/visio/build-setup.bat
===================================================================
--- trunk/src/view/visio/build-setup.bat 2010-03-05 23:30:55 UTC (rev 666)
+++ trunk/src/view/visio/build-setup.bat 2010-03-06 12:19:42 UTC (rev 667)
@@ -1,4 +1,4 @@
-set VERSION=0.3.36
+set VERSION=0.3.37
set BUILD_TYPE=Release
"C:\Program Files\NSIS\makensis" /DVERSION=%VERSION% /DBUILD_TYPE=%BUILD_TYPE% scstudio.nsi
"C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\signtool.exe" sign /a scstudio-setup-%VERSION%.exe
Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi 2010-03-05 23:30:55 UTC (rev 666)
+++ trunk/src/view/visio/scstudio.nsi 2010-03-06 12:19:42 UTC (rev 667)
@@ -197,6 +197,9 @@
WriteRegDWORD HKCU '${RegMainPath}\Beautify' 'SuccessorDistance' '5'
WriteRegDWORD HKCU '${RegMainPath}\Beautify' 'SendReceiveDistance' '0'
WriteRegDWORD HKCU '${RegMainPath}\Beautify' 'IncompleteMessageLength' '20'
+ WriteRegDWORD HKCU '${RegMainPath}\Beautify' 'CrossingPenalization' '1'
+ WriteRegDWORD HKCU '${RegMainPath}\Beautify' 'GoingBackPenalization' '1'
+ WriteRegDWORD HKCU '${RegMainPath}\Beautify' 'MinInstanceBottomDistance' '5'
; configure simulator
WriteRegBin HKCU '${RegMainPath}\Simulator' 'BinWidth' 0000803F
WriteRegBin HKCU '${RegMainPath}\Simulator' 'MaxMessageDelay' 00002041
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ob...@us...> - 2010-03-29 00:40:31
|
Revision: 706
http://scstudio.svn.sourceforge.net/scstudio/?rev=706&view=rev
Author: obouda
Date: 2010-03-29 00:40:24 +0000 (Mon, 29 Mar 2010)
Log Message:
-----------
Instances Field drawing feature reworked and completed. The dialog has changed, units are now taken into consideration, accessible via context menu, form values validation and error handling.
Modified Paths:
--------------
trunk/src/view/visio/addon/addon.cpp
trunk/src/view/visio/addon/addon.h
trunk/src/view/visio/addon/dllmodule.rc
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/document.h
trunk/src/view/visio/addon/instancesfielddlg.cpp
trunk/src/view/visio/addon/instancesfielddlg.h
trunk/src/view/visio/addon/resource.h
trunk/src/view/visio/addon/scstudio.vcproj
trunk/src/view/visio/addon/stdafx.h
trunk/src/view/visio/stencils/Sequence Chart Studio/MSC-logo.vtx
trunk/src/view/visio/stencils/Sequence Chart Studio/MSC.vtx
Added Paths:
-----------
trunk/src/view/visio/addon/pageutils.cpp
trunk/src/view/visio/addon/pageutils.h
Modified: trunk/src/view/visio/addon/addon.cpp
===================================================================
--- trunk/src/view/visio/addon/addon.cpp 2010-03-27 19:15:58 UTC (rev 705)
+++ trunk/src/view/visio/addon/addon.cpp 2010-03-29 00:40:24 UTC (rev 706)
@@ -27,6 +27,7 @@
#include "extract.h"
#include "errors.h"
#include "resource.h"
+#include "pageutils.h"
// include command line parsing library SimpleOpt
// http://code.jellycan.com/simpleopt
@@ -57,6 +58,7 @@
{
m_pIAddonSink = NULL;
m_keyButtonState = 0;
+ m_mousePosX = m_mousePosY = 0.0;
};
VAORC CStudioAddon::About(LPVAOV2LSTRUCT pV2L)
@@ -265,6 +267,10 @@
case 101:
TRACE("CStudioAddon::Run() reference action 'Open Reference'");
return pDocumentMonitor->OnOpenReference(iDocumentIndex, iPageIndex, sShapeU);
+ case 102:
+ case CDocumentMonitor::MENU_INSTANCES_FIELD:
+ TRACE("CStudioAddon::Run() menu item 'Check--Drawing--Instances Field'");
+ return DoInstancesField(pDocumentMonitor, vsoApp);
case CDocumentMonitor::MENU_WINDOWS_REPORTER:
TRACE("CStudioAddon::Run() menu item 'Check--Windows--Verification Report'");
@@ -308,9 +314,6 @@
case CDocumentMonitor::MENU_SELECT_ADD_ALL_MESSAGES:
TRACE("CStudioAddon::Run() add all messages to the current selection");
return pDocumentMonitor->OnMenuSelectAllMessages(vsoApp, true);
- case CDocumentMonitor::MENU_INSTANCES_FIELD:
- TRACE("CStudioAddon::Run() menu item 'Check--Drawing--Instances Field'");
- return DoInstancesField(pDocumentMonitor, vsoApp);
default:
TRACE("CStudioAddon::Run() unexpected event id=" << iEvent);
@@ -372,7 +375,8 @@
VAORC CStudioAddon::DoInstancesField(CDocumentMonitor* documentMonitor, Visio::IVApplicationPtr vsoApp)
{
TRACE("CStudioAddon::DoInstancesField() called");
- CInstancesFieldDlg dlg;
+
+ CInstancesFieldDlg dlg(vsoApp, m_mousePosX, m_mousePosY);
if (!dlg.DoModal()) return VAORC_SUCCESS;
if (!documentMonitor->IsEmpty(vsoApp))
@@ -386,9 +390,16 @@
}
return documentMonitor->DrawInstancesField(
- vsoApp, dlg.m_instances_cnt,
- (dlg.m_use_const_spacing ? dlg.m_spacing : 0.0f),
- dlg.m_margin_left, dlg.m_margin_top, dlg.m_margin_right
+ vsoApp,
+ dlg.m_instances_cnt,
+ CPageUtils::ConvertUnits(vsoApp, dlg.m_instance_length, visPageUnits, visMillimeters),
+ CPageUtils::ConvertUnits(vsoApp, dlg.m_instance_width, visPageUnits, visMillimeters),
+ CPageUtils::ConvertUnits(vsoApp, dlg.m_start_pos_x, visPageUnits, visMillimeters),
+ CPageUtils::ConvertUnits(vsoApp,
+ (CPageUtils::GetPageHeight(vsoApp->ActivePage) - dlg.m_start_pos_y), // the drawing y-coordinates are upside down
+ visPageUnits, visMillimeters),
+ dlg.m_use_const_spacing,
+ CPageUtils::ConvertUnits(vsoApp, (dlg.m_use_const_spacing ? dlg.m_spacing : dlg.m_total_width), visPageUnits, visMillimeters)
);
}
@@ -441,6 +452,11 @@
HandleKeyUp(pSubjectObj, pSourceObj);
break;
+ case Visio::visEvtCodeMouseMove:
+ TRACE("CStudioAddon::HandleVisioEvent() visEvtCodeMouseMove");
+ HandleMouseMove(pSubjectObj, pSourceObj);
+ break;
+
default:
TRACE("CStudioAddon::HandleVisioEvent() unexpected event id="
<< std::ios::hex << event);
@@ -551,6 +567,12 @@
}
}
+void CStudioAddon::HandleMouseMove(Visio::IVMouseEventPtr vsoMouseEvent, Visio::IVApplicationPtr vsoApp)
+{
+ m_mousePosX = vsoMouseEvent->x;
+ m_mousePosY = vsoMouseEvent->y;
+}
+
void CStudioAddon::RegisterPersistentEvents(Visio::IVDocumentPtr vsoDocument)
{
Visio::IVEventPtr vsoDocumentCreateEvent = NULL;
@@ -618,9 +640,10 @@
m_vsoMarkerEvent = vsoApplicationEventList->AddAdvise(visEvtApp|visEvtMarker, varSink, _T(""), _T(""));
}
- // register key listening
+ // register key & mouse listening
vsoApp->EventList->AddAdvise(Visio::visEvtCodeKeyDown, varSink, _T(""), _T("KeyDown"));
vsoApp->EventList->AddAdvise(Visio::visEvtCodeKeyUp, varSink, _T(""), _T("KeyUp"));
+ vsoApp->EventList->AddAdvise(Visio::visEvtCodeMouseMove, varSink, _T(""), _T("MouseMove"));
// Create a monitor class to keep track of this document and the Events
// being monitored for this document.
Modified: trunk/src/view/visio/addon/addon.h
===================================================================
--- trunk/src/view/visio/addon/addon.h 2010-03-27 19:15:58 UTC (rev 705)
+++ trunk/src/view/visio/addon/addon.h 2010-03-29 00:40:24 UTC (rev 706)
@@ -53,6 +53,7 @@
void HandleMarker(Visio::IVApplicationPtr vsoApp);
void HandleKeyDown(Visio::IVKeyboardEventPtr vsoKeyboardEvent, Visio::IVApplicationPtr vsoApp);
void HandleKeyUp(Visio::IVKeyboardEventPtr vsoKeyboardEvent, Visio::IVApplicationPtr vsoApp);
+ void HandleMouseMove(Visio::IVMouseEventPtr vsoMouseEvent, Visio::IVApplicationPtr vsoApp);
void RegisterPersistentEvents(Visio::IVDocumentPtr vsoDocument);
CDocumentMonitor *GetDocumentMonitor(Visio::IVApplicationPtr vsoApp, Visio::IVDocumentPtr vsoDocument);
@@ -66,6 +67,8 @@
DocumentMonitorsMap m_DocumentMonitors;
long m_keyButtonState;
+ double m_mousePosX;
+ double m_mousePosY;
};
// $Id$
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2010-03-27 19:15:58 UTC (rev 705)
+++ trunk/src/view/visio/addon/dllmodule.rc 2010-03-29 00:40:24 UTC (rev 706)
@@ -96,29 +96,35 @@
CONTROL "",IDC_DRAWING2,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,110,14,100,92
END
-IDD_INSTANCES_FIELD_OPTIONS DIALOGEX 0, 0, 186, 137
+IDD_INSTANCES_FIELD_OPTIONS DIALOGEX 0, 0, 201, 127
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Instances Field Options"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
- DEFPUSHBUTTON "OK",IDOK,131,5,50,14
- PUSHBUTTON "Cancel",IDCANCEL,131,25,50,14
+ DEFPUSHBUTTON "OK",IDOK,146,5,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,146,25,50,14
LTEXT "Number of instances:",IDC_STATIC,5,5,70,12,SS_CENTERIMAGE
- EDITTEXT IDC_IF_INSTANCES_CNT,80,5,40,14,ES_AUTOHSCROLL
- GROUPBOX "",IDC_OPTIONS_GROUP_BOX,5,42,176,90
- PUSHBUTTON "+",IDC_OPTIONS_SWITCH_BTN,5,41,10,10
- LTEXT " Options ",IDC_OPTIONS_SWITCH_LBL,19,41,30,8
- CONTROL "Use constant spacing between instances",IDC_IF_SPACING_SWITCH,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,57,146,10
- EDITTEXT IDC_IF_SPACING,69,69,40,14,ES_AUTOHSCROLL
- LTEXT "Spacing [mm]:",IDC_IF_LBL1,19,71,46,8
- LTEXT "Margins [mm]",IDC_IF_LBL2,10,87,44,8
- LTEXT "Left:",IDC_IF_LBL3,19,99,16,8
- EDITTEXT IDC_IF_MARGIN_LEFT,48,97,40,14,ES_AUTOHSCROLL
- LTEXT "Right:",IDC_IF_LBL4,100,99,30,8
- EDITTEXT IDC_IF_MARGIN_RIGHT,130,97,40,14,ES_AUTOHSCROLL
- LTEXT "Top:",IDC_IF_LBL5,19,115,16,8
- EDITTEXT IDC_IF_MARGIN_TOP,48,113,40,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_IF_INSTANCES_CNT,80,5,43,14,ES_AUTOHSCROLL
+ GROUPBOX "",IDC_OPTIONS_GROUP_BOX,5,73,191,50
+ LTEXT " Options ",IDC_OPTIONS_SWITCH_LBL,19,73,30,8
+ LTEXT "Instance length:",IDC_STATIC,5,23,70,12,SS_CENTERIMAGE
+ EDITTEXT IDC_IF_INSTANCE_LENGTH,80,23,43,14,ES_AUTOHSCROLL
+ LTEXT "Start position:",IDC_STATIC,5,40,50,12,SS_CENTERIMAGE
+ EDITTEXT IDC_IF_START_POS_X,80,40,43,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_IF_START_POS_Y,80,54,43,14,ES_AUTOHSCROLL
+ PUSHBUTTON "+",IDC_OPTIONS_SWITCH_BTN,5,73,10,10
+ CONTROL "Total width:",IDC_TOTAL_WIDTH_RDO,"Button",BS_AUTORADIOBUTTON,10,89,54,10
+ CONTROL "Spacing:",IDC_SPACING_RDO,"Button",BS_AUTORADIOBUTTON,10,104,43,10
+ EDITTEXT IDC_IF_TOTAL_WIDTH,63,88,40,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_IF_SPACING,63,103,40,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Default values",IDC_DEFAULT_BTN,131,88,58,14
+ LTEXT "x:",IDC_STATIC,64,40,9,12,SS_CENTERIMAGE
+ LTEXT "y:",IDC_STATIC,64,54,9,12,SS_CENTERIMAGE
+ LTEXT "",IDC_UNITS_LBL1,126,23,14,12,SS_CENTERIMAGE
+ LTEXT "",IDC_UNITS_LBL2,126,40,14,12,SS_CENTERIMAGE
+ LTEXT "",IDC_UNITS_LBL3,126,54,14,12,SS_CENTERIMAGE
+ LTEXT "",IDC_UNITS_LBL4,107,88,14,12,SS_CENTERIMAGE
+ LTEXT "",IDC_UNITS_LBL5,107,103,14,12,SS_CENTERIMAGE
END
@@ -230,19 +236,16 @@
IDD_INSTANCES_FIELD_OPTIONS, DIALOG
BEGIN
LEFTMARGIN, 5
- RIGHTMARGIN, 181
+ RIGHTMARGIN, 196
VERTGUIDE, 10
VERTGUIDE, 19
VERTGUIDE, 48
- VERTGUIDE, 100
+ VERTGUIDE, 64
+ VERTGUIDE, 123
VERTGUIDE, 130
TOPMARGIN, 5
- BOTTOMMARGIN, 132
- HORZGUIDE, 76
- HORZGUIDE, 107
- HORZGUIDE, 111
- HORZGUIDE, 123
- HORZGUIDE, 127
+ BOTTOMMARGIN, 122
+ HORZGUIDE, 54
END
END
#endif // APSTUDIO_INVOKED
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2010-03-27 19:15:58 UTC (rev 705)
+++ trunk/src/view/visio/addon/document.cpp 2010-03-29 00:40:24 UTC (rev 706)
@@ -586,25 +586,25 @@
m_vsoDocument->CustomToolbars->UpdateUI();
}
-VAORC CDocumentMonitor::DrawInstancesField(Visio::IVApplicationPtr vsoApp, int instancesCnt, Coordinate spacing, Coordinate marginLeft, Coordinate marginTop, Coordinate marginRight)
+VAORC CDocumentMonitor::DrawInstancesField(Visio::IVApplicationPtr vsoApp, int instancesCnt, Coordinate instanceLength, Coordinate instanceWidth, Coordinate startX, Coordinate startY, bool useConstSpacing, Coordinate spacingOrWidth)
{
TRACE("CDocumentMonitor::DrawInstancesField() Drawing instances field");
- if (instancesCnt < 0 || spacing < 0 || marginLeft < 0 || marginTop < 0 || marginRight < 0)
+ if (instancesCnt < 0 || instanceLength < 0 || instanceWidth < 0 || startX < 0 || startY < 0)
{
TRACE("CDocumentMonitor::DrawInstancesField() Bad arguments (some are negative)");
return VAORC_FAILURE;
}
- Visio::IVPagePtr vsoPage = vsoApp->GetActivePage();
+ Visio::IVPagePtr vsoPage = vsoApp->ActivePage;
int oldShapesCount = vsoPage->Shapes->Count;
CDrawingVisualizer visualizer(m_vsoApp);
+ Coordinate spacing = spacingOrWidth;
// compute dynamic spacing
- if (spacing == 0.0f && instancesCnt > 1)
+ if (!useConstSpacing && instancesCnt > 1)
{
- Coordinate pageWidth = vsoPage->PageSheet->CellsSRC[visSectionObject][visRowPage][visPageWidth]->Result[visMillimeters];
- spacing = (pageWidth - marginRight - marginLeft) / (instancesCnt - 1);
+ spacing = (spacingOrWidth - instanceWidth) / (instancesCnt - 1);
}
// build a bmsc according to the parameters
@@ -612,13 +612,13 @@
for (int i=0; i<instancesCnt; i++)
{
- Coordinate x = marginLeft + i*spacing;
- Coordinate height = 30;
- Coordinate width = 10;
+ Coordinate x = startX + instanceWidth/2 + i*spacing;
+ Coordinate height = instanceLength;
+ Coordinate width = instanceWidth;
InstancePtr inst(new Instance(_T("NAME")));
- inst->set_line_begin(MscPoint(x, marginTop));
- inst->set_line_end(MscPoint(x, marginTop + height));
+ inst->set_line_begin(MscPoint(x, startY));
+ inst->set_line_end(MscPoint(x, startY + height));
inst->set_width(width);
bmsc->add_instance(inst);
@@ -640,51 +640,6 @@
selection->Select(shape, Visio::visSelect);
}
vsoApp->ActiveWindow->Selection = selection;
-
-
-
- /*
- Visio::IVPagePtr vsoPage = vsoApp->GetActivePage();
- //double page_height = align5(shape->ContainingPage->PageSheet->CellsSRC[visSectionObject][visRowPage][visPageHeight]->Result[visMillimeters]);
- double page_width = vsoPage->PageSheet->CellsSRC[visSectionObject][visRowPage][visPageWidth]->Result[visMillimeters];
- long scope_id = m_vsoApp->BeginUndoScope("Instances Field") + page_width;
- // temporary mappers Visio shape-id --> msc.h
- //std::map<long,InstancePtr> instances;
- //MscMessageMap messages;
- //TimeRelationEventMap time_relations;
- int instcnt = 0;
- // first walk through all shapes: create objects
- for(int i = 1; i <= vsoPage->Shapes->Count; i++)
- {
- Visio::IVShapePtr shape = vsoPage->Shapes->Item[i];
-
- TShapeType type = get_shape_type(shape);
- if(type == ST_BMSC_INSTANCE)
- {
- instcnt++;
- //instances[shape->ID] = new_instance_ptr(shape);
- }
- }
-
- if(instcnt < 2)
- {
- MessageBox(GetActiveWindow(),
- _T("This page contains less than 2 instances.\n"),
- _T("Less than 2 instances"), MB_ICONERROR);
- m_vsoApp->EndUndoScope(scope_id, false);
- return VAORC_FAILURE;
- }
-
- Visio::IVDocumentPtr bmsc_stencil = vsoApp->Documents->Item[BMSC_STENCIL_NAME];
- Visio::IVMasterPtr instance_master = bmsc_stencil->Masters->Item["Line Instance"];
- Visio::IVMasterPtr message_master = bmsc_stencil->Masters->Item["Message (Right)"];
- Visio::IVShapePtr m1 = vsoPage->Drop(message_master, 0, 0);
- Visio::IVShapePtr m2 = vsoPage->Drop(message_master, 3, 0);
- m1->Text = "INVITE 1";
- m2->Text = "INVITE 2";
-
- m_vsoApp->EndUndoScope(scope_id, true);
- */
return VAORC_SUCCESS;
}
@@ -966,11 +921,6 @@
return VAORC_SUCCESS;
}
-bool CDocumentMonitor::IsEmpty(Visio::IVApplicationPtr vsoApp)
-{
- return (vsoApp->ActivePage->Shapes->Count == 0);
-}
-
void CDocumentMonitor::selectAll(Visio::IVApplicationPtr vsoApp, bool select_instances, bool add_to_selection)
{
Visio::IVPagePtr page = vsoApp->ActivePage;
Modified: trunk/src/view/visio/addon/document.h
===================================================================
--- trunk/src/view/visio/addon/document.h 2010-03-27 19:15:58 UTC (rev 705)
+++ trunk/src/view/visio/addon/document.h 2010-03-29 00:40:24 UTC (rev 706)
@@ -96,25 +96,41 @@
void OnSimulationError();
/**
+ * Retrieves the document being monitored.
+ * @return document being monitored
+ */
+ Visio::IVDocumentPtr GetMonitoredDocument() { return m_vsoDocument; }
+
+ /**
* Tells whether the active document page is empty.
* @param vsoApp the application for which to tell the result
* @return true when the active document page is empty, false if not
*/
- bool IsEmpty(Visio::IVApplicationPtr vsoApp);
+ bool IsEmpty(Visio::IVApplicationPtr vsoApp) { return (vsoApp->ActivePage->Shapes->Count == 0); }
+ /**
+ * Toggles the toolbar items according to whether modifiers (Ctrl or Shift) are pressed.
+ * @param modifiersPressed are modifiers (Ctrl or Shift) pressed?
+ */
void ToggleToolbarItems(bool modifiersPressed);
/**
* Draws a field of instances on the current page.
- * @param vsoApp the monitored application where to draw
- * @param instancesCnt number of instances to draw
- * @param spacing constant spacing between instances; 0 for dynamic
- * @param marginLeft left margin - horizontal offset where to start
- * @param marginTop top margin - vertical offset where to start
- * @param marginRight right margin; used only if spacing=0
+ *
+ * All coordinates are expected to be in the millimeters (as it seems to be the units visualizer uses), and the upper-left corner
+ * is expected to be at [0,0].
+ *
+ * @param vsoApp the monitored application where to draw
+ * @param instancesCnt number of instances to draw
+ * @param instanceLength requested length of the instances
+ * @param instanceWidth requested width of the instances
+ * @param startX x-coordinate where to start drawing the upper left corner of the first instance
+ * @param startY y-coordinate where to start drawing the upper left corner of the first instance
+ * @param useConstSpacing use constant (true) or dynamic (false) spacing?
+ * @param spacingOrWidth constant spacing between instances for constant spacing, or total width for dynamic spacing
* @return result: VAORC_SUCCESS or VAORC_FAILURE
*/
- VAORC DrawInstancesField(Visio::IVApplicationPtr vsoApp, int instancesCnt, Coordinate spacing, Coordinate marginLeft, Coordinate marginTop, Coordinate marginRight);
+ VAORC DrawInstancesField(Visio::IVApplicationPtr vsoApp, int instancesCnt, Coordinate instanceLength, Coordinate instanceWidth, Coordinate startX, Coordinate startY, bool useConstSpacing, Coordinate spacingOrWidth);
// event objects for this document
Visio::IVEventPtr m_vsoPageAddedEvent;
Modified: trunk/src/view/visio/addon/instancesfielddlg.cpp
===================================================================
--- trunk/src/view/visio/addon/instancesfielddlg.cpp 2010-03-27 19:15:58 UTC (rev 705)
+++ trunk/src/view/visio/addon/instancesfielddlg.cpp 2010-03-29 00:40:24 UTC (rev 706)
@@ -11,7 +11,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * Copyright (c) 2010 Ondrej Bouda <xb...@fi...>
+ * Copyright (c) 2010 Ondrej Bouda <ond...@wh...>
*
* $Id$
*/
@@ -20,18 +20,64 @@
#include "dllmodule.h"
#include "instancesfielddlg.h"
#include "errors.h"
+#include "document.h"
+#include "pageutils.h"
+CInstancesFieldDlg::CInstancesFieldDlg(Visio::IVApplicationPtr vsoApp, double mousePosX, double mousePosY)
+{
+ m_vsoApp = vsoApp;
+ Visio::IVPagePtr page = vsoApp->ActivePage;
+
+ // we got the mouse coordinates in the internal units
+ m_mousePosX = static_cast<float>(CPageUtils::ConvertUnits(page, mousePosX, 0, visPageUnits));
+ m_mousePosY = static_cast<float>(CPageUtils::ConvertUnits(page, mousePosY, 0, visPageUnits));
+
+ m_pageWidth = static_cast<float>(CPageUtils::GetPageWidth(page));
+ m_pageHeight = static_cast<float>(CPageUtils::GetPageHeight(page));
+
+ /* FIXME: type the units in the form
+ // type the units in the form
+ Visio::IVShapePtr sheet = page->PageSheet;
+ Visio::IVCellPtr pageWidthCell = sheet->CellsSRC[visSectionObject][visRowPage][visPageWidth];
+ m_pageUnits = static_cast<VisUnitCodes>(pageWidthCell->Units);
+
+ for (int i=0; i<ARRAYSIZE(m_unitsLabels); i++) {
+ // FIXME: change the units in the form
+ //m_unitsLabels[i].SetWindowText(CDocumentMonitor::VisioUnitToString(m_pageUnits));
+ //m_unitsLabels[i].SetWindowText(_T("blah"));
+ }
+ */
+}
+
+void CInstancesFieldDlg::OnDataValidateError(UINT nCtrlID, BOOL bSave, _XData& data)
+{
+ CString sMsg = "";
+
+ switch (nCtrlID) {
+ case IDC_IF_INSTANCES_CNT:
+ sMsg.Format(_T("The number of instances must be between %d and %d."),
+ data.intData.nMin, data.intData.nMax );
+ break;
+ default:
+ TRACE("CInstancesFieldDlg::OnDataValidateError() does not have a validation error message for a control");
+ }
+
+ MessageBox(sMsg, _T("Instances Field Error"), MB_ICONEXCLAMATION);
+}
+
LRESULT CInstancesFieldDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{
CenterWindow(GetParent());
LoadRegistryData();
+ if (m_mousePosX > 0 && m_mousePosY > 0) {
+ m_start_pos_x = m_mousePosX;
+ m_start_pos_y = m_mousePosY;
+ }
DoDataExchange(false);
SetOptionsVisibility(m_optionsVisible);
- m_spacingSwitchBtn.SetCheck(m_use_const_spacing ? BST_CHECKED : BST_UNCHECKED);
- m_spacingEdit.EnableWindow(m_use_const_spacing);
- m_marginRightEdit.EnableWindow(!m_use_const_spacing);
+ UpdateSpacingControls();
m_instancesCntEdit.SetSel(0, -1);
@@ -40,13 +86,16 @@
LRESULT CInstancesFieldDlg::OnCloseCmd(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
{
+ BOOL dataExchanged = FALSE;
if(wID == IDOK)
{
- DoDataExchange(true);
- SaveRegistryData();
+ dataExchanged = DoDataExchange(true);
+ if (dataExchanged) {
+ SaveRegistryData();
+ }
}
- EndDialog((wID == IDOK));
+ EndDialog((wID == IDOK && dataExchanged));
return 0;
}
@@ -57,15 +106,49 @@
return 0;
}
-LRESULT CInstancesFieldDlg::OnSpacingSwitch(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+void CInstancesFieldDlg::UpdateSpacingControls()
{
- bool checked = (m_spacingSwitchBtn.GetCheck() == BST_CHECKED);
- m_use_const_spacing = checked;
+ m_totalWidthRdo.SetCheck(m_use_const_spacing ? BST_UNCHECKED : BST_CHECKED);
+ m_spacingRdo.SetCheck(m_use_const_spacing ? BST_CHECKED : BST_UNCHECKED);
+ m_totalWidthEdit.EnableWindow(!m_use_const_spacing);
m_spacingEdit.EnableWindow(m_use_const_spacing);
- m_marginRightEdit.EnableWindow(!m_use_const_spacing);
+}
+
+LRESULT CInstancesFieldDlg::OnTotalWidthRdo(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+{
+ m_use_const_spacing = false;
+ UpdateSpacingControls();
return 0;
}
+LRESULT CInstancesFieldDlg::OnSpacingRdo(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+{
+ m_use_const_spacing = true;
+ UpdateSpacingControls();
+ return 0;
+}
+
+LRESULT CInstancesFieldDlg::OnDefaultCmd(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+{
+ m_start_pos_x = 0.0f;
+ m_start_pos_y = m_pageHeight;
+ m_total_width = (m_pageWidth > 0 ? m_pageWidth :
+ CPageUtils::ConvertUnits(m_vsoApp->ActivePage, DEFAULT_IF_TOTAL_WIDTH, 0, visPageUnits)
+ );
+ m_instance_length = (m_pageHeight > 0 ? m_pageHeight :
+ CPageUtils::ConvertUnits(m_vsoApp->ActivePage, DEFAULT_IF_INSTANCE_LENGTH, 0, visPageUnits)
+ );
+
+ DoDataExchange(false);
+
+ m_use_const_spacing = false;
+ UpdateSpacingControls();
+
+ m_instancesCntEdit.SetSel(0, -1);
+ return 0;
+}
+
+
void CInstancesFieldDlg::SetOptionsVisibility(bool visible)
{
m_optionsSwitchBtn.SetWindowText((visible ? _T("-") : _T("+")));
@@ -73,52 +156,78 @@
CWindow window = m_optionsGroupBox.GetParent();
RECT windowRect;
window.GetWindowRect(&windowRect);
- windowRect.bottom = windowRect.top + (visible ? 250 : 116);
+ windowRect.bottom = windowRect.top + (visible ? 225 : 165);
window.SetWindowPos(0, &windowRect, SWP_SHOWWINDOW | SWP_NOZORDER | SWP_DRAWFRAME);
RECT groupRect;
m_optionsGroupBox.GetWindowRect(&groupRect);
m_optionsGroupBox.ScreenToClient(&groupRect);
- // NOTE: relative to the dialog window
- groupRect.top = 67;
- groupRect.bottom = groupRect.top + (visible ? 150 : 8);
+ // relative to the dialog window
+ groupRect.top = 120;
+ groupRect.bottom = groupRect.top + (visible ? 76 : 8);
groupRect.left = 8;
- groupRect.right = 272;
+ groupRect.right = 292;
m_optionsGroupBox.SetWindowPos(0, &groupRect, SWP_SHOWWINDOW | SWP_NOZORDER | SWP_DRAWFRAME);
- m_spacingSwitchBtn.ShowWindow(visible);
+ m_totalWidthRdo.ShowWindow(visible);
+ m_spacingRdo.ShowWindow(visible);
+ m_totalWidthEdit.ShowWindow(visible);
m_spacingEdit.ShowWindow(visible);
- for (int i=0; i<ARRAY_SIZE(m_optionItems); i++) {
- m_optionItems[i].ShowWindow(visible);
+ m_defaultValuesBtn.ShowWindow(visible);
+
+ for (int i=3; i<ARRAYSIZE(m_unitsLabels); i++) {
+ m_unitsLabels[i].ShowWindow(visible);
}
- m_instancesCntEdit.SetFocus();
+ if (visible) {
+ if (m_use_const_spacing) {
+ m_spacingRdo.SetFocus();
+ } else {
+ m_totalWidthRdo.SetFocus();
+ }
+ } else {
+ m_instancesCntEdit.SetFocus();
+ }
}
int CInstancesFieldDlg::LoadRegistryData()
{
TRACE("CInstancesFieldDlg::LoadRegistryData() loading options from registry");
- m_instances_cnt = GetRegistry<int> (GetRegistryFolder(), NULL, _T("InstancesCnt"), DEFAULT_IF_INSTANCES_CNT);
- m_use_const_spacing = GetRegistry<bool> (GetRegistryFolder(), NULL, _T("SpacingSwitch"), DEFAULT_IF_SPACING_SWITCH);
- m_spacing = GetRegistry<float>(GetRegistryFolder(), NULL, _T("Spacing"), DEFAULT_IF_SPACING);
- m_margin_left = GetRegistry<float>(GetRegistryFolder(), NULL, _T("MarginLeft"), DEFAULT_IF_MARGIN_LEFT);
- m_margin_right = GetRegistry<float>(GetRegistryFolder(), NULL, _T("MarginRight"), DEFAULT_IF_MARGIN_RIGHT);
- m_margin_top = GetRegistry<float>(GetRegistryFolder(), NULL, _T("MarginTop"), DEFAULT_IF_MARGIN_TOP);
- m_optionsVisible = GetRegistry<bool> (GetRegistryFolder(), NULL, _T("OptionsVisible"), DEFAULT_IF_OPTIONS_VISIBLE);
+ Visio::IVPagePtr page = m_vsoApp->ActivePage;
+ // FIXME: precision float <- double warnings
+#define _u(x) CPageUtils::ConvertUnits(page, x, 0, visPageUnits)
+ m_instances_cnt = GetRegistry<int> (GetRegistryFolder(), NULL, _T("InstancesCnt"), DEFAULT_IF_INSTANCES_CNT);
+ m_instance_length = _u(GetRegistry<float>(GetRegistryFolder(), NULL, _T("InstanceLength"), DEFAULT_IF_INSTANCE_LENGTH));
+ m_instance_width = _u(GetRegistry<float>(GetRegistryFolder(), NULL, _T("InstanceWidth"), DEFAULT_IF_INSTANCE_WIDTH));
+ m_start_pos_x = _u(GetRegistry<float>(GetRegistryFolder(), NULL, _T("StartPosX"), DEFAULT_IF_START_POS_X));
+ m_start_pos_y = _u(GetRegistry<float>(GetRegistryFolder(), NULL, _T("StartPosY"), DEFAULT_IF_START_POS_Y));
+ m_use_const_spacing = GetRegistry<bool> (GetRegistryFolder(), NULL, _T("SpacingSwitch"), DEFAULT_IF_SPACING_SWITCH);
+ m_total_width = _u(GetRegistry<float>(GetRegistryFolder(), NULL, _T("TotalWidth"), DEFAULT_IF_TOTAL_WIDTH));
+ m_spacing = _u(GetRegistry<float>(GetRegistryFolder(), NULL, _T("Spacing"), DEFAULT_IF_SPACING));
+ m_optionsVisible = GetRegistry<bool> (GetRegistryFolder(), NULL, _T("OptionsVisible"), DEFAULT_IF_OPTIONS_VISIBLE);
+#undef _u
+
return 0;
}
int CInstancesFieldDlg::SaveRegistryData()
{
TRACE("CInstancesFieldDlg::SaveRegistryData() saving options to registry");
+
+ Visio::IVPagePtr page = m_vsoApp->ActivePage;
+ // FIXME: precision float <- double warnings
+#define _u(x) CPageUtils::ConvertUnits(page, x, visPageUnits, 0)
SetRegistry<int> (HKEY_CURRENT_USER, GetRegistryFolder(), _T("InstancesCnt"), m_instances_cnt);
+ SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("InstanceLength"), _u(m_instance_length));
+ SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("InstanceWidth"), _u(m_instance_width));
+ SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("StartPosX"), _u(m_start_pos_x));
+ SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("StartPosY"), _u(m_start_pos_y));
SetRegistry<bool> (HKEY_CURRENT_USER, GetRegistryFolder(), _T("SpacingSwitch"), m_use_const_spacing);
- SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("Spacing"), m_spacing);
- SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("MarginLeft"), m_margin_left);
- SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("MarginRight"), m_margin_right);
- SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("MarginTop"), m_margin_top);
+ SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("TotalWidth"), _u(m_total_width));
+ SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("Spacing"), _u(m_spacing));
SetRegistry<bool> (HKEY_CURRENT_USER, GetRegistryFolder(), _T("OptionsVisible"), m_optionsVisible);
+#undef _u
return 0;
}
Modified: trunk/src/view/visio/addon/instancesfielddlg.h
===================================================================
--- trunk/src/view/visio/addon/instancesfielddlg.h 2010-03-27 19:15:58 UTC (rev 705)
+++ trunk/src/view/visio/addon/instancesfielddlg.h 2010-03-29 00:40:24 UTC (rev 706)
@@ -11,7 +11,7 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
- * Copyright (c) 2010 Ondrej Bouda <xb...@fi...>
+ * Copyright (c) 2010 Ondrej Bouda <ond...@wh...>
*
* $Id$
*/
@@ -24,6 +24,7 @@
#include <atlctrls.h>
#include <atlddx.h>
#include <atlwinx.h>
+#include <atlmisc.h>
class CInstancesFieldDlg
: public ATL::CDialogImpl<CInstancesFieldDlg>, public CWinDataExchange<CInstancesFieldDlg>
@@ -31,36 +32,50 @@
public:
enum { IDD = IDD_INSTANCES_FIELD_OPTIONS };
int m_instances_cnt;
+ float m_instance_length;
+ float m_instance_width; // NOTE: not in the form, just for the user to be able to change it via the Registry
+ float m_start_pos_x;
+ float m_start_pos_y;
bool m_use_const_spacing;
+ float m_total_width;
float m_spacing;
- float m_margin_left;
- float m_margin_right;
- float m_margin_top;
+ CInstancesFieldDlg(Visio::IVApplicationPtr vsoApp, double mousePosX=0.0, double mousePosY=0.0);
+
const wchar_t* GetRegistryFolder() { return SCSTUDIO_REGISTRY_ROOT _T("\\InstancesField"); }
+private:
+ Visio::IVApplicationPtr m_vsoApp;
+ VisUnitCodes m_pageUnits;
+
+ float m_mousePosX;
+ float m_mousePosY;
+
+ float m_pageWidth;
+ float m_pageHeight;
+
protected:
BEGIN_DDX_MAP(CInstancesFieldDlg)
- DDX_INT_RANGE(IDC_IF_INSTANCES_CNT, m_instances_cnt, 1, 1000)
+ DDX_INT_RANGE(IDC_IF_INSTANCES_CNT, m_instances_...
[truncated message content] |
|
From: <ob...@us...> - 2010-03-29 20:32:47
|
Revision: 708
http://scstudio.svn.sourceforge.net/scstudio/?rev=708&view=rev
Author: obouda
Date: 2010-03-29 20:32:41 +0000 (Mon, 29 Mar 2010)
Log Message:
-----------
Menu Check--Drawing--Instances Field and the corresponding context-menu renamed to Add Instances...
Modified Paths:
--------------
trunk/src/view/visio/addon/addon.cpp
trunk/src/view/visio/addon/dllmodule.rc
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/document.h
trunk/src/view/visio/addon/instancesfielddlg.cpp
trunk/src/view/visio/stencils/Sequence Chart Studio/MSC-logo.vtx
trunk/src/view/visio/stencils/Sequence Chart Studio/MSC.vtx
Modified: trunk/src/view/visio/addon/addon.cpp
===================================================================
--- trunk/src/view/visio/addon/addon.cpp 2010-03-29 16:24:16 UTC (rev 707)
+++ trunk/src/view/visio/addon/addon.cpp 2010-03-29 20:32:41 UTC (rev 708)
@@ -268,8 +268,8 @@
TRACE("CStudioAddon::Run() reference action 'Open Reference'");
return pDocumentMonitor->OnOpenReference(iDocumentIndex, iPageIndex, sShapeU);
case 102:
- case CDocumentMonitor::MENU_INSTANCES_FIELD:
- TRACE("CStudioAddon::Run() menu item 'Check--Drawing--Instances Field'");
+ case CDocumentMonitor::MENU_ADD_INSTANCES:
+ TRACE("CStudioAddon::Run() menu item 'Check--Drawing--Add Instances'");
return DoInstancesField(pDocumentMonitor, vsoApp);
case CDocumentMonitor::MENU_WINDOWS_REPORTER:
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2010-03-29 16:24:16 UTC (rev 707)
+++ trunk/src/view/visio/addon/dllmodule.rc 2010-03-29 20:32:41 UTC (rev 708)
@@ -98,7 +98,7 @@
IDD_INSTANCES_FIELD_OPTIONS DIALOGEX 0, 0, 201, 127
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Instances Field Options"
+CAPTION "Add Instances Options"
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "OK",IDOK,146,5,50,14
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2010-03-29 16:24:16 UTC (rev 707)
+++ trunk/src/view/visio/addon/document.cpp 2010-03-29 20:32:41 UTC (rev 708)
@@ -381,11 +381,11 @@
vslIconFile = vslFileName+_T(",3");
itemSelectMessages->IconFileName(vslIconFile.c_str());
- Visio::IVMenuItemPtr itemInstancesField = itemDrawing->MenuItems->Add();
- itemInstancesField->Caption = "Instances &Field";
- itemInstancesField->AddOnName = ADDON_NAME;
- itemInstancesField->AddOnArgs = stringize() << L"/event=" << MENU_INSTANCES_FIELD;
- itemInstancesField->BeginGroup = true;
+ Visio::IVMenuItemPtr itemAddInstances = itemDrawing->MenuItems->Add();
+ itemAddInstances->Caption = "Add Instances...";
+ itemAddInstances->AddOnName = ADDON_NAME;
+ itemAddInstances->AddOnArgs = stringize() << L"/event=" << MENU_ADD_INSTANCES;
+ itemAddInstances->BeginGroup = true;
Visio::IVMenuItemPtr itemImport = itemDrawing->MenuItems->Add();
itemImport->Caption = "&Import...";
@@ -482,11 +482,11 @@
accelItemSelectMessages->Control = true;
accelItemSelectMessages->Alt = true;
- Visio::IVAccelItemPtr accelItemInstancesField = accelTable->AccelItems->Add();
- accelItemInstancesField->CmdNum = itemInstancesField->CmdNum;
- accelItemInstancesField->Key = 'F';
- accelItemInstancesField->Control = true;
- accelItemInstancesField->Alt = true;
+ Visio::IVAccelItemPtr accelItemAddInstances = accelTable->AccelItems->Add();
+ accelItemAddInstances->CmdNum = itemAddInstances->CmdNum;
+ accelItemAddInstances->Key = 'F';
+ accelItemAddInstances->Control = true;
+ accelItemAddInstances->Alt = true;
m_vsoDocument->SetCustomMenus(vsoMenus);
}
Modified: trunk/src/view/visio/addon/document.h
===================================================================
--- trunk/src/view/visio/addon/document.h 2010-03-29 16:24:16 UTC (rev 707)
+++ trunk/src/view/visio/addon/document.h 2010-03-29 20:32:41 UTC (rev 708)
@@ -62,7 +62,7 @@
MENU_SELECT_ALL_MESSAGES,
MENU_SELECT_ADD_ALL_INSTANCES,
MENU_SELECT_ADD_ALL_MESSAGES,
- MENU_INSTANCES_FIELD,
+ MENU_ADD_INSTANCES,
};
VAORC OnMenuWindowsReporter(Visio::IVApplicationPtr vsoApp);
Modified: trunk/src/view/visio/addon/instancesfielddlg.cpp
===================================================================
--- trunk/src/view/visio/addon/instancesfielddlg.cpp 2010-03-29 16:24:16 UTC (rev 707)
+++ trunk/src/view/visio/addon/instancesfielddlg.cpp 2010-03-29 20:32:41 UTC (rev 708)
@@ -62,7 +62,7 @@
TRACE("CInstancesFieldDlg::OnDataValidateError() does not have a validation error message for a control");
}
- MessageBox(sMsg, _T("Instances Field Error"), MB_ICONEXCLAMATION);
+ MessageBox(sMsg, _T("Add Instances Error"), MB_ICONEXCLAMATION);
}
LRESULT CInstancesFieldDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/MSC-logo.vtx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/MSC-logo.vtx 2010-03-29 16:24:16 UTC (rev 707)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/MSC-logo.vtx 2010-03-29 20:32:41 UTC (rev 708)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='264555E26CC5991E8269602BFB12BB77CE2877E2D0C543BD2ECAFF233A6A566BA663366D067B82C14C3633DA6D2F23EF09DEFD391F4B4837510701DC27DFE157' start='190' metric='0' DocLangID='1033' buildnum='6423' version='12.0' xml:space='preserve' xmlns='http://schemas.microsoft.com/visio/2003/core' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><DocumentProperties><Title>Message Sequence Chart</Title><Creator>Petr Gotthard</Creator><Template>P:\Projects\scstudio\src\view\visio\Sequence Chart Studio\MSC.vtx</Template><Desc>Create interaction diagram standartized in ITU-T Z.120.</Desc><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>805312791</BuildNumberEdited><PreviewPicture Size='20064'>
+<VisioDocument key='24319A4CB7BEB526CB29BB5CB4FA9DF547202948CAA5093F815C0253CF795B628F6A7A1E8883BDD8AEBB9C3CC2F2F19692155B79DAA9F59247B3351864EB474E' start='190' metric='0' DocLangID='1033' buildnum='6423' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>Message Sequence Chart</Title><Creator>Petr Gotthard</Creator><Template>P:\Projects\scstudio\src\view\visio\Sequence Chart Studio\MSC.vtx</Template><Desc>Create interaction diagram standartized in ITU-T Z.120.</Desc><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>805312791</BuildNumberEdited><PreviewPicture Size='20064'>
AQAAAIwAAAAAAAAAAAAAAFAAAABQAAAAAAAAAAAAAAAJCwAABAsAACBFTUYAAAEAYE4AAAMAAAABA
AAADwAAAGwAAAAAAAAAAAUAACADAADEAQAAGgEAAAAAAAAAAAAAAAAAAOPjBgBuTgQAVgBJAFMASQ
BPAAAARAByAGEAdwBpAG4AZwAAAAAAAABMAAAAwE0AAAAAAAAAAAAAUAAAAFAAAAAAAAAAAAAAAFE
@@ -352,7 +352,7 @@
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////AA4AAAAU
-AAAAAAAAABAAAAAUAAAA</PreviewPicture><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-14T15:08:25</TimeCreated><TimeSaved>2010-03-23T13:16:39</TimeSaved><TimeEdited>2010-03-23T13:16:38</TimeEdited><TimePrinted>2008-12-14T15:08:25</TimePrinted></DocumentProperties><DocumentSettings TopPage='2' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>41</GlueSettings><SnapSettings>295</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/><ColorEntry IX='28' RGB='#EFEFEF'/><ColorEntry IX='29' RGB='#FAFAFA'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1033</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1033</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1033</LangID></Char></StyleSheet><StyleSheet ID='6' NameU='Connector' Name='Connector' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>0</FillForegnd><FillBkgnd F='Inh'>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin Unit='PT' F='Inh'>0.05555555555555555</TopMargin><BottomMargin Unit='PT' F='Inh'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd>2</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='7' NameU='Visio 90' Name='Visio 90' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><Begi...
[truncated message content] |
|
From: <ob...@us...> - 2010-04-12 12:03:59
|
Revision: 717
http://scstudio.svn.sourceforge.net/scstudio/?rev=717&view=rev
Author: obouda
Date: 2010-04-12 12:03:52 +0000 (Mon, 12 Apr 2010)
Log Message:
-----------
Message Sequence function - menus, accelerators etc.
Modified Paths:
--------------
trunk/src/view/visio/addon/addon.cpp
trunk/src/view/visio/addon/dllmodule.rc
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/document.h
trunk/src/view/visio/addon/pageutils.cpp
trunk/src/view/visio/addon/pageutils.h
trunk/src/view/visio/addon/resource.h
trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx
Modified: trunk/src/view/visio/addon/addon.cpp
===================================================================
--- trunk/src/view/visio/addon/addon.cpp 2010-04-10 23:23:43 UTC (rev 716)
+++ trunk/src/view/visio/addon/addon.cpp 2010-04-12 12:03:52 UTC (rev 717)
@@ -260,6 +260,7 @@
case 2: // DocumentOpen
return VAORC_SUCCESS;
+ // 1xx events
// note: to keep stencil compatibility, the 1xx events must not be renumbered
case 100:
TRACE("CStudioAddon::Run() stencil event 'OnDrop'");
@@ -267,11 +268,14 @@
case 101:
TRACE("CStudioAddon::Run() reference action 'Open Reference'");
return pDocumentMonitor->OnOpenReference(iDocumentIndex, iPageIndex, sShapeU);
- case 102:
- case CDocumentMonitor::MENU_ADD_INSTANCES:
+ case CDocumentMonitor::MENU_ADD_INSTANCES: // 102
TRACE("CStudioAddon::Run() menu item 'Check--Drawing--Add Instances'");
return DoInstancesField(pDocumentMonitor, vsoApp);
+ case CDocumentMonitor::MENU_MESSAGE_SEQUENCE: // 103
+ TRACE("CStudioAddon::Run() menu item 'Check--Drawing--Message Sequence'");
+ return pDocumentMonitor->OnMenuMessageSequence(vsoApp);
+ // 2xx events
case CDocumentMonitor::MENU_WINDOWS_REPORTER:
TRACE("CStudioAddon::Run() menu item 'Check--Windows--Verification Report'");
return pDocumentMonitor->OnMenuWindowsReporter(vsoApp);
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2010-04-10 23:23:43 UTC (rev 716)
+++ trunk/src/view/visio/addon/dllmodule.rc 2010-04-12 12:03:52 UTC (rev 717)
@@ -13,6 +13,66 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
+// Czech resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CSY)
+#ifdef _WIN32
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+#pragma code_page(1250)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_MESSAGE_SEQUENCE_OPTIONS DIALOGEX 0, 0, 311, 113
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Message Sequence Options"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,254,7,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,254,25,50,14
+ GROUPBOX "Direction:",IDC_STATIC,7,7,241,64
+ CONTROL "Left only",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON,13,19,44,10
+ CONTROL "Right only",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,13,31,48,10
+ CONTROL "Left, Right",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,13,43,50,10
+ CONTROL "Right, Left",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,13,55,50,10
+ LTEXT "Left Message Captions:",IDC_STATIC,90,19,76,8
+ EDITTEXT IDC_MC_LEFT_MESSAGE,171,17,67,14,ES_AUTOHSCROLL
+ LTEXT "Right Message Captions:",IDC_STATIC,90,43,80,8
+ EDITTEXT IDC_MS_RIGHT_MESSAGE,171,41,67,14,ES_AUTOHSCROLL
+ LTEXT "Starting Y-position:",IDC_STATIC,7,78,62,8
+ LTEXT "Vertical space between messages:",IDC_STATIC,7,94,111,8
+ EDITTEXT IDC_EDIT2,121,76,40,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_EDIT3,121,92,40,14,ES_AUTOHSCROLL
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+ IDD_MESSAGE_SEQUENCE_OPTIONS, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 304
+ VERTGUIDE, 13
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 106
+ END
+END
+#endif // APSTUDIO_INVOKED
+
+#endif // Czech resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
// English (U.S.) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2010-04-10 23:23:43 UTC (rev 716)
+++ trunk/src/view/visio/addon/document.cpp 2010-04-12 12:03:52 UTC (rev 717)
@@ -382,11 +382,16 @@
itemSelectMessages->IconFileName(vslIconFile.c_str());
Visio::IVMenuItemPtr itemAddInstances = itemDrawing->MenuItems->Add();
- itemAddInstances->Caption = "Add Instances...";
+ itemAddInstances->Caption = "&Add Instances...";
itemAddInstances->AddOnName = ADDON_NAME;
itemAddInstances->AddOnArgs = stringize() << L"/event=" << MENU_ADD_INSTANCES;
itemAddInstances->BeginGroup = true;
+ Visio::IVMenuItemPtr itemMessageSequence = itemDrawing->MenuItems->Add();
+ itemMessageSequence->Caption = "&Message Sequence...";
+ itemMessageSequence->AddOnName = ADDON_NAME;
+ itemMessageSequence->AddOnArgs = stringize() << L"/event=" << MENU_MESSAGE_SEQUENCE;
+
Visio::IVMenuItemPtr itemImport = itemDrawing->MenuItems->Add();
itemImport->Caption = "&Import...";
itemImport->AddOnName = ADDON_NAME;
@@ -488,6 +493,12 @@
accelItemAddInstances->Control = true;
accelItemAddInstances->Alt = true;
+ Visio::IVAccelItemPtr accelItemMessageSequence = accelTable->AccelItems->Add();
+ accelItemMessageSequence->CmdNum = itemMessageSequence->CmdNum;
+ accelItemMessageSequence->Key = 'S';
+ accelItemMessageSequence->Control = true;
+ accelItemMessageSequence->Alt = true;
+
m_vsoDocument->SetCustomMenus(vsoMenus);
}
@@ -974,6 +985,84 @@
return VAORC_SUCCESS;
}
+std::pair<Visio::IVShapePtr, Visio::IVShapePtr> CDocumentMonitor::getInstancesPair(Visio::IVApplicationPtr vsoApp)
+{
+ // FIXME: does not work quite well
+ Visio::IVSelectionPtr selection = /*CPageUtils::FilterSelection(*/vsoApp->ActiveWindow->Selection/*, ST_BMSC_INSTANCE)*/;
+ switch (selection->Count)
+ {
+ case 1:
+ return std::make_pair<Visio::IVShapePtr, Visio::IVShapePtr>(selection->Item[1], selection->Item[1]);
+ case 2:
+ // NOTE: respects the order in which the items were selected
+ return std::make_pair<Visio::IVShapePtr, Visio::IVShapePtr>(selection->Item[1], selection->Item[2]);
+ case 0:
+ selection->SelectAll();
+ default:
+ Visio::IVShapePtr leftmost = selection->Item[1];
+ Visio::IVShapePtr rightmost = selection->Item[1];
+ for (int i=2; i<=selection->Count; i++)
+ {
+ if (CPageUtils::GetShapeBeginX(selection->Item[i]) < CPageUtils::GetShapeBeginX(leftmost))
+ {
+ leftmost = selection->Item[i];
+ }
+ if (CPageUtils::GetShapeBeginX(selection->Item[i]) > CPageUtils::GetShapeBeginX(rightmost))
+ {
+ rightmost = selection->Item[i];
+ }
+ }
+ return std::make_pair<Visio::IVShapePtr, Visio::IVShapePtr>(leftmost, rightmost);
+ }
+}
+
+std::deque<Visio::IVShapePtr> CDocumentMonitor::getInstancesInBetween(Visio::IVApplicationPtr vsoApp, Visio::IVShapePtr boundaryOne, Visio::IVShapePtr boundaryTwo, float yCoord)
+{
+ std::deque<Visio::IVShapePtr> qualified;
+ if (CPageUtils::GetShapeBeginX(boundaryOne) == CPageUtils::GetShapeBeginX(boundaryTwo))
+ {
+ return qualified;
+ }
+
+ // TODO: implement
+ return qualified;
+}
+
+VAORC CDocumentMonitor::OnMenuMessageSequence(Visio::IVApplicationPtr vsoApp)
+{
+ std::pair<Visio::IVShapePtr, Visio::IVShapePtr> boundaries = getInstancesPair(vsoApp);
+ if (boundaries.first == boundaries.second)
+ {
+ // prompt to select another instance
+ // TODO
+ /*
+ MessageBox(GetActiveWindow(),
+ _T("Selected just one instance"), _T("Selected"), MB_OK);
+ return VAORC_FAILURE;
+ */
+ }
+/* DEBUG
+ MessageBox(GetActiveWindow(),
+ boundaries.first->Name,
+ _T("Selected as first"), MB_OK
+ );
+ MessageBox(GetActiveWindow(),
+ boundaries.second->Name,
+ _T("Selected as second"), MB_OK
+ );
+*/
+ MessageBox(GetActiveWindow(),
+ _T("Message Sequence not implemented yet"), _T("Error"), MB_OK | MB_ICONEXCLAMATION);
+ return VAORC_SUCCESS;
+ // TODO: validation - are the two instances chosen compatible for message sequence? (i.e. intersect in their y-coords?)
+ // TODO: show an options dialog
+ // TODO: during filling the dialog, mark all the instances taken into account (depends on the y-coord)
+ // TODO: make a list of instances being subject of message sequence drawing
+ float yCoord;
+ std::deque<Visio::IVShapePtr> subjectInstances = getInstancesInBetween(vsoApp, boundaries.first, boundaries.second, yCoord);
+ // TODO: draw the message sequence
+}
+
VAORC CDocumentMonitor::OnMenuWindowsReporter(Visio::IVApplicationPtr vsoApp)
{
if(m_reportVisible)
Modified: trunk/src/view/visio/addon/document.h
===================================================================
--- trunk/src/view/visio/addon/document.h 2010-04-10 23:23:43 UTC (rev 716)
+++ trunk/src/view/visio/addon/document.h 2010-04-12 12:03:52 UTC (rev 717)
@@ -49,6 +49,10 @@
enum MenuItems
{
+ // context menu items
+ MENU_ADD_INSTANCES = 102,
+ MENU_MESSAGE_SEQUENCE,
+ // standard Check menu items
MENU_WINDOWS_REPORTER = 200,
MENU_IMPORT,
MENU_EXPORT,
@@ -63,7 +67,6 @@
MENU_SELECT_ALL_MESSAGES,
MENU_SELECT_ADD_ALL_INSTANCES,
MENU_SELECT_ADD_ALL_MESSAGES,
- MENU_ADD_INSTANCES,
};
VAORC OnMenuWindowsReporter(Visio::IVApplicationPtr vsoApp);
@@ -71,8 +74,9 @@
VAORC OnMenuExport(Visio::IVApplicationPtr vsoApp);
VAORC OnMenuRepaint(Visio::IVApplicationPtr vsoApp);
VAORC OnMenuTransform(Visio::IVApplicationPtr vsoApp, int index);
- VAORC OnMenuSelectAllInstances(Visio::IVApplicationPtr vsoApp, bool add);
- VAORC OnMenuSelectAllMessages(Visio::IVApplicationPtr vsoApp, bool add);
+ VAORC OnMenuSelectAllInstances(Visio::IVApplicationPtr vsoApp, bool add); // FIXME: refactor: define enum types
+ VAORC OnMenuSelectAllMessages(Visio::IVApplicationPtr vsoApp, bool add); // FIXME: refactor: define enum types
+ VAORC OnMenuMessageSequence(Visio::IVApplicationPtr vsoApp);
VAORC OnMenuFindFlow(Visio::IVApplicationPtr vsoApp);
VAORC OnMenuSimulationStart(Visio::IVApplicationPtr vsoApp);
VAORC OnMenuSimulationStop(Visio::IVApplicationPtr vsoApp);
@@ -212,8 +216,45 @@
* @param add_to_selection when true, adds all objects to existing selection,
* when false, the old selection is dropped
*/
- void selectAll(Visio::IVApplicationPtr vsoApp, bool select_instances, bool add_to_selection);
+ void selectAll(Visio::IVApplicationPtr vsoApp, bool select_instances, bool add_to_selection); // FIXME: refactor: define enum instead of bool add_to_selection, pass TShapeType instead of select_instances and use CPageUtils::filterSelection() (but watch out when adding to an existing selection)
+ /**
+ * Gets a pair of instances based on the current selection.
+ *
+ * If there are no instances selected in the application, the instances returned
+ * are the leftmost and the rightmost of all instances on the active page.
+ * If there is exactly 1 instance selected, it puts it into the returned pair both at first
+ * and second position.
+ * If there are exactly 2 instances selected, these two are returned in the order of
+ * their selection.
+ * If more than 2 instances are selected, returned are the leftmost and the rightmost
+ * of the selected instances.
+ *
+ * @param vsoApp the application to get the instances from
+ * @return a pair of instances chosen using rules mentioned above
+ */
+ std::pair<Visio::IVShapePtr, Visio::IVShapePtr> getInstancesPair(Visio::IVApplicationPtr vsoApp);
+
+ /**
+ * Gets all instances between some two instances at a given height.
+ *
+ * Taken are all instances with x-coords between x-coords of the two instances given and
+ * y-coords beginning above yCoord and ending below yCoords (imagine a line at height yCoord -
+ * then the instances taken into account are only these intersecting this line).
+ *
+ * The function respects the order of boundaries: if boundaryOne is the left of the two,
+ * all instances returned are ordered by the x-coords in the ascending direction; otherwise,
+ * they are returned in a descending order.
+ * In the special case both boundaries are of same x-coords, an empty list is returned.
+ *
+ * @param vsoApp application to get the instances in
+ * @param boundaryOne an instances serving as one of boundaries
+ * @param boundaryTwo another instance serving as a boundary
+ * @param yCoord height of an imaginary line which all returned instances must intersect
+ * @return a list of instances meeting above criteria according to boundaries and yCoord given
+ */
+ std::deque<Visio::IVShapePtr> getInstancesInBetween(Visio::IVApplicationPtr vsoApp, Visio::IVShapePtr boundaryOne, Visio::IVShapePtr boundaryTwo, float yCoord);
+
Visio::IVUIObjectPtr GetMostCustomMenus();
Visio::IVUIObjectPtr GetMostCustomToolbars();
};
Modified: trunk/src/view/visio/addon/pageutils.cpp
===================================================================
--- trunk/src/view/visio/addon/pageutils.cpp 2010-04-10 23:23:43 UTC (rev 716)
+++ trunk/src/view/visio/addon/pageutils.cpp 2010-04-12 12:03:52 UTC (rev 717)
@@ -113,4 +113,19 @@
}
}
+Visio::IVSelectionPtr CPageUtils::FilterSelection(Visio::IVSelectionPtr selection, TShapeType shapeType)
+{
+ Visio::IVPagePtr page = selection->Application->ActivePage;
+ Visio::IVSelectionPtr newSel = page->CreateSelection(Visio::visSelTypeEmpty, Visio::visSelModeSkipSuper);
+ for (int i=1; i<=selection->Count; i++)
+ {
+ if (get_shape_type(selection->Item[i]) == shapeType)
+ {
+ newSel->Select(selection->Item[i], Visio::visSelect);
+ }
+ }
+ return newSel;
+}
+
+
// $Id$
Modified: trunk/src/view/visio/addon/pageutils.h
===================================================================
--- trunk/src/view/visio/addon/pageutils.h 2010-04-10 23:23:43 UTC (rev 716)
+++ trunk/src/view/visio/addon/pageutils.h 2010-04-12 12:03:52 UTC (rev 717)
@@ -18,6 +18,7 @@
#pragma once
#include "stdafx.h"
+#include "extract.h"
/**
* A utility class for functionality on a Visio Page.
@@ -68,6 +69,20 @@
static const LPCTSTR VisioUnitToString(VisUnitCodes unitCode);
+ /**
+ * Filters out all shapes from a given selection which are not of a given type.
+ *
+ * @param selection the selection to be filtered
+ * @param shapeType
+ * @return a new selection consisting only of shapes of the given type
+ */
+ static Visio::IVSelectionPtr FilterSelection(Visio::IVSelectionPtr selection, TShapeType shapeType);
+
+ static double GetShapeBeginX(Visio::IVShapePtr shape) { return shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginX]; }
+ static double GetShapeEndX(Visio::IVShapePtr shape) { return shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndX]; }
+ static double GetShapeBeginY(Visio::IVShapePtr shape) { return shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginY]; }
+ static double GetShapeEndY(Visio::IVShapePtr shape) { return shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndY]; }
+
};
// $Id$
Modified: trunk/src/view/visio/addon/resource.h
===================================================================
--- trunk/src/view/visio/addon/resource.h 2010-04-10 23:23:43 UTC (rev 716)
+++ trunk/src/view/visio/addon/resource.h 2010-04-12 12:03:52 UTC (rev 717)
@@ -29,6 +29,7 @@
#define IDC_SIM_BIN_WIDTH 219
#define IDI_ICON_SELECT_ADD_MESSAGES 219
#define IDC_IF_INSTANCES_CNT 220
+#define IDD_MESSAGE_SEQUENCE_OPTIONS 220
#define IDC_IF_MARGIN_SIDE 221
#define IDC_IF_INSTANCE_LENGTH 221
#define IDC_IF_MARGIN_TOP 222
@@ -57,14 +58,22 @@
#define IDC_UNITS_LBL3 248
#define IDC_UNITS_LBL4 249
#define IDC_UNITS_LBL5 250
+#define IDC_RADIO1 251
+#define IDC_RADIO3 252
+#define IDC_RADIO4 253
+#define IDC_EDIT1 254
+#define IDC_MC_LEFT_MESSAGE 254
+#define IDC_MS_RIGHT_MESSAGE 255
+#define IDC_EDIT2 256
+#define IDC_EDIT3 257
// Next default values for new objects
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE 220
+#define _APS_NEXT_RESOURCE_VALUE 221
#define _APS_NEXT_COMMAND_VALUE 32768
-#define _APS_NEXT_CONTROL_VALUE 251
+#define _APS_NEXT_CONTROL_VALUE 258
#define _APS_NEXT_SYMED_VALUE 105
#endif
#endif
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx 2010-04-10 23:23:43 UTC (rev 716)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx 2010-04-12 12:03:52 UTC (rev 717)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='02345315034715B9F6FBA6D8893ACB02A448BAADEA6FAD11F1595B06E6B52EFBEAD3493B612782F69FED04D1A3646120FBB1F41DF19BB850FA75B32DF6DCEF8B' start='190' xmlns='http://schemas.microsoft.com/visio/2003/core' metric='0' DocLangID='1033' buildnum='8161' version='11.0' xml:space='preserve'><DocumentProperties><Title>Basic MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>738205665</BuildNumberEdited><TimeCreated>2008-12-14T11:32:13</TimeCreated><TimeSaved>2010-02-25T18:37:53</TimeSaved><TimeEdited>2010-02-25T18:37:50</TimeEdited><TimePrinted>2008-12-14T11:32:13</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='31367 -2147483648 8 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='1627421663 -2147483648 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='1627421663 -2147483648 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='1627421663 -2147483648 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='8' Name='Dotum' UnicodeRanges='1627421663 -2147483648 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147459008 0 128 0' CharSets='0 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='1 1 6 0 1 1 1 1 1 1' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262144 0 0 0' CharSets='0 0' Panos='2 0 5 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32768 0 0 0' CharSets='0 0' Panos='0 0 4 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194304 0 0 0' CharSets='0 0' Panos='0 0 4 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='1627421663 -2147483648 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131072 0 0 0' CharSets='0 0' Panos='2 0 5 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='1627421663 -2147483648 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048576 0 0 0' CharSets='0 0' Panos='2 0 4 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097152 0 0 0' CharSets='0 0' Panos='2 0 5 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='1627421663 -2147483648 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='1627421663 -2147483648 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='1627421663 -2147483648 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='31367 -2147483648 8 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='Žádný styl'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1033</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Pouze text' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTra...
[truncated message content] |
|
From: <got...@us...> - 2010-05-16 09:34:53
|
Revision: 784
http://scstudio.svn.sourceforge.net/scstudio/?rev=784&view=rev
Author: gotthardp
Date: 2010-05-16 09:34:47 +0000 (Sun, 16 May 2010)
Log Message:
-----------
Prepare for release.
Modified Paths:
--------------
trunk/src/view/visio/addon/dllmodule.rc
trunk/src/view/visio/build-setup.bat
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2010-05-15 10:31:41 UTC (rev 783)
+++ trunk/src/view/visio/addon/dllmodule.rc 2010-05-16 09:34:47 UTC (rev 784)
@@ -365,8 +365,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,3,37,0
- PRODUCTVERSION 0,3,37,0
+ FILEVERSION 0,3,39,0
+ PRODUCTVERSION 0,3,39,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x9L
@@ -383,13 +383,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.3.37"
+ VALUE "FileVersion", "0.3.39"
VALUE "InternalName", "scstudio.vsl"
VALUE "LegalCopyright", "(c) Petr Gotthard. All rights reserved."
VALUE "OriginalFilename", "scstudio.vsl"
VALUE "PrivateBuild", "$Revision$"
VALUE "ProductName", "Sequence Chart Studio"
- VALUE "ProductVersion", "0.3.37"
+ VALUE "ProductVersion", "0.3.39"
END
END
BLOCK "VarFileInfo"
Modified: trunk/src/view/visio/build-setup.bat
===================================================================
--- trunk/src/view/visio/build-setup.bat 2010-05-15 10:31:41 UTC (rev 783)
+++ trunk/src/view/visio/build-setup.bat 2010-05-16 09:34:47 UTC (rev 784)
@@ -1,4 +1,4 @@
-set VERSION=0.3.37
+set VERSION=0.3.39
set BUILD_TYPE=Release
"C:\Program Files\NSIS\makensis" /DVERSION=%VERSION% /DBUILD_TYPE=%BUILD_TYPE% scstudio.nsi
"C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\signtool.exe" sign /a scstudio-setup-%VERSION%.exe
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <got...@us...> - 2010-08-31 19:48:45
|
Revision: 867
http://scstudio.svn.sourceforge.net/scstudio/?rev=867&view=rev
Author: gotthardp
Date: 2010-08-31 19:48:39 +0000 (Tue, 31 Aug 2010)
Log Message:
-----------
New alpha release.
Modified Paths:
--------------
trunk/src/view/visio/addon/dllmodule.rc
trunk/src/view/visio/build-setup.bat
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2010-08-30 19:27:59 UTC (rev 866)
+++ trunk/src/view/visio/addon/dllmodule.rc 2010-08-31 19:48:39 UTC (rev 867)
@@ -394,8 +394,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,3,39,0
- PRODUCTVERSION 0,3,39,0
+ FILEVERSION 0,3,40,0
+ PRODUCTVERSION 0,3,40,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x9L
@@ -412,13 +412,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.3.39"
+ VALUE "FileVersion", "0.3.40"
VALUE "InternalName", "scstudio.vsl"
VALUE "LegalCopyright", "(c) Petr Gotthard. All rights reserved."
VALUE "OriginalFilename", "scstudio.vsl"
VALUE "PrivateBuild", "$Revision$"
VALUE "ProductName", "Sequence Chart Studio"
- VALUE "ProductVersion", "0.3.39"
+ VALUE "ProductVersion", "0.3.40"
END
END
BLOCK "VarFileInfo"
Modified: trunk/src/view/visio/build-setup.bat
===================================================================
--- trunk/src/view/visio/build-setup.bat 2010-08-30 19:27:59 UTC (rev 866)
+++ trunk/src/view/visio/build-setup.bat 2010-08-31 19:48:39 UTC (rev 867)
@@ -1,4 +1,4 @@
-set VERSION=0.3.39
+set VERSION=0.3.40
set BUILD_TYPE=Release
"C:\Program Files\NSIS\makensis" /DVERSION=%VERSION% /DBUILD_TYPE=%BUILD_TYPE% scstudio.nsi
"C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\signtool.exe" sign /a scstudio-setup-%VERSION%.exe
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <va...@us...> - 2010-09-10 14:41:03
|
Revision: 911
http://scstudio.svn.sourceforge.net/scstudio/?rev=911&view=rev
Author: vacek
Date: 2010-09-10 14:40:57 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Help modification - HTML files are used and displayed in a web browser.
Modified Paths:
--------------
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/numberingGlobalDlg.cpp
trunk/src/view/visio/addon/snapGlobalDlg.cpp
trunk/src/view/visio/scstudio.nsi
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2010-09-10 13:07:27 UTC (rev 910)
+++ trunk/src/view/visio/addon/document.cpp 2010-09-10 14:40:57 UTC (rev 911)
@@ -2200,9 +2200,9 @@
int CDocumentMonitor::InvokeHelp(const std::wstring& filename)
{
std::basic_string<TCHAR> path = GetVisioModulePath();
- path += _T("scstudio.chm::/");
- path += filename;
-
+ path += L"\\help\\" + filename;
+ ShellExecute(NULL, L"open", path.c_str() , NULL, NULL, SW_SHOWNORMAL);
+ return 0;
try
{
m_vsoApp->InvokeHelp(path.c_str(), HH_DISPLAY_TOPIC, 1);
Modified: trunk/src/view/visio/addon/numberingGlobalDlg.cpp
===================================================================
--- trunk/src/view/visio/addon/numberingGlobalDlg.cpp 2010-09-10 13:07:27 UTC (rev 910)
+++ trunk/src/view/visio/addon/numberingGlobalDlg.cpp 2010-09-10 14:40:57 UTC (rev 911)
@@ -139,6 +139,11 @@
{
//FIXME: Doesn't work in VIsio 2007
std::basic_string<TCHAR> path = GetVisioModulePath();
+ path += _T("\\help\\frontend\\message-numbering.html");
+ ShellExecute(NULL, L"open", path.c_str() , NULL, NULL, SW_SHOWNORMAL);
+ return;
+
+
path += _T("scstudio.chm::/frontend/message-numbering.html");
try
Modified: trunk/src/view/visio/addon/snapGlobalDlg.cpp
===================================================================
--- trunk/src/view/visio/addon/snapGlobalDlg.cpp 2010-09-10 13:07:27 UTC (rev 910)
+++ trunk/src/view/visio/addon/snapGlobalDlg.cpp 2010-09-10 14:40:57 UTC (rev 911)
@@ -55,6 +55,10 @@
void CSnapGlobalDlg::OnHelp()
{
std::basic_string<TCHAR> path = GetVisioModulePath();
+ path += _T("\\help\\frontend\\message-snapping.html");
+ ShellExecute(NULL, L"open", path.c_str() , NULL, NULL, SW_SHOWNORMAL);
+
+ return;
path += _T("scstudio.chm::/frontend/message-snapping.html");
try
Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi 2010-09-10 13:07:27 UTC (rev 910)
+++ trunk/src/view/visio/scstudio.nsi 2010-09-10 14:40:57 UTC (rev 911)
@@ -135,12 +135,18 @@
SetOutPath $INSTDIR\bin
File "addon\${BUILD_TYPE}\scstudio.vsl"
File "addon\${BUILD_TYPE}\scstudio.vsl.intermediate.manifest"
- File "..\..\..\doc\help\scstudio.chm"
+ ; File "..\..\..\doc\help\scstudio.chm"
File "..\..\..\${BUILD_TYPE}\*.dll"
+
${AppendRegStr} ${Visio11RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
${AppendRegStr} ${Visio12RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
+ SetOutPath $INSTDIR\bin\help
+ File /r "..\..\..\doc\help\*.html"
+ File /r "..\..\..\doc\help\*.css"
+ File /r "..\..\..\doc\help\*.png"
+
SetOutPath "$INSTDIR\stencils\Sequence Chart Studio"
File "stencils\Sequence Chart Studio\Basic MSC.vsx"
File "stencils\Sequence Chart Studio\HMSC.vsx"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <got...@us...> - 2010-09-20 20:42:23
|
Revision: 984
http://scstudio.svn.sourceforge.net/scstudio/?rev=984&view=rev
Author: gotthardp
Date: 2010-09-20 20:42:17 +0000 (Mon, 20 Sep 2010)
Log Message:
-----------
Prepare for release.
Modified Paths:
--------------
trunk/src/view/visio/addon/dllmodule.rc
trunk/src/view/visio/build-setup.bat
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2010-09-20 19:04:26 UTC (rev 983)
+++ trunk/src/view/visio/addon/dllmodule.rc 2010-09-20 20:42:17 UTC (rev 984)
@@ -474,8 +474,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,3,40,0
- PRODUCTVERSION 0,3,40,0
+ FILEVERSION 0,4,0,0
+ PRODUCTVERSION 0,4,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x9L
@@ -492,13 +492,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.3.40"
+ VALUE "FileVersion", "0.4.0"
VALUE "InternalName", "scstudio.vsl"
VALUE "LegalCopyright", "(c) Petr Gotthard. All rights reserved."
VALUE "OriginalFilename", "scstudio.vsl"
VALUE "PrivateBuild", "$Revision$"
VALUE "ProductName", "Sequence Chart Studio"
- VALUE "ProductVersion", "0.3.40"
+ VALUE "ProductVersion", "0.4.0"
END
END
BLOCK "VarFileInfo"
Modified: trunk/src/view/visio/build-setup.bat
===================================================================
--- trunk/src/view/visio/build-setup.bat 2010-09-20 19:04:26 UTC (rev 983)
+++ trunk/src/view/visio/build-setup.bat 2010-09-20 20:42:17 UTC (rev 984)
@@ -1,4 +1,4 @@
-set VERSION=0.3.40
+set VERSION=0.4.0
set BUILD_TYPE=Release
"C:\Program Files\NSIS\makensis" /DVERSION=%VERSION% /DBUILD_TYPE=%BUILD_TYPE% scstudio.nsi
"C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\signtool.exe" sign /a scstudio-setup-%VERSION%.exe
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mbe...@us...> - 2011-07-09 11:23:54
|
Revision: 1124
http://scstudio.svn.sourceforge.net/scstudio/?rev=1124&view=rev
Author: mbezdeka
Date: 2011-07-09 11:23:46 +0000 (Sat, 09 Jul 2011)
Log Message:
-----------
Menu reconfiguration: Context menu now contains "Add message numbering" and "Delete message numebring" items.
Modified Paths:
--------------
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/enumerateUtils.cpp
trunk/src/view/visio/addon/shapeutils.cpp
trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx
trunk/src/view/visio/stencils/Sequence Chart Studio/MSC.vtx
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2011-07-09 03:33:19 UTC (rev 1123)
+++ trunk/src/view/visio/addon/document.cpp 2011-07-09 11:23:46 UTC (rev 1124)
@@ -277,13 +277,6 @@
case ST_BMSC_MESSAGE_FOUND:
if(vsoShape->Text.length() == 0)
vsoShape->Text = _T("NAME");
- //Message flip
- if(!vsoShape->GetCellExists(_T("Actions.flipDirection"),0))
- {
- vsoShape->AddNamedRow(visSectionAction,_T("flipDirection"),visTagDefault);
- vsoShape->Cells["Actions.flipDirection.Action"]->FormulaU = _T("=RUNADDONWARGS(\"Sequence Chart Studio\",\"/event=105\")");
- vsoShape->Cells["Actions.flipDirection.Menu"]->FormulaU = _T("=\"Flip message direction\"");
- }
//Message snapping
if(CMessageSnapping::isEnabled() && (m_vsoApp->ActiveWindow->Selection->Count == 1)) //Check whether snapping is enabled
{
@@ -492,21 +485,21 @@
}
Visio::IVMenuItemPtr itemEnableEnumerating = itemMessageEnumerating->MenuItems->Add();
- itemEnableEnumerating->Caption = "Message &numbering";
+ itemEnableEnumerating->Caption = "Message &Numbering";
itemEnableEnumerating->AddOnName = ADDON_NAME;
itemEnableEnumerating->AddOnArgs = stringize() << L"/event=" << MENU_ENABLE_MESSAGE_ENUMERATION;
vslIconFile = vslFileName+_T(",8");
itemEnableEnumerating->IconFileName(vslIconFile.c_str());
Visio::IVMenuItemPtr itemDisableEnumerating = itemMessageEnumerating->MenuItems->Add();
- itemDisableEnumerating->Caption = "&Delete numbering";
+ itemDisableEnumerating->Caption = "&Delete Numbering";
itemDisableEnumerating->AddOnName = ADDON_NAME;
itemDisableEnumerating->AddOnArgs = stringize() << L"/event=" << MENU_DISABLE_MESSAGE_ENUMERATION;
vslIconFile = vslFileName+_T(",9");
itemDisableEnumerating->IconFileName(vslIconFile.c_str());
Visio::IVMenuItemPtr itemSelectNumberingGroup = itemMessageEnumerating->MenuItems->Add();
- itemSelectNumberingGroup->Caption = "&Select numbering group";
+ itemSelectNumberingGroup->Caption = "&Select Numbering Group";
itemSelectNumberingGroup->AddOnName = ADDON_NAME;
itemSelectNumberingGroup->AddOnArgs = stringize() << L"/event=" << MENU_SELECT_NUMBERED_GROUP;
vslIconFile = vslFileName+_T(",14");
Modified: trunk/src/view/visio/addon/enumerateUtils.cpp
===================================================================
--- trunk/src/view/visio/addon/enumerateUtils.cpp 2011-07-09 03:33:19 UTC (rev 1123)
+++ trunk/src/view/visio/addon/enumerateUtils.cpp 2011-07-09 11:23:46 UTC (rev 1124)
@@ -289,7 +289,7 @@
shape->Data3 = groupID;
shape->AddNamedRow(visSectionAction,_T("enumeration"),visTagDefault);
shape->Cells["Actions.enumeration.Action"]->FormulaU = _T("=RUNADDONWARGS(\"Sequence Chart Studio\",\"/event=104\")");
- shape->Cells["Actions.enumeration.Menu"]->FormulaU = _T("=\"Select numbering group\"");
+ shape->Cells["Actions.enumeration.Menu"]->FormulaU = _T("=\"Select Numbering Group\"");
}
else if(_tcsicmp(shape->Data1,_T("1")) == 0)
{
Modified: trunk/src/view/visio/addon/shapeutils.cpp
===================================================================
--- trunk/src/view/visio/addon/shapeutils.cpp 2011-07-09 03:33:19 UTC (rev 1123)
+++ trunk/src/view/visio/addon/shapeutils.cpp 2011-07-09 11:23:46 UTC (rev 1124)
@@ -148,7 +148,7 @@
{
newShape->AddNamedRow(visSectionAction,_T("enumeration"),visTagDefault);
newShape->Cells["Actions.enumeration.Action"]->FormulaU = _T("=RUNADDONWARGS(\"Sequence Chart Studio\",\"/event=104\")");
- newShape->Cells["Actions.enumeration.Menu"]->FormulaU = _T("=\"Select numbering group\"");
+ newShape->Cells["Actions.enumeration.Menu"]->FormulaU = _T("=\"Select Numbering Group\"");
}
}
//Copy message position
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx 2011-07-09 03:33:19 UTC (rev 1123)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx 2011-07-09 11:23:46 UTC (rev 1124)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='F341C2682C7783760DD32A1D46C5322D9727492446DA6B5F9C652BB9D496377588CE7D513960210674FDFBAC6253060A0906185269AFD817E1B2EA636EF9DD1C' start='190' xmlns='http://schemas.microsoft.com/visio/2003/core' metric='0' DocLangID='1033' buildnum='8323' version='11.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><DocumentProperties><Title>Basic MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>805312904</BuildNumberCreated><BuildNumberEdited>738205827</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Boolean'>Yes</CustomProp></CustomProps><TimeCreated>2011-03-31T23:02:37</TimeCreated><TimeSaved>2011-06-28T14:42:46</TimeSaved><TimeEdited>2011-06-28T14:42:21</TimeEdited><TimePrinted>2011-03-31T23:02:37</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='357'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1033</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1033</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><Char IX='0'><Font>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1033</LangID></Char><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout></StyleSheet><StyleSheet ID='6' NameU='Connector' Name='Connector' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>0</FillForegnd><FillBkgnd F='Inh'>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin Unit='PT' F='Inh'>0.05555555555555555</TopMargin><BottomMargin Unit='PT' F='Inh'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd>2</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='7' NameU='Visio 90' Name='Visio 90' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd>0</FillForegnd><FillBkgnd>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='8' NameU='Callout' Name='Callout' LineStyle='9' FillStyle='9' TextStyle='9'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Char IX='0'><Font>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexSc...
[truncated message content] |
|
From: <xm...@us...> - 2011-11-29 14:05:11
|
Revision: 1213
http://scstudio.svn.sourceforge.net/scstudio/?rev=1213&view=rev
Author: xmalota
Date: 2011-11-29 14:05:00 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Removed prototype of Beautify profiles.
Modified Paths:
--------------
trunk/src/view/visio/addon/beautifySettingADlg.cpp
trunk/src/view/visio/addon/beautifySettingADlg.h
trunk/src/view/visio/addon/beautifySettingGDlg.cpp
trunk/src/view/visio/addon/beautifySettingGDlg.h
trunk/src/view/visio/addon/dllmodule.rc
trunk/src/view/visio/addon/resource.h
trunk/src/view/visio/addon/scstudio.vcproj
trunk/src/view/visio/addon/settingsDialog.h
trunk/src/view/visio/addon/settingsDlg.cpp
trunk/src/view/visio/scstudio.nsi
Removed Paths:
-------------
trunk/src/view/visio/addon/beautifyProfilesDlg.cpp
trunk/src/view/visio/addon/beautifyProfilesDlg.h
Deleted: trunk/src/view/visio/addon/beautifyProfilesDlg.cpp
===================================================================
--- trunk/src/view/visio/addon/beautifyProfilesDlg.cpp 2011-11-26 22:29:33 UTC (rev 1212)
+++ trunk/src/view/visio/addon/beautifyProfilesDlg.cpp 2011-11-29 14:05:00 UTC (rev 1213)
@@ -1,574 +0,0 @@
-/*
- * scstudio - Sequence Chart Studio
- * http://scstudio.sourceforge.net
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * Copyright (c) 2010 Milan Malota <xm...@gm...>
- *
- * $Id: beautifyProfilesDlg.cpp 1111 2011-06-29 10:13:46Z xmalota $
- */
-
-
-#include "stdafx.h"
-#include "dllmodule.h"
-#include "beautifyProfilesDlg.h"
-#include "errors.h"
-#include "document.h"
-#include "registryManager.h"
-
-#include <windows.h>
-#include <wchar.h>
-
-LRESULT CBeautifyProfilesDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
-{
- //getting registry
- Registry* reg = Registry::get();
-
- //attaching dialog items
- m_staticRdo.Attach(GetDlgItem(IDC_STATIC_MODIFIED));
- m_staticRdo.SetWindowTextW(_T("UNCHANGED"));
-
- m_profilesComboRdo.Attach(GetDlgItem(IDC_COMBO_PROFILES));
-
- //retrieving names of profiles saved in the registry
- HKEY hKey;
- //open the registry key
- if(RegOpenKeyEx ( HKEY_CURRENT_USER,
- _T("Software\\Sequence Chart Studio\\Beautify\\Profiles"),
- 0,
- KEY_READ,
- &hKey) != ERROR_SUCCESS)
- return bHandled = false;
-
- DWORD dwIndex = 0;
- LONG lRet;
- DWORD cbName = 256;
- TCHAR szSubKeyName[256];
- //insert strings into combobox
- while ((lRet = RegEnumKeyEx(hKey, dwIndex, szSubKeyName, &cbName, NULL,
- NULL, NULL, NULL)) != ERROR_NO_MORE_ITEMS)
- {
- m_profilesComboRdo.InsertString(0, szSubKeyName);
- dwIndex++;
- cbName = 256;
- }
- RegCloseKey(hKey);
-
- m_profilesComboRdo.SetCurSel(0);
-
- //TODO:add information about changing current profile
-
- return bHandled = false;
-}
-
-
-BOOL CBeautifyProfilesDlg::OnApply(WORD wID)
-{
- return TRUE;
-}
-
-
-LRESULT CBeautifyProfilesDlg::OnBnClickedSave(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
-{
- //TODO:check whenever is value in editbox correct
-
- int current_index = m_profilesComboRdo.GetCurSel();
- int count = m_profilesComboRdo.GetCount();
-
- CString current_text;
- TCHAR ttmp[10] = _T("");
- LPTSTR tmp = NULL;
-
- if(current_index != -1)
- {
- //retrieves name of selected item in combobox's listbox and saves
- m_profilesComboRdo.GetLBText(current_index, ttmp);
-
- current_text.Format(_T("%s"), ttmp);
- //if names of default profiles are changed need to be changed
- if((!current_text.Compare(L"[First]")) || (!current_text.Compare(L"[Second]")) || (!current_text.Compare(L"[Third]")))
- {
- MessageBox(_T("Default profiles cannot be overwritten.") , _T("Error"), MB_OK | MB_ICONSTOP);
- }
- else
- {
- current_text.Format(_T("Would you like to overwrite '%s'?"), ttmp);
- LPCTSTR print(current_text);
- if( MessageBox(print , _T("Warning"), MB_OK | MB_ICONINFORMATION | MB_OKCANCEL) == IDOK)
- {
- //user selected OK
- m_profilesComboRdo.SetCurSel(current_index);
- SaveRegistryData(ttmp);
- }
- else
- return 0;
- }
- }
- //current selection is combobox's editbox
- else
- {
- //limits text of and cuts text from editbox
- m_profilesComboRdo.LimitText(16);
- m_profilesComboRdo.SetEditSel(0, 15);
- m_profilesComboRdo.Cut();
-
- //text in edit box is saved in clipboard
- //open clipboard
-
-#ifdef _UNICODE
- if (!IsClipboardFormatAvailable(CF_UNICODETEXT)) return 0;
-#else
- if (!IsClipboardFormatAvailable(CF_TEXT)) return 0;
-#endif
- if (!OpenClipboard()) return 0;
-
-#ifdef _UNICODE
- HGLOBAL hglb = GetClipboardData(CF_UNICODETEXT);
-#else
- HGLOBAL hglb = ::GetClipboardData(CF_TEXT);
-#endif
-
- if (hglb != NULL)
- {
- tmp = reinterpret_cast<TCHAR*>(GlobalLock(hglb));
- if (tmp != NULL)
- {
- GlobalUnlock(hglb);
- }
- }
- // before returning close the clipboard
- CloseClipboard();
-
- current_text.Format(_T("%s"), tmp);
- if(m_profilesComboRdo.FindStringExact(0, tmp) >= 0)
- {
- //need to be overwritten if default profiles' names are changed
- if((!current_text.Compare(L"[First]")) || (!current_text.Compare(L"[Second]")) || (!current_text.Compare(L"[Third]")))
- {
- MessageBox(_T("Default profiles cannot be overwritten.") , _T("Error"), MB_OK | MB_ICONSTOP);
- return 0;
- }
- //succesfully founded a profile with the same name
- current_text.Format(_T("Would you like to overwrite '%s'?"), tmp);
- LPCTSTR print(current_text);
- if(MessageBox(print, _T(""), MB_OK | MB_ICONINFORMATION | MB_OKCANCEL) == IDOK)
- {
- m_profilesComboRdo.SetCurSel(current_index);
- SaveRegistryData(tmp);
- }
- else
- return 0;
- }
- else
- {
- //the profile wasn't founded
- if(current_text.Find(L" ", 0) != -1)
- {
- //user want to save profile with the empty name
- MessageBox(_T("Please input another name."), _T("Error"), MB_OK | MB_ICONSTOP);
- }
- else
- {
- //user want to save profile with not specified name
- if(MessageBox(_T("Would you like to save current setting?"), _T("Saving profile"),
- MB_OK | MB_ICONINFORMATION | MB_OKCANCEL) == IDOK)
- {
- m_profilesComboRdo.InsertString(0, tmp);
- m_profilesComboRdo.SetCurSel(0);
- SaveRegistryData(tmp);
- }
- }
- }
- }
- return 0;
-}
-
-LRESULT CBeautifyProfilesDlg::OnBnClickedLoad(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
-{
- //TODO:refactoring
- int current_index = m_profilesComboRdo.GetCurSel();
-
- CString current_text;
- TCHAR ttmp[10] = _T("");
- LPTSTR tmp = NULL;
- //
- if(current_index != -1)
- {
- m_profilesComboRdo.GetLBText(current_index, ttmp);
- current_text.Format(_T("Would you like to load '%s'?"), ttmp);
- LPCTSTR print(current_text);
- if(MessageBox(print , _T(""), MB_OK | MB_ICONINFORMATION | MB_OKCANCEL) == IDOK)
- {
- m_profilesComboRdo.SetCurSel(current_index);
- LoadRegistryData(ttmp);
- m_staticRdo.SetWindowTextW(_T("UNCHANGED"));
- }
- }
- else
- {
- m_profilesComboRdo.LimitText(16);
- m_profilesComboRdo.SetEditSel(0, 15);
- m_profilesComboRdo.Cut();
-
- //text in edit box is saved in clipboard
- //open clipboard
-
-#ifdef _UNICODE
- if (!IsClipboardFormatAvailable(CF_UNICODETEXT)) return 0;
-#else
- if (!IsClipboardFormatAvailable(CF_TEXT)) return 0;
-#endif
- if (!OpenClipboard()) return 0;
-
-#ifdef _UNICODE
- HGLOBAL hglb = GetClipboardData(CF_UNICODETEXT);
-#else
- HGLOBAL hglb = ::GetClipboardData(CF_TEXT);
-#endif
-
- if (hglb != NULL)
- {
- tmp = reinterpret_cast<TCHAR*>(GlobalLock(hglb));
- if (tmp != NULL)
- {
- GlobalUnlock(hglb);
- }
- }
- // before returning close the clipboard
- CloseClipboard();
-
- current_text.Format(_T("%s"), tmp);
- if(m_profilesComboRdo.FindStringExact(0, tmp) < 0)
- {
- MessageBox(_T("Profile could not be found."), _T("Error"), MB_OK | MB_ICONSTOP);
- }
- else
- {
- m_profilesComboRdo.GetLBText(current_index, tmp);
- current_text.Format(_T("Would you like to load: '%s'?"), tmp);
- LPCTSTR print(current_text);
- if(MessageBox(print, _T("Information"), MB_OK | MB_ICONINFORMATION) == IDOK)
- {
- m_profilesComboRdo.SetCurSel(current_index);
- LoadRegistryData(tmp);
- m_staticRdo.SetWindowTextW(_T("UNCHANGED"));
- }
-
- }
- }
- return 0;
-}
-
-LRESULT CBeautifyProfilesDlg::OnBnClickedDelete(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
-{
- int current_index = m_profilesComboRdo.GetCurSel();
-
- CString current_text;
- TCHAR ttmp[10] = _T("");
- LPTSTR tmp = NULL;
- if(current_index != -1)
- {
- //retrieves name of selected item in combobox's listbox to be deleted
- m_profilesComboRdo.GetLBText(current_index, ttmp);
-
- current_text.Format(_T("%s"), ttmp);
- //if names of default profiles are changed need to be changed
- if((!current_text.Compare(L"[First]")) || (!current_text.Compare(L"[Second]")) || (!current_text.Compare(L"[Third]")))
- {
- MessageBox(_T("Default profiles cannot be deleted.") , _T("Error"), MB_OK | MB_ICONSTOP);
- }
- else
- {
- current_text.Format(_T("Would you like to delete: %s"), ttmp);
- LPCTSTR print(current_text);
- if(MessageBox(print , _T(""), MB_OK | MB_ICONINFORMATION | MB_OKCANCEL) == IDOK)
- {
- m_profilesComboRdo.DeleteString(current_index);
- //retrieving names of profiles saved in the registry
-
- HKEY hKey;
- //open the registry key
- if(RegOpenKeyEx ( HKEY_CURRENT_USER,
- _T("Software\\Sequence Chart Studio\\Beautify\\Profiles"),
- 0,
- KEY_READ,
- &hKey) != ERROR_SUCCESS)
- return bHandled = false;
- current_text.Format(_T("%s"), ttmp);
- LPCTSTR key(current_text);
- if(RegDeleteKey(hKey, key) == ERROR_SUCCESS)
- MessageBox(_T("Profile was successfully deleted."), _T(""), MB_OK | MB_ICONINFORMATION);
- }
- }
- }
- else
- {
- m_profilesComboRdo.LimitText(16);
- m_profilesComboRdo.SetEditSel(0, 15);
- m_profilesComboRdo.Cut();
-
-#ifdef _UNICODE
- if (!IsClipboardFormatAvailable(CF_UNICODETEXT)) return 0;
-#else
- if (!IsClipboardFormatAvailable(CF_TEXT)) return 0;
-#endif
- if (!OpenClipboard()) return 0;
-
-#ifdef _UNICODE
- HGLOBAL hglb = GetClipboardData(CF_UNICODETEXT);
-#else
- HGLOBAL hglb = ::GetClipboardData(CF_TEXT);
-#endif
-
- if (hglb != NULL)
- {
- tmp = reinterpret_cast<TCHAR*>(GlobalLock(hglb));
- if (tmp != NULL)
- {
- GlobalUnlock(hglb);
- }
- }
- // before returning close the clipboard
- CloseClipboard();
-
- if(m_profilesComboRdo.FindStringExact(0, tmp) < 0)
- {
- MessageBox(_T("Selected profile doesn't exist."), _T("Error"), MB_OK | MB_ICONERROR);
- }
- else
- {
- current_text.Format(_T("%s"), tmp);
- if((!current_text.Compare(L"[First]")) || (!current_text.Compare(L"[Second]")) || (!current_text.Compare(L"[Third]")))
- {
- MessageBox(_T("Default profiles cannot be deleted."), _T("Error"), MB_OK | MB_ICONERROR);
- }
- else
- {
- if(MessageBox(_T("Are you sure to delete selected profile?"), _T("OK"), MB_OK | MB_OKCANCEL) == IDOK)
- {
- m_profilesComboRdo.DeleteString(current_index);
-
- HKEY hKey;
- //open the registry key
- if(RegOpenKeyEx ( HKEY_CURRENT_USER,
- _T("Software\\Sequence Chart Studio\\Beautify\\Profiles"),
- 0,
- KEY_READ,
- &hKey) != ERROR_SUCCESS)
- return bHandled = false;
- current_text.Format(_T("%s"), ttmp);
- LPCTSTR key(current_text);
- if(RegDeleteKey(hKey, key) == ERROR_SUCCESS)
- MessageBox(_T("Profile was successfully deleted."), _T(""), MB_OK | MB_ICONINFORMATION);
-
-
- m_staticRdo.SetWindowTextW(_T("MODIFIED"));
- }
- }
-
- }
- }
- //values must stay, but the name is deleted
- return 0;
-}
-
-
-//saving to new profile
-int CBeautifyProfilesDlg::SaveRegistryData(LPTSTR lpszText)
-{
- TRACE("CBeautifySettingDlg::SaveRegistryData() - Saving options and name to registry");
- Visio::IVPagePtr page = m_vsoApp->ActivePage;
-
- Registry* reg = Registry::get();
-
- const wchar_t* path = lpszText;
- const wchar_t* newRegistryPath = SCSTUDIO_PROFILES_ROOT;
-
- CString current_text;
- current_text.Format(_T("%s%s"), newRegistryPath, path);
- LPCTSTR newProfilePath(current_text);
- //MessageBox(newProfilePath , _T("PATH-SAVE"), MB_OK | MB_ICONINFORMATION | MB_OKCANCEL);
-
- reg->setRegistry<DWORD>(newProfilePath, _T("PartsInstanceLength"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("PartsInstanceLength"), 1));
- reg->setRegistry<DWORD>(newProfilePath, _T("ConstInstanceLength"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("ConstInstanceLength"), 0));
- reg->setRegistry<DWORD>(newProfilePath, _T("AlignBottom"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("AlignBottom"), 1));
- reg->setRegistry<DWORD>(newProfilePath, _T("OriginalInstanceLength"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("OriginalInstanceLength"), 0));
-
- reg->setRegistry<DWORD>(newProfilePath, _T("ConstHead"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("ConstHead"), 1));
- reg->setRegistry<DWORD>(newProfilePath, _T("MaxHead"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("MaxHead"), 0));
- reg->setRegistry<DWORD>(newProfilePath, _T("MinHead"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("MinHead"), 0));
- reg->setRegistry<DWORD>(newProfilePath, _T("OriginHead"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("OriginHead"), 0));
-
- reg->setRegistry<float>(newProfilePath, _T("HeadValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("HeadValue"), 10.0));
- reg->setRegistry<float>(newProfilePath, _T("CoregionValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("CoregionValue"), 10.0));
- reg->setRegistry<float>(newProfilePath, _T("InstanceValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("InstanceValue"), 60.0));
- reg->setRegistry<float>(newProfilePath, _T("IncompleteMsgValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("IncompleteMsgValue"), 5.0));
- reg->setRegistry<float>(newProfilePath, _T("SlopeMsgValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("SlopeMsgValue"), 0.0));
-
- reg->setRegistry<float>(newProfilePath, _T("HeadDistValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("HeadDistValue"), 5.0));
- reg->setRegistry<float>(newProfilePath, _T("BeginCorDistValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("BeginCorDistValue"), 5.0));
- reg->setRegistry<float>(newProfilePath, _T("EndCorDistValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("EndCorDistValue"), 5.0));
- reg->setRegistry<float>(newProfilePath, _T("SuccesorDistValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("SuccesorDistValue"), 5.0));
- reg->setRegistry<float>(newProfilePath, _T("FootDistValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("FootDistValue"), 5.0));
-
- reg->setRegistry<DWORD>(newProfilePath, _T("OriginalOrder"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("OriginalOrder"), 1));
- reg->setRegistry<DWORD>(newProfilePath, _T("AllowPermutation"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("AllowPermutation"), 0));
-
- reg->setRegistry<DWORD>(newProfilePath, _T("ConstSpaces"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("ConstSpaces"), 1));
- reg->setRegistry<DWORD>(newProfilePath, _T("TotalWidth"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("TotalWidth"), 0));
- reg->setRegistry<DWORD>(newProfilePath, _T("OriginalSpaces"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("OriginalSpaces"), 0));
-
- reg->setRegistry<DWORD>(newProfilePath, _T("FirstInstancePlacements"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("FirstInstancePlacements"), 1));
- reg->setRegistry<DWORD>(newProfilePath, _T("LeftUpperCorner"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("LeftUpperCorner"), 0));
- reg->setRegistry<DWORD>(newProfilePath, _T("OwnCoordinates"),
- reg->getRegistry<DWORD>(GetRegistryFolder(), _T("OwnCoordinates"), 0));
-
- reg->setRegistry<float>(newProfilePath, _T("SpaceValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("SpaceValue"), 25.0));
- reg->setRegistry<float>(newProfilePath, _T("TotalValue"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("TotalValue"), 200.0));
- reg->setRegistry<float>(newProfilePath, _T("XCoordinatePlacements"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("XCoordinatePlacements"), 0.0));
- reg->setRegistry<float>(newProfilePath, _T("YCoordinatePlacements"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("YCoordinatePlacements"), 0.0));
- reg->setRegistry<float>(newProfilePath, _T("WeightGb"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("WeightGb"), 512.0));
- reg->setRegistry<float>(newProfilePath, _T("WeightCr"),
- reg->getRegistry<float>(GetRegistryFolder(), _T("WeightCr"), 512.0));
-
- return 0;
-}
-
-int CBeautifyProfilesDlg::LoadRegistryData(LPTSTR lpszText)
-{
- TRACE("CBeautifySettingADlg::LoadRegistryData() - Loading options and name from registry");
- Visio::IVPagePtr page = m_vsoApp->ActivePage;
-
- Registry* reg = Registry::get();
-
- const wchar_t* path = lpszText;
- const wchar_t* actualRegistryPath = SCSTUDIO_PROFILES_ROOT;
-
- CString current_text, current_text2;
-
- current_text.Format(_T("%s%s"), actualRegistryPath, path);
- LPCTSTR profilePath(current_text);
- //MessageBox(profilePath , _T("PATH-LOAD from:"), MB_OK | MB_ICONINFORMATION | MB_OKCANCEL);
-
- //current_text.Format(_T("%s"), GetRegistryFolder());
- //LPCTSTR profilePath2(current_text);
- //MessageBox(profilePath2 , _T("PATH-LOAD to:"), MB_OK | MB_ICONINFORMATION | MB_OKCANCEL);
-
- //reg->setRegistry<DWORD>(GetRegistryFolder(), _T("LOAD PROFILE"), reg->getRegistry<DWORD>(profilePath, _T("AlignBottom"), 1));
-
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("PartsInstanceLength"),
- reg->getRegistry<DWORD>(profilePath, _T("PartsInstanceLength"), 1));
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("ConstInstanceLength"),
- reg->getRegistry<DWORD>(profilePath, _T("ConstInstanceLength"), 0));
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("AlignBottom"),
- reg->getRegistry<DWORD>(profilePath, _T("AlignBottom"), 1));
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("OriginalInstanceLength"),
- reg->getRegistry<DWORD>(profilePath, _T("OriginalInstanceLength"), 0));
-
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("ConstHead"),
- reg->getRegistry<DWORD>(profilePath, _T("ConstHead"), 1));
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("MaxHead"),
- reg->getRegistry<DWORD>(profilePath, _T("MaxHead"), 0));
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("MinHead"),
- reg->getRegistry<DWORD>(profilePath, _T("MinHead"), 0));
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("OriginHead"),
- reg->getRegistry<DWORD>(profilePath, _T("OriginHead"), 0));
-
- reg->setRegistry<float>(GetRegistryFolder(), _T("HeadValue"),
- reg->getRegistry<float>(profilePath, _T("HeadValue"), 10.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("CoregionValue"),
- reg->getRegistry<float>(profilePath, _T("CoregionValue"), 10.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("InstanceValue"),
- reg->getRegistry<float>(profilePath, _T("InstanceValue"), 60.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("IncompleteMsgValue"),
- reg->getRegistry<float>(profilePath, _T("IncompleteMsgValue"), 5.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("SlopeMsgValue"),
- reg->getRegistry<float>(profilePath, _T("SlopeMsgValue"), 0.0));
-
- reg->setRegistry<float>(GetRegistryFolder(), _T("HeadDistValue"),
- reg->getRegistry<float>(profilePath, _T("HeadDistValue"), 5.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("BeginCorDistValue"),
- reg->getRegistry<float>(profilePath, _T("BeginCorDistValue"), 5.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("EndCorDistValue"),
- reg->getRegistry<float>(profilePath, _T("EndCorDistValue"), 5.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("SuccesorDistValue"),
- reg->getRegistry<float>(profilePath, _T("SuccesorDistValue"), 5.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("FootDistValue"),
- reg->getRegistry<float>(profilePath, _T("FootDistValue"), 5.0));
-
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("OriginalOrder"),
- reg->getRegistry<DWORD>(profilePath, _T("OriginalOrder"), 1));
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("AllowPermutation"),
- reg->getRegistry<DWORD>(profilePath, _T("AllowPermutation"), 0));
-
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("ConstSpaces"),
- reg->getRegistry<DWORD>(profilePath, _T("ConstSpaces"), 1));
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("TotalWidth"),
- reg->getRegistry<DWORD>(profilePath, _T("TotalWidth"), 0));
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("OriginalSpaces"),
- reg->getRegistry<DWORD>(profilePath, _T("OriginalSpaces"), 0));
-
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("FirstInstancePlacements"),
- reg->getRegistry<DWORD>(profilePath, _T("FirstInstancePlacements"), 1));
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("LeftUpperCorner"),
- reg->getRegistry<DWORD>(profilePath, _T("LeftUpperCorner"), 0));
- reg->setRegistry<DWORD>(GetRegistryFolder(), _T("OwnCoordinates"),
- reg->getRegistry<DWORD>(profilePath, _T("OwnCoordinates"), 0));
-
- reg->setRegistry<float>(GetRegistryFolder(), _T("SpaceValue"),
- reg->getRegistry<float>(profilePath, _T("SpaceValue"), 25.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("TotalValue"),
- reg->getRegistry<float>(profilePath, _T("TotalValue"), 200.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("XCoordinatePlacements"),
- reg->getRegistry<float>(profilePath, _T("XCoordinatePlacements"), 0.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("YCoordinatePlacements"),
- reg->getRegistry<float>(profilePath, _T("YCoordinatePlacements"), 0.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("WeightGb"),
- reg->getRegistry<float>(profilePath, _T("WeightGb"), 512.0));
- reg->setRegistry<float>(GetRegistryFolder(), _T("WeightCr"),
- reg->getRegistry<float>(profilePath, _T("WeightCr"), 512.0));
-
- return 0;
-}
-
-
-
-// $Id: beautifyProfilesDlg.cpp 1111 2011-06-29 10:13:46Z xmalota $
\ No newline at end of file
Deleted: trunk/src/view/visio/addon/beautifyProfilesDlg.h
===================================================================
--- trunk/src/view/visio/addon/beautifyProfilesDlg.h 2011-11-26 22:29:33 UTC (rev 1212)
+++ trunk/src/view/visio/addon/beautifyProfilesDlg.h 2011-11-29 14:05:00 UTC (rev 1213)
@@ -1,90 +0,0 @@
-/*
- * scstudio - Sequence Chart Studio
- * http://scstudio.sourceforge.net
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * Copyright (c) 2010 Milan Malota <xm...@gm...>
- *
- * $Id: beautifyProfilesDlg.h 1111 2011-06-29 10:13:46Z xmalota $
- */
-
-#pragma once
-
-#include <atldlgs.h>
-#include <atlddx.h>
-#include <atlctrls.h>
-#include <atlcrack.h>
-#include <atlmisc.h>
-#include <atlwin.h>
-
-#include <Winuser.h>
-
-#include "data/msc.h"
-#include "settingsDialog.h"
-
-#define SCSTUDIO_PROFILES_ROOT _T("Software\\Sequence Chart Studio\\Beautify\\Profiles\\")
-
-class CBeautifyProfilesDlg
- : public ATL::CSettingsPageDialog, public CWinDataExchange<CBeautifyProfilesDlg>
-{
-public:
- enum { IDD = IDD_BEAUTIFY_PROFILES };
-
- CBeautifyProfilesDlg(Visio::IVApplicationPtr vsoApp):
- CSettingsPageDialog(IDD, true, CBeautifyProfilesDlg::StartDialogProc),
- m_vsoApp(vsoApp) {}
-
- ~CBeautifyProfilesDlg(){}
-
- const wchar_t* GetRegistryFolder() { return SCSTUDIO_REGISTRY_ROOT _T("\\Beautify"); }
-
-private:
- Visio::IVApplicationPtr m_vsoApp;
-
-BEGIN_DDX_MAP(CBeautifyProfilesDlg)
- DDX_CONTROL_HANDLE(IDC_LOAD, m_loadRdo);
- DDX_CONTROL_HANDLE(IDC_SAVE, m_saveRdo);
- DDX_CONTROL_HANDLE(IDC_DELETE, m_deleteRdo);
- DDX_CONTROL_HANDLE(IDC_COMBO_PROFILES, m_profilesComboRdo);
- DDX_CONTROL_HANDLE(IDC_STATIC_MODIFIED, m_staticRdo);
-END_DDX_MAP()
-
-BEGIN_MSG_MAP(CBeautifyProfilesDlg)
- MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
- COMMAND_HANDLER(IDC_SAVE, BN_CLICKED, OnBnClickedSave)
- COMMAND_HANDLER(IDC_LOAD, BN_CLICKED, OnBnClickedLoad)
- COMMAND_HANDLER(IDC_DELETE, BN_CLICKED, OnBnClickedDelete)
-
- REFLECT_NOTIFICATIONS()
-END_MSG_MAP()
-
-CButton m_loadRdo;
-CButton m_saveRdo;
-CButton m_deleteRdo;
-CComboBox m_profilesComboRdo;
-CStatic m_staticRdo;
-
-int m_iProfilesCombo;
-
-LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
-LRESULT OnBnClickedSave(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
-LRESULT OnBnClickedLoad(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
-LRESULT OnBnClickedDelete(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
-
-
-BOOL OnApply(WORD wID);
-BOOL OnHelp(){return TRUE;}
-
-int SaveRegistryData(LPTSTR lpszText);
-int LoadRegistryData(LPTSTR lpszText);
-
-};
-// $Id: beautifyProfilesDlg.h 1111 2011-06-29 10:13:46Z xmalota $S
\ No newline at end of file
Modified: trunk/src/view/visio/addon/beautifySettingADlg.cpp
===================================================================
--- trunk/src/view/visio/addon/beautifySettingADlg.cpp 2011-11-26 22:29:33 UTC (rev 1212)
+++ trunk/src/view/visio/addon/beautifySettingADlg.cpp 2011-11-29 14:05:00 UTC (rev 1213)
@@ -107,11 +107,6 @@
{
strPercent.Format(_T("Ratio of eliminiation is: %d:%d"), nWeightGb, nWeightCr);
- //m_toolTipBar->SetWindowText(strPercent);
- //m_TrackBar.SetToolTips(*m_toolTipBar);
- //MessageBox(strPercent, _T("Setting Beautify Error"), MB_ICONEXCLAMATION);
- //m_StaticPercent.SetWindowText(strPercent);
- //m_PieChart.SetPercent(nPercent);
}
return 0;
}
@@ -124,7 +119,7 @@
dataExchanged = DoDataExchange(true);
if (dataExchanged)
{
- SaveRegistryData();
+ SaveRegistryData();
}
else
{
@@ -346,11 +341,4 @@
return 0;
}
-void CBeautifySettingsADlg::OnSelectionChanged()
-{
- LoadRegistryData();
- DoDataExchange(FALSE);
- UpdateControls();
-}
-
// $Id: beautifySettingADlg.cpp 1111 2011-06-29 10:13:46Z xmalota $
\ No newline at end of file
Modified: trunk/src/view/visio/addon/beautifySettingADlg.h
===================================================================
--- trunk/src/view/visio/addon/beautifySettingADlg.h 2011-11-26 22:29:33 UTC (rev 1212)
+++ trunk/src/view/visio/addon/beautifySettingADlg.h 2011-11-29 14:05:00 UTC (rev 1213)
@@ -146,10 +146,8 @@
BOOL OnApply(WORD wID);
BOOL OnHelp();
- void OnSelectionChanged();
LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
- //LRESULT OnCloseCmd(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnTrackBar(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
LRESULT OnConstSpacesRdo(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
Modified: trunk/src/view/visio/addon/beautifySettingGDlg.cpp
===================================================================
--- trunk/src/view/visio/addon/beautifySettingGDlg.cpp 2011-11-26 22:29:33 UTC (rev 1212)
+++ trunk/src/view/visio/addon/beautifySettingGDlg.cpp 2011-11-29 14:05:00 UTC (rev 1213)
@@ -110,13 +110,14 @@
{
dataExchanged = DoDataExchange(true);
if (dataExchanged)
+ {
SaveRegistryData();
- else
- {
- return FALSE;
- }
+ }
+ else
+ {
+ return FALSE;
+ }
}
-
return TRUE;
}
@@ -131,7 +132,7 @@
TRACE("CBeautifySettingGDlg::LoadRegistryData() - Loading options from registry");
Visio::IVPagePtr page = m_vsoApp->ActivePage;
- Registry* reg = Registry::get();
+ Registry* reg = Registry::get();
#define _u(x) CPageUtils::ConvertUnits(page, x, 0, visPageUnits)
m_use_partsInstance = reg->getRegistry<DWORD>(GetRegistryFolder(), _T("PartsInstanceLength"), 1);
m_use_constInstance = reg->getRegistry<DWORD>(GetRegistryFolder(), _T("ConstInstanceLength"), 0);
@@ -355,12 +356,4 @@
UpdateControls();
return 0;
}
-
-void CBeautifySettingsGDlg::OnSelectionChanged()
-{
- LoadRegistryData();
- DoDataExchange(FALSE);
- UpdateControls();
-}
-
// $Id: beautifySettingGDlg.cpp 1111 2011-06-29 10:13:46Z xmalota $
\ No newline at end of file
Modified: trunk/src/view/visio/addon/beautifySettingGDlg.h
===================================================================
--- trunk/src/view/visio/addon/beautifySettingGDlg.h 2011-11-26 22:29:33 UTC (rev 1212)
+++ trunk/src/view/visio/addon/beautifySettingGDlg.h 2011-11-29 14:05:00 UTC (rev 1213)
@@ -77,13 +77,11 @@
//Registry folder
const wchar_t* GetRegistryFolder() { return SCSTUDIO_REGISTRY_ROOT _T("\\Beautify"); }
- //int m_arrange;
long m_use_partsInstance;
long m_use_constInstance;
long m_use_originInstance;
int m_alignBottom;
- //int m_settingHead;
long m_use_const_head;
long m_use_max_head;
long m_use_min_head;
@@ -168,15 +166,12 @@
//Overrides methods
BOOL OnApply(WORD wID);
BOOL OnHelp();
- void OnSelectionChanged();
- //LRESULT OnArrange(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnConstInstanceRdo(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnPartsInstanceRdo(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnAlignBottomRdo(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
LRESULT OnOriginalInstanceRdo(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
- //LRESULT OnSettingHead(WORD w...
[truncated message content] |
|
From: <got...@us...> - 2012-01-21 20:59:37
|
Revision: 1298
http://scstudio.svn.sourceforge.net/scstudio/?rev=1298&view=rev
Author: gotthardp
Date: 2012-01-21 20:59:31 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
Version number changed to 0.5.0
Modified Paths:
--------------
trunk/src/view/visio/addon/dllmodule.rc
trunk/src/view/visio/build-setup.bat
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2012-01-21 20:55:19 UTC (rev 1297)
+++ trunk/src/view/visio/addon/dllmodule.rc 2012-01-21 20:59:31 UTC (rev 1298)
@@ -491,8 +491,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,4,0,0
- PRODUCTVERSION 0,4,0,0
+ FILEVERSION 0,5,0,0
+ PRODUCTVERSION 0,5,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x9L
@@ -509,13 +509,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.4.0"
+ VALUE "FileVersion", "0.5.0"
VALUE "InternalName", "scstudio.vsl"
VALUE "LegalCopyright", "(c) Petr Gotthard. All rights reserved."
VALUE "OriginalFilename", "scstudio.vsl"
VALUE "PrivateBuild", "$Revision$"
VALUE "ProductName", "Sequence Chart Studio"
- VALUE "ProductVersion", "0.4.0"
+ VALUE "ProductVersion", "0.5.0"
END
END
BLOCK "VarFileInfo"
Modified: trunk/src/view/visio/build-setup.bat
===================================================================
--- trunk/src/view/visio/build-setup.bat 2012-01-21 20:55:19 UTC (rev 1297)
+++ trunk/src/view/visio/build-setup.bat 2012-01-21 20:59:31 UTC (rev 1298)
@@ -1,4 +1,4 @@
-set VERSION=0.4.0
+set VERSION=0.5.0
set BUILD_TYPE=Release
"C:\Program Files\NSIS\makensis" /DVERSION=%VERSION% /DBUILD_TYPE=%BUILD_TYPE% scstudio.nsi
"C:\Program Files\Microsoft SDKs\Windows\v6.0A\bin\signtool.exe" sign /a scstudio-setup-%VERSION%.exe
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mbe...@us...> - 2012-03-22 23:27:50
|
Revision: 1354
http://scstudio.svn.sourceforge.net/scstudio/?rev=1354&view=rev
Author: mbezdeka
Date: 2012-03-22 23:27:44 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
Bugfix: Fixed bug #3367416 (Loading scstudio takes too much time).
Modified Paths:
--------------
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/settingsDialog.h
trunk/src/view/visio/scstudio.nsi
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2012-03-21 15:15:40 UTC (rev 1353)
+++ trunk/src/view/visio/addon/document.cpp 2012-03-22 23:27:44 UTC (rev 1354)
@@ -2303,7 +2303,7 @@
int CDocumentMonitor::InvokeHelp(const std::wstring& filename)
{
std::basic_string<TCHAR> path = GetVisioModulePath();
- path += L"\\help\\" + filename;
+ path += L"..\\help\\" + filename;
ShellExecute(NULL, L"open", path.c_str() , NULL, NULL, SW_SHOWNORMAL);
return 0;
try
@@ -2425,7 +2425,7 @@
VAORC CDocumentMonitor::OnHelp()
{
- std::basic_string<TCHAR> result = GetVisioModulePath() + _T("\\help\\index.html");
+ std::basic_string<TCHAR> result = GetVisioModulePath() + _T("..\\help\\index.html");
ShellExecute(NULL, L"open", result.c_str() , NULL, NULL, SW_SHOWNORMAL);
return VAORC_SUCCESS;
}
Modified: trunk/src/view/visio/addon/settingsDialog.h
===================================================================
--- trunk/src/view/visio/addon/settingsDialog.h 2012-03-21 15:15:40 UTC (rev 1353)
+++ trunk/src/view/visio/addon/settingsDialog.h 2012-03-22 23:27:44 UTC (rev 1354)
@@ -94,7 +94,7 @@
void showHelp(LPCTSTR path)
{
- std::basic_string<TCHAR> result = GetVisioModulePath() + path;
+ std::basic_string<TCHAR> result = GetVisioModulePath() + std::wstring(L"..") + path;
ShellExecute(NULL, L"open", result.c_str() , NULL, NULL, SW_SHOWNORMAL);
}
Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi 2012-03-21 15:15:40 UTC (rev 1353)
+++ trunk/src/view/visio/scstudio.nsi 2012-03-22 23:27:44 UTC (rev 1354)
@@ -170,7 +170,7 @@
${AppendRegStr} ${Visio12RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
${AppendRegStr} ${Visio14RegPath} "Application" "AddonsPath" "$INSTDIR\bin"
- SetOutPath $INSTDIR\bin\help
+ SetOutPath $INSTDIR\help
File /r "..\..\..\doc\help\*.html"
File /r "..\..\..\doc\help\*.css"
File /r "..\..\..\doc\help\*.png"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xm...@us...> - 2013-03-18 13:32:38
|
Revision: 1606
http://sourceforge.net/p/scstudio/code/1606
Author: xmalota
Date: 2013-03-18 13:32:34 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
attempt to remove compilation problem in VS 2008, import file extension filter supports each filter separately
Modified Paths:
--------------
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/scstudio.vcproj
trunk/src/view/visio/scstudio.sln
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2013-03-18 11:13:12 UTC (rev 1605)
+++ trunk/src/view/visio/addon/document.cpp 2013-03-18 13:32:34 UTC (rev 1606)
@@ -2007,7 +2007,7 @@
}
//cretes list of filters
- for(FormatterPtrList::const_iterator fpos = imformatter.begin();
+ for(FormatterPtrList::const_iterator fpos = imformatter.begin();
fpos != imformatter.end(); fpos++)
{
if(fpos == imformatter.end() - 1)
@@ -2015,6 +2015,18 @@
else
filter << "*." << (*fpos)->get_extension() << "; ";
}
+
+ //creates all filters separately
+ for(FormatterPtrList::const_iterator fpos = imformatter.begin();
+ fpos != imformatter.end(); fpos++)
+ {
+
+ filter << (*fpos)->get_description()
+ << " (*." << (*fpos)->get_extension() << ")@*." << (*fpos)->get_extension() << "@";
+
+ if(extension.empty())
+ extension = (*fpos)->get_extension();
+ }
// append a filter to display all files
filter << "All Files (*.*)@*.*@";
Modified: trunk/src/view/visio/addon/scstudio.vcproj
===================================================================
--- trunk/src/view/visio/addon/scstudio.vcproj 2013-03-18 11:13:12 UTC (rev 1605)
+++ trunk/src/view/visio/addon/scstudio.vcproj 2013-03-18 13:32:34 UTC (rev 1606)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9.00"
+ Version="9,00"
Name="scstudio"
ProjectGUID="{0E00282C-F48B-4984-A274-5B59E1E2AD49}"
RootNamespace="scstudio"
@@ -84,7 +84,7 @@
AdditionalDependencies="version.lib scmsc.lib"
OutputFile="$(OutDir)\$(ProjectName).vsl"
LinkIncremental="2"
- AdditionalLibraryDirectories="..\..\..\..\$(OutDir)"
+ AdditionalLibraryDirectories=""..\..\..\..\$(OutDir)";"..\..\..\..\third-party-sw\boost\stage\lib""
ModuleDefinitionFile=".\dllmodule.def"
GenerateDebugInformation="true"
SubSystem="2"
@@ -678,11 +678,11 @@
>
</File>
<File
- RelativePath="..\..\..\..\..\..\bitmaps\intervals.bmp"
+ RelativePath=".\intervals.bmp"
>
</File>
<File
- RelativePath=".\intervals.bmp"
+ RelativePath="..\..\..\..\..\..\bitmaps\intervals.bmp"
>
</File>
<File
Modified: trunk/src/view/visio/scstudio.sln
===================================================================
--- trunk/src/view/visio/scstudio.sln 2013-03-18 11:13:12 UTC (rev 1605)
+++ trunk/src/view/visio/scstudio.sln 2013-03-18 13:32:34 UTC (rev 1606)
@@ -1,9 +1,9 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scstudio", "addon\scstudio.vcxproj", "{0E00282C-F48B-4984-A274-5B59E1E2AD49}"
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scstudio", "addon\scstudio.vcproj", "{0E00282C-F48B-4984-A274-5B59E1E2AD49}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setup-nsis", "setup-nsis\setup-nsis.vcxproj", "{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setup-nsis", "setup-nsis\setup-nsis.vcproj", "{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tm...@us...> - 2013-06-24 18:01:15
|
Revision: 1831
http://sourceforge.net/p/scstudio/code/1831
Author: tmarton
Date: 2013-06-24 18:01:11 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
merged hmsc connection lines and connection arrows
Modified Paths:
--------------
trunk/src/view/visio/addon/visualize.cpp
trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
trunk/src/view/visio/stencils/Sequence Chart Studio/MSC.vtx
Modified: trunk/src/view/visio/addon/visualize.cpp
===================================================================
--- trunk/src/view/visio/addon/visualize.cpp 2013-06-24 12:41:30 UTC (rev 1830)
+++ trunk/src/view/visio/addon/visualize.cpp 2013-06-24 18:01:11 UTC (rev 1831)
@@ -92,8 +92,7 @@
ST_HMSC_START,
ST_HMSC_END,
ST_HMSC_REFERENCE,
- ST_HMSC_CONDITION,
- ST_HMSC_LINE,
+ ST_HMSC_CONDITION,
ST_HMSC_ARROW,
ST_COMMENT,
ST_TEXT,
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx 2013-06-24 12:41:30 UTC (rev 1830)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx 2013-06-24 18:01:11 UTC (rev 1831)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='DC3EC77A3F68347423B611C4000F7BB4FE10C2A2EAF53068EF32B1C41754F723CB444D23DCDB377907825F2DD23888A4D711F29DC6DFAEEBDB5F8D82D1886A59' start='190' metric='0' DocLangID='1033' buildnum='6606' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>Basic MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>805312904</BuildNumberCreated><BuildNumberEdited>805312974</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2011-03-31T23:02:37</TimeCreated><TimeSaved>2012-06-20T11:21:00</TimeSaved><TimeEdited>2012-06-20T11:20:55</TimeEdited><TimePrinted>2011-03-31T23:02:37</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1033</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1033</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1033</LangID></Char></StyleSheet><StyleSheet ID='6' NameU='Connector' Name='Connector' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>0</FillForegnd><FillBkgnd F='Inh'>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin Unit='PT' F='Inh'>0.05555555555555555</TopMargin><BottomMargin Unit='PT' F='Inh'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd>2</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='7' NameU='Visio 90' Name='Visio 90' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd>0</FillForegnd><FillBkgnd>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='8' NameU='Callout' Name='Callout' LineStyle='9' FillStyle='9' TextStyle='9'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Char IX='0'><Font>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='9' NameU='Visio 00' Name='Visio 00' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='HSL(0,0,0)'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='HSL(144,116,225)'>#e8eef7</FillForegnd><FillBkgnd F='HSL(144,106,193)'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='HSL(144,116,125)'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1033</LangID></Char></StyleSheet><StyleSheet ID='10' NameU='Connector Arrow' Name='Connector Arrow' LineStyle='6' FillStyle='6' TextStyle='6'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>0</EnableFillProps><EnableTextProps>0</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.003333333333333334</LineWeight><LineColor ...
[truncated message content] |
|
From: <xf...@us...> - 2013-07-08 15:48:43
|
Revision: 1845
http://sourceforge.net/p/scstudio/code/1845
Author: xfarmad
Date: 2013-07-08 15:48:39 +0000 (Mon, 08 Jul 2013)
Log Message:
-----------
Removed directed interval
Modified Paths:
--------------
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/extract.cpp
trunk/src/view/visio/addon/extract.h
trunk/src/view/visio/addon/visualize.cpp
trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
trunk/src/view/visio/stencils/Sequence Chart Studio/MSC.vtx
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2013-07-08 14:20:21 UTC (rev 1844)
+++ trunk/src/view/visio/addon/document.cpp 2013-07-08 15:48:39 UTC (rev 1845)
@@ -305,7 +305,7 @@
break;
case ST_TIME_INTERVAL:
- case ST_TIME_DIRECTED:
+ //case ST_TIME_DIRECTED:
if(vsoShape->Text.length() == 0)
vsoShape->Text = _T("[0,inf)");
break;
Modified: trunk/src/view/visio/addon/extract.cpp
===================================================================
--- trunk/src/view/visio/addon/extract.cpp 2013-07-08 14:20:21 UTC (rev 1844)
+++ trunk/src/view/visio/addon/extract.cpp 2013-07-08 15:48:39 UTC (rev 1845)
@@ -53,7 +53,7 @@
case ST_COMMENT:
case ST_TEXT:
case ST_TIME_INTERVAL:
- case ST_TIME_DIRECTED:
+ //case ST_TIME_DIRECTED:
case ST_TIME_ABSOLUTE:
//when user calls repaint function, ST_MARKER_EVENT shoud be removed too
case ST_MARKER_EVENT:
@@ -215,7 +215,7 @@
{_T("comment"), ST_COMMENT},
{_T("text"), ST_TEXT},
{_T("time.interval"), ST_TIME_INTERVAL},
- {_T("time.directed"), ST_TIME_DIRECTED},
+ //{_T("time.directed"), ST_TIME_DIRECTED},
{_T("time.absolute"), ST_TIME_ABSOLUTE},
{_T("picture"), ST_PICTURE},
{_T("marker.event"), ST_MARKER_EVENT},
@@ -691,10 +691,10 @@
}
case ST_TIME_INTERVAL:
- case ST_TIME_DIRECTED:
+ //case ST_TIME_DIRECTED:
{
TimeRelationEvent *new_relation = new TimeRelationEvent((const char*)shape->Text);
- new_relation->set_directed(type == ST_TIME_DIRECTED);
+ //new_relation->set_directed(type == ST_TIME_DIRECTED);
new_relation->set_width(GetControlPos(shape, _T("Height")));
time_relations[shape->ID] = new_relation;
break;
@@ -908,7 +908,7 @@
break;
case ST_TIME_INTERVAL:
- case ST_TIME_DIRECTED:
+ //case ST_TIME_DIRECTED:
case ST_TIME_ABSOLUTE:
case ST_COMMENT:
// ignore all these shape types
@@ -1546,10 +1546,10 @@
break;
case ST_TIME_INTERVAL:
- case ST_TIME_DIRECTED:
+ //case ST_TIME_DIRECTED:
{
TimeRelationRefNode *new_relation = new TimeRelationRefNode((const char*)shape->Text);
- new_relation->set_directed(type == ST_TIME_DIRECTED);
+ //new_relation->set_directed(type == ST_TIME_DIRECTED);
new_relation->set_width(GetControlPos(shape, _T("Height")));
time_relations[shape->ID] = new_relation;
break;
Modified: trunk/src/view/visio/addon/extract.h
===================================================================
--- trunk/src/view/visio/addon/extract.h 2013-07-08 14:20:21 UTC (rev 1844)
+++ trunk/src/view/visio/addon/extract.h 2013-07-08 15:48:39 UTC (rev 1845)
@@ -42,7 +42,7 @@
ST_COMMENT,
ST_TEXT,
ST_TIME_INTERVAL,
- ST_TIME_DIRECTED,
+ //ST_TIME_DIRECTED,
ST_TIME_ABSOLUTE,
ST_PICTURE,
ST_MARKER_EVENT,
Modified: trunk/src/view/visio/addon/visualize.cpp
===================================================================
--- trunk/src/view/visio/addon/visualize.cpp 2013-07-08 14:20:21 UTC (rev 1844)
+++ trunk/src/view/visio/addon/visualize.cpp 2013-07-08 15:48:39 UTC (rev 1845)
@@ -97,7 +97,6 @@
ST_COMMENT,
ST_TEXT,
ST_TIME_INTERVAL,
- ST_TIME_DIRECTED,
ST_TIME_ABSOLUTE,
ST_UNKNOWN
};
@@ -418,9 +417,12 @@
{
Visio::IVShapePtr result;
+ /*
+ For directed time suport
if(time_relation->is_directed())
result = vsoPage->Drop(find_master(ST_TIME_DIRECTED), 0, 0);
else
+ */
result = vsoPage->Drop(find_master(ST_TIME_INTERVAL), 0, 0);
SetControlPos(result, _T("Height"), time_relation->get_width());
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx 2013-07-08 14:20:21 UTC (rev 1844)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx 2013-07-08 15:48:39 UTC (rev 1845)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='51A0A021B396AFE3F92691BDEC445AD3FAAE5CC79A4D29E75C35D409E4ACD21733734D6B00A5F0D754C49AACCC108E3E17E9EA4340C047E62EBC0D095500F602' start='190' metric='0' DocLangID='1033' buildnum='4518' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>Basic MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>806228390</BuildNumberCreated><BuildNumberEdited>806228390</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2011-03-31T23:02:37</TimeCreated><TimeSaved>2013-07-08T16:18:06</TimeSaved><TimeEdited>2013-07-08T16:17:38</TimeEdited><TimePrinted>2011-03-31T23:02:37</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1033</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1033</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1033</LangID></Char></StyleSheet><StyleSheet ID='6' NameU='Connector' Name='Connector' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>0</FillForegnd><FillBkgnd F='Inh'>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin Unit='PT' F='Inh'>0.05555555555555555</TopMargin><BottomMargin Unit='PT' F='Inh'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd>2</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='7' NameU='Visio 90' Name='Visio 90' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd>0</FillForegnd><FillBkgnd>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='8' NameU='Callout' Name='Callout' LineStyle='9' FillStyle='9' TextStyle='9'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><C...
[truncated message content] |
|
From: <xf...@us...> - 2013-07-22 09:27:45
|
Revision: 1854
http://sourceforge.net/p/scstudio/code/1854
Author: xfarmad
Date: 2013-07-22 09:27:39 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
united condition - the same condition shape can be used in bmsc and hmsc
Modified Paths:
--------------
trunk/src/view/visio/addon/enumerateUtils.cpp
trunk/src/view/visio/addon/extract.cpp
trunk/src/view/visio/addon/extract.h
trunk/src/view/visio/addon/visualize.cpp
trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
Modified: trunk/src/view/visio/addon/enumerateUtils.cpp
===================================================================
--- trunk/src/view/visio/addon/enumerateUtils.cpp 2013-07-19 21:07:53 UTC (rev 1853)
+++ trunk/src/view/visio/addon/enumerateUtils.cpp 2013-07-22 09:27:39 UTC (rev 1854)
@@ -382,7 +382,7 @@
case ST_BMSC_MESSAGE_FOUND:
case ST_BMSC_MESSAGE_LOST:
case ST_BMSC_ACTION:
- case ST_BMSC_CONDITION:
+ case ST_MSC_CONDITION:
return true;
}
return false;
Modified: trunk/src/view/visio/addon/extract.cpp
===================================================================
--- trunk/src/view/visio/addon/extract.cpp 2013-07-19 21:07:53 UTC (rev 1853)
+++ trunk/src/view/visio/addon/extract.cpp 2013-07-22 09:27:39 UTC (rev 1854)
@@ -39,7 +39,6 @@
case ST_BMSC_MESSAGE_LOST:
case ST_BMSC_MESSAGE_FOUND:
case ST_BMSC_ACTION:
- case ST_BMSC_CONDITION:
case ST_BMSC_COREGION:
case ST_BMSC_ORDER_LINE:
case ST_BMSC_ORDER_ARROW:
@@ -47,9 +46,9 @@
case ST_HMSC_START:
case ST_HMSC_END:
case ST_HMSC_REFERENCE:
- case ST_HMSC_CONDITION:
case ST_HMSC_LINE:
case ST_HMSC_ARROW:
+ case ST_MSC_CONDITION:
case ST_COMMENT:
case ST_TEXT:
case ST_TIME_INTERVAL:
@@ -201,7 +200,6 @@
{_T("bmsc.message.lost"), ST_BMSC_MESSAGE_LOST},
{_T("bmsc.message.found"), ST_BMSC_MESSAGE_FOUND},
{_T("bmsc.action"), ST_BMSC_ACTION},
- {_T("bmsc.condition"), ST_BMSC_CONDITION},
{_T("bmsc.coregion.box"), ST_BMSC_COREGION},
{_T("bmsc.order.line"), ST_BMSC_ORDER_LINE},
{_T("bmsc.order.arrow"), ST_BMSC_ORDER_ARROW},
@@ -209,9 +207,9 @@
{_T("hmsc.start"), ST_HMSC_START},
{_T("hmsc.end"), ST_HMSC_END},
{_T("hmsc.reference"), ST_HMSC_REFERENCE},
- {_T("hmsc.condition"), ST_HMSC_CONDITION},
{_T("hmsc.line"), ST_HMSC_LINE},
{_T("hmsc.arrow"), ST_HMSC_ARROW},
+ {_T("msc.condition"), ST_MSC_CONDITION},
{_T("comment"), ST_COMMENT},
{_T("text"), ST_TEXT},
{_T("time.interval"), ST_TIME_INTERVAL},
@@ -678,7 +676,7 @@
break;
}
- case ST_BMSC_CONDITION:
+ case ST_MSC_CONDITION:
{
LocalCondition* new_local_condition = new LocalCondition((const wchar_t*)shape->Text);
// note: this shape is rotated by 90 degrees
@@ -884,7 +882,7 @@
}
break;
- case ST_BMSC_CONDITION:
+ case ST_MSC_CONDITION:
//local condition are just hacked for the moment
{
std::map<long,int>::iterator connections = local_condition_connections.find(event.shape_id);
@@ -1016,7 +1014,7 @@
case ST_BMSC_MESSAGE_LOST:
case ST_BMSC_MESSAGE_FOUND:
case ST_BMSC_ACTION:
- case ST_BMSC_CONDITION: // NOTE: hack - local action and condition behaves like a lost message
+ case ST_MSC_CONDITION: // NOTE: hack - local action and condition behaves like a lost message
switch(state)
{
case ST_EXPECTING_AREA:
@@ -1301,6 +1299,13 @@
}
else if(connected_side == CS_SHAPE_LEFT || connected_side == CS_SHAPE_RIGHT)
{
+ if(shape_type == ST_MSC_CONDITION)
+ {
+ if(connect->FromPart == visBegin)
+ return CD_OUTGOING;
+ else if(connect->FromPart == visEnd)
+ return CD_INCOMING;
+ }
PrintError(stringize() << page_name << ": "
<< "Flow lines must be attached to a top or a bottom edge.",
shapelist() << shape << line);
@@ -1375,7 +1380,7 @@
case ST_HMSC_CONNECTION:
case ST_HMSC_START:
case ST_HMSC_REFERENCE:
- case ST_HMSC_CONDITION:
+ case ST_MSC_CONDITION:
{
PredecessorNode *pred = dynamic_cast<PredecessorNode*>(node.get());
if(pred != NULL)
@@ -1404,7 +1409,7 @@
case ST_HMSC_CONNECTION:
case ST_HMSC_END:
case ST_HMSC_REFERENCE:
- case ST_HMSC_CONDITION:
+ case ST_MSC_CONDITION:
{
SuccessorNode *succ = dynamic_cast<SuccessorNode*>(node.get());
if(succ != NULL)
@@ -1530,7 +1535,7 @@
new_node->set_msc(msc);
break;
}
- case ST_HMSC_CONDITION:
+ case ST_MSC_CONDITION:
{
ConditionNode *new_condition = new ConditionNode((const char*)shape->Text);
new_condition->set_position(GetPinPos(shape));
Modified: trunk/src/view/visio/addon/extract.h
===================================================================
--- trunk/src/view/visio/addon/extract.h 2013-07-19 21:07:53 UTC (rev 1853)
+++ trunk/src/view/visio/addon/extract.h 2013-07-22 09:27:39 UTC (rev 1854)
@@ -28,7 +28,6 @@
ST_BMSC_MESSAGE_LOST,
ST_BMSC_MESSAGE_FOUND,
ST_BMSC_ACTION,
- ST_BMSC_CONDITION,
ST_BMSC_COREGION,
ST_BMSC_ORDER_LINE,
ST_BMSC_ORDER_ARROW,
@@ -36,9 +35,9 @@
ST_HMSC_START,
ST_HMSC_END,
ST_HMSC_REFERENCE,
- ST_HMSC_CONDITION,
ST_HMSC_LINE,
ST_HMSC_ARROW,
+ ST_MSC_CONDITION,
ST_COMMENT,
ST_TEXT,
ST_TIME_INTERVAL,
Modified: trunk/src/view/visio/addon/visualize.cpp
===================================================================
--- trunk/src/view/visio/addon/visualize.cpp 2013-07-19 21:07:53 UTC (rev 1853)
+++ trunk/src/view/visio/addon/visualize.cpp 2013-07-22 09:27:39 UTC (rev 1854)
@@ -84,16 +84,15 @@
ST_BMSC_MESSAGE_LOST,
ST_BMSC_MESSAGE_FOUND,
ST_BMSC_ACTION,
- ST_BMSC_CONDITION,
ST_BMSC_COREGION,
ST_BMSC_ORDER_LINE,
ST_BMSC_ORDER_ARROW,
ST_HMSC_CONNECTION,
ST_HMSC_START,
ST_HMSC_END,
- ST_HMSC_REFERENCE,
- ST_HMSC_CONDITION,
+ ST_HMSC_REFERENCE,
ST_HMSC_ARROW,
+ ST_MSC_CONDITION,
ST_COMMENT,
ST_TEXT,
ST_TIME_INTERVAL,
@@ -327,7 +326,7 @@
}
else if(local_condition != NULL)
{
- Visio::IVShapePtr cond = drop_message(vsoPage, messages, incomplete_message, find_master(ST_BMSC_CONDITION));
+ Visio::IVShapePtr cond = drop_message(vsoPage, messages, incomplete_message, find_master(ST_MSC_CONDITION));
// note: local actions are rotated by 90' in Visio, height is the 'x' coordinate
CShapeUtils::GlueBeginToPos(cond, parent, event->get_position() - MscPoint(0, local_condition->get_height()));
CShapeUtils::GlueEndToPos(cond, parent, event->get_position());
@@ -634,7 +633,16 @@
ConditionNodePtr condition_node = boost::dynamic_pointer_cast<ConditionNode>(node);
if(condition_node != NULL)
{
- shape = DropMaster(vsoPage, find_master(ST_HMSC_CONDITION), condition_node->get_position());
+ //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();
+ shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndX]->Result[visMillimeters] = condition_node->get_position().get_x();
+ shape->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndY]->Result[visMillimeters] = page_height - condition_node->get_position().get_y() - 10;
shape->Text = condition_node->get_label().c_str();
}
@@ -769,11 +777,24 @@
case PATH: CShapeUtils::MarkShape(connector, SC_DARK_GREEN); break;
default: throw std::runtime_error("Error: unexpected behaviour");
}
-
Visio::IVCellPtr from_cell = connector->CellsSRC[visSectionObject][visRowXForm1D][vis1DBeginX];
- from_cell->GlueToPos(shape, 0.5, 0.0);
+ 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);
+ }
Visio::IVCellPtr to_cell = connector->CellsSRC[visSectionObject][visRowXForm1D][vis1DEndX];
- to_cell->GlueToPos(successor_shape, 0.5, 1.0);
+ 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);
+ }
// add successors of this node to the stack
// note: std::list<>::push_back doesn't invalidate iterators
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx 2013-07-19 21:07:53 UTC (rev 1853)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/Basic MSC.vsx 2013-07-22 09:27:39 UTC (rev 1854)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='00EB33424FC07C5F9134A95EC1A81D6E379BFCB2073D9DA50F52AB20D667691F08005AA0C407FAC890461B74228D9A167BCFC03EEEB8329837B1DB770C88A25D' start='190' metric='0' DocLangID='1033' buildnum='7100' version='14.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>Basic MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>806228390</BuildNumberCreated><BuildNumberEdited>939531196</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2011-03-31T23:02:37</TimeCreated><TimeSaved>2013-07-19T08:22:17</TimeSaved><TimeEdited>2013-07-19T08:21:55</TimeEdited><TimePrinted>2011-03-31T23:02:37</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01041666666666667</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1033</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships>0</v14:Relationships><v14:DisplayLevel>0</v14:DisplayLevel></v14:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><v14:PageLayout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:AvoidPageBreaks>0</v14:AvoidPageBreaks></v14:PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><v14:PageProps xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:DrawingResizeType F='No Formula'>0</v14:DrawingResizeType></v14:PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01041666666666667</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01041666666666667</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1033</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout><Char IX='0'><Font>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size>...
[truncated message content] |
|
From: <xf...@us...> - 2013-07-29 21:47:47
|
Revision: 1858
http://sourceforge.net/p/scstudio/code/1858
Author: xfarmad
Date: 2013-07-29 21:47:44 +0000 (Mon, 29 Jul 2013)
Log Message:
-----------
HMSC connection arrow and time snapping upgrade
Modified Paths:
--------------
trunk/src/view/visio/addon/addon.cpp
trunk/src/view/visio/addon/connectionArrowSnapping.cpp
trunk/src/view/visio/addon/connectionArrowSnapping.h
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/timeSnapping.cpp
trunk/src/view/visio/addon/timeSnapping.h
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
Modified: trunk/src/view/visio/addon/addon.cpp
===================================================================
--- trunk/src/view/visio/addon/addon.cpp 2013-07-28 20:43:34 UTC (rev 1857)
+++ trunk/src/view/visio/addon/addon.cpp 2013-07-29 21:47:44 UTC (rev 1858)
@@ -32,6 +32,7 @@
#include "messageSnapping.h"
#include "messageJump.h"
#include "timeSnapping.h"
+#include "connectionArrowSnapping.h"
// include command line parsing library SimpleOpt
// http://code.jellycan.com/simpleopt
@@ -977,13 +978,26 @@
{
Visio::IVShapePtr timeShape = selection->Item[1];
- if(timeShape)
- {
- CTimeSnapping::snap(timeShape);
- }
+ if(timeShape)
+ {
+ CTimeSnapping::snap(timeShape);
+ }
}
////////////////////////////////////////////////////
+ //ConnectionArrow snapping
+ if((selection->Count==1) && (last_selected==ST_HMSC_ARROW)
+ && (m_bBeginChanged || m_bEndChanged))
+ {
+ Visio::IVShapePtr connectionArrowShape = selection->Item[1];
+
+ if(connectionArrowShape)
+ {
+ CConnectionArrowSnapping::snap(connectionArrowShape);
+ }
+ }
+
+ ////////////////////////////////////////////////////
//Message snapping
if(!m_bOnDropShape && m_bSnap && !m_bKeyDown && (selection->Count == 1) && CMessageSnapping::isEnabled())
{
Modified: trunk/src/view/visio/addon/connectionArrowSnapping.cpp
===================================================================
--- trunk/src/view/visio/addon/connectionArrowSnapping.cpp 2013-07-28 20:43:34 UTC (rev 1857)
+++ trunk/src/view/visio/addon/connectionArrowSnapping.cpp 2013-07-29 21:47:44 UTC (rev 1858)
@@ -20,5 +20,168 @@
#include "connectionArrowSnapping.h"
#include "shapeutils.h"
+bool CConnectionArrowSnapping::isHmscShape(Visio::IVShapePtr shape)
+{
+ switch(get_shape_type(shape))
+ {
+ case ST_HMSC_CONNECTION:
+ case ST_HMSC_END:
+ case ST_HMSC_REFERENCE:
+ case ST_HMSC_START:
+ case ST_MSC_CONDITION:
+ return true;
+ }
+ return false;
+}
+bool CConnectionArrowSnapping::isCorrectConnected(Visio::IVShapePtr connectionShape, Visio::IVConnectPtr connect)
+{
+ if(!connectionShape || !connect)
+ return false;
+
+ Visio::IVShapePtr shape = connect->ToSheet;
+
+ if(!isHmscShape(shape))
+ return false;
+
+ TShapeType type = get_shape_type(shape);
+
+ if(type == ST_HMSC_START)
+ {
+ if(_tcsicmp(connect->FromCell->Name,_T("BeginX")) != 0)
+ return false;
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X1")) != 0)
+ return false;
+ return true;
+ }
+
+ if(type == ST_HMSC_END)
+ {
+ if(_tcsicmp(connect->FromCell->Name,_T("EndX")) != 0)
+ return false;
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X1")) != 0)
+ return false;
+ return true;
+ }
+
+ if(type == ST_HMSC_REFERENCE || type == ST_MSC_CONDITION)
+ {
+ if(_tcsicmp(connect->FromCell->Name,_T("BeginX")) == 0)
+ {
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X2")) == 0)
+ return true;
+ }
+ if(_tcsicmp(connect->FromCell->Name,_T("EndX")) == 0)
+ {
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X1")) == 0)
+ return true;
+ }
+ return false;
+ }
+
+ if(type == ST_HMSC_CONNECTION)
+ {
+ return true;
+ }
+
+ return false;
+}
+
+void CConnectionArrowSnapping::connectArrowCorretly(Visio::IVCellPtr from, Visio::IVShapePtr to)
+{
+ TShapeType type = get_shape_type(to);
+
+ if(type == ST_HMSC_START)
+ {
+ if(_tcsicmp(from->Name,_T("BeginX")) == 0)
+ {
+ from->GlueTo(to->GetCells("Connections.X1"));
+ }
+ else
+ return;
+ }
+
+ if(type == ST_HMSC_END)
+ {
+ if(_tcsicmp(from->Name,_T("EndX")) == 0)
+ {
+ from->GlueTo(to->GetCells("Connections.X1"));
+ }
+ else
+ return;
+ }
+
+ if(type == ST_HMSC_REFERENCE || type == ST_MSC_CONDITION)
+ {
+ if(_tcsicmp(from->Name,_T("BeginX")) == 0)
+ {
+ from->GlueTo(to->GetCells("Connections.X2"));
+ }
+ if(_tcsicmp(from->Name,_T("EndX")) == 0)
+ {
+ from->GlueTo(to->GetCells("Connections.X1"));
+ }
+ else
+ return;
+ }
+}
+
+void CConnectionArrowSnapping::disconnectShape(Visio::IVShapePtr connectionShape, Visio::IVCellPtr fromCell, Visio::IVShapePtr to)
+{
+ TShapeType type = get_shape_type(to);
+
+ if(type == ST_HMSC_START)
+ {
+ double endX = CShapeUtils::getShapeCell(connectionShape, "EndX"), endY = CShapeUtils::getShapeCell(connectionShape, "EndY") - 5;
+ connectionShape->GetCells("EndX")->put_Result(_variant_t(Visio::visMillimeters),endX);
+ connectionShape->GetCells("EndY")->put_Result(_variant_t(Visio::visMillimeters),endY);
+ }
+
+ if(type == ST_HMSC_END)
+ {
+ double beginX = CShapeUtils::getShapeCell(connectionShape, "BeginX"), beginY = CShapeUtils::getShapeCell(connectionShape, "beginY") + 5;
+ connectionShape->GetCells("BeginX")->put_Result(_variant_t(Visio::visMillimeters),beginX);
+ connectionShape->GetCells("BeginY")->put_Result(_variant_t(Visio::visMillimeters),beginY);
+ }
+
+ if(type == ST_HMSC_REFERENCE || type == ST_MSC_CONDITION)
+ {
+ if(_tcsicmp(fromCell->Name,_T("BeginX")) == 0)
+ {
+ double beginX = CShapeUtils::getShapeCell(connectionShape, "BeginX"), beginY = CShapeUtils::getShapeCell(connectionShape, "beginY") + 5;
+ connectionShape->GetCells("BeginX")->put_Result(_variant_t(Visio::visMillimeters),beginX);
+ connectionShape->GetCells("BeginY")->put_Result(_variant_t(Visio::visMillimeters),beginY);
+ }
+ if(_tcsicmp(fromCell->Name,_T("EndX")) == 0)
+ {
+ double endX = CShapeUtils::getShapeCell(connectionShape, "EndX"), endY = CShapeUtils::getShapeCell(connectionShape, "EndY") - 5;
+ connectionShape->GetCells("EndX")->put_Result(_variant_t(Visio::visMillimeters),endX);
+ connectionShape->GetCells("EndY")->put_Result(_variant_t(Visio::visMillimeters),endY);
+ }
+ }
+
+}
+
+void CConnectionArrowSnapping::snap(Visio::IVShapePtr connectionShape)
+{
+ if(!connectionShape)
+ return;
+
+ //Check if shape is already connected
+ Visio::IVConnectsPtr connects = connectionShape->Connects;
+ Visio::IVCellPtr beginCell = connectionShape->GetCells("BeginX"), endCell = connectionShape->GetCells("EndX");
+
+ for(int i=connects->Count; i>0; --i)
+ {
+ if(!isCorrectConnected(connectionShape, connects->Item[i]))
+ {
+ Visio::IVCellPtr from = connects->Item[i]->FromCell;
+ Visio::IVShapePtr to = connects->Item[i]->ToSheet;
+ disconnectShape(connectionShape, connects->Item[i]->FromCell, connects->Item[i]->ToSheet);
+ connectArrowCorretly(from, to);
+ }
+ }
+}
+
+
// $Id$
\ No newline at end of file
Modified: trunk/src/view/visio/addon/connectionArrowSnapping.h
===================================================================
--- trunk/src/view/visio/addon/connectionArrowSnapping.h 2013-07-28 20:43:34 UTC (rev 1857)
+++ trunk/src/view/visio/addon/connectionArrowSnapping.h 2013-07-29 21:47:44 UTC (rev 1858)
@@ -26,7 +26,27 @@
class CConnectionArrowSnapping
{
+private:
+
+ static bool isHmscShape(Visio::IVShapePtr shape);
+ static void disconnectShape(Visio::IVShapePtr connectionShape, Visio::IVCellPtr fromCell, Visio::IVShapePtr to);
+
+ /**
+ * check if connection arrow is connected correctly
+ */
+ static bool isCorrectConnected(Visio::IVShapePtr connectionShape, Visio::IVConnectPtr connect);
+
+ /**
+ * connect connection arrow correctly to shape
+ */
+ static void connectArrowCorretly(Visio::IVCellPtr from, Visio::IVShapePtr to);
+public:
+ /**
+ * automatically snaps current connection shape to nearest HMSC shape
+ * @param connectionShape a shape to snap
+ */
+ static void snap(Visio::IVShapePtr connectionShape);
};
// $Id$
\ No newline at end of file
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2013-07-28 20:43:34 UTC (rev 1857)
+++ trunk/src/view/visio/addon/document.cpp 2013-07-29 21:47:44 UTC (rev 1858)
@@ -37,6 +37,7 @@
#include "orderSnapping.h"
#include "timeSnapping.h"
+#include "connectionArrowSnapping.h"
#include <fstream>
@@ -317,6 +318,10 @@
vsoShape->Text = _T("NAME");
break;
+ case ST_HMSC_ARROW:
+ CConnectionArrowSnapping::snap(vsoShape);
+ break;
+
case ST_TIME_INTERVAL:
//case ST_TIME_DIRECTED:
if(vsoShape->Text.length() == 0)
Modified: trunk/src/view/visio/addon/timeSnapping.cpp
===================================================================
--- trunk/src/view/visio/addon/timeSnapping.cpp 2013-07-28 20:43:34 UTC (rev 1857)
+++ trunk/src/view/visio/addon/timeSnapping.cpp 2013-07-29 21:47:44 UTC (rev 1858)
@@ -60,7 +60,41 @@
return timeAcceptingShapes;
}
+void CTimeSnapping::disconnectShape(Visio::IVShapePtr timeShape, bool begin, Visio::IVShapePtr to)
+{
+ double pointX, pointY;
+ if(begin)
+ {
+ pointX = CShapeUtils::getShapeCell(timeShape, "BeginX");
+ pointY = CShapeUtils::getShapeCell(timeShape, "BeginY");
+ }
+ else
+ {
+ pointX = CShapeUtils::getShapeCell(timeShape, "EndX");
+ pointY = CShapeUtils::getShapeCell(timeShape, "EndY");
+ }
+ switch(get_shape_type(to))
+ {
+ case ST_HMSC_START:
+ pointY -= 5;
+ break;
+ case ST_HMSC_END:
+ pointY += 5;
+ break;
+ }
+ if(begin)
+ {
+ timeShape->GetCells("BeginX")->put_Result(_variant_t(Visio::visMillimeters),pointX);
+ timeShape->GetCells("BeginY")->put_Result(_variant_t(Visio::visMillimeters),pointY);
+ }
+ else
+ {
+ timeShape->GetCells("EndX")->put_Result(_variant_t(Visio::visMillimeters),pointX);
+ timeShape->GetCells("EndY")->put_Result(_variant_t(Visio::visMillimeters),pointY);
+ }
+}
+
void CTimeSnapping::snap(Visio::IVShapePtr timeShape)
{
if(!timeShape)
@@ -69,7 +103,6 @@
bool interval = get_shape_type(timeShape) == ST_TIME_INTERVAL;
//Check if shape is already connected
- std::vector<Visio::IVShapePtr> badShapes;
Visio::IVConnectsPtr connects = timeShape->Connects;
Visio::IVCellPtr beginCell = timeShape->GetCells("BeginX");
@@ -78,7 +111,7 @@
if(interval)
{
- endCell = timeShape->GetCells(_T("EndX"));
+ endCell = timeShape->GetCells("EndX");
}
Visio::IVCellPtr from;
@@ -88,7 +121,7 @@
Visio::IVShapePtr connShape = connects->Item[i]->ToSheet;
from = connects->Item[i]->FromCell;
- if(from->Result[0] == beginCell->Result[0])
+ if(_tcsicmp(from->Name, beginCell->Name) == 0)
{
if (isTimeAcceptingShape(connShape))
{
@@ -96,13 +129,14 @@
}
else
{
- CShapeUtils::unglueShape(timeShape, "BeginX", connShape);
+ //unglue shape
+ disconnectShape(timeShape,true,connShape);
}
continue;
}
if(interval)
{
- if(from->Result[0] == endCell->Result[0])
+ if(_tcsicmp(from->Name, endCell->Name) == 0)
{
if (isTimeAcceptingShape(connShape))
{
@@ -110,7 +144,8 @@
}
else
{
- CShapeUtils::unglueShape(timeShape, "EndX", connShape);
+ //unglue shape
+ disconnectShape(timeShape,false,connShape);
}
}
}
Modified: trunk/src/view/visio/addon/timeSnapping.h
===================================================================
--- trunk/src/view/visio/addon/timeSnapping.h 2013-07-28 20:43:34 UTC (rev 1857)
+++ trunk/src/view/visio/addon/timeSnapping.h 2013-07-29 21:47:44 UTC (rev 1858)
@@ -31,6 +31,9 @@
static const double snapDistance(){return 10.0;}
+
+ static void disconnectShape(Visio::IVShapePtr timeShape, bool begin, Visio::IVShapePtr to);
+
/**
* calculate distance between points
*/
@@ -49,9 +52,7 @@
public:
/**
* automatically snaps current time shape to nearest time accepting shape
- * @param msgShape a shape to snap
- * @param posX MouseX position for closest instances computing
- * @param posY MouseY position for closest instances computing
+ * @param timeShape a shape to snap
*/
static void snap(Visio::IVShapePtr timeShape);
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-07-28 20:43:34 UTC (rev 1857)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-07-29 21:47:44 UTC (rev 1858)
@@ -1,22 +1,8 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='675F8EDE580929D46489C9806727CF51A4177949108254E88D6D7A07E7FE70FCD6F14EEA1D502099B5D8387EC3E35220FC1319692138A3E00F6727766F5B744B' start='190' metric='0' DocLangID='1029' buildnum='7100' version='14.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>939531196</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-07-21T10:23:17</TimeSaved><TimeEdited>2013-07-21T10:23:14</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01041666666666667</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships>0</v14:Relationships><v14:DisplayLevel>0</v14:DisplayLevel></v14:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><v14:PageLayout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:AvoidPageBreaks>0</v14:AvoidPageBreaks></v14:PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><v14:PageProps xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:DrawingResizeType F='No Formula'>0</v14:DrawingResizeType></v14:PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01041666666666667</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01041666666666667</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleShee...
[truncated message content] |
|
From: <xm...@us...> - 2013-10-23 12:26:15
|
Revision: 1865
http://sourceforge.net/p/scstudio/code/1865
Author: xmalota
Date: 2013-10-23 12:26:11 +0000 (Wed, 23 Oct 2013)
Log Message:
-----------
HMSC shapes unified, remove walking glue behavior, shapes prepared for implementation of snapping
Modified Paths:
--------------
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2013-10-11 09:27:00 UTC (rev 1864)
+++ trunk/src/view/visio/addon/document.cpp 2013-10-23 12:26:11 UTC (rev 1865)
@@ -309,10 +309,16 @@
case ST_COMMENT:
case ST_TEXT:
- if(vsoShape->Text.length() == 0)
- vsoShape->Text = _T("NAME");
- break;
-
+ {
+ if(vsoShape->Text.length() == 0)
+ vsoShape->Text = _T("NAME");
+
+ //putting limits on the size of comment
+ Visio::IVCellPtr tmp;
+ tmp = vsoShape->GetCells("Height");
+ tmp->FormulaU = "BOUND(20 mm, 0, FALSE, 0.01 mm, 10000000 mm)";
+ break;
+ }
case ST_HMSC_REFERENCE:
if(vsoShape->Text.length() == 0)
vsoShape->Text = _T("NAME");
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-10-11 09:27:00 UTC (rev 1864)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-10-23 12:26:11 UTC (rev 1865)
@@ -1,8 +1,22 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='4E091781EA959B024A88A0AB3A89A7A4F42333A7151A480676C5554E09FE47FAB3BEC8378314F014DE06E65220914DB01B515A6386D2DD3EF7AC3CDCD02E96BF' start='190' metric='0' DocLangID='1029' buildnum='6676' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>805313044</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-07-29T22:48:58</TimeSaved><TimeEdited>2013-07-29T22:27:29</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1029</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1029</LangID></Char><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout></StyleSheet><StyleSheet ID='6' NameU='Basic' Name='Basic' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign F='Inh'>1</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='7' NameU='Visio 00' Name='Visio 00' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='HSL(0,0,0)'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='HSL(144,116,225)'>#e8eef7</FillForegnd><FillBkgnd F='HSL(144,106,193)'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='HSL(144,116,125)'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='8' NameU='Connector' Name='Connector' LineStyle='9' FillStyle='9' TextStyle='9'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>0</FillForegnd><FillBkgnd F='Inh'>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin Unit='PT' F='Inh'>0.05555555555555555</TopMargin><BottomMargin Unit='PT' F='Inh'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd>2</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='9' NameU='Visio 90' Name='Visio 90' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd>0</FillForegnd><FillBkgnd>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'...
[truncated message content] |
|
From: <xm...@us...> - 2013-10-30 09:36:09
|
Revision: 1867
http://sourceforge.net/p/scstudio/code/1867
Author: xmalota
Date: 2013-10-30 09:36:06 +0000 (Wed, 30 Oct 2013)
Log Message:
-----------
reconnection of all wrongly connected arrows in HMSC revised, removed bug with condition
Modified Paths:
--------------
trunk/src/view/visio/addon/connectionArrowSnapping.cpp
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
Modified: trunk/src/view/visio/addon/connectionArrowSnapping.cpp
===================================================================
--- trunk/src/view/visio/addon/connectionArrowSnapping.cpp 2013-10-30 00:17:02 UTC (rev 1866)
+++ trunk/src/view/visio/addon/connectionArrowSnapping.cpp 2013-10-30 09:36:06 UTC (rev 1867)
@@ -42,7 +42,7 @@
Visio::IVShapePtr shape = connect->ToSheet;
if(!isHmscShape(shape))
- return false;
+ return false;
TShapeType type = get_shape_type(shape);
@@ -81,7 +81,27 @@
if(type == ST_HMSC_CONNECTION)
{
- return true;
+ if(_tcsicmp(connect->FromCell->Name,_T("BeginX")) == 0)
+ {
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X1")) == 0)
+ return true;
+ }
+ if(_tcsicmp(connect->FromCell->Name,_T("BeginX")) == 0)
+ {
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X2")) == 0)
+ return true;
+ }
+ if(_tcsicmp(connect->FromCell->Name,_T("BeginX")) == 0)
+ {
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X3")) == 0)
+ return true;
+ }
+ if(_tcsicmp(connect->FromCell->Name,_T("EndX")) == 0)
+ {
+ if(_tcsicmp(connect->ToCell->Name,_T("Connections.X4")) == 0)
+ return true;
+ }
+ return false;
}
return false;
@@ -124,6 +144,19 @@
else
return;
}
+
+ if(type == ST_HMSC_CONNECTION)
+ {
+ if(_tcsicmp(from->Name,_T("BeginX")) == 0)
+ {
+ //decide which point is the most appropriate
+ from->GlueTo(to->GetCells("Connections.X1"));
+ }
+ if(_tcsicmp(from->Name,_T("EndX")) == 0)
+ {
+ from->GlueTo(to->GetCells("Connections.X4"));
+ }
+ }
}
void CConnectionArrowSnapping::disconnectShape(Visio::IVShapePtr connectionShape, Visio::IVCellPtr fromCell, Visio::IVShapePtr to)
@@ -171,16 +204,16 @@
Visio::IVConnectsPtr connects = connectionShape->Connects;
Visio::IVCellPtr beginCell = connectionShape->GetCells("BeginX"), endCell = connectionShape->GetCells("EndX");
- for(int i=connects->Count; i>0; --i)
- {
- if(!isCorrectConnected(connectionShape, connects->Item[i]))
- {
- Visio::IVCellPtr from = connects->Item[i]->FromCell;
- Visio::IVShapePtr to = connects->Item[i]->ToSheet;
- disconnectShape(connectionShape, connects->Item[i]->FromCell, connects->Item[i]->ToSheet);
- connectArrowCorretly(from, to);
- }
- }
+ for(int i=connects->Count; i>0; --i)
+ {
+ if(!isCorrectConnected(connectionShape, connects->Item[i]))
+ {
+ Visio::IVCellPtr from = connects->Item[i]->FromCell;
+ Visio::IVShapePtr to = connects->Item[i]->ToSheet;
+ disconnectShape(connectionShape, connects->Item[i]->FromCell, connects->Item[i]->ToSheet);
+ connectArrowCorretly(from, to);
+ }
+ }
}
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-10-30 00:17:02 UTC (rev 1866)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-10-30 09:36:06 UTC (rev 1867)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='CC0AAEEE784F2857CD9A8871856F6ECDA77CB1157377B8BF6C7655B745E113409B669ECDCB64772F5EA2E810F617887D4204F5280DC69E135501A6FC5EB48DD4' start='190' metric='0' DocLangID='1029' buildnum='4518' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>806228390</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-10-23T14:16:45</TimeSaved><TimeEdited>2013-10-23T14:16:12</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1029</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1029</LangID></Char><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout></StyleSheet><StyleSheet ID='6' NameU='Basic' Name='Basic' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign F='Inh'>1</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='7' NameU='Visio 00' Name='Visio 00' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>1</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='HSL(0,0,0)'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='HSL(144,116,225)'>#e8eef7</FillForegnd><FillBkgnd F='HSL(144,106,193)'>#b7c9e3</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='HSL(144,116,125)'>#4979c0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><Char IX='0'><Font F='Inh'>4</Font><Color>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size F='Inh'>0.1666666666666667</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char></StyleSheet><StyleSheet ID='8' NameU='Connector' Name='Connector' LineStyle='9' FillStyle='9' TextStyle='9'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize>1</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize>1</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>0</FillForegnd><FillBkgnd F='Inh'>1</FillBkgnd><FillPattern F='Inh'>1</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin Unit='PT' F='Inh'>0.05555555555555555</TopMargin><BottomMargin Unit='PT' F='Inh'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd>2</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontS...
[truncated message content] |
|
From: <xm...@us...> - 2013-11-20 11:49:48
|
Revision: 1870
http://sourceforge.net/p/scstudio/code/1870
Author: xmalota
Date: 2013-11-20 11:49:44 +0000 (Wed, 20 Nov 2013)
Log Message:
-----------
connection arrow snapping in HMSC implemented, bug with comment removed
Modified Paths:
--------------
trunk/src/view/visio/addon/connectionArrowSnapping.cpp
trunk/src/view/visio/addon/connectionArrowSnapping.h
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
Modified: trunk/src/view/visio/addon/connectionArrowSnapping.cpp
===================================================================
--- trunk/src/view/visio/addon/connectionArrowSnapping.cpp 2013-11-08 16:22:38 UTC (rev 1869)
+++ trunk/src/view/visio/addon/connectionArrowSnapping.cpp 2013-11-20 11:49:44 UTC (rev 1870)
@@ -149,7 +149,6 @@
{
if(_tcsicmp(from->Name,_T("BeginX")) == 0)
{
- //decide which point is the most appropriate
from->GlueTo(to->GetCells("Connections.X1"));
}
if(_tcsicmp(from->Name,_T("EndX")) == 0)
@@ -195,14 +194,94 @@
}
+bool CConnectionArrowSnapping::shouldBeSnapped(double xPosition, double yPosition, Visio::IVShapePtr shapeToSnapped)
+{
+ double pinx, piny, width, height;
+ pinx = CShapeUtils::getShapeCell(shapeToSnapped, "PinX");
+ piny = CShapeUtils::getShapeCell(shapeToSnapped, "PinY");
+ width = CShapeUtils::getShapeCell(shapeToSnapped, "Width");
+ height = CShapeUtils::getShapeCell(shapeToSnapped, "Height");
+
+ if(((pinx-(width/2)) <= xPosition) && (xPosition <= (pinx+(width/2))))
+ {
+ if(((piny-(height/2)) <= yPosition) && (yPosition <= (piny+(height/2))))
+ {
+ return true;
+ }
+ }
+
+ return false;
+}
+
+Visio::IVCellPtr CConnectionArrowSnapping::getProperConnectionPoint(double xPosition, double yPosition, Visio::IVShapePtr shapeToSnapped)
+{
+ if(!shapeToSnapped || get_shape_type(shapeToSnapped) != ST_HMSC_CONNECTION)
+ return NULL;
+
+ double pinx, piny, width;
+ pinx = CShapeUtils::getShapeCell(shapeToSnapped, "PinX");
+ piny = CShapeUtils::getShapeCell(shapeToSnapped, "PinY");
+ width = CShapeUtils::getShapeCell(shapeToSnapped, "Width");
+
+ if(xPosition >= pinx + width/2)
+ return shapeToSnapped->GetCells("Connections.X3");
+ else if(xPosition <= pinx - width/2)
+ return shapeToSnapped->GetCells("Connections.X2");
+ else
+ return shapeToSnapped->GetCells("Connections.X1");
+}
+
void CConnectionArrowSnapping::snap(Visio::IVShapePtr connectionShape)
{
if(!connectionShape)
return;
- //Check if shape is already connected
+ Visio::IVCellPtr beginCell, endCell;
+ beginCell = connectionShape->GetCells("BeginX");
+ endCell = connectionShape->GetCells("EndX");
+
+ double beginCellX, beginCellY;
+ double endCellX, endCellY;
+
+ beginCellX = CShapeUtils::getShapeCell(connectionShape, "BeginX");
+ endCellX = CShapeUtils::getShapeCell(connectionShape, "EndX");
+ beginCellY = CShapeUtils::getShapeCell(connectionShape, "BeginY");
+ endCellY = CShapeUtils::getShapeCell(connectionShape, "EndY");
+
+ Visio::IVShapesPtr shapes;
+ shapes = connectionShape->ContainingPage->GetShapes();
+
+ if((_tcsicmp(beginCell->Name,_T("BeginX")) == 0) || (_tcsicmp(beginCell->Name,_T("EndX")) == 0))
+ {
+ //depends on the type of shape
+ for(int i=1; i<=shapes->Count; i++)
+ {
+ Visio::IVShapePtr shape = shapes->Item[i];
+ if(isHmscShape(shape))
+ {
+ if(shouldBeSnapped(beginCellX, beginCellY, shape))
+ {
+ if(get_shape_type(shape) == ST_HMSC_REFERENCE || get_shape_type(shape) == ST_MSC_CONDITION)
+ beginCell->GlueTo(shape->GetCells("Connections.X2"));
+ else if(get_shape_type(shape) == ST_HMSC_CONNECTION)
+ {
+ Visio::IVCellPtr connectionPoint = getProperConnectionPoint(endCellX, endCellY, shape);
+ if(connectionPoint)
+ beginCell->GlueTo(connectionPoint);
+ //beginCell->GlueTo(shape->GetCells("Connections.X1"));
+ }
+ else
+ beginCell->GlueTo(shape->GetCells("Connections.X1"));
+ }
+ if(shouldBeSnapped(endCellX, endCellY, shape))
+ {
+ endCell->GlueTo(shape->GetCells("Connections.X1"));
+ }
+ }
+ }
+ }
+
Visio::IVConnectsPtr connects = connectionShape->Connects;
- Visio::IVCellPtr beginCell = connectionShape->GetCells("BeginX"), endCell = connectionShape->GetCells("EndX");
for(int i=connects->Count; i>0; --i)
{
Modified: trunk/src/view/visio/addon/connectionArrowSnapping.h
===================================================================
--- trunk/src/view/visio/addon/connectionArrowSnapping.h 2013-11-08 16:22:38 UTC (rev 1869)
+++ trunk/src/view/visio/addon/connectionArrowSnapping.h 2013-11-20 11:49:44 UTC (rev 1870)
@@ -41,6 +41,14 @@
* connect connection arrow correctly to shape
*/
static void connectArrowCorretly(Visio::IVCellPtr from, Visio::IVShapePtr to);
+ /**
+ * check whether connection point occurs in the area of snapable shape
+ */
+ static bool shouldBeSnapped(double xPosition, double yPosition, Visio::IVShapePtr shape);
+ /**
+ * find the best connection point where connection arrow should be connected
+ */
+ static Visio::IVCellPtr getProperConnectionPoint(double xPosition, double yPosition, Visio::IVShapePtr shapeToSnapped);
public:
/**
* automatically snaps current connection shape to nearest HMSC shape
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2013-11-08 16:22:38 UTC (rev 1869)
+++ trunk/src/view/visio/addon/document.cpp 2013-11-20 11:49:44 UTC (rev 1870)
@@ -302,23 +302,28 @@
case ST_BMSC_ORDER_LINE:
case ST_BMSC_ORDER_ARROW:
// orderShape snapping
- posX = CShapeUtils::getShapeCell(vsoShape,"PinX");
+ posX = CShapeUtils::getShapeCell(vsoShape,"PinX");
posY = CShapeUtils::getShapeCell(vsoShape,"PinY");
COrderSnapping::snapToCoregEvents(vsoShape,posX,posY);
- break;
+ break;
case ST_COMMENT:
+ {
+ if(vsoShape->Text.length() == 0)
+ vsoShape->Text = _T("NAME");
+
+ //putting limits on the size of comment
+ Visio::IVCellPtr tmp;
+ tmp = vsoShape->GetCells("Height");
+ tmp->FormulaU = "BOUND(20 mm, 0, FALSE, 0.01 mm, 10000000 mm)";
+ }
+ break;
+
case ST_TEXT:
- {
- if(vsoShape->Text.length() == 0)
- vsoShape->Text = _T("NAME");
-
- //putting limits on the size of comment
- Visio::IVCellPtr tmp;
- tmp = vsoShape->GetCells("Height");
- tmp->FormulaU = "BOUND(20 mm, 0, FALSE, 0.01 mm, 10000000 mm)";
- break;
- }
+ if(vsoShape->Text.length() == 0)
+ vsoShape->Text = _T("NAME");
+ break;
+
case ST_HMSC_REFERENCE:
if(vsoShape->Text.length() == 0)
vsoShape->Text = _T("NAME");
Modified: trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx
===================================================================
--- trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-11-08 16:22:38 UTC (rev 1869)
+++ trunk/src/view/visio/stencils/Sequence Chart Studio/HMSC.vsx 2013-11-20 11:49:44 UTC (rev 1870)
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8' ?>
-<VisioDocument key='D697245E5748EADF20CC9CC84813927D85ED4409401FDBFC4654D14A58BBC41F74C2AA2031422FAF64EBD33D134AD3A404E33035DE8AC38E1AD448A942E6EA85' start='190' metric='0' DocLangID='1029' buildnum='4518' version='12.0' xml:space='preserve' xmlns:vx='http://schemas.microsoft.com/visio/2006/extension' xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension' xmlns='http://schemas.microsoft.com/visio/2003/core'><DocumentProperties><Title>High-Level MSC</Title><Creator>Petr Gotthard</Creator><Company>Brno</Company><BuildNumberCreated>738205665</BuildNumberCreated><BuildNumberEdited>806228390</BuildNumberEdited><CustomProps><CustomProp Name='_VPID_EXTENDED_VDX' PropType='Number'>1</CustomProp></CustomProps><TimeCreated>2008-12-26T17:33:21</TimeCreated><TimeSaved>2013-10-30T10:22:40</TimeSaved><TimeEdited>2013-10-30T10:22:37</TimeEdited><TimePrinted>2008-12-26T17:33:21</TimePrinted></DocumentProperties><DocumentSettings TopPage='0' DefaultTextStyle='3' DefaultLineStyle='3' DefaultFillStyle='3' DefaultGuideStyle='4'><GlueSettings>9</GlueSettings><SnapSettings>65847</SnapSettings><SnapExtensions>34</SnapExtensions><DynamicGridEnabled>0</DynamicGridEnabled><ProtectStyles>0</ProtectStyles><ProtectShapes>0</ProtectShapes><ProtectMasters>0</ProtectMasters><ProtectBkgnds>0</ProtectBkgnds></DocumentSettings><Colors><ColorEntry IX='0' RGB='#000000'/><ColorEntry IX='1' RGB='#FFFFFF'/><ColorEntry IX='2' RGB='#FF0000'/><ColorEntry IX='3' RGB='#00FF00'/><ColorEntry IX='4' RGB='#0000FF'/><ColorEntry IX='5' RGB='#FFFF00'/><ColorEntry IX='6' RGB='#FF00FF'/><ColorEntry IX='7' RGB='#00FFFF'/><ColorEntry IX='8' RGB='#800000'/><ColorEntry IX='9' RGB='#008000'/><ColorEntry IX='10' RGB='#000080'/><ColorEntry IX='11' RGB='#808000'/><ColorEntry IX='12' RGB='#800080'/><ColorEntry IX='13' RGB='#008080'/><ColorEntry IX='14' RGB='#C0C0C0'/><ColorEntry IX='15' RGB='#E6E6E6'/><ColorEntry IX='16' RGB='#CDCDCD'/><ColorEntry IX='17' RGB='#B3B3B3'/><ColorEntry IX='18' RGB='#9A9A9A'/><ColorEntry IX='19' RGB='#808080'/><ColorEntry IX='20' RGB='#666666'/><ColorEntry IX='21' RGB='#4D4D4D'/><ColorEntry IX='22' RGB='#333333'/><ColorEntry IX='23' RGB='#1A1A1A'/><ColorEntry IX='24' RGB='#000000'/><ColorEntry IX='25' RGB='#E8EEF7'/><ColorEntry IX='26' RGB='#B7C9E3'/><ColorEntry IX='27' RGB='#4979C0'/></Colors><FaceNames><FaceName ID='1' Name='Arial Unicode MS' UnicodeRanges='-1 -369098753 63 0' CharSets='1614742015 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='357'/><FaceName ID='2' Name='Symbol' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 5 1 2 1 7 6 2 5 7' Flags='261'/><FaceName ID='3' Name='Wingdings' UnicodeRanges='0 0 0 0' CharSets='-2147483648 0' Panos='5 0 0 0 0 0 0 0 0 0' Flags='261'/><FaceName ID='4' Name='Arial' UnicodeRanges='-536859905 -1073711037 9 0' CharSets='1073742335 -65536' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='5' Name='SimSun' UnicodeRanges='3 680460288 6 0' CharSets='262145 0' Panos='2 1 6 0 3 1 1 1 1 1' Flags='421'/><FaceName ID='6' Name='PMingLiU' UnicodeRanges='-1610611969 684719354 22 0' CharSets='1048577 0' Panos='2 2 5 0 0 0 0 0 0 0' Flags='421'/><FaceName ID='7' Name='MS PGothic' UnicodeRanges='-536870145 1791491579 18 0' CharSets='1073873055 -539557888' Panos='2 11 6 0 7 2 5 8 2 4' Flags='421'/><FaceName ID='8' Name='Dotum' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='9' Name='Sylfaen' UnicodeRanges='67110535 0 0 0' CharSets='536871071 0' Panos='1 10 5 2 5 3 6 3 3 3' Flags='325'/><FaceName ID='10' Name='Estrangelo Edessa' UnicodeRanges='-2147475389 0 128 0' CharSets='1 0' Panos='3 8 6 0 0 0 0 0 0 0' Flags='325'/><FaceName ID='11' Name='Vrinda' UnicodeRanges='65539 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='12' Name='Shruti' UnicodeRanges='262147 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='13' Name='Mangal' UnicodeRanges='32771 0 0 0' CharSets='1 0' Panos='2 4 5 3 5 2 3 3 2 2' Flags='325'/><FaceName ID='14' Name='Tunga' UnicodeRanges='4194307 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='15' Name='Sendnya' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='16' Name='Raavi' UnicodeRanges='131075 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='17' Name='Dhenu' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='18' Name='Latha' UnicodeRanges='1048579 0 0 0' CharSets='1 0' Panos='2 11 6 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='19' Name='Gautami' UnicodeRanges='2097155 0 0 0' CharSets='1 0' Panos='2 11 5 2 4 2 4 2 2 3' Flags='325'/><FaceName ID='20' Name='Cordia New' UnicodeRanges='-2130706429 0 0 0' CharSets='65537 0' Panos='2 11 3 4 2 2 2 2 2 4' Flags='325'/><FaceName ID='21' Name='MS Farsi' UnicodeRanges='-520082689 -1073741822 8 0' CharSets='536936959 539492352' Panos='2 11 6 4 2 2 2 2 2 4' Flags='327'/><FaceName ID='22' Name='Gulim' UnicodeRanges='-1342176593 1775729915 48 0' CharSets='1074266271 -539557888' Panos='2 11 6 0 0 1 1 1 1 1' Flags='421'/><FaceName ID='23' Name='Times New Roman' UnicodeRanges='-536859905 -1073711039 9 0' CharSets='1073742335 -65536' Panos='2 2 6 3 5 4 5 2 3 4' Flags='325'/></FaceNames><StyleSheets><StyleSheet ID='0' NameU='No Style' Name='No Style'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.01</LineWeight><LineColor>0</LineColor><LinePattern>1</LinePattern><Rounding>0</Rounding><EndArrowSize>2</EndArrowSize><BeginArrow>0</BeginArrow><EndArrow>0</EndArrow><LineCap>0</LineCap><BeginArrowSize>2</BeginArrowSize><LineColorTrans>0</LineColorTrans></Line><Fill><FillForegnd>1</FillForegnd><FillBkgnd>0</FillBkgnd><FillPattern>1</FillPattern><ShdwForegnd>0</ShdwForegnd><ShdwBkgnd>1</ShdwBkgnd><ShdwPattern>0</ShdwPattern><FillForegndTrans>0</FillForegndTrans><FillBkgndTrans>0</FillBkgndTrans><ShdwForegndTrans>0</ShdwForegndTrans><ShdwBkgndTrans>0</ShdwBkgndTrans><ShapeShdwType>0</ShapeShdwType><ShapeShdwOffsetX>0</ShapeShdwOffsetX><ShapeShdwOffsetY>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>1</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop>0.5</DefaultTabStop><TextDirection>0</TextDirection><TextBkgndTrans>0</TextBkgndTrans></TextBlock><Protection><LockWidth>0</LockWidth><LockHeight>0</LockHeight><LockMoveX>0</LockMoveX><LockMoveY>0</LockMoveY><LockAspect>0</LockAspect><LockDelete>0</LockDelete><LockBegin>0</LockBegin><LockEnd>0</LockEnd><LockRotate>0</LockRotate><LockCrop>0</LockCrop><LockVtxEdit>0</LockVtxEdit><LockTextEdit>0</LockTextEdit><LockFormat>0</LockFormat><LockGroup>0</LockGroup><LockCalcWH>0</LockCalcWH><LockSelect>0</LockSelect><LockCustProp>0</LockCustProp></Protection><vx:Protection xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:LockFromGroupFormat>0</vx:LockFromGroupFormat><vx:LockThemeColors>0</vx:LockThemeColors><vx:LockThemeEffects>0</vx:LockThemeEffects></vx:Protection><Misc><NoObjHandles>0</NoObjHandles><NonPrinting>0</NonPrinting><NoCtlHandles>0</NoCtlHandles><NoAlignBox>0</NoAlignBox><UpdateAlignBox>0</UpdateAlignBox><HideText>0</HideText><DynFeedback>0</DynFeedback><GlueType>0</GlueType><WalkPreference>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType>0</ObjType><Comment V='null'/><IsDropSource>0</IsDropSource><NoLiveDynamics>0</NoLiveDynamics><LocalizeMerge>0</LocalizeMerge><Calendar>0</Calendar><LangID>1029</LangID><ShapeKeywords V='null'/><DropOnPageScale>1</DropOnPageScale></Misc><Event><TheData F='No Formula'>0</TheData><TheText F='No Formula'>0</TheText><EventDblClick F='No Formula'>0</EventDblClick><EventXFMod F='No Formula'>0</EventXFMod><EventDrop F='No Formula'>0</EventDrop></Event><vx:Event xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:EventMultiDrop F='No Formula'>0</vx:EventMultiDrop></vx:Event><Help><HelpTopic V='null'/><Copyright V='null'/></Help><LayerMem><LayerMember V='null'/></LayerMem><RulerGrid><XRulerDensity>32</XRulerDensity><YRulerDensity>32</YRulerDensity><XRulerOrigin>0</XRulerOrigin><YRulerOrigin>0</YRulerOrigin><XGridDensity>8</XGridDensity><YGridDensity>8</YGridDensity><XGridSpacing>0</XGridSpacing><YGridSpacing>0</YGridSpacing><XGridOrigin>0</XGridOrigin><YGridOrigin>0</YGridOrigin></RulerGrid><Image><Gamma>1</Gamma><Contrast>0.5</Contrast><Brightness>0.5</Brightness><Sharpen>0</Sharpen><Blur>0</Blur><Denoise>0</Denoise><Transparency>0</Transparency></Image><Group><SelectMode>1</SelectMode><DisplayMode>2</DisplayMode><IsDropTarget>0</IsDropTarget><IsSnapTarget>1</IsSnapTarget><IsTextEditTarget>1</IsTextEditTarget><DontMoveChildren>0</DontMoveChildren></Group><Layout><ShapePermeableX>0</ShapePermeableX><ShapePermeableY>0</ShapePermeableY><ShapePermeablePlace>0</ShapePermeablePlace><ShapeFixedCode>0</ShapeFixedCode><ShapePlowCode>0</ShapePlowCode><ShapeRouteStyle>0</ShapeRouteStyle><ConFixedCode>0</ConFixedCode><ConLineJumpCode>0</ConLineJumpCode><ConLineJumpStyle>0</ConLineJumpStyle><ConLineJumpDirX>0</ConLineJumpDirX><ConLineJumpDirY>0</ConLineJumpDirY><ShapePlaceFlip>0</ShapePlaceFlip><ConLineRouteExt>0</ConLineRouteExt><ShapeSplit>0</ShapeSplit><ShapeSplittable>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle>0</vx:ShapePlaceStyle></vx:Layout><PageLayout><ResizePage>0</ResizePage><EnableGrid>0</EnableGrid><DynamicsOff>0</DynamicsOff><CtrlAsInput>0</CtrlAsInput><PlaceStyle>0</PlaceStyle><RouteStyle>0</RouteStyle><PlaceDepth>0</PlaceDepth><PlowCode>0</PlowCode><LineJumpCode>1</LineJumpCode><LineJumpStyle>0</LineJumpStyle><PageLineJumpDirX>0</PageLineJumpDirX><PageLineJumpDirY>0</PageLineJumpDirY><LineToNodeX>0.125</LineToNodeX><LineToNodeY>0.125</LineToNodeY><BlockSizeX>0.25</BlockSizeX><BlockSizeY>0.25</BlockSizeY><AvenueSizeX>0.375</AvenueSizeX><AvenueSizeY>0.375</AvenueSizeY><LineToLineX>0.125</LineToLineX><LineToLineY>0.125</LineToLineY><LineJumpFactorX>0.66666666666667</LineJumpFactorX><LineJumpFactorY>0.66666666666667</LineJumpFactorY><LineAdjustFrom>0</LineAdjustFrom><LineAdjustTo>0</LineAdjustTo><PlaceFlip>0</PlaceFlip><LineRouteExt>0</LineRouteExt><PageShapeSplit>0</PageShapeSplit></PageLayout><PrintProps><PageLeftMargin>0.25</PageLeftMargin><PageRightMargin>0.25</PageRightMargin><PageTopMargin>0.25</PageTopMargin><PageBottomMargin>0.25</PageBottomMargin><ScaleX>1</ScaleX><ScaleY>1</ScaleY><PagesX>1</PagesX><PagesY>1</PagesY><CenterX>0</CenterX><CenterY>0</CenterY><OnPage>0</OnPage><PrintGrid>0</PrintGrid><PrintPageOrientation>1</PrintPageOrientation><PaperKind>1</PaperKind><PaperSource>7</PaperSource></PrintProps><PageProps><PageWidth Unit='NUM' F='No Formula'>0</PageWidth><PageHeight Unit='NUM' F='No Formula'>0</PageHeight><ShdwOffsetX Unit='NUM' F='No Formula'>0</ShdwOffsetX><ShdwOffsetY Unit='NUM' F='No Formula'>0</ShdwOffsetY><PageScale F='No Formula'>0</PageScale><DrawingScale F='No Formula'>0</DrawingScale><DrawingSizeType F='No Formula'>0</DrawingSizeType><DrawingScaleType F='No Formula'>0</DrawingScaleType><InhibitSnap F='No Formula'>0</InhibitSnap><UIVisibility F='No Formula'>0</UIVisibility><ShdwType F='No Formula'>0</ShdwType><ShdwObliqueAngle Unit='NUM' F='No Formula'>0</ShdwObliqueAngle><ShdwScaleFactor F='No Formula'>0</ShdwScaleFactor></PageProps><Char IX='0'><Font>4</Font><Color>0</Color><Style>0</Style><Case>0</Case><Pos>0</Pos><FontScale>1</FontScale><Size>0.1666666666666667</Size><DblUnderline>0</DblUnderline><Overline>0</Overline><Strikethru>0</Strikethru><Highlight>0</Highlight><DoubleStrikethrough>0</DoubleStrikethrough><RTLText>0</RTLText><UseVertical>0</UseVertical><Letterspace>0</Letterspace><ColorTrans>0</ColorTrans><AsianFont>0</AsianFont><ComplexScriptFont>0</ComplexScriptFont><LocalizeFont>0</LocalizeFont><ComplexScriptSize>-1</ComplexScriptSize><LangID>1029</LangID></Char><Para IX='0'><IndFirst>0</IndFirst><IndLeft>0</IndLeft><IndRight>0</IndRight><SpLine>-1.2</SpLine><SpBefore>0</SpBefore><SpAfter>0</SpAfter><HorzAlign>1</HorzAlign><Bullet>0</Bullet><BulletStr V='null'/><BulletFont>0</BulletFont><LocalizeBulletFont>0</LocalizeBulletFont><BulletFontSize>-1</BulletFontSize><TextPosAfterBullet>0</TextPosAfterBullet><Flags>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='1' NameU='Text Only' Name='Text Only' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin>0</LeftMargin><RightMargin>0</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>0</VerticalAlign><TextBkgnd>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign>0</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para></StyleSheet><StyleSheet ID='2' NameU='None' Name='None' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight F='Inh'>0.01</LineWeight><LineColor F='Inh'>0</LineColor><LinePattern>0</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill></StyleSheet><StyleSheet ID='3' NameU='Normal' Name='Normal' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock></StyleSheet><StyleSheet ID='4' NameU='Guide' Name='Guide' LineStyle='3' FillStyle='3' TextStyle='3'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight Unit='PT'>0</LineWeight><LineColor>4</LineColor><LinePattern>23</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><Fill><FillForegnd F='Inh'>1</FillForegnd><FillBkgnd F='Inh'>0</FillBkgnd><FillPattern>0</FillPattern><ShdwForegnd F='Inh'>0</ShdwForegnd><ShdwBkgnd F='Inh'>1</ShdwBkgnd><ShdwPattern F='Inh'>0</ShdwPattern><FillForegndTrans F='Inh'>0</FillForegndTrans><FillBkgndTrans F='Inh'>0</FillBkgndTrans><ShdwForegndTrans F='Inh'>0</ShdwForegndTrans><ShdwBkgndTrans F='Inh'>0</ShdwBkgndTrans><ShapeShdwType F='Inh'>0</ShapeShdwType><ShapeShdwOffsetX F='Inh'>0</ShapeShdwOffsetX><ShapeShdwOffsetY F='Inh'>0</ShapeShdwOffsetY><ShapeShdwObliqueAngle F='Inh'>0</ShapeShdwObliqueAngle><ShapeShdwScaleFactor F='Inh'>1</ShapeShdwScaleFactor></Fill><TextBlock><LeftMargin Unit='PT' F='Inh'>0.05555555555555555</LeftMargin><RightMargin Unit='PT' F='Inh'>0.05555555555555555</RightMargin><TopMargin>0</TopMargin><BottomMargin>0</BottomMargin><VerticalAlign>2</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Misc><NoObjHandles F='Inh'>0</NoObjHandles><NonPrinting>1</NonPrinting><NoCtlHandles F='Inh'>0</NoCtlHandles><NoAlignBox F='Inh'>0</NoAlignBox><UpdateAlignBox F='Inh'>0</UpdateAlignBox><HideText F='Inh'>0</HideText><DynFeedback F='Inh'>0</DynFeedback><GlueType F='Inh'>0</GlueType><WalkPreference F='Inh'>0</WalkPreference><BegTrigger F='No Formula'>0</BegTrigger><EndTrigger F='No Formula'>0</EndTrigger><ObjType F='Inh'>0</ObjType><Comment F='Inh'/><IsDropSource F='Inh'>0</IsDropSource><NoLiveDynamics F='Inh'>0</NoLiveDynamics><LocalizeMerge F='Inh'>0</LocalizeMerge><Calendar F='Inh'>0</Calendar><LangID F='Inh'>1029</LangID><ShapeKeywords F='Inh'/><DropOnPageScale F='Inh'>1</DropOnPageScale></Misc><Layout><ShapePermeableX>1</ShapePermeableX><ShapePermeableY>1</ShapePermeableY><ShapePermeablePlace>1</ShapePermeablePlace><ShapeFixedCode F='Inh'>0</ShapeFixedCode><ShapePlowCode F='Inh'>0</ShapePlowCode><ShapeRouteStyle F='Inh'>0</ShapeRouteStyle><ConFixedCode F='Inh'>0</ConFixedCode><ConLineJumpCode F='Inh'>0</ConLineJumpCode><ConLineJumpStyle F='Inh'>0</ConLineJumpStyle><ConLineJumpDirX F='Inh'>0</ConLineJumpDirX><ConLineJumpDirY F='Inh'>0</ConLineJumpDirY><ShapePlaceFlip F='Inh'>0</ShapePlaceFlip><ConLineRouteExt F='Inh'>0</ConLineRouteExt><ShapeSplit F='Inh'>0</ShapeSplit><ShapeSplittable F='Inh'>0</ShapeSplittable></Layout><vx:Layout xmlns:vx='http://schemas.microsoft.com/visio/2006/extension'><vx:ShapePlaceStyle F='Inh'>0</vx:ShapePlaceStyle></vx:Layout><Char IX='0'><Font F='Inh'>4</Font><Color>4</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size>0.125</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID F='Inh'>1029</LangID></Char><v14:Layout xmlns:v14='http://schemas.microsoft.com/office/visio/2010/extension'><v14:Relationships F='Inh'>0</v14:Relationships><v14:DisplayLevel F='Inh'>0</v14:DisplayLevel></v14:Layout></StyleSheet><StyleSheet ID='6' NameU='Basic' Name='Basic' LineStyle='7' FillStyle='7' TextStyle='7'><StyleProp><EnableLineProps>1</EnableLineProps><EnableFillProps>1</EnableFillProps><EnableTextProps>1</EnableTextProps><HideForApply>0</HideForApply></StyleProp><Line><LineWeight>0.003333333333333334</LineWeight><LineColor F='Inh'>#000000</LineColor><LinePattern F='Inh'>1</LinePattern><Rounding F='Inh'>0</Rounding><EndArrowSize F='Inh'>2</EndArrowSize><BeginArrow F='Inh'>0</BeginArrow><EndArrow F='Inh'>0</EndArrow><LineCap F='Inh'>0</LineCap><BeginArrowSize F='Inh'>2</BeginArrowSize><LineColorTrans F='Inh'>0</LineColorTrans></Line><TextBlock><LeftMargin Unit='PT'>0.05555555555555555</LeftMargin><RightMargin Unit='PT'>0.05555555555555555</RightMargin><TopMargin Unit='PT'>0.05555555555555555</TopMargin><BottomMargin Unit='PT'>0.05555555555555555</BottomMargin><VerticalAlign F='Inh'>1</VerticalAlign><TextBkgnd F='Inh'>0</TextBkgnd><DefaultTabStop F='Inh'>0.5</DefaultTabStop><TextDirection F='Inh'>0</TextDirection><TextBkgndTrans F='Inh'>0</TextBkgndTrans></TextBlock><Char IX='0'><Font F='Inh'>4</Font><Color F='Inh'>0</Color><Style F='Inh'>0</Style><Case F='Inh'>0</Case><Pos F='Inh'>0</Pos><FontScale F='Inh'>1</FontScale><Size Unit='PT'>0.1111111111111111</Size><DblUnderline F='Inh'>0</DblUnderline><Overline F='Inh'>0</Overline><Strikethru F='Inh'>0</Strikethru><Highlight F='Inh'>0</Highlight><DoubleStrikethrough F='Inh'>0</DoubleStrikethrough><RTLText F='Inh'>0</RTLText><UseVertical F='Inh'>0</UseVertical><Letterspace F='Inh'>0</Letterspace><ColorTrans F='Inh'>0</ColorTrans><AsianFont F='Inh'>0</AsianFont><ComplexScriptFont F='Inh'>0</ComplexScriptFont><LocalizeFont F='Inh'>0</LocalizeFont><ComplexScriptSize F='Inh'>-1</ComplexScriptSize><LangID>1033</LangID></Char><Para IX='0'><IndFirst F='Inh'>0</IndFirst><IndLeft F='Inh'>0</IndLeft><IndRight F='Inh'>0</IndRight><SpLine F='Inh'>-1.2</SpLine><SpBefore F='Inh'>0</SpBefore><SpAfter F='Inh'>0</SpAfter><HorzAlign F='Inh'>1</HorzAlign><Bullet F='Inh'>0</Bullet><BulletStr F='Inh'/><BulletFont F='Inh'>0</BulletFont><LocalizeBulletFont F='Inh'>0</LocalizeBulletFont><BulletFontSize F='Inh'>-1</BulletFontSize><TextPosAfterBullet F='Inh'>0</TextPosAfterBullet><Flags F='Inh'>0</Flags></Para><Tabs IX='0'/></StyleSheet><StyleSheet ID='7' NameU='Visio 00' Name='Visio 00' LineStyle='0' FillStyle='0' TextStyle='0'><StyleProp><EnableLineProps>1</EnableLineP...
[truncated message content] |
|
From: <xf...@us...> - 2013-11-26 14:27:09
|
Revision: 1873
http://sourceforge.net/p/scstudio/code/1873
Author: xfarmad
Date: 2013-11-26 14:27:03 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
--- developing under Visual studio 2010
Modified Paths:
--------------
trunk/src/view/visio/scstudio.nsi
trunk/src/view/visio/scstudio.sln
Modified: trunk/src/view/visio/scstudio.nsi
===================================================================
--- trunk/src/view/visio/scstudio.nsi 2013-11-26 14:24:58 UTC (rev 1872)
+++ trunk/src/view/visio/scstudio.nsi 2013-11-26 14:27:03 UTC (rev 1873)
@@ -211,7 +211,7 @@
SetOutPath $INSTDIR\bin
File "addon\${BUILD_TYPE}\scstudio.vsl"
- File "addon\${BUILD_TYPE}\scstudio.vsl.intermediate.manifest"
+ File "addon\${BUILD_TYPE}\scstudio.dll.intermediate.manifest"
;File "addon\Release\scstudio.vsl.intermediate.manifest"
;File "..\..\..\doc\help\scstudio.chm"
File "..\..\..\${BUILD_TYPE}\*.dll"
Modified: trunk/src/view/visio/scstudio.sln
===================================================================
--- trunk/src/view/visio/scstudio.sln 2013-11-26 14:24:58 UTC (rev 1872)
+++ trunk/src/view/visio/scstudio.sln 2013-11-26 14:27:03 UTC (rev 1873)
@@ -1,9 +1,9 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scstudio", "addon\scstudio.vcproj", "{0E00282C-F48B-4984-A274-5B59E1E2AD49}"
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "scstudio", "addon\scstudio.vcxproj", "{0E00282C-F48B-4984-A274-5B59E1E2AD49}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setup-nsis", "setup-nsis\setup-nsis.vcproj", "{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "setup-nsis", "setup-nsis\setup-nsis.vcxproj", "{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <xf...@us...> - 2014-01-04 19:21:30
|
Revision: 1879
http://sourceforge.net/p/scstudio/code/1879
Author: xfarmad
Date: 2014-01-04 19:21:28 +0000 (Sat, 04 Jan 2014)
Log Message:
-----------
VS2010 project files for add-on compilation
Added Paths:
-----------
trunk/src/view/visio/addon/scstudio.vcxproj
trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj
Added: trunk/src/view/visio/addon/scstudio.vcxproj
===================================================================
--- trunk/src/view/visio/addon/scstudio.vcxproj (rev 0)
+++ trunk/src/view/visio/addon/scstudio.vcxproj 2014-01-04 19:21:28 UTC (rev 1879)
@@ -0,0 +1,305 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Template|Win32">
+ <Configuration>Template</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{0E00282C-F48B-4984-A274-5B59E1E2AD49}</ProjectGuid>
+ <RootNamespace>scstudio</RootNamespace>
+ <Keyword>AtlProj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfAtl>Dynamic</UseOfAtl>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfAtl>Dynamic</UseOfAtl>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+ <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</IgnoreImportLibrary>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PostBuildEventUseInBuild>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+ <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <PostBuildEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</PostBuildEventUseInBuild>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(VISIOSDK_ROOT)\Libraries\TypeLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <MkTypLibCompatible>false</MkTypLibCompatible>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <GenerateStublessProxies>true</GenerateStublessProxies>
+ <TypeLibraryName>$(IntDir)scstudio.tlb</TypeLibraryName>
+ <HeaderFileName>scstudio.h</HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ <InterfaceIdentifierFileName>scstudio_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName>scstudio_p.c</ProxyFileName>
+ <ValidateAllParameters>false</ValidateAllParameters>
+ </Midl>
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\src;..\..\..\..\third-party-sw\boost;$(VISIOSDK_ROOT)\Libraries\CPP\Include;$(VISIOSDK_ROOT)\Libraries\CPP\Source;$(VISIOSDK_ROOT)\Libraries\TypeLib;..\..\..\..\third-party-sw\wtl\include;..\..\..\..\third-party-sw\simpleopt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0500;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_DEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>version.lib;scmsc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).vsl</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\..\$(OutDir);..\..\..\..\third-party-sw\boost\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>.\dllmodule.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <PostBuildEvent>
+ <Message>Signing code...</Message>
+ <Command>signtool sign /a $(OutDir)$(ProjectName).vsl</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <Midl>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(VISIOSDK_ROOT)\Libraries\TypeLib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <MkTypLibCompatible>false</MkTypLibCompatible>
+ <TargetEnvironment>Win32</TargetEnvironment>
+ <GenerateStublessProxies>true</GenerateStublessProxies>
+ <TypeLibraryName>$(IntDir)scstudio.tlb</TypeLibraryName>
+ <HeaderFileName>scstudio.h</HeaderFileName>
+ <DllDataFileName>
+ </DllDataFileName>
+ <InterfaceIdentifierFileName>scstudio_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName>scstudio_p.c</ProxyFileName>
+ <ValidateAllParameters>false</ValidateAllParameters>
+ </Midl>
+ <ClCompile>
+ <Optimization>MaxSpeed</Optimization>
+ <AdditionalIncludeDirectories>..\..\..\..\src;..\..\..\..\third-party-sw\boost;$(VISIOSDK_ROOT)\Libraries\CPP\Include;$(VISIOSDK_ROOT)\Libraries\CPP\Source;$(VISIOSDK_ROOT)\Libraries\TypeLib;..\..\..\..\third-party-sw\wtl\include;..\..\..\..\third-party-sw\simpleopt;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_WIN32_WINNT=0x0500;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;NDEBUG;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <RuntimeTypeInfo>true</RuntimeTypeInfo>
+ <PrecompiledHeader>
+ </PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <ResourceCompile>
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <Culture>0x0409</Culture>
+ <AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ResourceCompile>
+ <Link>
+ <AdditionalDependencies>version.lib;scmsc.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <OutputFile>$(OutDir)$(ProjectName).vsl</OutputFile>
+ <AdditionalLibraryDirectories>..\..\..\..\$(OutDir);..\..\..\..\third-party-sw\boost\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <ModuleDefinitionFile>.\dllmodule.def</ModuleDefinitionFile>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Windows</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ <PostBuildEvent>
+ <Message>Signing code...</Message>
+ <Command>signtool sign /a $(OutDir)$(ProjectName).vsl</Command>
+ </PostBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="aboutdlg.h" />
+ <ClInclude Include="addon.h" />
+ <ClInclude Include="connectionArrowSnapping.h" />
+ <ClInclude Include="dllmodule.h" />
+ <ClInclude Include="document.h" />
+ <ClInclude Include="enums.h" />
+ <ClInclude Include="errors.h" />
+ <ClInclude Include="extract.h" />
+ <ClInclude Include="messageJump.h" />
+ <ClInclude Include="messageSnapping.h" />
+ <ClInclude Include="numberEditBox.h" />
+ <ClInclude Include="orderSnapping.h" />
+ <ClInclude Include="registryManager.h" />
+ <ClInclude Include="reportmessage.h" />
+ <ClInclude Include="reportview.h" />
+ <ClInclude Include="resource.h" />
+ <ClInclude Include="settingsDialog.h" />
+ <ClInclude Include="stdafx.h" />
+ <ClInclude Include="beautifySettingADlg.h" />
+ <ClInclude Include="beautifySettingGDlg.h" />
+ <ClInclude Include="beautifySettingTimesDlg.h" />
+ <ClInclude Include="beautifySettingWidthsDlg.h" />
+ <ClInclude Include="enumerationDlg.h" />
+ <ClInclude Include="finddlg.h" />
+ <ClInclude Include="instancesfielddlg.h" />
+ <ClInclude Include="messagesequencedlg.h" />
+ <ClInclude Include="numberingGlobalDlg.h" />
+ <ClInclude Include="optionsdlg.h" />
+ <ClInclude Include="pcapSettingADlg.h" />
+ <ClInclude Include="pcapSettingAggregDlg.h" />
+ <ClInclude Include="pcapSettingGDlg.h" />
+ <ClInclude Include="pcapSettingViewDlg.h" />
+ <ClInclude Include="protectionGlobalDlg.h" />
+ <ClInclude Include="settingsDlg.h" />
+ <ClInclude Include="simulatordlg.h" />
+ <ClInclude Include="snapGlobalDlg.h" />
+ <ClInclude Include="dirent.h" />
+ <ClInclude Include="enumerateUtils.h" />
+ <ClInclude Include="pageutils.h" />
+ <ClInclude Include="shapeutils.h" />
+ <ClInclude Include="timeSnapping.h" />
+ <ClInclude Include="visualize.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="addon.cpp" />
+ <ClCompile Include="connectionArrowSnapping.cpp" />
+ <ClCompile Include="dllmodule.cpp" />
+ <ClCompile Include="document.cpp" />
+ <ClCompile Include="document_check.cpp" />
+ <ClCompile Include="document_simulation.cpp" />
+ <ClCompile Include="errors.cpp" />
+ <ClCompile Include="extract.cpp" />
+ <ClCompile Include="messageJump.cpp" />
+ <ClCompile Include="messageSnapping.cpp" />
+ <ClCompile Include="orderSnapping.cpp" />
+ <ClCompile Include="registryManager.cpp" />
+ <ClCompile Include="reportmessage.cpp" />
+ <ClCompile Include="reportview.cpp" />
+ <ClCompile Include="stdafx.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="timeSnapping.cpp" />
+ <ClCompile Include="visualize.cpp" />
+ <ClCompile Include="beautifySettingADlg.cpp" />
+ <ClCompile Include="beautifySettingGDlg.cpp" />
+ <ClCompile Include="beautifySettingTimesDlg.cpp" />
+ <ClCompile Include="beautifySettingWidthsDlg.cpp" />
+ <ClCompile Include="enumerationDlg.cpp" />
+ <ClCompile Include="finddlg.cpp" />
+ <ClCompile Include="instancesfielddlg.cpp" />
+ <ClCompile Include="messagesequencedlg.cpp" />
+ <ClCompile Include="numberingGlobalDlg.cpp" />
+ <ClCompile Include="optionsdlg.cpp" />
+ <ClCompile Include="pcapSettingADlg.cpp" />
+ <ClCompile Include="pcapSettingAggregDlg.cpp" />
+ <ClCompile Include="pcapSettingGDlg.cpp" />
+ <ClCompile Include="pcapSettingViewDlg.cpp" />
+ <ClCompile Include="protectionGlobalDlg.cpp" />
+ <ClCompile Include="settingsDlg.cpp" />
+ <ClCompile Include="simulatordlg.cpp" />
+ <ClCompile Include="snapGlobalDlg.cpp" />
+ <ClCompile Include="enumerateUtils.cpp" />
+ <ClCompile Include="pageutils.cpp" />
+ <ClCompile Include="shapeutils.cpp" />
+ <ClCompile Include="eventsink_i.c" />
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="dllmodule.def" />
+ <None Include="abs_times.bmp" />
+ <None Include="dllmodule.rgs" />
+ <None Include="icon_add_instances.ico" />
+ <None Include="icon_beautify.ico" />
+ <None Include="icon_check.ico" />
+ <None Include="icon_findflow.ico" />
+ <None Include="icon_jump_left_messages.ico" />
+ <None Include="icon_jump_left_messages_copy.ico" />
+ <None Include="icon_jump_right_messages.ico" />
+ <None Include="icon_jump_right_messages_copy.ico" />
+ <None Include="icon_message_enumeration.ico" />
+ <None Include="icon_message_enumeration_disable.ico" />
+ <None Include="icon_message_select_group.ico" />
+ <None Include="icon_message_sequence.ico" />
+ <None Include="icon_reverse_message.ico" />
+ <None Include="icon_select_add_instances.ico" />
+ <None Include="icon_select_add_messages.ico" />
+ <None Include="icon_select_instances.ico" />
+ <None Include="icon_select_messages.ico" />
+ <None Include="icon_simulation_start.ico" />
+ <None Include="icon_simulation_stop.ico" />
+ <None Include="icon_tighten_time.ico" />
+ <None Include="instance.bmp" />
+ <None Include="intervals.bmp" />
+ <None Include="..\..\..\..\..\..\bitmaps\intervals.bmp" />
+ <None Include="spacing .bmp" />
+ </ItemGroup>
+ <ItemGroup>
+ <Midl Include="eventsink.idl">
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">eventsink.h</HeaderFileName>
+ <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">eventsink_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">eventsink_p.c</ProxyFileName>
+ <HeaderFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">eventsink.h</HeaderFileName>
+ <InterfaceIdentifierFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">eventsink_i.c</InterfaceIdentifierFileName>
+ <ProxyFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">eventsink_p.c</ProxyFileName>
+ </Midl>
+ </ItemGroup>
+ <ItemGroup>
+ <ResourceCompile Include="dllmodule.rc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+ <ProjectExtensions>
+ <VisualStudio>
+ <UserProperties RESOURCE_FILE="dllmodule.rc" />
+ </VisualStudio>
+ </ProjectExtensions>
+</Project>
\ No newline at end of file
Added: trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj
===================================================================
--- trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj (rev 0)
+++ trunk/src/view/visio/setup-nsis/setup-nsis.vcxproj 2014-01-04 19:21:28 UTC (rev 1879)
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{77848F6B-EA64-4917-8E72-21FA1DD2B2F6}</ProjectGuid>
+ <RootNamespace>setup-nsis</RootNamespace>
+ <Keyword>Win32Proj</Keyword>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <UseOfMfc>Dynamic</UseOfMfc>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
+ <CharacterSet>NotSet</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+ <Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros" />
+ <PropertyGroup>
+ <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+ <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
+ <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
+ <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
+ <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <Optimization>Disabled</Optimization>
+ <AdditionalIncludeDirectories>C:\Program Files\Microsoft Platform SDK for Windows XP SP2\Bin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <MinimalRebuild>true</MinimalRebuild>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)nsis.dll</OutputFile>
+ <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <ProgramDatabaseFile>$(OutDir)nsis.pdb</ProgramDatabaseFile>
+ <SubSystem>Console</SubSystem>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <AdditionalIncludeDirectories>C:\Program Files\Microsoft Platform SDK for Windows XP SP2\Bin;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <OutputFile>$(OutDir)nsis.dll</OutputFile>
+ <IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <RandomizedBaseAddress>false</RandomizedBaseAddress>
+ <DataExecutionPrevention>
+ </DataExecutionPrevention>
+ <TargetMachine>MachineX86</TargetMachine>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="certificates.cpp" />
+ <ClCompile Include="filefix.cpp" />
+ <ClCompile Include="pluginapi.c">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ </PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ </PrecompiledHeader>
+ </ClCompile>
+ <ClCompile Include="stdafx.cpp">
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+ <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="stdafx.h" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <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.
|
Thanks for helping keep SourceForge clean.
X