shinestacker 1.6.0__tar.gz → 1.6.1__tar.gz

{shinestacker-1.6.0 → shinestacker-1.6.1}/.github/workflows/release.yml

@@ -29,6 +29,10 @@ jobs:
         with:
           python-version: "3.12"
 
+      - name: Install Inno Setup
+        if: runner.os == 'Windows'
+        run: choco install innosetup -y --no-progress --accept-license
+
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -40,12 +44,14 @@ jobs:
         run: |
           python build_release.py
 
-      - name: Upload artifact
+      - name: Upload artifacts
         uses: actions/upload-artifact@v4
         with:
           name: shinestacker-${{ matrix.os }}
           path: |
             ${{ matrix.os == 'windows-latest' && 'dist/shinestacker-release.zip' || 'dist/shinestacker-release.tar.gz' }}
+            ${{ matrix.os == 'windows-latest' && 'dist/*.exe' || '' }}
+          if-no-files-found: ignore
   create-release:
     needs: publish-release
     runs-on: ubuntu-latest
@@ -61,6 +67,9 @@ jobs:
           cp artifacts/shinestacker-ubuntu-latest/shinestacker-release.tar.gz release_assets/shinestacker-ubuntu.tar.gz
           cp artifacts/shinestacker-macos-latest/shinestacker-release.tar.gz release_assets/shinestacker-macos.tar.gz
           cp artifacts/shinestacker-windows-latest/shinestacker-release.zip release_assets/shinestacker-windows.zip
+          if ls artifacts/shinestacker-windows-latest/shinestacker-setup.exe 1> /dev/null 2>&1; then
+            cp artifacts/shinestacker-windows-latest/shinestacker-setup.exe release_assets/
+          fi
           ls -la release_assets/
 
       - name: Create release
@@ -71,3 +80,4 @@ jobs:
             release_assets/shinestacker-ubuntu.tar.gz
             release_assets/shinestacker-macos.tar.gz
             release_assets/shinestacker-windows.zip
+            release_assets/shinestacker-setup.exe

{shinestacker-1.6.0 → shinestacker-1.6.1}/CHANGELOG.md

@@ -2,7 +2,19 @@
 
 This page reports the main releases only and the main changes therein.
 
-## [v1.6.0] -  2025-09.27
+## [v1.6.1] - 2025-10-01
+** Unreleased updates **
+
+### Changed
+- improved display update performance by refreshing only the painted area
+- multiple frame import now runs in a separate thread, avoiding UI freezes
+- reduced dependencies and code refactored for more robust architecture
+- added windows installer
+- dropped examples and test images reduces distribution file size
+
+-----
+
+## [v1.6.0] -  2025-09-27
 **Few more features and several fixes**
 
 ### Added

