removed #!

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24152 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wxPython/lib/floatcanvas.py b/wxPython/wxPython/lib/floatcanvas.py
index 8276da20f0163832cd258e4ca9e1ca0096c9f1dd..8f88ebbb31570d2807aa0ec64b961a974944904c 100644 (file)
--- a/wxPython/wxPython/lib/floatcanvas.py
+++ b/wxPython/wxPython/lib/floatcanvas.py
@@ -1,8 +1,6 @@
-#!/usr/bin/env python2.2
+from Numeric import array,Float,cos,pi,sum,minimum,maximum,Int32

 
 

-from Numeric import array,Float,cos,pi,sum,minimum,maximum
-
-from time import clock
+from time import clock, sleep

 from wxPython.wx import *
 import types
 import os        
 from wxPython.wx import *
 import types
 import os        


@@ -12,6 +10,7 @@ ID_ZOOM_OUT_BUTTON = wxNewId()
 ID_ZOOM_TO_FIT_BUTTON = wxNewId()
 ID_MOVE_MODE_BUTTON = wxNewId()
 ID_TEST_BUTTON = wxNewId()
 ID_ZOOM_TO_FIT_BUTTON = wxNewId()
 ID_MOVE_MODE_BUTTON = wxNewId()
 ID_TEST_BUTTON = wxNewId()

+

 ID_ABOUT_MENU = wxNewId()          
 ID_EXIT_MENU  = wxNewId() 
 ID_ZOOM_TO_FIT_MENU = wxNewId()
 ID_ABOUT_MENU = wxNewId()          
 ID_EXIT_MENU  = wxNewId() 
 ID_ZOOM_TO_FIT_MENU = wxNewId()


@@ -206,12 +205,13 @@ class draw_object:
                 self.Brush = self.BrushList[(FillColor,FillStyle)]
                 
         def SetPen(self,LineColor,LineStyle,LineWidth):
                 self.Brush = self.BrushList[(FillColor,FillStyle)]
                 
         def SetPen(self,LineColor,LineStyle,LineWidth):

-            if LineColor is None or LineStyle is None:
+            if (LineColor is None) or (LineStyle is None):

                 self.Pen = wxTRANSPARENT_PEN
                 self.LineStyle = 'Transparent'
                 self.Pen = wxTRANSPARENT_PEN
                 self.LineStyle = 'Transparent'

-            if not self.PenList.has_key((LineColor,LineStyle,LineWidth)):
-                self.PenList[(LineColor,LineStyle,LineWidth)] = wxPen(LineColor,LineWidth,self.LineStyleList[LineStyle])
-            self.Pen = self.PenList[(LineColor,LineStyle,LineWidth)]
+            else:
+                if not self.PenList.has_key((LineColor,LineStyle,LineWidth)):
+                    self.PenList[(LineColor,LineStyle,LineWidth)] = wxPen(LineColor,LineWidth,self.LineStyleList[LineStyle])
+                self.Pen = self.PenList[(LineColor,LineStyle,LineWidth)]

 
         def SetPens(self,LineColors,LineStyles,LineWidths):
             """
 
         def SetPens(self,LineColors,LineStyles,LineWidths):
             """


@@ -360,6 +360,13 @@ class Line(draw_object):
 
         self.SetPen(LineColor,LineStyle,LineWidth)
 
 
         self.SetPen(LineColor,LineStyle,LineWidth)
 

+    def SetPoints(self,Points):
+        self.Points = Points
+        self.BoundingBox = array(((min(self.Points[:,0]),min(self.Points[:,1])),(max(self.Points[:,0]),max(self.Points[:,1]))),Float)
+        if self._Canvas:
+            # It looks like this shouldn't be private
+            self._Canvas.BoundingBoxDirty = 1
+            

     def _Draw(self,dc,WorldToPixel,ScaleFunction):
         Points = WorldToPixel(self.Points)
         dc.SetPen(self.Pen)
     def _Draw(self,dc,WorldToPixel,ScaleFunction):
         Points = WorldToPixel(self.Points)
         dc.SetPen(self.Pen)


@@ -786,17 +793,21 @@ class FloatCanvas(wxPanel):
         
         self.Scale = 1
 
         
         self.Scale = 1
 

-        # called just to make sure everything is initialized
-        self.OnSize(None)
-

         self.GUIMode = None
         self.StartRBBox = None
         self.GUIMode = None
         self.StartRBBox = None

