Mercurial > code > home > repos > light9
changeset 1313:ed27b45526b1
comments
Ignore-this: 5a047815072276be0ab01ff3cf4931a4
| author | Drew Perttula <drewp@bigasterisk.com> |
|---|---|
| date | Wed, 01 Jun 2016 10:55:41 +0000 |
| parents | cec677a84142 |
| children | c91d1044fe49 |
| files | light9/collector/device.py light9/rdfdb/graphfile.py |
| diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/light9/collector/device.py Wed Jun 01 10:55:15 2016 +0000 +++ b/light9/collector/device.py Wed Jun 01 10:55:41 2016 +0000 @@ -42,7 +42,7 @@ if deviceAttr == L9['color']: rgbs = [hex_to_rgb(v) for v in values] return rgb_to_hex([max(*component) for component in zip(*rgbs)]) - + # angles should perhaps use average; gobo choice use the most-open one return max(values) def toOutputAttrs(deviceType, deviceAttrSettings):
--- a/light9/rdfdb/graphfile.py Wed Jun 01 10:55:15 2016 +0000 +++ b/light9/rdfdb/graphfile.py Wed Jun 01 10:55:41 2016 +0000 @@ -130,6 +130,8 @@ print e traceback.print_exc() log.error("%s syntax error", self.path) + # todo: likely bug- if a file has this error upon first + # read, I think we don't retry it right. return except IOError as e: log.error("%s rereading %s: %r", self.path, self.uri, e)