diff options
| author |  rcoh <rcoh@mit.edu> | 2011-02-16 18:29:41 -0500 |
|---|---|---|
| committer | rcoh <rcoh@mit.edu> | 2011-02-16 18:29:41 -0500 |
| commit | fffc14c4672294d9bbf8c60edfe8c309f0d54698 (patch) | |
| tree | 19057b2e98735cc30fa1e0b3932d416946f8d705 /layouts/SpecifiedLayout.py | |
| parent | 24aa31808de6a4dc06a651076e5b292aebd9240d (diff) | |
| parent | 2df9e408a0ff74539862c4a4e562a878cc11a329 (diff) | |
Merge branch 'conner5' of https://github.com/dxiao/SmootLight into dxiao-conner5
Conflicts:
config/C5Sign.xml
layouts/SpecifiedLayout.py
Diffstat (limited to 'layouts/SpecifiedLayout.py')
| -rw-r--r-- | layouts/SpecifiedLayout.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/layouts/SpecifiedLayout.py b/layouts/SpecifiedLayout.py index 5a6e963..b746e68 100644 --- a/layouts/SpecifiedLayout.py +++ b/layouts/SpecifiedLayout.py @@ -12,10 +12,9 @@ class SpecifiedLayout(PixelAssembler): You may put attributes on the Locs so that you don't get confused. """ - def layoutInit(self): + def initLayout(self): self.lightNum = -1 def layoutFunc(self, lastLocation): self.lightNum += 1 return self['Locations'][self.lightNum] - |