[Pythoncard-cvs] PythonCard/components bitmapcanvas.py,1.38,1.39

[Kevin A. <ka...@us...>]

Update of /cvsroot/pythoncard/PythonCard/components
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8381/components

Modified Files:
	bitmapcanvas.py 
Log Message:
added fixdc.py - wxPython 2.5.1.5 DC methods workaround
modified bitmapcanvas.py methods to use Point Size variations of names


Index: bitmapcanvas.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/components/bitmapcanvas.py,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** bitmapcanvas.py	21 Apr 2004 07:34:16 -0000	1.38
--- bitmapcanvas.py	1 May 2004 16:26:01 -0000	1.39
***************
*** 206,214 ****
      def blit(self, destXY, widthHeight, source, srcXY,
               logicalFunc=wx.COPY, useMask=False): #, xsrcMask=-1, ysrcMask=-1):
!         self._bufImage.Blit(destXY, widthHeight, source, srcXY,
                              logicalFunc, useMask) #, xsrcMask, ysrcMask)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def clear(self):
--- 206,214 ----
      def blit(self, destXY, widthHeight, source, srcXY,
               logicalFunc=wx.COPY, useMask=False): #, xsrcMask=-1, ysrcMask=-1):
!         self._bufImage.BlitPointSize(destXY, widthHeight, source, srcXY,
                              logicalFunc, useMask) #, xsrcMask, ysrcMask)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def clear(self):
***************
*** 216,227 ****
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      # this is poorly named, it should be DrawAxis
      def crossHair(self, xy):
!         self._bufImage.CrossHair(xy)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawArc(self, x1y1, x2y2, xcyc):
--- 216,227 ----
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      # this is poorly named, it should be DrawAxis
      def crossHair(self, xy):
!         self._bufImage.CrossHairPoint(xy)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawArc(self, x1y1, x2y2, xcyc):
***************
*** 235,242 ****
          """
  
!         self._bufImage.DrawArc(x1y1, x2y2, xcyc)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      # doesn't exist in wxMemoryDC
--- 235,242 ----
          """
  
!         self._bufImage.DrawArcPoint(x1y1, x2y2, xcyc)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      # doesn't exist in wxMemoryDC
***************
*** 259,266 ****
              return
  
!         self._bufImage.DrawBitmap(bmp, xy, transparency)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawBitmapScaled(self, aBitmap, xy, size, transparency=1):
--- 259,266 ----
              return
  
!         self._bufImage.DrawBitmapPoint(bmp, xy, transparency)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawBitmapScaled(self, aBitmap, xy, size, transparency=1):
***************
*** 279,316 ****
  
          bmp = wx.BitmapFromImage(img.Scale(size[0], size[1]))
!         self._bufImage.DrawBitmap(bmp, xy, transparency)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawCircle(self, xy, radius):
!         self._bufImage.DrawCircle(xy, radius)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawEllipse(self, xy, widthHeight):
!         self._bufImage.DrawEllipse(xy, widthHeight)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawEllipticArc(self, xy, widthHeight, startEnd):
!         self._bufImage.DrawEllipticArc(xy, widthHeight, startEnd)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawIcon(self, aIcon, xy):
!         self._bufImage.DrawIcon(aIcon, xy)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawLine(self, startXY, endXY):
!         self._bufImage.DrawLine(startXY, endXY)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawLines(self, pointsList):
--- 279,316 ----
  
          bmp = wx.BitmapFromImage(img.Scale(size[0], size[1]))
