apparently the check for too small rect is needed not only with wxNB_MULTILINE (see...

[wxWidgets.git] / wxPython / demo / FloatCanvas.py

diff --git a/wxPython/demo/FloatCanvas.py b/wxPython/demo/FloatCanvas.py
index 94f2eab77cb4194a3200362e37ecc33bbf677d64..7f1d2d0d002a4a99cf0a71d236f33f9d7d2318f8 100644 (file)
--- a/wxPython/demo/FloatCanvas.py
+++ b/wxPython/demo/FloatCanvas.py
@@ -1,99 +1,59 @@
+#!/usr/bin/env python2.3

 
 

+import wx
+
+##First, make sure Numeric or numarray can be imported.

 try:
     import Numeric
     import RandomArray
     haveNumeric = True
 except ImportError:
 try:
     import Numeric
     import RandomArray
     haveNumeric = True
 except ImportError:

+    # Numeric isn't there, let's try numarray

     try:
         import numarray as Numeric
         import numarray.random_array as RandomArray
         haveNumeric = True
     except ImportError:
     try:
         import numarray as Numeric
         import numarray.random_array as RandomArray
         haveNumeric = True
     except ImportError:

+        # numarray isn't there either

         haveNumeric = False
         haveNumeric = False

+        errorText = (
+        "The FloatCanvas requires either the Numeric or numarray module\n\n"
+        "You can get them at:\n"
+        "http://sourceforge.net/projects/numpy\n\n"
+        "NOTE: The Numeric module is substantially faster than numarray for this\n"
+        "purpose, if you have lots of objects\n"
+        )
+      
+#---------------------------------------------------------------------------

 
 

-if not haveNumeric:
-    errorText = """
-The FloatCanvas requires either the Numeric or Numarray module:
-You can get them at:
-     http://sourceforge.net/projects/numpy
-
-NOTE: The Numeric module is substantially faster than numarray for this
-purpose, if you have lot's of objects
-"""
-
-    def runTest(frame, nb, log):
-        dlg = wx.MessageDialog(frame, errorText, 'Sorry', wx.OK |
-                               wx.ICON_INFORMATION)
-        dlg.ShowModal()
-        dlg.Destroy()
-
-    overview = ""
-    
-else:
-    StartUpDemo = "all"
-    if __name__ == "__main__": # parse options if run stand-alone
-        # check options:
-        import sys, getopt
-        optlist, args = getopt.getopt(sys.argv[1:],'l',["local","all","text","map","stext","hit","hitf","animate","speed","temp"])
-        
-        for opt in optlist:
-            if opt[0] == "--all":
-                StartUpDemo = "all"
-            elif opt[0] == "--text":
-                StartUpDemo = "text"
-            elif opt[0] == "--map":
-                StartUpDemo = "map"
-            elif opt[0] == "--stext":
-                StartUpDemo = "stext"
-            elif opt[0] == "--hit":
-                StartUpDemo = "hit"
-            elif opt[0] == "--hitf":
-                StartUpDemo = "hitf"
-            elif opt[0] == "--animate":
-                StartUpDemo = "animate"
-            elif opt[0] == "--speed":
-                StartUpDemo = "speed"
-            elif opt[0] == "--temp":
-                StartUpDemo = "temp"
-    import wx
-    import time, random
-    
-    def runTest(frame, nb, log):
-        """
-        This method is used by the wxPython Demo Framework for integrating
-        this demo with the rest.
-        """
-        win = DrawFrame(None, -1, "FloatCanvas Drawing Window",wx.DefaultPosition,(500,500))
-        frame.otherWin = win
-        win.Show(True)
-        win.DrawTest()
-
+def BuildDrawFrame(): # this gets called when needed, rather than on import

     try:
         from floatcanvas import NavCanvas, FloatCanvas
     except ImportError: # if it's not there locally, try the wxPython lib.
         from wx.lib.floatcanvas import NavCanvas, FloatCanvas
 
     try:
         from floatcanvas import NavCanvas, FloatCanvas
     except ImportError: # if it's not there locally, try the wxPython lib.
         from wx.lib.floatcanvas import NavCanvas, FloatCanvas
 

-    import wxPython.lib.colourdb
-    
+    import wx.lib.colourdb
+    import time, random
+

     class DrawFrame(wx.Frame):
     class DrawFrame(wx.Frame):

-    
+

         """
         A frame used for the FloatCanvas Demo
         """
         A frame used for the FloatCanvas Demo

-        
+

         """
         """

-        
-        
+
+

         def __init__(self,parent, id,title,position,size):
             wx.Frame.__init__(self,parent, id,title,position, size)
         def __init__(self,parent, id,title,position,size):
             wx.Frame.__init__(self,parent, id,title,position, size)

-            
+

             ## Set up the MenuBar
             MenuBar = wx.MenuBar()
             ## Set up the MenuBar
             MenuBar = wx.MenuBar()

-            
+

             file_menu = wx.Menu()
             item = file_menu.Append(-1, "&Close","Close this frame")
             self.Bind(wx.EVT_MENU, self.OnQuit, item)
             MenuBar.Append(file_menu, "&File")
             file_menu = wx.Menu()
             item = file_menu.Append(-1, "&Close","Close this frame")
             self.Bind(wx.EVT_MENU, self.OnQuit, item)
             MenuBar.Append(file_menu, "&File")

-            
+

             draw_menu = wx.Menu()
 
             item = draw_menu.Append(-1, "&Draw Test","Run a test of drawing random components")
             draw_menu = wx.Menu()
 
             item = draw_menu.Append(-1, "&Draw Test","Run a test of drawing random components")


@@ -101,7 +61,7 @@ else:
 
             item = draw_menu.Append(-1, "&Line Test","Run a test of drawing random lines")
             self.Bind(wx.EVT_MENU, self.LineTest, item)
 
             item = draw_menu.Append(-1, "&Line Test","Run a test of drawing random lines")
             self.Bind(wx.EVT_MENU, self.LineTest, item)

-            
+

             item = draw_menu.Append(-1, "Draw &Map","Run a test of drawing a map")
             self.Bind(wx.EVT_MENU, self.DrawMap, item)
             item = draw_menu.Append(-1, "&Text Test","Run a test of text drawing")
             item = draw_menu.Append(-1, "Draw &Map","Run a test of drawing a map")
             self.Bind(wx.EVT_MENU, self.DrawMap, item)
             item = draw_menu.Append(-1, "&Text Test","Run a test of text drawing")


@@ -112,33 +72,38 @@ else:
             self.Bind(wx.EVT_MENU, self.Clear, item)
             item = draw_menu.Append(-1, "&Hit Test","Run a test of the hit test code")
             self.Bind(wx.EVT_MENU, self.TestHitTest, item)
             self.Bind(wx.EVT_MENU, self.Clear, item)
             item = draw_menu.Append(-1, "&Hit Test","Run a test of the hit test code")
             self.Bind(wx.EVT_MENU, self.TestHitTest, item)

-            item = draw_menu.Append(-1, "&Hit Test Foreground","Run a test of the hit test code with a foreground Object")
+            item = draw_menu.Append(-1, "Hit Test &Foreground","Run a test of the hit test code with a foreground Object")

             self.Bind(wx.EVT_MENU, self.TestHitTestForeground, item)
             item = draw_menu.Append(-1, "&Animation","Run a test of Animation")
             self.Bind(wx.EVT_MENU, self.TestAnimation, item)
             item = draw_menu.Append(-1, "&Speed","Run a test of Drawing Speed")
             self.Bind(wx.EVT_MENU, self.SpeedTest, item)
             self.Bind(wx.EVT_MENU, self.TestHitTestForeground, item)
             item = draw_menu.Append(-1, "&Animation","Run a test of Animation")
             self.Bind(wx.EVT_MENU, self.TestAnimation, item)
             item = draw_menu.Append(-1, "&Speed","Run a test of Drawing Speed")
             self.Bind(wx.EVT_MENU, self.SpeedTest, item)

+            item = draw_menu.Append(-1, "Change &Properties","Run a test of Changing Object Properties")
+            self.Bind(wx.EVT_MENU, self.PropertiesChangeTest, item)
+            item = draw_menu.Append(-1, "&Arrows","Run a test of Arrows")
+            self.Bind(wx.EVT_MENU, self.ArrowTest, item)
+

             MenuBar.Append(draw_menu, "&Tests")
             MenuBar.Append(draw_menu, "&Tests")

-            
+

             view_menu = wx.Menu()
             item = view_menu.Append(-1, "Zoom to &Fit","Zoom to fit the window")
             self.Bind(wx.EVT_MENU, self.ZoomToFit, item)
             MenuBar.Append(view_menu, "&View")
             view_menu = wx.Menu()
             item = view_menu.Append(-1, "Zoom to &Fit","Zoom to fit the window")
             self.Bind(wx.EVT_MENU, self.ZoomToFit, item)
             MenuBar.Append(view_menu, "&View")

-            
+

             help_menu = wx.Menu()
             item = help_menu.Append(-1, "&About",
                                     "More information About this program")
             self.Bind(wx.EVT_MENU, self.OnAbout, item)
             MenuBar.Append(help_menu, "&Help")
             help_menu = wx.Menu()
             item = help_menu.Append(-1, "&About",
                                     "More information About this program")
             self.Bind(wx.EVT_MENU, self.OnAbout, item)
             MenuBar.Append(help_menu, "&Help")

-            
+

             self.SetMenuBar(MenuBar)
             self.SetMenuBar(MenuBar)

-            
+

             self.CreateStatusBar()            
             # Add the Canvas
             self.Canvas = NavCanvas.NavCanvas(self,
                                               -1,
                                               (500,500),
             self.CreateStatusBar()            
             # Add the Canvas
             self.Canvas = NavCanvas.NavCanvas(self,
                                               -1,
                                               (500,500),

-                                              Debug = 1,
+                                              Debug = 0,

                                               BackgroundColor = "DARK SLATE BLUE")
 
             wx.EVT_CLOSE(self, self.OnCloseWindow)
                                               BackgroundColor = "DARK SLATE BLUE")
 
             wx.EVT_CLOSE(self, self.OnCloseWindow)


@@ -149,8 +114,8 @@ else:
             self.EventsAreBound = False
 
             ## getting all the colors and linestyles  for random objects
             self.EventsAreBound = False
 
             ## getting all the colors and linestyles  for random objects

-            wxPython.lib.colourdb.updateColourDB()
-            self.colors = wxPython.lib.colourdb.getColourList()
+            wx.lib.colourdb.updateColourDB()
+            self.colors = wx.lib.colourdb.getColourList()

             #self.LineStyles = FloatCanvas.DrawObject.LineStyleList.keys()
 
 
             #self.LineStyles = FloatCanvas.DrawObject.LineStyleList.keys()
 
 


@@ -175,7 +140,20 @@ else:
             self.EventsAreBound = True
 
         def UnBindAllMouseEvents(self):
             self.EventsAreBound = True
 
         def UnBindAllMouseEvents(self):

-            ## Here is how you catch FloatCanvas mouse events
+            ## Here is how you unbind FloatCanvas mouse events
+            FloatCanvas.EVT_LEFT_DOWN(self.Canvas, None ) 
+            FloatCanvas.EVT_LEFT_UP(self.Canvas, None )
+            FloatCanvas.EVT_LEFT_DCLICK(self.Canvas, None) 
+
+            FloatCanvas.EVT_MIDDLE_DOWN(self.Canvas, None )
+            FloatCanvas.EVT_MIDDLE_UP(self.Canvas, None )
+            FloatCanvas.EVT_MIDDLE_DCLICK(self.Canvas, None )
+
+            FloatCanvas.EVT_RIGHT_DOWN(self.Canvas, None )
+            FloatCanvas.EVT_RIGHT_UP(self.Canvas, None )
+            FloatCanvas.EVT_RIGHT_DCLICK(self.Canvas, None )
+
+            FloatCanvas.EVT_MOUSEWHEEL(self.Canvas, None )

             FloatCanvas.EVT_LEFT_DOWN(self.Canvas, None ) 
             FloatCanvas.EVT_LEFT_UP(self.Canvas, None )
             FloatCanvas.EVT_LEFT_DCLICK(self.Canvas, None) 
             FloatCanvas.EVT_LEFT_DOWN(self.Canvas, None ) 
             FloatCanvas.EVT_LEFT_UP(self.Canvas, None )
             FloatCanvas.EVT_LEFT_DCLICK(self.Canvas, None) 


@@ -235,41 +213,48 @@ else:
         def OnWheel(self, event):
             print "Mouse Wheel Moved in DrawFrame"
             self.PrintCoords(event)
         def OnWheel(self, event):
             print "Mouse Wheel Moved in DrawFrame"
             self.PrintCoords(event)

-
+            Rot = event.GetWheelRotation()
+            print "Wheel Rotation is:", Rot
+            print "Wheel Delta is:", event.GetWheelDelta()
+            Rot = Rot / abs(Rot) * 0.1
+            if event.ControlDown(): # move left-right
+                self.Canvas.MoveImage( (Rot, 0), "Panel" )
+            else: # move up-down
+                self.Canvas.MoveImage( (0, Rot), "Panel" )
+                

         def OnMove(self, event):
             """
         def OnMove(self, event):
             """

-            Updates the staus bar with the world coordinates
+            Updates the status bar with the world coordinates

             """
             self.SetStatusText("%.2f, %.2f"%tuple(event.Coords))
 
         def OnAbout(self, event):
             print "OnAbout called"
             """
             self.SetStatusText("%.2f, %.2f"%tuple(event.Coords))
 
         def OnAbout(self, event):
             print "OnAbout called"

-            
+

             dlg = wx.MessageDialog(self, "This is a small program to demonstrate\n"
                                                       "the use of the FloatCanvas\n",
                                                       "About Me", wx.OK | wx.ICON_INFORMATION)
             dlg.ShowModal()
             dlg.Destroy()
             dlg = wx.MessageDialog(self, "This is a small program to demonstrate\n"
                                                       "the use of the FloatCanvas\n",
                                                       "About Me", wx.OK | wx.ICON_INFORMATION)
             dlg.ShowModal()
             dlg.Destroy()

-            
+

         def ZoomToFit(self,event):
             self.Canvas.ZoomToBB()
         def ZoomToFit(self,event):
             self.Canvas.ZoomToBB()

-            
+

         def Clear(self,event = None):
             self.UnBindAllMouseEvents()
             self.Canvas.ClearAll()
             self.Canvas.SetProjectionFun(None)
             self.Canvas.Draw()
         def Clear(self,event = None):
             self.UnBindAllMouseEvents()
             self.Canvas.ClearAll()
             self.Canvas.SetProjectionFun(None)
             self.Canvas.Draw()

-            
+

         def OnQuit(self,event):
             self.Close(True)
         def OnQuit(self,event):
             self.Close(True)

-            
+

         def OnCloseWindow(self, event):
             self.Destroy()
         def OnCloseWindow(self, event):
             self.Destroy()

-            
+

         def DrawTest(self,event=None):
         def DrawTest(self,event=None):

-            wx.GetApp().Yield(True)
-#            import random
-#            import RandomArray
+            wx.GetApp().Yield()
+

             Range = (-10,10)
             colors = self.colors
 
             Range = (-10,10)
             colors = self.colors
 


@@ -279,8 +264,8 @@ else:
             Canvas.ClearAll()
             Canvas.SetProjectionFun(None)
 
             Canvas.ClearAll()
             Canvas.SetProjectionFun(None)
 

-            ##         Random tests of everything:
-            
+            ##          Random tests of everything:
+

             # Rectangles
             for i in range(3):
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
             # Rectangles
             for i in range(3):
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))


