Release 7.5.0

Author: navarlu

.github/workflows/build.yml

@@ -33,6 +33,29 @@ jobs:
           name: TinyTouch-linux-x64
           path: dist/TinyTouch-${{ github.ref_name }}-linux-x64.zip
 
+  build-linux-legacy:
+    runs-on: ubuntu-20.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.11"
+      - name: Install deps
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install -r requirements.txt
+      - name: Build (PyInstaller)
+        run: |
+          TINYTOUCH_APP_NAME=TinyTouch-${{ github.ref_name }}-legacy python -m PyInstaller TinyTouch.spec
+      - name: Package
+        run: |
+          cd dist
+          zip -r TinyTouch-${{ github.ref_name }}-linux-x64-legacy.zip TinyTouch-${{ github.ref_name }}-legacy
+      - uses: actions/upload-artifact@v4
+        with:
+          name: TinyTouch-linux-x64-legacy
+          path: dist/TinyTouch-${{ github.ref_name }}-linux-x64-legacy.zip
+
   build-windows:
     runs-on: windows-latest
     steps:
@@ -58,7 +81,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: [build-linux, build-windows]
+    needs: [build-linux, build-linux-legacy, build-windows]
     if: startsWith(github.ref, 'refs/tags/')
     steps:
       - uses: actions/download-artifact@v4
@@ -70,4 +93,5 @@ jobs:
           name: TinyTouch ${{ github.ref_name }}
           files: |
             dist/TinyTouch-linux-x64/TinyTouch-${{ github.ref_name }}-linux-x64.zip
+            dist/TinyTouch-linux-x64-legacy/TinyTouch-${{ github.ref_name }}-linux-x64-legacy.zip
             dist/TinyTouch-windows-x64/TinyTouch-${{ github.ref_name }}-windows-x64.zip

Labeled_data/cat3/data/cat3_last_position.json

@@ -1 +1 @@
-{"frame": 229, "total_frames": 323}
+{"frame": 303, "total_frames": 323}

Labeled_data/cat3/export/cat3_export.csv

@@ -1,17 +1,22 @@
 {
-  "Program Version": "7.3.0 (Linux)",
+  "Program Version": "7.4.0 (Linux)",
   "Video Name": "cat3",
   "Labeling Mode": "Normal",
   "Frame Rate": 25.0,
-  "Zones Covered With Clothes": null,
+  "Zones Covered With Clothes": [
+    "BOX2",
+    "BOX1",
+    "BOX3",
+    "BOX4"
+  ],
   "Param Labels": {
-    "Parameter_1": "P1",
+    "Parameter_1": "Looking1",
     "Parameter_2": "P2",
     "Parameter_3": "P3"
   },
   "Limb Param Labels": {
-    "XX_Parameter_1": "Looking",
+    "XX_Parameter_1": "LP1",
     "XX_Parameter_2": "LP2",
-    "XX_Parameter_3": "LP34"
+    "XX_Parameter_3": "LP3"
   }
 }

Labeled_data/cat3/export/cat3_metadata.json

