changeset 1125:57eb333e6a4c

reload Effects.py when graph changes. quieter logging Ignore-this: 56027c468808a8cce7c5e6d431858320
author Drew Perttula <drewp@bigasterisk.com>
date Fri, 13 Jun 2014 07:51:05 +0000
parents 4eb7dc40797f
children 63ab21eb7bbf
files light9/effecteval/effect.py light9/effecteval/effectloop.py
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/light9/effecteval/effect.py	Fri Jun 13 07:47:22 2014 +0000
+++ b/light9/effecteval/effect.py	Fri Jun 13 07:51:05 2014 +0000
@@ -3,7 +3,8 @@
 from rdflib import URIRef
 from light9.namespaces import L9, RDF
 from light9.curvecalc.curve import CurveResource
-from light9 import Submaster, Effects
+from light9 import Submaster
+from light9 import Effects # gets reload() later
 log = logging.getLogger('effect')
 
 # consider http://waxeye.org/ for a parser that can be used in py and js
@@ -92,7 +93,8 @@
         self.codes = [CodeLine(self.graph, s) for s in codeStrs]
 
         self.sortCodes()
-        
+
+        reload(Effects)
         self.otherFuncs = Effects.configExprGlobals()
 
     def sortCodes(self):
--- a/light9/effecteval/effectloop.py	Fri Jun 13 07:47:22 2014 +0000
+++ b/light9/effecteval/effectloop.py	Fri Jun 13 07:51:05 2014 +0000
@@ -99,7 +99,6 @@
     def combineOutputs(self, outputs):
         """pick usable effect outputs and reduce them into one for sendOutput"""
         outputs = [x for x in outputs if isinstance(x, Submaster.Submaster)]
-        log.info('outputs %r', outputs)
         out = Submaster.sub_maxes(*outputs)
 
         return out