cleanup ray-fix

tkray/fix.py

@@ -70,6 +70,7 @@ a = "/usr/share/fonts/truetype/freefont/FreeSans.ttf"
 font_l_10 = pyray.load_font_ex(a, 10, None, 0);
 
 a = "/usr/share/fonts/truetype/freefont/FreeSansBold.ttf"
+font10 = pyray.load_font_ex(a, 10, None, 0);
 font12 = pyray.load_font_ex(a, 12, None, 0);
 font14 = pyray.load_font_ex(a, 14, None, 0);
 font16 = pyray.load_font_ex(a, 16, None, 0);
@@ -110,6 +111,8 @@ class BUTTON():
         self.btn.btn3.color    = [55,155,155,255]
         self.btn.btn3.color_on = [55,255,255,255]
         self.btn.btn2.color_on = [55,255,255,255]
+        
+        self.font = font14
 
         self.btn.btn1.name=txt
         #x=btn.btn1.name
@@ -129,8 +132,8 @@ class BUTTON():
 
         x=self.btn.btn1.name
 
-        font_size = font14.baseSize
-        pyray.draw_text_ex(font14,str(x), [pos[1]+4,pos[0]+4], font_size, 0, [0,0,0,255])#pyray.YELLOW)#[0,255,0,255]) #pyray.YELLOW)
+        font_size = self.font.baseSize
+        pyray.draw_text_ex(self.font,str(x), [pos[1]+4,pos[0]+4], font_size, 0, [0,0,0,255])#pyray.YELLOW)#[0,255,0,255]) #pyray.YELLOW)
 
     def event(self,x,y,mouse):
         try:
@@ -269,22 +272,28 @@ def load_fix():
 
     return _load_fix_keys.copy(), _load_fix_host_list.copy()
 
-XFIRST_RUN = 1
 def check_buttons(buttons,host_list):
-    global XFIRST_RUN 
     _x=20
     _y=30
-    if not XFIRST_RUN:
-        return
-    XFIRST_RUN = 0
+
     H = 22
-    W = 120
-    W2 = W
+    W = 100
+    W2 = W+20
+
+    _last_v = {}
     for i,k in enumerate(host_list): #.items():
         _x=20
         key = str(i)
         if key not in buttons: # insert 
             v=host_list[k]
+            _last_v = v
+            txt="ID:"+str(v["ID"])
+            btn=BUTTON(None,txt,[_y,_x,H,60])
+            btn.btn.btn1.color_on = [255,255,0,255]
+            buttons[key+".ID"] = btn
+            #print("ADD",key,btn)
+            _x+=60+2
+
             txt=v["NAME"]
             btn=BUTTON(None,txt,[_y,_x,H,W])
             btn.btn.btn1.color_on = [255,255,0,255]
@@ -321,6 +330,11 @@ def check_buttons(buttons,host_list):
 
         _y+=23
 
+    #for k in buttons:
+    #for i,k in enumerate(host_list): #.items():
+    if _last_v:
+        print("init.button.ok",_last_v)
+
 def draw_buttons(buttons):
     mh = pyray.get_screen_height()
     for k,btn in buttons.items():
@@ -366,15 +380,18 @@ while not pyray.window_should_close():
         check_buttons(buttons,host_list)
 
 
-        pyray.draw_text_ex(font_l_22,"FIXTURE LIST",[20,5], 22, 0,  pyray.GRAY)
+        pyray.draw_text_ex(font_l_22,"FIXTURE LIST",[20,2], 22, 0,  pyray.GRAY)
 
-        pyray.draw_text_ex(font12,"ACTIVE:{:0.1f} {:0.1f}".format(0,0),[200,5], 12, 0,  pyray.YELLOW)
-        pyray.draw_text_ex(font12,"ENCODER:±{:0.2f}".format(5),[310,5], 12, 0,  pyray.YELLOW)
+        pyray.draw_text_ex(font12,"ACTIVE:{:0.1f} {:0.1f}".format(0,0),[220,5], 12, 0,  pyray.YELLOW)
+        pyray.draw_text_ex(font12,"ENCODER:{:0.2f}".format(5),[315,5], 12, 0,  pyray.YELLOW)
 
         pyray.draw_text_ex(font12,"FPS:{}".format(fps_count)     ,[420,5], 12, 0,  pyray.BLUE)
         pyray.draw_text_ex(font12,"BTN:{}".format(len(buttons))  ,[460,5], 12, 0,  pyray.BLUE)
         pyray.draw_text_ex(font12,"FIX:{}".format(len(host_list)),[520,5], 12, 0,  pyray.BLUE)
 
+        wheel = pyray.get_mouse_wheel_move()
+        if wheel:
+            print(wheel)
         m=pyray.get_mouse_position()
         #print(m)
         if m.x != old_x or m.y != old_y:
@@ -419,10 +436,18 @@ while not pyray.window_should_close():
             #print(mouse)
             mouse_old = mouse[:]
             
-        txt=""
         key="scroll-bar"
-        btn=BUTTON(None,txt,[30,mw-35,mh-75,30])
-        btn.btn.btn1.color_on = [255,255,0,255]
+        if key not in buttons:
+            txt=""
+            btn=BUTTON(None,txt,[30,mw-35,mh-75,30])
+            #btn.btn.btn1.color_on = [255,255,0,255]
+            buttons[key] = btn
+            btn.btn.btn4.val.set(btn.btn.btn4.val._max*0.4)
+
+        txt="HELP"
+        key="HELP"
+        btn=BUTTON(None,txt,[4,160,16,40])
+        btn.font = font10
         buttons[key] = btn
 
         draw_buttons(buttons)