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

pogucam/buffers.py

@@ -10,6 +10,9 @@ class FastAccumBuffer:
         self.shape = shape
         self._init_buffer()
         self._last_retrieved_idx = -1 #???
+        self.previous_sum_frames = None
+        #self._saturated_pixel_count = 0
+        self._saturated_pixel_count = np.zeros(3, dtype=int)
 
     def _init_buffer(self):
         self.cube = np.empty((self.max_frames, *self.shape), dtype=np.uint8)
@@ -17,6 +20,9 @@ class FastAccumBuffer:
         self.idx = 0
         self.count = 0
         self._last_retrieved_idx = -1 #???
+        self.previous_sum_frames = None
+        #self._saturated_pixel_count = 0
+        self._saturated_pixel_count = np.zeros(3, dtype=int)
 
     def add(self, img: np.ndarray, info: dict):
         """
@@ -45,14 +51,31 @@ class FastAccumBuffer:
             return False
         return self.idx != self._last_retrieved_idx # ???
 
+    def get_previous_sum_frames(self):
+        #print("i... prev buffers")
+        return self.previous_sum_frames
+
     def get_sum_frames(self):
         if self.count == 0:
+            self._saturated_pixel_count = 0
             return None
         #print("!... SUM")
         summed = np.sum(self.cube[:self.count].astype(np.uint16), axis=0)
+        saturated_mask = summed > 255#
+        #Count saturation per channel
+        self._saturated_pixel_count = np.array([
+            np.count_nonzero(saturated_mask[:, :, c]) for c in range(3)
+        ])
+        #self._saturated_pixel_count = np.count_nonzero(saturated_mask)
         np.clip(summed, 0, 255, out=summed)
         self._last_retrieved_idx = self.idx # ???
-        return summed.astype(np.uint8)
+        #prev = self.previous_sum_frames
+        curr = summed.astype(np.uint8)
+        self.previous_sum_frames = curr
+        return curr# summed.astype(np.uint8)
+
+    def get_saturated_pixel_count(self):
+        return self._saturated_pixel_count
 
     def get_max_frames(self):
         return self.max_frames

pogucam/explore_u24_uni.py

@@ -467,8 +467,8 @@ class StreamWidget(QLabel):
         self.SAVED_NOW = False # for overtext info
         #
         self.xtended = False # 2x  local
-        self.flag_print = False # terminal \n
-        self.flag_print_over = True # overtext
+        self.flag_print = False # terminal \n OR \r      "P"
+        self.flag_print_over = True # overtext           "S-P"
         self.flag_redcross = False
         self.error = False
         self.zoomme = 1
@@ -508,8 +508,8 @@ class StreamWidget(QLabel):
         #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
+        #self.level2_buffer = None
+        #self.level2_buffer_max_size = 10
 
         # --------------------------------- I put it at the end so that it knows all attributes
         self.update_image()
@@ -542,7 +542,7 @@ class StreamWidget(QLabel):
                 post_response = requests.post(url=self.post_addr, data=data )
         else:
             # ---------------------------------------------------------  JUST LOCAL DEVICE ----------------
-            print("X... no remote IP defined - nothing sent", data)
+            #print("X... no remote IP defined - nothing sent", data)
             #--------------------------- ------------------------------------ACUUMULATE LOCALY
             if ('accumtxt' in data):
                 val = int(data['accumtxt']) # SIZE OF THE BUFFER
@@ -693,7 +693,7 @@ class StreamWidget(QLabel):
         if action == "q": # quit
             self.zoomme = 1
             self.redcross = [0, 0]
-            self.l_gamma = 1
+            self.l_gamma = 1 # local is 1
             self.l_rotate = 0
 
             self.r_integrate = 0
@@ -859,14 +859,14 @@ class StreamWidget(QLabel):
     #                               OVERTEXT
     # --------------------------------------------------------------------------------
 
-    def overttext(self, blackbar=False):
+    def overtext(self, blackbar=False):
         """
         great font for small numbers
         """
         #
         #
         #
-        if self.frame is None:
+        if self.img is None:
             return
         RXT = f"XT:{self.r_xtend}" #  CC LU ... for remote ok
         ZOO = f"ZOO:{self.zoomme:3.1f}"
@@ -895,27 +895,28 @@ class StreamWidget(QLabel):
         #
         overtext = f"{self.frame_time} # {self.frame_num} # {self.l_frame_num:6d} #  {RXT} . {ZOO} . {ROO} . {LGA} . {SAV} {FIT} . {BUF}. {LAPS}"
         #
-        position = ( 0, self.frame.shape[0]-1 ) # 480 on x-axis
+        position = ( 0, self.img.shape[0]-1 ) # 480 on x-axis
         #
 
         if blackbar:
-            overlay = self.frame.copy()
+            overlay = self.img.copy()
             if self.resolution == "1920x1080":
                 shade_height = 20
             else:
                 shade_height = 10
-            height, width = self.frame.shape[:2]
+            height, width = self.img.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)
+            #cv2.addWeighted(overlay, alpha, self.frame, 1 - alpha, 0, self.frame)
+            cv2.addWeighted(overlay, alpha, self.img, 1 - alpha, 0, self.img)
         #
         font = "di"
         if self.resolution == "1920x1080":
             font = "di2"
         self.img = iprint(self.img, str(overtext), font=font, position=position,color_rgb=(0,255,0) )
         if self.SAVED_NOW:
-            position = (  self.frame.shape[1] - 20, self.frame.shape[0]-1 ) # 480 on x-axis
+            position = (  self.img.shape[1] - 20, self.img.shape[0]-1 ) # 480 on x-axis
             self.img = iprint(self.img, f"SAVE", font=font, position=position,color_rgb=(0,0,255) ) # bgr
 
         #self.img = iprint(self.img, str(overtext), font="p7", position=position,color_rgb=(0,255,0) )
@@ -1327,7 +1328,7 @@ class StreamWidget(QLabel):
             print("X.... Timeouted on URLOPEN", end="\n")
         if nopass:
             self.which_error = f"{self.which_error} / NOPASS" # no password file
-        print( f"{str(dt.datetime.now() )[:-4]}---", end="\r")
+        print( f"{str(dt.datetime.now() )[:-4]}....", end="\r")
 
         return stream
 
@@ -1480,7 +1481,7 @@ class StreamWidget(QLabel):
             self.frame_time = self.l_frame_time.strftime("%H:%M:%S.%f")[:-4]
             if not ret:
                 return False
-            print(f" --- {self.frame_time} ; resolution /{self.frame.shape}/  ---- ", end="")
+            print(f" ... {self.frame_time} ; resolution /{self.frame.shape}/  .... ", end="")
 
             avg = self.frame # once per Nx it is AVG
             self.img = avg # normally frame. but sometimes avg == really averaged img!
@@ -1641,11 +1642,10 @@ class StreamWidget(QLabel):
 
 
             # Final transformations before SAVE, you save zoomed------------------TRANNS OR NOT TRANS
+            #    TRANS Before save
             if self.saving_transformed_image:
                 self.img = self.final_transformations( self.img )
-                if self.flag_print_over:
-                    self.overttext() #
-                    self.SAVED_NOW = False  # this is for overtext RED save
+                    #self.SAVED_NOW = False  # this is for overtext RED save # maybe I dont need it
 
             #                  SAVING  organization    HERE
             #                  SAVING  organization    HERE
@@ -1654,9 +1654,9 @@ class StreamWidget(QLabel):
             #                  SAVING  organization    HERE
             #                  SAVING  organization    HERE
 
-            if self.level2_buffer is None:
-                self.level2_buffer = buffers.AccumBuffer(self.img)
-                self.level2_buffer.define_accum_buffer(  self.level2_buffer_max_size  ) # ???
+            #if self.level2_buffer is None:
+            #    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
@@ -1667,11 +1667,20 @@ class StreamWidget(QLabel):
 
             # 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()
+                rimg = None
+                if self.FABuffer.new_sum_available():
+                    rimg = self.FABuffer.get_sum_frames()#_mean_accum_buffer()
+                    #print("\n    new", type(rimg))
+                    print(f"SATURATED: {self.FABuffer.get_saturated_pixel_count()}", end="")
+                else:
+                    rimg = self.FABuffer.get_previous_sum_frames()#_mean_accum_buffer()
+                    #print("\n----pre", type(rimg))
                 if rimg is not None:
                     self.img = rimg
-                    self.overttext(blackbar=True) # applies on img
+                    #### self.overtext(blackbar=True) # applies on img
 
+            if self.flag_print_over:
+                self.overtext(blackbar=True) #
 
 
             # # -- LAPS 1s 10s 60s  but also   accumulated local frames
@@ -1701,7 +1710,7 @@ class StreamWidget(QLabel):
             #         self.saving_laps_last_save = now
             #         self.save_img( time_tag=self.frame_time  , savingjpg=False) #
 
-            # ---- just save once -----------------  -------------------------------------------- ************  "s" ***********
+            # ---- just save once -------------------- ************  "s" ***********
             if self.saving_once:
                 # jpg and NO AVG
                 if (len(self.FABuffer) < 2)    and (not self.l_show_accum) and (not self.saving_fits_only):
@@ -1838,21 +1847,12 @@ class StreamWidget(QLabel):
 
 
 
-
-
-
-
-
-
-
-
-
             # ------------------------------------- --------------------   TRANNS OR NOT TRANS
             if not self.saving_transformed_image:
                 self.img = self.final_transformations( self.img )
                 if self.flag_print_over:
-                    self.overttext()
-                    self.SAVED_NOW = False  # this is for overtext RED save
+                    self.overtext(blackbar=True)
+                    #self.SAVED_NOW = False  # this is for overtext RED save
 
             #
         else:# --- NO IMAGE CREATED ------------------------------- ... make the image gray ...
@@ -1861,6 +1861,11 @@ class StreamWidget(QLabel):
             self.img = cv2.cvtColor(self.img, cv2.COLOR_BGR2GRAY)
             self.img = cv2.cvtColor(self.img, cv2.COLOR_GRAY2BGR) #I want to keep 3 channels
             self.use_frame(stripes=True)# img = self.frame
+
+        if self.flag_print_over:
+            #self.overtext(blackbar=True)
+            self.SAVED_NOW = False  # this is for overtext RED save
+
         #=============================== --------------------- ===================  UPDATE/SHOW
         #=============================== --------------------- ===================  UPDATE/SHOW
         #=============================== --------------------- ===================  UPDATE/SHOW

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

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

pogucam-0.1.8.dist-info/RECORD

@@ -0,0 +1,9 @@
+pogucam/__init__.py,sha256=Iij7VvXCrFPMtTia41mQ7LxFLaulf_fD5cb-AyjpUo0,53
+pogucam/buffers.py,sha256=9nW9W8z3wjaLcfFrZqmsnsowxQOWXTweOuHVjwWWIn8,6368
+pogucam/explore_u24_uni.py,sha256=1_P7_5IYgxIKcTAh5l8FtXXndN162KS59Qlb9m7TQmM,110637
+pogucam/installation.md,sha256=8qspiLlYjEBx5CedRfBU7Mm0A2pz0lfAnaupZyBm5Eo,128
+pogucam/text_write.py,sha256=hyRyA1M5z-pda963T-k0i8fvvAlv1p3YBTZtYNdOeoE,19304
+pogucam-0.1.8.dist-info/METADATA,sha256=Rdr2jXmn_yWxnwj0YagSp4UFtZanb4JMXu_w0SNVnUM,466
+pogucam-0.1.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pogucam-0.1.8.dist-info/entry_points.txt,sha256=-97N0LsXIR8h0rJMzIMuNeNwuY8LvPYPTqnXsuAnVsM,63
+pogucam-0.1.8.dist-info/RECORD,,

pogucam-0.1.7.dist-info/RECORD

@@ -1,9 +0,0 @@
-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,,