pogucam 0.1.5__py3-none-any.whl → 0.1.7__py3-none-any.whl

pogucam/buffers.py

@@ -0,0 +1,157 @@
+
+import numpy as np
+# ================================================================================
+# jsut store uint +info
+# --------------------------------------------------------------------------------
+
+class FastAccumBuffer:
+    def __init__(self, max_frames, shape=(640, 480, 3)):
+        self.max_frames = max_frames
+        self.shape = shape
+        self._init_buffer()
+        self._last_retrieved_idx = -1 #???
+
+    def _init_buffer(self):
+        self.cube = np.empty((self.max_frames, *self.shape), dtype=np.uint8)
+        self.info = [None] * self.max_frames
+        self.idx = 0
+        self.count = 0
+        self._last_retrieved_idx = -1 #???
+
+    def add(self, img: np.ndarray, info: dict):
+        """
+        inconsistent shape resets the buffer
+        """
+        if img.dtype != np.uint8 or img.shape != self.shape:
+            self.shape = img.shape
+            self._init_buffer()
+        if self.cube.shape[0] != self.max_frames:
+            self._init_buffer()
+        self.cube[self.idx] = img
+        self.info[self.idx] = info
+        self.idx = (self.idx + 1) % self.max_frames
+        self.count = min(self.count + 1, self.max_frames)
+
+    def get_last_img(self):
+        if self.count == 0:
+            return None
+        last_idx = (self.idx - 1) % self.max_frames
+        return self.cube[last_idx]
+
+    def new_sum_available(self):
+        return self.idx == self.max_frames - 1
+        # True if buffer has wrapped around since last sum_images() call
+        if self.count < self.max_frames:
+            return False
+        return self.idx != self._last_retrieved_idx # ???
+
+    def get_sum_frames(self):
+        if self.count == 0:
+            return None
+        #print("!... SUM")
+        summed = np.sum(self.cube[:self.count].astype(np.uint16), axis=0)
+        np.clip(summed, 0, 255, out=summed)
+        self._last_retrieved_idx = self.idx # ???
+        return summed.astype(np.uint8)
+
+    def get_max_frames(self):
+        return self.max_frames
+
+    def set_max_frames(self, max_frames):
+        """
+        reset the buffer
+        """
+        if max_frames != self.max_frames:
+            self.max_frames = max_frames
+            self._init_buffer()
+
+    def __iter__(self):
+        """
+        returns image,info_dict
+        """
+        for i in range(self.count):
+            yield self.cube[(self.idx - self.count + i) % self.max_frames], self.info[(self.idx - self.count + i) % self.max_frames]
+
+    def __len__(self):
+        return self.count
+
+
+
+
+# ==========================================================================================
+#  CLASS     SLOW  level 2  - averaging buffer.....
+# ------------------------------------------------------------------------------------------
+
+
+class AccumBuffer:
+    def __init__(self, frame=None, img_dtype=np.uint8):
+        self.frame = frame
+        self.img = type('img', (), {'dtype': img_dtype})()
+        self.accum_buffer_size = 0
+        self.accum_buffer = []
+        self.accum_count = 0
+        self.accum_index = 0
+        self.running_sum = None
+
+    def is_accum_index_at_end(self):
+        return self.accum_index >= self.accum_buffer_size - 1
+
+    def get_current_size(self):
+        return self.accum_count
+
+    def get_max_buffer_size(self):
+        return self.accum_buffer_size
+
+    def clear_buffer(self, some_frame):
+        self.accum_buffer = np.zeros((self.accum_buffer_size, *some_frame.shape), dtype=self.img.dtype)
+        self.accum_count = 0
+        self.accum_index = 0
+        self.running_sum = np.zeros(some_frame.shape, dtype=np.float64)
+
+    def get_frame_shape(self):
+        if self.frame is not None:
+            return self.frame.shape
+        else:
+            return None
+
+    def define_accum_buffer(self, n):
+        if self.frame is None:
+            return False
+        if (n == self.accum_buffer_size) and (len(self.accum_buffer) > 1):
+            return True
+        self.accum_buffer_size = n
+        self.accum_buffer = np.zeros((self.accum_buffer_size, *self.frame.shape), dtype=self.img.dtype)
+        self.accum_count = 0
+        self.accum_index = 0
+        self.running_sum = np.zeros(self.frame.shape, dtype=np.float64)
+        return True
+
+    def add_to_accum_buffer(self, frame):
+        if len(self.accum_buffer) < 1:
+            return False
+        if self.accum_count < self.accum_buffer_size:
+            self.running_sum += frame
+            self.accum_buffer[self.accum_index] = frame
+            self.accum_count += 1
+        else:
+            oldest_frame = self.accum_buffer[self.accum_index]
+            if frame.shape != oldest_frame.shape:
+                return False
+            self.running_sum += frame.astype(np.float64) - oldest_frame.astype(np.float64)
+            self.accum_buffer[self.accum_index] = frame
+        self.accum_index = (self.accum_index + 1) % self.accum_buffer_size
+        return True
+
+    def get_mean_accum_buffer(self):
+        if self.accum_count == 0:
+            return None
+        rimg = self.running_sum / self.accum_count
+        return rimg.astype(np.uint8)
+
+    def order_accum_buffer_frames(self):
+        if self.accum_count < self.accum_buffer_size:
+            frames_ordered = self.accum_buffer[:self.accum_count]
+        else:
+            frames_ordered = np.concatenate((self.accum_buffer[self.accum_index:], self.accum_buffer[:self.accum_index]))
+        for frame in frames_ordered:
+            yield frame

