V1.3.0

.github/workflows/build-image.yml

@@ -0,0 +1,147 @@
+name: Builds the Sunscan OS image
+
+on:
+  pull_request:
+  push:
+    tags:
+      - '*.*.*'
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build-image:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - uses: actions/checkout@v4
+      - name: Determine version
+        id: vars
+        run: |
+          # Get the tag, if any
+          TAG=$(git describe --tags --exact-match 2>/dev/null || echo "")
+
+          if [ -n "$TAG" ]; then
+            echo "APP_VERSION=$TAG" >> $GITHUB_ENV
+            echo "IMGFILENAME=sunscan_os_$TAG" >> $GITHUB_ENV
+          else
+            BRANCH=$(git rev-parse --abbrev-ref HEAD)
+            COMMIT=$(git rev-parse --short HEAD)
+            echo "APP_VERSION=${BRANCH}_${COMMIT}" >> $GITHUB_ENV
+            echo "IMGFILENAME=sunscan_os_${BRANCH}_${COMMIT}" >> $GITHUB_ENV
+          fi
+      - run: |
+          {
+          mkdir -p pi-gen-sunscan/01-prepare-repo
+          cat > pi-gen-sunscan/01-prepare-repo/00-run.sh <<-EOF
+          #!/bin/bash
+          git clone ${{ github.server_url }}/${{ github.event.pull_request.head.repo.full_name || github.repository }}.git --branch ${{ github.head_ref || github.ref_name }} --depth 1 ${WORK_DIR}/tmp/repo
+          ls -alh ${WORK_DIR}/tmp/repo
+          EOF
+          } &&
+          chmod +x pi-gen-sunscan/01-prepare-repo/00-run.sh
+
+      - uses: usimd/pi-gen-action@v1
+        id: build
+        with:
+          compression: xz
+
+          # Compression level to be used. From 0 to 9 (refer to the tool man page for more
+          # information on this. Usually 0 is no compression but very fast, up to 9 with the
+          # best compression but very slow).
+          compression-level: 9
+
+          # Enable SSH access to Pi.
+          enable-ssh: 1
+
+          export-last-stage-only: true
+
+          # Comma or whitespace separated list of additional packages to install on host
+          # before running pi-gen. Use this list to add any packages your custom stages may
+          # require. Note that this is not affecting the final image. In order to add
+          # additional packages, you need to add a respective 'XX-packages' file in your
+          # custom stage.
+          extra-host-dependencies: ''
+
+          # Comma or whitespace separated list of additional modules to load on host before
+          # running pi-gen. If your custom stage requires additional software or kernel
+          # modules to be loaded, add them here. Note that this is not meant to configure
+          # modules to be loaded in the target image.
+          extra-host-modules: ''
+
+          # Token to use for checking out pi-gen repo.
+          github-token: ${{ github.token }}
+
+          # Host name of the image.
+          hostname: sunscan
+
+          # Final image name.
+          image-name: ${{ env.IMGFILENAME }}
+
+          # Enabling this option will remove plenty of components from the GitHub Actions
+          # runner that are not mandatory pre-requisites for a (vanilla) pi-gen build. This
+          # shall increase the available disk space so that also large images can be
+          # compiled on a free GHA runner (benchmark is the full image including a desktop
+          # environment). If any packages are missing during the build consider adding them
+          # to the `extra-host-dependencies` list.
+          increase-runner-disk-size: false
+
+          # Default keyboard keymap.
+          keyboard-keymap: us
+
+          # Default keyboard layout.
+          keyboard-layout: English (US)
+
+          # Default locale of the system image.
+          locale: en_US.UTF-8
+
+          # Password of the intial user account, locked if empty.
+          password: 'password'
+
+          # Path where selected pi-gen ref will be checked out to. If the path does not yet
+          # exist, it will be created (including its parents).
+          pi-gen-dir: pi-gen
+
+          # The release name to use in `/etc/issue.txt`. The default should only be used for
+          # official Raspberry Pi builds.
+          pi-gen-release: Raspberry Pi reference
+
+          # GitHub repository to fetch pi-gen from, must be a fork from RPi-Distro/pi-gen.
+          pi-gen-repository: RPi-Distro/pi-gen
+
+          # Release version of pi-gen to use. This can both be a branch or tag name known in
+          # the pi-gen repository.
+          pi-gen-version: arm64
+
+          # Setting to `1` will disable password authentication for SSH and enable public
+          # key authentication. Note that if SSH is not enabled this will take effect when
+          # SSH becomes enabled.
+          pubkey-only-ssh: 0
+
+          # The release version to build images against. Valid values are jessie, stretch,
+          # buster, bullseye, bookworm, and testing.
+          release: bookworm
+
+          # List of stage name to execute in given order. Relative and absolute paths to
+          # custom stage directories are allowed here. Note that by default pi-gen exports
+          # images in stage2 (lite), stage4 and stage5. You probably want to hook in custom
+          # stages before one of the exported stages. Otherwise, the action will make sure
+          # any custom stage will include an image export directive.
+          stage-list: stage0 stage1 stage2 ./pi-gen-sunscan
+
+          # System timezone.
+          timezone: Europe/Paris
+
+          # Name of the initial user account.
+          username: admin
+
+          # Print all output from pi-gen.
+          verbose-output: true
+      - uses: actions/upload-artifact@v4
+        with:
+          name: ${{ env.IMGFILENAME }}
+          path: ${{ steps.build.outputs.image-path }}
+      # - name: Release
+      #   uses: softprops/action-gh-release@v2
+      #   if: startsWith(github.ref, 'refs/tags/')
+      #   with:
+      #       files: ${{ steps.build.outputs.image-path }}