@@ -288,8 +273,8 @@ else:
                 cf = random.randint(0,len(colors)-1)
                 h = random.randint(1,5)
                 w = random.randint(1,5)
                 cf = random.randint(0,len(colors)-1)
                 h = random.randint(1,5)
                 w = random.randint(1,5)

-                Canvas.AddRectangle(x,y,h,w,LineWidth = lw,FillColor = colors[cf])
-              
+                Canvas.AddRectangle(x,y,w,h,LineWidth = lw,FillColor = colors[cf])
+

             # Ellipses
             for i in range(3):
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
             # Ellipses
             for i in range(3):
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))


@@ -298,17 +283,14 @@ else:
                 h = random.randint(1,5)
                 w = random.randint(1,5)
                 Canvas.AddEllipse(x,y,h,w,LineWidth = lw,FillColor = colors[cf])
                 h = random.randint(1,5)
                 w = random.randint(1,5)
                 Canvas.AddEllipse(x,y,h,w,LineWidth = lw,FillColor = colors[cf])

-              
-##            # Dots -- Does anyone need this?
-##            for i in range(5):
-##                x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
-##                D = random.randint(1,50)
-##                lw = random.randint(1,5)
-##                cf = random.randint(0,len(colors)-1)
-##                cl = random.randint(0,len(colors)-1)
-##                Canvas.AddDot(x,y,D,LineWidth = lw,LineColor = colors[cl],FillColor = colors[cf])
-              
-                # Circles
+
+            # Points
+            for i in range(5):
+                x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
+                D = random.randint(1,50)
+                cf = random.randint(0,len(colors)-1)
+                Canvas.AddPoint((x,y), Color = colors[cf], Diameter = D)
+            # Circles

             for i in range(5):
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
                 D = random.randint(1,5)
             for i in range(5):
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
                 D = random.randint(1,5)


@@ -317,8 +299,7 @@ else:
                 cl = random.randint(0,len(colors)-1)
                 Canvas.AddCircle(x,y,D,LineWidth = lw,LineColor = colors[cl],FillColor = colors[cf])
                 Canvas.AddText("Circle # %i"%(i),x,y,Size = 12,BackgroundColor = None,Position = "cc")
                 cl = random.randint(0,len(colors)-1)
                 Canvas.AddCircle(x,y,D,LineWidth = lw,LineColor = colors[cl],FillColor = colors[cf])
                 Canvas.AddText("Circle # %i"%(i),x,y,Size = 12,BackgroundColor = None,Position = "cc")

-              
-                # Lines
+            # Lines

             for i in range(5):
                 points = []
                 for j in range(random.randint(2,10)):
             for i in range(5):
                 points = []
                 for j in range(random.randint(2,10)):


@@ -328,8 +309,7 @@ else:
                 cf = random.randint(0,len(colors)-1)
                 cl = random.randint(0,len(colors)-1)
                 Canvas.AddLine(points, LineWidth = lw, LineColor = colors[cl])
                 cf = random.randint(0,len(colors)-1)
                 cl = random.randint(0,len(colors)-1)
                 Canvas.AddLine(points, LineWidth = lw, LineColor = colors[cl])

-              
-                # Polygons
+            # Polygons

             for i in range(3):
                 points = []
                 for j in range(random.randint(2,6)):
             for i in range(3):
                 points = []
                 for j in range(random.randint(2,6)):


@@ -343,7 +323,7 @@ else:
                                        LineColor = colors[cl],
                                        FillColor = colors[cf],
                                        FillStyle = 'Solid')
                                        LineColor = colors[cl],
                                        FillColor = colors[cf],
                                        FillStyle = 'Solid')

-                                
+

             ## Pointset
             for i in range(4):
                 points = []
             ## Pointset
             for i in range(4):
                 points = []


