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

pogucam/buffers.py

@@ -26,7 +26,7 @@ class FastAccumBuffer:
 
     def add(self, img: np.ndarray, info: dict):
         """
-        inconsistent shape resets the buffer
+        inconsistent shapes reset the buffer
         """
         if img.dtype != np.uint8 or img.shape != self.shape:
             self.shape = img.shape
@@ -74,6 +74,19 @@ class FastAccumBuffer:
         self.previous_sum_frames = curr
         return curr# summed.astype(np.uint8)
 
+    def get_avg_frames(self):
+        """
+        untested averaged frame
+        """
+        if self.count == 0:
+            return None
+        avg = np.mean(self.cube[:self.count].astype(np.float32), axis=0)
+        avg = np.clip(avg, 0, 255).astype(np.uint8)
+        self.previous_sum_frames = avg
+        return avg
+
+
+
     def get_saturated_pixel_count(self):
         return self._saturated_pixel_count
 

pogucam/explore_u24_uni.py

@@ -504,6 +504,7 @@ class StreamWidget(QLabel):
         #self.accum_buffer = None   #
         #self.accum_image = None    #
         self.l_show_accum = False  # THIS MUST BE KEPT
+        self.l_show_accum_avg = False
         # ---- np stak-------------------------------------
         #self.accum_buffer_size = 0 #
         #self.accum_count = 0       # actual number of img in buff
@@ -535,9 +536,15 @@ class StreamWidget(QLabel):
         #print(self.internet_not_device, self.internet_not_device)
         # -------------------------------------------------------------- ACCUM -----------------
         if self.internet_not_device:
+            # every internet call do here
             if ('accumtxt' in data) and int(data['accumtxt']) == 1:   # skip Loop 1
                 print("D... LOOP 1 skipped for remote send command - for some reason I send out 0 only,not 1")
                 pass
+            elif ('accumtxt' in data): # NO ACCUM REMOTE !!!!!!!!!!! ??? test
+                val = int(data['accumtxt']) # SIZE OF THE BUFFER
+                if val == 0: val = 1 # trying to fix
+                if len(self.FABuffer) != val and val > 0:
+                    self.FABuffer.set_max_frames(val)
             else:
                 post_response = requests.post(url=self.post_addr, data=data )
         else:
@@ -859,14 +866,18 @@ class StreamWidget(QLabel):
     #                               OVERTEXT
     # --------------------------------------------------------------------------------
 
-    def overtext(self, blackbar=False):
+    def overtext(self, blackbar=False, image=None):
         """
         great font for small numbers
         """
         #
         #
         #
-        if self.img is None:
+        selfimg = image
+        if selfimg is None:
+            selfimg = self.img
+        # ---------------------------
+        if selfimg is None:
             return
         RXT = f"XT:{self.r_xtend}" #  CC LU ... for remote ok
         ZOO = f"ZOO:{self.zoomme:3.1f}"
@@ -895,30 +906,30 @@ 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.img.shape[0]-1 ) # 480 on x-axis
+        position = ( 0, selfimg.shape[0]-1 ) # 480 on x-axis
         #
 
         if blackbar:
-            overlay = self.img.copy()
+            overlay = selfimg.copy()
             if self.resolution == "1920x1080":
                 shade_height = 20
             else:
                 shade_height = 10
-            height, width = self.img.shape[:2]
+            height, width = selfimg.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.img, 1 - alpha, 0, self.img)
+            cv2.addWeighted(overlay, alpha, selfimg, 1 - alpha, 0, selfimg)
         #
         font = "di"
         if self.resolution == "1920x1080":
             font = "di2"
-        self.img = iprint(self.img, str(overtext), font=font, position=position,color_rgb=(0,255,0) )
+        selfimg = iprint(selfimg, str(overtext), font=font, position=position,color_rgb=(0,255,0) )
         if self.SAVED_NOW:
-            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
-
+            position = (  selfimg.shape[1] - 20, selfimg.shape[0]-1 ) # 480 on x-axis
+            selfimg = iprint(selfimg, f"SAVE", font=font, position=position,color_rgb=(0,0,255) ) # bgr
+        self.img = selfimg
         #self.img = iprint(self.img, str(overtext), font="p7", position=position,color_rgb=(0,255,0) )
 
 
@@ -1106,6 +1117,8 @@ class StreamWidget(QLabel):
                     mycnt += 1
                     fff = fname1.replace(".jpg", f"_{mycnt:03d}.jpg")
                     print(fff)
+                    if self.flag_print_over:
+                        self.overtext(blackbar=True) # ---- after ACCUM ------------------  img should be tagged
                     if self.saving_jpg:
                         cv2.imwrite(fff, i, [int(cv2.IMWRITE_JPEG_QUALITY), 90])
                     else:
@@ -1665,11 +1678,14 @@ class StreamWidget(QLabel):
             #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
 
