shinestacker 0.2.0.post1.dev1__tar.gz → 0.2.2__tar.gz

shinestacker-0.2.2/.coveragerc

@@ -0,0 +1,5 @@
+[run]
+omit =
+    src/shinestacker/gui/*
+    src/shinestacker/app/*
+    src/shinestacker/retouch/*

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/.github/workflows/ci-multiplatform.yml

@@ -30,10 +30,16 @@ jobs:
 
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip setuptools
+          python -m pip install --upgrade pip setuptools pytest-cov
           pip install -e .[dev]
 
       - name: Run non-GUI tests (test_00*.py)
-        working-directory: tests
         run: >
-          python3 -c "import glob, pytest, sys; sys.exit(pytest.main(glob.glob('test_00*.py') + ['-v', '--disable-warnings']))"
+          python3 -c "import glob, pytest, sys; sys.exit(pytest.main(glob.glob('tests/test_00*.py') + ['-v', '--disable-warnings', '--cov=shinestacker', '--cov-report=xml']))"
+
+      - name: Upload coverage to Codecov
+        if: matrix.os == 'ubuntu-latest'
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: lucalista/shinestacker

{shinestacker-0.2.0.post1.dev1/sandbox → shinestacker-0.2.2/.github/workflows}/pypi-publish.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
 
     permissions:
-      id-token: write  # Needed for trusted publishing (if you prefer)
+      id-token: write
       contents: read
 
     steps:

shinestacker-0.2.2/.readthedocs.yaml

@@ -0,0 +1,22 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version, and other tools you might need
+build:
+  os: ubuntu-24.04
+  tools:
+    python: "3.12"
+
+# Build documentation in the "docs/" directory with Sphinx
+sphinx:
+   configuration: docs/conf.py
+
+# Optionally, but recommended,
+# declare the Python requirements required to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+python:
+   install:
+     - requirements: docs/requirements.txt

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/CHANGELOG.md

@@ -4,6 +4,26 @@ This page reports the main releases only and the main changes therein.
 
 ---
 
+## [v0.2.2] - 2025-07-28
+**More stability and improved tests**
+
+### Changes
+
+* improved test suite and enhanced test coverage
+* updated documentation
+* some stability improvements
+
+---
+
+## [v0.2.1] - 2025-07-27
+**Icon location fix**
+
+### Changes
+
+* icon location fixed, compatibly with PyPI and bundle release build
+
+---
+
 ## [v0.2.0] - 2025-07-27
 **Stability improvements and new package name**
 

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/PKG-INFO

@@ -1,9 +1,11 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 0.2.0.post1.dev1
+Version: 0.2.2
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
+Project-URL: Homepage, https://github.com/lucalista/shinestacker
+Project-URL: Documentation, https://shinestacker.readthedocs.io/
 Classifier: Programming Language :: Python :: 3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.12
@@ -30,17 +32,20 @@ Dynamic: license-file
 # Shine Stacker Processing Framework
 
 [![CI multiplatform](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml/badge.svg)](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml)
+[![PyPI version](https://badge.fury.io/py/shinestacker.svg)](https://pypi.org/project/shinestacker/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/shinestacker)](https://pypi.org/project/shinestacker/)
+[![codecov](https://codecov.io/github/lucalista/shinestacker/graph/badge.svg?token=Y5NKW6VH5G)](https://codecov.io/github/lucalista/shinestacker)
 
-<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies.gif' width="400">  <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies_stack.jpg' width="400">
+<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies.gif' width="400" referrerpolicy="no-referrer">  <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies_stack.jpg' width="400" referrerpolicy="no-referrer">
 
-## Documentation
+# Documentation
 
 📖 [Main documentation](https://github.com/lucalista/shinestacker/blob/main/docs/main.md) • 📝 [Changelog](https://github.com/lucalista/shinestacker/blob/main/CHANGELOG.md)
 
 
-# Credits:
+# Credits
 
-The main pyramid stack algorithm was inspired by the [Laplacian pyramids method](https://github.com/sjawhar/focus-stacking) implementation by Sami Jawhar. The latest implementation was rewritten from the original code that was used under permission of the author for initial versions of this package.
+The main pyramid stack algorithm was initially inspired by the [Laplacian pyramids method](https://github.com/sjawhar/focus-stacking) implementation by Sami Jawhar that was used under permission of the author for initial versions of this package. The implementation in the latest releases was rewritten from the original code.
 
 # Resources
 

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/README.md

@@ -1,17 +1,20 @@
 # Shine Stacker Processing Framework
 
 [![CI multiplatform](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml/badge.svg)](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml)
+[![PyPI version](https://badge.fury.io/py/shinestacker.svg)](https://pypi.org/project/shinestacker/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/shinestacker)](https://pypi.org/project/shinestacker/)
+[![codecov](https://codecov.io/github/lucalista/shinestacker/graph/badge.svg?token=Y5NKW6VH5G)](https://codecov.io/github/lucalista/shinestacker)
 
-<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies.gif' width="400">  <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies_stack.jpg' width="400">
+<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies.gif' width="400" referrerpolicy="no-referrer">  <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies_stack.jpg' width="400" referrerpolicy="no-referrer">
 
-## Documentation
+# Documentation
 
 📖 [Main documentation](https://github.com/lucalista/shinestacker/blob/main/docs/main.md) • 📝 [Changelog](https://github.com/lucalista/shinestacker/blob/main/CHANGELOG.md)
 
 
-# Credits:
+# Credits
 
-The main pyramid stack algorithm was inspired by the [Laplacian pyramids method](https://github.com/sjawhar/focus-stacking) implementation by Sami Jawhar. The latest implementation was rewritten from the original code that was used under permission of the author for initial versions of this package.
+The main pyramid stack algorithm was initially inspired by the [Laplacian pyramids method](https://github.com/sjawhar/focus-stacking) implementation by Sami Jawhar that was used under permission of the author for initial versions of this package. The implementation in the latest releases was rewritten from the original code.
 
 # Resources
 

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/docs/alignment.md

@@ -1,4 +1,6 @@
-# Alignment and registration: scale, tanslation and rotation correction, or full perspective correction
+# Alignment and registration
+
+Automatically align, scale, tanslate and rotate or apply full perspective correction.
 
 ```python
 job.add_action(Actions("align", [AlignFrames(*options)])

shinestacker-0.2.2/docs/api.md

@@ -0,0 +1,10 @@
+# API Reference
+
+```{toctree}
+:maxdepth: 2
+:caption: API Modules
+
+_autosummary/shinestacker.config
+_autosummary/shinestacker.core
+_autosummary/shinestacker.algorithms
+```

shinestacker-0.2.2/docs/conf.py

@@ -0,0 +1,42 @@
+import os
+import sys
+sys.path.insert(0, os.path.abspath('../src'))
+
+project = 'Shine Stacker'
+author = 'Luca Lista'
+html_title = "Shine Stacker Documentation"
+
+extensions = [
+    'myst_parser',
+    'sphinx.ext.mathjax',
+]
+
+myst_enable_extensions = [
+    "dollarmath",
+    "amsmath",
+]
+
+source_suffix = {
+    '.rst': 'restructuredtext',
+    '.md': 'markdown',
+}
+
+master_doc = 'index'
+
+html_theme = 'furo'
+
+extensions = [
+    'myst_parser',
+    'sphinx.ext.autodoc',
+    'sphinx.ext.napoleon',
+    'sphinx.ext.autosummary',
+]
+
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store', '**/.ipynb_checkpoints']
+
+autosummary_generate = True
+autodoc_default_options = {
+    'members': True,
+    'undoc-members': True,
+    'show-inheritance': True,
+}

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/docs/gui.md

