diff options
author | rcoh <rcoh@mit.edu> | 2011-02-13 03:25:00 -0500 |
---|---|---|
committer | rcoh <rcoh@mit.edu> | 2011-02-13 03:25:00 -0500 |
commit | 7e3ff67854e469ddfa7e6af51c904f403b3c4c77 (patch) | |
tree | b6563d006b9660afe89eb2b28f5435088d8e7378 | |
parent | 055510465b754f764ec05a44728396274f8cbee2 (diff) |
Note that y coordinates in Layout must be subtracted from 24
-rw-r--r-- | config/C5Sign.xml | 3 | ||||
-rw-r--r-- | layouts/C5SignLayout.xml | 120 | ||||
-rw-r--r-- | layouts/SpecifiedLayout.py | 2 | ||||
-rw-r--r-- | operationscore/PixelAssembler.py | 1 |
4 files changed, 66 insertions, 60 deletions
diff --git a/config/C5Sign.xml b/config/C5Sign.xml index 6550067..65a45bc 100644 --- a/config/C5Sign.xml +++ b/config/C5Sign.xml @@ -175,11 +175,12 @@ <ChainedBehaviors> <Id>colorchange</Id> <Id>mover</Id> + <Id>square</Id> <Id>decay</Id> </ChainedBehaviors> <RecursiveHooks>{'mover':'movebounce'}</RecursiveHooks> <RenderToScreen>True</RenderToScreen> - <Mapper>gaussmap</Mapper> + <!--Mapper>gaussmap</Mapper--> </Args> </Behavior> <Behavior> diff --git a/layouts/C5SignLayout.xml b/layouts/C5SignLayout.xml index cd07f21..2424509 100644 --- a/layouts/C5SignLayout.xml +++ b/layouts/C5SignLayout.xml @@ -2,64 +2,68 @@ <PixelStrip> <Class>layouts.SpecifiedLayout</Class> <Args> - <Locations> - <!--# Left strip--> - <Loc>(2,22)</Loc> - <Loc>(2,16)</Loc> - <Loc>(2,10)</Loc> - <Loc>(2,4)</Loc> - <!--# Top strip--> - <Loc>(4, 2)</Loc> - <Loc>(10,2)</Loc> - <Loc>(16,2)</Loc> - <Loc>(22,2)</Loc> - <Loc>(27,2)</Loc> - <Loc>(33,2)</Loc> - <Loc>(39,2)</Loc> - <Loc>(44,2)</Loc> - <!--# Right strip--> - <Loc>(45,4)</Loc> - <Loc>(45,10)</Loc> - <Loc>(45,16)</Loc> - <Loc>(45,22)</Loc> - <!--# Bottom strip--> - <Loc>(44,22)</Loc> - <Loc>(39,22)</Loc> - <Loc>(34,22)</Loc> - <Loc>(27,22)</Loc> - <Loc>(22,22)</Loc> - <Loc>(16,22)</Loc> - <Loc>(10,22)</Loc> - <Loc>(4,22)</Loc> - <!--# Welcome to--> - <Loc>(12,19)</Loc> - <Loc>(13,19)</Loc> - <Loc>(16,19)</Loc> - <Loc>(18,19)</Loc> - <Loc>(21,19)</Loc> - <Loc>(23,19)</Loc> - <Loc>(26,19)</Loc> - <Loc>(27,19)</Loc> - <Loc>(30,19)</Loc> - <Loc>(34,19)</Loc> - <Loc>(37,19)</Loc> - <!--# C5 Logo--> - <Loc>(31,12)</Loc> - <Loc>(26,12)</Loc> - <Loc>(24,14)</Loc> - <Loc>(17,16)</Loc> - <Loc>(21,14)</Loc> - <!--# Conner 5--> - <Loc>(19,7)</Loc> - <Loc>(6,7)</Loc> - <Loc>(11,7)</Loc> - <Loc>(15,7)</Loc> - <Loc>(22,7)</Loc> - <Loc>(27,7)</Loc> - <Loc>(33,8)</Loc> - <Loc>(38,7)</Loc> - <Loc>(42,7)</Loc> - <Loc>(34,8)</Loc> + <Id>strip1</Id> + <numPixels>50</numPixels> + <Spacing>12</Spacing> + <pixelToPixelSpacing>12</pixelToPixelSpacing> + <originLocation>(2,22)</originLocation> + <Locations> + <!--# Left strip--> + <Loc>(2,16)</Loc> + <Loc>(2,10)</Loc> + <Loc>(2,4)</Loc> + <!--# Top strip--> + <Loc>(4, 2)</Loc> + <Loc>(10,2)</Loc> + <Loc>(16,2)</Loc> + <Loc>(22,2)</Loc> + <Loc>(27,2)</Loc> + <Loc>(33,2)</Loc> + <Loc>(39,2)</Loc> + <Loc>(44,2)</Loc> + <!--# Right strip--> + <Loc>(45,4)</Loc> + <Loc>(45,10)</Loc> + <Loc>(45,16)</Loc> + <Loc>(45,22)</Loc> + <!--# Bottom strip--> + <Loc>(44,22)</Loc> + <Loc>(39,22)</Loc> + <Loc>(34,22)</Loc> + <Loc>(27,22)</Loc> + <Loc>(22,22)</Loc> + <Loc>(16,22)</Loc> + <Loc>(10,22)</Loc> + <Loc>(4,22)</Loc> + <!--# Welcome to--> + <Loc>(12,19)</Loc> + <Loc>(13,19)</Loc> + <Loc>(16,19)</Loc> + <Loc>(18,19)</Loc> + <Loc>(21,19)</Loc> + <Loc>(23,19)</Loc> + <Loc>(26,19)</Loc> + <Loc>(27,19)</Loc> + <Loc>(30,19)</Loc> + <Loc>(34,19)</Loc> + <Loc>(37,19)</Loc> + <!--# C5 Logo--> + <Loc>(31,12)</Loc> + <Loc>(26,12)</Loc> + <Loc>(24,14)</Loc> + <Loc>(17,16)</Loc> + <Loc>(21,14)</Loc> + <!--# Conner 5--> + <Loc>(19,7)</Loc> + <Loc>(11,7)</Loc> + <Loc>(6,7)</Loc> + <Loc>(15,7)</Loc> + <Loc>(22,7)</Loc> + <Loc>(27,7)</Loc> + <Loc>(33,8)</Loc> + <Loc>(38,7)</Loc> + <Loc>(42,7)</Loc> + <Loc>(34,8)</Loc> </Locations> </Args> </PixelStrip> diff --git a/layouts/SpecifiedLayout.py b/layouts/SpecifiedLayout.py index 967a3d6..b746e68 100644 --- a/layouts/SpecifiedLayout.py +++ b/layouts/SpecifiedLayout.py @@ -12,7 +12,7 @@ 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): diff --git a/operationscore/PixelAssembler.py b/operationscore/PixelAssembler.py index 84f3b0b..582b59d 100644 --- a/operationscore/PixelAssembler.py +++ b/operationscore/PixelAssembler.py @@ -19,6 +19,7 @@ class PixelAssembler(SmootCoreObject): defined or improperly defined.') if Geo.dist(newLocation, locations[-1]) > \ self['pixelToPixelSpacing']: + import pdb; pdb.set_trace() raise Exception('Illegal pixel location. Distance \ between adjacent pixels must be less than \ pixelToPixelSpacing.') |