pogucam/explore_u24_uni.py

@@ -63,7 +63,10 @@ import base64
 import getpass
 import time
 
+
 from pogucam.text_write import iprint, fonts_available, get_f_height, get_f_width, get_def_font, set_def_font
+from pogucam import buffers
+
 from console import fg, bg, fx
 
 from astropy.io import fits
@@ -343,83 +346,6 @@ def crosson( frame,  dix, diy, color = "g", box_small = True, box_large = False)
 
 
 
-# ==========================================================================================
-#  CLASS
-# ------------------------------------------------------------------------------------------
-
-
-class AccumBuffer:
-    def __init__(self, frame=None, img_dtype=np.uint8):
-        self.frame = frame
-        self.img = type('img', (), {'dtype': img_dtype})()
-        self.accum_buffer_size = 0
-        self.accum_buffer = []
-        self.accum_count = 0
-        self.accum_index = 0
-        self.running_sum = None
-
-    def is_accum_index_at_end(self):
-        return self.accum_index >= self.accum_buffer_size - 1
-
-    def get_current_size(self):
-        return self.accum_count
-
-    def get_max_buffer_size(self):
-        return self.accum_buffer_size
-
-    def clear_buffer(self, some_frame):
-        self.accum_buffer = np.zeros((self.accum_buffer_size, *some_frame.shape), dtype=self.img.dtype)
-        self.accum_count = 0
-        self.accum_index = 0
-        self.running_sum = np.zeros(some_frame.shape, dtype=np.float64)
-
-    def get_frame_shape(self):
-        if self.frame is not None:
-            return self.frame.shape
-        else:
-            return None
-
-    def define_accum_buffer(self, n):
-        if self.frame is None:
-            return False
-        if (n == self.accum_buffer_size) and (len(self.accum_buffer) > 1):
-            return True
-        self.accum_buffer_size = n
-        self.accum_buffer = np.zeros((self.accum_buffer_size, *self.frame.shape), dtype=self.img.dtype)
-        self.accum_count = 0
-        self.accum_index = 0
-        self.running_sum = np.zeros(self.frame.shape, dtype=np.float64)
-        return True
-
-    def add_to_accum_buffer(self, frame):
-        if len(self.accum_buffer) < 1:
-            return False
-        if self.accum_count < self.accum_buffer_size:
-            self.running_sum += frame
-            self.accum_buffer[self.accum_index] = frame
-            self.accum_count += 1
-        else:
-            oldest_frame = self.accum_buffer[self.accum_index]
-            if frame.shape != oldest_frame.shape:
-                return False
-            self.running_sum += frame.astype(np.float64) - oldest_frame.astype(np.float64)
-            self.accum_buffer[self.accum_index] = frame
-        self.accum_index = (self.accum_index + 1) % self.accum_buffer_size
-        return True
-
-    def get_mean_accum_buffer(self):
-        if self.accum_count == 0:
-            return None
-        rimg = self.running_sum / self.accum_count
-        return rimg.astype(np.uint8)
-
-    def order_accum_buffer_frames(self):
-        if self.accum_count < self.accum_buffer_size:
-            frames_ordered = self.accum_buffer[:self.accum_count]
-        else:
-            frames_ordered = np.concatenate((self.accum_buffer[self.accum_index:], self.accum_buffer[:self.accum_index]))
-        for frame in frames_ordered:
-            yield frame
 
 # ==========================================================================================
 #  CLASS
@@ -572,13 +498,15 @@ class StreamWidget(QLabel):
         self.setup(action="r", number=4)
         # ------------------------  capture
         self.cap = None
-        self.accum_n = 1
-        self.accum_buffer = None #deque(maxlen=self.accum_n)
-        self.accum_image = None
-        self.l_show_accum = False
-        # ---- np stak
-        self.accum_buffer_size = 0 #
-        self.accum_count = 0 # actual number of img in buff
+        # ------------------------- FastBuffer
+        self.FABuffer = buffers.FastAccumBuffer(1) # shape is default
+        #self.accum_n = 1           #
+        #self.accum_buffer = None   #
+        #self.accum_image = None    #
+        self.l_show_accum = False  # THIS MUST BE KEPT
+        # ---- np stak-------------------------------------
+        #self.accum_buffer_size = 0 #
+        #self.accum_count = 0       # actual number of img in buff
         # -------------------------------------------------
         self.level2_buffer = None
         self.level2_buffer_max_size = 10
