Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[825] trunk/src/view/visio/addon
|
From: <mbe...@us...> - 2010-07-04 14:03:06
|
Revision: 825
http://scstudio.svn.sourceforge.net/scstudio/?rev=825&view=rev
Author: mbezdeka
Date: 2010-07-04 14:02:59 +0000 (Sun, 04 Jul 2010)
Log Message:
-----------
added missing file properties (Id)
message numbering - added functionality to global settings dialog
Modified Paths:
--------------
trunk/src/view/visio/addon/document.cpp
trunk/src/view/visio/addon/enumerateUtils.cpp
trunk/src/view/visio/addon/enumerateUtils.h
trunk/src/view/visio/addon/globalSettingsDlg.cpp
trunk/src/view/visio/addon/globalSettingsDlg.h
trunk/src/view/visio/addon/numberingGlobalDlg.cpp
trunk/src/view/visio/addon/numberingGlobalDlg.h
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2010-07-03 21:04:32 UTC (rev 824)
+++ trunk/src/view/visio/addon/document.cpp 2010-07-04 14:02:59 UTC (rev 825)
@@ -1477,50 +1477,36 @@
void CDocumentMonitor::autoEnumerate(Visio::IVShapePtr msgShape)
{
+ const TCHAR* regFolder = _T("Software\\Sequence Chart Studio\\MessageNumbering");
Visio::IVSelectionPtr selection = m_vsoApp->ActiveWindow->Selection;
if(selection->Count == 1 && _tcsicmp(msgShape->Data1,_T("")) == 0)
{
- //MessageBox(GetActiveWindow(),_T("No selection"),_T(""),MB_OK);
- }
- else
- {
- std::set<_bstr_t> groups;
- //Collect all groups in current selection
- for(int i=1; i<=selection->Count; i++)
- {
- Visio::IVShapePtr shape = selection->Item[i];
- if(isMessageShape(shape) && (_tcsicmp(shape->Data3,_T("")) != 0))
- groups.insert(shape->Data3);
- }
- //Re-number groups
- for(std::set<_bstr_t>::iterator it = groups.begin(); it != groups.end(); it++)
- drawNumbers(m_vsoApp->ActivePage->Shapes,*it);
- }
+ //Return if auto enumeration is off
+ if(!GetRegistry<bool>(regFolder, NULL, _T("AutoEnum"), 0))
+ return;
- //Visio::IVShapePtr pageSheet = msgShape->Application->ActivePage->PageSheet;
- //Visio::IVShapePtr closestMsg;
+ Visio::IVShapePtr pageSheet = msgShape->Application->ActivePage->PageSheet;
+ Visio::IVShapePtr closestMsg;
- //int autoEnum1 = pageSheet->Cells["User.AutoEnum1"]->ResultInt[visNone][visTruncate];
- //
- //switch(autoEnum1)
- //{
- // case 0:
- // closestMsg = CEnumerateUtils::getClosestMessage(msgShape->Application,msgShape,false);
- // if(closestMsg)
- // if(_tcsicmp(closestMsg->Data3,_T("")) != 0)
- // enumerate(msgShape->Application,closestMsg->Data3,true,true);
- // break;
- // case 1:
- // closestMsg = CEnumerateUtils::getClosestMessage(msgShape->Application,msgShape,true);
- // if(closestMsg)
- // enumerate(msgShape->Application,closestMsg->Data3,true,true);
- // break;
+ int bAutoEnumType = GetRegistry<bool>(regFolder, NULL, _T("AutoEnumType"), 0);
+ closestMsg = CEnumerateUtils::getClosestMessage(msgShape->Application,msgShape,bAutoEnumType ? true : false);
+ if(closestMsg && _tcsicmp(closestMsg->Data3,_T("")) != 0)
+ enumerate(msgShape->Application,closestMsg->Data3,true,true);
+ }
- // default:
- // enumerate(msgShape->Application,msgShape->Data3,false,true);
- // break;
- //}
+ //Check which groups have changed
+ std::set<_bstr_t> groups;
+ //Collect all groups in current selection
+ for(int i=1; i<=selection->Count; i++)
+ {
+ Visio::IVShapePtr shape = selection->Item[i];
+ if(isMessageShape(shape) && (_tcsicmp(shape->Data3,_T("")) != 0))
+ groups.insert(shape->Data3);
+ }
+ //Re-number groups
+ for(std::set<_bstr_t>::iterator it = groups.begin(); it != groups.end(); it++)
+ drawNumbers(m_vsoApp->ActivePage->Shapes,*it);
}
VAORC CDocumentMonitor::OnMenuSelectNumberedGroup(Visio::IVApplicationPtr vsoApp)
Modified: trunk/src/view/visio/addon/enumerateUtils.cpp
===================================================================
--- trunk/src/view/visio/addon/enumerateUtils.cpp 2010-07-03 21:04:32 UTC (rev 824)
+++ trunk/src/view/visio/addon/enumerateUtils.cpp 2010-07-04 14:02:59 UTC (rev 825)
@@ -13,6 +13,7 @@
*
* Copyright (c) 2010 Martin Bezdeka <mbe...@se...>
*
+ * $Id$
*/
#include "enumerateUtils.h"
@@ -308,3 +309,4 @@
combo.InsertString(3,_T("A, B, C,..."));
}
+// $Id$
\ No newline at end of file
Modified: trunk/src/view/visio/addon/enumerateUtils.h
===================================================================
--- trunk/src/view/visio/addon/enumerateUtils.h 2010-07-03 21:04:32 UTC (rev 824)
+++ trunk/src/view/visio/addon/enumerateUtils.h 2010-07-04 14:02:59 UTC (rev 825)
@@ -13,6 +13,7 @@
*
* Copyright (c) 2010 Martin Bezdeka <mbe...@se...>
*
+ * $Id$
*/
#pragma once
@@ -51,3 +52,5 @@
static VAORC enableEnumeration(Visio::IVShapePtr shape, _bstr_t groupID, std::set<_bstr_t>& formerGroups);
static void fillComboWithTypes(WTL::CComboBox& combo);
};
+
+// $Id$
\ No newline at end of file
Modified: trunk/src/view/visio/addon/globalSettingsDlg.cpp
===================================================================
--- trunk/src/view/visio/addon/globalSettingsDlg.cpp 2010-07-03 21:04:32 UTC (rev 824)
+++ trunk/src/view/visio/addon/globalSettingsDlg.cpp 2010-07-04 14:02:59 UTC (rev 825)
@@ -13,6 +13,7 @@
*
* Copyright (c) 2010 Martin Bezdeka <mbe...@se...>
*
+ * $Id$
*/
#include "stdafx.h"
@@ -41,4 +42,5 @@
}
}
+// $Id$
Modified: trunk/src/view/visio/addon/globalSettingsDlg.h
===================================================================
--- trunk/src/view/visio/addon/globalSettingsDlg.h 2010-07-03 21:04:32 UTC (rev 824)
+++ trunk/src/view/visio/addon/globalSettingsDlg.h 2010-07-04 14:02:59 UTC (rev 825)
@@ -13,6 +13,7 @@
*
* Copyright (c) 2010 Martin Bezdeka <mbe...@se...>
*
+ * $Id$
*/
#pragma once
@@ -43,3 +44,5 @@
CNumberingGlobalDlg page1;
CPropertyPage<IDD_CHECK_OPTIONS> page2;
};
+
+// $Id$
\ No newline at end of file
Modified: trunk/src/view/visio/addon/numberingGlobalDlg.cpp
===================================================================
--- trunk/src/view/visio/addon/numberingGlobalDlg.cpp 2010-07-03 21:04:32 UTC (rev 824)
+++ trunk/src/view/visio/addon/numberingGlobalDlg.cpp 2010-07-04 14:02:59 UTC (rev 825)
@@ -13,6 +13,7 @@
*
* Copyright (c) 2010 Martin Bezdeka <mbe...@se...>
*
+ * $Id$
*/
#include "stdafx.h"
@@ -174,4 +175,6 @@
{
EnableNumberingStyleControls(true);
return 0;
-}
\ No newline at end of file
+}
+
+// $Id$
\ No newline at end of file
Modified: trunk/src/view/visio/addon/numberingGlobalDlg.h
===================================================================
--- trunk/src/view/visio/addon/numberingGlobalDlg.h 2010-07-03 21:04:32 UTC (rev 824)
+++ trunk/src/view/visio/addon/numberingGlobalDlg.h 2010-07-04 14:02:59 UTC (rev 825)
@@ -13,6 +13,7 @@
*
* Copyright (c) 2010 Martin Bezdeka <mbe...@se...>
*
+ * $Id$
*/
#pragma once
@@ -87,3 +88,5 @@
//Other functions
const wchar_t* GetRegistryFolder() { return SCSTUDIO_REGISTRY_ROOT _T("\\MessageNumbering"); }
};
+
+// $Id$
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
