diff --git a/components/EventColors.py b/components/EventColors.py index 4381b8a..c343661 100755 --- a/components/EventColors.py +++ b/components/EventColors.py @@ -32,10 +32,11 @@ def __init__(self, role): 'icon': 'palette', 'inports': [ { 'id': 'current', 'type': 'array'}, - { 'id': 'colors', 'type': 'object' }, + { 'id': 'palette', 'type': 'object' }, ], 'outports': [ - { 'id': 'palette', 'type': 'object' }, + { 'id': 'mainhall', 'type': 'object' }, + { 'id': 'membersarea', 'type': 'object' }, ], } self.palette = None @@ -46,12 +47,13 @@ def process(self, inport, msg): if inport == 'current': self.current_events = msg.data if self.palette: - self.send('palette', handleEvents(msg.data, self.palette)) + self.send('mainhall', handleEvents(msg.data, self.palette)) self.ack(msg) return - if inport == 'colors': + if inport == 'palette': self.palette = msg.data - self.send('palette', handleEvents(self.current_events, msg.data)) + self.send('mainhall', handleEvents(self.current_events, msg.data)) + self.send('membersarea', handleEvents(self.current_events, msg.data)) self.ack(msg) if __name__ == '__main__': diff --git a/graphs/main.json b/graphs/main.json index 18348b0..bacec69 100644 --- a/graphs/main.json +++ b/graphs/main.json @@ -783,7 +783,7 @@ { "src": { "process": "eventcolors", - "port": "palette" + "port": "mainhall" }, "tgt": { "process": "bigswitch", @@ -792,8 +792,8 @@ }, { "src": { - "process": "farbgeber", - "port": "palette" + "process": "eventcolors", + "port": "membersarea" }, "tgt": { "process": "pioneer", @@ -817,13 +817,13 @@ }, "tgt": { "process": "eventcolors", - "port": "colors" + "port": "palette" } }, { "src": { "process": "eventcolors", - "port": "palette" + "port": "mainhall" }, "tgt": { "process": "farbdmx", @@ -832,8 +832,8 @@ }, { "src": { - "process": "farbgeber", - "port": "palette" + "process": "eventcolors", + "port": "membersarea" }, "tgt": { "process": "farbhue", diff --git a/spec/EventColors.yaml b/spec/EventColors.yaml index 761eef1..22df126 100644 --- a/spec/EventColors.yaml +++ b/spec/EventColors.yaml @@ -4,8 +4,8 @@ fixture: type: 'fbp' data: | INPORT=Events.CURRENT:CURRENT - INPORT=Events.COLORS:COLORS - OUTPORT=Events.PALETTE:PALETTE + INPORT=Events.PALETTE:PALETTE + OUTPORT=Events.MAINHALL:MAINHALL Events(c-flo/EventColors) cases: - @@ -13,10 +13,10 @@ cases: assertion: 'should return farbgeber palette' inputs: current: [] - colors: + palette: b: [0, 0, 0] expect: - palette: + mainhall: - equals: b: [0, 0, 0] @@ -27,10 +27,10 @@ cases: current: - summary: cryptoparty - colors: + palette: b: [0, 0, 0] expect: - palette: + mainhall: - equals: b: [255, 0, 152]