@@ -617,15 +545,17 @@ class StreamWidget(QLabel):
             print("X... no remote IP defined - nothing sent", data)
             #--------------------------- ------------------------------------ACUUMULATE LOCALY
             if ('accumtxt' in data):
-                val = int(data['accumtxt'])
+                val = int(data['accumtxt']) # SIZE OF THE BUFFER
                 # how to solve 0? the forgotten problem with 1 allowed here and not 0
                 if val == 0: val = 1 # trying to fix
-                if val != self.accum_n:
-                    self.accum_n = val
-                    #if val == 0: self.accum_n = val # This looks obsolete!; commenting out
-                    #
-                    ###self.accum_buffer = deque(maxlen=self.accum_n)
-                    self.define_accum_buffer( self.accum_n )
+                if len(self.FABuffer) != val and val > 0:
+                    self.FABuffer.set_max_frames(val)
+                #if val != self.accum_n:
+                #    self.accum_n = val
+                #    #if val == 0: self.accum_n = val # This looks obsolete!; commenting out
+                #    #
+                #    ###self.accum_buffer = deque(maxlen=self.accum_n)
+                #    self.define_accum_buffer( self.accum_n )
 
 
             #-----------------------------------------------------------------SWITCHRES LOCALY
@@ -647,7 +577,8 @@ class StreamWidget(QLabel):
                 self.cap.set(cv2.CAP_PROP_FRAME_HEIGHT, height)
 
                 self.zoome = 1
-                self.define_accum_buffer(0 ) # RESET BUFFER
+                self.FABuffer.set_max_frames(1)
+                #self.define_accum_buffer(0 ) # RESET BUFFER
 
             #----------------------------------------------------------
 
@@ -668,7 +599,8 @@ class StreamWidget(QLabel):
                 self.cap.set(cv2.CAP_PROP_FRAME_WIDTH, width)
                 self.cap.set(cv2.CAP_PROP_FRAME_HEIGHT, height)
 
-                self.define_accum_buffer(0 ) # RESET BUFFER
+                #self.define_accum_buffer(0 ) # RESET BUFFER
+                self.FABuffer.set_max_frames(1)
                 self.zoome = 1
 
             #----------------------------------------------------------
@@ -949,10 +881,15 @@ class StreamWidget(QLabel):
         if self.saving_fits_only:
             FIT = f"FITS {self.FITS_INTERVAL_SECONDS:3d}"
 
-        total_size = 0
-        if self.accum_buffer is not None:
-            total_size = sys.getsizeof(self.accum_buffer) + sum(sys.getsizeof(arr) for arr in self.accum_buffer)
-        BUF = f"BUF={self.accum_count:3d}/{self.accum_n:3d} {total_size/1024/1024:5.0f} MB"
+        # ---------------------- ACCUM
+        total_size = sys.getsizeof(self.FABuffer)
+        cur_size = len(self.FABuffer)
+        max_size = self.FABuffer.get_max_frames()
+
+        #if self.accum_buffer is not None:
+        #    total_size = sys.getsizeof(self.accum_buffer) + sum(sys.getsizeof(arr) for arr in self.accum_buffer)
+        #BUF = f"BUF={self.accum_count:3d}/{self.accum_n:3d} {total_size/1024/1024:5.0f} MB"
+        BUF = f"BUF={cur_size:3d}/{max_size:3d} {total_size/1024/1024:5.0f} MB"
         #
         #
         #
@@ -960,17 +897,18 @@ class StreamWidget(QLabel):
         #
         position = ( 0, self.frame.shape[0]-1 ) # 480 on x-axis
         #
-        overlay = self.frame.copy()
-        if self.resolution == "1920x1080":
-            shade_height = 20
-        else:
-            shade_height = 10
-        height, width = self.frame.shape[:2]
-        cv2.rectangle(overlay, (0, height - shade_height), (width, height), (0, 0, 0), -1)
-        alpha = 0.5
+
         if blackbar:
-            alpha = 0.
-        cv2.addWeighted(overlay, alpha, self.frame, 1 - alpha, 0, self.frame)
+            overlay = self.frame.copy()
+            if self.resolution == "1920x1080":
+                shade_height = 20
+            else:
+                shade_height = 10
+            height, width = self.frame.shape[:2]
+            cv2.rectangle(overlay, (0, height - shade_height), (width, height), (0, 0, 0), -1)
+            alpha = 0.5
+            #alpha = 0.
+            cv2.addWeighted(overlay, alpha, self.frame, 1 - alpha, 0, self.frame)
         #
         font = "di"
         if self.resolution == "1920x1080":
@@ -1091,7 +1029,6 @@ class StreamWidget(QLabel):
             #hdu.header['DATE'] = '2025-05-12'
 
             hdul.writeto(newfname, overwrite=True) # .gz is too expensive too
