Merge branch 'master' of https://github.com/PythonCHB/wxPythonDemos

Author: ChrisBarker-NOAA

00-README.md

@@ -24,7 +24,7 @@ http://wiki.wxpython.org/index.cgi/wxPython_Style_Guide
 Despite these flaws, I think there is a lot to be learned from this
 collection.
 
-I suggest you search or grep for a widget you may want to learn somethign about, or just fire up each one and see what it does!
+I suggest you search or grep for a widget you may want to learn something about, or just fire up each one and see what it does!
 
 To Do
 ----------

CalculatorDemo.py

@@ -3,7 +3,7 @@
 """
 wxPython Calculator Demo in 50 lines of code
 
-This demo was pulled form teh wxPython Wiki:
+This demo was pulled from the wxPython Wiki:
 
 http://wiki.wxpython.org/CalculatorDemo
 by  Miki Tebeka
@@ -30,14 +30,15 @@
 import wx
 from math import * # So we can evaluate "sqrt(8)"
 
-class Calculator(wx.Frame):
+
+class Calculator(wx.Panel):
     '''Main calculator dialog'''
-    def __init__(self, parent=None):
-        wx.Frame.__init__(self, parent, title="Calculator")
+    def __init__(self, *args, **kwargs):
+        wx.Panel.__init__(self, *args, **kwargs)
         sizer = wx.BoxSizer(wx.VERTICAL) # Main vertical sizer
 
-        self.display = wx.ComboBox(self, -1) # Current calculation
-        sizer.Add(self.display, 0, wx.EXPAND) # Add to main sizer
+        self.display = wx.ComboBox(self) # Current calculation
+        sizer.Add(self.display, 0, wx.EXPAND|wx.BOTTOM, 8) # Add to main sizer
 
         # [7][8][9][/] 
         # [4][5][6][*]
@@ -61,9 +62,7 @@ def __init__(self, parent=None):
         self.equal = b
 
         # Set sizer and center
-        self.SetSizer(sizer)
-        sizer.Fit(self)
-        self.CenterOnScreen()
+        self.SetSizerAndFit(sizer)
 
     def OnButton(self, evt):
         '''Handle button click event'''
@@ -78,6 +77,7 @@ def OnButton(self, evt):
 
         else: # Just add button text to current calculation
             self.display.SetValue(self.display.GetValue() + label)
+            self.display.SetInsertionPointEnd()
             self.equal.SetFocus() # Set the [=] button in focus
 
     def Calculate(self):
@@ -110,12 +110,28 @@ def ComputeExpression(self, expression):
         
         This can be called from another class, module, etc.
         """
+        print "ComputeExpression called with:", expression
         self.display.SetValue(expression)
         self.Calculate()
 
+class MainFrame(wx.Frame):
+    def __init__(self, *args, **kwargs):
+        kwargs.setdefault('title', "Calculator")
+        wx.Frame.__init__(self, *args, **kwargs)
+
+        self.calcPanel = Calculator(self)
+
+        # put the panel on -- in a sizer to give it some space
+        S = wx.BoxSizer(wx.VERTICAL)
+        S.Add(self.calcPanel, 1, wx.GROW|wx.ALL, 10)
+        self.SetSizerAndFit(S)
+        self.CenterOnScreen()
+
+
 if __name__ == "__main__":
     # Run the application
     app = wx.App(False)
-    frame = Calculator(None)
+    frame = MainFrame(None)
     frame.Show()
-    app.MainLoop()
+    app.MainLoop()
+

CalculatorDemoDriver.py

@@ -1,13 +1,18 @@
 #!/usr/bin/env python
 
 """
-demo of how to drive a wxPython app from another script:
+NOTE: This worked when it was written, but not with recent (2.9)
+      versions of wxPython. I suspect that it would have to be re-factored
+      to put the GUI in the main thread, and star a secondary thread to
+      interact with the user.
+
+Demo of how to drive a wxPython app from another script:
 
 one thread to do the driving, one thread to run the Calculator:
 
 the primary thread runs the GUI - - it gets "locked up" with the mainloop.
 
-the secondary thread i used to do things in a way outside the GUI. In this
+the secondary thread is used to do things outside the GUI. In this
 case, a simple pause and sending commands now and then. The commands are put
 on the event loop with a wx.CallAfter() call.
 
@@ -33,7 +38,7 @@ def run(self):
         """
         #Create the application
         self.app = wx.App(False)
-        self.calculator = CalculatorDemo.Calculator()
+        self.calculator = CalculatorDemo.MainFrame(None)
         self.calculator.Show()
         self.app.MainLoop()
 