!         self._bufImage.DrawBitmapPoint(bmp, xy, transparency)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawCircle(self, xy, radius):
!         self._bufImage.DrawCirclePoint(xy, radius)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawEllipse(self, xy, widthHeight):
!         self._bufImage.DrawEllipsePointSize(xy, widthHeight)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawEllipticArc(self, xy, widthHeight, startEnd):
!         self._bufImage.DrawEllipticArcPointSize(xy, widthHeight, startEnd)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawIcon(self, aIcon, xy):
!         self._bufImage.DrawIconPoint(aIcon, xy)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawLine(self, startXY, endXY):
!         self._bufImage.DrawLinePoint(startXY, endXY)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawLines(self, pointsList):
***************
*** 318,328 ****
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawPoint(self, xy):
!         self._bufImage.DrawPoint(xy)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawPolygon(self, pointsList):
--- 318,328 ----
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawPoint(self, xy):
!         self._bufImage.DrawPointPoint(xy)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawPolygon(self, pointsList):
***************
*** 330,340 ****
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawRectangle(self, xy, widthHeight):
!         self._bufImage.DrawRectangle(xy, widthHeight)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawPointList(self, points, pens=None):
--- 330,340 ----
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawRectangle(self, xy, widthHeight):
!         self._bufImage.DrawRectanglePointSize(xy, widthHeight)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawPointList(self, points, pens=None):
***************
*** 342,346 ****
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      # KEA 2003-03-14
--- 342,346 ----
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      # KEA 2003-03-14
***************
*** 351,367 ****
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawRotatedText(self, aString, xy, angle):
!         self._bufImage.DrawRotatedText(aString, xy, angle)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawRoundedRectangle(self, xy, widthHeight, radius):
!         self._bufImage.DrawRoundedRectangle(xy, widthHeight, radius)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawSpline(self, pointsList):
--- 351,367 ----
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawRotatedText(self, aString, xy, angle):
!         self._bufImage.DrawRotatedTextPoint(aString, xy, angle)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawRoundedRectangle(self, xy, widthHeight, radius):
!         self._bufImage.DrawRoundedRectanglePointSize(xy, widthHeight, radius)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawSpline(self, pointsList):
***************
*** 369,373 ****
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawLineList(self, lines, pens=None):
--- 369,373 ----
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawLineList(self, lines, pens=None):
***************
*** 375,415 ****
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawText(self, aString, xy):
!         self._bufImage.DrawText(aString, xy)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      # KEA 2002-03-31 this doesn't seem to work
      def floodFill(self, xy, colour, style=wx.FLOOD_SURFACE):
!         self._bufImage.FloodFill(xy, colour, style)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def getPixel(self, xy):
!         return self._bufImage.GetPixel(xy)
! 
!     """
!     # these are aliases for the old BitmapCanvas methods that
!     # started with a lowercase letter
!     clear = Clear
!     drawBitmap = DrawBitmap
!     drawLineList = DrawLineList
!     drawPointList = DrawPointList
!     drawRectangleList = DrawRectangleList
!     drawRect = drawRectangle = DrawRectangle
!     drawText = DrawText
!     drawRotatedText = DrawRotatedText
!     drawEllipse = DrawEllipse
!     line = drawLine = DrawLine
!     plot = drawPoint = DrawPoint
!     """
  
      def refresh(self):
          dc = wx.ClientDC(self)
!         dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
          #self._delegate.Refresh()
  
--- 375,399 ----
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def drawText(self, aString, xy):
!         self._bufImage.DrawTextPoint(aString, xy)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      # KEA 2002-03-31 this doesn't seem to work
      def floodFill(self, xy, colour, style=wx.FLOOD_SURFACE):
!         self._bufImage.FloodFillPoint(xy, colour, style)
          if self.autoRefresh:
              dc = wx.ClientDC(self)
!             dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
  
      def getPixel(self, xy):
!         return self._bufImage.GetPixelPoint(xy)
  
      def refresh(self):
          dc = wx.ClientDC(self)
!         dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
          #self._delegate.Refresh()
  
***************
*** 420,425 ****
          #print "OnPaint", rect
          dc = wx.PaintDC(self)
!         #dc.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
!         dc.Blit((rect[0], rect[1]), (rect[2], rect[3]), self._bufImage, (rect[0], rect[1]))
          #stoptime = time.time()
          #elapsed = stoptime - starttime
--- 404,409 ----
          #print "OnPaint", rect
          dc = wx.PaintDC(self)
!         #dc.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
!         dc.BlitPointSize((rect[0], rect[1]), (rect[2], rect[3]), self._bufImage, (rect[0], rect[1]))
          #stoptime = time.time()
          #elapsed = stoptime - starttime
***************
*** 438,442 ****
          _bufImage.SetTextForeground(self._penColor)
          _bufImage.Clear()
!         _bufImage.Blit((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
          
          self._size = size
--- 422,426 ----
          _bufImage.SetTextForeground(self._penColor)
          _bufImage.Clear()
!         _bufImage.BlitPointSize((0, 0), (self._size[0], self._size[1]), self._bufImage, (0, 0))
          
          self._size = size
***************
*** 480,484 ****
          bitmap = wx.EmptyBitmap(size[0], size[1])
          memory.SelectObject(bitmap)
!         memory.Blit((0, 0), size, self._bufImage, (0, 0))
          memory.SelectObject(wx.NullBitmap)
          return bitmap
--- 464,468 ----
          bitmap = wx.EmptyBitmap(size[0], size[1])
          memory.SelectObject(bitmap)
!         memory.BlitPointSize((0, 0), size, self._bufImage, (0, 0))
          memory.SelectObject(wx.NullBitmap)
          return bitmap