shinestacker 1.8.1__py3-none-any.whl → 1.9.0__py3-none-any.whl

shinestacker/_version.py

@@ -1 +1 @@
-__version__ = '1.8.1'
+__version__ = '1.9.0'

shinestacker/algorithms/exif.py

@@ -1,12 +1,14 @@
-# pylint: disable=C0114, C0116, W0718, R0911, R0912, E1101
+# pylint: disable=C0114, C0116, W0718, R0911, R0912, E1101, R0915, R1702, R0914, R0917, R0913
 import os
 import re
 import io
 import logging
+import traceback
 import cv2
 import numpy as np
 from PIL import Image
 from PIL.TiffImagePlugin import IFDRational
+from PIL.PngImagePlugin import PngInfo
 from PIL.ExifTags import TAGS
 import tifffile
 from .. config.constants import constants
@@ -58,9 +60,33 @@ def get_exif(exif_filename):
             if data is not None:
                 exif_data[XMLPACKET] = data
         return exif_data
+    if extension_png(exif_filename):
+        exif_data = get_exif_from_png(image)
+        return exif_data if exif_data else image.getexif()
     return image.getexif()
 
 
+def get_exif_from_png(image):
+    exif_data = {}
+    try:
+        exif_from_image = image.getexif()
+        if exif_from_image:
+            exif_data.update(dict(exif_from_image))
+    except Exception:
+        pass
+    try:
+        if hasattr(image, 'text') and image.text:
+            for key, value in image.text.items():
+                exif_data[f"PNG_{key}"] = value
+        if hasattr(image, 'info') and image.info:
+            for key, value in image.info.items():
+                if key not in ['dpi', 'gamma']:
+                    exif_data[f"PNG_{key}"] = value
+    except Exception:
+        pass
+    return exif_data
+
+
 def exif_extra_tags_for_tif(exif):
     logger = logging.getLogger(__name__)
     res_x, res_y = exif.get(RESOLUTIONX), exif.get(RESOLUTIONY)
@@ -153,7 +179,222 @@ def add_exif_data_to_jpg_file(exif, in_filenama, out_filename, verbose=False):
     return exif
 
 
