[GME-commit] GMESRC/GME/Gme PartBrowserDlg.h, 1.3, 1.4 PartBrowserDlg.cpp, 1.6, 1.7 PartBrowser.h, 1.4, 1.5 MainFrm.cpp, 1.36, 1.37 MainFrm.h, 1.27, 1.28

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

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv23819

Modified Files:
	PartBrowserDlg.h PartBrowserDlg.cpp PartBrowser.h MainFrm.cpp 
	MainFrm.h 
Log Message:
Minor changes for the new AspectCycling and Navigation features.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: PartBrowserDlg.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/PartBrowserDlg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PartBrowserDlg.h	13 Aug 2001 17:19:00 -0000	1.3
--- PartBrowserDlg.h	7 Mar 2007 22:22:52 -0000	1.4
***************
*** 40,43 ****
--- 40,44 ----
  	void SetBgColor(COLORREF bgColor);
  	void ChangeAspect(int ind);
+ 	void CycleAspect();
  	void SetTabs();
  	void Resize();

Index: PartBrowserDlg.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/PartBrowserDlg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PartBrowserDlg.cpp	7 Feb 2003 15:22:47 -0000	1.6
--- PartBrowserDlg.cpp	7 Mar 2007 22:22:52 -0000	1.7
***************
*** 144,145 ****
--- 144,161 ----
  	*pResult = 0;
  }
+ 
+ void CPartBrowserDlg::CycleAspect()
+ {
+ 	if( !guiMetaModel
+ 	 || guiMetaModel->aspects.GetCount() == 0
+ 	 || !CGMEDoc::theInstance) 
+ 	 return;
+ 
+ 	int ind = ( tab.GetCurSel() + 1) % guiMetaModel->aspects.GetCount();
+ 	tab.SetCurSel(ind);
+ 
+ 	partFrame.pane.ChangeAspect( ind);
+ 	CGMEDoc::theInstance->ChangeAspects( CGMEView::GetActiveView()->GetAspectName( ind));
+ 
+ 	Resize();
+ }
\ No newline at end of file

Index: PartBrowser.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/PartBrowser.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PartBrowser.h	12 Jan 2005 17:53:16 -0000	1.4
--- PartBrowser.h	7 Mar 2007 22:22:52 -0000	1.5
***************
*** 42,45 ****
--- 42,46 ----
  	void SetBgColor(COLORREF bgColor)		{ browserDlg.SetBgColor(bgColor); }
  	void ChangeAspect(int ind)				{ browserDlg.ChangeAspect(ind); }
+ 	void CycleAspect()                      { browserDlg.CycleAspect(); }
  protected:
  	CPartBrowserDlg	browserDlg;

Index: MainFrm.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/MainFrm.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** MainFrm.cpp	8 Dec 2006 19:49:34 -0000	1.36
--- MainFrm.cpp	7 Mar 2007 22:22:52 -0000	1.37
***************
*** 91,98 ****
--- 91,104 ----
  	ON_COMMAND_EX(IDW_TOOLBAR_DUMMY, OnBarCheck)
  	ON_COMMAND_EX(IDW_TOOLBAR_MODE, OnBarCheck)
+ 	ON_COMMAND_EX(IDW_TOOLBAR_NAVIG, OnBarCheck)
  	ON_UPDATE_COMMAND_UI(IDW_TOOLBAR_MAIN, OnUpdateControlBarMenu)
  	ON_UPDATE_COMMAND_UI(IDW_TOOLBAR_WINS, OnUpdateControlBarMenu)
  	ON_UPDATE_COMMAND_UI(IDW_TOOLBAR_DUMMY, OnUpdateControlBarMenu)
  	ON_UPDATE_COMMAND_UI(IDW_TOOLBAR_MODE, OnUpdateControlBarMenu)
+ 	ON_UPDATE_COMMAND_UI(IDW_TOOLBAR_NAVIG, OnUpdateControlBarMenu)
+ 	ON_COMMAND(ID_BUTTON33020, OnBtnBack)
+ 	ON_COMMAND(ID_BUTTON33022, OnBtnHome)
+ 	ON_UPDATE_COMMAND_UI(ID_BUTTON33020, OnUpdateBtnBack)
+ 	ON_UPDATE_COMMAND_UI(ID_BUTTON33022, OnUpdateBtnHome)
  END_MESSAGE_MAP()
  
***************
*** 371,375 ****
  
  	DockControlBar(&m_browser, AFX_IDW_DOCKBAR_RIGHT);
! 	
  	// terge 
  	DockControlBar(&m_partBrowser, AFX_IDW_DOCKBAR_BOTTOM);
--- 377,381 ----
  
  	DockControlBar(&m_browser, AFX_IDW_DOCKBAR_RIGHT);
! 
  	// terge 
  	DockControlBar(&m_partBrowser, AFX_IDW_DOCKBAR_BOTTOM);
***************
*** 1025,1027 ****
--- 1031,1056 ----
  	}
  	return CMDIFrameWnd::PreTranslateMessage(pMsg);
+ }
+ 
+ 
+ void CMainFrame::OnBtnBack()
+ {
+ 	if( !theApp.isHistoryEnabled() || !CGMEDoc::theInstance) return;
+ 	CGMEDoc::theInstance->back();
+ }
+ 
+ void CMainFrame::OnUpdateBtnBack(CCmdUI* pCmdUI)
+ {
+ 	pCmdUI->Enable( theApp.isHistoryEnabled() && CGMEDoc::theInstance && CGMEDoc::theInstance->m_historian.isEnabledBack());
+ }
+ 
+ void CMainFrame::OnBtnHome()
+ {
+ 	if( !theApp.isHistoryEnabled() || !CGMEDoc::theInstance) return;
+ 	CGMEDoc::theInstance->home();
+ }
+ 
+ void CMainFrame::OnUpdateBtnHome(CCmdUI* pCmdUI)
+ {
+ 	pCmdUI->Enable( theApp.isHistoryEnabled() && CGMEDoc::theInstance && CGMEDoc::theInstance->m_historian.isEnabledHome());
  }

Index: MainFrm.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/MainFrm.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** MainFrm.h	4 Dec 2006 18:51:28 -0000	1.27
--- MainFrm.h	7 Mar 2007 22:22:52 -0000	1.28
***************
*** 59,62 ****
--- 59,63 ----
  	void ResetPartBrowser()							{ m_partBrowser.PostMessage(WM_PAINT); }
  	void ChangePartBrowserAspect(int ind)			{ m_partBrowser.ChangeAspect(ind); }
+ 	void CyclePartBrowserAspect()                   { m_partBrowser.CycleAspect(); }
  	BOOL CMainFrame::VerifyBarState(LPCTSTR lpszProfileName);
      void ShowObjectInspector();
***************
*** 131,134 ****
--- 132,140 ----
  	afx_msg void CMainFrame::OnClose();
  	afx_msg void OnDropFiles(HDROP);
+ 
+ 	afx_msg void OnBtnBack();
+ 	afx_msg void OnBtnHome();
+ 	afx_msg void OnUpdateBtnBack(CCmdUI* pCmdUI);
+ 	afx_msg void OnUpdateBtnHome(CCmdUI* pCmdUI);
  	//}}AFX_MSG
  	DECLARE_MESSAGE_MAP()