-            #print(f" x {fg.red}FITS SAVED{fg.default} {newfname}", end=" ")
         # -------------------------------------------------
         thread = threading.Thread(target=save)
         thread.start()
@@ -1126,14 +1063,13 @@ class StreamWidget(QLabel):
                 print("           xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx                  ")
                 #mylst = []
                 n = 1
-                for i in self.order_accum_buffer_frames(): # ITER WORKS BUT NO GREEN LABELS
+                for i, info in self.FABuffer:#self.order_accum_buffer_frames(): # ITER WORKS BUT NO GREEN LABELS
                     i = np.moveaxis( i, [0, 1, 2], [1, 2, 0])
                     i = np.rot90(i, 2)
                     #mylst.append(i)
                     #data_cube3 = np.stack(mylst, axis=0)
                     self.save_fits_in_background(i, fname1, numero=n)
                     n += 1
-                self.SAVED_NOW = True
             elif dumpbuffer and (self.l_show_accum) and (use_buffer is not None):   # I WILL NOT USE THIS ***********
                 print("           xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx                  ")
                 #print("D... some way to save only one AVG image per Nbuf: TO DO!")   # TODO
@@ -1147,30 +1083,25 @@ class StreamWidget(QLabel):
                     #data_cube3 = np.stack(mylst, axis=0)
                     self.save_fits_in_background(i, fname1, numero=n)
                     n += 1
-                self.SAVED_NOW = True             # BUFFER OF BUFFERS !!!!!!! TODO
-                pass
             elif (not dumpbuffer) and  (not self.l_show_accum):
                 print("... just one foto in FITS, why not") # trivial   ------- NOBUFFER
-                mylast = self.accum_buffer[self.accum_index]
+                mylast = self.FABuffer.get_last_img()#self.accum_buffer[self.accum_index]
                 i = np.moveaxis( mylast, [0, 1, 2], [1, 2, 0])
                 i = np.rot90(i, 2)
                 self.save_fits_in_background(i, fname1)
-                self.SAVED_NOW = True
-                pass
             elif (not dumpbuffer) and  (self.l_show_accum):
                 print(" ... provide average, 1 image in FITS") # trivial ------- NOBUFFER
-                mymean = self.get_mean_accum_buffer()
+                mymean = self.FABuffer.get_sum_frames()#get_mean_accum_buffer()
                 i = np.moveaxis( mymean, [0, 1, 2], [1, 2, 0])
                 i = np.rot90(i, 2)
                 self.save_fits_in_background(i, fname1)
-                self.SAVED_NOW = True
-                pass
         # -------  JPG ****   ****  **** **** *** *** * * * *
         else:#                                              --------NOT FITS
             if (dumpbuffer) and (not self.l_show_accum):
                 # dump buffer - straight
                 mycnt = 0
-                for i in self.order_accum_buffer_frames(): # ITER WORKS BUT NO GREEN LABELS
+                #for i in self.order_accum_buffer_frames(): # ITER WORKS BUT NO GREEN LABELS
+                for i, info in self.FABuffer:
                     mycnt += 1
                     fff = fname1.replace(".jpg", f"_{mycnt:03d}.jpg")
                     print(fff)
@@ -1178,7 +1109,6 @@ class StreamWidget(QLabel):
                         cv2.imwrite(fff, i, [int(cv2.IMWRITE_JPEG_QUALITY), 90])
                     else:
                         cv2.imwrite(fff.replace("jpg", "png"), i )
-                    self.SAVED_NOW = True
                 pass
             # -----------------------------------------------
             elif (not dumpbuffer) and (not self.l_show_accum):
@@ -1187,20 +1117,14 @@ class StreamWidget(QLabel):
                     cv2.imwrite(fname1, self.img, [int(cv2.IMWRITE_JPEG_QUALITY), 90])
                 else:
                     cv2.imwrite(fname1.replace("jpg", "png"), self.img )
-                self.SAVED_NOW = True
-                pass
             elif (dumpbuffer) and (self.l_show_accum):
                 print("D... the trickies - save every Nth-every new buffer - IDK ")
-                self.SAVED_NOW = True
-                pass
             elif (not dumpbuffer) and (self.l_show_accum):
-                mymean = self.get_mean_accum_buffer()
+                mymean = self.FABuffer.get_sum_frames()#get_mean_accum_buffer()
                 if self.saving_jpg:
                     cv2.imwrite(fname1, mymean, [int(cv2.IMWRITE_JPEG_QUALITY), 90])
                 else:
                     cv2.imwrite(fname1.replace("jpg", "png"), mymean )
-                self.SAVED_NOW = True
-                pass
 
 
     # ======================================================================
@@ -1559,23 +1483,7 @@ class StreamWidget(QLabel):
             print(f" --- {self.frame_time} ; resolution /{self.frame.shape}/  ---- ", end="")
 
             avg = self.frame # once per Nx it is AVG