{shinestacker-1.6.0/src/shinestacker.egg-info → shinestacker-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.6.0
+Version: 1.6.1
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0

shinestacker-1.6.1/scripts/build_release.py

@@ -0,0 +1,112 @@
+import os
+import shutil
+import tarfile
+import subprocess
+from pathlib import Path
+import platform
+
+#
+# assume the scripts runs under its directory, "scripts", as defined in release.yml
+#
+os.chdir("../")
+project_root = Path(__file__).resolve().parent.parent
+dist_dir = project_root / "dist"
+project_name = "shinestacker"
+app_name = "shinestacker"
+package_dir = "shinestacker"
+
+sys_name = platform.system().lower()
+
+hooks_dir = "scripts/hooks"
+
+print("=== USING HOOKS ===")
+hook_files = list(Path(hooks_dir).glob("hook-*.py"))
+for hook in hook_files:
+    print(f"  - {hook.name}")
+
+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", f"--additional-hooks-dir={hooks_dir}"
+]
+if sys_name == 'darwin':
+    pyinstaller_cmd += ["--windowed", "--icon=src/shinestacker/gui/ico/shinestacker.icns"]
+elif sys_name == 'windows':
+    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)
+
+# examples_dir = project_root / "examples"
+# target_examples = dist_dir / package_dir / "examples"
+# target_examples.mkdir(exist_ok=True)
+# for project_file in ["complete-project.fsp", "stack-from-frames.fsp"]:
+#     shutil.copy(examples_dir / project_file, target_examples)
+#    shutil.copytree(examples_dir / 'input', target_examples / 'input', dirs_exist_ok=True)
+
+if sys_name == 'windows':
+    shutil.make_archive(
+        base_name=str(dist_dir / "shinestacker-release"),
+        format="zip",
+        root_dir=dist_dir,
+        base_dir=package_dir
+    )
+else:
+    archive_path = dist_dir / "shinestacker-release.tar.gz"
+    with tarfile.open(archive_path, "w:gz") as tar:
+        tar.add(
+            dist_dir / package_dir,
+            arcname=package_dir,
+            recursive=True,
+            filter=lambda info: info
+        )
+
+if sys_name == 'windows':
+    print("=== CREATING WINDOWS INSTALLER ===")
+    inno_paths = [
+        r"C:\Program Files (x86)\Inno Setup 6\ISCC.exe",
+        r"C:\Program Files (x86)\Inno Setup 5\ISCC.exe",
+        r"C:\Program Files\Inno Setup 6\ISCC.exe",
+        r"C:\Program Files\Inno Setup 5\ISCC.exe"
+    ]
+    iscc_exe = None
+    for path in inno_paths:
+        if os.path.exists(path):
+            iscc_exe = path
+            print(f"Found Inno Setup at: {path}")
+            break
+    if not iscc_exe:
+        print("Inno Setup not found in standard locations. Checking for Chocolatey...")
+        try:
+            subprocess.run(["choco", "--version"], check=True, capture_output=True)
+            print("Installing Inno Setup via Chocolatey...")
+            subprocess.run(["choco", "install", "innosetup", "-y", "--no-progress", "--accept-license"], check=True)
+            for path in inno_paths:
+                if os.path.exists(path):
+                    iscc_exe = path
+                    print(f"Found Inno Setup at: {path}")
+                    break
+        except (subprocess.CalledProcessError, FileNotFoundError):
+            print("Chocolatey not available or installation failed.")
+    if iscc_exe:
+        iss_script_source = project_root / "scripts" / "shinestacker-inno-setup.iss"
+        iss_script_temp = project_root / "shinestacker-inno-setup.iss"
+        if iss_script_source.exists():
+            print(f"Copying ISS script to project root: {iss_script_temp}")
+            shutil.copy2(iss_script_source, iss_script_temp)
+            print(f"Compiling installer with: {iscc_exe}")
+            subprocess.run([iscc_exe, str(iss_script_temp)], check=True)            
+            print("Removing temporary ISS script")
+            iss_script_temp.unlink()            
+            if dist_dir.exists():
+                installer_files = list(dist_dir.glob("*.exe"))
+                if installer_files:
+                    print(f"Installer created: {installer_files[0].name}")
+        else:
+            print(f"ISS script not found at: {iss_script_source}")
+    else:
+        print("WARNING: Could not find or install Inno Setup. Skipping installer creation.")
+        print("You can manually install Inno Setup from: https://jrsoftware.org/isdl.php")
+        print("Or install Chocolatey and run: choco install innosetup -y")

shinestacker-1.6.1/scripts/hooks/hook-IPython.py

@@ -0,0 +1,10 @@
+excludedimports = [
+    'IPython',
+    'ipywidgets',
+    'jedi',
+    'parso',
+    'prompt_toolkit',
+    'tornado',
+    'zmq',
+    'nbformat',
+]

shinestacker-1.6.1/scripts/hooks/hook-PySide6.py

@@ -0,0 +1,53 @@
+excludedimports = [
+    # Keep only these 5 modules actually used:
+    # PySide6.QtCore
+    # PySide6.QtGui  
+    # PySide6.QtPdf
+    # PySide6.QtPdfWidgets
+    # PySide6.QtWidgets
+    
+    # Exclude everything else:
+    'PySide6.Qt3DAnimation',
+    'PySide6.Qt3DCore',
+    'PySide6.Qt3DExtras', 
+    'PySide6.Qt3DInput',
+    'PySide6.Qt3DLogic',
+    'PySide6.Qt3DRender',
+    'PySide6.QtBluetooth',
+    'PySide6.QtCharts',
+    'PySide6.QtConcurrent',
+    'PySide6.QtDataVisualization',
+    'PySide6.QtDBus',
+    'PySide6.QtDesigner',
+    'PySide6.QtGamepad',
+    'PySide6.QtHelp',
+    'PySide6.QtLocation',
+    'PySide6.QtMultimedia',
+    'PySide6.QtMultimediaWidgets',
+    'PySide6.QtNetwork',
+    'PySide6.QtNfc',
+    'PySide6.QtOpenGL',
+    'PySide6.QtOpenGLWidgets',
+    'PySide6.QtPositioning',
+    'PySide6.QtPrintSupport',
+    'PySide6.QtQml',
+    'PySide6.QtQuick',
+    'PySide6.QtQuick3D',
+    'PySide6.QtQuickWidgets',
+    'PySide6.QtRemoteObjects',
+    'PySide6.QtScxml',
+    'PySide6.QtSensors',
+    'PySide6.QtSerialPort',
+    'PySide6.QtSql',
+    'PySide6.QtSvg',
+    'PySide6.QtTest',
+    'PySide6.QtTextToSpeech',
+    'PySide6.QtUiTools',
+    'PySide6.QtWebChannel',
+    'PySide6.QtWebEngine',
+    'PySide6.QtWebEngineCore',
+    'PySide6.QtWebEngineWidgets',
+    'PySide6.QtWebSockets',
+    'PySide6.QtXml',
+    'PySide6.QtXmlPatterns',
+]