.gitignore

@@ -117,10 +117,12 @@ dmypy.json
 # project adds
 *.log
 /app/.idea
-
+/app/jsolex
 /app/storage/raw/*
 /app/storage/scans/*
 /app/storage/snapshots/*
+/app/storage/stacking/*
+/app/storage/animations/*
 /app/storage/tmp/*
 /app/storage/tmp/test/*
 app/main_dev.py

app/Inti_functions.py

@@ -445,7 +445,7 @@ def detect_edge (myimg,zexcl, crop, disp_log):
 
 
     # releve seuil moyenne pour eviter clamp trop fort
-    img_mean=3*np.mean(myimg[1:-1,milieu-rayon-50:milieu+rayon+50]) #facteur 1.3 pour eviter des artefacts de bords
+    img_mean=1.3*np.mean(myimg[1:-1,milieu-rayon+50:milieu+rayon-50]) #facteur 1.3 pour eviter des artefacts de bords
     img_c=np.copy(myimg)
     img_c[img_c>img_mean]=img_mean
 

app/animate.py

@@ -0,0 +1,153 @@
+import os
+import cv2
+
+from fastapi import FastAPI, HTTPException
+from pydantic import BaseModel
+from pathlib import Path
+
+from typing import List, Optional
+from PIL import Image, ImageDraw, ImageFont, ImageChops
+from datetime import datetime
+from storage import get_scan_tag
+
+class PostProcessRequest(BaseModel):
+    paths: List[str]
+    watermark: bool = False
+    observer: str = ''
+    description: str = ''
+    frame_duration: int = 200  # Default frame duration in ms
+    display_datetime: bool = False  # Whether to display datetime on each frame
+    resize_gif: bool = True  # Whether to resize GIF to 50% of original size
+    bidirectional: bool = False  # Whether to play animation in both directions
+    add_average_frame: bool = False  # Whether to calculate and add average frames between frames
+    patch_size: int = 32 
+    step_size: int = 10 
+    intensity_threshold: int = 0
+
+def extract_datetime_from_path(image_path: str) -> str:
+    """
+    Extract the datetime (YYYY_MM_DD-HH_MM_SS) from the image path.
+    """
+    path = Path(image_path)
+    # Assuming the datetime is always in the folder name before the image name
+    folder_name = path.parent.name
+    # Assuming the format is YYYY_MM_DD-HH_MM_SS, we will split and reformat it
+    date_part, time_part = folder_name.split('-')
+    sunscan, year, month, day = date_part.split('_')
+    hour, minute, second = time_part.split('_')
+    # Return the formatted datetime: YYYY/MM/DD HH:MM:SS
+    return f"{year}/{month}/{day} {hour}:{minute}:{second} UT"
+
+
+def add_datetime_to_frame(image: Image.Image, datetime_str: str) -> Image.Image:
+    """
+    Add the extracted datetime to the image with a specified font size.
+    """
+    draw = ImageDraw.Draw(image) 
+    font = ImageFont.truetype("/var/www/sunscan-backend/app/fonts/Roboto-Regular.ttf", 30)  # Use a specific font if available
+    text_position = get_text_position(image)
+    draw.text(text_position, datetime_str, fill="white", font=font)
+    return image
+
+def get_text_position(image, padding_from_bottom=50, padding_from_left=20):
+     # Get the image dimensions to position the text in the bottom-left corner
+    width, height = image.size
+    # Position the text in the bottom-left corner with some padding
+    return (padding_from_left, height - padding_from_bottom)  # Padding of Npx from the left and bottom
+
+def add_watermark(image: Image.Image, observer: str) -> Image.Image:
+    """
+    Add the extracted datetime to the image with a specified font size.
+    """
+    draw = ImageDraw.Draw(image)
+
+    font = ImageFont.truetype("/var/www/sunscan-backend/app/fonts/Baumans-Regular.ttf", 40)  # Use a specific font if available
+    draw.text(get_text_position(image, 115), 'SUNSCAN', fill="white", font=font)
+    font = ImageFont.truetype("/var/www/sunscan-backend/app/fonts/Roboto-Regular.ttf", 20)  # Use a specific font if available
+    draw.text(get_text_position(image, 73), observer, fill="white", font=font)
+    return image
+
+def resize_frame(image: Image.Image) -> Image.Image:
+    """
+    Resize the image to 50% of its original size.
+    """
+    width, height = image.size
+    new_size = (width // 2, height // 2)
+    return image.resize(new_size, Image.Resampling.LANCZOS)
+
+def calculate_average_frame(frame1: Image.Image, frame2: Image.Image) -> Image.Image:
+    """
+    Calculate the average frame between two frames.
+    """
+    return ImageChops.blend(frame1, frame2, alpha=0.5)
+
+def create_gif(image_paths: List[Path], watermark: bool, observer: str,output_path: Path, frame_duration: int, display_datetime: bool, resize_gif: bool, bidirectional: bool, add_average_frame: bool):
+    """
+    Create a GIF animation from a list of image paths.
+    """
+    frames = []
+    for image_path in image_paths:
+        image = cv2.imread(str(image_path), cv2.IMREAD_UNCHANGED)
+        image = image // 256
+        frame = Image.fromarray(image).convert("RGB")
+        # Extract the datetime from the path and format it
+        datetime_str = extract_datetime_from_path(str(image_path))
+        if display_datetime:
+            tag = get_scan_tag(os.path.dirname(image_path))
+            txt = datetime_str if not tag else datetime_str+" - "+tag
+            frame = add_datetime_to_frame(frame, txt)
+        if watermark:
+            frame = add_watermark(frame, observer)
+        if resize_gif:
+            frame = resize_frame(frame)
+        frames.append(frame)
+
+    if add_average_frame:
+        extended_frames = []
+        for i in range(len(frames) - 1):
+            extended_frames.append(frames[i])
+            average_frame = calculate_average_frame(frames[i], frames[i + 1])
+            extended_frames.append(average_frame)
+        extended_frames.append(frames[-1])
+        frames = extended_frames
+
+    if bidirectional:
+        frames += frames[::-1]  # Append reversed frames for bidirectional playback
+
+
+    # Check if the output path contains "clahe" and create a preview gif
+    if "helium_cont" in str(output_path).lower():
+        # Resize the frames to 250px width and height
+        preview_frames = [frame.resize((250, 250), Image.Resampling.LANCZOS) for frame in frames]
+        preview_output_path = os.path.join(os.path.dirname(output_path), "animated_preview.gif")
+        preview_frames[0].save(
+            preview_output_path,
+            save_all=True,
+            append_images=preview_frames[1:],
+            duration=frame_duration,  # Frame duration in ms
+            loop=0,  # Infinite loop
+            dither=True
+        )
+        print(f"Preview GIF saved at {preview_output_path}")
+    elif "clahe" in str(output_path).lower():
+        # Resize the frames to 250px width and height
+        preview_frames = [frame.resize((250, 250), Image.Resampling.LANCZOS) for frame in frames]
+        preview_output_path = os.path.join(os.path.dirname(output_path), "animated_preview.gif")
+        preview_frames[0].save(
+            preview_output_path,
+            save_all=True,
+            append_images=preview_frames[1:],
+            duration=frame_duration,  # Frame duration in ms
+            loop=0,  # Infinite loop
+            dither=True
+        )
+        print(f"Preview GIF saved at {preview_output_path}")
+
+    frames[0].save(
+        output_path,
+        save_all=True,
+        append_images=frames[1:],
+        duration=frame_duration,  # Frame duration in ms
+        loop=0,  # Infinite loop,
+        dither=True
+    )