light9 Changeset - c0b09a24f6ca

Changeset - c0b09a24f6ca

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

drewp@bigasterisk.com - 12 years ago 2013-06-15 21:25:45
drewp@bigasterisk.com

subterm expression new function chan('channame'), replaces broken getsub one
Ignore-this: d15f574725c0c6b96c511c22aa3efda0

2 files changed with 7 insertions and 2 deletions:

light9/Submaster.py

light9/curvecalc/subterm.py

0 comments (0 inline, 0 general)

light9/Submaster.py

➞

Show inline comments

@@ @@ -327,6 +327,9 @@ class Submasters(object): @@
     def get_sub_by_uri(self, uri):
         return self.submasters[uri]
     def get_sub_by_name(self, name):
         return get_sub_by_name(name, self)
 # a global instance of Submasters, created on demand
 _submasters = None
@@ @@ -344,8 +347,9 @@ def get_sub_by_name(name, submasters=Non @@
     if not submasters:
         submasters = get_global_submasters()
     if name in submasters.get_all_sub_names():
         return submasters.get_sub_by_name(name)
     # get_all_sub_names went missing. needs rework
     #if name in submasters.get_all_sub_names():
     #    return submasters.get_sub_by_name(name)
     try:
         val = int(name)

light9/curvecalc/subterm.py

➞

Show inline comments

@@ @@ -140,6 +140,7 @@ class Subterm(object): @@
         glo = exprglo.exprGlobals(glo, t)
         glo['getsub'] = lambda name: self.submasters.get_sub_by_name(name)
         glo['chan'] = lambda name: Submaster.Submaster("chan", {get_dmx_channel(name): 1})
         try:
             self.lasteval = eval(expr, glo)

0 comments (0 inline, 0 general)