shinestacker-1.6.1/scripts/hooks/hook-opencv.py

@@ -0,0 +1,24 @@
+excludedimports = [
+    'cv2.videoio',
+    'cv2.videostab',
+    'cv2.face', 
+    'cv2.bgsegm',
+    'cv2.optflow',
+    'cv2.saliency',
+    'cv2.text',
+    'cv2.tracking',
+    'cv2.mcc',
+    'cv2.rapid',
+    'cv2.stereo',
+    'cv2.dnn',
+    'cv2.freetype',
+    'cv2.hdf',
+    'cv2.img_hash',
+    'cv2.line_descriptor',
+    'cv2.reg',
+    'cv2.rgbd',
+    'cv2.surface_matching',
+    'cv2.xfeatures2d',
+    'cv2.ximgproc',
+    'cv2.xphoto',
+]

shinestacker-1.6.1/scripts/hooks/hook-tests.py

@@ -0,0 +1,7 @@
+excludedimports = [
+    'matplotlib.tests',
+    'numpy.random._examples', 
+    'scipy.tests',
+    'PIL.tests',
+    'jsonpickle.tests',
+]

shinestacker-1.6.1/scripts/scan_imports.py

@@ -0,0 +1,47 @@
+import ast
+from pathlib import Path
+
+def scan_imports():
+    project_root = Path("../src/shinestacker")
+    imports = {
+        'PySide6': set(),
+        'scipy': set(),
+        'matplotlib': set(),
+        'cv2': set(),
+        'numpy': set(),
+        'PIL': set()
+    }
+    
+    for py_file in project_root.rglob("*.py"):
+        with open(py_file, 'r', encoding='utf-8') as f:
+            try:
+                tree = ast.parse(f.read())
+            except:
+                continue
+        
+        for node in ast.walk(tree):
+            if isinstance(node, ast.Import):
+                for alias in node.names:
+                    for lib in imports.keys():
+                        if lib in alias.name:
+                            imports[lib].add(alias.name)            
+            elif isinstance(node, ast.ImportFrom):
+                if node.module:
+                    for lib in imports.keys():
+                        if lib in node.module:
+                            imports[lib].add(node.module)
+                            if node.names:
+                                for alias in node.names:
+                                    imports[lib].add(f"{node.module}.{alias.name}")
+    return imports
+
+def print_imports(imports):
+    for lib, modules in imports.items():
+        if modules:
+            print(f"\n=== {lib.upper()} IMPORTS ===")
+            for imp in sorted(modules):
+                print(f"  {imp}")
+
+if __name__ == "__main__":
+    found_imports = scan_imports()
+    print_imports(found_imports)

shinestacker-1.6.1/scripts/shinestacker-inno-setup.iss

