bugfixes4

Author: navarlu

.gitattributes

@@ -1,4 +1,5 @@
 LabelingApplication4_1_new_template.exe filter=lfs diff=lfs merge=lfs -text
 LabelingApplication4_1.exe filter=lfs diff=lfs merge=lfs -text
 LabelingApplication5_3.exe filter=lfs diff=lfs merge=lfs -text
+LabelingApplication5_5.exe filter=lfs diff=lfs merge=lfs -text
 *.exe filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -19,10 +19,10 @@ flagged/
 !Videos/cat3_mp4.mp4
 Videos/videoplayback.mp4
 # Include the Labeled_data folder and its contents
-!Labeled_data/
-!Labeled_data/cat3_mp4/
-Labeled_data/videoplayback/
+Labeled_data/cat3_mp4_reliability/**
+Labeled_data/videoplayback/**
 
+!Labeled_data/cat3_mp4/
 
 # Ignore config and environment files
 

Labeled_data/cat3_mp4/data/cat3_mp4_limb_parameters.csv

@@ -2,5 +2,7 @@ Limb,Frame,Parameter,State
 RH,8,Parameter_1,ON
 RH,16,Parameter_1,OFF
 RH,9,Parameter_1,
+RH,28,Parameter_1,ON
+RH,60,Parameter_1,ON
 LH,78,Parameter_2,ON
 LH,78,Parameter_3,OFF

Labeled_data/cat3_mp4/data/cat3_mp4parameter_1.csv

@@ -1,3 +1,8 @@
 Frame,State
 78,ON
 9,ON
+23,OFF
+28,ON
+29,OFF
+11,ON
+12,OFF

Labeled_data/cat3_mp4/data/cat3_mp4parameter_3.csv

@@ -0,0 +1,2 @@
+Frame,State
+31,

Labeled_data/cat3_mp4/export/cat3_mp4_export.csv

@@ -2,7 +2,7 @@ Program Version: 5.4
 Video Name: cat3_mp4
 Labeling Mode: Normal
 Frame Rate: 25.0
-Zones Covered With Clothes: ['BOX2', 'BOX1', 'BOX4', 'BOX5', 'BOX3', 'BOX6']
+Zones Covered With Clothes: ['BOX4', 'BOX3', 'BOX2', 'BOX1', 'BOX5', 'BOX6']
 Limb Parameter 1: Looking
 Limb Parameter 2: LP2
 Limb Parameter 3: LP3
@@ -22,8 +22,8 @@ Frame,LH_X,LH_Y,LH_Onset,LH_Bodypart,LH_Look,LH_Zones,LL_X,LL_Y,LL_Onset,LL_Body
 8,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,ON,,,,,,
 9,,,,,,[],,,,,,[],,,,,,[],,,,,,[],ON,,,,,,,,,,,,,,,
 10,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
-11,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
-12,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
+11,,,,,,[],,,,,,[],,,,,,[],,,,,,[],ON,,,,,,,,,,,,,,,
+12,,,,,,[],,,,,,[],,,,,,[],,,,,,[],OFF,,,,,,,,,,,,,,,
 13,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 14,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 15,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
@@ -34,13 +34,13 @@ Frame,LH_X,LH_Y,LH_Onset,LH_Bodypart,LH_Look,LH_Zones,LL_X,LL_Y,LL_Onset,LL_Body
 20,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 21,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 22,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
-23,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
+23,,,,,,[],,,,,,[],,,,,,[],,,,,,[],OFF,,,,,,,,,,,,,,,
 24,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 25,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 26,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 27,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
-28,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
-29,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
+28,,,,,,[],,,,,,[],,,,,,[],,,,,,[],ON,,,,,,,,,ON,,,,,,
+29,,,,,,[],,,,,,[],,,,,,[],,,,,,[],OFF,,,,,,,,,,,,,,,
 30,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 31,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 32,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
@@ -71,7 +71,7 @@ Frame,LH_X,LH_Y,LH_Onset,LH_Bodypart,LH_Look,LH_Zones,LL_X,LL_Y,LL_Onset,LL_Body
 57,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 58,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 59,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
-60,308.0,322.0,On,LH,No,"[""9R""]",,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
+60,308.0,322.0,On,LH,No,"[""9R""]",,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,ON,,,,,,
 61,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 62,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,
 63,,,,,,[],,,,,,[],,,,,,[],,,,,,[],,,,,,,,,,,,,,,,

LabelingApplication5_3.exe

@@ -0,0 +1,38 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+
+a = Analysis(
+    ['main.py'],
+    pathex=[],
+    binaries=[],
+    datas=[],
+    hiddenimports=[],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    noarchive=False,
+    optimize=0,
+)
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.datas,
+    [],
+    name='LabelingApplication5_5',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    runtime_tmpdir=None,
+    console=True,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+)

LabelingApplication5_5.spec

@@ -1,4 +1,4 @@
-# Self-contact Coding Application version 5.3
+# Self-contact Coding Application version 5.5
 
 ## Introduction
 

README.md

@@ -32,7 +32,8 @@
 #bigger entry for notes?
 #typo in loading parameter names
 #loading button fix
-
+#update readme with looking btn change
+#delete looking from export
 #guide na zacatku
 #deleting confidential data
 #indication of saving
@@ -119,7 +120,7 @@ def __init__(self, video_path):
         self.parameter_button2_state_dict = {}
         self.parameter_button3_state_dict = {}
         self.dataNotes_path_to_csv = None
-        self.program_version = 5.4
+        self.program_version = 5.5
         print("INFO: Program version:", self.program_version)
         self.parameter1_name = None
         self.parameter2_name = None
@@ -443,7 +444,9 @@ def on_middle_click(self, event=None):
 
             if closest_index is not None:
                 del details['xy'][closest_index]  # Remove the coordinate
-
+                print(f"DEBUG: Deleting zone: {details['Zone'][closest_index]}")
+                del details['Zone'][closest_index]
+                
                 if not details['xy']:  
                     del limb_data[current_frame]  # Remove frame entry if empty
 
@@ -913,6 +916,7 @@ def display_first_frame(self, frame_number=None):
         self.update_note_entry()
         self.update_frame_counter()
         self.update_limb_parameter_buttons()
+        self.update_button_colors()
         #self.draw_timeline()
         #self.draw_timeline2()