Release 7.0

Author: navarlu

.github/workflows/build.yml

@@ -0,0 +1,53 @@
+name: Build TinyTouch
+
+on:
+  workflow_dispatch:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - name: Install deps
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install -r requirements.txt
+      - name: Build (PyInstaller)
+        run: |
+          python -m PyInstaller TinyTouch.spec
+      - name: Package
+        run: |
+          cd dist
+          zip -r TinyTouch-linux-x64.zip TinyTouch
+      - uses: actions/upload-artifact@v4
+        with:
+          name: TinyTouch-linux-x64
+          path: dist/TinyTouch-linux-x64.zip
+
+  build-windows:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - name: Install deps
+        run: |
+          python -m pip install --upgrade pip setuptools wheel
+          pip install -r requirements.txt
+      - name: Build (PyInstaller)
+        run: |
+          python -m PyInstaller TinyTouch.spec
+      - name: Package
+        run: |
+          Compress-Archive -Path dist\\TinyTouch.exe -DestinationPath dist\\TinyTouch-windows-x64.zip
+      - uses: actions/upload-artifact@v4
+        with:
+          name: TinyTouch-windows-x64
+          path: dist/TinyTouch-windows-x64.zip

.gitignore

@@ -41,6 +41,7 @@ Labeled_data/cat3_mp4/data/**
 Thumbs.db
 
 # Ignore virtual environments
+.venv/
 venv/
 .env/
 TinyTouch_env/

Labeled_data/cat3/data/cat3_last_position.json

@@ -1 +1 @@
-{"frame": 307, "total_frames": 323}
+{"frame": 248, "total_frames": 323}

Labeled_data/cat3/export/cat3_metadata.json

@@ -3,7 +3,11 @@
   "Video Name": "cat3",
   "Labeling Mode": "Normal",
   "Frame Rate": 25.0,
-  "Zones Covered With Clothes": null,
+  "Zones Covered With Clothes": [
+    "L",
+    "K",
+    "J"
+  ],
   "Param Labels": {
     "Parameter_1": "P1",
     "Parameter_2": "P2",

README.md

@@ -21,7 +21,7 @@ This application is designed for behavioral researchers to code self-contact (se
 2. Double-click on `LabelingApplicationx_x.exe` to launch the application.
 
 ---
-### Linux Installation
+### Linux Installation
 
 #### Step 1: Clone the Repository
 
@@ -47,9 +47,25 @@ pip install -r requirements.txt
 ```
 #### Step 4: Run the Application
 
-```bash
-python3 src/main.py
-```
+```bash
+python3 src/main.py
+```
+
+---
+### Linux App (single file, PyInstaller)
+
+This produces a single executable you can double-click. Build on Linux only.
+
+```bash
+python3.12 -m venv .venv
+source .venv/bin/activate
+python -m pip install --upgrade pip setuptools wheel
+pip install -r requirements.txt
+python -m PyInstaller TinyTouch.spec
+```
+
+The output binary is in `dist/TinyTouch`. On first launch, `config.json` is copied next to the
+executable so you can edit it without unpacking anything.
 
 ## Application Workflow
 

TinyTouch.spec

@@ -0,0 +1,49 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+import os
+import sys
+
+spec_path = os.path.abspath(sys.argv[0]) if sys.argv else os.path.abspath("TinyTouch.spec")
+project_root = os.path.abspath(os.path.dirname(spec_path))
+src_root = os.path.join(project_root, "src")
+
+datas = [
+    (os.path.join(project_root, "config.json"), "."),
+    (os.path.join(project_root, "icons"), "icons"),
+]
+
+a = Analysis(
+    ["src/main.py"],
+    pathex=[src_root],
+    binaries=[],
+    datas=datas,
+    hiddenimports=[
+        "PIL._tkinter_finder",
+        "PIL._tkinter",
+    ],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    win_no_prefer_redirects=False,
+    win_private_assemblies=False,
+    cipher=None,
+    noarchive=False,
+)
+
+pyz = PYZ(a.pure, a.zipped_data, cipher=None)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    a.binaries,
+    a.datas,
+    [],
+    name="TinyTouch",
+    console=True,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+)

src/analysis.py

@@ -12,6 +12,8 @@
 import plotly.graph_objects as go
 from plotly.subplots import make_subplots
 
+from config_utils import load_config
+from resource_utils import resource_path
 
 LIMBS = ["LH", "RH", "LL", "RL"]
 
@@ -505,8 +507,7 @@ def _create_touch_duration_histogram(touch_durations_list, frame_rate, limbs, ou
 
 def _read_new_template_flag():
     try:
-        with open("config.json", "r") as f:
-            cfg = json.load(f)
+        cfg = load_config()
         return bool(cfg.get("new_template", False))
     except Exception:
         return False
@@ -519,7 +520,7 @@ def _zone_sort_key(zone: str):
 
 
 def _get_zone_list(new_template: bool):
-    zones_dir = "icons/zones3_new_template" if new_template else "icons/zones3"
+    zones_dir = resource_path("icons/zones3_new_template" if new_template else "icons/zones3")
     zones = []
     try:
         for filename in os.listdir(zones_dir):
@@ -597,17 +598,17 @@ def do_analysis(folder_path, output_folder, name, debug, frame_rate):
 
     if new_template:
         image_paths = [
-            "icons/LH_new_template.png",
-            "icons/RH_new_template.png",
-            "icons/LL_new_template.png",
-            "icons/RL_new_template.png",
+            resource_path("icons/LH_new_template.png"),
+            resource_path("icons/RH_new_template.png"),
+            resource_path("icons/LL_new_template.png"),
+            resource_path("icons/RL_new_template.png"),
         ]
     else:
         image_paths = [
-            "icons/LH.png",
-            "icons/RH.png",
-            "icons/LL.png",
-            "icons/RL.png",
+            resource_path("icons/LH.png"),
+            resource_path("icons/RH.png"),
+            resource_path("icons/LL.png"),
+            resource_path("icons/RL.png"),
         ]
     _plot_touch_visualization_all_4(limb_rows, image_paths, output_folder)
 

src/cloth_app.py

@@ -1,38 +1,72 @@
 import tkinter as tk
 from PIL import Image, ImageTk
 
+from resource_utils import resource_path
+
+DEFAULT_CLOTH_DIAGRAM_SCALE = 1.0
+DEFAULT_CLOTH_DOT_RADIUS = 7
+
 
 class ClothApp:
-    def __init__(self, master, on_close_callback):
+    def __init__(
+        self,
+        master,
+        on_close_callback,
+        initial_points=None,
+        diagram_scale=DEFAULT_CLOTH_DIAGRAM_SCALE,
+        dot_radius=DEFAULT_CLOTH_DOT_RADIUS,
+    ):
         # Vytvoření nového okna pomocí Toplevel
         self.top_level = tk.Toplevel(master)
         self.top_level.title("Clothes App")
-        self.top_level.geometry("225x348")  # Double the original dimensions for the window size
         self.on_close_callback = on_close_callback
+        self.diagram_scale = float(diagram_scale)
+        self.dot_radius = int(dot_radius)
 
-        self.f = tk.Frame(self.top_level, bg='red')
+        self.f = tk.Frame(self.top_level, bg='lightgrey')
         self.f.grid(row=1, column=0, sticky="nsew")
 
         self.dots = {}
-        self.img = Image.open("icons/diagram.png")
-        self.img = self.img.resize((int(self.img.width*0.5), int(self.img.height*0.5)), Image.LANCZOS)
+        self.img = Image.open(resource_path("icons/diagram.png"))
+        self.img = self.img.resize(
+            (int(self.img.width * self.diagram_scale), int(self.img.height * self.diagram_scale)),
+            Image.LANCZOS,
+        )
         self.photo2 = ImageTk.PhotoImage(self.img)
-        self.canvas2 = tk.Canvas(self.f, width=self.img.width, height=self.img.height, bg='red')
+        self.canvas2 = tk.Canvas(self.f, width=self.img.width, height=self.img.height, bg='lightgrey')
 
-        self.canvas2.pack()
+        self.canvas2.pack(padx=10, pady=10)
         self.canvas2.create_image(0, 0, anchor="nw", image=self.photo2)
         self.canvas2.bind("<Button-1>", self.add_dot)    # Left click to add a dot
         self.canvas2.bind("<Button-2>", self.remove_dot) # Middle click to remove a dot
         self.top_level.protocol("WM_DELETE_WINDOW", self.on_close)
 
+        if initial_points:
+            for x, y in initial_points:
+                self._create_dot(x, y)
+
+        win_w = self.img.width + 20
+        win_h = self.img.height + 20
+        self.top_level.geometry(f"{win_w}x{win_h}")
+
     def on_close(self):
         # Callback with dots data on close
-        self.on_close_callback(self.dots)
+        self.on_close_callback(self.dots, self.diagram_scale)
         self.top_level.destroy()
 
+    def _create_dot(self, x, y):
+        dot_id = self.canvas2.create_oval(
+            x - self.dot_radius,
+            y - self.dot_radius,
+            x + self.dot_radius,
+            y + self.dot_radius,
+            fill="red",
+        )
+        self.dots[dot_id] = (x, y)
+        return dot_id
+
     def add_dot(self, event):
-        dot_id = self.canvas2.create_oval(event.x-5, event.y-5, event.x+5, event.y+5, fill="red")
-        self.dots[dot_id] = (event.x, event.y)
+        self._create_dot(event.x, event.y)
         print("INFO: Clothes dots: ", self.dots)
 
     def remove_dot(self, event):

src/config_utils.py

@@ -4,32 +4,60 @@
 """
 
 import json
+import os
+import shutil
 from PIL import Image, ImageTk
 
+from resource_utils import get_app_dir, resource_path
+
+
+def get_config_path() -> str:
+    return os.path.join(get_app_dir(), "config.json")
+
+
+def _ensure_config_file() -> str:
+    config_path = get_config_path()
+    if os.path.exists(config_path):
+        return config_path
+
+    bundled_config = resource_path("config.json")
+    if os.path.exists(bundled_config):
+        try:
+            shutil.copyfile(bundled_config, config_path)
+            return config_path
+        except Exception:
+            return bundled_config
+
+    return config_path
+
 
 def load_config():
     try:
-        with open('config.json', 'r') as file:
+        config_path = _ensure_config_file()
+        with open(config_path, 'r') as file:
             return json.load(file)
     except Exception:
         return {}
 
 
 def save_config(config: dict) -> None:
-    with open('config.json', 'w') as file:
+    config_path = _ensure_config_file()
+    with open(config_path, 'w') as file:
         json.dump(config, file, indent=2, sort_keys=False)
 
 
 def load_config_flags():
-    with open('config.json', 'r') as file:
+    config_path = _ensure_config_file()
+    with open(config_path, 'r') as file:
         config = json.load(file)
         NEW_TEMPLATE = config.get('new_template', False)
         minimal_touch_length = config.get('minimal_touch_length', '280')
         return NEW_TEMPLATE, minimal_touch_length
 
 
 def load_perf_config():
-    with open('config.json', 'r') as file:
+    config_path = _ensure_config_file()
+    with open(config_path, 'r') as file:
         config = json.load(file)
         enabled = bool(config.get('perf_enabled', False))
         log_every_s = float(config.get('perf_log_every_s', 2.0))
@@ -38,7 +66,8 @@ def load_perf_config():
 
 
 def load_display_limits():
-    with open('config.json', 'r') as file:
+    config_path = _ensure_config_file()
+    with open(config_path, 'r') as file:
         config = json.load(file)
         max_w = config.get('max_display_width', 0)
         max_h = config.get('max_display_height', 0)
@@ -61,7 +90,8 @@ def load_parameter_names_into(video_obj, par_buttons, limb_par_buttons):
     par_buttons: dict {1: button, 2: button, 3: button}
     limb_par_buttons: dict {1: button, 2: button, 3: button}
     """
-    with open('config.json', 'r') as file:
+    config_path = _ensure_config_file()
+    with open(config_path, 'r') as file:
         config = json.load(file)
         p1 = config.get('parameter1', 'Parameter 1')
         p2 = config.get('parameter2', 'Parameter 2')