@@ -351,7 +331,7 @@ else:
                 cf = random.randint(0,len(colors)-1)
                 D = random.randint(1,4)
                 Canvas.AddPointSet(points, Color = colors[cf], Diameter = D)
                 cf = random.randint(0,len(colors)-1)
                 D = random.randint(1,4)
                 Canvas.AddPointSet(points, Color = colors[cf], Diameter = D)

-            
+

             # Text
             String = "Unscaled text"
             for i in range(3):
             # Text
             String = "Unscaled text"
             for i in range(3):


@@ -368,6 +348,17 @@ else:
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
                 Canvas.AddScaledText(String, x, y, Size = ts, Color = colors[cf], Position = "cc")
 
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
                 Canvas.AddScaledText(String, x, y, Size = ts, Color = colors[cf], Position = "cc")
 

+            # Arrows
+            N = 5
+            Points = RandomArray.uniform(Range[0], Range[1], (N,2) )
+            for i in range(N):
+                Canvas.AddArrow(Points[i],
+                                random.uniform(20,100),
+                                Direction = random.uniform(0,360),
+                                LineWidth = random.uniform(1,5),
+                                LineColor = colors[random.randint(0,len(colors)-1)],
+                                ArrowHeadAngle = random.uniform(20,90))
+

             Canvas.ZoomToBB()
 
         def TestAnimation(self,event=None):
             Canvas.ZoomToBB()
 
         def TestAnimation(self,event=None):


@@ -380,8 +371,7 @@ else:
             having to re-draw the whole background.
 
             """
             having to re-draw the whole background.
 
             """

-            print "Running TestAnimation"
-            wx.GetApp().Yield(True)
+            wx.GetApp().Yield()

             Range = (-10,10)
             self.Range = Range
 
             Range = (-10,10)
             self.Range = Range
 


@@ -391,7 +381,7 @@ else:
             Canvas.ClearAll()
             Canvas.SetProjectionFun(None)
 
             Canvas.ClearAll()
             Canvas.SetProjectionFun(None)
 

-            ##         Random tests of everything:
+            ##          Random tests of everything:

             colors = self.colors
             # Rectangles
             for i in range(3):
             colors = self.colors
             # Rectangles
             for i in range(3):


@@ -401,7 +391,7 @@ else:
                 h = random.randint(1,5)
                 w = random.randint(1,5)
                 Canvas.AddRectangle(x,y,h,w,LineWidth = lw,FillColor = colors[cf])
                 h = random.randint(1,5)
                 w = random.randint(1,5)
                 Canvas.AddRectangle(x,y,h,w,LineWidth = lw,FillColor = colors[cf])

-              
+

             # Ellipses
             for i in range(3):
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
             # Ellipses
             for i in range(3):
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))


@@ -410,7 +400,7 @@ else:
                 h = random.randint(1,5)
                 w = random.randint(1,5)
                 Canvas.AddEllipse(x,y,h,w,LineWidth = lw,FillColor = colors[cf])
                 h = random.randint(1,5)
                 w = random.randint(1,5)
                 Canvas.AddEllipse(x,y,h,w,LineWidth = lw,FillColor = colors[cf])

-              
+

             # Circles
             for i in range(5):
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
             # Circles
             for i in range(5):
                 x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))


@@ -420,7 +410,7 @@ else:
                 cl = random.randint(0,len(colors)-1)
                 Canvas.AddCircle(x,y,D,LineWidth = lw,LineColor = colors[cl],FillColor = colors[cf])
                 Canvas.AddText("Circle # %i"%(i),x,y,Size = 12,BackgroundColor = None,Position = "cc")
                 cl = random.randint(0,len(colors)-1)
                 Canvas.AddCircle(x,y,D,LineWidth = lw,LineColor = colors[cl],FillColor = colors[cf])
                 Canvas.AddText("Circle # %i"%(i),x,y,Size = 12,BackgroundColor = None,Position = "cc")

-              
+

             # Lines
             for i in range(5):
                 points = []
             # Lines
             for i in range(5):
                 points = []


@@ -431,7 +421,7 @@ else:
                 cf = random.randint(0,len(colors)-1)
                 cl = random.randint(0,len(colors)-1)
                 Canvas.AddLine(points, LineWidth = lw, LineColor = colors[cl])
                 cf = random.randint(0,len(colors)-1)
                 cl = random.randint(0,len(colors)-1)
                 Canvas.AddLine(points, LineWidth = lw, LineColor = colors[cl])

-              
+

             # Polygons
             for i in range(3):
                 points = []
             # Polygons
             for i in range(3):
                 points = []


@@ -446,7 +436,7 @@ else:
                                        LineColor = colors[cl],
                                        FillColor = colors[cf],
                                        FillStyle = 'Solid')
                                        LineColor = colors[cl],
                                        FillColor = colors[cf],
                                        FillStyle = 'Solid')

-                                
+

             # Scaled Text
             String = "Scaled text"
             for i in range(3):
             # Scaled Text
             String = "Scaled text"
             for i in range(3):


@@ -458,13 +448,13 @@ else:
 
             # Now the Foreground Object:
             C = Canvas.AddCircle(0,0,7,LineWidth = 2,LineColor = "Black",FillColor = "Red", InForeground = True)
 
             # Now the Foreground Object:
             C = Canvas.AddCircle(0,0,7,LineWidth = 2,LineColor = "Black",FillColor = "Red", InForeground = True)

-            T = Canvas.AddScaledText("Click to Move",0,0, Size = 0.8, Position = 'cc', InForeground = True)
+            T = Canvas.AddScaledText("Click to Move",0,0, Size = 0.6, Position = 'cc', InForeground = True)

             C.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.MoveMe)
             C.Text = T
 
             self.Timer = wx.PyTimer(self.ShowFrame)
             self.FrameDelay = 50 # milliseconds
             C.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.MoveMe)
             C.Text = T
 
             self.Timer = wx.PyTimer(self.ShowFrame)
             self.FrameDelay = 50 # milliseconds

-            
+

             Canvas.ZoomToBB()
 
         def ShowFrame(self):
             Canvas.ZoomToBB()
 
         def ShowFrame(self):


@@ -483,7 +473,7 @@ else:
                 wx.GetApp().Yield(True)
             else:
                 self.Timer.Stop()
                 wx.GetApp().Yield(True)
             else:
                 self.Timer.Stop()

-            
+

 
         def MoveMe(self, Object):
             self.MovingObject = Object
 
         def MoveMe(self, Object):
             self.MovingObject = Object


@@ -492,13 +482,13 @@ else:
             self.dy = random.uniform(Range[0]/4,Range[1]/4)
             #import time
             #start = time.time()
             self.dy = random.uniform(Range[0]/4,Range[1]/4)
             #import time
             #start = time.time()

-            self.NumTimeSteps = 500
+            self.NumTimeSteps = 200

             self.TimeStep = 1
             self.Timer.Start(self.FrameDelay)
             #print "Did %i frames in %f seconds"%(N, (time.time() - start) )
             self.TimeStep = 1
             self.Timer.Start(self.FrameDelay)
             #print "Did %i frames in %f seconds"%(N, (time.time() - start) )

-                
+

         def TestHitTest(self,event=None):
         def TestHitTest(self,event=None):

-            wx.GetApp().Yield(True)
+            wx.GetApp().Yield()

 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas


@@ -506,34 +496,35 @@ else:
             Canvas.ClearAll()
             Canvas.SetProjectionFun(None)
 
             Canvas.ClearAll()
             Canvas.SetProjectionFun(None)
 

-            #Add a HitAble rectangle
+            #Add a Hit-able rectangle

             w, h = 60, 20
 
             dx = 80
             dy = 40
             x,y = 20, 20
             w, h = 60, 20
 
             dx = 80
             dy = 40
             x,y = 20, 20

-            
+            FontSize = 8
+

             #Add one that is not HitAble
             Canvas.AddRectangle(x, y, w, h, LineWidth = 2)
             #Add one that is not HitAble
             Canvas.AddRectangle(x, y, w, h, LineWidth = 2)

-            Canvas.AddText("Not Hit-able", x, y, Position = "bl")
-            
+            Canvas.AddText("Not Hit-able", x, y, Size = FontSize, Position = "bl")
+

 
             x += dx
 
             x += dx

-            R = Canvas.AddRectangle(x, y, w, h,LineWidth = 2)
+            R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2)

             R.Name = "Line Rectangle"
             R.HitFill = False
             R.Name = "Line Rectangle"
             R.HitFill = False

+            R.HitLineWidth = 5 # Makes it a little easier to hit

             R.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHit)
             R.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHit)

-            Canvas.AddText("Left Click Line", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
-            
+            Canvas.AddText("Left Click Line", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "Red"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + "Rectangle"
             R.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHit)
 
             x += dx
             color = "Red"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + "Rectangle"
             R.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHit)

-            Canvas.AddText("Left Click Fill", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Left Click Fill", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x = 20
             y += dy
 
             x = 20
             y += dy


@@ -542,15 +533,15 @@ else:
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_RIGHT_DOWN, self.RectGotHit)
             Canvas.AddText("Right Click Fill", x, y, Position = "bl")
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_RIGHT_DOWN, self.RectGotHit)
             Canvas.AddText("Right Click Fill", x, y, Position = "bl")

-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "Grey"
             R = Canvas.AddEllipse(x, y, w, h,LineWidth = 2,FillColor = color)
             R.Name = color +" Ellipse"
             R.Bind(FloatCanvas.EVT_FC_RIGHT_DOWN, self.RectGotHit)
 
             x += dx
             color = "Grey"
             R = Canvas.AddEllipse(x, y, w, h,LineWidth = 2,FillColor = color)
             R.Name = color +" Ellipse"
             R.Bind(FloatCanvas.EVT_FC_RIGHT_DOWN, self.RectGotHit)

