cleanup: tksdl

Start.py

@@ -0,0 +1,245 @@
+#!/usr/bin/python3
+
+import time
+boot = time.time()
+
+import random
+import os
+import sys
+#sys.path.insert(0,os.path.realpath(os.getcwd() + '/..'))
+sys.path.insert(0,"/opt/LibreLight/Xdesk/")
+print(sys.path)
+print()
+
+
+
+# ===== GUI =========
+import pygame
+import pygame.gfxdraw
+import pygame.font
+pg = pygame
+main_size=(600,500)
+window = pygame.display.set_mode(main_size,pg.RESIZABLE,32)
+
+pg = pygame
+pygame.init()
+pygame.mixer.quit()
+clock = pygame.time.Clock()
+
+import tool.movewin as movewin
+import tool.sdl_elm as sdl_elm
+
+
+CAPTION = 'LibreLight Start '
+CAPTION += ':{}'.format(random.randint(100,999))
+#try:
+try:
+    _gcmd=r'git log -1 --format=%ci'
+    r = os.popen(_gcmd)
+    txt=r.read()
+    print(txt)
+    CAPTION += " " + txt.strip().split()[0]
+except Exception as e:
+    print(e)
+    CAPTION += " no-date" 
+
+try:
+    _gcmd='git rev-parse --short HEAD'
+    r=os.popen(_gcmd)
+    txt=r.read()
+    CAPTION += " v:"+txt.strip()
+except Exception as e:
+    print(e)
+    CAPTION += " no git" 
+
+
+_id = movewin.winfo(CAPTION)
+c1 = movewin.movewin(_id,200,50)
+os.system(c1)
+c1 = movewin.activate(_id)
+os.system(c1)
+
+pg.display.set_caption(CAPTION)
+
+font0  = pygame.font.SysFont("freesans",10)
+font0b = pygame.font.SysFont("freesansbold",10)
+font   = pygame.font.SysFont("freemonobold",22)
+font10 = pygame.font.SysFont("freemonobold",10)
+font12 = pygame.font.SysFont("freemonobold",12)
+font15 = pygame.font.SysFont("freemonobold",15)
+font22 = pygame.font.SysFont("FreeSans",22)
+#font  = pygame.font.SysFont(None,30)
+
+fr = font.render("hallo" ,1, (200,0,255))
+
+start = time.time()
+table = []
+
+r = 80
+i = 1
+
+bx = sdl_elm.Button(window,pos=[20,r,80,40])
+bx.text = "FIX:{}\n<val>\nx".format(i+1)
+bx.bg_on = [255,0,255]
+bx.btn1.color_on = [255,0,155]
+bx.btn1.type = "flash"
+table.append(bx)
+r+=bx.get_rect()[3]
+
+i += 1
+bx = sdl_elm.Button(window,pos=[20,r,80,40])
+bx.text = "FIX:{}\n<val>\nx".format(i+1)
+table.append(bx)
+r+=bx.get_rect()[3]
+
+i += 1
+r+=bx.get_rect()[3]
+bx = sdl_elm.Button(window,pos=[20,r,80,40])
+bx.text = "FIX:{}\n<val>\nx".format(i+1)
+bx.font0 = pygame.font.SysFont("freesans",20)
+bx.btn4.val.set( 100)
+bx.fader = 0
+table.append(bx)
+r+=bx.get_rect()[3]
+
+i += 1
+bx = sdl_elm.Button(window,pos=[30,r,190,60])
+bx.text = "FIX:{}\n<val>\nx".format(i+1)
+bx.font0 = pygame.font.SysFont("freesans-bold",20)
+bx.btn1.type = "flash"
+table.append(bx)
+r+=bx.get_rect()[3]
+
+i += 1
+bx = sdl_elm.Button(window,pos=[20,r,60,20])
+bx.text = "FIX:{}\n<val>\nx".format(i+1)
+bx.font0 = pygame.font.SysFont("freesans",12)
+table.append(bx)
+
+mouse_down = 0
+mouse_pos1 = [0,0]
+mouse_pos2 = [0,0]
+mouse_grab = []
+print(int((time.time()-boot)*10),"loop...")
+fps_t = time.time()
+fps = 0
+fps_old = 0
+while 1:
+    fps +=1
+    t = time.time()
+    if t-fps_t >= 1:
+        #print("FPS:",fps)
+        fps_old = fps
+        fps=0
+        fps_t =t
+
+    pygame.display.flip()
+    pos = [160,10,70,60]
+    rgb = (0xdd,0xdd,0xdd,0)
+    rgb = (0xaa,0xaa,0xaa,0)
+    
+    window.fill((5,5,5))
+    pygame.draw.rect(window,(0,0,0),[0,0,main_size[0],main_size[1]])
+
+    fr = font22.render("FPS:"+str(fps_old)  ,1, (200,200,200))
+    window.blit(fr,(10,10 ))
+
+    fr = font22.render("DEMO / TEST - MODE ! "  ,1, (200,200,200))
+    window.blit(fr,(10,30 ))
+
+    pos = [160,110,70+80,20]
+    pygame.draw.rect(window,rgb,pos)
+
+    t=(time.time()-start)
+    if t > 15:
+        start = time.time()
+    b= 80-int(t*10)
+    pos = [160,110,70+(b),20]
+    rgb = (0x00,0xff,0xff,0)
+    pygame.draw.rect(window,rgb,pos)
+    rgb = (0x00,0x00,0x00,0)
+    fr = font22.render(str(round(t,1)) ,1, rgb) #(200,200,200))
+    window.blit(fr,pos[:2])
+    
+    pos = [160,200,80,20]
+    #fd = sdl_elm.Fader(window,pos)
+    #fd.draw()
+    
+    pos = [160,90,70+80,20]
+    pygame.draw.rect(window,rgb,pos)
+    b= int(t*10)
+    pos = [160,90,0+(b),20]
+    rgb = (0x00,0xff,0xff,0)
+    pygame.draw.rect(window,rgb,pos)
+    rgb = (0x00,0x00,0x00,0)
+    fr = font22.render(str(round(t,1)) ,1, rgb) #(200,200,200))
+    window.blit(fr,pos[:2])
+
+
+    rgb = (0xaa,0xaa,0xaa,0)
+    fr = font22.render(str(round(t,1)) ,1, rgb) #(200,200,200))
+    window.blit(fr,(500,500))
+
+    for t in table:
+        t.draw()
+
+
+    resize_changed = 0
+    for event in pygame.event.get(): 
+         
+        if "scancode" in event.dict:
+            if event.scancode == 9:
+                for t in table:
+                    t.btn2.clean()
+
+        print("event",event)
+        if event.type == pygame.QUIT:
+            pygame.quit()
+            sys.exit(0)
+        elif event.type == pygame.VIDEORESIZE:
+            scrsize = event.size
+            width   = event.w
+            hight   = event.h
+            resize_changed = True
+
+        for t in table:
+            t.event(event)
+
+        if "pos" in event.dict:
+            if "button" in event.dict:
+                if event.type == 5:#press
+                    mouse_down = 1
+                    mouse_pos1 = [event.pos[0],event.pos[1]]
+                if event.type == 6:#release
+                    mouse_down = 0
+
+                for btn in mouse_grab:
+                    btn.btn2.val.set(1)
+                mouse_grab = []
+            mouse_pos2 = [event.pos[0],event.pos[1]]
+
+    
+    if mouse_down:
+        d1 = mouse_pos1[0]-mouse_pos2[0]
+        d2 = mouse_pos1[1]-mouse_pos2[1] 
+        pix = 23
+        #print(d1,d2)
+        if ( d1 > pix or d1 < -pix)  or  ( d2 >pix or d2 < -pix):
+
+            sdl_elm.draw_mouse_box(window,mouse_pos1,mouse_pos2)
+            for t in table:
+                pos = t.get_rect()
+
+                mpos = [mouse_pos1[0],mouse_pos1[1],mouse_pos2[0],mouse_pos2[1]]
+
+                if sdl_elm.check_area2(pos,mpos):
+                    t._set_mouse_focus(1)
+                    mouse_grab.append(t)
+                else:
+                    t._set_mouse_focus(0)
+
+    if resize_changed:# = True
+        screen = pygame.display.set_mode(scrsize,pg.RESIZABLE)
+
+    clock.tick(30)
+

