just a little clean up

Author: ChrisBarker-NOAA

week-03/code/decorators/keyword_demo.ipynb

@@ -1,6 +1,6 @@
 {
  "metadata": {
-  "name": "super_test"
+  "name": ""
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -41,7 +41,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 1
+     "prompt_number": 2
     },
     {
      "cell_type": "code",
@@ -63,7 +63,7 @@
        ]
       }
      ],
-     "prompt_number": 2
+     "prompt_number": 3
     },
     {
      "cell_type": "code",

week-06/code/numpy/super_test.ipynb renamed to week-06/code/super/super_test.ipynb

@@ -1,6 +1,6 @@
 {
  "metadata": {
-  "name": "super_test2"
+  "name": ""
  },
  "nbformat": 3,
  "nbformat_minor": 0,
@@ -37,7 +37,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 2
+     "prompt_number": 1
     },
     {
      "cell_type": "code",
@@ -61,7 +61,7 @@
        ]
       }
      ],
-     "prompt_number": 3
+     "prompt_number": 2
     },
     {
      "cell_type": "markdown",
@@ -90,7 +90,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 5
+     "prompt_number": 3
     },
     {
      "cell_type": "code",
@@ -111,7 +111,7 @@
        ]
       }
      ],
-     "prompt_number": 6
+     "prompt_number": 4
     },
     {
      "cell_type": "markdown",
@@ -145,7 +145,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 13
+     "prompt_number": 5
     },
     {
      "cell_type": "code",
@@ -167,7 +167,7 @@
        ]
       }
      ],
-     "prompt_number": 14
+     "prompt_number": 6
     },
     {
      "cell_type": "code",
@@ -204,7 +204,7 @@
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 15
+     "prompt_number": 7
     },
     {
      "cell_type": "code",
@@ -225,25 +225,26 @@
         "in C.this\n",
         "in A.this\n",
         "<super: <class 'A'>, <C object>>\n",
-        "<bound method C.this of <__main__.C object at 0x1c55ab0>>\n",
+        "<bound method C.this of <__main__.C object at 0x102335810>>\n",
         "in B.this\n",
         "<super: <class 'B'>, <C object>>\n",
-        "<bound method C.this of <__main__.C object at 0x1c55ab0>>\n",
+        "<bound method C.this of <__main__.C object at 0x102335810>>\n",
         "in B.this\n",
         "<super: <class 'B'>, <C object>>\n",
-        "<bound method C.this of <__main__.C object at 0x1c55ab0>>\n"
+        "<bound method C.this of <__main__.C object at 0x102335810>>\n"
        ]
       }
      ],
-     "prompt_number": 16
+     "prompt_number": 8
     },
     {
      "cell_type": "code",
      "collapsed": false,
      "input": [],
      "language": "python",
      "metadata": {},
-     "outputs": []
+     "outputs": [],
+     "prompt_number": 8
     }
    ],
    "metadata": {}

week-06/code/numpy/super_test2.ipynb renamed to week-06/code/super/super_test2.ipynb

@@ -77,9 +77,12 @@ def __init__(self, app_logic, *args, **kwargs):
         ## add just a single button:
         self.theButton = wx.Button(self, label="Push Me")
         self.theButton.Bind(wx.EVT_BUTTON, self.onButton)
-                                   
+        self.theButton.Bind(wx.EVT_LEFT_DOWN, self.onButton)
+
+    
     def onButton(self, evt=None):
         print "You pushed the button!"
+        evt.Skip()
 
     def onClose(self, evt=None):
         print "close menu selected"

week-09/code/basic_app_4.py

@@ -47,6 +47,7 @@ class ButtonPanel(wx.Panel):
     def __init__(self, *args, **kwargs):
         wx.Panel.__init__(self, *args, **kwargs)
 
+        #self.SetBackgroundColour(wx.Colour('red'))
         ## add just a single button:
         self.theButton = wx.Button(self, label="Push Me")
         self.theButton.Bind(wx.EVT_BUTTON, self.onButton)

week-09/code/basic_app_5.py

@@ -57,11 +57,11 @@ def __init__(self, *args, **kwargs):
 
         ## do the layout
         ## (try uncommenting the other, and see what happens...)
-        S = wx.BoxSizer(wx.VERTICAL)
-        #S = wx.BoxSizer(wx.HORIZONTAL)
+        #S = wx.BoxSizer(wx.VERTICAL)
+        S = wx.BoxSizer(wx.HORIZONTAL)
 
-        S.Add(theButton1, 0, wx.GROW | wx.ALL, 4)
-        S.Add(theButton2, 0, wx.GROW | wx.ALL, 4)
+        S.Add(theButton1, 1, wx.GROW | wx.ALL, 4)
+        S.Add(theButton2, 2, wx.GROW | wx.ALL, 4)
 
         self.SetSizerAndFit(S)
 

week-09/code/basic_app_6.py

@@ -63,7 +63,7 @@ def __init__(self, *args, **kwargs):
         ## need another sizer to get the horizonal placement right:
         mainSizer = wx.BoxSizer(wx.HORIZONTAL)
         mainSizer.Add((1,1), 1)    # stretchable space
-        mainSizer.Add(buttonSizer, 0, wx.ALIGN_CENTER) # the sizer with the buttons in it
+        mainSizer.Add(buttonSizer, 0, wx.ALIGN_LEFT) # the sizer with the buttons in it
         mainSizer.Add((1,1), 1)    # stretchable space
 
         self.SetSizer(mainSizer)