+        self.PrevRBBox = None

         self.StartMove = None
         self.StartMove = None

+        self.PrevMoveBox = None
+        # called just to make sure everything is initialized
+        self.OnSize(None)

 
 

+        

     def BuildToolbar(self):
         tb = wxToolBar(self,-1)
         self.ToolBar = tb
         
     def BuildToolbar(self):
         tb = wxToolBar(self,-1)
         self.ToolBar = tb
         

+        tb.SetToolBitmapSize((23,23))
+        

         tb.AddTool(ID_ZOOM_IN_BUTTON, GetPlusBitmap(), isToggle=true,shortHelpString = "Zoom In")
         EVT_TOOL(self, ID_ZOOM_IN_BUTTON, self.SetMode)
         
         tb.AddTool(ID_ZOOM_IN_BUTTON, GetPlusBitmap(), isToggle=true,shortHelpString = "Zoom In")
         EVT_TOOL(self, ID_ZOOM_IN_BUTTON, self.SetMode)
         


@@ -864,6 +875,7 @@ class FloatCanvas(wxPanel):
                     dc.EndDrawing()
                     
                 elif event.LeftUp() and self.StartRBBox :
                     dc.EndDrawing()
                     
                 elif event.LeftUp() and self.StartRBBox :

+                    self.PrevRBBox = None

                     EndRBBox = (event.GetX(),event.GetY())
                     StartRBBox = self.StartRBBox
                     # if mouse has moved less that ten pixels, don't use the box.
                     EndRBBox = (event.GetX(),event.GetY())
                     StartRBBox = self.StartRBBox
                     # if mouse has moved less that ten pixels, don't use the box.


@@ -877,6 +889,7 @@ class FloatCanvas(wxPanel):
                         Center = self.PixelToWorld(StartRBBox)
                         self.Zoom(1.5,Center)
                     self.StartRBBox = None
                         Center = self.PixelToWorld(StartRBBox)
                         self.Zoom(1.5,Center)
                     self.StartRBBox = None

+                    

             if self.GUIMode == "ZoomOut":
                 if event.LeftDown():
                     Center = self.PixelToWorld((event.GetX(),event.GetY()))
             if self.GUIMode == "ZoomOut":
                 if event.LeftDown():
                     Center = self.PixelToWorld((event.GetX(),event.GetY()))


@@ -901,6 +914,7 @@ class FloatCanvas(wxPanel):
                     dc.EndDrawing()
                   
                 elif event.LeftUp() and self.StartMove:
                     dc.EndDrawing()
                   
                 elif event.LeftUp() and self.StartMove:

+                    self.PrevMoveBox = None

                     StartMove = self.StartMove
                     EndMove = array((event.GetX(),event.GetY()))
                     if sum((StartMove-EndMove)**2) > 16:
                     StartMove = self.StartMove
                     EndMove = array((event.GetX(),event.GetY()))
                     if sum((StartMove-EndMove)**2) > 16:


@@ -917,18 +931,19 @@ class FloatCanvas(wxPanel):
                 self.Zoom(1.5,Center)
             else:
                 event.Skip()
                 self.Zoom(1.5,Center)
             else:
                 event.Skip()

-
+        event.Skip()
+                

     def MakeNewBuffers(self):
         # Make new offscreen bitmap:
     def MakeNewBuffers(self):
         # Make new offscreen bitmap:

-        self._Buffer = wxEmptyBitmap(int(self.PanelSize[0]), int(self.PanelSize[1]))
+        self._Buffer = wxEmptyBitmap(self.PanelSize[0],self.PanelSize[1])

         if self.UseBackground:
         if self.UseBackground:

-            self._BackBuffer = wxEmptyBitmap((self.PanelSize[0]), (self.PanelSize[1]))
+            self._BackBuffer = wxEmptyBitmap(self.PanelSize[0],self.PanelSize[1])

             self._BackgroundDirty = 1
         else:
             pass
                 
     def OnSize(self,event):
             self._BackgroundDirty = 1
         else:
             pass
                 
     def OnSize(self,event):

-        self.PanelSize  = array(self.DrawPanel.GetClientSizeTuple(),Float)
+        self.PanelSize  = array(self.DrawPanel.GetClientSizeTuple(),Int32)

         try:
             self.AspectRatio = self.PanelSize[0]/self.PanelSize[1]
         except ZeroDivisionError:
         try:
             self.AspectRatio = self.PanelSize[0]/self.PanelSize[1]
         except ZeroDivisionError:


