[Wxdevcenter-cvs] StdPlugin/src BitmapCtrl.cpp,1.6,1.7

[Emilien K. <cur...@us...>]

Update of /cvsroot/wxdevcenter/StdPlugin/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14701/src

Modified Files:
	BitmapCtrl.cpp 
Log Message:
Fix pb de trnaslation de coordonnées bitmap->client et inversement

Index: BitmapCtrl.cpp
===================================================================
RCS file: /cvsroot/wxdevcenter/StdPlugin/src/BitmapCtrl.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BitmapCtrl.cpp	8 Jan 2005 16:17:25 -0000	1.6
--- BitmapCtrl.cpp	8 Jan 2005 16:29:53 -0000	1.7
***************
*** 225,240 ****
  wxPoint BitmapCtrl::ClientToBitmap(wxPoint ptClient)const
  {
      ptClient += wxPoint(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL));
-     if(m_iZoom>0)
-     {
-         ptClient.x /= (m_iZoom+1);
-         ptClient.y /= (m_iZoom+1);
-     }
-     else if(m_iZoom<0)
-     {
-         ptClient.x *= -(m_iZoom-1);
-         ptClient.y *= -(m_iZoom-1);
-     }
      ptClient -= m_ptOrigin;
      return ptClient;
  }
--- 225,234 ----
  wxPoint BitmapCtrl::ClientToBitmap(wxPoint ptClient)const
  {
+     ptClient.x /= ZoomToScale();
+     ptClient.y /= ZoomToScale();
+ 
      ptClient += wxPoint(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL));
      ptClient -= m_ptOrigin;
+ 
      return ptClient;
  }
***************
*** 243,258 ****
  wxPoint BitmapCtrl::BitmapToClient(wxPoint ptBitmap)const
  {
!     ptBitmap += m_ptOrigin ;
!     if(m_iZoom>0)
!     {
!         ptBitmap.x *= (m_iZoom+1);
!         ptBitmap.y *= (m_iZoom+1);
!     }
!     else if(m_iZoom<0)
!     {
!         ptBitmap.x /= -(m_iZoom-1);
!         ptBitmap.y /= -(m_iZoom-1);
!     }
!     ptBitmap -= wxSize(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL));
      return ptBitmap;
  }
--- 237,246 ----
  wxPoint BitmapCtrl::BitmapToClient(wxPoint ptBitmap)const
  {
!     ptBitmap += m_ptOrigin;
!     ptBitmap -= wxPoint(GetScrollPos(wxHORIZONTAL), GetScrollPos(wxVERTICAL));
! 
!     ptBitmap.x *= ZoomToScale();
!     ptBitmap.y *= ZoomToScale();
! 
      return ptBitmap;
  }