[GME-commit] GMESRC/GME/Gme resource.h,1.61,1.62 GMEView.h,1.63,1.64 GMEView.cpp,1.157,1.158 GME.rc,1.133,1.134

[gme-commit at list.isis.vanderbilt.edu]

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

Modified Files:
	resource.h GMEView.h GMEView.cpp GME.rc 
Log Message:
violations to console

CVS User: bogyom

Index: resource.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/resource.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** resource.h	29 Oct 2004 17:35:02 -0000	1.61
--- resource.h	12 Nov 2004 15:09:48 -0000	1.62
***************
*** 335,338 ****
--- 335,339 ----
  #define ID_EDIT_COPYSMART               32967
  #define ID_VIEW_REFRESH_SOURCECONTROL   32972
+ #define ID_CNTX_CHECK                   32973
  #define IDC_BTNSELECT                   33000
  #define IDC_BTNDESELECT                 33001
***************
*** 354,358 ****
  #define _APS_3D_CONTROLS                     1
  #define _APS_NEXT_RESOURCE_VALUE        211
! #define _APS_NEXT_COMMAND_VALUE         32973
  #define _APS_NEXT_CONTROL_VALUE         1107
  #define _APS_NEXT_SYMED_VALUE           115
--- 355,359 ----
  #define _APS_3D_CONTROLS                     1
  #define _APS_NEXT_RESOURCE_VALUE        211
! #define _APS_NEXT_COMMAND_VALUE         32974
  #define _APS_NEXT_CONTROL_VALUE         1107
  #define _APS_NEXT_SYMED_VALUE           115

Index: GMEView.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** GMEView.h	29 Oct 2004 17:34:41 -0000	1.63
--- GMEView.h	12 Nov 2004 15:09:49 -0000	1.64
***************
*** 348,352 ****
--- 348,354 ----
  	afx_msg void OnFileCheckSelected();
  	afx_msg void OnCntxInterpret();
+ 	afx_msg void OnCntxCheck();
  	afx_msg void OnUpdateCntxInterpret(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateCntxCheck(CCmdUI* pCmdUI);
  	afx_msg void OnCntxRegistry();
  	afx_msg void OnEditRegistry();

Index: GMEView.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.cpp,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** GMEView.cpp	29 Oct 2004 17:34:41 -0000	1.157
--- GMEView.cpp	12 Nov 2004 15:09:49 -0000	1.158
***************
*** 330,334 ****
--- 330,336 ----
  	ON_COMMAND(ID_FILE_CHECKSEL, OnFileCheckSelected)
  	ON_COMMAND(ID_CNTX_INTERPRET, OnCntxInterpret)
+ 	ON_COMMAND(ID_CNTX_CHECK, OnCntxCheck)
  	ON_UPDATE_COMMAND_UI(ID_CNTX_INTERPRET, OnUpdateCntxInterpret)
+ 	ON_UPDATE_COMMAND_UI(ID_CNTX_CHECK, OnUpdateCntxCheck)
  	ON_COMMAND(ID_CNTX_REGISTRY, OnCntxRegistry)
  	ON_COMMAND(ID_EDIT_REGISTRY, OnEditRegistry)
***************
*** 5283,5286 ****
--- 5285,5313 ----
  }
  
+ void CGMEView::OnCntxCheck()
+ {
+ 	CGMEEventLogger::LogGMEEvent("CGMEView::OnCntxCheck\r\n");
+ 	CGMEEventLogger::LogGMEEvent("    Selected FCOs:");
+ 	GMEEVENTLOG_GUIFCOS(selected);
+ 
+ 	ASSERT(theApp.mgaConstMgr);
+ 	if(!theApp.mgaConstMgr) 
+ 		return;
+ 
+ 	MSGTRY
+ 	{
+ 		CComPtr<IMgaFCO> selfco;
+ 
+ 		if (selected.IsEmpty())
+ 			selfco = currentModel;
+ 		else
+ 		{
+ 			POSITION pos = selected.GetHeadPosition();
+ 			selfco = selected.GetNext(pos)->mgaFco;
+ 		}
+ 		theApp.mgaConstMgr->ObjectsInvokeEx(theApp.mgaProject, selfco, NULL, NULL);
+ 	}
+ 	MSGCATCH("Error while trying to check the selected or current model",;)
+ }
  
  void CGMEView::OnCntxInterpret()
***************
*** 5316,5319 ****
--- 5343,5350 ----
  }
  
+ void CGMEView::OnUpdateCntxCheck(CCmdUI* pCmdUI)
+ {
+ 	pCmdUI->Enable(!selected.IsEmpty()  ||  currentModel != NULL); 
+ }
  
  void CGMEView::OnUpdateCntxInterpret(CCmdUI* pCmdUI)

Index: GME.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GME.rc,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** GME.rc	9 Nov 2004 20:43:39 -0000	1.133
--- GME.rc	12 Nov 2004 15:09:49 -0000	1.134
***************
*** 376,379 ****
--- 376,380 ----
          MENUITEM SEPARATOR
          MENUITEM "Interpret",                   ID_CNTX_INTERPRET
+         MENUITEM "Check",                       ID_CNTX_CHECK
          MENUITEM SEPARATOR
          MENUITEM "Help",                        ID_CNTX_HELP
***************
*** 492,495 ****
--- 493,497 ----
          MENUITEM SEPARATOR
          MENUITEM "Interpret",                   ID_CNTX_INTERPRET
+         MENUITEM "Check",                       ID_CNTX_CHECK
          MENUITEM SEPARATOR
          MENUITEM "Help",                        ID_CNTX_HELP
***************
*** 559,563 ****
  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
--- 561,565 ----
  FONT 10, "MS Sans Serif"
  BEGIN
!     CTEXT           "4.11.10",IDC_STATIC,11,65,152,8,SS_NOPREFIX
      CTEXT           "Copyright © 2000-2004 Vanderbilt University",IDC_STATIC,
                      10,75,152,8
***************
*** 1424,1427 ****
--- 1426,1430 ----
  BEGIN
      ID_CNTX_INTERPRET       "Interpret selected models"
+     ID_CNTX_CHECK			"Check selected or current model"
      ID_EDIT_SYNC            "Synchronize object positions between aspects\nSynchronize aspects"
      ID_EDIT_SELECTALL       "Select all objects in current aspect\nSelect All"