[GME-commit] GMESRC/GME/Gme GMEView.cpp,1.125,1.126

gme-commit at list.isis.vanderbilt.edu gme-commit at list.isis.vanderbilt.edu
Fri Mar 5 16:04:18 CST 2004


Update of /var/lib/gme/GMESRC/GME/Gme
In directory braindrain:/tmp/cvs-serv4100

Modified Files:
	GMEView.cpp 
Log Message:
Lots of changes to Event Logging for more context information.

CVS User: brianw

Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.125
retrieving revision 1.126
diff -C2 -d -r1.125 -r1.126
*** GMEView.cpp	4 Mar 2004 14:10:43 -0000	1.125
--- GMEView.cpp	5 Mar 2004 22:04:16 -0000	1.126
***************
*** 1006,1009 ****
--- 1006,1010 ----
  void CGMEView::OnPrint(CDC* pDC, CPrintInfo* pInfo)
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnPrint\r\n");
  	CGmePrintDialog* pdlg = (CGmePrintDialog*)(pInfo->m_pPD);
  	int headerY = 0;
***************
*** 1541,1545 ****
  void CGMEView::ShowAttributes()	// currentModel
  {
! 	CGMEEventLogger::LogGMEEvent("CGMEView::ShowAttributes()\r\n");
  	ChangeAttrPrefFco();
  
--- 1542,1546 ----
  void CGMEView::ShowAttributes()	// currentModel
  {
! 	CGMEEventLogger::LogGMEEvent("CGMEView::ShowAttributes() on "+path+name+"\r\n");
  	ChangeAttrPrefFco();
  
***************
*** 1612,1616 ****
  void CGMEView::SetBgColor()
  {
- 	CGMEEventLogger::LogGMEEvent("CGMEView::SetBgColor in "+path+name+"\r\n");
  	if(currentModel != 0) {
  		try {
--- 1613,1616 ----
***************
*** 1674,1678 ****
  void CGMEView::ShowModel(CComPtr<IMgaModel> model,CString *aspect)
  {
- 	CGMEEventLogger::LogGMEEvent("CGMEView::ShowModel in "+path+name+"\r\n");
  	CString newAspect = aspect ? *aspect : currentAspect->name;
  	CGMEDoc *doc = GetDocument();
--- 1674,1677 ----
***************
*** 1863,1866 ****
--- 1862,1866 ----
  		// TODO: Connections
  		if (guiObj) {
+ 			CGMEEventLogger::LogGMEEvent("CGMEView::SetCenterObject("+guiObj->GetName()+" "+guiObj->GetID()+") in "+path+name+"\r\n");
  			if (!guiObj->IsVisible()) {
  				int aspNum = guiMeta->aspects.GetCount();
***************
*** 2066,2069 ****
--- 2066,2073 ----
  void CGMEView::DisconnectAll(CGuiObject *end,CGuiPort *endPort,bool onlyVisible)
  {
+ 	if(endPort)
+ 		CGMEEventLogger::LogGMEEvent("CGMEView::DisconnectAll(end="+end->GetName()+" "+end->GetID()+" endPort="+endPort->GetName()+" "+endPort->GetID()+")\r\n");
+ 	else
+ 		CGMEEventLogger::LogGMEEvent("CGMEView::DisconnectAll(end="+end->GetName()+" "+end->GetID()+")\r\n");
  	CGuiConnectionList conns;
  	FindConnections(end,endPort,conns);
***************
*** 2116,2119 ****
--- 2120,2124 ----
  bool CGMEView::DeleteConnection(CGuiConnection *guiConn,bool checkAspect)
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::DeleteConnection("+guiConn->GetName()+" "+guiConn->GetID()+") in "+path+name+"\r\n");
  	bool ok = false;
  	BeginWaitCursor();
***************
*** 2157,2160 ****
--- 2162,2166 ----
  {
  	try {
+ 		CGMEEventLogger::LogGMEEvent("CGMEView::DeleteObjects in "+path+name+"\r\n");
  		CString msg;
  		if(!CheckBeforeDeleteObjects(objectList,msg)) {
***************
*** 2164,2167 ****
--- 2170,2174 ----
  		BeginWaitCursor();
  		BeginTransaction();
+ 		GMEEVENTLOG_GUIOBJS(objectList);
  		POSITION pos = objectList.GetHeadPosition();
  		while(pos) {
***************
*** 2213,2216 ****
--- 2220,2225 ----
  {
  	try {
+ 		CGMEEventLogger::LogGMEEvent("CGMEView::DeleteAnnotations() in "+path+name+"\r\n");
+ 		GMEEVENTLOG_GUIANNOTATORS(annotatorList);
  		BeginWaitCursor();
  		BeginTransaction();
***************
*** 2783,2786 ****
--- 2792,2796 ----
  bool CGMEView::Connect(CGuiObject *src,CGuiPort *srcPort, int srcHotSide, CGuiObject *dst,CGuiPort *dstPort, int dstHotSide, bool nosticky)
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::Connect src="+src->GetName()+" "+src->GetID()+",dst="+dst->GetName()+" "+dst->GetID()+" in "+path+name+"\r\n");
  	bool ret = false;
  	CGMEDoc *doc = GetDocument();
***************
*** 2794,2800 ****
--- 2804,2812 ----
  		if (srcPort) {
  			srcPort = srcPort->IsRealPort() ? srcPort : NULL;
+ 			if (srcPort) CGMEEventLogger::LogGMEEvent("    srcPort="+srcPort->GetName()+" "+srcPort->GetID()+"\r\n");
  		}
  		if (dstPort) {
  			dstPort = dstPort->IsRealPort() ? dstPort : NULL;
+ 			if (dstPort) CGMEEventLogger::LogGMEEvent("    dstPort="+dstPort->GetName()+" "+dstPort->GetID()+"\r\n");
  		}
  #pragma warning(disable: 4310) // cast truncates constant value
***************
*** 2887,2890 ****
--- 2899,2903 ----
  			CommitTransaction();
  			AfxMessageBox("Paradigm violation: cannot connect selected objects!",MB_ICONSTOP | MB_OK);
+ 			CGMEEventLogger::LogGMEEvent("    Paradigm violation: cannot connect selected objects!\r\n");
  		}
  	}
***************
*** 2906,2909 ****
--- 2919,2923 ----
  void CGMEView::InsertNewPart(CString roleName,CPoint pt)
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::InsertNewPart("+roleName+") in "+path+name+"\r\n");
  	CComPtr<IMgaFCO> child;
  	CComPtr<IMgaMetaRole> role;
***************
*** 2950,2953 ****
--- 2964,2968 ----
  void CGMEView::ChangeAspect(CString aspName)
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::ChangeAspect("+aspName+") in "+path+name+"\r\n");
  	if(currentAspect->name != aspName) {
  		CGuiMetaAspect *newAsp = guiMeta->FindAspect(aspName);
***************
*** 2982,2985 ****
--- 2997,3001 ----
  	VERIFY(am);
  	ChangeAspect(am->name);
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::ChangeAspect("+am->name+") in "+path+name+"\r\n");
  }
  
***************
*** 3110,3113 ****
--- 3126,3130 ----
  bool CGMEView::ChangePrnAspect(CString aspName)
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::ChangePrnAspect("+aspName+") in "+path+name+"\r\n");
  	if(currentAspect->name == aspName)
  		return true;
***************
*** 3154,3157 ****
--- 3171,3175 ----
  		case GME_EDIT_MODE:
  			{
+ 				CGMEEventLogger::LogGMEEvent("    mode=GME_EDIT_MODE\r\n");
  				CGuiObject *selection = FindObject(point);
  				CGuiAnnotator *annotation = selection ? NULL : FindAnnotation(point);
***************
*** 3161,3164 ****
--- 3179,3183 ----
  				if((selection != 0) || (annotation != 0)) {
  					if (selection) {
+ 						CGMEEventLogger::LogGMEEvent("    LButton over "+selection->GetName()+" "+selection->GetID()+"\r\n"); 
  						alreadySelected = selected.Find(selection);
  						if(alreadySelected)
***************
*** 3171,3174 ****
--- 3190,3194 ----
  					}
  					if (annotation) {
+ 						CGMEEventLogger::LogGMEEvent("    LButton over "+annotation->GetName()+"\r\n"); 
  						alreadySelected = selectedAnnotations.Find(annotation);
  						if(alreadySelected)
***************
*** 3310,3313 ****
--- 3330,3334 ----
  		case GME_AUTOCONNECT_MODE:
  			{
+ 				CGMEEventLogger::LogGMEEvent("    mode=GME_AUTOCONNECT_MODE\r\n");
  				if(connTmp) {
  					if(connSrc == 0) {
***************
*** 3327,3330 ****
--- 3348,3352 ----
  		case GME_DISCONNECT_MODE:
  			{
+ 				CGMEEventLogger::LogGMEEvent("    mode=GME_DISCONNECT_MODE\r\n");
  				CGuiObject *selection = FindObject(point);
  				if(selection) {
***************
*** 3373,3376 ****
--- 3395,3399 ----
  		case GME_SET_MODE:
  			{
+ 				CGMEEventLogger::LogGMEEvent("    mode=GME_SET_MODE\r\n");
  				if(!currentSet)
  					break;
***************
*** 3380,3383 ****
--- 3403,3407 ----
  					CGuiObject *object = FindObject(point);
  					if(object) {
+ 						CGMEEventLogger::LogGMEEvent("    LButton over "+object->GetName()+" "+object->GetID()+"\r\n");
  						if(currentSet->CheckMember(object))
  							fco = object;
***************
*** 3409,3412 ****
--- 3433,3437 ----
  		case GME_ZOOM_MODE:
  			{
+ 				CGMEEventLogger::LogGMEEvent("    mode=GME_ZOOM_MODE\r\n");
  				ZoomIn();
  				Invalidate();
***************
*** 3415,3420 ****
--- 3440,3447 ----
  		case GME_VISUAL_MODE:
  			{
+ 				CGMEEventLogger::LogGMEEvent("    mode=GME_VISUAL_MODE\r\n");
  				CGuiObject *obj = FindObject(point);
  				if(obj) {
+ 					CGMEEventLogger::LogGMEEvent("    LButton over "+obj->GetName()+" "+obj->GetID()+"\r\n");
  					obj->ToggleGrayOut();
  					CGuiFco::GrayOutNonInternalConnections(connections);
***************
*** 3424,3427 ****
--- 3451,3455 ----
  					CGuiConnection *conn = router.FindConnection(point);
  					if(conn) {
+ 						CGMEEventLogger::LogGMEEvent("    LButton over "+conn->GetName()+" "+conn->GetID()+"\r\n");
  						conn->ToggleGrayOut();
  						conn->GrayOutEndPoints();
***************
*** 3431,3434 ****
--- 3459,3463 ----
  						CGuiAnnotator *ann = FindAnnotation(point);
  						if (ann) {
+ 							CGMEEventLogger::LogGMEEvent("    LButton over "+ann->GetName()+"\r\n");
  							ann->ToggleGrayOut();
  							Invalidate();
***************
*** 3456,3459 ****
--- 3485,3489 ----
  
  		if(selection) {
+ 			CGMEEventLogger::LogGMEEvent(    "LButton double clicked on "+selection->GetName()+" "+selection->GetID()+"\r\n");
  			CString aspectName = currentAspect->name;;
  			CComPtr<IMgaFCO> mgaFco = selection->mgaFco;
***************
*** 3529,3532 ****
--- 3559,3563 ----
  		}
  		else if (annotation) {
+ 			CGMEEventLogger::LogGMEEvent(    "LButton double clicked on "+annotation->GetName()+"\r\n");
  			CComPtr<IMgaFCO> fcoToShow;
  			currentModel.QueryInterface(&fcoToShow);
***************
*** 3553,3556 ****
--- 3584,3591 ----
  		contextAnnotation = NULL;
  	}
+ 	if(contextSelection)
+ 		CGMEEventLogger::LogGMEEvent("    RButton over "+contextSelection->GetName()+" "+contextSelection->GetID()+"\r\n");
+ 	else if(contextAnnotation)
+ 		CGMEEventLogger::LogGMEEvent("    RButton over "+contextAnnotation->GetName()+"\r\n");
  
  	CGMEDoc *doc = GetDocument();
***************
*** 3558,3561 ****
--- 3593,3597 ----
  	case GME_SET_MODE:
  		{
+ 			CGMEEventLogger::LogGMEEvent("    mode=GME_SET_MODE\r\n");
  			selected.RemoveAll();
  			selectedAnnotations.RemoveAll();
***************
*** 3589,3592 ****
--- 3625,3629 ----
  	case GME_ZOOM_MODE:
  		{
+ 			CGMEEventLogger::LogGMEEvent("    mode=GME_ZOOM_MODE\r\n");
  			ZoomOut();
  			Invalidate();
***************
*** 3595,3598 ****
--- 3632,3636 ----
  	case GME_VISUAL_MODE:
  		{
+ 			CGMEEventLogger::LogGMEEvent("    mode=GME_VISUAL_MODE\r\n");
  			CGuiObject *obj = dynamic_cast<CGuiObject *>(contextSelection);
  			if(obj) {
***************
*** 3619,3622 ****
--- 3657,3661 ----
  	case GME_EDIT_MODE:
  		{
+ 			CGMEEventLogger::LogGMEEvent("    mode=GME_EDIT_MODE\r\n");
  			CPoint global = point;
  			ClientToScreen(&global);
***************
*** 3683,3688 ****
--- 3722,3729 ----
  
  	case GME_AUTOCONNECT_MODE:
+ 		CGMEEventLogger::LogGMEEvent("    mode=GME_AUTOCONNECT_MODE\r\n");
  	case GME_DISCONNECT_MODE:
  		{
+ 			CGMEEventLogger::LogGMEEvent("    mode=GME_DISCONNECT_MODE\r\n");
  			CPoint global = point;
  			ClientToScreen(&global);
***************
*** 3748,3753 ****
  DROPEFFECT CGMEView::OnDragOver(COleDataObject* pDataObject, DWORD dwKeyState, CPoint point)
  {
! 	//CGMEEventLogger::LogGMEEvent("CGMEView::OnDragOver in "+path+name+"\r\n"); 
! 	//this event happens too much, logfile size was exploding
  	if(!CGMEDataSource::IsGmeNativeDataAvailable(pDataObject,theApp.mgaProject))
  //	if(!pDataObject->IsDataAvailable(CGMEDataSource::cfGMEDesc))
--- 3789,3794 ----
  DROPEFFECT CGMEView::OnDragOver(COleDataObject* pDataObject, DWORD dwKeyState, CPoint point)
  {
! 	CGMEEventLogger::LogGMEEvent("CGMEView::OnDragOver in "+path+name+"\r\n"); 
! 	//this event happens too much, logfile size could explode...
  	if(!CGMEDataSource::IsGmeNativeDataAvailable(pDataObject,theApp.mgaProject))
  //	if(!pDataObject->IsDataAvailable(CGMEDataSource::cfGMEDesc))
***************
*** 3761,3764 ****
--- 3802,3807 ----
  	CoordinateTransfer(point);
  	CGuiObject *obj = FindObject(point);
+ 	if(obj)
+ 		CGMEEventLogger::LogGMEEvent("    Dragging over: "+obj->GetName()+" "+obj->GetID()+" in "+path+name+"\r\n");//better this way, not logging dragging over empty space
  	CGuiObject *ref = dynamic_cast<CGuiReference *>(obj);
  	if(!ref)
***************
*** 3803,3806 ****
--- 3846,3857 ----
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::OnDrop in "+path+name+"\r\n");
+ 	if(dropEffect & DROPEFFECT_MOVE)
+ 		CGMEEventLogger::LogGMEEvent("    DROPEFFECT_MOVE\r\n");
+ 	if(dropEffect & DROPEFFECT_LINK)
+ 		CGMEEventLogger::LogGMEEvent("    DROPEFFECT_LINK\r\n");
+ 	if(dropEffect & DROPEFFECT_COPY)
+ 		CGMEEventLogger::LogGMEEvent("    DROPEFFECT_COPY\r\n");
+ 	if(dropEffect == DROPEFFECT_NONE) //DROPEFFECT_NONE==0
+ 		CGMEEventLogger::LogGMEEvent("    DROPEFFECT_NONE\r\n");
  	ASSERT_VALID(this);
  	CGMEDoc* pDoc = GetDocument();
***************
*** 3821,3824 ****
--- 3872,3878 ----
  		{
  			ASSERT((selected.GetCount() + selectedAnnotations.GetCount()) > 0);
+ 			CGMEEventLogger::LogGMEEvent("    Dropping:\r\n");
+ 			GMEEVENTLOG_GUIOBJS(selected);
+ 			GMEEVENTLOG_GUIANNOTATORS(selectedAnnotations);
  			Invalidate();
  
***************
*** 3854,3857 ****
--- 3908,3912 ----
  			catch(hresult_exception e) {
  				AbortTransaction(e.hr);
+ 				CGMEEventLogger::LogGMEEvent("    Unable to complete drop operation.\r\n");
  				AfxMessageBox("Unable to complete drop operation",MB_ICONSTOP | MB_OK);
  				Reset(true);
***************
*** 3881,3884 ****
--- 3936,3940 ----
  		return TRUE;
  	}
+ 	CGMEEventLogger::LogGMEEvent("    Nothing Dropped\r\n");
  	return FALSE;
  }
***************
*** 4250,4254 ****
  		CGuiObject *guiObj = dynamic_cast<CGuiObject *>(contextSelection);
  		if(guiObj) {
! 			CGMEEventLogger::LogGMEEvent("    "+guiObj->GetName()+"\r\n");
  			CGuiObjectList list;
  			CGuiAnnotatorList dummyList;
--- 4306,4310 ----
  		CGuiObject *guiObj = dynamic_cast<CGuiObject *>(contextSelection);
  		if(guiObj) {
! 			CGMEEventLogger::LogGMEEvent("    "+guiObj->GetName()+" "+guiObj->GetID()+"\r\n");
  			CGuiObjectList list;
  			CGuiAnnotatorList dummyList;
***************
*** 4264,4268 ****
  	}
  	else if (contextAnnotation) {
! 		CGMEEventLogger::LogGMEEvent(contextAnnotation->GetName()+"/r/n");
  		CGuiObjectList dummyList;
  		CGuiAnnotatorList list;
--- 4320,4324 ----
  	}
  	else if (contextAnnotation) {
! 		CGMEEventLogger::LogGMEEvent("    "+contextAnnotation->GetName()+"/r/n");
  		CGuiObjectList dummyList;
  		CGuiAnnotatorList list;
***************
*** 4284,4288 ****
  		CGuiObject *guiObj = dynamic_cast<CGuiObject *>(contextSelection);
  		if(guiObj) {
! 			CGMEEventLogger::LogGMEEvent(guiObj->GetName()+"\r\n");
  			CGuiObjectList list;
  			CGuiAnnotatorList dummyList;
--- 4340,4344 ----
  		CGuiObject *guiObj = dynamic_cast<CGuiObject *>(contextSelection);
  		if(guiObj) {
! 			CGMEEventLogger::LogGMEEvent("    "+guiObj->GetName()+" "+guiObj->GetID()+"\r\n");
  			CGuiObjectList list;
  			CGuiAnnotatorList dummyList;
***************
*** 4299,4303 ****
  	}
  	else if (contextAnnotation) {
! 		CGMEEventLogger::LogGMEEvent(contextAnnotation->GetName()+"/r/n");
  		CGuiObjectList dummyList;
  		CGuiAnnotatorList list;
--- 4355,4359 ----
  	}
  	else if (contextAnnotation) {
! 		CGMEEventLogger::LogGMEEvent("    "+contextAnnotation->GetName()+"/r/n");
  		CGuiObjectList dummyList;
  		CGuiAnnotatorList list;
***************
*** 4325,4329 ****
  		CGuiObject *guiObj = dynamic_cast<CGuiObject *>(contextSelection);
  		if(guiObj) {
! 			CGMEEventLogger::LogGMEEvent(guiObj->GetName()+"\r\n");
  			CGuiObjectList list;
  			list.AddTail(guiObj);
--- 4381,4385 ----
  		CGuiObject *guiObj = dynamic_cast<CGuiObject *>(contextSelection);
  		if(guiObj) {
! 			CGMEEventLogger::LogGMEEvent("    "+guiObj->GetName()+" "+guiObj->GetID()+"\r\n");
  			CGuiObjectList list;
  			list.AddTail(guiObj);
***************
*** 4333,4337 ****
  	}
  	if(isType && contextAnnotation) {
! 		CGMEEventLogger::LogGMEEvent(contextAnnotation->GetName()+"/r/n");
  		CGuiAnnotatorList list;
  		list.AddTail(contextAnnotation);
--- 4389,4393 ----
  	}
  	if(isType && contextAnnotation) {
! 		CGMEEventLogger::LogGMEEvent("    "+contextAnnotation->GetName()+"/r/n");
  		CGuiAnnotatorList list;
  		list.AddTail(contextAnnotation);
***************
*** 4348,4351 ****
--- 4404,4408 ----
  void CGMEView::OnSelfcntxCopy()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnSelfcntxCopy in "+path+name+"\r\n");
  	OnEditCopy();
  }
***************
*** 4378,4381 ****
--- 4435,4439 ----
  void CGMEView::OnSelfcntxPaste()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnSelfcntxPaste in "+path+name+"\r\n");
  	if(isType) {
  		COleDataObject clipboardData;
***************
*** 4393,4396 ****
--- 4451,4460 ----
  void CGMEView::OnActivateView(BOOL bActivate, CView* pActivateView, CView* pDeactiveView)
  {
+ 	CString s = bActivate ? "ACTIVATE ":"DEACTIVATE ";
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnActivateView "+s+path+name+"\r\n");
+ 	//I tried logging pActivateView and pDeactiveView, but they always seemed to be "this"
+ 	//anyways, OnActivateView is called on both views, so you would know if going from
+ 	//one to another by the ACTIVATE/DEACTIVATE - Brian
+ 	
  	if(bActivate) {
  		modelGrid.Clear();
***************
*** 4471,4474 ****
--- 4535,4540 ----
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::OnRunComponent "+compname+" in "+path+name+"\r\n");
+ 	CGMEEventLogger::LogGMEEvent("    Selected FCOs:");
+ 	GMEEVENTLOG_GUIFCOS(selected);
  	MSGTRY
  	{
***************
*** 4528,4531 ****
--- 4594,4598 ----
  	if(obj) {
  		try {
+ 			CGMEEventLogger::LogGMEEvent("    "+obj->GetName()+" "+obj->GetID()+"\r\n");
  			BeginTransaction();
  			CComPtr<IMgaReference> mgaRef;
***************
*** 4543,4546 ****
--- 4610,4614 ----
  		if(set) {
  			try {
+ 				CGMEEventLogger::LogGMEEvent("    "+set->GetName()+" "+set->GetID()+"\r\n");
  				BeginTransaction();
  				CComPtr<IMgaSet> mgaSet;
***************
*** 4574,4577 ****
--- 4642,4646 ----
  	if(obj) {
  		try {
+ 			CGMEEventLogger::LogGMEEvent("    "+obj->GetName()+" "+obj->GetID()+"\r\n");
  			BeginTransaction();
  			CComPtr<IMgaReference> mgaRef;
***************
*** 4588,4591 ****
--- 4657,4661 ----
  		if(set) {
  			try {
+ 				CGMEEventLogger::LogGMEEvent("    "+set->GetName()+" "+set->GetID()+"\r\n");
  				BeginTransaction();
  				CComPtr<IMgaSet> mgaSet;
***************
*** 4630,4634 ****
--- 4700,4707 ----
  	CComPtr<IMgaFCO> fco;
  	if(contextSelection)
+ 	{
+ 		CGMEEventLogger::LogGMEEvent("    "+contextSelection->GetName()+" "+contextSelection->GetID()+"\r\n");
  		fco = contextSelection->mgaFco;
+ 	}
  	else
  		currentModel.QueryInterface(&fco);
***************
*** 4683,4687 ****
  void CGMEView::OnUpdateCntxShowtype(CCmdUI* pCmdUI)
  {
- 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxShowtype in "+path+name+"\r\n");
  	bool type = (contextSelection ? contextSelection->IsType() : isType);
  	bool model = (contextSelection ? (dynamic_cast<CGuiModel *>(contextSelection) != 0) : true);
--- 4756,4759 ----
***************
*** 4744,4747 ****
--- 4816,4820 ----
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::OnFileCheckSelected in "+path+name+"\r\n");
+ 	GMEEVENTLOG_GUIOBJS(selected);
  	POSITION pos = selected.GetHeadPosition();
  	if(pos)
***************
*** 4775,4778 ****
--- 4848,4853 ----
  {
  	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxInterpret in "+path+name+"\r\n");
+ 	CGMEEventLogger::LogGMEEvent("    Selected FCOs:");
+ 	GMEEVENTLOG_GUIFCOS(selected);
  	MSGTRY
  	{
***************
*** 4813,4817 ****
--- 4888,4895 ----
  	CComPtr<IMgaFCO> fco;
  	if(contextSelection)
+ 	{
+ 		CGMEEventLogger::LogGMEEvent("    "+contextSelection->GetName()+" "+contextSelection->GetID()+"\r\n");
  		fco = contextSelection->mgaFco;
+ 	}
  	else
  		currentModel.QueryInterface(&fco);
***************
*** 4842,4845 ****
--- 4920,4924 ----
  void CGMEView::ShowRegistryBrowser(CComPtr<IMgaFCO> fco)
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::ShowRegistryBrowser in "+path+name+"\r\n");
  	try {
  		BeginTransaction();
***************
*** 4858,4861 ****
--- 4937,4941 ----
  void CGMEView::ShowAnnotationBrowser(CComPtr<IMgaFCO> fco, CComPtr<IMgaRegNode> focus)
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::ShowAnnotationBrowser in "+path+name+"\r\n");
  	try {
  		BeginTransaction();
***************
*** 4937,4941 ****
  void CGMEView::SyncAspects(CGuiMetaAspect *srcAspect, CGuiMetaAspectList &dstAspects, CGuiObjectList &movingObjects, CGuiObjectList &sedentaryObjects,  bool priorityForSrcVisible, bool priorityForSelected)
  {
! 
  	try {
  		BeginTransaction(TRANSACTION_GENERAL);
--- 5017,5021 ----
  void CGMEView::SyncAspects(CGuiMetaAspect *srcAspect, CGuiMetaAspectList &dstAspects, CGuiObjectList &movingObjects, CGuiObjectList &sedentaryObjects,  bool priorityForSrcVisible, bool priorityForSelected)
  {
! 	CGMEEventLogger::LogGMEEvent("CGMEView::SyncAspects in "+path+name+"\r\n");
  	try {
  		BeginTransaction(TRANSACTION_GENERAL);
***************
*** 5449,5452 ****
--- 5529,5533 ----
  void CGMEView::OnCntxSrcarSouth()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxSrcarSouth in "+path+name+"\r\n");
  	SwapAutoRouterPref( "S" );
  }
***************
*** 5454,5457 ****
--- 5535,5539 ----
  void CGMEView::OnCntxSrcarNorth()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxSrcarNorth in "+path+name+"\r\n");
  	SwapAutoRouterPref( "N" );
  }
***************
*** 5459,5462 ****
--- 5541,5545 ----
  void CGMEView::OnCntxSrcarEast()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxSrcarEast in "+path+name+"\r\n");
  	SwapAutoRouterPref( "E" );
  }
***************
*** 5464,5467 ****
--- 5547,5551 ----
  void CGMEView::OnCntxSrcarWest()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxSrcarWest in "+path+name+"\r\n");
  	SwapAutoRouterPref( "W" );
  }
***************
*** 5469,5472 ****
--- 5553,5557 ----
  void CGMEView::OnCntxDstarEast()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxDstarEast in "+path+name+"\r\n");
  	SwapAutoRouterPref( "e" );
  }
***************
*** 5474,5477 ****
--- 5559,5563 ----
  void CGMEView::OnCntxDstarNorth()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxDstarNorth in "+path+name+"\r\n");
  	SwapAutoRouterPref( "n" );
  }
***************
*** 5479,5482 ****
--- 5565,5569 ----
  void CGMEView::OnCntxDstarSouth()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxDstarSouth in "+path+name+"\r\n");
  	SwapAutoRouterPref( "s" );
  }
***************
*** 5484,5487 ****
--- 5571,5575 ----
  void CGMEView::OnCntxDstarWest()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxDstarWest in "+path+name+"\r\n");
  	SwapAutoRouterPref( "w" );
  }
***************
*** 5489,5492 ****
--- 5577,5581 ----
  void CGMEView::OnCntxDstarClear()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxDstarClear in "+path+name+"\r\n");
  	SetAllAutoRouterPref( false, true );
  }
***************
*** 5494,5497 ****
--- 5583,5587 ----
  void CGMEView::OnCntxSrcarClear()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxSrcarClear in "+path+name+"\r\n");
  	SetAllAutoRouterPref( true, true );
  }
***************
*** 5499,5502 ****
--- 5589,5593 ----
  void CGMEView::OnCntxDstarSet()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxDstarSet in "+path+name+"\r\n");
  	SetAllAutoRouterPref( false, false );
  }
***************
*** 5504,5507 ****
--- 5595,5599 ----
  void CGMEView::OnCntxSrcarSet()
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxSrcarSet in "+path+name+"\r\n");
  	SetAllAutoRouterPref( true, false );
  }
***************
*** 5509,5513 ****
--- 5601,5607 ----
  void CGMEView::SwapAutoRouterPref( const CString& strP )
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::SwapAutoRouterPref in "+path+name+"\r\n");
  	if( contextSelection ) {
+ 		CGMEEventLogger::LogGMEEvent("    "+contextSelection->GetName()+" "+contextSelection->GetID()+"\r\n");
  		CComPtr<IMgaFCO> spFCO = contextSelection->mgaFco;
  		if ( spFCO ) {
***************
*** 5532,5536 ****
--- 5626,5632 ----
  void CGMEView::SetAllAutoRouterPref( bool bSrc, bool bClear )
  {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::SetAllAutoRouterPref in "+path+name+"\r\n");
  	if( contextSelection ) {
+ 		CGMEEventLogger::LogGMEEvent("    "+contextSelection->GetName()+" "+contextSelection->GetID()+"\r\n");
  		CComPtr<IMgaFCO> spFCO = contextSelection->mgaFco;
  		if ( spFCO ) {



More information about the GME-commit mailing list