@@ -1,16 +1,15 @@
 {
-  "diagram_scale": 1.5,
-  "dot_size": 20.0,
+  "diagram_scale": 1.0,
+  "dot_size": 10.0,
   "new_template": false,
   "minimal_touch_length": 280,
-  "parameter1": "P1",
+  "parameter1": "Looking1",
   "parameter2": "P2",
   "parameter3": "P3",
-  "limb_parameter1": "Looking",
+  "limb_parameter1": "LP1",
   "limb_parameter2": "LP2",
-  "limb_parameter3": "LP34",
-  "max_display_width": 1080,
-  "max_display_height": 920,
+  "limb_parameter3": "LP3",
+  "video_downscale": 1.0,
   "perf_enabled": false,
   "perf_log_every_s": 2.0,
   "perf_log_top_n": 6

config.json

@@ -11,6 +11,7 @@ class ClothApp:
     def __init__(
         self,
         master,
+        on_save_callback,
         on_close_callback,
         initial_points=None,
         diagram_scale=DEFAULT_CLOTH_DIAGRAM_SCALE,
@@ -19,12 +20,25 @@ def __init__(
         # Vytvoření nového okna pomocí Toplevel
         self.top_level = tk.Toplevel(master)
         self.top_level.title("Clothes App")
+        self.on_save_callback = on_save_callback
         self.on_close_callback = on_close_callback
         self.diagram_scale = float(diagram_scale)
         self.dot_radius = int(dot_radius)
 
+        self.controls = tk.Frame(self.top_level, bg='lightgrey')
+        self.controls.grid(row=0, column=0, sticky="ew", padx=10, pady=(10, 0))
+        self.controls.columnconfigure(0, weight=1)
+
+        save_btn = tk.Button(self.controls, text="Save", command=self.on_save)
+        save_btn.pack(side="left", padx=5)
+
+        save_close_btn = tk.Button(self.controls, text="Save & Close", command=self.on_close)
+        save_close_btn.pack(side="left", padx=5)
+
         self.f = tk.Frame(self.top_level, bg='lightgrey')
         self.f.grid(row=1, column=0, sticky="nsew")
+        self.top_level.columnconfigure(0, weight=1)
+        self.top_level.rowconfigure(1, weight=1)
 
         self.dots = {}
         self.img = Image.open(resource_path("icons/diagram.png"))
@@ -45,13 +59,20 @@ def __init__(
             for x, y in initial_points:
                 self._create_dot(x, y)
 
+        self.top_level.update_idletasks()
+        controls_h = self.controls.winfo_reqheight()
         win_w = self.img.width + 20
-        win_h = self.img.height + 20
+        win_h = self.img.height + 20 + controls_h + 10
         self.top_level.geometry(f"{win_w}x{win_h}")
 
+    def on_save(self):
+        if self.on_save_callback:
+            self.on_save_callback(self.dots, self.diagram_scale)
+
     def on_close(self):
         # Callback with dots data on close
-        self.on_close_callback(self.dots, self.diagram_scale)
+        if self.on_close_callback:
+            self.on_close_callback(self.dots, self.diagram_scale)
         self.top_level.destroy()
 
     def _create_dot(self, x, y):

src/cloth_app.py

@@ -84,6 +84,20 @@ def load_display_limits():
         return max_w, max_h
 
 
+def load_video_downscale():
+    config_path = _ensure_config_file()
+    with open(config_path, 'r') as file:
+        config = json.load(file)
+        raw = config.get('video_downscale', 1.0)
+        try:
+            scale = float(raw)
+        except Exception:
+            scale = 1.0
+        if scale <= 0:
+            scale = 1.0
+        return scale
+
+
 def load_parameter_names_into(video_obj, par_buttons, limb_par_buttons):
     """
     Sets names onto the video object and updates the buttons' labels.

src/config_utils.py

@@ -42,7 +42,8 @@ def write_export_metadata(meta_path: str,
                           frame_rate,
                           clothes_list,
                           param_labels: dict | None = None,
-                          limb_param_labels: dict | None = None) -> None:
+                          limb_param_labels: dict | None = None,
+                          labeling_time_seconds: float | None = None) -> None:
     """
     Writes a JSON sidecar with all non-tabular export metadata that used to be
     stuffed into the first 5 lines of *_export.csv.
@@ -56,6 +57,8 @@ def write_export_metadata(meta_path: str,
         "Param Labels": param_labels or {},
         "Limb Param Labels": limb_param_labels or {},
     }
+    if labeling_time_seconds is not None:
+        meta["Total Labeling Time (hours)"] = round(float(labeling_time_seconds) / 3600.0, 4)
     os.makedirs(os.path.dirname(meta_path), exist_ok=True)
     with open(meta_path, "w", encoding="utf-8") as f:
         json.dump(meta, f, indent=2, ensure_ascii=False)
@@ -386,7 +389,6 @@ def _xy_str(lst):
             row[f"{limb}_X"] = _xy_str(rec.get("X", []))
             row[f"{limb}_Y"] = _xy_str(rec.get("Y", []))
             row[f"{limb}_Onset"] = rec.get("Onset", "")
-            row[f"{limb}_Look"] = rec.get("Look", "")
             row[f"{limb}_Zones"] = json.dumps(rec.get("Zones", []) or [])
 
         # Global params (canonical keys → fixed columns)
@@ -409,7 +411,7 @@ def _xy_str(lst):
     # Exact legacy column order
     cols = ["Frame", "Time_ms"]
     for limb in ["LH", "LL", "RH", "RL"]:
-        cols += [f"{limb}_X", f"{limb}_Y", f"{limb}_Onset", f"{limb}_Look", f"{limb}_Zones"]
+        cols += [f"{limb}_X", f"{limb}_Y", f"{limb}_Onset", f"{limb}_Zones"]
     cols += ["Parameter_1", "Parameter_2", "Parameter_3"]
     for limb in ["LH", "LL", "RH", "RL"]:
         cols += [f"{limb}_Parameter_1", f"{limb}_Parameter_2", f"{limb}_Parameter_3"]
@@ -630,10 +632,8 @@ def merge_and_flip_export(
             if col not in merged_df.columns:
                 merged_df[col] = None
 
-    # normalize look columns
-    for limb in ['LH', 'LL', 'RH', 'RL']:
-        merged_df = merged_df.drop([c for c in merged_df.columns if c == f'{limb}_Look_x'], axis=1)
-        merged_df = merged_df.rename(columns={f'{limb}_Look_y': f'{limb}_Look_x'})
+    # Drop legacy Look columns (no longer used in exports).
+    merged_df = merged_df.drop(columns=[c for c in merged_df.columns if "_Look" in c], errors="ignore")
 
     merged_df = merged_df.drop_duplicates(subset=['Frame'])
     merged_df = merged_df.drop([c for c in merged_df.columns if c.endswith('_y')], axis=1)