From 055510465b754f764ec05a44728396274f8cbee2 Mon Sep 17 00:00:00 2001 From: dxiao Date: Sun, 13 Feb 2011 03:10:40 -0500 Subject: new c5 layout. --- layouts/C5SignLayout.xml | 70 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 10 deletions(-) (limited to 'layouts/C5SignLayout.xml') diff --git a/layouts/C5SignLayout.xml b/layouts/C5SignLayout.xml index 58310d7..cd07f21 100644 --- a/layouts/C5SignLayout.xml +++ b/layouts/C5SignLayout.xml @@ -1,16 +1,66 @@ - layouts.ZigzagLayout + layouts.SpecifiedLayout - strip1 - 10 - X - 1 - 20 - 20 - 50 - (0,0) + + + (2,22) + (2,16) + (2,10) + (2,4) + + (4, 2) + (10,2) + (16,2) + (22,2) + (27,2) + (33,2) + (39,2) + (44,2) + + (45,4) + (45,10) + (45,16) + (45,22) + + (44,22) + (39,22) + (34,22) + (27,22) + (22,22) + (16,22) + (10,22) + (4,22) + + (12,19) + (13,19) + (16,19) + (18,19) + (21,19) + (23,19) + (26,19) + (27,19) + (30,19) + (34,19) + (37,19) + + (31,12) + (26,12) + (24,14) + (17,16) + (21,14) + + (19,7) + (6,7) + (11,7) + (15,7) + (22,7) + (27,7) + (33,8) + (38,7) + (42,7) + (34,8) + -- cgit v1.2.3 From 7e3ff67854e469ddfa7e6af51c904f403b3c4c77 Mon Sep 17 00:00:00 2001 From: rcoh Date: Sun, 13 Feb 2011 03:25:00 -0500 Subject: Note that y coordinates in Layout must be subtracted from 24 --- config/C5Sign.xml | 3 +- layouts/C5SignLayout.xml | 120 ++++++++++++++++++++------------------- layouts/SpecifiedLayout.py | 2 +- operationscore/PixelAssembler.py | 1 + 4 files changed, 66 insertions(+), 60 deletions(-) (limited to 'layouts/C5SignLayout.xml') 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 @@ colorchange mover + square decay {'mover':'movebounce'} True - gaussmap + 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 @@ layouts.SpecifiedLayout - - - (2,22) - (2,16) - (2,10) - (2,4) - - (4, 2) - (10,2) - (16,2) - (22,2) - (27,2) - (33,2) - (39,2) - (44,2) - - (45,4) - (45,10) - (45,16) - (45,22) - - (44,22) - (39,22) - (34,22) - (27,22) - (22,22) - (16,22) - (10,22) - (4,22) - - (12,19) - (13,19) - (16,19) - (18,19) - (21,19) - (23,19) - (26,19) - (27,19) - (30,19) - (34,19) - (37,19) - - (31,12) - (26,12) - (24,14) - (17,16) - (21,14) - - (19,7) - (6,7) - (11,7) - (15,7) - (22,7) - (27,7) - (33,8) - (38,7) - (42,7) - (34,8) + strip1 + 50 + 12 + 12 + (2,22) + + + (2,16) + (2,10) + (2,4) + + (4, 2) + (10,2) + (16,2) + (22,2) + (27,2) + (33,2) + (39,2) + (44,2) + + (45,4) + (45,10) + (45,16) + (45,22) + + (44,22) + (39,22) + (34,22) + (27,22) + (22,22) + (16,22) + (10,22) + (4,22) + + (12,19) + (13,19) + (16,19) + (18,19) + (21,19) + (23,19) + (26,19) + (27,19) + (30,19) + (34,19) + (37,19) + + (31,12) + (26,12) + (24,14) + (17,16) + (21,14) + + (19,7) + (11,7) + (6,7) + (15,7) + (22,7) + (27,7) + (33,8) + (38,7) + (42,7) + (34,8) 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.') -- cgit v1.2.3 From db19c9731c7bed3716a387a0db5b56dd3ba72104 Mon Sep 17 00:00:00 2001 From: dxiao Date: Sun, 13 Feb 2011 03:34:10 -0500 Subject: changed C5Sign layout to reflect accurate origin --- layouts/C5SignLayout.xml | 96 ++++++++++++++++++++++++------------------------ 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'layouts/C5SignLayout.xml') diff --git a/layouts/C5SignLayout.xml b/layouts/C5SignLayout.xml index 2424509..353ae73 100644 --- a/layouts/C5SignLayout.xml +++ b/layouts/C5SignLayout.xml @@ -6,64 +6,64 @@ 50 12 12 - (2,22) + (2,2) - (2,16) - (2,10) - (2,4) + (2,8) + (2,14) + (2,20) - (4, 2) - (10,2) - (16,2) - (22,2) - (27,2) - (33,2) - (39,2) - (44,2) + (4, 22) + (10,22) + (16,22) + (22,22) + (27,22) + (33,22) + (39,22) + (44,22) - (45,4) - (45,10) - (45,16) - (45,22) + (45,20) + (45,14) + (45,8) + (45,2) - (44,22) - (39,22) - (34,22) - (27,22) - (22,22) - (16,22) - (10,22) - (4,22) + (44,2) + (39,2) + (34,2) + (27,2) + (22,2) + (16,2) + (10,2) + (4,2) - (12,19) - (13,19) - (16,19) - (18,19) - (21,19) - (23,19) - (26,19) - (27,19) - (30,19) - (34,19) - (37,19) + (12,5) + (13,5) + (16,5) + (18,5) + (21,5) + (23,5) + (26,5) + (27,5) + (30,5) + (34,5) + (37,5) (31,12) (26,12) - (24,14) - (17,16) - (21,14) + (24,10) + (17,8) + (21,10) - (19,7) - (11,7) - (6,7) - (15,7) - (22,7) - (27,7) - (33,8) - (38,7) - (42,7) - (34,8) + (19,17) + (11,17) + (6,17) + (15,17) + (22,17) + (27,17) + (33,16) + (38,17) + (42,17) + (34,16) -- cgit v1.2.3