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)
+