lib/xcolor.py

@@ -0,0 +1,16 @@
+#!/usr/bin/python3
+
+WHITHE = [255,255,255]
+BLACK  = [0,0,0]
+RED    = [255,0,0]
+BLUE   = [119,119,255]
+GOLD   = [255,215,0]
+AMBER  = [255,191,0]
+YELLOW = [255,255,0]
+CYAN   = [0,255,255]
+MAGENTA= [255,0,255]
+GREEN  = [0,255,0]
+GRAY   = [127,127,127]
+LIGHTGREEN= [144,238,144]
+LIGHTBLUE = [173,216,230]
+LIGHTGRAY = [217,217,217]

tksdl/demo.py

@@ -6,7 +6,12 @@ boot = time.time()
 import random
 import os
 import sys
-import tool.movewin as movewin
+#sys.path.insert(0,os.path.realpath(os.getcwd() + '/..'))
+sys.path.insert(0,"/opt/LibreLight/Xdesk/")
+print(sys.path)
+print()
+
+
 
 # ===== GUI =========
 import pygame
@@ -21,10 +26,32 @@ pygame.init()
 pygame.mixer.quit()
 clock = pygame.time.Clock()
 
+import tool.movewin as movewin
 import tool.sdl_elm as sdl_elm
 
 
-CAPTION = 'LibreLight Start :{}'.format(random.randint(100,999))
+CAPTION = 'LibreLight Start '
+CAPTION += ':{}'.format(random.randint(100,999))
+#try:
+try:
+    _gcmd=r'git log -1 --format=%ci'
+    r = os.popen(_gcmd)
+    txt=r.read()
+    print(txt)
+    CAPTION += " " + txt.strip().split()[0]
+except Exception as e:
+    print(e)
+    CAPTION += " no-date" 
+
+try:
+    _gcmd='git rev-parse --short HEAD'
+    r=os.popen(_gcmd)
+    txt=r.read()
+    CAPTION += " v:"+txt.strip()
+except Exception as e:
+    print(e)
+    CAPTION += " no git" 
+
 
 _id = movewin.winfo(CAPTION)
 c1 = movewin.movewin(_id,200,50)