-            # showing or NOT the average image
+            # showing or NOT the average image   ************* SHO@WING *********** SHOWING **********
             if self.l_show_accum and (len(self.FABuffer) > 1):# and (len(self.accum_buffer) > 1):
                 rimg = None
                 if self.FABuffer.new_sum_available():
-                    rimg = self.FABuffer.get_sum_frames()#_mean_accum_buffer()
+                    if self.l_show_accum_avg:
+                        rimg = self.FABuffer.get_avg_frames()#_mean_accum_buffer()
+                    else:
+                        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:
@@ -1679,8 +1695,10 @@ class StreamWidget(QLabel):
                     self.img = rimg
                     #### self.overtext(blackbar=True) # applies on img
 
+            if self.saving_all: #
+                self.SAVED_NOW = True
             if self.flag_print_over:
-                self.overtext(blackbar=True) #
+                self.overtext(blackbar=True) # ---- after ACCUM ------------------  img should be tagged
 
 
             # # -- LAPS 1s 10s 60s  but also   accumulated local frames
@@ -1770,6 +1788,7 @@ class StreamWidget(QLabel):
             # ----  save ALL  -----------------  -------------------------------------------- ************  "shift-s" ***********
             # ----  save ALL  -----------------  -------------------------------------------- ************  "shift-s" ***********
             if self.saving_all: # ---------------  Shift-S-------
+
                 # jpg and NO AVG
                 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!
@@ -1845,6 +1864,9 @@ class StreamWidget(QLabel):
                     pass
 
 
+            if self.flag_print_over:
+                ####self.overtext(blackbar=True)
+                self.SAVED_NOW = False  # this is for overtext RED save
 
 
             # ------------------------------------- --------------------   TRANNS OR NOT TRANS
@@ -1862,9 +1884,7 @@ class StreamWidget(QLabel):
             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
@@ -1975,9 +1995,11 @@ class StreamWidget(QLabel):
             if (key == Qt.Key.Key_P):
                 if ( len(parts_set) == 0):
                     self.flag_print = not self.flag_print
+                    print(f"i... termtext: {self.flag_print}")
                     #print("i... flasg print ", self.flag_print)
                 elif (parts_set == {'Shift'}):
                     self.flag_print_over = not self.flag_print_over
+                    print(f"i... overtext: {self.flag_print_over}")
                 elif (parts_set == {'Ctrl'}) :
                     pass
             # -----------------------------------------------------------------   e    expo
@@ -2140,7 +2162,7 @@ class StreamWidget(QLabel):
                     print( "i... reset position red cross")
                     self.redcross = [0, 0]
             # -----------------------------------------------------------------   i   integrate accumulate
-            if (key == Qt.Key.Key_I):
+            if (key == Qt.Key.Key_I):    #    i   shift-i  Ctrl-i   Ctrl-Shift-i    Alt
                 #   4.6GB / 1000 640x480
                 if ( len(parts_set) == 0):
                     if self.r_integrate < 8:
@@ -2172,6 +2194,9 @@ class StreamWidget(QLabel):
                 elif (parts_set == {'Ctrl', 'Shift'}) :
                     self.l_show_accum = not self.l_show_accum
                     print(f"i... ACCUMULATION IS {self.l_show_accum}")
+                elif (parts_set == {'Alt'}) :
+                    self.l_show_accum_avg = not self.l_show_accum_avg
+                    print(f"i... ACCUMULATION AVG/nonSUM IS {self.l_show_accum_avg}")
 
             # -----------------------------------------------------------------   b
             if (key == Qt.Key.Key_B):

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

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

pogucam-0.1.10.dist-info/RECORD

@@ -0,0 +1,9 @@
+pogucam/__init__.py,sha256=Iij7VvXCrFPMtTia41mQ7LxFLaulf_fD5cb-AyjpUo0,53
+pogucam/buffers.py,sha256=1JLkuenkHoA-K-uZAlNV7chHQDZLrspgT5_XOY-E-34,6692
+pogucam/explore_u24_uni.py,sha256=_vyNd_dIpIAKuvqL7st01QX-2pjeRljZ2MEAZxM9lBk,112075
+pogucam/installation.md,sha256=8qspiLlYjEBx5CedRfBU7Mm0A2pz0lfAnaupZyBm5Eo,128
+pogucam/text_write.py,sha256=hyRyA1M5z-pda963T-k0i8fvvAlv1p3YBTZtYNdOeoE,19304
+pogucam-0.1.10.dist-info/METADATA,sha256=-EXEmOf1UXog_njQALCJ-LbZ5edhDC5YXenGmclimuk,467
+pogucam-0.1.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pogucam-0.1.10.dist-info/entry_points.txt,sha256=-97N0LsXIR8h0rJMzIMuNeNwuY8LvPYPTqnXsuAnVsM,63
+pogucam-0.1.10.dist-info/RECORD,,

pogucam-0.1.8.dist-info/RECORD

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