-            Canvas.AddText("Right Click Fill", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Right Click Fill", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "Brown"
 
             x += dx
             color = "Brown"


@@ -558,8 +549,8 @@ else:
             R.Name = color + " Circle"
             R.HitFill = True
             R.Bind(FloatCanvas.EVT_FC_LEFT_DCLICK, self.RectGotHit)
             R.Name = color + " Circle"
             R.HitFill = True
             R.Bind(FloatCanvas.EVT_FC_LEFT_DCLICK, self.RectGotHit)

-            Canvas.AddText("Left D-Click Fill", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Left D-Click Fill", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x = 20
             y += dy
 
             x = 20
             y += dy


@@ -567,24 +558,24 @@ else:
             R = Canvas.AddCircle(x+dx/2, y+dy/2, dx/4, LineWidth = 2,FillColor = color)
             R.Name = color +  " Circle"
             R.Bind(FloatCanvas.EVT_FC_LEFT_UP, self.RectGotHit)
             R = Canvas.AddCircle(x+dx/2, y+dy/2, dx/4, LineWidth = 2,FillColor = color)
             R.Name = color +  " Circle"
             R.Bind(FloatCanvas.EVT_FC_LEFT_UP, self.RectGotHit)

-            Canvas.AddText("Left Up Fill", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Left Up Fill", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "White"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_MIDDLE_DOWN, self.RectGotHit)
 
             x += dx
             color = "White"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_MIDDLE_DOWN, self.RectGotHit)

-            Canvas.AddText("Middle Down", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Middle Down", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "AQUAMARINE"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_MIDDLE_UP, self.RectGotHit)
 
             x += dx
             color = "AQUAMARINE"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_MIDDLE_UP, self.RectGotHit)

-            Canvas.AddText("Middle Up", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Middle Up", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x = 20
             y += dy
 
             x = 20
             y += dy


@@ -592,24 +583,24 @@ else:
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_MIDDLE_DCLICK, self.RectGotHit)
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_MIDDLE_DCLICK, self.RectGotHit)

-            Canvas.AddText("Middle DoubleClick", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Middle DoubleClick", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "CYAN"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_RIGHT_UP, self.RectGotHit)
 
             x += dx
             color = "CYAN"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_RIGHT_UP, self.RectGotHit)

-            Canvas.AddText("Right Up", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Right Up", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "LIME GREEN"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_RIGHT_DCLICK, self.RectGotHit)
 
             x += dx
             color = "LIME GREEN"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_RIGHT_DCLICK, self.RectGotHit)

-            Canvas.AddText("Right Double Click", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Right Double Click", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x = 20
             y += dy
 
             x = 20
             y += dy


@@ -618,24 +609,24 @@ else:
             R.Name = color
             R.Bind(FloatCanvas.EVT_FC_RIGHT_DOWN, self.RectGotHitRight)
             R.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHitLeft)
             R.Name = color
             R.Bind(FloatCanvas.EVT_FC_RIGHT_DOWN, self.RectGotHitRight)
             R.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHitLeft)

-            Canvas.AddText("L and R Click", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("L and R Click", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "SALMON"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_ENTER_OBJECT, self.RectMouseOver)
 
             x += dx
             color = "SALMON"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color + " Rectangle"
             R.Bind(FloatCanvas.EVT_FC_ENTER_OBJECT, self.RectMouseOver)

-            Canvas.AddText("Mouse Enter", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Mouse Enter", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "MEDIUM VIOLET RED"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color
             R.Bind(FloatCanvas.EVT_FC_LEAVE_OBJECT, self.RectMouseLeave)
 
             x += dx
             color = "MEDIUM VIOLET RED"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color)
             R.Name = color
             R.Bind(FloatCanvas.EVT_FC_LEAVE_OBJECT, self.RectMouseLeave)

-            Canvas.AddText("Mouse Leave", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Mouse Leave", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x = 20
             y += dy
 
             x = 20
             y += dy


@@ -644,8 +635,8 @@ else:
             R.Name = color
             R.Bind(FloatCanvas.EVT_FC_ENTER_OBJECT, self.RectMouseOver)
             R.Bind(FloatCanvas.EVT_FC_LEAVE_OBJECT, self.RectMouseLeave)
             R.Name = color
             R.Bind(FloatCanvas.EVT_FC_ENTER_OBJECT, self.RectMouseOver)
             R.Bind(FloatCanvas.EVT_FC_LEAVE_OBJECT, self.RectMouseLeave)

-            Canvas.AddText("Enter and Leave", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Enter and Leave", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "WHEAT"
 
             x += dx
             color = "WHEAT"


@@ -653,8 +644,8 @@ else:
             R.Name = color
             R.Bind(FloatCanvas.EVT_FC_ENTER_OBJECT, self.RectMouseOver)
             R.Bind(FloatCanvas.EVT_FC_LEAVE_OBJECT, self.RectMouseLeave)
             R.Name = color
             R.Bind(FloatCanvas.EVT_FC_ENTER_OBJECT, self.RectMouseOver)
             R.Bind(FloatCanvas.EVT_FC_LEAVE_OBJECT, self.RectMouseLeave)

-            Canvas.AddText("Mouse Enter&Leave", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Mouse Enter&Leave", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "KHAKI"
 
             x += dx
             color = "KHAKI"


@@ -662,16 +653,16 @@ else:
             R.Name = color
             R.Bind(FloatCanvas.EVT_FC_ENTER_OBJECT, self.RectMouseOver)
             R.Bind(FloatCanvas.EVT_FC_LEAVE_OBJECT, self.RectMouseLeave)
             R.Name = color
             R.Bind(FloatCanvas.EVT_FC_ENTER_OBJECT, self.RectMouseOver)
             R.Bind(FloatCanvas.EVT_FC_LEAVE_OBJECT, self.RectMouseLeave)

-            Canvas.AddText("Mouse ENter&Leave", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Mouse ENter&Leave", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x = 20
             y += dy
             L = Canvas.AddLine(( (x, y), (x+10, y+10), (x+w, y+h) ), LineWidth = 2, LineColor = "Red")
             L.Name = "A Line"
             L.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHitLeft)
 
             x = 20
             y += dy
             L = Canvas.AddLine(( (x, y), (x+10, y+10), (x+w, y+h) ), LineWidth = 2, LineColor = "Red")
             L.Name = "A Line"
             L.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHitLeft)

-            Canvas.AddText("Left Down", x, y, Position = "bl")
-            Canvas.AddText(L.Name, x, y+h, Position = "tl")
+            Canvas.AddText("Left Down", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(L.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "SEA GREEN"
 
             x += dx
             color = "SEA GREEN"


@@ -679,8 +670,8 @@ else:
             R = Canvas.AddPolygon(Points,  LineWidth = 2, FillColor = color)
             R.Name = color + " Polygon"
             R.Bind(FloatCanvas.EVT_FC_RIGHT_DOWN, self.RectGotHitRight)
             R = Canvas.AddPolygon(Points,  LineWidth = 2, FillColor = color)
             R.Name = color + " Polygon"
             R.Bind(FloatCanvas.EVT_FC_RIGHT_DOWN, self.RectGotHitRight)

-            Canvas.AddText("RIGHT_DOWN", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("RIGHT_DOWN", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x += dx
             color = "Red"
 
             x += dx
             color = "Red"


@@ -688,28 +679,27 @@ else:
             R = Canvas.AddPointSet(Points,  Diameter = 4, Color = color)
             R.Name = "PointSet"
             R.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.PointSetGotHit)
             R = Canvas.AddPointSet(Points,  Diameter = 4, Color = color)
             R.Name = "PointSet"
             R.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.PointSetGotHit)

-            Canvas.AddText("LEFT_DOWN", x, y, Position = "bl")
-            Canvas.AddText(R.Name, x, y+h, Position = "tl")
+            Canvas.AddText("LEFT_DOWN", x, y, Size = FontSize, Position = "bl")
+            Canvas.AddText(R.Name, x, y+h, Size = FontSize, Position = "tl")

 
             x = 20
             y += dy
             T = Canvas.AddText("Hit-able Text", x, y, Size = 15, Color = "Red", Position = 'tl')
             T.Name = "Hit-able Text"
             T.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHitLeft)
 
             x = 20
             y += dy
             T = Canvas.AddText("Hit-able Text", x, y, Size = 15, Color = "Red", Position = 'tl')
             T.Name = "Hit-able Text"
             T.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHitLeft)

-            Canvas.AddText("Left Down", x, y, Position = "bl")
+            Canvas.AddText("Left Down", x, y, Size = FontSize, Position = "bl")

 
             x += dx
             T = Canvas.AddScaledText("Scaled Text", x, y, Size = 1./2*h, Color = "Pink", Position = 'bl')
             Canvas.AddPointSet( (x, y), Diameter = 3)
             T.Name = "Scaled Text"
             T.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHitLeft)
 
             x += dx
             T = Canvas.AddScaledText("Scaled Text", x, y, Size = 1./2*h, Color = "Pink", Position = 'bl')
             Canvas.AddPointSet( (x, y), Diameter = 3)
             T.Name = "Scaled Text"
             T.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RectGotHitLeft)

-            Canvas.AddText("Left Down", x, y, Position = "tl")
+            Canvas.AddText("Left Down", x, y, Size = FontSize, Position = "tl")

 
             self.Canvas.ZoomToBB()
 
         def TestHitTestForeground(self,event=None):
 
             self.Canvas.ZoomToBB()
 
         def TestHitTestForeground(self,event=None):

-            print "Running: TestHitTestForeground"
-            wx.GetApp().Yield(True)
+            wx.GetApp().Yield()

 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas


@@ -723,7 +713,7 @@ else:
             dx = 80
             dy = 40
             x,y = 20, 20
             dx = 80
             dy = 40
             x,y = 20, 20

-            
+

             color = "Red"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color, InForeground = False)
             R.Name = color + "Rectangle"
             color = "Red"
             R = Canvas.AddRectangle(x, y, w, h, LineWidth = 2, FillColor = color, InForeground = False)
             R.Name = color + "Rectangle"