@@ -34,23 +61,14 @@ os.system(c1)
 
 pg.display.set_caption(CAPTION)
 
-
-f = pygame.font.get_fonts()
-f = list(f)
-f.sort()
-for i in f:
-    if 1:# "mono" in i.lower():
-        print(i)
-    
-
-font0 = pygame.font.SysFont("freesans",10)
+font0  = pygame.font.SysFont("freesans",10)
 font0b = pygame.font.SysFont("freesansbold",10)
-font = pygame.font.SysFont("freemonobold",22)
+font   = pygame.font.SysFont("freemonobold",22)
 font10 = pygame.font.SysFont("freemonobold",10)
 font12 = pygame.font.SysFont("freemonobold",12)
 font15 = pygame.font.SysFont("freemonobold",15)
 font22 = pygame.font.SysFont("FreeSans",22)
-#font = pygame.font.SysFont(None,30)
+#font  = pygame.font.SysFont(None,30)
 
 fr = font.render("hallo" ,1, (200,0,255))
 
@@ -60,7 +78,7 @@ table = []
 r = 80
 i = 1
 
-bx = sdl_elm.Button(window,pos=[20,r,60,20])
+bx = sdl_elm.Button(window,pos=[20,r,80,40])
 bx.text = "FIX:{}\n<val>\nx".format(i+1)
 bx.bg_on = [255,0,255]
 bx.btn1.color_on = [255,0,155]
@@ -79,7 +97,7 @@ r+=bx.get_rect()[3]
 bx = sdl_elm.Button(window,pos=[20,r,80,40])
 bx.text = "FIX:{}\n<val>\nx".format(i+1)
 bx.font0 = pygame.font.SysFont("freesans",20)
-bx.val.set( 100)
+bx.btn4.val.set( 100)
 bx.fader = 0
 table.append(bx)
 r+=bx.get_rect()[3]
@@ -87,7 +105,7 @@ r+=bx.get_rect()[3]
 i += 1
 bx = sdl_elm.Button(window,pos=[30,r,190,60])
 bx.text = "FIX:{}\n<val>\nx".format(i+1)