@@ -958,6 +973,8 @@ class FloatCanvas(wxPanel):
         """
         if self.Debug: start = clock()
         ScreenDC =  wxClientDC(self.DrawPanel)
         """
         if self.Debug: start = clock()
         ScreenDC =  wxClientDC(self.DrawPanel)

+        ViewPortWorld = ( self.PixelToWorld((0,0)), self.PixelToWorld(self.PanelSize) )
+        ViewPortBB = array( ( minimum.reduce(ViewPortWorld), maximum.reduce(ViewPortWorld) ) )

         if self.UseBackground:
             dc = wxMemoryDC()
             dc.SelectObject(self._BackBuffer)
         if self.UseBackground:
             dc = wxMemoryDC()
             dc.SelectObject(self._BackBuffer)


@@ -998,21 +1015,31 @@ class FloatCanvas(wxPanel):
                 dc.BeginDrawing()
                 dc.Clear()
                 i = 0
                 dc.BeginDrawing()
                 dc.Clear()
                 i = 0

-                ViewPortWorld = array((self.PixelToWorld((0,0)), self.PixelToWorld(self.DrawPanel.GetSizeTuple() ) ),Float )
-                ViewPortBB = array( (minimum.reduce(ViewPortWorld), maximum.reduce(ViewPortWorld)) )

                 for Object in self._DrawList:
                     if self.BBCheck(Object.BoundingBox,ViewPortBB):
                         #print "object is in Bounding Box"
                         i+=1
                         Object._Draw(dc,self.WorldToPixel,self.ScaleFunction)
                         if i % self.NumBetweenBlits == 0:
                 for Object in self._DrawList:
                     if self.BBCheck(Object.BoundingBox,ViewPortBB):
                         #print "object is in Bounding Box"
                         i+=1
                         Object._Draw(dc,self.WorldToPixel,self.ScaleFunction)
                         if i % self.NumBetweenBlits == 0:

-                            ScreenDC.Blit(0, 0, int(self.PanelSize[0]), int(self.PanelSize[1]), dc, 0, 0)
-                print "there were %i objects drawn"%i
+                            ScreenDC.Blit(0, 0, self.PanelSize[0],self.PanelSize[1], dc, 0, 0)

                 dc.EndDrawing()
             else:
                 dc.Clear()
         # now refresh the screen
                 dc.EndDrawing()
             else:
                 dc.Clear()
         # now refresh the screen

-        ScreenDC.DrawBitmap(self._Buffer,0,0)
+        #ScreenDC.DrawBitmap(self._Buffer,0,0) #NOTE: uisng DrawBitmap didn't work right on MSW
+        ScreenDC.Blit(0, 0, self.PanelSize[0],self.PanelSize[1], dc, 0, 0)
+
+        # If the canvas is in the middle of a zoom or move, the Rubber Band box needs to be re-drawn
+        if self.PrevRBBox:
+            ScreenDC.SetPen(wxPen('WHITE', 2,wxSHORT_DASH))
+            ScreenDC.SetBrush(wxTRANSPARENT_BRUSH)
+            ScreenDC.SetLogicalFunction(wxXOR)
+            ScreenDC.DrawRectangle(*self.PrevRBBox)
+        elif self.PrevMoveBox:
+            ScreenDC.SetPen(wxPen('WHITE', 1,))
+            ScreenDC.SetBrush(wxTRANSPARENT_BRUSH)
+            ScreenDC.SetLogicalFunction(wxXOR)
+            ScreenDC.DrawRectangle(*self.PrevMoveBox)

         if self.Debug: print "Drawing took %f seconds of CPU time"%(clock()-start)
 
     def BBCheck(self, BB1, BB2):
         if self.Debug: print "Drawing took %f seconds of CPU time"%(clock()-start)
 
     def BBCheck(self, BB1, BB2):


@@ -1027,7 +1054,7 @@ class FloatCanvas(wxPanel):
         else:
             return False
 
         else:
             return False
 

-    def        Move(self,shift,CoordType):
+    def Move(self,shift,CoordType):

         """
         move the image in the window.
 
         """
         move the image in the window.
 


@@ -1320,3 +1347,4 @@ class FloatCanvas(wxPanel):
 
 
 
 
 
 

+