-            # -------------------------------------------- all buffer thing will go elsewhere--------------
-            # if self.accum_n > 1:
-            #     #avg = self.frame.astype("float32")
-            #     if len(self.accum_buffer) == self.accum_n: # TRICK---- RESTARTED BUFFER EVERYTIME ----- EASY TO CONTROL SAVE
-            #         avg = np.mean(self.accum_buffer, axis=0).astype(np.uint8)
-            #         self.frame = avg
-            #         self.accum_image = avg # store for next loop
-            #         # I will use this for -bad-old-orientative-image AND SAVE!
-            #         # RESET BUFFER! count from Zero
-            #         self.accum_buffer = deque(maxlen=self.accum_n)
-            #         # I need to carefully sync saving
-            #     self.accum_buffer.append( self.frame.astype("float32")  ) # always frame
             self.img = avg # normally frame. but sometimes avg == really averaged img!
-            # NICE.
-            # I want to see accumulated....??????
-            #if self.accum_image is not None and (len(self.accum_buffer) > self.accum_n / 2):
-            #    self.img = self.accum_image
         return True
 
 
@@ -1691,62 +1599,7 @@ class StreamWidget(QLabel):
  #        "                                                       #
  ##################################################################
 
-    def define_accum_buffer(self, n ):
-        #  NEED TO REDEFINE ON S-X !!!!
-        if (self.frame is None):#
-            return False
-        if (n == self.accum_buffer_size) and (len(self.accum_buffer) > 1):
-            return True
-        self.accum_buffer_size = n
-        self.accum_buffer = np.zeros((self.accum_buffer_size, *self.frame.shape), dtype=self.img.dtype)
-        self.accum_count = 0
-        self.accum_index = 0
-        self.running_sum = np.zeros(self.frame.shape, dtype=np.float64)
-        return True
-
-    def add_to_accum_buffer(self, frame):
-        # When adding a new frame:
-        if  (len(self.accum_buffer) < 1):
-            return False
-        #print("addind")
-        if self.accum_count < self.accum_buffer_size:
-            self.running_sum += frame
-            self.accum_buffer[self.accum_index] = frame
-            self.accum_count += 1
-        else:
-            oldest_frame = self.accum_buffer[self.accum_index]
-            if frame.shape !=  oldest_frame.shape:
-                #self.define_accum_buffer(self.accum_buffer_size )
-                return False
-            self.running_sum += frame.astype(np.float64) - oldest_frame.astype(np.float64)
-            self.accum_buffer[self.accum_index] = frame
-        # do as before
-        #@self.accum_buffer[self.accum_index] = frame
-        self.accum_index = (self.accum_index + 1) % self.accum_buffer_size
-        return True
-
-    def get_mean_accum_buffer(self):
-        if self.accum_count == 0:
-            return None
-        rimg = self.running_sum / self.accum_count
-        return rimg.astype(np.uint8)
-        # #print(self.accum_count, self.accum_buffer_size)
-        # if self.accum_count > 1:
-        #     img = np.mean(self.accum_buffer[:self.accum_count], axis=0)
-        #     return img
-        # return None
-
-    def  order_accum_buffer_frames(self):
-        if self.accum_count < self.accum_buffer_size:
-            frames_ordered = self.accum_buffer[:self.accum_count]
-        else:
-            frames_ordered = np.concatenate((self.accum_buffer[self.accum_index:], self.accum_buffer[:self.accum_index]))
-        for frame in frames_ordered:
-            yield frame
-        #return frames_ordered
 
-    #def iter_accum_buffer_ordered_frames(self):
-    #    frames_ordered = self.order_accum_buffer_frames()
 
 
 
@@ -1802,17 +1655,19 @@ class StreamWidget(QLabel):
             #                  SAVING  organization    HERE
 
             if self.level2_buffer is None:
-                self.level2_buffer = AccumBuffer(self.img)
+                self.level2_buffer = buffers.AccumBuffer(self.img)
                 self.level2_buffer.define_accum_buffer(  self.level2_buffer_max_size  ) # ???
 
 
             # DEFINE BUFFER, if not yet /  if overtext is before,  i have blurred timemarks
             # ---------------------------- if overtext is after  , i do not have greentext on image
-            if self.define_accum_buffer( self.accum_n ): # does  nothing if already exists
-                self.add_to_accum_buffer( self.img) # No idea why fits has wrong colors
+            self.FABuffer.add( self.img, {'name':'test', 'time': dt.datetime.now()} )
+            #if self.define_accum_buffer( self.accum_n ): # does  nothing if already exists
+            #    self.add_to_accum_buffer( self.img) # No idea why fits has wrong colors
 
-            if self.l_show_accum and (self.accum_n > 1) and (len(self.accum_buffer) > 1):
-                rimg = self.get_mean_accum_buffer()
+            # showing or NOT the average image
+            if self.l_show_accum and (len(self.FABuffer) > 1):# and (len(self.accum_buffer) > 1):
+                rimg = self.FABuffer.get_sum_frames()#_mean_accum_buffer()
                 if rimg is not None:
                     self.img = rimg
                     self.overttext(blackbar=True) # applies on img