-bx.font0 = pygame.font.SysFont("freesans",20)
+bx.font0 = pygame.font.SysFont("freesans-bold",20)
 bx.btn1.type = "flash"
 table.append(bx)
 r+=bx.get_rect()[3]
@@ -110,7 +128,7 @@ while 1:
     fps +=1
     t = time.time()
     if t-fps_t >= 1:
-        print("FPS:",fps)
+        #print("FPS:",fps)
         fps_old = fps
         fps=0
         fps_t =t
@@ -196,7 +214,7 @@ while 1:
                     mouse_down = 0
 
                 for btn in mouse_grab:
-                    btn.btn2.val = 1
+                    btn.btn2.val.set(1)
                 mouse_grab = []
             mouse_pos2 = [event.pos[0],event.pos[1]]
 

tool/sdl_elm.py

@@ -2,6 +2,7 @@
 import pygame
 import pygame.gfxdraw
 import pygame.font
+from lib.xcolor import *
 
 font0 = pygame.font.SysFont("freesans",10)
 
@@ -15,26 +16,29 @@ font22 = pygame.font.SysFont("FreeSans",22)
 
 
 class VALUE():
-    def __init__(self,v,_min=0,_max=255):
+    def __init__(self,v=0,_min=0,_max=255):
         self._val = v
         self._max = _max
         self._min = _min
-    def set(self,val):
-        if val <= self._max and val >= self._min:
-            self._val = val
+
     def _check(self):
         if self._val > self._max:
             self._val = self._max
         if self._val < self._min:
             self._val = self._min
 
+    def get(self):
+        self._check()
+        return self._val
+
+    def set(self,val):
+        if val <= self._max and val >= self._min:
+            self._val = val
+
     def inc(self,v):
         self._val += v
         self._check()
 
-    def get(self):
-        self._check()
-        return self._val
 
 class ELEM_KILLGROUP():
     def __init__(self):
@@ -53,37 +57,51 @@ class ELEM_KILLGROUP():
         
 
 class ELEM_BUF():
-    def __init__(self,kill=None):
-        self.val = 0
+    def __init__(self,kill=None,name="ELEM_BUF"):
+        self.val = VALUE() #0
+        self.increment = 10 
+        self.name = name
+        self.nr_on  = [0]
+        self.nr_off = [0]
         self.color = [0,255,0]
         self.color_on = [255,255,0]
-        self.type="flash" #"toggle" #"flash"
+        self.type="flash" #"toggle" #"flash",fade
         self.killgroup = kill 
 
     def get(self):
-        return self.val
+        return self.val.get()
 
     def get_color(self):
-        if self.val:
+        if self.val.get():
             return self.color_on
         return self.color
 
     def clean(self):
-        self.val = 0
+        self.val.set(0)
 
     def press(self):
+        print([self.name,self.type,self.val.get()])
+        if self.type == "fader":
+            self.inc(self.increment)
+            return
         if self.type == "toggle":
-            if self.val:
-                self.val = 0
+            if self.val.get():
+                self.val.set(0)
             else:
-                self.val = 1
+                self.val.set(1)
 
         if self.type == "flash":
-            self.val = 1
+            self.val.set(1)
 
     def release(self):
+        if self.type == "fader":
+            self.inc(-self.increment)
+            return
         if self.type == "flash":
-            self.val = 0
+            self.val.set(0)
+
+    def inc(self,v):
+        self.val.inc(v)
 
 class Layout():
     def __init__(self,master):
@@ -163,30 +181,51 @@ def check_area2(R1,R2): #pos,mouse_box
         print("area2",x,y)
         return 1 
 
+
 class Button():
     def __init__(self,window,pos):
         self.window = window
         self.event_pos = [0,0]
-        self.font0 = pygame.font.SysFont("freesans",10)
+        self.font0 = pygame.font.SysFont("freesans-bold",16)
         self.w = 20
         self.h = 10
         self.pos = pos
         self.fader = 1
 