@@ -0,0 +1,68 @@
+#define MyAppName "ShineStacker"
+#define MyAppVersion "1.6.1"
+#define MyAppPublisher "Luca Lista"
+#define MyAppURL "https://shinestacker.wordpress.com/"
+#define MyAppExeName "shinestacker.exe"
+#define MyAppAssocName MyAppName + " focus stacking project"
+#define MyAppAssocExt ".fsp"
+#define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{A2B55EAF-932F-4D5A-8D80-B7DF79D5AE7B}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run
+; on anything but x64 and Windows 11 on Arm.
+ArchitecturesAllowed=x64compatible
+; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the
+; install be done in "64-bit mode" on x64 or Windows 11 on Arm,
+; meaning it should use the native 64-bit Program Files directory and
+; the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64compatible
+ChangesAssociations=yes
+DisableProgramGroupPage=yes
+LicenseFile=.\LICENSE
+; Uncomment the following line to run in non administrative install mode (install for current user only).
+;PrivilegesRequired=lowest
+OutputBaseFilename=shinestacker-setup
+OutputDir=.\dist
+VersionInfoVersion={#MyAppVersion}
+VersionInfoCompany={#MyAppPublisher}
+SetupIconFile=.\src\shinestacker\gui\ico\shinestacker.ico
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+; Copy the entire shinestacker folder structure that contains both the exe and _internal
+Source: ".\dist\shinestacker\shinestacker\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ".\examples\*"; DestDir: "{app}\examples"; Flags: ignoreversion recursesubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Registry]
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

shinestacker-1.6.1/shinestacker-inno-setup.iss

@@ -0,0 +1,68 @@
+#define MyAppName "ShineStacker"
+#define MyAppVersion "1.6.1"
+#define MyAppPublisher "Luca Lista"
+#define MyAppURL "https://shinestacker.wordpress.com/"
+#define MyAppExeName "shinestacker.exe"
+#define MyAppAssocName MyAppName + " focus stacking project"
+#define MyAppAssocExt ".fsp"
+#define MyAppAssocKey StringChange(MyAppAssocName, " ", "") + MyAppAssocExt
+
+[Setup]
+; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
+; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
+AppId={{A2B55EAF-932F-4D5A-8D80-B7DF79D5AE7B}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+;AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={autopf}\{#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+; "ArchitecturesAllowed=x64compatible" specifies that Setup cannot run
+; on anything but x64 and Windows 11 on Arm.
+ArchitecturesAllowed=x64compatible
+; "ArchitecturesInstallIn64BitMode=x64compatible" requests that the
+; install be done in "64-bit mode" on x64 or Windows 11 on Arm,
+; meaning it should use the native 64-bit Program Files directory and
+; the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64compatible
+ChangesAssociations=yes
+DisableProgramGroupPage=yes
+LicenseFile=.\LICENSE
+; Uncomment the following line to run in non administrative install mode (install for current user only).
+;PrivilegesRequired=lowest
+OutputBaseFilename=shinestacker-setup
+OutputDir=.\dist
+VersionInfoVersion={#MyAppVersion}
+VersionInfoCompany={#MyAppPublisher}
+SetupIconFile=.\src\shinestacker\gui\ico\shinestacker.ico
+SolidCompression=yes
+WizardStyle=modern
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[Files]
+; Copy the entire shinestacker folder structure that contains both the exe and _internal
+Source: ".\dist\shinestacker\shinestacker\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
+Source: ".\examples\*"; DestDir: "{app}\examples"; Flags: ignoreversion recursesubdirs
+; NOTE: Don't use "Flags: ignoreversion" on any shared system files
+
+[Registry]
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+
+[Icons]
+Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
+Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
+

shinestacker-1.6.1/src/shinestacker/_version.py

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

{shinestacker-1.6.0 → shinestacker-1.6.1}/src/shinestacker/app/main.py

@@ -13,6 +13,7 @@ from PySide6.QtCore import Qt, QEvent, QTimer, Signal
 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.config.settings import StdPathFile
 from shinestacker.core.logging import setup_logging
 from shinestacker.gui.main_window import MainWindow
 from shinestacker.retouch.image_editor_ui import ImageEditorUI
@@ -229,7 +230,8 @@ open retouch window at startup instead of project windows.
     if filename and path:
         print("can't specify both arguments --filename and --path", file=sys.stderr)
         sys.exit(1)
-    setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True)
+    setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True,
+                  log_file=StdPathFile('shinestacker.log').get_file_path())
     app = Application(sys.argv)
     if config.DONT_USE_NATIVE_MENU:
         app.setAttribute(Qt.AA_DontUseNativeMenuBar)

{shinestacker-1.6.0 → shinestacker-1.6.1}/src/shinestacker/app/project.py

@@ -12,6 +12,7 @@ from PySide6.QtCore import Qt, QTimer, QEvent
 from shinestacker.config.config import config
 config.init(DISABLE_TQDM=True, DONT_USE_NATIVE_MENU=True)
 from shinestacker.config.constants import constants
+from shinestacker.config.settings import StdPathFile
 from shinestacker.core.logging import setup_logging
 from shinestacker.gui.main_window import MainWindow
 from shinestacker.app.gui_utils import (
@@ -57,7 +58,8 @@ project filename.
 ''')
     add_project_arguments(parser)
     args = vars(parser.parse_args(sys.argv[1:]))
-    setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True)
+    setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True,
+                  log_file=StdPathFile('shinestacker.log').get_file_path())
     app = Application(sys.argv)
     if config.DONT_USE_NATIVE_MENU:
         app.setAttribute(Qt.AA_DontUseNativeMenuBar)

{shinestacker-1.6.0 → shinestacker-1.6.1}/src/shinestacker/app/retouch.py

@@ -1,6 +1,7 @@
 # pylint: disable=C0114, C0115, C0116, C0413, E0611, R0903, E1121, W0201
 import os
 import sys
+import logging
 import argparse
 from PySide6.QtWidgets import QApplication, QMenu
 from PySide6.QtGui import QIcon
@@ -8,6 +9,8 @@ from PySide6.QtCore import Qt, QEvent
 from shinestacker.config.config import config
 config.init(DISABLE_TQDM=True, DONT_USE_NATIVE_MENU=True)
 from shinestacker.config.constants import constants
+from shinestacker.config.settings import StdPathFile
+from shinestacker.core.logging import setup_logging
 from shinestacker.retouch.image_editor_ui import ImageEditorUI
 from shinestacker.app.gui_utils import (
     disable_macos_special_menu_items, fill_app_menu, set_css_style)
@@ -54,6 +57,8 @@ Multiple files can be specified separated by ';'.
     if filename and path:
         print("can't specify both arguments --filename and --path", file=sys.stderr)
         sys.exit(1)
+    setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True,
+                  log_file=StdPathFile('shinestacker.log').get_file_path())
     app = Application(sys.argv)
     if config.DONT_USE_NATIVE_MENU:
         app.setAttribute(Qt.AA_DontUseNativeMenuBar)

{shinestacker-1.6.0 → shinestacker-1.6.1}/src/shinestacker/core/core_utils.py

@@ -26,19 +26,10 @@ def make_tqdm_bar(name, size, ncols=80):
 
 
 def get_app_base_path():
-    sep = '\\' if (platform.system() == 'Windows') else '/'
     if getattr(sys, 'frozen', False):
-        path = os.path.dirname(os.path.realpath(sys.executable))
-        dirs = path.split(sep)
-        last = -1
-        for i in range(len(dirs) - 1, -1, -1):
-            if dirs[i] == 'shinestacker':
-                last = i
-                break
-        path = sep.join(dirs if last == 1 else dirs[:last + 1])
-    elif __file__:
-        path = sep.join(os.path.dirname(os.path.abspath(__file__)).split(sep)[:-3])
-    return path
+        return os.path.dirname(os.path.abspath(sys.executable))
+    else:
+        return os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 def running_under_windows() -> bool:

{shinestacker-1.6.0 → shinestacker-1.6.1}/src/shinestacker/core/logging.py

@@ -1,4 +1,5 @@
 # pylint: disable=C0114, C0115, C0116
+import os
 import logging
 import sys
 from pathlib import Path
@@ -64,8 +65,8 @@ def setup_logging(console_level=logging.INFO, file_level=logging.DEBUG, log_file
         if log_file == '':
             today = datetime.date.today().strftime("%Y-%m-%d")
             log_file = f"logs/{constants.APP_STRING.lower()}-{today}.log"
-        if log_file[0] != '/':
-            log_file = f'{get_app_base_path()}/{log_file}'
+        if not os.path.isabs(log_file):
+            log_file = os.path.join(get_app_base_path(), {log_file})
         Path(log_file).parent.mkdir(parents=True, exist_ok=True)
         file_handler = logging.FileHandler(log_file)
         file_handler.setLevel(file_level)

{shinestacker-1.6.0 → shinestacker-1.6.1}/src/shinestacker/retouch/base_filter.py

@@ -157,7 +157,7 @@ class BaseFilter(QObject, LayerCollectionHandler):
             except Exception:
                 h, w = self.master_layer_copy().shape[:2]
             try:
-                self.undo_manager.extend_undo_area(0, 0, w, h)
+                self.undo_manager.set_paint_area(0, 0, w, h)
                 self.undo_manager.save_undo_state(
                     self.master_layer_copy(),
                     self.name

{shinestacker-1.6.0 → shinestacker-1.6.1}/src/shinestacker/retouch/display_manager.py

@@ -215,7 +215,7 @@ class DisplayManager(QObject, LayerCollectionHandler):
     def refresh_master_view(self):
         if self.has_no_master_layer():
             return
-        self.image_viewer.update_master_display()
+        self.image_viewer.update_master_display_area()
         self.update_master_thumbnail()
 
     def refresh_current_view(self):
@@ -229,7 +229,6 @@ class DisplayManager(QObject, LayerCollectionHandler):
             self.status_message_requested.emit("Temporary view: Individual layer.")
         else:
             self._master_refresh_and_thumb()
-            self.image_viewer.strategy.brush_preview.hide()
             self.status_message_requested.emit("Temporary view: Master.")
 
     def end_temp_view(self):