cleanup

vpu/vpu_live4.py

@@ -755,6 +755,23 @@ class PixelMedia():
 
         wn.blit(im, (int(x-xx/2), int(y-yy)))  # draw frame
 
+    def draw_img(self,wn,img_meta):
+        self.img_meta["pos"]   = [self.x,self.y]
+        self.img_meta["scale"] = self.scale #= 50 #%
+        self.img_meta["dim"]   = self.dim #255
+        self.img_meta["ang"]   = self.angle # 0
+
+        if 1: #self.is_change():
+            im2 = self.img_meta["raw_img"]
+            im2 = img_rescale(im2, percent=self.img_meta["scale"])
+            # add DIMER to videplayer
+            im2 = cv2.normalize(im2, im2, 0, self.img_meta["dim"], cv2.NORM_MINMAX) 
+
+            self.img_meta["img"] = im2
+
+        img_draw_raw(self.img_meta)
+        self.change_reset()
+
     def is_change(self):
         #if self.frame_change or self.dmx_change:
         if self.frame_change or self.dmx_change:
@@ -771,22 +788,7 @@ class PixelMedia():
 
     def draw(self,wn=None):
         if self.img_meta:
-            self.img_meta["pos"]   = [self.x,self.y]
-            self.img_meta["scale"] = self.scale #= 50 #%
-            self.img_meta["dim"]   = self.dim #255
-            self.img_meta["ang"]   = self.angle # 0
-
-            #if self.is_change():
-            img = self.img_meta["raw_img"]
-            im2 = img_rescale(img, percent=self.img_meta["scale"])
-            #    
-            #    # add DIMER to videplayer
-            im2 = cv2.normalize(im2, im2, 0, self.img_meta["dim"], cv2.NORM_MINMAX) 
-            self.img_meta["img"] = im2
-
-            img_draw_raw(self.img_meta)
-
-            self.change_reset()
+            self.draw_img(wn,self.img_meta)
             return
 
 
@@ -2792,6 +2794,7 @@ def create_img_meta():
     return out
 
 def img_open(img_meta):
+    cprint("img_open",img_meta["fname"],"-------")
     fname = img_meta["_fpath"] +"/"+ img_meta["fname"] #'/opt/LibreLight/Xdesk/icon/picker.png'
     im2 = cv2.imread(fname)
     width  = int(im2.shape[1])