-        self.btn1 = ELEM_BUF() # btn (background)
-        self.btn1.color = [140,140,140]
-        self.btn1.color_on = [255,0,0]
-
-        self.btn2 = ELEM_BUF() # sel
-        self.btn2.color = [120,120,120]
-        self.btn2.type ="toggle"
-
-        self.btn3 = ELEM_BUF() # mouse focus
-        self.btn3.color = [100,100,100]
-        self.btn3.color_on = [200,200,200]
-
-        self.val = VALUE(0,0,256)
-        self.val_inc = 4.4 #10
+        self.btn1 = ELEM_BUF() 
+        self.btn1.name = "BUTTON BUF"
+        self.btn1.nr_on  = [1,3]
+        self.btn1.nr_off = [1,3]
+        self.btn1.color = LIGHTGRAY 
+        self.btn1.color_on = RED 
+
+        self.btn2 = ELEM_BUF() # sel elem
+        self.btn2.name = "SELECT BUF"
+        self.btn2.nr_on  = [2]
+        self.btn2.nr_off = [0]
+        self.btn2.color = GRAY 
+        self.btn2.color_on = YELLOW
+        self.btn2.type = "toggle"
+
+        self.btn3 = ELEM_BUF() 
+        self.btn3.name = "MOUSE FOCUS"
+        self.btn3.color = GRAY 
+        self.btn3.color_on = WHITHE
+
+        self.btn4 = ELEM_BUF() 
+        self.btn4.name = "MOUSE ECODER"
+        self.btn4.increment = 4.4
+        self.btn4.type = "fader"
+        self.btn4.nr_on  = [4]
+        self.btn4.nr_off = [5]
+        self.btn4.color = GRAY 
+        self.btn4.color_on = WHITHE
+
+        self.btns = []
+        self.btns.append(self.btn1)
+        self.btns.append(self.btn2)
+        self.btns.append(self.btn3)
+        self.btns.append(self.btn4)
 
         self.__layout = Layout(self)
         self.pack = self.__layout.pack
@@ -198,10 +237,13 @@ class Button():
         self.text2 = []
 
     def check(self):
-        if 0:#dbg:
+        if 10:#dbg:
             self.text2 = []
             #self.text2.append(self.val)
-            self.text2.append([self.btn1.get(),self.btn2.get(),self.btn3.get()])
+            b = []
+            for btn in self.btns:
+                b.append(btn.get())
+            self.text2.append(b)
             self.text2.append(self.btn1.type)
 
         self._check_event()
@@ -247,7 +289,7 @@ class Button():
     def _draw_fader(self):
         rgb = [0,200,0]
         pos2 = self.pos[:]
-        v = self.val.get()
+        v = self.btn4.val.get() #self.val.get()
         fh = get_font_hight(self.font0)
         if self.fader:
             pos2[1] += 2 #fh+2
@@ -263,7 +305,7 @@ class Button():
 
         a = pos[0]+4
         r = pos[1]+4
-        v = "{:4.02f}".format(self.val.get()) 
+        v = "{:4.02f}".format(self.btn4.val.get()) 
 
         lines = self.text.split("\n")
         lines.extend(self.text2)
@@ -290,7 +332,7 @@ class Button():
 
     def _check_event(self):
         pass
-    def _draw_bd(self,delta=0,color=[0,0,0]):
+    def _draw_bd(self,delta=0,color=BLACK):
         l_pos = draw_bd(pos=self.pos,delta=delta)
         for i in l_pos:
             pygame.draw.aaline(self.window,color,i[0],i[1],1)
@@ -315,23 +357,12 @@ class Button():
 
                 e = [event.button,mode]
                 print("e",e)
-
-                if e[0] in [1,3] and e[1] == "press":
-                    self.btn1.press()
-                if e[0] in [1,3] and e[1] == "release":
-                    self.btn1.release()
-
-                if e[0] in [2] and e[1] == "press":
-                        self.btn2.press()
-                if e[0] in [2] and e[1] == "release":
-                        self.btn2.release()
-
-                if e[0] in [4]: #mouse encoder 
-                    self.val.inc(self.val_inc)
-                if e[0] in [5]: #mouse encoder 
-                    self.val.inc(-self.val_inc)
-
-
+                
+                for btn in self.btns: 
+                    if e[0] in btn.nr_on  and e[1] == "press":
+                        btn.press()
+                    if e[0] in btn.nr_off and e[1] == "release":
+                        btn.release()
 
 
 def draw_mouse_box(window,pos1,pos2,color=[128,128,128],text=1):