@@ -733,10 +723,10 @@ else:
             Canvas.AddText(R.Name, x, y+h, Position = "tl")
 
             ## A set of Rectangles that move together
             Canvas.AddText(R.Name, x, y+h, Position = "tl")
 
             ## A set of Rectangles that move together

-            
+

             ## NOTE: In a real app, it might be better to create a new
             ## custom FloatCanvas DrawObject
             ## NOTE: In a real app, it might be better to create a new
             ## custom FloatCanvas DrawObject

-            
+

             self.MovingRects = []
             x += dx
             color = "LightBlue"
             self.MovingRects = []
             x += dx
             color = "LightBlue"


@@ -773,16 +763,16 @@ else:
 
         def RectMoveLeft(self,Object):
             self.MoveRects("left")
 
         def RectMoveLeft(self,Object):
             self.MoveRects("left")

-            
+

         def RectMoveRight(self,Object):
             self.MoveRects("right")
         def RectMoveRight(self,Object):
             self.MoveRects("right")

-                        
+

         def RectMoveUp(self,Object):
             self.MoveRects("up")
         def RectMoveUp(self,Object):
             self.MoveRects("up")

-                        
+

         def RectMoveDown(self,Object):
             self.MoveRects("down")
         def RectMoveDown(self,Object):
             self.MoveRects("down")

-                        
+

         def MoveRects(self, Dir):
             for Object in self.MovingRects:
                 X,Y = Object.XY
         def MoveRects(self, Dir):
             for Object in self.MovingRects:
                 X,Y = Object.XY


@@ -792,8 +782,8 @@ else:
                 elif Dir == "down": Y -= 10
                 Object.SetXY(X,Y)
             self.Canvas.Draw()
                 elif Dir == "down": Y -= 10
                 Object.SetXY(X,Y)
             self.Canvas.Draw()

-                
-                        
+
+

         def PointSetGotHit(self, Object):
             print Object.Name, "Got Hit\n"
 
         def PointSetGotHit(self, Object):
             print Object.Name, "Got Hit\n"
 


@@ -814,7 +804,7 @@ else:
 
 
         def TestText(self, event= None):
 
 
         def TestText(self, event= None):

-            wx.GetApp().Yield(True)
+            wx.GetApp().Yield()

 
             self.BindAllMouseEvents()
             Canvas = self.Canvas
 
             self.BindAllMouseEvents()
             Canvas = self.Canvas


@@ -829,10 +819,6 @@ else:
 
             # Text
             String = "Some text"
 
             # Text
             String = "Some text"

-##            for i in range(10):
-##                ts = random.randint(10,40)
-##                cf = random.randint(0,len(colors)-1)
-##                x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))

             self.Canvas.AddText("Top Left",x,y,Size = 14,Color = "Yellow",BackgroundColor = "Blue", Position = "tl")
             self.Canvas.AddText("Bottom Left",x,y,Size = 14,Color = "Cyan",BackgroundColor = "Black",Position = "bl")
             self.Canvas.AddText("Top Right",x,y,Size = 14,Color = "Black",BackgroundColor = "Cyan",Position = "tr")
             self.Canvas.AddText("Top Left",x,y,Size = 14,Color = "Yellow",BackgroundColor = "Blue", Position = "tl")
             self.Canvas.AddText("Bottom Left",x,y,Size = 14,Color = "Cyan",BackgroundColor = "Black",Position = "bl")
             self.Canvas.AddText("Top Right",x,y,Size = 14,Color = "Black",BackgroundColor = "Cyan",Position = "tr")


@@ -840,19 +826,19 @@ else:
             Canvas.AddPointSet((x,y), Color = "White", Diameter = 2)
 
             x,y  = (0, 2)
             Canvas.AddPointSet((x,y), Color = "White", Diameter = 2)
 
             x,y  = (0, 2)

-            
+

             Canvas.AddPointSet((x,y), Color = "White", Diameter = 2)
             self.Canvas.AddText("Top Center",x,y,Size = 14,Color = "Black",Position = "tc")
             self.Canvas.AddText("Bottom Center",x,y,Size = 14,Color = "White",Position = "bc")
 
             x,y  = (0, 4)
             Canvas.AddPointSet((x,y), Color = "White", Diameter = 2)
             self.Canvas.AddText("Top Center",x,y,Size = 14,Color = "Black",Position = "tc")
             self.Canvas.AddText("Bottom Center",x,y,Size = 14,Color = "White",Position = "bc")
 
             x,y  = (0, 4)

-            
+

             Canvas.AddPointSet((x,y), Color = "White", Diameter = 2)
             self.Canvas.AddText("Center Right",x,y,Size = 14,Color = "Black",Position = "cr")
             self.Canvas.AddText("Center Left",x,y,Size = 14,Color = "Black",Position = "cl")
 
             x,y  = (0, -2)
             Canvas.AddPointSet((x,y), Color = "White", Diameter = 2)
             self.Canvas.AddText("Center Right",x,y,Size = 14,Color = "Black",Position = "cr")
             self.Canvas.AddText("Center Left",x,y,Size = 14,Color = "Black",Position = "cl")
 
             x,y  = (0, -2)

-            
+

             Canvas.AddPointSet((x,y), Color = "White", Diameter = 2)
             self.Canvas.AddText("Center Center",x,y,Size = 14,Color = "Black",Position = "cc")
 
             Canvas.AddPointSet((x,y), Color = "White", Diameter = 2)
             self.Canvas.AddText("Center Center",x,y,Size = 14,Color = "Black",Position = "cc")
 


@@ -874,7 +860,7 @@ else:
             self.Canvas.ZoomToBB()
 
         def TestScaledText(self, event= None):
             self.Canvas.ZoomToBB()
 
         def TestScaledText(self, event= None):

-            wx.GetApp().Yield(True)
+            wx.GetApp().Yield()

 
             self.BindAllMouseEvents()
             Canvas = self.Canvas
 
             self.BindAllMouseEvents()
             Canvas = self.Canvas


@@ -891,13 +877,13 @@ else:
 
 
             x,y  = (0, 20)
 
 
             x,y  = (0, 20)

-            
+

             Canvas.AddScaledText("Top Center",x,y,Size = 7,Color = "Black",Position = "tc")
             Canvas.AddScaledText("Bottom Center",x,y,Size = 7,Color = "White",Position = "bc")
             Canvas.AddPointSet((x,y), Color = "White", Diameter = 4)
 
             x,y  = (0, -20)
             Canvas.AddScaledText("Top Center",x,y,Size = 7,Color = "Black",Position = "tc")
             Canvas.AddScaledText("Bottom Center",x,y,Size = 7,Color = "White",Position = "bc")
             Canvas.AddPointSet((x,y), Color = "White", Diameter = 4)
 
             x,y  = (0, -20)

-          
+

             Canvas.AddScaledText("Center Right",x,y,Size = 9,Color = "Black",Position = "cr")
             Canvas.AddScaledText("Center Left",x,y,Size = 9,Color = "Black",Position = "cl")
             Canvas.AddPointSet((x,y), Color = "White", Diameter = 4)
             Canvas.AddScaledText("Center Right",x,y,Size = 9,Color = "Black",Position = "cr")
             Canvas.AddScaledText("Center Left",x,y,Size = 9,Color = "Black",Position = "cl")
             Canvas.AddPointSet((x,y), Color = "White", Diameter = 4)


@@ -923,17 +909,17 @@ else:
             T = self.Canvas.AddScaledText("Bookman Font", x, y, Size = 8, Font = Font)
 
             self.Canvas.ZoomToBB()
             T = self.Canvas.AddScaledText("Bookman Font", x, y, Size = 8, Font = Font)
 
             self.Canvas.ZoomToBB()

-            
+

         def DrawMap(self,event = None):
         def DrawMap(self,event = None):

-            wx.GetApp().Yield(True)
+            wx.GetApp().Yield()

             import os, time
             self.BindAllMouseEvents()
             import os, time
             self.BindAllMouseEvents()

-            
+

         ## Test of Actual Map Data
             self.Canvas.ClearAll()
             self.Canvas.SetProjectionFun("FlatEarth")
             #start = time.clock()
         ## Test of Actual Map Data
             self.Canvas.ClearAll()
             self.Canvas.SetProjectionFun("FlatEarth")
             #start = time.clock()

-            Shorelines = Read_MapGen(os.path.join("data",'world.dat'),stats = 0)
+            Shorelines = self.Read_MapGen(os.path.join("data",'world.dat'),stats = 0)

             #print "It took %f seconds to load %i shorelines"%(time.clock() - start,len(Shorelines) )
             #start = time.clock()
             for segment in Shorelines:
             #print "It took %f seconds to load %i shorelines"%(time.clock() - start,len(Shorelines) )
             #start = time.clock()
             for segment in Shorelines:


@@ -942,10 +928,10 @@ else:
             #start = time.clock()
             self.Canvas.ZoomToBB()
             #print "It took %f seconds to draw %i shorelines"%(time.clock() - start,len(Shorelines) )
             #start = time.clock()
             self.Canvas.ZoomToBB()
             #print "It took %f seconds to draw %i shorelines"%(time.clock() - start,len(Shorelines) )

-    
- 
+
+

         def LineTest(self,event = None):
         def LineTest(self,event = None):

-            wx.GetApp().Yield(True)
+            wx.GetApp().Yield()

             import os, time
 #            import random
             colors = self.colors
             import os, time
 #            import random
             colors = self.colors