@@ -42,12 +47,17 @@ def run(self):
 gui_thread = GUI_Thread()
 gui_thread.start()
 
+# the computer object:
+computer = gui_thread.calculator.calcPanel.ComputeExpression
+
 # now we have control back -- start a loop for user input
-print "enter expressions to calcualte: enter to evaluate"
+print "enter expressions to calculate: enter to evaluate"
 print "hit ctrl+C to exit"
 while True:
     expr = raw_input()
     # send the input to the calculator to calculate
-    gui_thread.calculator.ComputeExpression(expr)
+    print "calling computer with:", expr
+    wx.CallAfter(computer, expr)
+
 
 

JustButton.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python
+
+import wx
+import wx.lib.buttons
+
+class ButtonPanel(wx.Panel):
+    def __init__(self, *args, **kwargs):
+        wx.Panel.__init__(self, *args, **kwargs)
+
+        btn = wx.Button(self, label = "Push Me", pos=(40,60), size=(120,-1))
+        btn = wx.Button(self, label = "Push Me Also", pos=(80,30), size=(200, 60))
+        btn = wx.Button(self, label = "No, push me!", pos=(90,110), size=(65, 80))
+        btn = wx.lib.buttons.GenButton(self, label = "better?", pos=(40,150), size=(60, 60))
+
+        btn.Bind(wx.EVT_BUTTON, self.OnButton )
+
+    def OnButton(self, evt):
+        print "Button Clicked"
+
+
+class DemoFrame(wx.Frame):
+    """ This frame displays a panel with a button] """
+    def __init__(self, title = "Micro App"):
+        wx.Frame.__init__(self, None , -1, title)
+
+        pnl = ButtonPanel(self)
+
+        self.Bind(wx.EVT_CLOSE, self.OnQuit)
+
+        
+    def OnQuit(self,Event):
+        self.Destroy()
+        
+
+app = wx.App(False)
+frame = DemoFrame()
+frame.Show()
+app.MainLoop()
+
+
+
+
+

MicroApp.py

@@ -39,7 +39,7 @@ def __init__(self, title = "Micro App"):
 
         self.SetMenuBar(MenuBar)
 
-        btn = wx.Button(self, label = "Quit")
+        btn = wx.Button(self, label = "Quit", pos=(40,60))
 
         btn.Bind(wx.EVT_BUTTON, self.OnQuit )
 

OffScreenHTML.py

@@ -2,6 +2,10 @@
 
 """
 test of rendering HTML to an off-screen bitmap
+
+This version uses a wx.GCDC, so you can have an alpha background.
+
+Works on OS-X, may need an explicite alpha bitmap on other platforms
 """
 
 import wx
@@ -17,7 +21,8 @@ def __init__(self, width, height):
         self.HR = wx.html.HtmlDCRenderer()
 
         # a bunch of defaults...
-        self.BackgroundColor = "White"
+        self.BackgroundColor = "white"
+        self.BackgroundColor = (255, 255, 255, 50)
         self.Padding = 10
 
 
@@ -27,6 +32,7 @@ def Render(self, source):
         """
         DC = wx.MemoryDC()
         DC.SelectObject(self.Buffer)
+        DC = wx.GCDC(DC)
         DC.SetBackground(wx.Brush(self.BackgroundColor))
         DC.Clear()
 
@@ -78,7 +84,8 @@ def Convert(self, text):
     that will show if it can take care of the basic rendering for us, and
     auto-wrap, and all sorts of nifty stuff like that
     </p>
-    
+    <p>
+    and here is some <b> Bold Text </b>
     <p> It does seem to work OK </p> 
     """
 

sudoku-chb.py

@@ -146,7 +146,7 @@ def test_PuzzleGrid():
 class Grid:
     def __init__(self, w, h):
         size = min(w,h)
-        self.d = d = (size - 20) / 9
+        self.d = d = max( 2, (size - 20) / 9 )# make  sure we don't get zero...
         self.x0 = (w - (self.d * 9)) / 2
         self.y0 = (h - (self.d * 9)) / 2
         self.font_size = int(11 * d/16.0)
@@ -212,7 +212,7 @@ def Draw(self, dc):
         # draw the background:
         dc.SetBackground(wx.Brush(self.GetBackgroundColour()))
         dc.Clear()
-        dc.SetBrush(wx.Brush(wx.Color(128,128,255)))
+        dc.SetBrush(wx.Brush(wx.Colour(128,128,255)))
         dc.SetPen(wx.TRANSPARENT_PEN)
         dc.DrawRectangle(x0, y0, d*9, d*9 )