[GME-commit] GMESRC/GME/Gme MainFrm.h,1.14,1.15 MainFrm.cpp,1.18,1.19 GMEView.h,1.54,1.55 GMEStd.h,1.23,1.24

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

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

Modified Files:
	MainFrm.h MainFrm.cpp GMEView.h GMEStd.h 
Log Message:
Panning Window embedded

CVS User: bogyom

Index: MainFrm.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/MainFrm.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MainFrm.h	26 Feb 2004 10:30:04 -0000	1.14
--- MainFrm.h	25 Mar 2004 16:44:33 -0000	1.15
***************
*** 14,17 ****
--- 14,18 ----
  #include "GMEObjectInspector.h"
  #include "GMESearch.h"
+ #include "PanningWindow.h"
  
  // Tooltip helper for components
***************
*** 75,78 ****
--- 76,81 ----
  	virtual void Dump(CDumpContext& dc) const;
  #endif
+ 	CPanningWindow	m_pannWin;
+ 
  
  protected:  // control bar embedded members
***************
*** 95,98 ****
--- 98,103 ----
  	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
  	afx_msg void OnViewPartbrowser();
+ 	afx_msg void OnViewPannWin();
+ 	afx_msg void OnUpdateViewPannWin(CCmdUI* pCmdUI);
  	afx_msg void OnUpdateViewPartbrowser(CCmdUI* pCmdUI);
  	afx_msg void OnViewBrowser();

Index: MainFrm.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/MainFrm.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** MainFrm.cpp	26 Feb 2004 10:30:04 -0000	1.18
--- MainFrm.cpp	25 Mar 2004 16:44:33 -0000	1.19
***************
*** 64,68 ****
--- 64,70 ----
  	ON_WM_CREATE()
  	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)
***************
*** 157,160 ****
--- 159,175 ----
  
  
+ 	// terge 
+ 	// PANNING WINDOW
+ 	if (!m_pannWin.Create(_T("Panning Window"), this, CSize(80, 80),
+         TRUE, ID_PANNWIN))
+     {
+         TRACE0("Failed to create panning Window\n");
+         return -1;      // fail to create
+ 	}
+     m_pannWin.SetBarStyle(m_pannWin.GetBarStyle() |
+         CBRS_TOOLTIPS | CBRS_FLYBY | CBRS_SIZE_DYNAMIC);
+ 
+     m_pannWin.EnableDocking(CBRS_ALIGN_ANY);
+ 
  
  	// GME ACTIVE BROWSER
***************
*** 199,208 ****
      DockControlBar(&m_browser, AFX_IDW_DOCKBAR_RIGHT);
  	
! 
      DockControlBar(&m_partBrowser, AFX_IDW_DOCKBAR_BOTTOM);
      RecalcLayout(TRUE);
  	CRect rc;
      m_partBrowser.GetWindowRect(rc);
! 	rc.OffsetRect(1, 0);
  	DockControlBar(&m_objectInspector,AFX_IDW_DOCKBAR_BOTTOM,rc);
  
--- 214,227 ----
      DockControlBar(&m_browser, AFX_IDW_DOCKBAR_RIGHT);
  	
! 	// terge 
      DockControlBar(&m_partBrowser, AFX_IDW_DOCKBAR_BOTTOM);
      RecalcLayout(TRUE);
  	CRect rc;
      m_partBrowser.GetWindowRect(rc);
! 	rc.OffsetRect(rc.Width(), 0);
!     DockControlBar(&m_pannWin, AFX_IDW_DOCKBAR_BOTTOM, rc);
!     RecalcLayout(TRUE);
!     m_pannWin.GetWindowRect(rc);
! 	rc.OffsetRect(rc.Width(), 0);
  	DockControlBar(&m_objectInspector,AFX_IDW_DOCKBAR_BOTTOM,rc);
  
***************
*** 387,394 ****
--- 406,424 ----
  }
  
+ void CMainFrame::OnViewPannWin() 
+ {
+ 	ShowControlBar(&m_pannWin, !m_pannWin.IsVisible(), FALSE);
+ }
+ 
  void CMainFrame::OnUpdateViewPartbrowser(CCmdUI* pCmdUI) 
  {
  	pCmdUI->Enable();
  	pCmdUI->SetCheck(m_partBrowser.IsVisible());
+ }
+ 
+ void CMainFrame::OnUpdateViewPannWin(CCmdUI* pCmdUI) 
+ {
+ 	pCmdUI->Enable();
+ 	pCmdUI->SetCheck(m_pannWin.IsVisible());
  }
  

Index: GMEView.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEView.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** GMEView.h	12 Mar 2004 20:55:17 -0000	1.54
--- GMEView.h	25 Mar 2004 16:44:33 -0000	1.55
***************
*** 38,41 ****
--- 38,45 ----
  	unsigned int m_lastPrnPage;
  	void setZoomPoint(int curzoom, CPoint point);
+ 	void DoPannWinRefresh();
+ 
+ public:
+ 	bool m_refreshpannwin;
  
  public:

Index: GMEStd.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/Gme/GMEStd.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** GMEStd.h	11 Mar 2004 18:05:45 -0000	1.23
--- GMEStd.h	25 Mar 2004 16:44:33 -0000	1.24
***************
*** 75,78 ****
--- 75,80 ----
  //#define GME_MIN_ZOOM_PERCENT		10
  
+ #define EXTENT_ERROR_CORR	1.1 // ?? masks an error of extent calculation
+ 
  #define ZOOM_WIDTH	-1
  #define ZOOM_HEIGHT	-2