@@ -20,7 +20,7 @@ noisy pixel masking.
 
 * If the app is dowloaded from the [releases page](https://github.com/lucalista/focusstack/releases), after the  ```zip``` archive is uncompressed, just double-click the app icon.
 
-<img src='../img/gui-finder.png' width="300">
+<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/gui-finder.png' width="300" referrerpolicy="no-referrer">
 
 **Platform Tip**: Windows apps are inside `/focusstack/`, macOS/Linux apps are directly in the uncompressed folder.
 
@@ -35,7 +35,7 @@ Switching from *Project* to *Retouch* can be done from the *FocusStack* main men
 
 When the app starts, it proposes to create a new project.
 
-<img src='../img/gui-project-new.png' width="600">
+<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/gui-project-new.png' width="600" referrerpolicy="no-referrer">
 
 ### Creating Projects
 1. Select source folder (JPEG/TIFF 8/16-bit)
@@ -44,7 +44,7 @@ When the app starts, it proposes to create a new project.
    - Real-time logs & progress bar
    - Thumbnail previews for each stage
 
-<img src='../img/flow-diagram.png' width="900" alt="FocusStack workflow: Source images → Alignment → Balancing → Stacking">
+<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flow-diagram.png' width="900" alt="FocusStack workflow: Source images → Alignment → Balancing → Stacking" referrerpolicy="no-referrer">
 
 > **Large Set Tip**: For 100+ images:
 > - Split into 10-15 image "bunches" 
@@ -63,7 +63,7 @@ Some actions can be combined in order to produce a single intermediate output (a
 
 It is possible to run a single job, or all jobs within a project.
 
-<img src='../img/gui-project-run.png' width="600">
+<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/gui-project-run.png' width="600" referrerpolicy="no-referrer">
 
 ### Project Run Tabs
 
@@ -75,7 +75,7 @@ When the job finishes, a *Retouch* button is enabled, which opens the output ima
 
 ## Retouch area
 
-<img src='../img/gui-retouch.png' width="600">
+<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/gui-retouch.png' width="600" referrerpolicy="no-referrer">
 
 ### Brush Properties
 Adjust in the top toolbar:

shinestacker-0.2.2/docs/index.md

@@ -0,0 +1,22 @@
+# Shine Stacker
+
+## Focus Stacking Processing Framework and GUI
+
+[![CI multiplatform](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml/badge.svg)](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml)
+[![PyPI version](https://badge.fury.io/py/shinestacker.svg)](https://pypi.org/project/shinestacker/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/shinestacker)](https://pypi.org/project/shinestacker/)
+[![codecov](https://codecov.io/github/lucalista/shinestacker/graph/badge.svg?token=Y5NKW6VH5G)](https://codecov.io/github/lucalista/shinestacker)
+
+```{toctree}
+:maxdepth: 2
+:caption: Content
+
+main.md
+gui.md
+job.md
+alignment.md
+balancing.md
+focus_stacking.md
+multilayer.md
+noise.md
+vignetting.md

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/docs/job.md

@@ -1,4 +1,4 @@
-# Job creation
+# Job creation and action scheduling
 
 Create a job, then schedule the desired actions in a job, then run the job.
 
@@ -13,7 +13,7 @@ Arguments are:
 * ```callbacks``` (optional, default: ```None```): dictionary of callback functions for internal use. If equal to ```'tqdm'```, a progress bar is shown in either text mode or jupyter notebook.
 * ```enabled``` (optional, default: ```True```): allows to switch on and off all actions within a job.
 
-# Schedule multiple actions based on a reference image: align and/or balance images
+## Schedule multiple actions based on a reference image: align and/or balance images
 
 The class ```CombinedActions``` runs multiple actions on each of the frames appearing in a path.
 

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/docs/main.md

@@ -1,8 +1,11 @@
 # Shine Stacker Processing Framework
 
 [![CI multiplatform](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml/badge.svg)](https://github.com/lucalista/shinestacker/actions/workflows/ci-multiplatform.yml)
+[![PyPI version](https://badge.fury.io/py/shinestacker.svg)](https://pypi.org/project/shinestacker/)
+[![Python Versions](https://img.shields.io/pypi/pyversions/shinestacker)](https://pypi.org/project/shinestacker/)
+[![codecov](https://codecov.io/github/lucalista/shinestacker/graph/badge.svg?token=Y5NKW6VH5G)](https://codecov.io/github/lucalista/shinestacker)
 
-<img src='../img/flies.gif' width="400">  <img src='../img/flies_stack.jpg' width="400">
+<img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies.gif' width="400">  <img src='https://raw.githubusercontent.com/lucalista/shinestacker/main/img/flies_stack.jpg' width="400">
 
 > **Professional focus stacking** for microscopy, macro photography, and computational imaging
 
@@ -76,14 +79,14 @@ job.run()
 
 ## Documentation Highlights
 ### Core Processing
-- [Graphical User Interface](../docs/gui.md)
-- [Image alignment](../docs/alignment.md)
-- [Luminosity and color balancing](../docs/balancing.md)
-- [Stacking algorithms](../docs/focus_stacking.md)
+- [Graphical User Interface](gui.md)
+- [Image alignment](alignment.md)
+- [Luminosity and color balancing](balancing.md)
+- [Stacking algorithms](focus_stacking.md)
 ### Advanced Modules
-- [Noisy pixel masking](../docs/noise.md)
-- [Vignetting correction](../docs/vignetting.md)
-- [Multilayer image](../docs/multilayer.md)
+- [Noisy pixel masking](noise.md)
+- [Vignetting correction](vignetting.md)
+- [Multilayer image](multilayer.md)
 
 ## Requirements
 
@@ -96,12 +99,12 @@ job.run()
 ```bash
 pip install imagecodecs matplotlib numpy opencv-python pillow psdtags scipy setuptools-scm tifffile tqdm
 ```
-# GUI support
+## GUI support
 ```bash
 pip install argparse PySide6 jsonpickle webbrowser
 ```
 
-# Jupyter support
+## Jupyter support
 ```bash
 pip install ipywidgets
 ```

shinestacker-0.2.2/docs/requirements.txt

@@ -0,0 +1,3 @@
+sphinx
+myst-parser
+furo

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/pyproject.toml

@@ -33,6 +33,10 @@ dependencies = [
     "setuptools-scm"
 ]
 
+[project.urls]
+Homepage = "https://github.com/lucalista/shinestacker"
+Documentation = "https://shinestacker.readthedocs.io/"
+
 [project.optional-dependencies]
 dev = [
     "pytest",

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/scripts/build_release.py

@@ -20,20 +20,14 @@ pyinstaller_cmd = ["pyinstaller", "--onedir", f"--name={app_name}", "--paths=src
                    f"--distpath=dist/{package_dir}", f"--collect-all={project_name}",
                    "--collect-data=imagecodecs", "--collect-submodules=imagecodecs", "--copy-metadata=imagecodecs"]
 if sys_name == 'darwin':
-    pyinstaller_cmd += ["--windowed", "--icon=ico/shinestacker.icns"]
+    pyinstaller_cmd += ["--windowed", "--icon=src/shinestacker/gui/ico/shinestacker.icns"]
 elif sys_name == 'windows':
-    pyinstaller_cmd += ["--windowed", "--icon=ico/shinestacker.ico"]
+    pyinstaller_cmd += ["--windowed", "--icon=src/shinestacker/gui/ico/shinestacker.ico"]
 pyinstaller_cmd += ["src/shinestacker/app/main.py"]
 
 print(" ".join(pyinstaller_cmd))
 subprocess.run(pyinstaller_cmd, check=True)
 
-ico_dir = project_root / "ico"
-target_ico = dist_dir / package_dir / "ico"
-if target_ico.exists():
-    shutil.rmtree(target_ico)
-shutil.copytree(ico_dir, target_ico)
-
 examples_dir = project_root / "examples"
 target_examples = dist_dir / package_dir / "examples"
 target_examples.mkdir(exist_ok=True)

shinestacker-0.2.2/src/shinestacker/__init__.py

@@ -0,0 +1,16 @@
+# flake8: noqa F401 F403
+from ._version import __version__
+from . import config
+from . import core
+from . import algorithms
+from .config import __all__
+from .core import __all__
+from .algorithms import __all__
+from .config import *
+from .core import *
+from .algorithms import *
+
+__all__ = ['__version__']
+#__all__ += config.__all__
+#__all__ += core.__all__
+#__all__ += algorithms.__all__

shinestacker-0.2.2/src/shinestacker/_version.py

@@ -0,0 +1 @@
+__version__ = '0.2.2'

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/algorithms/__init__.py

@@ -12,3 +12,8 @@ from .vignetting import Vignetting
 import logging
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
+
+__all__ = [
+	'StackJob', 'CombinedActions', 'AlignFrames', 'BalanceFrames', 'FocusStackBunch', 'FocusStack',
+	'DepthMapStack', 'PyramidStack', 'MultiLayer', 'NoiseDetection', 'MaskNoise', 'Vignetting'
+]

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/algorithms/align.py

@@ -62,7 +62,6 @@ def get_good_matches(des_0, des_1, matching_config=None):
 
 
 def validate_align_config(detector, descriptor, match_method):
-    print(detector, descriptor, match_method)
     if descriptor == constants.DESCRIPTOR_SIFT and match_method == constants.MATCHING_NORM_HAMMING:
         raise ValueError("Descriptor SIFT requires matching method KNN")
     if detector == constants.DETECTOR_ORB and descriptor == constants.DESCRIPTOR_AKAZE and \

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/algorithms/core_utils.py

@@ -1,5 +1,5 @@
 import os
-from config.config import config
+from ..config.config import config
 
 if not config.DISABLE_TQDM:
     from tqdm import tqdm

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/app/main.py

@@ -12,7 +12,6 @@ from shinestacker.config.config import config
 config.init(DISABLE_TQDM=True, COMBINED_APP=True, DONT_USE_NATIVE_MENU=True)
 from shinestacker.config.constants import constants
 from shinestacker.core.logging import setup_logging
-from shinestacker.core.core_utils import get_app_base_path
 from shinestacker.gui.main_window import MainWindow
 from shinestacker.retouch.image_editor_ui import ImageEditorUI
 from shinestacker.app.gui_utils import disable_macos_special_menu_items
@@ -138,12 +137,7 @@ expert options are visible by default.
         app.setAttribute(Qt.AA_DontUseNativeMenuBar)
     else:
         disable_macos_special_menu_items()
-    icon_path = f'{get_app_base_path()}'
-    if os.path.exists(f'{icon_path}/ico'):
-        icon_path = f'{icon_path}/ico'
-    else:
-        icon_path = f'{icon_path}/../ico'
-    icon_path = f'{icon_path}/shinestacker.png'
+    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
     app.setWindowIcon(QIcon(icon_path))
     main_app = MainApp()
     app.main_app = main_app

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/app/project.py

@@ -12,7 +12,6 @@ from shinestacker.config.config import config
 config.init(DISABLE_TQDM=True, DONT_USE_NATIVE_MENU=True)
 from shinestacker.config.constants import constants
 from shinestacker.core.logging import setup_logging
-from shinestacker.core.core_utils import get_app_base_path
 from shinestacker.gui.main_window import MainWindow
 from shinestacker.app.gui_utils import disable_macos_special_menu_items
 from shinestacker.app.help_menu import add_help_action
@@ -73,7 +72,8 @@ expert options are visible by default.
         app.setAttribute(Qt.AA_DontUseNativeMenuBar)
     else:
         disable_macos_special_menu_items()
-    app.setWindowIcon(QIcon(f'{get_app_base_path()}/ico/shinestacker.png'))
+    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
+    app.setWindowIcon(QIcon(icon_path))
     window = ProjectApp()
     if args['expert']:
         window.set_expert_options()

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/app/retouch.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import argparse
 from PySide6.QtWidgets import QApplication, QMenu
@@ -5,7 +6,6 @@ from PySide6.QtGui import QIcon, QAction
 from PySide6.QtCore import Qt, QEvent
 from shinestacker.config.config import config
 config.init(DISABLE_TQDM=True, DONT_USE_NATIVE_MENU=True)
-from shinestacker.core.core_utils import get_app_base_path
 from shinestacker.config.config import config
 from shinestacker.config.constants import constants
 from shinestacker.retouch.image_editor_ui import ImageEditorUI
@@ -70,7 +70,8 @@ Multiple directories can be specified separated by ';'.
         app.setAttribute(Qt.AA_DontUseNativeMenuBar)
     else:
         disable_macos_special_menu_items()
-    app.setWindowIcon(QIcon(f'{get_app_base_path()}/ico/shinestacker.png'))
+    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
+    app.setWindowIcon(QIcon(icon_path))
     editor = RetouchApp()
     app.editor = editor
     editor.show()

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/config/__init__.py

@@ -2,3 +2,5 @@
 from .config import config
 from .constants import constants
 from .gui_constants import gui_constants
+
+__all__ = ['config', 'constants', 'gui_constants']

shinestacker-0.2.2/src/shinestacker/core/__init__.py

@@ -0,0 +1,11 @@
+# flake8: noqa F401
+from .logging import setup_logging
+from .exceptions import (FocusStackError, InvalidOptionError, ImageLoadError, ImageSaveError, AlignmentError,
+                         BitDepthError, ShapeError, RunStopException)
+from .framework import Job
+
+__all__ = [
+    'setup_logging',
+    'FocusStackError', 'InvalidOptionError', 'ImageLoadError', 'ImageSaveError',
+    'AlignmentError','BitDepthError', 'ShapeError', 'RunStopException',
+    'Job']

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/gui/main_window.py

@@ -414,6 +414,9 @@ class MainWindow(ActionsWindow, LogManager):
                     menu.addAction(self.job_retouch_path_action)
             menu.exec(event.globalPos())
 
+    def get_icon(self, icon):
+        return QIcon(os.path.join(self.script_dir, f"img/{icon}.png"))
+
     def get_retouch_path(self, job):
         frames_path = [get_action_output_path(action)[0]
                        for action in job.sub_actions if action.type_name == constants.ACTION_COMBO]

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/gui/new_project.py

@@ -6,7 +6,6 @@ from PySide6.QtGui import QIcon
 from PySide6.QtCore import Qt
 from .. config.gui_constants import gui_constants
 from .. config.constants import constants
-from .. core.core_utils import get_app_base_path
 
 
 class NewProjectDialog(QDialog):
@@ -39,12 +38,7 @@ class NewProjectDialog(QDialog):
         self.layout.addRow(label)
 
     def create_form(self):
-        icon_path = f'{get_app_base_path()}'
-        if os.path.exists(f'{icon_path}/ico'):
-            icon_path = f'{icon_path}/ico'
-        else:
-            icon_path = f'{icon_path}/../ico'
-        icon_path = f'{icon_path}/shinestacker.png'
+        icon_path = f"{os.path.dirname(__file__)}/ico/shinestacker.png"
         app_icon = QIcon(icon_path)
         icon_pixmap = app_icon.pixmap(128, 128)
         icon_label = QLabel()

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/gui/project_editor.py

@@ -1,7 +1,6 @@
 import os
 from dataclasses import dataclass
 from PySide6.QtWidgets import QMainWindow, QListWidget, QMessageBox, QDialog, QListWidgetItem, QLabel
-from PySide6.QtGui import QIcon
 from PySide6.QtCore import Qt
 from .. config.constants import constants
 from .colors import ColorPalette
@@ -328,9 +327,6 @@ class ProjectEditor(QMainWindow):
         label = QLabel(html_text)
         widget_list.setItemWidget(item, label)
 
-    def get_icon(self, icon):
-        return QIcon(os.path.join(self.script_dir, f"img/{icon}.png"))
-
     def add_action_CombinedActions(self):
         self.add_action(constants.ACTION_COMBO)
 

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/retouch/exif_data.py

@@ -3,7 +3,6 @@ from PIL.TiffImagePlugin import IFDRational
 from PySide6.QtWidgets import QFormLayout, QHBoxLayout, QPushButton, QDialog, QLabel
 from PySide6.QtGui import QIcon
 from PySide6.QtCore import Qt
-from .. core.core_utils import get_app_base_path
 from .. algorithms.exif import exif_dict
 
 
@@ -32,12 +31,7 @@ class ExifData(QDialog):
         self.layout.addRow(label)
 
     def create_form(self):
-        icon_path = f'{get_app_base_path()}'
-        if os.path.exists(f'{icon_path}/ico'):
-            icon_path = f'{icon_path}/ico'
-        else:
-            icon_path = f'{icon_path}/../ico'
-        icon_path = f'{icon_path}/shinestacker.png'
+        icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
         app_icon = QIcon(icon_path)
         icon_pixmap = app_icon.pixmap(128, 128)
         icon_label = QLabel()

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/retouch/image_editor.py

@@ -364,8 +364,6 @@ class ImageEditor(QMainWindow):
             QMessageBox.critical(self, "Save Error", f"Could not save file: {str(e)}")
 
     def select_exif_path(self):
-        if self.current_stack is None:
-            return
         path, _ = QFileDialog.getOpenFileName(None, "Select file with exif data")
         if path:
             self.exif_path = path

{shinestacker-0.2.0.post1.dev1 → shinestacker-0.2.2}/src/shinestacker/retouch/shortcuts_help.py

@@ -3,7 +3,6 @@ from PySide6.QtWidgets import (QFormLayout, QHBoxLayout, QPushButton, QDialog,
                                QLabel, QVBoxLayout, QWidget)
 from PySide6.QtGui import QIcon
 from PySide6.QtCore import Qt
-from .. core.core_utils import get_app_base_path
 
 
 class ShortcutsHelp(QDialog):
@@ -44,12 +43,7 @@ class ShortcutsHelp(QDialog):
         layout.addRow(label)
 
     def create_form(self, left_layout, right_layout):
-        icon_path = f'{get_app_base_path()}'
-        if os.path.exists(f'{icon_path}/ico'):
-            icon_path = f'{icon_path}/ico'
-        else:
-            icon_path = f'{icon_path}/../ico'
-        icon_path = f'{icon_path}/shinestacker.png'
+        icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
         app_icon = QIcon(icon_path)
         icon_pixmap = app_icon.pixmap(128, 128)
         icon_label = QLabel()