[GME-commit]
GMESRC/GME/Gme GMEConsole.cpp,NONE,1.1 GMEConsole.h,NONE,1.1
console.cpp,NONE,1.1 console.h,NONE,1.1 GME.dsp,1.90,1.91
GME.rc,1.123,1.124 GMEApp.cpp,1.121,1.122 GMEDoc.cpp,1.22,1.23
GMEDoc.h,1.8,1.9 GMEOLEApp.cpp,1.6,1.7 GMEOLEApp.h,1.3,1.4
GMEObjectInspector.cpp,1.12,1.13 GmePrintDialog.h,1.2,1.3
MainFrm.cpp,1.24,1.25 MainFrm.h,1.19,1.20 PanningWindow.h,1.3,1.4
resource.h,1.56,1.57
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Sat Jul 24 02:41:56 CDT 2004
Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv15124/GME/Gme
Modified Files:
GME.dsp GME.rc GMEApp.cpp GMEDoc.cpp GMEDoc.h GMEOLEApp.cpp
GMEOLEApp.h GMEObjectInspector.cpp GmePrintDialog.h
MainFrm.cpp MainFrm.h PanningWindow.h resource.h
Added Files:
GMEConsole.cpp GMEConsole.h console.cpp console.h
Log Message:
New ActiveX control added: Console Window
CVS User: volgy
--- NEW FILE: GMEConsole.cpp ---
// GMEConsole.cpp : implementation file
//
#include "stdafx.h"
#include "GMEApp.h"
#include "GMEstd.h"
#include "mainfrm.h"
#include "GMEDoc.h"
#include "GMEView.h"
#include "sizecbar.h"
#include "GMEConsole.h"
#include "guimeta.h"
CGMEConsole* CGMEConsole::theInstance = 0;
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
static char THIS_FILE[] = __FILE__;
#endif
/////////////////////////////////////////////////////////////////////////////
// CGMEConsole dialog
CGMEConsole::CGMEConsole(CWnd* /*pParent =NULL*/)
{
//{{AFX_DATA_INIT(CGMEConsole)
// NOTE: the ClassWizard will add member initialization here
//}}AFX_DATA_INIT
VERIFY(theInstance == 0);
theInstance = this;
}
void CGMEConsole::DoDataExchange(CDataExchange* pDX)
{
CSizingControlBar::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CGMEConsole)
DDX_Control(pDX, IDC_CONSOLE_CTRL, m_Console);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CGMEConsole, CSizingControlBar)
//{{AFX_MSG_MAP(CGMEConsole)
ON_WM_CREATE()
ON_WM_SIZE()
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
/////////////////////////////////////////////////////////////////////////////
// CGMEConsole message handlers
int CGMEConsole::OnCreate(LPCREATESTRUCT lpCreateStruct)
{
if (CSizingControlBar::OnCreate(lpCreateStruct) == -1)
return -1;
if(!m_Console.Create("Console",WS_CHILD | WS_BORDER | WS_VISIBLE,CRect(0,0,230,300),this,IDC_CONSOLE_CTRL)) {
return -1;
}
/*
m_szFloat = CSize(500,165);
m_szHorz = CSize(100,165);
m_szVert = CSize(120,400);
*/
m_szFloat = CSize(400,600);
m_szHorz = CSize(800,80);
m_szVert = CSize(120,400);
return 0;
}
void CGMEConsole::OnSize(UINT nType, int cx, int cy)
{
CSizingControlBar::OnSize(nType, cx, cy);
CRect rc;
GetClientRect(rc);
m_Console.MoveWindow(rc);
}
BEGIN_EVENTSINK_MAP(CGMEConsole, CSizingControlBar)
//{{AFX_EVENTSINK_MAP(CGMEConsole)
ON_EVENT(CGMEConsole, IDC_CONSOLE_CTRL, 1 /* ClickMGAID */, OnClickMGAIDConsoleCtrl, VTS_BSTR)
//}}AFX_EVENTSINK_MAP
END_EVENTSINK_MAP()
void CGMEConsole::OnClickMGAIDConsoleCtrl(LPCTSTR objid)
{
if (CGMEDoc::theInstance) {
CGMEDoc::theInstance->ShowObject(objid);
}
}
void CGMEConsole::Clear()
{
}
void CGMEConsole::Message(CString str, short type)
{
m_Console.Message(str, type);
}
CString CGMEConsole::GetContents()
{
return m_Console.GetContents();
}
void CGMEConsole::SetContents(const CString& contents)
{
m_Console.SetContents(contents);
}
--- NEW FILE: GMEConsole.h ---
//{{AFX_INCLUDES()
#include "console.h"
//}}AFX_INCLUDES
#if !defined(AFX_GMECONSOLE_H__C58BF4E8_E3F7_4717_BBDA_B908B0DD4D5E__INCLUDED_)
#define AFX_GMECONSOLE_H__C58BF4E8_E3F7_4717_BBDA_B908B0DD4D5E__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// GMEConsole.h : header file
//
/////////////////////////////////////////////////////////////////////////////
// CGMEConsole dialog
class CGMEConsole : public CSizingControlBar
{
// Construction
public:
CGMEConsole(CWnd* pParent = NULL); // standard constructor
virtual ~CGMEConsole(){theInstance = 0;};
void Clear();
void Message(CString str, short type);
CString GetContents();
void SetContents(const CString& contents);
// Dialog Data
//{{AFX_DATA(CGMEConsole)
enum { IDD = IDD_CONSOLE_DIALOG };
CConsole m_Console;
//}}AFX_DATA
static CGMEConsole *theInstance;
// Overrides
// ClassWizard generated virtual function overrides
//{{AFX_VIRTUAL(CGMEConsole)
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
//}}AFX_VIRTUAL
// Implementation
protected:
// Generated message map functions
//{{AFX_MSG(CGMEConsole)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
afx_msg void OnSize(UINT nType, int cx, int cy);
afx_msg void OnClickMGAIDConsoleCtrl(LPCTSTR objid);
DECLARE_EVENTSINK_MAP()
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_GMECONSOLE_H__C58BF4E8_E3F7_4717_BBDA_B908B0DD4D5E__INCLUDED_)
--- NEW FILE: console.cpp ---
// Machine generated IDispatch wrapper class(es) created by Microsoft Visual C++
// NOTE: Do not modify the contents of this file. If this class is regenerated by
// Microsoft Visual C++, your modifications will be overwritten.
#include "stdafx.h"
#include "console.h"
/////////////////////////////////////////////////////////////////////////////
// CConsole
IMPLEMENT_DYNCREATE(CConsole, CWnd)
/////////////////////////////////////////////////////////////////////////////
// CConsole properties
CString CConsole::GetContents()
{
CString result;
GetProperty(0x1, VT_BSTR, (void*)&result);
return result;
}
void CConsole::SetContents(LPCTSTR propVal)
{
SetProperty(0x1, VT_BSTR, propVal);
}
CString CConsole::Get_Contents()
{
CString result;
GetProperty(0x0, VT_BSTR, (void*)&result);
return result;
}
void CConsole::Set_Contents(LPCTSTR propVal)
{
SetProperty(0x0, VT_BSTR, propVal);
}
/////////////////////////////////////////////////////////////////////////////
// CConsole operations
void CConsole::Message(LPCTSTR str, short type)
{
static BYTE parms[] =
VTS_BSTR VTS_I2;
InvokeHelper(0x2, DISPATCH_METHOD, VT_EMPTY, NULL, parms,
str, type);
}
void CConsole::Clear()
{
InvokeHelper(0x3, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
}
void CConsole::AboutBox()
{
InvokeHelper(0xfffffdd8, DISPATCH_METHOD, VT_EMPTY, NULL, NULL);
}
--- NEW FILE: console.h ---
#if !defined(AFX_CONSOLE_H__AEAA39FE_41DB_43E1_BC64_1C05D697E3F4__INCLUDED_)
#define AFX_CONSOLE_H__AEAA39FE_41DB_43E1_BC64_1C05D697E3F4__INCLUDED_
#if _MSC_VER > 1000
#pragma once
#endif // _MSC_VER > 1000
// Machine generated IDispatch wrapper class(es) created by Microsoft Visual C++
// NOTE: Do not modify the contents of this file. If this class is regenerated by
// Microsoft Visual C++, your modifications will be overwritten.
/////////////////////////////////////////////////////////////////////////////
// CConsole wrapper class
class CConsole : public CWnd
{
protected:
DECLARE_DYNCREATE(CConsole)
public:
CLSID const& GetClsid()
{
static CLSID const clsid
= { 0xe4eb8324, 0x13f0, 0x46cb, { 0x96, 0xa3, 0xf5, 0x39, 0xdf, 0x7f, 0x79, 0xd4 } };
return clsid;
}
virtual BOOL Create(LPCTSTR /*lpszClassName*/,
LPCTSTR lpszWindowName, DWORD dwStyle,
const RECT& rect,
CWnd* pParentWnd, UINT nID,
CCreateContext* /*pContext = NULL*/)
{ return CreateControl(GetClsid(), lpszWindowName, dwStyle, rect, pParentWnd, nID); }
BOOL Create(LPCTSTR lpszWindowName, DWORD dwStyle,
const RECT& rect, CWnd* pParentWnd, UINT nID,
CFile* pPersist = NULL, BOOL bStorage = FALSE,
BSTR bstrLicKey = NULL)
{ return CreateControl(GetClsid(), lpszWindowName, dwStyle, rect, pParentWnd, nID,
pPersist, bStorage, bstrLicKey); }
// Attributes
public:
CString GetContents();
void SetContents(LPCTSTR);
CString Get_Contents();
void Set_Contents(LPCTSTR);
// Operations
public:
void Message(LPCTSTR str, short type);
void Clear();
void AboutBox();
};
//{{AFX_INSERT_LOCATION}}
// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
#endif // !defined(AFX_CONSOLE_H__AEAA39FE_41DB_43E1_BC64_1C05D697E3F4__INCLUDED_)
Index: GME.dsp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GME.dsp,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** GME.dsp 22 Jul 2004 14:05:36 -0000 1.90
--- GME.dsp 24 Jul 2004 06:41:53 -0000 1.91
***************
*** 174,177 ****
--- 174,181 ----
# Begin Source File
+ SOURCE=.\console.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\DynMenu.cpp
# End Source File
***************
*** 198,201 ****
--- 202,209 ----
# Begin Source File
+ SOURCE=.\GMEConsole.cpp
+ # End Source File
+ # Begin Source File
+
SOURCE=.\GMEDoc.cpp
# End Source File
***************
*** 417,420 ****
--- 425,432 ----
# Begin Source File
+ SOURCE=.\console.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\EnumVar.h
# End Source File
***************
*** 433,436 ****
--- 445,452 ----
# Begin Source File
+ SOURCE=.\GMEConsole.h
+ # End Source File
+ # Begin Source File
+
SOURCE=.\GMEDoc.h
# End Source File
***************
*** 801,817 ****
# End Target
# End Project
- # Section GME : {72ADFD78-2C39-11D0-9903-00A0C91BC942}
- # 1:10:IDB_SPLASH:112
- # 2:21:SplashScreenInsertKey:4.0
- # End Section
- # Section GME : {A7DC846C-DAE3-4B3F-B947-71D85B5F6437}
- # 2:5:Class:CObjectInspector
- # 2:10:HeaderFile:objectinspector.h
- # 2:8:ImplFile:objectinspector.cpp
- # End Section
# Section GME : {E5FE98F1-B7AD-4ABE-89DB-87DDD9DB753E}
# 2:21:DefaultSinkHeaderFile:search.h
# 2:16:DefaultSinkClass:CSearch
# End Section
# Section GME : {5C402C89-C848-11D3-9A6E-00902721DB65}
# 2:5:Class:CActiveBrowser
--- 817,828 ----
# End Target
# End Project
# Section GME : {E5FE98F1-B7AD-4ABE-89DB-87DDD9DB753E}
# 2:21:DefaultSinkHeaderFile:search.h
# 2:16:DefaultSinkClass:CSearch
# End Section
+ # Section GME : {E4EB8324-13F0-46CB-96A3-F539DF7F79D4}
+ # 2:21:DefaultSinkHeaderFile:console.h
+ # 2:16:DefaultSinkClass:CConsole
+ # End Section
# Section GME : {5C402C89-C848-11D3-9A6E-00902721DB65}
# 2:5:Class:CActiveBrowser
***************
*** 819,829 ****
# 2:8:ImplFile:activebrowser.cpp
# End Section
# Section GME : {5C402C8B-C848-11D3-9A6E-00902721DB65}
# 2:21:DefaultSinkHeaderFile:activebrowser.h
# 2:16:DefaultSinkClass:CActiveBrowser
# End Section
! # Section GME : {B786F53C-297F-4DB8-8060-D45057217AEE}
! # 2:21:DefaultSinkHeaderFile:objectinspector.h
! # 2:16:DefaultSinkClass:CObjectInspector
# End Section
# Section GME : {B718CCF7-5055-40DD-9CBD-AB17F72AB113}
--- 830,845 ----
# 2:8:ImplFile:activebrowser.cpp
# End Section
+ # Section GME : {B786F53C-297F-4DB8-8060-D45057217AEE}
+ # 2:21:DefaultSinkHeaderFile:objectinspector.h
+ # 2:16:DefaultSinkClass:CObjectInspector
+ # End Section
# Section GME : {5C402C8B-C848-11D3-9A6E-00902721DB65}
# 2:21:DefaultSinkHeaderFile:activebrowser.h
# 2:16:DefaultSinkClass:CActiveBrowser
# End Section
! # Section GME : {72ADFD7B-2C39-11D0-9903-00A0C91BC942}
! # 1:17:ID_INDICATOR_TIME:103
! # 2:2:BH:
! # 2:17:ID_INDICATOR_TIME:ID_INDICATOR_TIME
# End Section
# Section GME : {B718CCF7-5055-40DD-9CBD-AB17F72AB113}
***************
*** 832,838 ****
# 2:8:ImplFile:search.cpp
# End Section
! # Section GME : {72ADFD7B-2C39-11D0-9903-00A0C91BC942}
! # 1:17:ID_INDICATOR_TIME:103
! # 2:2:BH:
! # 2:17:ID_INDICATOR_TIME:ID_INDICATOR_TIME
# End Section
--- 848,863 ----
# 2:8:ImplFile:search.cpp
# End Section
! # Section GME : {72ADFD78-2C39-11D0-9903-00A0C91BC942}
! # 1:10:IDB_SPLASH:112
! # 2:21:SplashScreenInsertKey:4.0
! # End Section
! # Section GME : {A7DC846C-DAE3-4B3F-B947-71D85B5F6437}
! # 2:5:Class:CObjectInspector
! # 2:10:HeaderFile:objectinspector.h
! # 2:8:ImplFile:objectinspector.cpp
! # End Section
! # Section GME : {71655C2B-D6DD-4345-B273-5BD1422370CB}
! # 2:5:Class:CConsole
! # 2:10:HeaderFile:console.h
! # 2:8:ImplFile:cnsole.cpp
# End Section
Index: GME.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.123
retrieving revision 1.124
diff -C2 -d -r1.123 -r1.124
*** GME.rc 20 Jul 2004 17:03:54 -0000 1.123
--- GME.rc 24 Jul 2004 06:41:53 -0000 1.124
***************
*** 194,197 ****
--- 194,198 ----
MENUITEM "&Attribute Panel", ID_VIEW_ATTRIBUTES
MENUITEM "Panning Window", ID_VIEW_PANNWIN
+ MENUITEM "&Console", ID_VIEW_CONSOLE
END
POPUP "&Help"
***************
*** 545,549 ****
FONT 10, "MS Sans Serif"
BEGIN
! CTEXT GME_VERSION_STR,IDC_STATIC,11,65,152,8,SS_NOPREFIX
CTEXT "Copyright © 2000-2004 Vanderbilt University",IDC_STATIC,
10,75,152,8
--- 546,550 ----
FONT 10, "MS Sans Serif"
BEGIN
! CTEXT "4.7.22",IDC_STATIC,11,65,152,8,SS_NOPREFIX
CTEXT "Copyright © 2000-2004 Vanderbilt University",IDC_STATIC,
10,75,152,8
***************
*** 731,735 ****
END
! 1538 DIALOGEX 32, 32, 420, 374
STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYSMENU
--- 732,736 ----
END
! IDD_PRINT_DIALOG DIALOGEX 32, 32, 420, 374
STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYSMENU
***************
*** 809,813 ****
END
! 1539 DIALOGEX 32, 32, 291, 177
STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYSMENU
--- 810,814 ----
END
! IDD_PRINTSETUP_DIALOG DIALOGEX 32, 32, 291, 177
STYLE DS_MODALFRAME | DS_3DLOOK | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE |
WS_CAPTION | WS_SYSMENU
***************
*** 889,892 ****
--- 890,903 ----
END
+ IDD_CONSOLE_DIALOG DIALOG DISCARDABLE 0, 0, 393, 65
+ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ CAPTION "Dialog"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+ CONTROL "",IDC_CONSOLE_CTRL,
+ "{E4EB8324-13F0-46CB-96A3-F539DF7F79D4}",WS_TABSTOP,7,7,
+ 379,50
+ END
+
#ifndef _MAC
***************
*** 1048,1052 ****
END
! 1538, DIALOG
BEGIN
RIGHTMARGIN, 410
--- 1059,1063 ----
END
! IDD_PRINT_DIALOG, DIALOG
BEGIN
RIGHTMARGIN, 410
***************
*** 1064,1068 ****
END
! 1539, DIALOG
BEGIN
TOPMARGIN, 4
--- 1075,1079 ----
END
! IDD_PRINTSETUP_DIALOG, DIALOG
BEGIN
TOPMARGIN, 4
***************
*** 1084,1087 ****
--- 1095,1106 ----
BOTTOMMARGIN, 194
END
+
+ IDD_CONSOLE_DIALOG, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 386
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 58
+ END
END
#endif // APSTUDIO_INVOKED
***************
*** 1113,1116 ****
--- 1132,1143 ----
IDC_SEARCHCTRL, 0x376, 20, 0
0x0000, 0x0000, 0x0000, 0x0001, 0x25d4, 0x0000, 0x251b, 0x0000, 0x0000,
+ 0x0000,
+ 0
+ END
+
+ IDD_CONSOLE_DIALOG DLGINIT
+ BEGIN
+ IDC_CONSOLE_CTRL, 0x376, 20, 0
+ 0x0000, 0x0000, 0x0000, 0x0001, 0x3acf, 0x0000, 0x085f, 0x0000, 0x0000,
0x0000,
0
Index: GMEApp.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEApp.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** GMEApp.cpp 22 Jul 2004 16:14:33 -0000 1.121
--- GMEApp.cpp 24 Jul 2004 06:41:53 -0000 1.122
***************
*** 2223,2227 ****
{
public:
! enum { IDD = 1538 };
CGmePrintSetup() : CPrintDialog(true, 0, NULL) {}
};
--- 2223,2227 ----
{
public:
! enum { IDD = IDD_PRINT_DIALOG };
CGmePrintSetup() : CPrintDialog(true, 0, NULL) {}
};
Index: GMEDoc.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEDoc.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** GMEDoc.cpp 30 Jun 2004 17:50:46 -0000 1.22
--- GMEDoc.cpp 24 Jul 2004 06:41:53 -0000 1.23
***************
*** 318,321 ****
--- 318,359 ----
}
+ void CGMEDoc::ShowObject(LPCTSTR objectID)
+ {
+ CComBSTR bstrID(objectID);
+ CComPtr<IMgaObject> object;
+ CComPtr<IUnknown> unk;
+ bool inTrans = false;
+
+
+ try {
+ long status;
+ COMTHROW(theApp.mgaProject->get_ProjectStatus(&status));
+ inTrans = (status & 0x08L) != 0;
+ CComPtr<IMgaTerritory> terr;
+ if (!inTrans) {
+ COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr));
+ COMTHROW(theApp.mgaProject->BeginTransaction(terr));
+ }
+ else {
+ COMTHROW(theApp.mgaProject->get_ActiveTerritory(&terr));
+ }
+
+ COMTHROW(theApp.mgaProject->GetObjectByID(bstrID, &object));
+ COMTHROW(object.QueryInterface(&unk));
+
+ if (!inTrans) {
+ theApp.mgaProject->CommitTransaction();
+ }
+ }
+ catch (hresult_exception e) {
+ if (!inTrans)
+ theApp.mgaProject->AbortTransaction();
+ return;
+ }
+
+
+ ShowObject(unk);
+ }
+
void CGMEDoc::ResetAllViews()
{
Index: GMEDoc.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEDoc.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GMEDoc.h 2 Jun 2004 22:32:38 -0000 1.8
--- GMEDoc.h 24 Jul 2004 06:41:53 -0000 1.9
***************
*** 41,44 ****
--- 41,45 ----
void SetNextToView(CComPtr<IMgaModel> &model,CString aspName, CComPtr<IMgaFCO> ¢erObj) { nextToView = model; nextAspect = aspName; initialCenterObj = centerObj;}
void ShowObject(CComPtr<IUnknown> alienObject);
+ void ShowObject(LPCTSTR objectID);
void ResetNextToView() { nextToView = 0; }
void ChangeAspects(CString aspName);
Index: GMEOLEApp.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEApp.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GMEOLEApp.cpp 22 Jul 2004 16:14:33 -0000 1.6
--- GMEOLEApp.cpp 24 Jul 2004 06:41:53 -0000 1.7
***************
*** 23,45 ****
#endif
- CSingletonFactory::CSingletonFactory(REFCLSID clsid,
- CRuntimeClass* pRuntimeClass,
- BOOL bMultiInstance,
- LPCTSTR lpszProgID):
- COleObjectFactory(clsid, pRuntimeClass, bMultiInstance, lpszProgID),
- singleton(NULL)
- {
- }
-
- CCmdTarget* CSingletonFactory::OnCreateObject()
- {
- if (singleton == NULL) {
- singleton = COleObjectFactory::OnCreateObject();
- }
-
- singleton->GetIDispatch(FALSE)->AddRef();
- return singleton;
- }
-
/////////////////////////////////////////////////////////////////////////////
// CGMEOLEApp
--- 23,26 ----
***************
*** 93,96 ****
--- 74,78 ----
DISP_PROPERTY_EX(CGMEOLEApp, "MgaProject", GetMgaProject, SetMgaProject, VT_DISPATCH)
DISP_PROPERTY_EX(CGMEOLEApp, "Panels", GetPanels, SetPanels, VT_DISPATCH)
+ DISP_PROPERTY_EX(CGMEOLEApp, "ConsoleContents", GetConsoleContents, SetConsoleContents, VT_BSTR)
DISP_FUNCTION(CGMEOLEApp, "CreateProject", CreateProject, VT_EMPTY, VTS_BSTR VTS_BSTR)
DISP_FUNCTION(CGMEOLEApp, "OpenProject", OpenProject, VT_EMPTY, VTS_BSTR)
***************
*** 117,120 ****
--- 99,104 ----
DISP_FUNCTION(CGMEOLEApp, "ShowAbout", ShowAbout, VT_EMPTY, VTS_NONE)
DISP_FUNCTION(CGMEOLEApp, "ShowFCO", ShowFCO, VT_EMPTY, VTS_DISPATCH)
+ DISP_FUNCTION(CGMEOLEApp, "ConsoleMessage", ConsoleMessage, VT_EMPTY, VTS_BSTR VTS_I4)
+ DISP_FUNCTION(CGMEOLEApp, "ConsoleClear", ConsoleClear, VT_EMPTY, VTS_NONE)
//}}AFX_DISPATCH_MAP
END_DISPATCH_MAP()
***************
*** 135,139 ****
// {C7DCCC2E-1642-4a40-8060-51A7B9FAE488}
! IMPLEMENT_OLESINGLECREATE(CGMEOLEApp, "GME.Application", 0xC7DCCC2E, 0x1642, 0x4a40, 0x80, 0x60, 0x51, 0xA7, 0xB9, 0xFA, 0xE4, 0x88)
/////////////////////////////////////////////////////////////////////////////
--- 119,123 ----
// {C7DCCC2E-1642-4a40-8060-51A7B9FAE488}
! IMPLEMENT_OLECREATE(CGMEOLEApp, "GME.Application", 0xC7DCCC2E, 0x1642, 0x4a40, 0x80, 0x60, 0x51, 0xA7, 0xB9, 0xFA, 0xE4, 0x88)
/////////////////////////////////////////////////////////////////////////////
***************
*** 548,551 ****
--- 532,540 ----
panel = new CGMEOLEPanel();
+ panel->SetParams(&(CMainFrame::theInstance->m_console), _T("Console"));
+ coll->Add(panel->GetIDispatch(FALSE));
+ panel->GetIDispatch(FALSE)->Release(); // We do not hold reference, hopefully the collection will hold one
+
+ panel = new CGMEOLEPanel();
panel->SetParams(&(CMainFrame::theInstance->m_partBrowser), _T("Part Browser"));
coll->Add(panel->GetIDispatch(FALSE));
***************
*** 578,581 ****
--- 567,608 ----
}
+ BSTR CGMEOLEApp::GetConsoleContents()
+ {
+ CGMEEventLogger::LogGMEEvent("CGMEOLEApp::GetConsoleContents()\r\n");
+
+ // PRECONDITIONS: None
+
+ CString str = CMainFrame::theInstance->m_console.GetContents();
+
+ return str.AllocSysString();
+ }
+
+ void CGMEOLEApp::SetConsoleContents(LPCTSTR contents)
+ {
+ CGMEEventLogger::LogGMEEvent("CGMEOLEApp::SetConsoleContents()\r\n");
+
+ // PRECONDITIONS: None
+
+ CMainFrame::theInstance->m_console.SetContents(contents);
+ }
+
+ void CGMEOLEApp::ConsoleMessage(LPCTSTR msg, long type)
+ {
+ CGMEEventLogger::LogGMEEvent("CGMEOLEApp::ConsoleMessage()\r\n");
+
+ // PRECONDITIONS: None
+
+ CMainFrame::theInstance->m_console.Message(msg, (short)type);
+ }
+
+ void CGMEOLEApp::ConsoleClear()
+ {
+ CGMEEventLogger::LogGMEEvent("CGMEOLEApp::ConsoleClear()\r\n");
+
+ // PRECONDITIONS: None
+
+ CMainFrame::theInstance->m_console.Clear();
+ }
+
DELEGATE_DUAL_INTERFACE(CGMEOLEApp, Dual)
***************
*** 617,622 ****
TRY_DUAL(IID_IGMEOLEApp)
{
! CString str = pThis->GetVersion();
! str.SetSysString(versionStr);
return NOERROR;
}
--- 644,650 ----
TRY_DUAL(IID_IGMEOLEApp)
{
! // CString str = pThis->GetVersion();
! // str.SetSysString(versionStr);
! *versionStr = pThis->GetVersion();
return NOERROR;
}
***************
*** 699,702 ****
--- 727,755 ----
}
+ STDMETHODIMP CGMEOLEApp::XDual::get_ConsoleContents( BSTR* contents)
+ {
+ METHOD_PROLOGUE(CGMEOLEApp, Dual)
+
+ TRY_DUAL(IID_IGMEOLEApp)
+ {
+ *contents = pThis->GetConsoleContents();
+ return NOERROR;
+ }
+ CATCH_ALL_DUAL
+ }
+
+
+ STDMETHODIMP CGMEOLEApp::XDual::put_ConsoleContents( BSTR contents)
+ {
+ METHOD_PROLOGUE(CGMEOLEApp, Dual)
+
+ TRY_DUAL(IID_IGMEOLEApp)
+ {
+ pThis->SetConsoleContents(CString(contents));
+ return NOERROR;
+ }
+ CATCH_ALL_DUAL
+ }
+
STDMETHODIMP CGMEOLEApp::XDual::CreateProject( BSTR metaname, BSTR connstr)
{
***************
*** 1005,1006 ****
--- 1058,1082 ----
}
+ STDMETHODIMP CGMEOLEApp::XDual::ConsoleMessage(BSTR msg, msgtype_enum type)
+ {
+ METHOD_PROLOGUE(CGMEOLEApp, Dual)
+
+ TRY_DUAL(IID_IGMEOLEApp)
+ {
+ pThis->ConsoleMessage(CString(msg), type);
+ return NOERROR;
+ }
+ CATCH_ALL_DUAL
+ }
+
+ STDMETHODIMP CGMEOLEApp::XDual::ConsoleClear()
+ {
+ METHOD_PROLOGUE(CGMEOLEApp, Dual)
+
+ TRY_DUAL(IID_IGMEOLEApp)
+ {
+ pThis->ConsoleClear();
+ return NOERROR;
+ }
+ CATCH_ALL_DUAL
+ }
Index: GMEOLEApp.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEOLEApp.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** GMEOLEApp.h 22 Jul 2004 16:14:33 -0000 1.3
--- GMEOLEApp.h 24 Jul 2004 06:41:53 -0000 1.4
***************
*** 8,33 ****
//
- class CGMEOLEApp;
-
- class CSingletonFactory: public COleObjectFactory
- {
- public:
- CSingletonFactory(REFCLSID clsid, CRuntimeClass* pRuntimeClass,
- BOOL bMultiInstance, LPCTSTR lpszProgID);
- virtual CCmdTarget* OnCreateObject();
- private:
- CCmdTarget* singleton;
- };
-
- #define DECLARE_OLESINGLECREATE(class_name) \
- public: \
- static AFX_DATA CSingletonFactory factory; \
- static AFX_DATA const GUID guid; \
-
- #define IMPLEMENT_OLESINGLECREATE(class_name, external_name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
- AFX_DATADEF CSingletonFactory class_name::factory(class_name::guid, \
- RUNTIME_CLASS(class_name), FALSE, _T(external_name)); \
- AFX_COMDAT const AFX_DATADEF GUID class_name::guid = \
- { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }; \
/////////////////////////////////////////////////////////////////////////////
--- 8,11 ----
***************
*** 61,65 ****
DECLARE_MESSAGE_MAP()
! DECLARE_OLESINGLECREATE(CGMEOLEApp)
// OLE dispatch map functions
--- 39,43 ----
DECLARE_MESSAGE_MAP()
! DECLARE_OLECREATE(CGMEOLEApp)
// OLE dispatch map functions
***************
*** 80,83 ****
--- 58,63 ----
afx_msg LPDISPATCH GetPanels();
afx_msg void SetPanels(LPDISPATCH newValue);
+ afx_msg BSTR GetConsoleContents();
+ afx_msg void SetConsoleContents(LPCTSTR contents);
afx_msg void CreateProject(LPCTSTR metaname, LPCTSTR connstr);
afx_msg void OpenProject(LPCTSTR connstr);
***************
*** 104,108 ****
afx_msg void ShowAbout();
afx_msg void ShowFCO(LPDISPATCH mgaFCO);
!
DECLARE_DISPATCH_MAP()
--- 84,89 ----
afx_msg void ShowAbout();
afx_msg void ShowFCO(LPDISPATCH mgaFCO);
! afx_msg void ConsoleMessage(LPCTSTR msg, long type);
! afx_msg void ConsoleClear();
DECLARE_DISPATCH_MAP()
***************
*** 119,122 ****
--- 100,105 ----
STDMETHOD(get_MgaProject)(THIS_ IMgaProject** project);
STDMETHOD(get_Panels)(THIS_ IGMEOLEColl** coll);
+ STDMETHOD(put_ConsoleContents)(THIS_ BSTR contents);
+ STDMETHOD(get_ConsoleContents)(THIS_ BSTR* contents);
STDMETHOD(CreateProject)(THIS_ BSTR metaname, BSTR connstr);
***************
*** 144,147 ****
--- 127,132 ----
STDMETHOD(ShowAbout)(THIS);
STDMETHOD(ShowFCO)(THIS_ IMgaFCO* mgaFCO);
+ STDMETHOD(ConsoleMessage)(THIS_ BSTR msg, msgtype_enum type);
+ STDMETHOD(ConsoleClear)(THIS);
END_DUAL_INTERFACE_PART(Dual)
Index: GMEObjectInspector.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEObjectInspector.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** GMEObjectInspector.cpp 15 Apr 2003 20:54:57 -0000 1.12
--- GMEObjectInspector.cpp 24 Jul 2004 06:41:53 -0000 1.13
***************
*** 137,139 ****
CMainFrame::theInstance->ShowObjectInspector();
m_ObjectInspector.ShowPanel(panelID);
! }
\ No newline at end of file
--- 137,139 ----
CMainFrame::theInstance->ShowObjectInspector();
m_ObjectInspector.ShowPanel(panelID);
! }
Index: GmePrintDialog.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GmePrintDialog.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** GmePrintDialog.h 1 Mar 2004 20:12:33 -0000 1.2
--- GmePrintDialog.h 24 Jul 2004 06:41:53 -0000 1.3
***************
*** 29,33 ****
//{{AFX_DATA(CGmePrintDialog)
! enum { IDD = 1538 };
CPreviewBtn m_demo;
CStatic m_scaletxt;
--- 29,33 ----
//{{AFX_DATA(CGmePrintDialog)
! enum { IDD = IDD_PRINT_DIALOG };
CPreviewBtn m_demo;
CStatic m_scaletxt;
Index: MainFrm.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/MainFrm.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** MainFrm.cpp 14 Jun 2004 20:32:46 -0000 1.24
--- MainFrm.cpp 24 Jul 2004 06:41:53 -0000 1.25
***************
*** 64,69 ****
ON_COMMAND(ID_VIEW_PARTBROWSER, OnViewPartbrowser)
ON_COMMAND(ID_VIEW_PANNWIN, OnViewPannWin)
- ON_UPDATE_COMMAND_UI(ID_VIEW_PARTBROWSER, OnUpdateViewPartbrowser)
ON_UPDATE_COMMAND_UI(ID_VIEW_PANNWIN, OnUpdateViewPannWin)
ON_COMMAND(ID_VIEW_BROWSER, OnViewBrowser)
ON_UPDATE_COMMAND_UI(ID_VIEW_BROWSER, OnUpdateViewBrowser)
--- 64,69 ----
ON_COMMAND(ID_VIEW_PARTBROWSER, OnViewPartbrowser)
ON_COMMAND(ID_VIEW_PANNWIN, OnViewPannWin)
ON_UPDATE_COMMAND_UI(ID_VIEW_PANNWIN, OnUpdateViewPannWin)
+ ON_UPDATE_COMMAND_UI(ID_VIEW_PARTBROWSER, OnUpdateViewPartbrowser)
ON_COMMAND(ID_VIEW_BROWSER, OnViewBrowser)
ON_UPDATE_COMMAND_UI(ID_VIEW_BROWSER, OnUpdateViewBrowser)
***************
*** 74,77 ****
--- 74,79 ----
ON_WM_TIMER()
ON_WM_DESTROY()
+ ON_COMMAND(ID_VIEW_CONSOLE, OnViewConsole)
+ ON_UPDATE_COMMAND_UI(ID_VIEW_CONSOLE, OnUpdateViewConsole)
//}}AFX_MSG_MAP
END_MESSAGE_MAP()
***************
*** 196,199 ****
--- 198,213 ----
m_objectInspector.EnableDocking(CBRS_ALIGN_ANY);
+ // CONSOLE
+ if(!m_console.Create(_T("Console"), this, CSize(80, 80),
+ TRUE,IDD_CONSOLE_DIALOG))
+ {
+ TRACE0("Failed to create Console\n");
+ return -1; // fail to create
+ }
+ m_console.SetBarStyle(m_console.GetBarStyle() |
+ CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
+
+ m_console.EnableDocking(CBRS_ALIGN_ANY);
+
***************
*** 223,226 ****
--- 237,245 ----
DockControlBar(&m_objectInspector,AFX_IDW_DOCKBAR_BOTTOM,rc);
+ RecalcLayout(TRUE);
+ m_objectInspector.GetWindowRect(rc);
+ rc.OffsetRect(0, rc.Height());
+ DockControlBar(&m_console,AFX_IDW_DOCKBAR_BOTTOM,rc);
+
// RecalcLayout(TRUE);
***************
*** 448,451 ****
--- 467,482 ----
}
+
+ void CMainFrame::OnViewConsole()
+ {
+ ShowControlBar(&m_console, !m_console.IsVisible(), FALSE);
+ }
+
+ void CMainFrame::OnUpdateViewConsole(CCmdUI* pCmdUI)
+ {
+ pCmdUI->Enable();
+ pCmdUI->SetCheck(m_console.IsVisible());
+ }
+
void CMainFrame::OnEditSearch()
{
***************
*** 714,716 ****
--- 745,748 ----
}
*/
+
Index: MainFrm.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/MainFrm.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** MainFrm.h 15 Jun 2004 15:59:20 -0000 1.19
--- MainFrm.h 24 Jul 2004 06:41:53 -0000 1.20
***************
*** 13,16 ****
--- 13,17 ----
#include "GMEBrowser.h"
#include "GMEObjectInspector.h"
+ #include "GMEConsole.h"
#include "GMESearch.h"
#include "PanningWindow.h"
***************
*** 91,94 ****
--- 92,96 ----
CGMEBrowser m_browser;
CGMEObjectInspector m_objectInspector;
+ CGMEConsole m_console;
CGMESearch m_search;
***************
*** 112,115 ****
--- 114,119 ----
afx_msg void OnTimer(UINT nIDEvent);
afx_msg void OnDestroy();
+ afx_msg void OnViewConsole();
+ afx_msg void OnUpdateViewConsole(CCmdUI* pCmdUI);
//}}AFX_MSG
DECLARE_MESSAGE_MAP()
Index: PanningWindow.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/PanningWindow.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PanningWindow.h 7 May 2004 20:58:25 -0000 1.3
--- PanningWindow.h 24 Jul 2004 06:41:53 -0000 1.4
***************
*** 27,31 ****
CPannWinDlg m_pannWinDlg;
! //{{AFX_MSG(CPartBrowser)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
afx_msg void OnSize(UINT nType, int cx, int cy);
--- 27,31 ----
CPannWinDlg m_pannWinDlg;
! //{{AFX_MSG(CPanningWindow)
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
afx_msg void OnSize(UINT nType, int cx, int cy);
Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/resource.h,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** resource.h 19 Jul 2004 15:22:58 -0000 1.56
--- resource.h 24 Jul 2004 06:41:53 -0000 1.57
***************
*** 71,74 ****
--- 71,75 ----
#define ID_PANNWIN 206
#define IDD_PANNWINDLG 207
+ #define IDD_CONSOLE_DIALOG 209
#define IDC_NAME 1000
#define IDC_TYPENAME 1001
***************
*** 151,154 ****
--- 152,158 ----
#define IDC_PARADIGM_COMMENT 1097
#define IDC_PARADIGM_GUID 1098
+ #define IDC_CONSOLE_CTRL 1100
+ #define IDD_PRINT_DIALOG 1538
+ #define IDD_PRINTSETUP_DIALOG 1539
#define IDD_PARADIGMPROPERTIES_DIALOG 1540
#define ID_CANCEL_EDIT_CNTR 32768
***************
*** 311,314 ****
--- 315,319 ----
#define ID_CNTX_COPYCLOSURE 32961
#define ID_EDIT_COPYCLOSURE 32962
+ #define ID_VIEW_CONSOLE 32963
#define IDC_BTNSELECT 33000
#define IDC_BTNDESELECT 33001
***************
*** 329,336 ****
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
! #define _APS_NEXT_RESOURCE_VALUE 208
! #define _APS_NEXT_COMMAND_VALUE 32963
! #define _APS_NEXT_CONTROL_VALUE 1100
! #define _APS_NEXT_SYMED_VALUE 114
#endif
#endif
--- 334,341 ----
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
! #define _APS_NEXT_RESOURCE_VALUE 211
! #define _APS_NEXT_COMMAND_VALUE 32964
! #define _APS_NEXT_CONTROL_VALUE 1101
! #define _APS_NEXT_SYMED_VALUE 115
#endif
#endif
More information about the GME-commit
mailing list