@@ -974,9 +960,7 @@ else:
             #print "It took %f seconds to draw %i lines"%(time.clock() - start,len(linepoints) )
 
         def SpeedTest(self,event=None):
             #print "It took %f seconds to draw %i lines"%(time.clock() - start,len(linepoints) )
 
         def SpeedTest(self,event=None):

-            wx.GetApp().Yield(True)
-#            import random
-#            import RandomArray
+            wx.GetApp().Yield()

             BigRange = (-1000,1000)
             colors = self.colors
 
             BigRange = (-1000,1000)
             colors = self.colors
 


@@ -986,136 +970,218 @@ else:
             Canvas.ClearAll()
             Canvas.SetProjectionFun(None)
 
             Canvas.ClearAll()
             Canvas.SetProjectionFun(None)
 

-            # Lots of Text
-            String = "Unscaled text"
+            # Pointset

             coords = []
             coords = []

-            text = []
-            for i in range(5000):
+            for i in range(1000):

                 x,y = (random.uniform(BigRange[0],BigRange[1]),random.uniform(BigRange[0],BigRange[1]))
                 coords.append( (x,y) )
                 x,y = (random.uniform(BigRange[0],BigRange[1]),random.uniform(BigRange[0],BigRange[1]))
                 coords.append( (x,y) )

-            print "Drawing the Numbers"
+            print "Drawing the Points"

             start = time.clock()
             start = time.clock()

-            for i in xrange( len(coords) ):
-                Canvas.AddText("%i"%(i),
-                               coords[i][0],
-                               coords[i][1],
-                               Size = 12,
-                               Position = "cc",
-                               BackgroundColor = "White")
-            print "It took %s seconds to add the numbers"%(time.clock() - start)
-
-
-##            ObjectList = []
-
-##            print "Building a list of lots of random objects"
-##            ##               Random tests of everything:
-##            def MakeRange():
-##                while True:
-##                    Range = ( random.randint(BigRange[0],BigRange[1]), random.randint(BigRange[0],BigRange[1]) ) 
-##                    if abs (Range[0] -  Range[1]) < 10:
-##                        continue
-##                    if Range[0] > Range[1]:
-##                        Range = ( Range[1], Range[0] )
-##                    break
-##                return Range
-
-##            # Rectangles
-##            for i in range(300):
-##                Range = MakeRange()
-##                x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
-##                lw = random.randint(1,5)
-##                cf = random.randint(0,len(colors)-1)
-##                h = random.randint(1, Range[1] - Range[0])
-##                w = random.randint(1, Range[1] - Range[0])
-##                ObjectList.append(FloatCanvas.Rectangle(x,y,h,w,LineWidth = lw,FillColor = colors[cf]))
-              
-##            # Ellipses
-##            for i in range(300):
-##                Range = MakeRange()
-##                x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
-##                lw = random.randint(1,5)
-##                cf = random.randint(0,len(colors)-1)
-##                h = random.randint(1, Range[1] - Range[0])
-##                w = random.randint(1, Range[1] - Range[0])
-##                ObjectList.append(FloatCanvas.Ellipse(x,y,h,w,LineWidth = lw,FillColor = colors[cf]))
-              
-            
-##            # Circles
-##            for i in range(500):
-##                Range = MakeRange()
-##                x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
-##                D = random.randint(1, (Range[1] - Range[0]) / 2)
-##                lw = random.randint(1,5)
-##                cf = random.randint(0,len(colors)-1)
-##                cl = random.randint(0,len(colors)-1)
-##                ObjectList.append(FloatCanvas.Circle(x,y,D,LineWidth = lw,LineColor = colors[cl],FillColor = colors[cf]))
-##                #ObjectList.append(FloatCanvas.Text("Circle # %i"%(i),x,y,Size = 12,BackgroundColor = None,Position = "cc"))
-              
-##                # Lines
-##            for i in range(500):
-##                Range = MakeRange()
-##                points = []
-##                for j in range(random.randint(2,100)):
-##                    point = (random.randint(Range[0],Range[1]),random.randint(Range[0],Range[1]))
-##                    points.append(point)
-##                lw = random.randint(1,10)
-##                cf = random.randint(0,len(colors)-1)
-##                cl = random.randint(0,len(colors)-1)
-##                ObjectList.append(FloatCanvas.Line(points, LineWidth = lw, LineColor = colors[cl]) )
-              
-##                # Polygons
-##            for i in range(300):
-##                Range = MakeRange()
-##                points = []
-##                for j in range(random.randint(2,60)):
-##                    point = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
-##                    points.append(point)
-##                lw = random.randint(1,6)
-##                cf = random.randint(0,len(colors)-1)
-##                cl = random.randint(0,len(colors)-1)
-##                ObjectList.append(FloatCanvas.Polygon(points,
-##                                       LineWidth = lw,
-##                                       LineColor = colors[cl],
-##                                       FillColor = colors[cf],
-##                                       FillStyle = 'Solid') )
-##            random.shuffle(ObjectList)
-##            print "Adding lots of random objects"
-##            start = time.clock()
-##            for Object in ObjectList:
-##                Canvas.AddObject(Object)
-##            print "It took %s Seconds to add %i objects "%(time.clock() - start, len(ObjectList) )
-
-##            ## Pointset
-##            for i in range(100):
-##                points = []
-##                points = RandomArray.uniform(Range[0],Range[1],(100,2))
-##                cf = random.randint(0,len(colors)-1)
-##                D = random.randint(1,4)
-##                Canvas.AddPointSet(points, Color = colors[cf], Diameter = D)
-            
-
-##            # Scaled Text
-##            String = "Scaled text"
-##            for i in range(30):
-##                ts = random.random()*3 + 0.2
-##                cf = random.randint(0,len(colors)-1)
-##                x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
-##                Canvas.AddScaledText(String, x, y, Size = ts, Color = colors[cf], Position = "cc")
+            for Point in coords:
+                Canvas.AddPoint(Point, Diameter = 4)
+            print "It took %s seconds to add the points"%(time.clock() - start)
+            Canvas.ZoomToBB()
+
+        def PropertiesChangeTest(self,event=None):
+            wx.GetApp().Yield()
+
+            Range = (-10,10)
+            colors = self.colors
+
+            self.UnBindAllMouseEvents()
+            Canvas = self.Canvas
+
+            Canvas.ClearAll()
+            Canvas.SetProjectionFun(None)
+
+            self.ColorObjectsAll = []
+            self.ColorObjectsLine = []
+            self.ColorObjectsColor = []
+            self.ColorObjectsText = []
+            ##One of each object:
+            # Rectangle
+            x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
+            lw = random.randint(1,5)
+            cf = random.randint(0,len(colors)-1)
+            h = random.randint(1,5)
+            w = random.randint(1,5)
+            self.Rectangle = Canvas.AddRectangle(x,y,w,h,LineWidth = lw,FillColor = colors[cf])
+            self.ColorObjectsAll.append(self.Rectangle)
+
+            # Ellipse
+            x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
+            lw = random.randint(1,5)
+            cf = random.randint(0,len(colors)-1)
+            h = random.randint(1,5)
+            w = random.randint(1,5)
+            self.Ellipse = Canvas.AddEllipse(x,y,h,w,LineWidth = lw,FillColor = colors[cf])
+            self.ColorObjectsAll.append(self.Ellipse)
+
+            # Point 
+            xy = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
+            D = random.randint(1,50)
+            lw = random.randint(1,5)
+            cf = random.randint(0,len(colors)-1)
+            cl = random.randint(0,len(colors)-1)
+            self.ColorObjectsColor.append(Canvas.AddPoint(xy, colors[cf], D))
+
+            # Circle
+            x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
+            D = random.randint(1,5)
+            lw = random.randint(1,5)
+            cf = random.randint(0,len(colors)-1)
+            cl = random.randint(0,len(colors)-1)
+            self.Circle = Canvas.AddCircle(x,y,D,LineWidth = lw,LineColor = colors[cl],FillColor = colors[cf])
+            self.ColorObjectsAll.append(self.Circle)
+
+            # Line
+            points = []
+            for j in range(random.randint(2,10)):
+                point = (random.randint(Range[0],Range[1]),random.randint(Range[0],Range[1]))
+                points.append(point)
+            lw = random.randint(1,10)
+            cf = random.randint(0,len(colors)-1)
+            cl = random.randint(0,len(colors)-1)
+            self.ColorObjectsLine.append(Canvas.AddLine(points, LineWidth = lw, LineColor = colors[cl]))
+
+            # Polygon
+##            points = []
+##            for j in range(random.randint(2,6)):
+##                point = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
+##                points.append(point)
+            points = RandomArray.uniform(Range[0],Range[1],(6,2))
+            lw = random.randint(1,6)
+            cf = random.randint(0,len(colors)-1)
+            cl = random.randint(0,len(colors)-1)
+            self.ColorObjectsAll.append(Canvas.AddPolygon(points,
+                                                       LineWidth = lw, 
+                                                       LineColor = colors[cl],
+                                                       FillColor = colors[cf],
+                                                       FillStyle = 'Solid'))
+
+            ## Pointset
+            points = RandomArray.uniform(Range[0],Range[1],(100,2))
+            cf = random.randint(0,len(colors)-1)
+            D = random.randint(1,4)
+            self.PointSet = Canvas.AddPointSet(points, Color = colors[cf], Diameter = D)
+            self.ColorObjectsColor.append(self.PointSet)
+
+            ## Point
+            point = RandomArray.uniform(Range[0],Range[1],(2,))
+            cf = random.randint(0,len(colors)-1)
+            D = random.randint(1,4)
+            self.Point = Canvas.AddPoint(point, Color = colors[cf], Diameter = D)
+            self.ColorObjectsColor.append(self.Point)
+
+            # Text
+            String = "Unscaled text"
+            ts = random.randint(10,40)
+            cf = random.randint(0,len(colors)-1)
+            x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
+            self.ColorObjectsText.append(Canvas.AddText(String, x, y, Size = ts, Color = colors[cf], Position = "cc"))
+
+            # Scaled Text
+            String = "Scaled text"
+            ts = random.random()*3 + 0.2
+            cf = random.randint(0,len(colors)-1)
+            x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
+            self.ColorObjectsText.append(Canvas.AddScaledText(String, x, y, Size = ts, Color = colors[cf], Position = "cc"))
+
+            # A "Button"
+            Button = Canvas.AddRectangle(-10, -12, 20, 3, LineStyle = None, FillColor = "Red")
+            Canvas.AddScaledText("Click Here To Change Properties",
+                                 0, -10.5,
+                                 Size = 0.7,
+                                 Color = "Black",
+                                 Position = "cc")
+
+            Button.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.ChangeProperties)

 
             Canvas.ZoomToBB()
 
 
             Canvas.ZoomToBB()
 

