From 71ae50cf8e4e9dbbbde8523560a649bdcbe639e5 Mon Sep 17 00:00:00 2001 From: Thomas Date: Fri, 24 Mar 2023 19:16:41 +0100 Subject: [PATCH] Updated package meta zeug --- makehdr.py | 2 +- numpyHDR.py | 2 -- picamburst.py | 7 +++---- readme.md | 20 +++++++++++++------- requirements.txt | 23 +---------------------- 5 files changed, 18 insertions(+), 36 deletions(-) diff --git a/makehdr.py b/makehdr.py index e59cd53..a1a1d6b 100644 --- a/makehdr.py +++ b/makehdr.py @@ -1,6 +1,6 @@ #!//usr/bin/python3 -import numpyHDR as hdr import file_utility as file +import numpyHDR as hdr '''CLI application for HDR experiments''' diff --git a/numpyHDR.py b/numpyHDR.py index 8bfad19..b3f6961 100644 --- a/numpyHDR.py +++ b/numpyHDR.py @@ -1,7 +1,5 @@ import numpy as np - - '''Numpy and PIL implementation of a Mertens Fusion alghoritm Usage: Instantiate then set attributes: input_image = List containing path strings including .jpg Extension diff --git a/picamburst.py b/picamburst.py index d044125..da67e6d 100644 --- a/picamburst.py +++ b/picamburst.py @@ -1,11 +1,10 @@ #!//usr/bin/python3 -import numpyHDR -from PIL import Image -from picamera2 import Picamera2 -from libcamera import controls import time +from libcamera import controls +from picamera2 import Picamera2 + picam2 = Picamera2() config = picam2.create_still_configuration() picam2.configure(config) diff --git a/readme.md b/readme.md index 97543a6..c4d6b4c 100644 --- a/readme.md +++ b/readme.md @@ -1,27 +1,33 @@ # numpyHDR -*Micro Library for HDR image creation using the Mertens Fusion Alghoritm* +* Micro Library for HDR image creation using the Mertens Fusion Alghoritm* +* Optional Raspicam integration with picamera2 lib +* CLI Application "makehdr.py" +* Processing time on raspi zero ca 15 min with full res 12MP files. ## Intention -- numpy and PIL only. +- numpy and PIL, picamera2 for Raspicam funtionality. - Whenever dependencies of other bigger image librarys arenĀ“t satisfyable. - 32-bit armv6 or oudated Kernels etc. ## Function +*Use makehdr.py CLI app for testing before implementation* + +- Captures an exposure bracket stack from the raspicam as fast as possible +- Alternatively from image sequences form file +- Either direct processing or save files in between - Uses a conversion of the Mertens Fusion alghoritm - Stretches Information to the full spectrum like Contrast or compression - Lifts the shadows softly with an envelope. - Clips to Image range and saves via PIL ## Setup -- Download into project path and import the class for now. +- Download and isntall dependencies from requirements.txt into env +- ## Usage -- Instantiate then set attributes: - - input_image = List containing path strings including .jpg Extension - - output_path = String ot Output without jpg ending - - compress_quality = 0-100 Jpeg compression level defaults to 75 +- Start make Run function sequence() to start processing. Example: diff --git a/requirements.txt b/requirements.txt index 70ca91f..97da706 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,23 +1,2 @@ -contourpy==1.0.7 -cycler==0.11.0 -fonttools==4.39.2 -imageio==2.26.0 -importlib-resources==5.12.0 -kiwisolver==1.4.4 -lazy_loader==0.1 -llvmlite==0.39.1 -matplotlib==3.7.1 -networkx==3.0 -numba==0.56.4 -numpy==1.23.5 -opencv-python-headless==4.7.0.72 -packaging==23.0 +numpy==1.24.2 Pillow==9.4.0 -pyparsing==3.0.9 -python-dateutil==2.8.2 -PyWavelets==1.4.1 -scikit-image==0.20.0 -scipy==1.9.1 -six==1.16.0 -tifffile==2023.3.15 -zipp==3.15.0