pogucam 0.1.14__py3-none-any.whl → 0.1.15__py3-none-any.whl

pogucam/explore_u24_uni.py

@@ -91,8 +91,8 @@ import datetime as dt
 import cv2
 import threading
 
-
-
+import glob # look for bg fg
+import shutil
 
 istrip = 0
 UPDATE_INTERVAL = 1
@@ -104,6 +104,69 @@ FILE_USERPASS = "~/.config/flashcam/.flashcam_upw"  # will extend
 FILE_REDCROSS0 = "~/.config/pogucam/crossred"  # will extend
 FILE_REDCROSS = "~/.config/pogucam/crossred"  # will extend
 
+
+
+
+
+# ================================================================================
+#
+# --------------------------------------------------------------------------------
+
+
+# ================================================================================
+#
+# --------------------------------------------------------------------------------
+
+
+# ================================================================================
+#
+# --------------------------------------------------------------------------------
+
+
+# ================================================================================
+#
+# --------------------------------------------------------------------------------
+
+
+# def parse_timestamp_in_saved_file(filename):
+#     # Extract timestamp part YYmmdd_HHMMSS.ff from filename
+#     parts = filename.split('_')
+#     if len(parts) < 5:
+#         return None
+#     timestamp_str = parts[3] + '_' + parts[4]  # YYmmdd_HHMMSS.ff
+#     try:
+#         # Parse ignoring fractional seconds for sorting
+#         dt = datetime.strptime(timestamp_str.split('.')[0], "%Y%m%d_%H%M%S")
+#         return dt
+#     except ValueError:
+#         return None
+
+def find_latest_bg_or_fg(new_name, foreground=False):
+    #
+    tag = "background"
+    if foreground:
+        tag = "foreground"
+    base, ext = os.path.splitext(new_name) #
+    parts = base.split('_')
+    pattern = f"{parts[0]}_{parts[1]}_{parts[2]}_"
+    copyfile = f"{pattern}{tag}{ext}"
+    #if not base.endswith(tag):
+    #    print("Filename must end with '_background' before extension")
+    #    return
+    #base_prefix = base[:-11]  # remove '_background'
+    pattern2 = f"{pattern}20*{ext}" # 20ieth century
+    files = glob.glob(pattern2)
+    lastfile = None
+    if not files:
+        print("D... No matching files found for", pattern2)
+    else:
+        lastfile = sorted(files)[-1]
+        print(f"D... {len(files)} possible files" , lastfile)
+    if lastfile is None: print(f"{fg.red}X... no suitable saved file for {tag} ", fg.default)
+    return lastfile,copyfile
+
+
+
 # ================================================================================
 # RA    "00 12 45.2"
 # --------------------------------------------------------------------------------
@@ -588,7 +651,14 @@ class StreamWidget(QLabel):
         # -------------------------------------------------
         #self.level2_buffer = None
         #self.level2_buffer_max_size = 10
-
+        #---------------------------------------------
+        self.filename_background = None
+        self.filename_foreground = None
+        self.image_background = None
+        self.image_foreground = None
+        self.l_timelaps = False
+        self.l_timelaps_seconds = 16 # initial 2^4
+        self.l_timelaps_last = dt.datetime.now() #
         # --------------------------------- I put it at the end so that it knows all attributes
         self.update_image()
 
@@ -613,7 +683,8 @@ class StreamWidget(QLabel):
         #print(self.internet_not_device, self.internet_not_device)
         # -------------------------------------------------------------- ACCUM -----------------
         if self.internet_not_device:
-            # every internet call do here
+            #### every internet call do here
+            ####  but skip anyting with ACCUM ACCUMTXT !!!!!!!!
             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
@@ -622,7 +693,7 @@ class StreamWidget(QLabel):
                 if val == 0: val = 1 # trying to fix
                 if len(self.FABuffer) != val and val > 0:
                     self.FABuffer.set_max_frames(val)
-            else:
+            else:#### HERE REALLY ######--------------------------------------------------
                 post_response = requests.post(url=self.post_addr, data=data )
         else:
             # ---------------------------------------------------------  JUST LOCAL DEVICE ----------------
@@ -965,7 +1036,7 @@ class StreamWidget(QLabel):
         SAV = f"      "
         if self.saving_all:
             SAV = f"SAVING"