@@ -1849,106 +1704,104 @@ class StreamWidget(QLabel):
             # ---- just save once -----------------  -------------------------------------------- ************  "s" ***********
             if self.saving_once:
                 # jpg and NO AVG
-                if (self.accum_buffer_size < 2)    and (not self.l_show_accum) and (not self.saving_fits_only):
+                if (len(self.FABuffer) < 2)    and (not self.l_show_accum) and (not self.saving_fits_only):
                     # no bufffer no loopshow no fits
                     self.save_img( time_tag=self.frame_time , dumpbuffer=False, use_fits=False ) # one simple image
                     print(fg.red, "s1", fg.default, end="")
                     self.saving_once = False
                 # jpg and NO AVG
-                elif (self.accum_buffer_size >= 2) and (not self.l_show_accum) and (not self.saving_fits_only):
+                elif (len(self.FABuffer) >= 2) and (not self.l_show_accum) and (not self.saving_fits_only):
                     self.save_img( time_tag=self.frame_time, dumpbuffer=False, use_fits=False ) #  save one simple image only
                     print(fg.red, "s1", fg.default, end="")
                     self.saving_once = False
                 # jpg and  AVG
-                elif (self.accum_buffer_size < 2)  and (self.l_show_accum) and (not self.saving_fits_only):
+                elif (len(self.FABuffer) < 2)  and (self.l_show_accum) and (not self.saving_fits_only):
                     # no bufffer no loopshow no fits
                     self.save_img( time_tag=self.frame_time, dumpbuffer=False, use_fits=False ) # just one simple image /lshow inside
                     print(fg.red, "F1", fg.default, end="")
                     self.saving_once = False
                     pass
                 # jpg and AVG
-                elif (self.accum_buffer_size >= 2) and (self.l_show_accum) and (not self.saving_fits_only):
+                elif (len(self.FABuffer) >= 2) and (self.l_show_accum) and (not self.saving_fits_only):
                     # no bufffer no loopshow no fits
-                    if self.accum_index >= self.accum_buffer_size - 1:
-                        self.save_img( time_tag=self.frame_time, dumpbuffer=False, use_fits=False ) # should be 1 AVG IMG
-                        print(fg.red, "F1", fg.default, end="")
-                        self.saving_once = False
-                    pass
+                    #if self.accum_index >= len(self.FABuffer) - 1:
+                    self.save_img( time_tag=self.frame_time, dumpbuffer=False, use_fits=False ) # should be 1 AVG IMG
+                    print(fg.red, "F1", fg.default, end="")
+                    self.saving_once = False
                 # FITS and NO AVG ---------------------------------------------------------------------------- FITS
-                elif (self.accum_buffer_size < 2)  and (not self.l_show_accum) and (self.saving_fits_only):
+                elif (len(self.FABuffer) < 2)  and (not self.l_show_accum) and (self.saving_fits_only):
                     # no bufffer no loopshow YES fits
                     self.save_img( time_tag=self.frame_time , dumpbuffer=False, use_fits=True ) # 1 img
                     print(fg.red, "F1", fg.default, end="")
                     self.saving_once = False
                     pass
                 # FITS and NO AVG
-                elif (self.accum_buffer_size >= 2) and (not self.l_show_accum) and (self.saving_fits_only):
+                elif (len(self.FABuffer) >= 2) and (not self.l_show_accum) and (self.saving_fits_only):
                     # no bufffer no loopshow no fits
                     self.save_img( time_tag=self.frame_time , dumpbuffer=True, use_fits=True ) # dump buffer once
                     print(fg.red, "F1", fg.default, end="")
                     self.saving_once = False
                     pass
                 # FITS and avg
-                elif (self.accum_buffer_size < 2)  and (self.l_show_accum) and (self.saving_fits_only):
+                elif (len(self.FABuffer) < 2)  and (self.l_show_accum) and (self.saving_fits_only):
                     # no bufffer no loopshow no fits
                     self.save_img( time_tag=self.frame_time , dumpbuffer=False, use_fits=True ) # one AVG
                     print(fg.red, "F1", fg.default, end="")
                     self.saving_once = False
                     pass
                 # FITS and avg  there are more
-                elif (self.accum_buffer_size >= 2) and (self.l_show_accum) and (self.saving_fits_only):
+                elif (len(self.FABuffer) >= 2) and (self.l_show_accum) and (self.saving_fits_only):
                     # no bufffer no loopshow no fits
-                    if self.accum_index >= self.accum_buffer_size - 1:
-                        self.save_img( time_tag=self.frame_time , dumpbuffer=False, use_fits=True ) # many AVG IDK
-                        print(fg.red, "F1", fg.default, end="")
-                        self.saving_once = False
-                    pass
+                    #if self.accum_index >= len(self.FABuffer) - 1:
+                    self.save_img( time_tag=self.frame_time , dumpbuffer=False, use_fits=True ) # many AVG IDK
+                    print(fg.red, "F1", fg.default, end="")
+                    self.saving_once = False
 
 
             # ----  save ALL  -----------------  -------------------------------------------- ************  "shift-s" ***********
             # ----  save ALL  -----------------  -------------------------------------------- ************  "shift-s" ***********
             if self.saving_all: # ---------------  Shift-S-------
                 # jpg and NO AVG
