Просмотр исходного кода

cleanup: FIXTURES.clear/get_dmx .to. fixlib.clear

micha 8 месяцев назад
Родитель
Сommit
344c8a8984
3 измененных файлов с 0 добавлено и 8 удалено
  1. 0 1
      _LibreLightDesk.py
  2. 0 5
      lib/fixlib.py
  3. 0 2
      lib/fxlib.py

+ 0 - 1
_LibreLightDesk.py

@@ -501,7 +501,6 @@ def jclient_send(data):
                     if "ATTR" in jdata:    
                         attr = jdata["ATTR"]
 
-                    #dmx_fine = FIXTURES.get_dmx(fix,attr+"-FINE")
                     dmx_fine = fixlib.get_dmx(FIXTURES.fixtures,fix,attr+"-FINE")
                     if jdata["DMX"] != dmx_fine and dmx > 0 and dmx_fine > 0:
                         jdata["DMX-FINE"] = dmx_fine

+ 0 - 5
lib/fixlib.py

@@ -576,11 +576,9 @@ def encoder(fixtures,fix,attr,xval="",xfade=0,xdelay=0,blind=0):
     jdata["FADE"]     = 0
     jdata["DELAY"]    = 0
     jdata["ATTR"]     = attr
-    #dmx               = get_dmx(fix,attr)
     dmx               = get_dmx(fixtures,fix,attr)
     jdata["DMX"]      = dmx
 
-    #dmx_fine = get_dmx(fix,attr+"-FINE")
     dmx_fine = get_dmx(fixtures,fix,attr+"-FINE")
     if dmx_fine != jdata["DMX"] and dmx > 0:
         jdata["DMX-FINE"] = dmx_fine
@@ -719,9 +717,6 @@ class Fixtures():
             if attr not in ATTR:
                 continue
 
-            #print(sdata)
-            #print("FIX",fix,attr)
-            #sDMX = self.get_dmx(fix,attr)
             sDMX = get_dmx(self.fixtures,fix,attr)
             #print(sDMX)
             xcmd["DMX"] = str(sDMX)

+ 0 - 2
lib/fxlib.py

@@ -76,11 +76,9 @@ def process_effect(wing_buffer,fx_prm,fx_prm_move,modes,jclient_send,master,FIXT
                 jdata["WING"] = wi
                 jdata["VALUE"]    = None
                 jdata["FIX"]      = fix
-                #dmx               = FIXTURES.get_dmx(fix,attr)
                 dmx               = fixlib.get_dmx(FIXTURES.fixtures,fix,attr)
                 jdata["DMX"]      = dmx
 
-                #dmx_fine = FIXTURES.get_dmx(fix,attr+"-FINE")
                 dmx_fine = fixlib.get_dmx(FIXTURES.fixtures,fix,attr+"-FINE")
                 if dmx_fine != jdata["DMX"] and dmx > 0:
                     jdata["DMX-FINE"] = dmx_fine