updated ScrolledBitmap demo to add an overlayed rectangle

Author: ChrisBarker-NOAA

ScrolledBitmap.py

@@ -1,68 +1,62 @@
-#!/usr/bin/env python2.4
+#!/usr/bin/env
 
-from wxPython.wx import *
+import wx
 
+# set an image file here
+img_filename = 'Images/white_tank.jpg'
 
-class MyCanvas(wxScrolledWindow):
-    def __init__(self, parent, id = -1, size = wxDefaultSize):
-        wxScrolledWindow.__init__(self, parent, id , wxPoint(0, 0), size, wxSUNKEN_BORDER)
-        ##wxScrolledWindow.__init__(self, parent)
-        ## read the image in (this is not a good place to do this in a real app)
 
-        print "about to Init"
+class MyCanvas(wx.ScrolledWindow):
+    def __init__(self, *args, **kwargs):
+        wx.ScrolledWindow.__init__(self, *args, **kwargs)
 
-        wxInitAllImageHandlers()
+        self.bmp = wx.Image(img_filename).ConvertToBitmap()
 
-        print "done initing"
+        self.maxWidth, self.maxHeight = self.bmp.GetWidth(), self.bmp.GetHeight()
 
-        #img = wxImage("white_tank.jpg",wxBITMAP_TYPE_JPEG )
-        #img = wxImage("white_tank.jpg")
-        #bmp = img.ConvertToBitmap()
-        #jpg = wxImage(opj('bitmaps/image.jpg'), wxBITMAP_TYPE_JPEG).ConvertToBitmap()
+        self.SetScrollbars(20, 20, self.maxWidth / 20, self.maxHeight / 20)
 
-        self.bmp = wxImage('Images/white_tank.jpg', wxBITMAP_TYPE_JPEG ).ConvertToBitmap()
+        self.Bind(wx.EVT_PAINT, self.OnPaint)
 
-        print "done loading image"
-
-        self.maxWidth, self.maxHeight  = self.bmp.GetWidth(), self.bmp.GetHeight()
-
-        self.SetScrollbars(20, 20, self.maxWidth/20, self.maxHeight/20)
-
-        EVT_PAINT(self, self.OnPaint)
+        # an arbitrary rect to draw -- in pixel coords
+        self.rect = (200, 200, 300, 200)  # x, y, width, height
 
     def OnPaint(self, event):
-        dc = wxPaintDC(self)
+        dc = wx.PaintDC(self)
         self.PrepareDC(dc)
-        dc.DrawBitmap(self.bmp, 0, 0)
 
+        dc.SetPen(wx.Pen(wx.RED, 2))
+        dc.SetBrush(wx.Brush((255, 255, 255, 85)))
 
-class TestFrame(wxFrame):
-    def __init__(self,parent, id,title,position,size):
-        wxFrame.__init__(self,parent, id,title,position, size)
+        dc.DrawBitmap(self.bmp, 0, 0)
+        dc.DrawRectangle(*self.rect)
 
 
-        EVT_CLOSE(self, self.OnCloseWindow)
+class TestFrame(wx.Frame):
+    def __init__(self, *args, **kwargs):
+        wx.Frame.__init__(self, *args, **kwargs)
 
+        wx.EVT_CLOSE(self, self.OnCloseWindow)
 
-        self.Canvas1 = MyCanvas(self, wxNewId() )
+        self.Canvas1 = MyCanvas(self, wx.NewId())
 
     def OnCloseWindow(self, event):
         self.Destroy()
 
-class App(wxApp):
+
+class App(wx.App):
     def OnInit(self):
-        frame = TestFrame(NULL, -1, "Scroll Test", wxDefaultPosition,(550,200))
+        frame = TestFrame(None, title="Scroll Test", size=(800, 700))
         self.SetTopWindow(frame)
         frame.Show(True)
-        return true
+        return True
 
 if __name__ == "__main__":
 
-    app = App(0)
-    print "about to start Mainloop"
+    app = App(False)
 
     app.MainLoop()
-     
+