+        def ChangeProperties(self, Object = None):
+            colors = self.colors
+            Range = (-10,10)
+
+            for Object in self.ColorObjectsAll:
+                pass
+                Object.SetFillColor(colors[random.randint(0,len(colors)-1)])
+                Object.SetLineColor(colors[random.randint(0,len(colors)-1)])
+                Object.SetLineWidth(random.randint(1,7))
+                Object.SetLineStyle(FloatCanvas.DrawObject.LineStyleList.keys()[random.randint(0,5)])
+            for Object in self.ColorObjectsLine:
+                Object.SetLineColor(colors[random.randint(0,len(colors)-1)])
+                Object.SetLineWidth(random.randint(1,7))
+                Object.SetLineStyle(FloatCanvas.DrawObject.LineStyleList.keys()[random.randint(0,5)])
+            for Object in self.ColorObjectsColor:
+                Object.SetColor(colors[random.randint(0,len(colors)-1)])
+            for Object in self.ColorObjectsText:
+                Object.SetColor(colors[random.randint(0,len(colors)-1)])
+                Object.SetBackgroundColor(colors[random.randint(0,len(colors)-1)])
+            self.Circle.SetDiameter(random.randint(1,10))
+            self.PointSet.SetDiameter(random.randint(1,8))
+            self.Point.SetDiameter(random.randint(1,8))
+            for Object in (self.Rectangle, self.Ellipse):
+                x,y = (random.uniform(Range[0],Range[1]),random.uniform(Range[0],Range[1]))
+                w,h = random.randint(1,5), random.randint(1,5)
+                Object.SetShape(x,y,w,h)
+            self.Canvas.Draw(Force = True)
+
+        def ArrowTest(self,event=None):
+            wx.GetApp().Yield()
+            self.UnBindAllMouseEvents()
+            Canvas = self.Canvas
+
+            Canvas.ClearAll()
+            Canvas.SetProjectionFun(None)
+
+            # put in a rectangle to get a bounding box
+            Canvas.AddRectangle(0,0,20,20,LineColor = None)
+
+            # Draw some Arrows
+            Canvas.AddArrow((10,10),Length = 40, Direction = 0)
+            Canvas.AddArrow((10,10),Length = 50, Direction = 45 ,LineWidth = 2, LineColor = "Black", ArrowHeadAngle = 20)
+            Canvas.AddArrow((10,10),Length = 60, Direction = 90 ,LineWidth = 3, LineColor = "Red",   ArrowHeadAngle = 30)
+            Canvas.AddArrow((10,10),Length = 70, Direction = 135,LineWidth = 4, LineColor = "Red",   ArrowHeadAngle = 40)
+            Canvas.AddArrow((10,10),Length = 80, Direction = 180,LineWidth = 5, LineColor = "Blue",  ArrowHeadAngle = 50)
+            Canvas.AddArrow((10,10),Length = 90, Direction = 225,LineWidth = 4, LineColor = "Blue",  ArrowHeadAngle = 60)
+            Canvas.AddArrow((10,10),Length = 100,Direction = 270,LineWidth = 3, LineColor = "Green", ArrowHeadAngle = 70)
+            Canvas.AddArrow((10,10),Length = 110,Direction = 315,LineWidth = 2, LineColor = "Green", ArrowHeadAngle = 90 )
+
+            Canvas.AddText("Clickable Arrow",4,18,Position = "bc")
+            Arrow = Canvas.AddArrow((4,18), 80, Direction = 90 ,LineWidth = 3, LineColor = "Red",   ArrowHeadAngle = 30)
+            Arrow.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.ArrowClicked)
+
+            Canvas.AddText("Changable Arrow",16,4,Position = "cc")
+            self.RotArrow = Canvas.AddArrow((16,4), 80, Direction = 0 ,LineWidth = 3, LineColor = "Green",   ArrowHeadAngle = 30)
+            self.RotArrow.Bind(FloatCanvas.EVT_FC_LEFT_DOWN, self.RotateArrow)
+
+
+
+            Canvas.ZoomToBB()
+
+        def ArrowClicked(self,event):
+            print "The Arrow was Clicked"
+
+        def RotateArrow(self,event):
+            print "The Changeable Arrow was Clicked"
+            ## You can do them either one at a time, or both at once
+            ## Doing them both at once prevents the arrow points from being calculated twice
+            #self.RotArrow.SetDirection(self.RotArrow.Direction + random.uniform(-90,90))
+            #self.RotArrow.SetLength(self.RotArrow.Length + random.randint(-20,20))
+            self.RotArrow.SetLengthDirection(self.RotArrow.Length + random.randint(-20,20),
+                                             self.RotArrow.Direction + random.uniform(-90,90) )
+
+            self.Canvas.Draw(Force = True)

 
         def TempTest(self, event= None):
 
         def TempTest(self, event= None):

-            "Running the Temporary test"
-            wx.GetApp().Yield(True)
+            wx.GetApp().Yield()

 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
             Canvas.ClearAll()
             Canvas.SetProjectionFun(None)
 
 
             self.UnBindAllMouseEvents()
             Canvas = self.Canvas
             Canvas.ClearAll()
             Canvas.SetProjectionFun(None)
 

-#            import random
-#            import RandomArray

             Range = (-10,10)
 
             # Create a random Polygon
             Range = (-10,10)
 
             # Create a random Polygon


@@ -1134,7 +1200,7 @@ else:
             self.SelectedPoly = None
             self.SelectPoints = []
             self.SelectedPoint = None
             self.SelectedPoly = None
             self.SelectPoints = []
             self.SelectedPoint = None

-            
+

             Canvas.ZoomToBB()
 
         def SelectPoly(self, Object):
             Canvas.ZoomToBB()
 
         def SelectPoly(self, Object):


@@ -1160,65 +1226,154 @@ else:
             print "Point Num: %i Hit"%Point.VerticeNum
             self.SelectedPoint = Point
 
             print "Point Num: %i Hit"%Point.VerticeNum
             self.SelectedPoint = Point
 

-            
-   
+        def Read_MapGen(self, filename, stats = 0,AllLines=0):
+            """
+            This function reads a MapGen Format file, and
+            returns a list of NumPy arrays with the line segments in them.
+
+            Each NumPy array in the list is an NX2 array of Python Floats.
+
+            The demo should have come with a file, "world.dat" that is the
+            shorelines of the whole world, in MapGen format.
+
+            """
+            import string
+            file = open(filename,'rt')
+            data = file.readlines()
+            data = map(string.strip,data)
+
+            Shorelines = []
+            segment = []
+            for line in data:
+                if line:
+                    if line == "# -b": #New segment beginning
+                        if segment: Shorelines.append(Numeric.array(segment))
+                        segment = []
+                    else:
+                        segment.append(map(float,string.split(line)))
+            if segment: Shorelines.append(Numeric.array(segment))
+
+            if stats:
+                NumSegments = len(Shorelines)
+                NumPoints = 0
+                for segment in Shorelines:
+                    NumPoints = NumPoints + len(segment)
+                AvgPoints = NumPoints / NumSegments
+                print "Number of Segments: ", NumSegments
+                print "Average Number of Points per segment: ",AvgPoints
+            if AllLines:
+                Lines = []
+                for segment in Shorelines:
+                    Lines.append(segment[0])
+                    for point in segment[1:-1]:
+                        Lines.append(point)
+                        Lines.append(point)
+                    Lines.append(segment[-1])
+                return Lines
+            else:
+                return Shorelines
+    return DrawFrame 
+
+#---------------------------------------------------------------------------
+      
+if __name__ == "__main__":
+    # check options:
+    import sys, getopt
+    optlist, args = getopt.getopt(sys.argv[1:],'l',["local","all","text","map","stext","hit","hitf","animate","speed","temp","props","arrow"])
+
+    if not haveNumeric:
+        raise ImportError(errorText)
+    StartUpDemo = "all" # the default
+    for opt in optlist:
+        if opt[0] == "--all":
+            StartUpDemo = "all"
+        elif opt[0] == "--text":
+            StartUpDemo = "text"
+        elif opt[0] == "--map":
+            StartUpDemo = "map"
+        elif opt[0] == "--stext":
+            StartUpDemo = "stext"
+        elif opt[0] == "--hit":
+            StartUpDemo = "hit"
+        elif opt[0] == "--hitf":
+            StartUpDemo = "hitf"
+        elif opt[0] == "--animate":
+            StartUpDemo = "animate"
+        elif opt[0] == "--speed":
+            StartUpDemo = "speed"
+        elif opt[0] == "--temp":
+            StartUpDemo = "temp"
+        elif opt[0] == "--props":
+            StartUpDemo = "props"
+        elif opt[0] == "--arrow":
+            StartUpDemo = "arrow"
+    try:
+        import fixdc
+    except ImportError:
+        print  ("\n *************Notice*************\n"
+                "The fixdc module fixes the DC API for wxPython2.5.1.6 You can get the module from:\n"
+                "http://prdownloads.sourceforge.net/wxpython/fixdc.py?download\n"
+                " It will set up the DC methods to match both older and upcoming versions\n")
+        raise
+

     class DemoApp(wx.App):
         """
         How the demo works:
     class DemoApp(wx.App):
         """
         How the demo works:

-        
+

         Under the Draw menu, there are three options:
         Under the Draw menu, there are three options:

-        
+

         *Draw Test: will put up a picture of a bunch of randomly generated
         objects, of each kind supported.
         *Draw Test: will put up a picture of a bunch of randomly generated
         objects, of each kind supported.

-        
+

         *Draw Map: will draw a map of the world. Be patient, it is a big map,
         with a lot of data, and will take a while to load and draw (about 10 sec 
         on my 450Mhz PIII). Redraws take about 2 sec. This demonstrates how the
         performance is not very good for large drawings.
         *Draw Map: will draw a map of the world. Be patient, it is a big map,
         with a lot of data, and will take a while to load and draw (about 10 sec 
         on my 450Mhz PIII). Redraws take about 2 sec. This demonstrates how the
         performance is not very good for large drawings.

-        
+

         *Clear: Clears the Canvas.
         *Clear: Clears the Canvas.

-        
+

         Once you have a picture drawn, you can zoom in and out and move about
         the picture. There is a tool bar with three tools that can be
         selected. 
         Once you have a picture drawn, you can zoom in and out and move about
         the picture. There is a tool bar with three tools that can be
         selected. 

-        
+

         The magnifying glass with the plus is the zoom in tool. Once selected,
         if you click the image, it will zoom in, centered on where you
         clicked. If you click and drag the mouse, you will get a rubber band
         box, and the image will zoom to fit that box when you release it.
         The magnifying glass with the plus is the zoom in tool. Once selected,
         if you click the image, it will zoom in, centered on where you
         clicked. If you click and drag the mouse, you will get a rubber band
         box, and the image will zoom to fit that box when you release it.

-        
+

         The magnifying glass with the minus is the zoom out tool. Once selected,
         if you click the image, it will zoom out, centered on where you
         clicked. (note that this takes a while when you are looking at the map,
         as it has a LOT of lines to be drawn. The image is double buffered, so
         you don't see the drawing in progress)
         The magnifying glass with the minus is the zoom out tool. Once selected,
         if you click the image, it will zoom out, centered on where you
         clicked. (note that this takes a while when you are looking at the map,
         as it has a LOT of lines to be drawn. The image is double buffered, so
         you don't see the drawing in progress)

-        
+

         The hand is the move tool. Once selected, if you click and drag on the
         image, it will move so that the part you clicked on ends up where you
         release the mouse. Nothing is changed while you are dragging. The
         drawing is too slow for that.
         The hand is the move tool. Once selected, if you click and drag on the
         image, it will move so that the part you clicked on ends up where you
         release the mouse. Nothing is changed while you are dragging. The
         drawing is too slow for that.

-        
+

         I'd like the cursor to change as you change tools, but the stock
         wxCursors didn't include anything I liked, so I stuck with the
         pointer. Please let me know if you have any nice cursor images for me to
         use.
         I'd like the cursor to change as you change tools, but the stock
         wxCursors didn't include anything I liked, so I stuck with the
         pointer. Please let me know if you have any nice cursor images for me to
         use.

-        
-        
+
+

         Any bugs, comments, feedback, questions, and especially code are welcome:
         Any bugs, comments, feedback, questions, and especially code are welcome:

-        
+

         -Chris Barker
         -Chris Barker

-        
+

         Chris.Barker@noaa.gov
         Chris.Barker@noaa.gov

-    
+

         """
 
         def __init__(self, *args, **kwargs):
             wx.App.__init__(self, *args, **kwargs)
         """
 
         def __init__(self, *args, **kwargs):
             wx.App.__init__(self, *args, **kwargs)

-        
+

         def OnInit(self):
             wx.InitAllImageHandlers()
         def OnInit(self):
             wx.InitAllImageHandlers()

+            DrawFrame = BuildDrawFrame()

             frame = DrawFrame(None, -1, "FloatCanvas Demo App",wx.DefaultPosition,(700,700))
             frame = DrawFrame(None, -1, "FloatCanvas Demo App",wx.DefaultPosition,(700,700))

-    
+

             self.SetTopWindow(frame)
             frame.Show()
 
             self.SetTopWindow(frame)
             frame.Show()
 


@@ -1245,84 +1400,75 @@ else:
             elif StartUpDemo == "temp":
                 "starting temp Test"
                 frame.TempTest()
             elif StartUpDemo == "temp":
                 "starting temp Test"
                 frame.TempTest()

-                
-            return True
-                
-    def Read_MapGen(filename,stats = 0,AllLines=0):
-        """
-        This function reads a MapGen Format file, and
-        returns a list of NumPy arrays with the line segments in them.
-        
-        Each NumPy array in the list is an NX2 array of Python Floats.
-        
-        The demo should have come with a file, "world.dat" that is the
-        shorelines of the whole world, in MapGen format.
-        
-        """
-        import string
-        file = open(filename,'rt')
-        data = file.readlines()
-        data = map(string.strip,data)
-        
-        Shorelines = []
-        segment = []
-        for line in data:
-            if line:
-                if line == "# -b": #New segment beginning
-                    if segment: Shorelines.append(Numeric.array(segment))
-                    segment = []
-                else:
-                    segment.append(map(float,string.split(line)))
-        if segment: Shorelines.append(Numeric.array(segment))
-        
-        if stats:
-            NumSegments = len(Shorelines)
-            NumPoints = 0
-            for segment in Shorelines:
-                NumPoints = NumPoints + len(segment)
-            AvgPoints = NumPoints / NumSegments
-            print "Number of Segments: ", NumSegments
-            print "Average Number of Points per segment: ",AvgPoints
-        if AllLines:
-            Lines = []
-            for segment in Shorelines:
-                Lines.append(segment[0])
-                for point in segment[1:-1]:
-                    Lines.append(point)
-                    Lines.append(point)
-                Lines.append(segment[-1])
-            return Lines
-        else:
-            return Shorelines
-    
-    ## for the wxPython demo:
-    try:
-        import floatcanvas
-    except ImportError: # if it's not there locally, try the wxPython lib.
-        from wx.lib import floatcanvas
-
-    overview = floatcanvas.__doc__
-      
-if __name__ == "__main__":
-    if not haveNumeric:
-        print errorText
-    else:
-        app = DemoApp(False)# put in True if you want output to go to it's own window.
-        app.MainLoop()
-    
-    
-    
-    
-
-
-
-
+            elif StartUpDemo == "props":
+                "starting PropertiesChange Test"
+                frame.PropertiesChangeTest()
+            elif StartUpDemo == "arrow":
+                "starting arrow Test"
+                frame.ArrowTest()

 
 

+            return True

 
 

+    app = DemoApp(False)# put in True if you want output to go to it's own window.
+    app.MainLoop()

 
 

+else:
+    # It's not running stand-alone, set up for wxPython demo.
+    if not haveNumeric:
+        ## TestPanel and runTest used for integration into wxPython Demo
+        class TestPanel(wx.Panel):
+            def __init__(self, parent, log):
+                self.log = log
+                wx.Panel.__init__(self, parent, -1)
+
+                import images
+
+                note1 = wx.StaticText(self, -1, errorText)
+                note2 = wx.StaticText(self, -1, "This is what the FloatCanvas can look like:")
+                S = wx.BoxSizer(wx.VERTICAL)
+                S.Add((10, 10), 1)
+                S.Add(note1, 0, wx.ALIGN_CENTER)
+                S.Add(note2, 0, wx.ALIGN_CENTER | wx.BOTTOM, 4)
+                S.Add(wx.StaticBitmap(self,-1,images.getFloatCanvasBitmap()),0,wx.ALIGN_CENTER)
+                S.Add((10, 10), 1)
+                self.SetSizer(S)
+                self.Layout()

 
 

+    else:
+        ## TestPanel and runTest used for integration into wxPython Demo
+        class TestPanel(wx.Panel):
+            def __init__(self, parent, log):
+                self.log = log
+                wx.Panel.__init__(self, parent, -1)
+                note1 = wx.StaticText(self, -1, "The FloatCanvas Demo needs")
+                note2 = wx.StaticText(self, -1, "a separate frame")
+                b = wx.Button(self, -1, "Open Demo Frame Now")
+                b.Bind(wx.EVT_BUTTON, self.OnButton)
+
+                S = wx.BoxSizer(wx.VERTICAL)
+                S.Add((10, 10), 1)
+                S.Add(note1, 0, wx.ALIGN_CENTER)
+                S.Add(note2, 0, wx.ALIGN_CENTER | wx.BOTTOM, 5)
+                S.Add(b, 0, wx.ALIGN_CENTER | wx.ALL, 5)
+                S.Add((10, 10), 1)
+                self.SetSizer(S)
+                self.Layout()
+
+            def OnButton(self, evt):
+                DrawFrame = BuildDrawFrame()
+                frame = DrawFrame(None, -1, "FloatCanvas Drawing Window",wx.DefaultPosition,(500,500))
+
+                #win = wx.lib.plot.TestFrame(self, -1, "PlotCanvas Demo")
+                frame.Show()
+                frame.DrawTest()

 
 

+    def runTest(frame, nb, log):
+        win = TestPanel(nb, log)
+        return win

 
 

+    # import to get the doc
+    from wx.lib import floatcanvas
+    overview = floatcanvas.__doc__