-def write_image_with_exif_data(exif, image, out_filename, verbose=False):
+def create_xmp_from_exif(exif_data):
+    xmp_elements = []
+    if exif_data:
+        for tag_id, value in exif_data.items():
+            if isinstance(tag_id, int):
+                if tag_id == 270 and value:  # ImageDescription
+                    desc = value
+                    if isinstance(desc, bytes):
+                        desc = desc.decode('utf-8', errors='ignore')
+                    xmp_elements.append(
+                        f'<dc:description><rdf:Alt><rdf:li xml:lang="x-default">{desc}</rdf:li>'
+                        '</rdf:Alt></dc:description>')
+                elif tag_id == 315 and value:  # Artist
+                    artist = value
+                    if isinstance(artist, bytes):
+                        artist = artist.decode('utf-8', errors='ignore')
+                    xmp_elements.append(
+                        f'<dc:creator><rdf:Seq><rdf:li>{artist}</rdf:li>'
+                        '</rdf:Seq></dc:creator>')
+                elif tag_id == 33432 and value:  # Copyright
+                    copyright_tag = value
+                    if isinstance(copyright_tag, bytes):
+                        copyright_tag = copyright_tag.decode('utf-8', errors='ignore')
+                    xmp_elements.append(
+                        f'<dc:rights><rdf:Alt><rdf:li xml:lang="x-default">{copyright_tag}</rdf:li>'
+                        '</rdf:Alt></dc:rights>')
+                elif tag_id == 271 and value:  # Make
+                    make = value
+                    if isinstance(make, bytes):
+                        make = make.decode('utf-8', errors='ignore')
+                    xmp_elements.append(f'<tiff:Make>{make}</tiff:Make>')
+                elif tag_id == 272 and value:  # Model
+                    model = value
+                    if isinstance(model, bytes):
+                        model = model.decode('utf-8', errors='ignore')
+                    xmp_elements.append(f'<tiff:Model>{model}</tiff:Model>')
+                elif tag_id == 306 and value:  # DateTime
+                    datetime_val = value
+                    if isinstance(datetime_val, bytes):
+                        datetime_val = datetime_val.decode('utf-8', errors='ignore')
+                    if ':' in datetime_val:
+                        datetime_val = datetime_val.replace(':', '-', 2).replace(' ', 'T')
+                    xmp_elements.append(f'<xmp:CreateDate>{datetime_val}</xmp:CreateDate>')
+                elif tag_id == 305 and value:  # Software
+                    software = value
+                    if isinstance(software, bytes):
+                        software = software.decode('utf-8', errors='ignore')
+                    xmp_elements.append(f'<xmp:CreatorTool>{software}</xmp:CreatorTool>')
+    if xmp_elements:
+        xmp_content = '\n    '.join(xmp_elements)
+        xmp_template = f"""<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/'
+ x:xmptk='Adobe XMP Core 5.6-c140 79.160451, 2017/05/06-01:08:21'>
+ <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+  <rdf:Description rdf:about=''
+    xmlns:dc='http://purl.org/dc/elements/1.1/'
+    xmlns:xmp='http://ns.adobe.com/xap/1.0/'
+    xmlns:tiff='http://ns.adobe.com/tiff/1.0/'
+    xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+    {xmp_content}
+  </rdf:Description>
+ </rdf:RDF>
+</x:xmpmeta>
+<?xpacket end='w'?>"""
+        return xmp_template
+    return """<?xpacket begin='' id='W5M0MpCehiHzreSzNTczkc9d'?>
+<x:xmpmeta xmlns:x='adobe:ns:meta/'
+ x:xmptk='Adobe XMP Core 5.6-c140 79.160451, 2017/05/06-01:08:21'>
+ <rdf:RDF xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#'>
+  <rdf:Description rdf:about=''/>
+ </rdf:RDF>
+</x:xmpmeta>
+<?xpacket end='w'?>"""
+
+
+def write_image_with_exif_data_png(exif, image, out_filename, verbose=False, color_order='auto'):
+    logger = logging.getLogger(__name__)
+    if isinstance(image, np.ndarray) and image.dtype == np.uint16:
+        if verbose:
+            logger.warning(msg="EXIF data not supported for 16-bit PNG format")
+        write_img(out_filename, image)
+        return
+    pil_image = _convert_to_pil_image(image, color_order, verbose, logger)
+    pnginfo, icc_profile = _prepare_png_metadata(exif, verbose, logger)
+    _save_png_with_metadata(pil_image, out_filename, pnginfo, icc_profile, verbose, logger)
+
+
+def _convert_to_pil_image(image, color_order, verbose, logger):
+    if isinstance(image, np.ndarray):
+        if len(image.shape) == 3 and image.shape[2] == 3:
+            if color_order in ['auto', 'bgr']:
+                image_rgb = cv2.cvtColor(image, cv2.COLOR_BGR2RGB)
+                if verbose:
+                    logger.info(msg="Converted BGR to RGB for PIL")
+                return Image.fromarray(image_rgb)
+        return Image.fromarray(image)
+    return image
+
+
+def _prepare_png_metadata(exif, verbose, logger):
+    pnginfo = PngInfo()
+    icc_profile = None
+    xmp_data = _extract_xmp_data(exif, verbose, logger)
+    if xmp_data:
+        pnginfo.add_text("XML:com.adobe.xmp", xmp_data)
+        if verbose:
+            logger.info(msg="Added XMP data to PNG info")
+    _add_exif_tags_to_pnginfo(exif, pnginfo, verbose, logger)
+    icc_profile = _extract_icc_profile(exif, verbose, logger)
+    return pnginfo, icc_profile
+
+
+def _extract_xmp_data(exif, verbose, logger):
+    for key, value in exif.items():
+        if isinstance(key, str) and ('xmp' in key.lower() or 'xml' in key.lower()):
+            if isinstance(value, bytes):
+                try:
+                    xmp_data = value.decode('utf-8', errors='ignore')
+                    if verbose:
+                        logger.info(msg=f"Found existing XMP data in source: {key}")
+                    return xmp_data
+                except Exception:
+                    continue
+            elif isinstance(value, str):
+                if verbose:
+                    logger.info(msg=f"Found existing XMP data in source: {key}")
+                return value
+    if verbose:
+        logger.info("Generated new XMP data from EXIF")
+    return create_xmp_from_exif(exif)
+
+
+def _add_exif_tags_to_pnginfo(exif, pnginfo, verbose, logger):
+    for tag_id, value in exif.items():
+        if value is None:
+            continue
+        if isinstance(tag_id, int):
+            _add_exif_tag(pnginfo, tag_id, value, verbose, logger)
+        elif isinstance(tag_id, str) and not tag_id.lower().startswith(('xmp', 'xml')):
+            _add_png_text_tag(pnginfo, tag_id, value, verbose, logger)
+
+
+def _add_exif_tag(pnginfo, tag_id, value, verbose, logger):
+    try:
+        tag_name = TAGS.get(tag_id, f"Unknown_{tag_id}")
+        if isinstance(value, bytes) and len(value) > 1000:
+            return
+        if isinstance(value, (int, float, str)):
+            pnginfo.add_text(tag_name, str(value))
+        elif isinstance(value, bytes):
+            try:
+                decoded_value = value.decode('utf-8', errors='replace')
+                pnginfo.add_text(tag_name, decoded_value)
+            except Exception:
+                pass
+        elif hasattr(value, 'numerator'):  # IFDRational
+            rational_str = f"{value.numerator}/{value.denominator}"
+            pnginfo.add_text(tag_name, rational_str)
+        else:
+            pnginfo.add_text(tag_name, str(value))
+    except Exception as e:
+        if verbose:
+            logger.warning(f"Could not store EXIF tag {tag_id}: {e}")
+
+
+def _add_png_text_tag(pnginfo, key, value, verbose, logger):
+    try:
+        clean_key = key[4:] if key.startswith('PNG_') else key
+        if 'icc' in clean_key.lower() or 'profile' in clean_key.lower():
+            return
+        if isinstance(value, bytes):
+            try:
+                decoded_value = value.decode('utf-8', errors='replace')
+                pnginfo.add_text(clean_key, decoded_value)
+            except Exception:
+                truncated_value = str(value)[:100] + "..."
+                pnginfo.add_text(clean_key, truncated_value)
+        else:
+            pnginfo.add_text(clean_key, str(value))
+    except Exception as e:
+        if verbose:
+            logger.warning(msg=f"Could not store PNG metadata {key}: {e}")
+
+
+def _extract_icc_profile(exif, verbose, logger):
+    for key, value in exif.items():
+        if (isinstance(key, str) and
+            isinstance(value, bytes) and
+                ('icc' in key.lower() or 'profile' in key.lower())):
+            if verbose:
+                logger.info(f"Found ICC profile: {key}")
+            return value
+    return None
+
+
+def _save_png_with_metadata(pil_image, out_filename, pnginfo, icc_profile, verbose, logger):
+    try:
+        save_args = {'format': 'PNG', 'pnginfo': pnginfo}
+        if icc_profile:
+            save_args['icc_profile'] = icc_profile
+            if verbose:
+                logger.info(msg="Saved PNG with ICC profile and metadata")
+        else:
+            if verbose:
+                logger.info(msg="Saved PNG without ICC profile but with metadata")
+        pil_image.save(out_filename, **save_args)
+        if verbose:
+            logger.info(msg=f"Successfully wrote PNG with metadata: {out_filename}")
+    except Exception as e:
+        if verbose:
+            logger.error(msg=f"Failed to write PNG with metadata: {e}")
+            logger.error(traceback.format_exc())
+        pil_image.save(out_filename, format='PNG')
+
+
+def write_image_with_exif_data(exif, image, out_filename, verbose=False, color_order='auto'):
     if exif is None:
         write_img(out_filename, image)
         return None