-        LAPS = f"LOO:{self.saving_laps:3d}"
+        LAPS = f"LAPS:{self.saving_laps:3d}"
         #
         FIT = f"        "
         if self.saving_fits_only:
@@ -988,6 +1059,10 @@ class StreamWidget(QLabel):
                 bufshow = "(SUM)"
         else:
             bufshow = "(   )"
+        bgfg1 = "  "
+        bgfg2 = "  "
+        if self.image_foreground is not None: bgfg1 = "FG"
+        if self.image_background is not None: bgfg2 = "BG"
 
         BUF = f"BUF{bufshow}={cur_size:3d}/{max_size:3d} {total_size/1024/1024:5.0f} MB"
         #
@@ -995,9 +1070,11 @@ class StreamWidget(QLabel):
         #
         #overtext = f"{self.frame_time} # {self.frame_num} # {self.l_frame_num:6d} #  {RXT} . {ZOO} . {ROO} . {LGA} . {SAV} {FIT} . {BUF}. {LAPS}"
         # SAVING is already red
-        overtext = f"{self.frame_time} # {self.frame_num} # {self.l_frame_num:6d} #  {RXT} . {ZOO} . {ROO} . {LGA} . {FIT} . {BUF}. {LAPS}"
+        #overtext = f"{self.frame_time} # {self.frame_num} # {self.l_frame_num:6d} #  {RXT} . {ZOO} . {ROO} . {LGA} . {FIT} . {BUF}. {LAPS}"
         # ROTATE IS LOCAL
-        overtext = f"{self.frame_time} # {self.frame_num} # {self.l_frame_num:6d} #  {RXT} . {ZOO} .  {LGA} . {FIT} . {BUF}. {LAPS}"
+        #overtext = f"{self.frame_time} # {self.frame_num} # {self.l_frame_num:6d} #  {RXT} . {ZOO} .  {LGA} . {FIT} . {BUF}. {LAPS}"
+        # I add BG-FG
+        overtext = f"{self.frame_time} # {self.frame_num} # {self.l_frame_num:6d} #  {RXT} . {ZOO} .  {LGA} . {FIT} . {bgfg1}{bgfg2} . {BUF}. {LAPS}"
         #
         position = ( 0, selfimg.shape[0]-1 ) # 480 on x-axis
         #
@@ -1032,6 +1109,7 @@ class StreamWidget(QLabel):
     # ----------------------------------------------------------------------
 
     def prepare_save(self, png=False, time_tag=None):
+        #   .....   self.saving_fits_only is not necessary, handled elsewhere
         dir2create = os.path.expanduser("~/DATA/")
         if not os.path.isdir(os.path.expanduser(dir2create)):
             print(f"D... trying to create directory {dir2create} for saving")
@@ -1039,12 +1117,13 @@ class StreamWidget(QLabel):
             os.mkdir(os.path.expanduser(dir2create))
         now = time_tag
         if time_tag is None:
-            now = dt.datetime.now().strftime( '%Y%m%d_%H%M%S_%f')[:-4]
+            now = dt.datetime.now().strftime( '%Y%m%d_%H%M%S.%f')[:-4]  # dot fraction - should be conform with other parts
         else:
             # 20:23:46.12
             now = dt.datetime.now().strftime( '%Y%m%d_')+now.replace(":", "")
         ext = "jpg"
         if png:ext = "png"
+        #if self.saving_fits_only:ext = "fits" # not necessary here...
         host = socket.gethostname()
         murl = ""
         if self.url.find("http://") >= 0:
@@ -1160,7 +1239,9 @@ class StreamWidget(QLabel):
         dumpbuffer:
         use_buffer is None OR THE BUFFER TO USE (level2)
         """
-        fname1 = self.prepare_save( time_tag=time_tag)
+        fname1 = fname
+        if fname is None:
+            fname1 = self.prepare_save( time_tag=time_tag)
         if not silent: print(fname1)
         #---------- FITS *****
         if use_fits: # --------- FITS CASE --- more complex -------------------------------
@@ -1516,6 +1597,12 @@ class StreamWidget(QLabel):
         ret_val = False
         if True:# self.img.shape == self.frame.shape:
             self.img = self.frame.copy()
+            if not self.image_background is None:
+                #self.img = self.img - self.image_background
+                self.img = cv2.subtract(self.img , self.image_background )
+            if not self.image_foreground is None:
+                #self.img = self.img + self.image_foreground
+                self.img = 0.5*self.img + 0.5*self.image_foreground
             if stripes: # These are thin gray
                 #self.vcr_pal_style(["NO SIGNAL"])
                 for y in range(0, self.img.shape[0], 16):
@@ -1989,9 +2076,15 @@ class StreamWidget(QLabel):
             #         print(fg.red, f"L{self.saving_laps}{fitag}", fg.default, end="")
             #         self.saving_laps_last_save = now
             #         self.save_img( time_tag=self.frame_time  , savingjpg=False) #
-
+            DO_TIMELAPS = False
+            if self.l_timelaps:
+                if dt.datetime.now() > self.l_timelaps_last + dt.timedelta(seconds=self.l_timelaps_seconds):
+                    print(f"\ni... {fg.cyan} TIMELAPS saving now {fg.default} ... every {fg.orange} {self.l_timelaps_seconds} s. {fg.defaiult}")
+                    self.l_timelaps_last = dt.datetime.now()
+                    DO_TIMELAPS = True
             # ---- just save once -------------------- ************  "s" ***********
-            if self.saving_once:
+            if self.saving_once or DO_TIMELAPS:
+                DO_TIMELAPS = False
                 # jpg and NO AVG --------- No difference show_accum_not_showaccum if frabuffer ==1
                 if (len(self.FABuffer) < 2)    and (not self.l_show_accum) and (not self.saving_fits_only):
                     # no bufffer no loopshow no fits
@@ -2068,6 +2161,7 @@ class StreamWidget(QLabel):
 
 
             # ----  save ALL  -----------------  -------------------------------------------- ************  "shift-s" ***********
+            #
             # ----  save ALL  -----------------  -------------------------------------------- ************  "shift-s" ***********
             if self.saving_all: # ---------------  Shift-S-------    ALWAYS PUT RED
 
@@ -2260,20 +2354,26 @@ class StreamWidget(QLabel):
                         print('kstars  (but press revert)')
                         print()
                 elif (parts_set == {'Ctrl'}) :
-                    self.saving_fits_only = not self.saving_fits_only
-                    self.saving_all = False
-                    if self.saving_fits_only:
-                        print(f"i...  {fg.orange}FITS_ONLY set to {self.saving_fits_only}{fg.default} (interval is {self.FITS_INTERVAL_SECONDS}) ;  but 'SAVING_all' SET TO ", self.saving_all)
-                    else:
-                        print(f"i...  FITS_ONLY set to {fg.cyan}{self.saving_fits_only}{fg.default} (interval is {self.FITS_INTERVAL_SECONDS}) ;  but 'SAVING_all' SET TO ", self.saving_all)
+                    pass
 
                 elif (parts_set == {'Ctrl', 'Shift'}) :
+                    # --------------
                     self.saving_jpg = not self.saving_jpg
                     self.saving_all = False
                     if self.saving_jpg:
                         print(f"i...  {fg.green}SAVING_JPG set to {self.saving_jpg}{fg.default} (interval is {self.FITS_INTERVAL_SECONDS}) ;  but 'SAVING_all' SET TO ", self.saving_all)
                     else:
                         print(f"i...  {fg.orange}PNG!{fg.default} SAVING_JPG set to {fg.cyan}{self.saving_jpg}{fg.default} (interval is {self.FITS_INTERVAL_SECONDS}) ;  but 'SAVING_all' SET TO ", self.saving_all)
+                elif (parts_set == {'Alt'}) :
+                    #   FITS / JPEG saving !!!
+                    self.saving_fits_only = not self.saving_fits_only
+                    self.saving_all = False
+                    if self.saving_fits_only:
+                        print(f"i...  {fg.orange}FITS_ONLY set to {self.saving_fits_only}{fg.default} (interval is {self.FITS_INTERVAL_SECONDS}) ;  but 'SAVING_all' SET TO ", self.saving_all)
+                    else:
+                        print(f"i...  FITS_ONLY set to {fg.cyan}{self.saving_fits_only}{fg.default} (interval is {self.FITS_INTERVAL_SECONDS}) ;  but 'SAVING_all' SET TO ", self.saving_all)
+
+
 
             # ------------------------------   xtend x2 ot switchres resolution---   x  XRES SWITCH - REMOTE - **SEND_COMMAND**
             if (key == Qt.Key.Key_X):
@@ -2463,7 +2563,7 @@ class StreamWidget(QLabel):
                 elif (parts_set == {'Ctrl'}) :
                     print( "i... reset position red cross")
                     self.redcross = [0, 0]
-            # -----------------------------------------------------------------   i   integrate accumulate - LOCAL ONLY ! **SEND_COMMAND**
+            # -----------------------------------------------------------------   i   integrate accumulate - LOCAL ONLY !  tricky**SEND_COMMAND**
             if (key == Qt.Key.Key_I):    #    i:inc   shift-i:dec   Ctrl-i:reset    Ctrl-Shift-i:watch     Alt-i: SUM vs. AVG
                 #   4.6GB / 1000 640x480
                 if ( len(parts_set) == 0):
@@ -2505,18 +2605,49 @@ class StreamWidget(QLabel):
             # -----------------------------------------------------------------   b BACKGROUND - REMOTE **SEND_COMMAND**
             if (key == Qt.Key.Key_B):
                 if ( len(parts_set) == 0):
-                    self.send_command( data= {"subbg": "SUBBG"})
+                    #self.send_command( data= {"subbg": "SUBBG"})
+                    fname1 = self.prepare_save( time_tag=None)
+                    #print(fg.green, f"D... looking for like {fname1}", fg.default)
+                    bgfilename, copyname= find_latest_bg_or_fg(fname1, foreground=False)
+                    self.filename_background = copyname
+                    if os.path.exists(self.filename_background):
+                        print(f"{fg.green}D... BG= {self.filename_background}", fg.default)
+                        self.image_background = cv2.imread(self.filename_background)
+                    pass
                 elif (parts_set == {'Shift'}) :
-                    self.send_command( data= {"savebg": "SAVEBG"})
+                    fname1 = self.prepare_save( time_tag=None)
+                    #print(fg.green, f"D... looking for like {fname1}", fg.default)
+                    bgfilename, copyname= find_latest_bg_or_fg(fname1, foreground=False)
+                    if not bgfilename is None:
+                        print(f"{fg.green}D... copying:", bgfilename, copyname, fg.default)
+                        shutil.copy(bgfilename, copyname)
+                    #self.send_command( data= {"savebg": "SAVEBG"})
+                    pass
                 elif (parts_set == {'Ctrl'}) :
+                    self.filename_background = None
+                    self.image_background = None
                     pass
-            # -----------------------------------------------------------------   f FOREGROUND - REMOTE **SEND_COMMAND**
+            # -----------------------------------------------------------------   f FOREGROUND - LOCAL ONLY !
             if (key == Qt.Key.Key_F):
                 if ( len(parts_set) == 0):
-                    self.send_command( data= {"mixfg": "MIXFG"})
+                    #self.send_command( data= {"mixfg": "MIXFG"})
+                    fname1 = self.prepare_save( time_tag=None)
+                    bgfilename, copyname= find_latest_bg_or_fg(fname1, foreground=True)
+                    self.filename_foreground = copyname
+                    if os.path.exists(self.filename_foreground):
+                        print(f"{fg.green}D... FG= {self.filename_foreground}", fg.default)
+                        self.image_foreground = cv2.imread(self.filename_foreground)
                 elif (parts_set == {'Shift'}) :
-                    self.send_command( data= {"savefg": "SAVEFG"})
+                    #self.send_command( data= {"savefg": "SAVEFG"})
+                    fname1 = self.prepare_save( time_tag=None)
+                    #print(fg.green, f"D... looking for like {fname1}", fg.default)
+                    bgfilename, copyname= find_latest_bg_or_fg(fname1, foreground=True)
+                    if not bgfilename is None:
+                        print(f"{fg.green}D... copying:", bgfilename, copyname, fg.default)
+                        shutil.copy(bgfilename, copyname)
                 elif (parts_set == {'Ctrl'}) :
+                    self.filename_foreground = None
+                    self.image_foreground = None
                     pass
 
             # -----------------------------------------------------------------   r ROTATE - LOCAL ONLY !
@@ -2581,7 +2712,7 @@ class StreamWidget(QLabel):
                     self.setup("q") # quit-resetall
 
 
-            # -----------------------------------------------------------------   t   tests whatever
+            # -----------------------------------------------------------------   [ ]   tests whatever
             if (key == Qt.Key.Key_T):
                 if ( len(parts_set) == 0):
                     #self.send_command( data= {"gaint": "GAINT", "gaintxt": float(0.123)})
@@ -2594,6 +2725,30 @@ class StreamWidget(QLabel):
                 elif (parts_set == {'Ctrl'}) :
                     #self.send_command( data= {"expot": "EXPOT", "expotxt": float(-1.0)})
                     pass
+
+            # -----------------------------------------------------------------   [ ]   tests whatever      A  timelaps LOCAL
+            if (key == Qt.Key.Key_A):
+                if ( len(parts_set) == 0):
+                    self.l_timelaps = True
+                    if self.l_timelaps_seconds == 0:
+                        self.l_timelaps_seconds = 1
+                    else:
+                        self.l_timelaps_seconds = self.l_timelaps_seconds * 2
+                    self.l_timelaps_last = dt.datetime.now()- dt.timedelta(seconds=self.l_timelaps_seconds)
+                    pass
+                elif (parts_set == {'Shift'}) :
+                    if self.l_timelaps_seconds > 1:
+                        self.l_timelaps_seconds = int(self.l_timelaps_seconds / 2)
+                    else:
+                        self.l_timelaps_seconds = 1
+                    self.l_timelaps_last = dt.datetime.now()- dt.timedelta(seconds=self.l_timelaps_seconds)
+                    pass
+                elif (parts_set == {'Ctrl'}) :
+                    self.l_timelaps = False
+                    print(f"{fg.cyan}i... NO TIMELAPS from now {fg.default}")
+                    pass
+                elif (parts_set == {'Alt'}) :
+                    pass
             # -----------------------------------------------------------------   t   tests whatever REMOTE !   **SEND_COMMAND**
             if (key == Qt.Key.Key_T):
                 if ( len(parts_set) == 0):

{pogucam-0.1.14.dist-info → pogucam-0.1.15.dist-info}/METADATA

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

{pogucam-0.1.14.dist-info → pogucam-0.1.15.dist-info}/RECORD

@@ -1,11 +1,11 @@
 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=MtAQ0httaCtSBtYquD1ElXak9k7TC12v-R07kzjQroU,126592
+pogucam/explore_u24_uni.py,sha256=y0YmH_RLhtSlHv3i6g-PvvKeTd1Yx0dylTulncFlSO0,134104
 pogucam/installation.md,sha256=8qspiLlYjEBx5CedRfBU7Mm0A2pz0lfAnaupZyBm5Eo,128
 pogucam/mqimr.py,sha256=f48gTXng5vM-1RiNPXSA-IvAc3y6WMStbvfQ8rUV7l0,1727
 pogucam/mqims.py,sha256=_G8AdfrbTrkIm2MOsq3tFOBYpiD4o58JUIvnZt0Sm7A,3293
 pogucam/text_write.py,sha256=hyRyA1M5z-pda963T-k0i8fvvAlv1p3YBTZtYNdOeoE,19304
-pogucam-0.1.14.dist-info/METADATA,sha256=-0fHR7SySxz9vmujJaNMLUUtDxILCPC_6eAoWUYzruQ,499
-pogucam-0.1.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pogucam-0.1.14.dist-info/entry_points.txt,sha256=-97N0LsXIR8h0rJMzIMuNeNwuY8LvPYPTqnXsuAnVsM,63
-pogucam-0.1.14.dist-info/RECORD,,
+pogucam-0.1.15.dist-info/METADATA,sha256=5TiiypRFdtco8r3Rg1m76MXhsh07vIdK3QrsPQxdX_w,499
+pogucam-0.1.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pogucam-0.1.15.dist-info/entry_points.txt,sha256=-97N0LsXIR8h0rJMzIMuNeNwuY8LvPYPTqnXsuAnVsM,63
+pogucam-0.1.15.dist-info/RECORD,,