Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[639] trunk/src/view/visio/addon
|
From: <ob...@us...> - 2010-03-01 13:37:45
|
Revision: 639
http://scstudio.svn.sourceforge.net/scstudio/?rev=639&view=rev
Author: obouda
Date: 2010-03-01 13:37:38 +0000 (Mon, 01 Mar 2010)
Log Message:
-----------
New feature: Instances field - GUI only for the moment
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/resource.h
trunk/src/view/visio/addon/scstudio.vcproj
trunk/src/view/visio/addon/stdafx.h
Added Paths:
-----------
trunk/src/view/visio/addon/instancesfielddlg.cpp
trunk/src/view/visio/addon/instancesfielddlg.h
Modified: trunk/src/view/visio/addon/addon.cpp
===================================================================
--- trunk/src/view/visio/addon/addon.cpp 2010-02-28 22:12:17 UTC (rev 638)
+++ trunk/src/view/visio/addon/addon.cpp 2010-03-01 13:37:38 UTC (rev 639)
@@ -22,6 +22,7 @@
#include "aboutdlg.h"
#include "SimulatorDlg.h"
#include "optionsdlg.h"
+#include "instancesfielddlg.h"
#include "document.h"
#include "extract.h"
#include "errors.h"
@@ -308,6 +309,15 @@
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'");
+ VAORC result = DisplayInstancesFieldDialog();
+ if (result != VAORC_SUCCESS)
+ return result;
+ else
+ return pDocumentMonitor->OnMenuInstancesField(vsoApp);
+ }
default:
TRACE("CStudioAddon::Run() unexpected event id=" << iEvent);
@@ -366,6 +376,15 @@
return VAORC_SUCCESS;
}
+VAORC CStudioAddon::DisplayInstancesFieldDialog()
+{
+ TRACE("CStudioAddon::DisplayInstancesFieldDialog() called");
+ CInstancesFieldDlg dlg;
+
+ dlg.DoModal();
+ return VAORC_SUCCESS;
+}
+
HRESULT CStudioAddon::HandleVisioEvent(
IUnknown *ipSink, short nEventCode, IDispatch *pSourceObj, long nEventID,
long nEventSeqNum, IDispatch *pSubjectObj, VARIANT vMoreInfo, VARIANT *pvResult)
Modified: trunk/src/view/visio/addon/addon.h
===================================================================
--- trunk/src/view/visio/addon/addon.h 2010-02-28 22:12:17 UTC (rev 638)
+++ trunk/src/view/visio/addon/addon.h 2010-03-01 13:37:38 UTC (rev 639)
@@ -36,6 +36,7 @@
VAORC DisplaySimulatorOptions();
VAORC DisplayCheckOptions();
+ VAORC DisplayInstancesFieldDialog();
virtual HRESULT HandleVisioEvent(
IUnknown *ipSink, // [in] ipSink [assert]
Modified: trunk/src/view/visio/addon/dllmodule.rc
===================================================================
--- trunk/src/view/visio/addon/dllmodule.rc 2010-02-28 22:12:17 UTC (rev 638)
+++ trunk/src/view/visio/addon/dllmodule.rc 2010-03-01 13:37:38 UTC (rev 639)
@@ -23,6 +23,22 @@
/////////////////////////////////////////////////////////////////////////////
//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON_CHECK ICON "icon_check.ico"
+IDI_ICON_FIND_FLOW ICON "icon_findflow.ico"
+IDI_ICON_SELECT_INSTANCES ICON "icon_select_instances.ico"
+IDI_ICON_SELECT_MESSAGES ICON "icon_select_messages.ico"
+IDI_ICON_SIMULATION_START ICON "icon_simulation_start.ico"
+IDI_ICON_SIMULATION_STOP ICON "icon_simulation_stop.ico"
+IDI_ICON_SELECT_ADD_INSTANCES ICON "icon_select_add_instances.ico"
+IDI_ICON_SELECT_ADD_MESSAGES ICON "icon_select_add_messages.ico"
+
+/////////////////////////////////////////////////////////////////////////////
+//
// Dialog
//
@@ -80,7 +96,27 @@
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, 114
+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
+ LTEXT "Number of instances:",IDC_STATIC,5,5,70,12,SS_CENTERIMAGE
+ EDITTEXT IDC_IF_INSTANCES_CNT,80,5,40,14,ES_AUTOHSCROLL
+ LTEXT "Margins on the side:",IDC_IF_LBL1,12,55,70,12,SS_CENTERIMAGE
+ EDITTEXT IDC_IF_MARGIN_SIDE,87,55,40,14,ES_AUTOHSCROLL
+ LTEXT "Top margin:",IDC_IF_LBL2,12,73,70,12,SS_CENTERIMAGE
+ EDITTEXT IDC_IF_MARGIN_TOP,87,73,40,14,ES_AUTOHSCROLL
+ LTEXT "Instances height:",IDC_IF_LBL3,12,90,70,12,SS_CENTERIMAGE
+ EDITTEXT IDC_IF_INSTANCES_HEIGHT,87,90,40,14,ES_AUTOHSCROLL
+ GROUPBOX "",IDC_OPTIONS_GROUP_BOX,5,42,176,68
+ PUSHBUTTON "+",IDC_OPTIONS_SWITCH_BTN,5,41,10,10
+ LTEXT " Appearance options ",IDC_OPTIONS_SWITCH_LBL,19,41,69,8
+END
+
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
@@ -185,6 +221,14 @@
TOPMARGIN, 5
BOTTOMMARGIN, 106
END
+
+ IDD_INSTANCES_FIELD_OPTIONS, DIALOG
+ BEGIN
+ LEFTMARGIN, 5
+ RIGHTMARGIN, 181
+ TOPMARGIN, 5
+ BOTTOMMARGIN, 109
+ END
END
#endif // APSTUDIO_INVOKED
@@ -206,22 +250,6 @@
/////////////////////////////////////////////////////////////////////////////
//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON_CHECK ICON "icon_check.ico"
-IDI_ICON_FIND_FLOW ICON "icon_findflow.ico"
-IDI_ICON_SELECT_INSTANCES ICON "icon_select_instances.ico"
-IDI_ICON_SELECT_MESSAGES ICON "icon_select_messages.ico"
-IDI_ICON_SIMULATION_START ICON "icon_simulation_start.ico"
-IDI_ICON_SIMULATION_STOP ICON "icon_simulation_stop.ico"
-IDI_ICON_SELECT_ADD_INSTANCES ICON "icon_select_add_instances.ico"
-IDI_ICON_SELECT_ADD_MESSAGES ICON "icon_select_add_messages.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
// String Table
//
Modified: trunk/src/view/visio/addon/document.cpp
===================================================================
--- trunk/src/view/visio/addon/document.cpp 2010-02-28 22:12:17 UTC (rev 638)
+++ trunk/src/view/visio/addon/document.cpp 2010-03-01 13:37:38 UTC (rev 639)
@@ -381,6 +381,12 @@
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 itemImport = itemDrawing->MenuItems->Add();
itemImport->Caption = "&Import...";
itemImport->AddOnName = ADDON_NAME;
@@ -476,6 +482,12 @@
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;
+
m_vsoDocument->SetCustomMenus(vsoMenus);
}
@@ -913,6 +925,57 @@
return VAORC_SUCCESS;
}
+VAORC CDocumentMonitor::OnMenuInstancesField(Visio::IVApplicationPtr vsoApp)
+{
+ Visio::IVPagePtr vsoPage = vsoApp->GetActivePage();
+ //vsoPage->InsertObject("Instance", visInsertAsControl);
+
+ // FIXME: draw instances field according to params set in the dialog
+ /*
+ 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;
+}
+
void CDocumentMonitor::ShowReportView()
{
if(m_reportVisible)
Modified: trunk/src/view/visio/addon/document.h
===================================================================
--- trunk/src/view/visio/addon/document.h 2010-02-28 22:12:17 UTC (rev 638)
+++ trunk/src/view/visio/addon/document.h 2010-03-01 13:37:38 UTC (rev 639)
@@ -62,6 +62,7 @@
MENU_SELECT_ALL_MESSAGES,
MENU_SELECT_ADD_ALL_INSTANCES,
MENU_SELECT_ADD_ALL_MESSAGES,
+ MENU_INSTANCES_FIELD,
};
VAORC OnMenuWindowsReporter(Visio::IVApplicationPtr vsoApp);
@@ -75,6 +76,7 @@
VAORC OnMenuSimulationStart(Visio::IVApplicationPtr vsoApp);
VAORC OnMenuSimulationStop(Visio::IVApplicationPtr vsoApp);
VAORC OnMenuVerify(Visio::IVApplicationPtr vsoApp);
+ VAORC OnMenuInstancesField(Visio::IVApplicationPtr vsoApp);
void ShowReportView();
void OnHideReportView();
Added: trunk/src/view/visio/addon/instancesfielddlg.cpp
===================================================================
--- trunk/src/view/visio/addon/instancesfielddlg.cpp (rev 0)
+++ trunk/src/view/visio/addon/instancesfielddlg.cpp 2010-03-01 13:37:38 UTC (rev 639)
@@ -0,0 +1,108 @@
+/*
+ * 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 Ondrej Bouda <xb...@fi...>
+ *
+ * $Id$
+ */
+
+#include "stdafx.h"
+#include "dllmodule.h"
+#include "instancesfielddlg.h"
+
+LRESULT CInstancesFieldDlg::OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+{
+ CenterWindow(GetParent());
+
+ LoadRegistryData();
+ DoDataExchange(false);
+
+ SetOptionsVisibility(m_optionsVisible);
+
+ m_instancesCntEdit.SetSel(0, -1);
+
+ return bHandled = FALSE;
+}
+
+LRESULT CInstancesFieldDlg::OnCloseCmd(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+{
+ if(wID == IDOK)
+ {
+ DoDataExchange(TRUE);
+ SaveRegistryData();
+ }
+
+ EndDialog(wID);
+ return 0;
+}
+
+LRESULT CInstancesFieldDlg::OnOptionsSwitch(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+{
+ m_optionsVisible = !m_optionsVisible;
+ SetOptionsVisibility(m_optionsVisible);
+ return 0;
+}
+
+void CInstancesFieldDlg::SetOptionsVisibility(bool visible)
+{
+ m_optionsSwitchBtn.SetWindowText((visible ? _T("-") : _T("+")));
+
+ CWindow window = m_optionsGroupBox.GetParent();
+ RECT windowRect;
+ window.GetWindowRect(&windowRect);
+ windowRect.bottom = windowRect.top + (visible ? 210 : 116);
+ 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 ? 110 : 8);
+ groupRect.left = 8;
+ groupRect.right = 272;
+ m_optionsGroupBox.SetWindowPos(0, &groupRect, SWP_SHOWWINDOW | SWP_NOZORDER | SWP_DRAWFRAME);
+
+ for (int i=0; i<ARRAY_SIZE(m_optionEdits); i++) {
+ m_optionEdits[i].ShowWindow(visible);
+ }
+ for (int i=0; i<ARRAY_SIZE(m_optionLabels); i++) {
+ m_optionLabels[i].ShowWindow(visible);
+ }
+
+ m_instancesCntEdit.SetFocus();
+}
+
+int CInstancesFieldDlg::LoadRegistryData()
+{
+ m_instances_cnt = GetRegistry(GetRegistryFolder(), NULL, _T("InstancesCnt"), DEFAULT_IF_INSTANCES_CNT);
+ m_margin_side = GetRegistry(GetRegistryFolder(), NULL, _T("MarginSide"), DEFAULT_IF_MARGIN_SIDE);
+ m_margin_top = GetRegistry(GetRegistryFolder(), NULL, _T("MarginTop"), DEFAULT_IF_MARGIN_TOP);
+ m_instances_height = GetRegistry(GetRegistryFolder(), NULL, _T("InstancesHeight"), DEFAULT_IF_INSTANCES_HEIGHT);
+ m_optionsVisible = GetRegistry(GetRegistryFolder(), NULL, _T("OptionsVisible"), DEFAULT_IF_OPTIONS_VISIBLE);
+
+ return 0;
+}
+
+int CInstancesFieldDlg::SaveRegistryData()
+{
+ SetRegistry<int> (HKEY_CURRENT_USER, GetRegistryFolder(), _T("InstancesCnt"), m_instances_cnt);
+ SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("MarginSide"), m_margin_side);
+ SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("MarginTop"), m_margin_top);
+ SetRegistry<float>(HKEY_CURRENT_USER, GetRegistryFolder(), _T("InstancesHeight"), m_instances_height);
+ SetRegistry<bool> (HKEY_CURRENT_USER, GetRegistryFolder(), _T("OptionsVisible"), m_optionsVisible);
+
+ return 0;
+}
+
+// $Id$
Property changes on: trunk/src/view/visio/addon/instancesfielddlg.cpp
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/src/view/visio/addon/instancesfielddlg.h
===================================================================
--- trunk/src/view/visio/addon/instancesfielddlg.h (rev 0)
+++ trunk/src/view/visio/addon/instancesfielddlg.h 2010-03-01 13:37:38 UTC (rev 639)
@@ -0,0 +1,95 @@
+/*
+ * 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 Ondrej Bouda <xb...@fi...>
+ *
+ * $Id$
+ */
+
+#pragma once
+
+// Include libraries from the Windows Template Library (WTL).
+// http://wtl.sourceforge.net
+#include <atldlgs.h>
+#include <atlctrls.h>
+#include <atlddx.h>
+
+class CInstancesFieldDlg
+ : public ATL::CDialogImpl<CInstancesFieldDlg>, public CWinDataExchange<CInstancesFieldDlg>
+{
+public:
+ enum { IDD = IDD_INSTANCES_FIELD_OPTIONS };
+ int m_instances_cnt;
+ float m_margin_side;
+ float m_margin_top;
+ float m_instances_height;
+
+ const wchar_t* GetRegistryFolder() { return SCSTUDIO_REGISTRY_ROOT _T("\\InstancesField"); }
+
+protected:
+BEGIN_DDX_MAP(CInstancesFieldDlg)
+ DDX_INT_RANGE(IDC_IF_INSTANCES_CNT, m_instances_cnt, 1, 1000)
+ DDX_FLOAT(IDC_IF_MARGIN_SIDE, m_margin_side)
+ DDX_FLOAT(IDC_IF_MARGIN_TOP, m_margin_top)
+ DDX_FLOAT(IDC_IF_INSTANCES_HEIGHT, m_instances_height)
+
+ DDX_CONTROL_HANDLE(IDC_IF_INSTANCES_CNT, m_instancesCntEdit);
+ DDX_CONTROL_HANDLE(IDC_OPTIONS_SWITCH_BTN, m_optionsSwitchBtn)
+ DDX_CONTROL_HANDLE(IDC_OPTIONS_GROUP_BOX, m_optionsGroupBox)
+ DDX_CONTROL_HANDLE(IDC_IF_MARGIN_SIDE, m_optionEdits[0])
+ DDX_CONTROL_HANDLE(IDC_IF_MARGIN_TOP, m_optionEdits[1])
+ DDX_CONTROL_HANDLE(IDC_IF_INSTANCES_HEIGHT, m_optionEdits[2])
+ DDX_CONTROL_HANDLE(IDC_IF_LBL1, m_optionLabels[0])
+ DDX_CONTROL_HANDLE(IDC_IF_LBL2, m_optionLabels[1])
+ DDX_CONTROL_HANDLE(IDC_IF_LBL3, m_optionLabels[2])
+END_DDX_MAP()
+
+BEGIN_MSG_MAP(CInstancesFieldDlg)
+ MESSAGE_HANDLER(WM_INITDIALOG, OnInitDialog)
+ COMMAND_ID_HANDLER(IDOK, OnCloseCmd)
+ COMMAND_ID_HANDLER(IDCANCEL, OnCloseCmd)
+ COMMAND_ID_HANDLER(IDC_OPTIONS_SWITCH_BTN, OnOptionsSwitch)
+ // FIXME: would like to make the label switch the options as well, but the following does not work:
+ //COMMAND_ID_HANDLER(IDC_OPTIONS_SWITCH_LBL, OnOptionsSwitch)
+END_MSG_MAP()
+
+// Handler prototypes:
+// LRESULT MessageHandler(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
+// LRESULT CommandHandler(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled)
+// LRESULT NotifyHandler(int idCtrl, LPNMHDR pnmh, BOOL& bHandled)
+
+ LRESULT OnInitDialog(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);
+ LRESULT OnCloseCmd(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+ LRESULT OnOptionsSwitch(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled);
+
+ int LoadRegistryData();
+ int SaveRegistryData();
+
+ void SetOptionsVisibility(bool visible);
+
+ bool m_optionsVisible;
+ CButton m_optionsSwitchBtn;
+
+ CEdit m_instancesCntEdit;
+ CStatic m_optionsGroupBox;
+ CEdit m_optionEdits[3];
+ CStatic m_optionLabels[3];
+};
+
+static const int DEFAULT_IF_INSTANCES_CNT = 1;
+static const float DEFAULT_IF_MARGIN_SIDE = 1.0f;
+static const float DEFAULT_IF_MARGIN_TOP = 1.0f;
+static const float DEFAULT_IF_INSTANCES_HEIGHT = 2.0f;
+static const bool DEFAULT_IF_OPTIONS_VISIBLE = false;
+
+// $Id$
Property changes on: trunk/src/view/visio/addon/instancesfielddlg.h
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: trunk/src/view/visio/addon/resource.h
===================================================================
--- trunk/src/view/visio/addon/resource.h 2010-02-28 22:12:17 UTC (rev 638)
+++ trunk/src/view/visio/addon/resource.h 2010-03-01 13:37:38 UTC (rev 639)
@@ -14,6 +14,7 @@
#define IDC_CHECKLIST 206
#define IDD_SIMULATOR_OPTIONS 206
#define IDC_OUTPUTLEVEL 207
+#define IDD_INSTANCES_FIELD_OPTIONS 207
#define IDC_DRAWING1 208
#define IDC_CHANNELTYPE 208
#define IDC_DRAWING2 209
@@ -27,6 +28,16 @@
#define IDI_ICON_SELECT_ADD_INSTANCES 218
#define IDC_SIM_BIN_WIDTH 219
#define IDI_ICON_SELECT_ADD_MESSAGES 219
+#define IDC_IF_INSTANCES_CNT 220
+#define IDC_IF_MARGIN_SIDE 221
+#define IDC_IF_MARGIN_TOP 222
+#define IDC_IF_INSTANCES_HEIGHT 223
+#define IDC_OPTIONS_SWITCH_BTN 226
+#define IDC_OPTIONS_SWITCH_LBL 227
+#define IDC_OPTIONS_GROUP_BOX 228
+#define IDC_IF_LBL1 229
+#define IDC_IF_LBL2 230
+#define IDC_IF_LBL3 231
// Next default values for new objects
//
@@ -34,7 +45,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 220
#define _APS_NEXT_COMMAND_VALUE 32768
-#define _APS_NEXT_CONTROL_VALUE 220
+#define _APS_NEXT_CONTROL_VALUE 232
#define _APS_NEXT_SYMED_VALUE 105
#endif
#endif
Modified: trunk/src/view/visio/addon/scstudio.vcproj
===================================================================
--- trunk/src/view/visio/addon/scstudio.vcproj 2010-02-28 22:12:17 UTC (rev 638)
+++ trunk/src/view/visio/addon/scstudio.vcproj 2010-03-01 13:37:38 UTC (rev 639)
@@ -316,6 +316,14 @@
>
</File>
<File
+ RelativePath=".\instancesfielddlg.cpp"
+ >
+ </File>
+ <File
+ RelativePath=".\instancesfielddlg.h"
+ >
+ </File>
+ <File
RelativePath=".\optionsdlg.cpp"
>
</File>
Modified: trunk/src/view/visio/addon/stdafx.h
===================================================================
--- trunk/src/view/visio/addon/stdafx.h 2010-02-28 22:12:17 UTC (rev 638)
+++ trunk/src/view/visio/addon/stdafx.h 2010-03-01 13:37:38 UTC (rev 639)
@@ -65,4 +65,7 @@
#endif // EXCEL_FOUND
+
+#define ARRAY_SIZE(a) (int)(sizeof(a)/sizeof(a[0]))
+
// $Id$
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