-                if (self.accum_buffer_size < 2)    and (not self.l_show_accum) and (not self.saving_fits_only):
+                if (len(self.FABuffer) < 2)    and (not self.l_show_accum) and (not self.saving_fits_only):
                     self.save_img( time_tag=self.frame_time, dumpbuffer=False, use_fits=False) # every frame, BURSTING JPGS!
                     print(fg.red, "s!", fg.default, f"{bg.red}{fg.white}!!!!!!!!!!!!{bg.default}{fg.default}", end="\n")
                 # jpg and NO AVG
-                elif (self.accum_buffer_size >= 2) and (not self.l_show_accum) and (not self.saving_fits_only):
+                elif (len(self.FABuffer) >= 2) and (not self.l_show_accum) and (not self.saving_fits_only):
                     self.save_img( time_tag=self.frame_time, dumpbuffer=True, use_fits=False ) #  Dump Full Buffer and stop
                     print(fg.red, "s-FuB DUMPED", fg.default, end="\n") # ONE DUMP
                     self.saving_all = False
                 # jpg and  AVG
-                elif (self.accum_buffer_size < 2)  and (self.l_show_accum) and (not self.saving_fits_only):
+                elif (len(self.FABuffer) < 2)  and (self.l_show_accum) and (not self.saving_fits_only):
                     # no bufffer no loopshow no fits
                     #self.save_img( time_tag=self.frame_time, dumpbuffer=False, use_fits=False ) # just one simple image /lshow inside
                     self.saving_all = False
                     pass
                 # jpg and AVG
-                elif (self.accum_buffer_size >= 2) and (self.l_show_accum) and (not self.saving_fits_only):
+                elif (len(self.FABuffer) >= 2) and (self.l_show_accum) and (not self.saving_fits_only):
                     # no bufffer no loopshow no fits
                     #self.save_img( time_tag=self.frame_time, dumpbuffer=False, use_fits=False ) # should be AVG
-                    if self.accum_index >= self.accum_buffer_size - 1:
+                    #if self.accum_index >= len(self.FABuffer) - 1:
+                    if self.FABuffer.new_sum_available():
                         self.save_img( time_tag=self.frame_time, dumpbuffer=False, use_fits=False ) #  Dump Full Buffer and stop
-                        print(fg.red, "Save AVG evry Nth ", fg.default, end="")
-                    pass
+                        print(fg.red, "Save SUM evry Nth ", fg.default, end="\n")
                 # FITS and NO AVG ---------------------------------------------------------------------------- FITS
                 # FITS and NO AVG ---------------------------------------------------------------------------- FITS
-                elif (self.accum_buffer_size < 2)  and (not self.l_show_accum) and (self.saving_fits_only):
+                elif (len(self.FABuffer) < 2)  and (not self.l_show_accum) and (self.saving_fits_only):
                     print("          here fits for  every image ....   too low buffer --- so   MAYBE        ")
                     # no bufffer no loopshow YES fits
                     self.save_img( time_tag=self.frame_time, dumpbuffer=False, use_fits=True) # every frame, BURSTING FITS !?!?!
                     #print(fg.red, "every N frames to FITS-IDK", fg.default, f"{bg.red}{fg.white}???{bg.default}{fg.default}", end="\n")
                     pass
                 # FITS and NO AVG
-                elif (self.accum_buffer_size >= 2) and (not self.l_show_accum) and (self.saving_fits_only):
+                elif (len(self.FABuffer) >= 2) and (not self.l_show_accum) and (self.saving_fits_only):
                     print(fg.red,"          here fits for ALL BUFFER NONONO   no save        ", fg.default, end="")
                     ## no bufffer no loopshow no fits
-                    #if self.accum_index >= self.accum_buffer_size - 1:
+                    #if self.accum_index >= len(self.FABuffer) - 1:
                     #    self.save_img( time_tag=self.frame_time , dumpbuffer=True, use_fits=True ) # dump buffer every time
                     #    print(fg.red, "F-FuB", fg.default , f"{bg.red}{fg.white}!!!!!!!!!!!!{bg.default}{fg.default}", end="\n")
                     pass
                 # FITS and avg
-                elif (self.accum_buffer_size < 2)  and (self.l_show_accum) and (self.saving_fits_only):
+                elif (len(self.FABuffer) < 2)  and (self.l_show_accum) and (self.saving_fits_only):
                     print(fg.red,  "          here -  too low buffer+ ACCUM =>   no save        ", fg.default, end="")
                     # no bufffer no loopshow no fits
                     #self.save_img( time_tag=self.frame_time , dumpbuffer=False, use_fits=True ) # one AVG (lshow handled inside)