@@ -168,7 +409,7 @@ def write_image_with_exif_data(exif, image, out_filename, verbose=False):
         tifffile.imwrite(out_filename, image, metadata=metadata, compression='adobe_deflate',
                          extratags=extra_tags, **exif_tags)
     elif extension_png(out_filename):
-        image.save(out_filename, 'PNG', exif=exif, quality=100)
+        write_image_with_exif_data_png(exif, image, out_filename, verbose, color_order=color_order)
     return exif
 
 
@@ -181,8 +422,10 @@ def save_exif_data(exif, in_filename, out_filename=None, verbose=False):
         print_exif(exif)
     if extension_tif(in_filename):
         image_new = tifffile.imread(in_filename)
-    else:
+    elif extension_jpg(in_filename):
         image_new = Image.open(in_filename)
+    elif extension_png(in_filename):
+        image_new = cv2.imread(in_filename, cv2.IMREAD_UNCHANGED)
     if extension_jpg(in_filename):
         add_exif_data_to_jpg_file(exif, in_filename, out_filename, verbose)
     elif extension_tif(in_filename):
@@ -191,7 +434,7 @@ def save_exif_data(exif, in_filename, out_filename=None, verbose=False):
         tifffile.imwrite(out_filename, image_new, metadata=metadata, compression='adobe_deflate',
                          extratags=extra_tags, **exif_tags)
     elif extension_png(in_filename):
-        image_new.save(out_filename, 'PNG', exif=exif, quality=100)
+        write_image_with_exif_data_png(exif, image_new, out_filename, verbose)
     return exif
 
 
@@ -237,4 +480,7 @@ def print_exif(exif, hide_xml=True):
     for tag, (tag_id, data) in exif_data.items():
         if isinstance(data, IFDRational):
             data = f"{data.numerator}/{data.denominator}"
-        logger.info(msg=f"{tag:25} [#{tag_id:5d}]: {data}")
+        if isinstance(tag_id, int):
+            logger.info(msg=f"{tag:25} [#{tag_id:5d}]: {data}")
+        else:
+            logger.info(msg=f"{tag:25} [ {tag_id:20} ]: {str(data)[:100]}...")

shinestacker/algorithms/multilayer.py

@@ -13,7 +13,7 @@ from .. config.constants import constants
 from .. config.config import config
 from .. core.colors import color_str
 from .. core.framework import TaskBase
-from .utils import EXTENSIONS_TIF, EXTENSIONS_JPG, EXTENSIONS_PNG
+from .utils import EXTENSIONS_TIF, EXTENSIONS_JPG, EXTENSIONS_PNG, EXTENSIONS_SUPPORTED
 from .stack_framework import ImageSequenceManager
 from .exif import exif_extra_tags_for_tif, get_exif
 
@@ -142,14 +142,16 @@ def write_multilayer_tiff_from_images(image_dict, output_file, exif_path='', cal
         elif os.path.isdir(exif_path):
             _dirpath, _, fnames = next(os.walk(exif_path))
             fnames = [name for name in fnames
-                      if os.path.splitext(name)[-1][1:].lower() in constants.EXTENSIONS]
-            extra_tags, exif_tags = exif_extra_tags_for_tif(get_exif(exif_path + '/' + fnames[0]))
+                      if os.path.splitext(name)[-1][1:].lower() in EXTENSIONS_SUPPORTED]
+            file_path = os.path.join(exif_path, fnames[0])
+            extra_tags, exif_tags = exif_extra_tags_for_tif(get_exif(file_path))
+        extra_tags = [tag for tag in extra_tags if isinstance(tag[0], int)]
         tiff_tags['extratags'] += extra_tags
         tiff_tags = {**tiff_tags, **exif_tags}
     if callbacks:
         callback = callbacks.get('write_msg', None)
         if callback:
-            callback(output_file.split('/')[-1])
+            callback(os.path.basename(output_file))
     compression = 'adobe_deflate'
     overlayed_images = overlay(
         *((np.concatenate((image, np.expand_dims(transp, axis=-1)),

shinestacker/algorithms/stack.py

@@ -1,11 +1,13 @@
 # pylint: disable=C0114, C0115, C0116, R0913, R0917
 import os
 import traceback
+import logging
+import numpy as np
 from .. config.constants import constants
 from .. core.framework import TaskBase
 from .. core.colors import color_str
 from .. core.exceptions import InvalidOptionError
-from .utils import write_img, extension_tif_jpg
+from .utils import write_img, extension_supported
 from .stack_framework import ImageSequenceManager, SequentialTask
 from .exif import copy_exif_from_file_to_file
 from .denoise import denoise
@@ -35,18 +37,28 @@ class FocusStackBase(TaskBase, ImageSequenceManager):
             stacked_img = denoise(stacked_img, self.denoise_amount, self.denoise_amount)
         write_img(out_filename, stacked_img)
         if self.exif_path != '':
-            self.sub_message_r(color_str(': copy exif data', constants.LOG_COLOR_LEVEL_3))
-            if not os.path.exists(self.exif_path):
-                raise RuntimeError(f"Path {self.exif_path} does not exist.")
-            try:
-                _dirpath, _, fnames = next(os.walk(self.exif_path))
-                fnames = [name for name in fnames if extension_tif_jpg(name)]
-                exif_filename = os.path.join(self.exif_path, fnames[0])
-                copy_exif_from_file_to_file(exif_filename, out_filename)
-                self.sub_message_r(' ' * 60)
-            except Exception as e:
-                traceback.print_tb(e.__traceback__)
-                raise RuntimeError("Can't copy EXIF data") from e
+            if stacked_img.dtype == np.uint16 and \
+               os.path.splitext(out_filename)[-1].lower() == '.png':
+                self.sub_message_r(color_str(': exif not supported for 16-bit PNG format',
+                                             constants.LOG_COLOR_WARNING),
+                                   level=logging.WARNING)
+            else:
+                self.sub_message_r(color_str(': copy exif data', constants.LOG_COLOR_LEVEL_3))
+                if not os.path.exists(self.exif_path):
+                    raise RuntimeError(f"path {self.exif_path} does not exist.")
+                try:
+                    _dirpath, _, fnames = next(os.walk(self.exif_path))
+                    fnames = [name for name in fnames if extension_supported(name)]
+                    if len(fnames) == 0:
+                        raise RuntimeError(f"path {self.exif_path} does not contain image files.")
+                    exif_filename = os.path.join(self.exif_path, fnames[0])
+                    copy_exif_from_file_to_file(exif_filename, out_filename)
+                    self.sub_message_r(' ' * 60)
+                except Exception as e:
+                    traceback.print_tb(e.__traceback__)
+                    self.sub_message_r(color_str(f': failed to copy EXIF data: {str(e)}',
+                                                 constants.LOG_COLOR_WARNING),
+                                       level=logging.WARNING)
         if self.plot_stack:
             idx_str = f"{self.frame_count + 1:04d}" if self.frame_count >= 0 else ''
             name = f"{self.name}: {self.stack_algo.name()}"

shinestacker/algorithms/stack_framework.py

@@ -7,7 +7,7 @@ from .. core.colors import color_str
 from .. core.framework import Job, SequentialTask
 from .. core.core_utils import check_path_exists
 from .. core.exceptions import RunStopException
-from .utils import read_img, write_img, extension_tif_jpg, get_img_metadata, validate_image
+from .utils import read_img, write_img, extension_supported, get_img_metadata, validate_image
 
 
 class StackJob(Job):
@@ -95,7 +95,7 @@ class ImageSequenceManager:
                 filelist = []
                 for _dirpath, _, filenames in os.walk(d):
                     filelist = [os.path.join(_dirpath, name)
-                                for name in filenames if extension_tif_jpg(name)]
+                                for name in filenames if extension_supported(name)]
                     filelist.sort()
                     if self.reverse_order:
                         filelist.reverse()

shinestacker/algorithms/utils.py

@@ -18,6 +18,15 @@ EXTENSIONS_TIF = ['tif', 'tiff']
 EXTENSIONS_JPG = ['jpg', 'jpeg']
 EXTENSIONS_PNG = ['png']
 EXTENSIONS_PDF = ['pdf']
+EXTENSIONS_SUPPORTED = EXTENSIONS_TIF + EXTENSIONS_JPG + EXTENSIONS_PNG
+EXTENSIONS_GUI_STR = " ".join([f"*.{ext}" for ext in EXTENSIONS_SUPPORTED])
+EXTENSION_GUI_TIF = " ".join([f"*.{ext}" for ext in EXTENSIONS_TIF])
+EXTENSION_GUI_JPG = " ".join([f"*.{ext}" for ext in EXTENSIONS_JPG])
+EXTENSION_GUI_PNG = " ".join([f"*.{ext}" for ext in EXTENSIONS_PNG])
+EXTENSIONS_GUI_SAVE_STR = f"TIFF Files ({EXTENSION_GUI_TIF});;" \
+                          f"JPEG Files ({EXTENSION_GUI_JPG});;" \
+                          f"PNG Files ({EXTENSION_GUI_PNG});;" \
+                          "All Files (*)"
 
 
 def extension_in(path, exts):
@@ -56,6 +65,10 @@ def extension_jpg_tif_png(path):
     return extension_in(path, EXTENSIONS_JPG + EXTENSIONS_TIF + EXTENSIONS_PNG)
 
 
+def extension_supported(path):
+    return extension_in(path, EXTENSIONS_SUPPORTED)
+
+
 def read_img(file_path):
     if not os.path.isfile(file_path):
         raise RuntimeError("File does not exist: " + file_path)
@@ -73,7 +86,10 @@ def write_img(file_path, img):
     elif extension_tif(file_path):
         cv2.imwrite(file_path, img, [int(cv2.IMWRITE_TIFF_COMPRESSION), 1])
     elif extension_png(file_path):
-        cv2.imwrite(file_path, img)
+        cv2.imwrite(file_path, img, [
+            int(cv2.IMWRITE_PNG_COMPRESSION), 9,
+            int(cv2.IMWRITE_PNG_STRATEGY), cv2.IMWRITE_PNG_STRATEGY_HUFFMAN_ONLY
+        ])
 
 
 def img_8bit(img):
@@ -96,7 +112,7 @@ def img_bw(img):
 def get_first_image_file(filenames):
     first_img_file = None
     for filename in filenames:
-        if os.path.isfile(filename) and extension_tif_jpg(filename):
+        if os.path.isfile(filename) and extension_supported(filename):
             first_img_file = filename
             break
     if first_img_file is None:

shinestacker/algorithms/vignetting.py

@@ -185,7 +185,7 @@ class Vignetting(SubAction):
         for i, p in enumerate(self.percentiles):
             s1 = sigmoid_model(0, *params) / self.v0
             s2 = sigmoid_model(self.r_max, *params) / self.v0
-            if s1 > p and s2 < p:
+            if s1 > p > s2:
                 try:
                     c = bisect(lambda x: sigmoid_model(x, *params) / self.v0 - p, 0, self.r_max)
                 except Exception as e:

shinestacker/config/constants.py

@@ -7,7 +7,6 @@ import os
 class _Constants:
     APP_TITLE = "Shine Stacker"
     APP_STRING = "ShineStacker"
-    EXTENSIONS = set(["jpeg", "jpg", "png", "tif", "tiff"])
 
     NUM_UINT8 = 256
     NUM_UINT16 = 65536

shinestacker/gui/action_config_dialog.py

@@ -6,6 +6,7 @@ from PySide6.QtCore import QTimer
 from PySide6.QtWidgets import QWidget, QLabel, QMessageBox, QStackedWidget
 from .. config.constants import constants
 from .. config.app_config import AppConfig
+from .. algorithms.utils import EXTENSIONS_SUPPORTED
 from .. algorithms.align import validate_align_config
 from . action_config import (
     DefaultActionConfigurator, add_tab, create_tab_layout, create_tab_widget,
@@ -122,7 +123,7 @@ class JobConfigurator(DefaultActionConfigurator):
             return 0
         count = 0
         for filename in os.listdir(path):
-            if filename.lower().endswith(('.png', '.jpg', '.jpeg', '.tif', '.tiff')):
+            if os.path.splitext(filename)[-1][1:].lower() in EXTENSIONS_SUPPORTED:
                 count += 1
         return count
 

shinestacker/gui/folder_file_selection.py

@@ -1,8 +1,9 @@
 # pylint: disable=C0114, C0115, C0116, E0611
 import os
+from PySide6.QtCore import Qt
 from PySide6.QtWidgets import (QWidget, QRadioButton, QButtonGroup, QLineEdit,
                                QPushButton, QHBoxLayout, QVBoxLayout, QFileDialog, QMessageBox)
-from PySide6.QtCore import Qt
+from .. algorithms.utils import EXTENSIONS_GUI_STR
 
 
 class FolderFileSelectionWidget(QWidget):
@@ -73,7 +74,7 @@ class FolderFileSelectionWidget(QWidget):
     def browse_files(self):
         files, _ = QFileDialog.getOpenFileNames(
             self, "Select Input Files", "",
-            "Image files (*.png *.jpg *.jpeg *.tif *.tiff)"
+            f"Image files ({EXTENSIONS_GUI_STR})"
         )
         if files:
             parent_dir = os.path.dirname(files[0])

shinestacker/gui/gui_run.py

@@ -9,7 +9,7 @@ from PySide6.QtCore import Signal, Slot
 from .. config.constants import constants
 from .. config.gui_constants import gui_constants
 from .colors import RED_BUTTON_STYLE, BLUE_BUTTON_STYLE, BLUE_COMBO_STYLE
-from .. algorithms.utils import extension_jpg_tif_png, extension_pdf
+from .. algorithms.utils import extension_supported, extension_pdf
 from .gui_logging import LogWorker, QTextEditLogger
 from .gui_images import GuiPdfView, GuiImageView, GuiOpenApp
 from .colors import (
@@ -209,7 +209,7 @@ class RunWindow(QTextEditLogger):
         try:
             if extension_pdf(path):
                 image_view = GuiPdfView(path, self)
-            elif extension_jpg_tif_png(path):
+            elif extension_supported(path):
                 image_view = GuiImageView(path, self)
             else:
                 raise RuntimeError(f"Can't visualize file type {os.path.splitext(path)[1]}.")

shinestacker/gui/new_project.py

@@ -8,7 +8,7 @@ from PySide6.QtCore import Qt
 from .. config.gui_constants import gui_constants
 from .. config.constants import constants
 from .. config.app_config import AppConfig
-from .. algorithms.utils import read_img, extension_tif_jpg
+from .. algorithms.utils import read_img, extension_supported
 from .. algorithms.stack import get_bunches
 from .folder_file_selection import FolderFileSelectionWidget
 from .base_form_dialog import BaseFormDialog
@@ -208,7 +208,7 @@ class NewProjectDialog(BaseFormDialog):
                 return 0
             count = 0
             for filename in os.listdir(path):
-                if extension_tif_jpg(filename):
+                if extension_supported(filename):
                     count += 1
             return count
         if self.input_widget.get_selection_mode() == 'files' and \
@@ -273,7 +273,7 @@ class NewProjectDialog(BaseFormDialog):
                 file_path = None
                 for filename in files:
                     full_path = os.path.join(path, filename)
-                    if extension_tif_jpg(full_path):
+                    if extension_supported(full_path):
                         file_path = full_path
                         break
             if file_path is None:
@@ -284,8 +284,8 @@ class NewProjectDialog(BaseFormDialog):
             height, width = img.shape[:2]
             n_bytes = 1 if img.dtype == np.uint8 else 2
             n_bits = 8 if img.dtype == np.uint8 else 16
-            n_gbytes = float(n_bytes * height * width * self.n_image_files) / constants.ONE_GIGA
-            if n_gbytes > 1 and not self.bunch_stack.isChecked():
+            n_gbytes = 3.0 * n_bytes * height * width * self.n_image_files / constants.ONE_GIGA
+            if n_gbytes > 4 and not self.bunch_stack.isChecked():
                 msg = QMessageBox()
                 msg.setStyleSheet("""
                     QMessageBox {

shinestacker/retouch/exif_data.py

@@ -42,8 +42,11 @@ class ExifData(BaseFormDialog):
             data = exif_dict(self.exif)
         if len(data) > 0:
             for k, (_, d) in data.items():
+                print(k, type(d))
                 if isinstance(d, IFDRational):
                     d = f"{d.numerator}/{d.denominator}"
+                elif len(str(d)) > 40:
+                    d = f"{str(d):.40}..."
                 else:
                     d = f"{d}"
                 if "<<<" not in d and k != 'IPTCNAA':

shinestacker/retouch/file_loader.py

@@ -5,7 +5,7 @@ import numpy as np
 import cv2
 from psdtags import PsdChannelId
 from PySide6.QtCore import QThread, Signal
-from .. algorithms.utils import read_img, extension_tif, extension_jpg
+from .. algorithms.utils import read_img, extension_tif, extension_jpg, extension_png
 from .. algorithms.multilayer import read_multilayer_tiff
 
 
@@ -50,10 +50,10 @@ class FileLoader(QThread):
             raise RuntimeError(f"Path {path} does not exist.")
         if not os.path.isfile(path):
             raise RuntimeError(f"Path {path} is not a file.")
-        if extension_jpg(path):
+        if extension_jpg(path) or extension_png(path):
             try:
                 stack = np.array([cv2.cvtColor(read_img(path), cv2.COLOR_BGR2RGB)])
-                return stack, [path.split('/')[-1].split('.')[0]]
+                return stack, [os.path.splitext(os.path.basename(path))[0]]
             except Exception as e:
                 traceback.print_tb(e.__traceback__)
                 return None, None

shinestacker/retouch/io_gui_handler.py

@@ -7,6 +7,7 @@ from PySide6.QtWidgets import (QFileDialog, QMessageBox, QVBoxLayout, QLabel, QD
                                QApplication, QProgressBar)
 from PySide6.QtGui import QGuiApplication, QCursor
 from PySide6.QtCore import Qt, QObject, QTimer, Signal
+from .. algorithms.utils import EXTENSIONS_GUI_STR, EXTENSIONS_GUI_SAVE_STR
 from .. algorithms.exif import get_exif, write_image_with_exif_data
 from .file_loader import FileLoader
 from .exif_data import ExifData
@@ -135,7 +136,7 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         if file_paths is None:
             file_paths, _ = QFileDialog.getOpenFileNames(
                 self.parent(), "Open Image", "",
-                "Images (*.tif *.tiff *.jpg *.jpeg);;All Files (*)")
+                F"Images ({EXTENSIONS_GUI_STR});;All Files (*)")
         if not file_paths:
             return
         if self.loader_thread and self.loader_thread.isRunning():
@@ -167,7 +168,7 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
     def import_frames(self):
         file_paths, _ = QFileDialog.getOpenFileNames(
             self.parent(), "Select frames", "",
-            "Images Images (*.tif *.tiff *.jpg *.jpeg);;All Files (*)")
+            f"Images Images ({EXTENSIONS_GUI_STR});;All Files (*)")
         if file_paths:
             self.import_frames_from_files(file_paths)
 
@@ -286,8 +287,7 @@ class IOGuiHandler(QObject, LayerCollectionHandler):
         if self.layer_stack() is None:
             return
         path, _ = QFileDialog.getSaveFileName(
-            self.parent(), "Save Image", "",
-            "TIFF Files (*.tif *.tiff);;JPEG Files (*.jpg *.jpeg);;All Files (*)")
+            self.parent(), "Save Image", "", EXTENSIONS_GUI_SAVE_STR)
         if path:
             self.save_master_to_path(path)
 

{shinestacker-1.8.1.dist-info → shinestacker-1.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.8.1
+Version: 1.9.0
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -105,11 +105,13 @@ Pyramid methods in image processing
 - **Logo**: The Shine Stacker logo was designed by [Alessandro Lista](https://linktr.ee/alelista). Copyright © Alessandro Lista. All rights reserved. The logo is not covered by the LGPL-3.0 license of this project.
 
 ## Attribution request
+
 📸 If you publish images created with Shine Stacker, please consider adding a note such as:
 
 *Created with Shine Stacker – https://github.com/lucalista/shinestacker*
 
 This is not mandatory, but highly appreciated.
+
 ---
 > Developed and maintained by [Luca Lista](https://github.com/lucalista).
 > 💡 Contributions, feedback, and feature suggestions are warmly welcome.

{shinestacker-1.8.1.dist-info → shinestacker-1.9.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 shinestacker/__init__.py,sha256=uq2fjAw2z_6TpH3mOcWFZ98GoEPRsNhTAK8N0MMm_e8,448
-shinestacker/_version.py,sha256=VeCo3jG4eMq5JgUgBBkmfX0RYN_MfWUdUGiQ16h2kPg,21
+shinestacker/_version.py,sha256=WddBug1JDIVoyG0cVXLv1jzZiNT54lgulb9KP0Q3AnU,21
 shinestacker/algorithms/__init__.py,sha256=1FwVJ3w9GGbFFkjYJRUedTvcdE4j0ieSgaH9RC9iCY4,877
 shinestacker/algorithms/align.py,sha256=840SLh38JePGQv9vgG2H6jHkgHSAYzSpbNDDTxV5ghg,37915
 shinestacker/algorithms/align_auto.py,sha256=DsHuAkFXSHbtFwp6XRaV3Sy1LGcUZWYAFijJXWrd1Bo,3833
@@ -9,17 +9,17 @@ shinestacker/algorithms/base_stack_algo.py,sha256=mqCCRufLc9k5fZV5Su41AsN1ecHrZJ
 shinestacker/algorithms/corrections.py,sha256=DrfLM33D20l4svuuBtoOiH-KGUH_BL1mAV7mHCA_nGA,1094
 shinestacker/algorithms/denoise.py,sha256=GL3Z4_6MHxSa7Wo4ZzQECZS87tHBFqO0sIVF_jPuYQU,426
 shinestacker/algorithms/depth_map.py,sha256=nRBrZQWbdUqFOtYMEQx9UNdnybrBTeAOr1eV91FlN8U,5611
-shinestacker/algorithms/exif.py,sha256=SM4ZDDe8hCJ3xY6053FNndOiwzEStzdp0WrXurlcHVc,9429
-shinestacker/algorithms/multilayer.py,sha256=EEMDr2NlCU9DCFO5ykbBrY-2q9oBUD0-ctm7x0IXU5U,9911
+shinestacker/algorithms/exif.py,sha256=0kYxk_cZeBgmiB2vEkmKNBVbCNeq_4KF-8lub9ehSPQ,19934
+shinestacker/algorithms/multilayer.py,sha256=SX4digCMvPxvm9KRrwroUwoAc83ScbmjIjN8s5au3wg,10053
 shinestacker/algorithms/noise_detection.py,sha256=SbWcxSPZIxnThXITAe7koPLKhQZ_gciQby50u3QfkGs,9464
 shinestacker/algorithms/pyramid.py,sha256=Z7tlp8Hh3ploAXJCr0VNe33d8H9GNrlqHXq_LapgRwo,8205
 shinestacker/algorithms/pyramid_auto.py,sha256=fl_jXNYLWsBiX0M0UghzCLqai0SGXlmKYHU7Z9SUYSo,6173
 shinestacker/algorithms/pyramid_tiles.py,sha256=t04_06oYF6QkSSyFQEivHh-GDTska2dQEmfCYoscy-c,12216
 shinestacker/algorithms/sharpen.py,sha256=h7PMJBYxucg194Usp_6pvItPUMFYbT-ebAc_-7XBFUw,949
-shinestacker/algorithms/stack.py,sha256=VvYo6w01sGbMIWS3w_4fVz6k7qOTpuEREXTP4kze6B0,5738
-shinestacker/algorithms/stack_framework.py,sha256=YEuaxDqs3gytZMUnub69gcuv5CnbwU3cLxxPQj6HsXQ,14612
-shinestacker/algorithms/utils.py,sha256=VJFOT-OBtDe5ds64VgwyZKa8AX1N91SSJlsgUVC9vMs,12303
-shinestacker/algorithms/vignetting.py,sha256=KFLPbBv8EAKB5PpO4QIqMbTLEufg-lvxOGkVkiOSEqI,10855
+shinestacker/algorithms/stack.py,sha256=OkKC9LWTTPSIFy4teiqC4TFjgRUGp4eiSGlxLKdmdL0,6488
+shinestacker/algorithms/stack_framework.py,sha256=HwB0gDncjJEKHdaR9fFcc2XoRrgxFNrrFDfVyeO4NRM,14616
+shinestacker/algorithms/utils.py,sha256=1RCsOSQ5TSM8y10Wg5JBDWCAEf-vEQReN_5VMtrLW7o,13127
+shinestacker/algorithms/vignetting.py,sha256=Y-K_CTjtNpl0YX86PaM0te-HFxuEcWozhWoB7-g_S7Y,10849
 shinestacker/algorithms/white_balance.py,sha256=PMKsBtxOSn5aRr_Gkx1StHS4eN6kBN2EhNnhg4UG24g,501
 shinestacker/app/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shinestacker/app/about_dialog.py,sha256=pkH7nnxUP8yc0D3vRGd1jRb5cwi1nDVbQRk_OC9yLk8,4144
@@ -34,7 +34,7 @@ shinestacker/app/settings_dialog.py,sha256=x4-mYEUcB1I9SoQmzDpxFzfLI5JU0hbeqmIyd
 shinestacker/config/__init__.py,sha256=aXxi-LmAvXd0daIFrVnTHE5OCaYeK1uf1BKMr7oaXQs,197
 shinestacker/config/app_config.py,sha256=rM1Rndk1GDa5c0AhcVNEN9zSAzxPZixzQYfjODbJUwE,771
 shinestacker/config/config.py,sha256=eBko2D3ADhLTIm9X6hB_a_WsIjwgfE-qmBVkhP1XSvc,1636
-shinestacker/config/constants.py,sha256=fdZ8qp4S5KM_MfXnLCOTnHemNQMcHEio-VatGkDH9-E,8530
+shinestacker/config/constants.py,sha256=qpQ7uuf7qnFesiq4zvt6A7ASjLbyADbbeMzkW-GCbe4,8470
 shinestacker/config/gui_constants.py,sha256=PNxzwmVEppJ2mV_vwp68NhWzJOEitVy1Pk9SwSmRsho,2882
 shinestacker/config/settings.py,sha256=jdRMJRT6AzO-dnvmOCwEGURsGBt36ILH-xszNIvE0ew,4845
 shinestacker/core/__init__.py,sha256=IUEIx6SQ3DygDEHN3_E6uKpHjHtUa4a_U_1dLd_8yEU,484
@@ -45,18 +45,18 @@ shinestacker/core/framework.py,sha256=i-_4v--ZtimmlPUs2DmkEVvbsvEDZmbCmOtMVfCxww
 shinestacker/core/logging.py,sha256=pN4FGcHwI5ouJKwCVoDWQx_Tg3t84mmPh0xhqszDDkw,3111
 shinestacker/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shinestacker/gui/action_config.py,sha256=OWW32h55OTvM6lbfJc3ZhPoa0vVEvsH63iCbTWo6r6E,25843
-shinestacker/gui/action_config_dialog.py,sha256=GYOnTXoEjHHWMS5RECaqtkMMI37OjkP6W5WXPKjYjwE,40727
+shinestacker/gui/action_config_dialog.py,sha256=8vZ1IxC953JXadhb27z3-GiNUZ8G_lg6MVnreuDOw_A,40777
 shinestacker/gui/base_form_dialog.py,sha256=KAUQNtmJazttmOIe4E4pFifbtvcByTAhtCmcIYeA4UE,766
 shinestacker/gui/colors.py,sha256=-HaFprDuzRSKjXoZfX1rdOuvawQAkazqdgLBEiZcFII,1476
 shinestacker/gui/config_dialog.py,sha256=yt3nvh0HPHQuCn3AFlzlIHUJnnxcz-Rrw3W3jS9ZYiE,3447
 shinestacker/gui/flow_layout.py,sha256=3yBU_z7VtvHKpx1H97CHVd81eq9pe1Dcja2EZBGGKcI,3791
-shinestacker/gui/folder_file_selection.py,sha256=IYWfZQFkoD5iO7zJ7BxVVDP9F3Dc0EXLILAhL4q-Cb8,4117
+shinestacker/gui/folder_file_selection.py,sha256=CwussPYMguMk8WuyuUKk28VneafwGR-5yiqPo0bp_XE,4158
 shinestacker/gui/gui_images.py,sha256=KxGBFLL2ztfNmvL4pconi3z5HJCoD2HXxpYZP70aUfM,6803
 shinestacker/gui/gui_logging.py,sha256=kiZcrC2AFYCWgPZo0O5SKw-E5cFrezwf4anS3HjPuNw,8168
-shinestacker/gui/gui_run.py,sha256=38ke2Zq7KfQBZDNCzfw6RVIUdDTElLKf-tawBarlWyw,15684
+shinestacker/gui/gui_run.py,sha256=Tp3BQTbASdfyELQonJPM10dX9mWb7TdecsIjzCnVQsA,15680
 shinestacker/gui/main_window.py,sha256=VYGX-w-A8sy1zsQAJEfLpImax8oB-inx_nZ2XofDEBQ,25777
 shinestacker/gui/menu_manager.py,sha256=mS-pRMymd1yYimbr6Z5YXjMA5AsNuaNcezs8MYWF2DU,12364
-shinestacker/gui/new_project.py,sha256=gvFNToDqLxWbgGBJ19u_2Tn_DlfXTVWQ5wE0dHErXL0,16723
+shinestacker/gui/new_project.py,sha256=fnTWxT0YS390T4CTu6Cdl7pWrjsCiphnKZJvDLzXGlE,16728
 shinestacker/gui/project_controller.py,sha256=h2x7Z1MFKXQGB4dGmdLcXQgcDTtId9RMi3m-4pSli2Y,16963
 shinestacker/gui/project_converter.py,sha256=Gmna0HwbvACcXiX74TaQYumif8ZV8sZ2APLTMM-L1mU,7436
 shinestacker/gui/project_editor.py,sha256=9KEH-CkIbK_yLKRo184C08uYXQ9_aqepEGQrKRqhfUg,25991
@@ -89,14 +89,14 @@ shinestacker/retouch/brush_preview.py,sha256=cOFVMCbEsgR_alzmr_-LLghtGU_unrE-hAj
 shinestacker/retouch/brush_tool.py,sha256=8uVncTA375uC3Nhp2YM0eZjpOR-nN47i2eGjN8tJzOU,8714
 shinestacker/retouch/denoise_filter.py,sha256=QVXFU54MDcylNWtiIcdQSZ3eClW_xNWZhCMIeoEQ8zk,576
 shinestacker/retouch/display_manager.py,sha256=fTZTGbvmX5DXagexuvbNgOF5GiH2Vv-stLUQQwoglp8,10181
-shinestacker/retouch/exif_data.py,sha256=LF-fRXW-reMq-xJ_QRE5j8DC2LVGKIlC6MR3QbC1cdg,1896
-shinestacker/retouch/file_loader.py,sha256=z02-A8_uDZxayI1NFTxT2GVUvEBWStchX9hlN1o5-0U,4784
+shinestacker/retouch/exif_data.py,sha256=17_f2MK1PPfwD1PKAiH5t2l7xp6MWrvfeK5buJECMA0,2012
+shinestacker/retouch/file_loader.py,sha256=FTOGOuQRHekofESFDsCvnUU5XnZH_GbLfxXwKnoxZ4s,4832
 shinestacker/retouch/filter_manager.py,sha256=tOGIWj5HjViL1-iXHkd91X-sZ1c1G531pDmLO0x6zx0,866
 shinestacker/retouch/icon_container.py,sha256=6gw1HO1bC2FrdB4dc_iH81DQuLjzuvRGksZ2hKLT9yA,585
 shinestacker/retouch/image_editor_ui.py,sha256=w6tyeYm1Arjyr-MxbLNKYvURV0qEZqigK0iUoqGy92o,34244
 shinestacker/retouch/image_view_status.py,sha256=2rWi2ugdyjMhWCtRJkwOnb7-tCtVfnGfCY_54qpZhwM,1970
 shinestacker/retouch/image_viewer.py,sha256=xf1vYZRPb9ClCQbqrqAFhPubdqIIpku7DgcY8O5bvYU,4694
-shinestacker/retouch/io_gui_handler.py,sha256=tyHMmR6_uE_IEI-CIcJibVhupxarKYHzX2fuhnesHaI,14616
+shinestacker/retouch/io_gui_handler.py,sha256=ADswLdpkrSyQW6GfHgfUosaKDd9_li5xilTNMRA7bsE,14626
 shinestacker/retouch/io_threads.py,sha256=r0X4it2PfwnmiAU7eStniIfcHhPvuaqdqf5VlnvjZ-4,2832
 shinestacker/retouch/layer_collection.py,sha256=xx8INSLCXIeTQn_nxfCo4QljAmQK1qukSYO1Zk4rqqo,6183
 shinestacker/retouch/overlaid_view.py,sha256=QTTdegUWs99YBZZPlIRdPI5O80U3t_c3HnyegbRqNbA,7029
@@ -109,9 +109,9 @@ shinestacker/retouch/unsharp_mask_filter.py,sha256=SO-6ZgPPDAO9em_MMefVvvSvt01-2
 shinestacker/retouch/view_strategy.py,sha256=jZxB_vX3_0notH0ClxKkLzbdtx4is3vQiYoIP-sDv3M,30216
 shinestacker/retouch/vignetting_filter.py,sha256=M7PZGPdVSq4bqo6wkEznrILMIG3-mTT7iwpgK4Hieyg,3794
 shinestacker/retouch/white_balance_filter.py,sha256=UaH4yxG3fU4vPutBAkV5oTXIQyUTN09x0uTywAzv3sY,8286
-shinestacker-1.8.1.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
-shinestacker-1.8.1.dist-info/METADATA,sha256=3Lq1O-DEp4lKM1EcwARqdZ6T92cjXw5TXerHxIC30Ws,6881
-shinestacker-1.8.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shinestacker-1.8.1.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
-shinestacker-1.8.1.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
-shinestacker-1.8.1.dist-info/RECORD,,
+shinestacker-1.9.0.dist-info/licenses/LICENSE,sha256=pWgb-bBdsU2Gd2kwAXxketnm5W_2u8_fIeWEgojfrxs,7651
+shinestacker-1.9.0.dist-info/METADATA,sha256=ekT-bHQmMgyxKc8igb3YntWBacm_Zr_Uyi3lve-QuQU,6883
+shinestacker-1.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+shinestacker-1.9.0.dist-info/entry_points.txt,sha256=SY6g1LqtMmp23q1DGwLUDT_dhLX9iss8DvWkiWLyo_4,166
+shinestacker-1.9.0.dist-info/top_level.txt,sha256=MhijwnBVX5psfsyX8JZjqp3SYiWPsKe69f3Gnyze4Fw,13
+shinestacker-1.9.0.dist-info/RECORD,,