@@ -1956,11 +1809,12 @@ class StreamWidget(QLabel):
                     self.saving_all = False
                     pass
                 # FITS and avg
-                elif (self.accum_buffer_size >= 2) and (self.l_show_accum) and (self.saving_fits_only):
+                elif (len(self.FABuffer) >= 2) and (self.l_show_accum) and (self.saving_fits_only):
                     # TOO COMPLEX --------------   I CHANGE TO FITS EVERY TIME NEW BUFFER IS OK -----------
                     # no bufffer no loopshow no fits
                     #self.save_img( time_tag=self.frame_time , dumpbuffer=False, use_fits=True ) # many AVG IDK
-                    if self.accum_index >= self.accum_buffer_size - 1: # ONLY THE ACCUM FRAME!
+                    if self.FABuffer.new_sum_available():
+                    #if self.accum_index >= len(self.FABuffer) - 1: # ONLY THE ACCUM FRAME!
                         self.save_img( time_tag=self.frame_time , dumpbuffer=False, use_fits=True ) # SIMPLIFIED
                         print(fg.red, "F-Every Nth-AVG to FITS -IDK", fg.default, end="")
                         ###########################################################################################################################################
@@ -2060,6 +1914,7 @@ class StreamWidget(QLabel):
             #print(" + ".join(parts), f"  /{chr(key)}/ ....   {parts_set}")
             # -----------------------------------------------------------------   s   savings
             if (key == Qt.Key.Key_S):
+                self.SAVED_NOW = True # red blink
                 if ( len(parts_set) == 0) :
                     self.saving_once = True
                     self.saving_all = False
@@ -2311,6 +2166,7 @@ class StreamWidget(QLabel):
                     # 0 would be a problem (locally???);    but 1 is not sent!!! ; SENDING 0, checking@send_command
                 elif (parts_set == {'Ctrl', 'Shift'}) :
                     self.l_show_accum = not self.l_show_accum
+                    print(f"i... ACCUMULATION IS {self.l_show_accum}")
 
             # -----------------------------------------------------------------   b
             if (key == Qt.Key.Key_B):

{pogucam-0.1.5.dist-info → pogucam-0.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pogucam
-Version: 0.1.5
+Version: 0.1.7
 Summary: Add your description here
 Author-email: jaromrax <jaromrax@gmail.com>
 Requires-Python: >=3.12

pogucam-0.1.7.dist-info/RECORD

@@ -0,0 +1,9 @@
+pogucam/__init__.py,sha256=Iij7VvXCrFPMtTia41mQ7LxFLaulf_fD5cb-AyjpUo0,53
+pogucam/buffers.py,sha256=DwEmQYej6CJ7KwXLhR_ulIC_tziQAKM2yFQoEXZ-ocA,5432
+pogucam/explore_u24_uni.py,sha256=BHsS7pAtJKMr7EqlcERF2_MaP6ZZ1Lyy1xs1EMGF8-c,109954
+pogucam/installation.md,sha256=8qspiLlYjEBx5CedRfBU7Mm0A2pz0lfAnaupZyBm5Eo,128
+pogucam/text_write.py,sha256=hyRyA1M5z-pda963T-k0i8fvvAlv1p3YBTZtYNdOeoE,19304
+pogucam-0.1.7.dist-info/METADATA,sha256=zTstNsYYV4-ctxOPP0aRm1RYxBbTkpuqvBAlN7c07ug,466
+pogucam-0.1.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pogucam-0.1.7.dist-info/entry_points.txt,sha256=-97N0LsXIR8h0rJMzIMuNeNwuY8LvPYPTqnXsuAnVsM,63
+pogucam-0.1.7.dist-info/RECORD,,

pogucam-0.1.5.dist-info/RECORD

@@ -1,8 +0,0 @@
-pogucam/__init__.py,sha256=Iij7VvXCrFPMtTia41mQ7LxFLaulf_fD5cb-AyjpUo0,53
-pogucam/explore_u24_uni.py,sha256=Ff7f3JkeWDRdSI6o52ZBM4JoWxIMnGzxH5NV_Bn0zBI,115676
-pogucam/installation.md,sha256=8qspiLlYjEBx5CedRfBU7Mm0A2pz0lfAnaupZyBm5Eo,128
-pogucam/text_write.py,sha256=hyRyA1M5z-pda963T-k0i8fvvAlv1p3YBTZtYNdOeoE,19304
-pogucam-0.1.5.dist-info/METADATA,sha256=JfsxeA0gE88MO5T_l1siQZ3n_ooLnuXgt-qI0uA90uc,466
-pogucam-0.1.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pogucam-0.1.5.dist-info/entry_points.txt,sha256=-97N0LsXIR8h0rJMzIMuNeNwuY8LvPYPTqnXsuAnVsM,63
-pogucam-0.1.5.dist-info/RECORD,,