shinestacker 1.0.4.post2__py3-none-any.whl → 1.2.0__py3-none-any.whl

shinestacker/algorithms/vignetting.py

@@ -1,4 +1,5 @@
 # pylint: disable=C0114, C0115, C0116, R0902, E1101, W0718, W0640, R0913, R0917, R0914
+import math
 import traceback
 import logging
 import numpy as np
@@ -49,16 +50,30 @@ def fit_sigmoid(radii, intensities):
     return res
 
 
+def subsample_factor(subsample, image):
+    if subsample == 0:
+        h, w = image.shape[:2]
+        img_res = (float(h) / 1000) * (float(w) / 1000)
+        target_res = constants.DEFAULT_BALANCE_RES_TARGET_MPX
+        subsample = int(1 + math.floor(img_res / target_res))
+    return subsample
+
+
 def img_subsampled(image, subsample=constants.DEFAULT_VIGN_SUBSAMPLE,
                    fast_subsampling=constants.DEFAULT_VIGN_FAST_SUBSAMPLING):
     image_bw = cv2.cvtColor(img_8bit(image), cv2.COLOR_BGR2GRAY)
-    return image_bw if subsample == 1 else img_subsample(image_bw, subsample, fast_subsampling)
+    if subsample == 0:
+        subsample = subsample_factor(subsample, image)
+    img_sub = image_bw if subsample == 1 else img_subsample(image_bw, subsample, fast_subsampling)
+    return img_sub
 
 
 def compute_fit_parameters(
         image, r_steps, radii=None, intensities=None,
         subsample=constants.DEFAULT_VIGN_SUBSAMPLE,
         fast_subsampling=constants.DEFAULT_VIGN_FAST_SUBSAMPLING):
+    if subsample == 0:
+        subsample = subsample_factor(subsample, image)
     image_sub = img_subsampled(image, subsample, fast_subsampling)
     if radii is None and intensities is None:
         radii, intensities = radial_mean_intensity(image_sub, r_steps)
@@ -77,6 +92,8 @@ def correct_vignetting(
     if params is None:
         if r_steps is None:
             raise RuntimeError("Either r_steps or pars must not be None")
+        if subsample == 0:
+            subsample = subsample_factor(subsample, image)
         params = compute_fit_parameters(
             image, r_steps, subsample=subsample, fast_subsampling=fast_subsampling)
     if v0 is None:
@@ -121,11 +138,12 @@ class Vignetting(SubAction):
         h, w = img_0.shape[:2]
         self.w_2, self.h_2 = w / 2, h / 2
         self.r_max = np.sqrt((w / 2)**2 + (h / 2)**2)
-        image_sub = img_subsampled(img_0, self.subsample, self.fast_subsampling)
+        subsample = subsample_factor(self.subsample, img_0)
+        image_sub = img_subsampled(img_0, subsample, self.fast_subsampling)
         radii, intensities = radial_mean_intensity(image_sub, self.r_steps)
         try:
             params = compute_fit_parameters(
-                img_0, self.r_steps, radii, intensities, self.subsample, self.fast_subsampling)
+                img_0, self.r_steps, radii, intensities, subsample, self.fast_subsampling)
         except Exception as e:
             traceback.print_tb(e.__traceback__)
             self.process.sub_message(
@@ -144,7 +162,7 @@ class Vignetting(SubAction):
         if self.plot_correction:
             plt.figure(figsize=(10, 5))
             plt.plot(radii, intensities, label="image mean intensity")
-            plt.plot(radii, sigmoid_model(radii * self.subsample, *params), label="sigmoid fit")
+            plt.plot(radii, sigmoid_model(radii * subsample, *params), label="sigmoid fit")
             plt.xlabel('radius (pixels)')
             plt.ylabel('mean intensity')
             plt.legend()
@@ -165,7 +183,7 @@ class Vignetting(SubAction):
         self.process.sub_message_r(color_str(": correct vignetting", "cyan"))
         return correct_vignetting(
             img_0, self.max_correction, self.black_threshold, None, params, self.v0,
-            self.subsample, self.fast_subsampling)
+            subsample, self.fast_subsampling)
 
     def begin(self, process):
         self.process = process

shinestacker/config/constants.py

@@ -1,6 +1,7 @@
 # pylint: disable=C0114, C0115, C0116, C0103, R0903
 import sys
 import re
+import os
 
 
 class _Constants:
@@ -12,6 +13,9 @@ class _Constants:
     NUM_UINT16 = 65536
     MAX_UINT8 = 255
     MAX_UINT16 = 65535
+    ONE_KILO = 1024
+    ONE_MEGA = ONE_KILO**2
+    ONE_GIGA = ONE_KILO**3
 
     LOG_FONTS = ['Monaco', 'Menlo', ' Lucida Console', 'Courier New', 'Courier', 'monospace']
     LOG_FONTS_STR = ", ".join(LOG_FONTS)
@@ -39,9 +43,16 @@ class _Constants:
     STACK_ALGO_DEFAULT = STACK_ALGO_PYRAMID
     DEFAULT_PLOTS_PATH = 'plots'
 
+    FIELD_SUBSAMPLE_VALUES_1 = [2, 3, 4, 6, 8, 12, 16, 24, 32]
+    FIELD_SUBSAMPLE_OPTIONS_1 = [f"1/{n} × 1/{n}" for n in FIELD_SUBSAMPLE_VALUES_1]
+    FIELD_SUBSAMPLE_VALUES = [0, 1] + FIELD_SUBSAMPLE_VALUES_1
+    FIELD_SUBSAMPLE_OPTIONS = ['Auto', 'Full resolution'] + FIELD_SUBSAMPLE_OPTIONS_1
+    FIELD_SUBSAMPLE_DEFAULT = FIELD_SUBSAMPLE_VALUES[0]
+
     PATH_SEPARATOR = ';'
 
     LOG_COLOR_ALERT = 'red'
+    LOG_COLOR_WARNING = 'yellow'
     LOG_COLOR_LEVEL_JOB = 'green'
     LOG_COLOR_LEVEL_1 = 'blue'
     LOG_COLOR_LEVEL_2 = 'magenta'
@@ -49,8 +60,10 @@ class _Constants:
 
     DEFAULT_FILE_REVERSE_ORDER = False
     DEFAULT_MULTILAYER_FILE_REVERSE_ORDER = True
+    MULTILAYER_WARNING_MEM_GB = 1
 
     DEFAULT_NOISE_MAP_FILENAME = "noise-map/hot_pixels.png"
+    DEFAULT_NOISE_MAX_FRAMES = 10
     DEFAULT_MN_KERNEL_SIZE = 3
     INTERPOLATE_MEAN = 'MEAN'
     INTERPOLATE_MEDIAN = 'MEDIAN'
@@ -103,11 +116,13 @@ class _Constants:
     DEFAULT_REFINE_ITERS = 100
     DEFAULT_ALIGN_CONFIDENCE = 99.9
     DEFAULT_ALIGN_MAX_ITERS = 2000
+    DEFAULT_ALIGN_ABORT_ABNORMAL = True
     DEFAULT_BORDER_VALUE = [0] * 4
     DEFAULT_BORDER_BLUR = 50
-    DEFAULT_ALIGN_SUBSAMPLE = 2
+    DEFAULT_ALIGN_SUBSAMPLE = 0
+    DEFAULT_ALIGN_RES_TARGET_MPX = 2
     DEFAULT_ALIGN_FAST_SUBSAMPLING = False
-    DEFAULT_ALIGN_MIN_GOOD_MATCHES = 100
+    DEFAULT_ALIGN_MIN_GOOD_MATCHES = 50
 
     BALANCE_LINEAR = "LINEAR"
     BALANCE_GAMMA = "GAMMA"
@@ -118,9 +133,12 @@ class _Constants:
     BALANCE_RGB = "RGB"
     BALANCE_HSV = "HSV"
     BALANCE_HLS = "HLS"
-    VALID_BALANCE_CHANNELS = [BALANCE_LUMI, BALANCE_RGB, BALANCE_HSV, BALANCE_HLS]
+    BALANCE_LAB = "LAB"
+    VALID_BALANCE_CHANNELS = [BALANCE_LUMI, BALANCE_RGB, BALANCE_HSV, BALANCE_HLS,
+                              BALANCE_LAB]
 
-    DEFAULT_BALANCE_SUBSAMPLE = 8
+    DEFAULT_BALANCE_SUBSAMPLE = 0
+    DEFAULT_BALANCE_RES_TARGET_MPX = 2
     DEFAULT_BALANCE_FAST_SUBSAMPLING = False
     DEFAULT_CORR_MAP = BALANCE_LINEAR
     DEFAULT_CHANNEL = BALANCE_LUMI
@@ -129,7 +147,8 @@ class _Constants:
     DEFAULT_R_STEPS = 100
     DEFAULT_BLACK_THRESHOLD = 1.0
     DEFAULT_MAX_CORRECTION = 1
-    DEFAULT_VIGN_SUBSAMPLE = 8
+    DEFAULT_VIGN_SUBSAMPLE = 0
+    DEFAULT_VIGN_RES_TARGET_MPX = 2
     DEFAULT_VIGN_FAST_SUBSAMPLING = False
 
     FLOAT_32 = 'float-32'
@@ -160,6 +179,13 @@ class _Constants:
     DEFAULT_PY_MIN_SIZE = 32
     DEFAULT_PY_KERNEL_SIZE = 5
     DEFAULT_PY_GEN_KERNEL = 0.4
+    DEFAULT_PY_TILE_SIZE = 512
+    DEFAULT_PY_N_TILED_LAYERS = 2
+    DEFAULT_PY_MEMORY_LIMIT_GB = 8
+    DEFAULT_PY_MAX_THREADS = min(os.cpu_count() or 4, 8)
+    DEFAULT_PY_MODE = 'auto'
+    PY_VALID_MODES = ['auto', 'memory', 'tiled']
+    MIN_PY_TILE_SIZE = 256
 
     DEFAULT_PLOT_STACK_BUNCH = False
     DEFAULT_PLOT_STACK = True

shinestacker/gui/action_config.py

@@ -10,7 +10,6 @@ from PySide6.QtWidgets import (QPushButton, QHBoxLayout, QFileDialog, QLabel, QC
 from .. config.constants import constants
 from .select_path_widget import (create_select_file_paths_widget, create_layout_widget_no_margins,
                                  create_layout_widget_and_connect)
-from .project_model import ActionConfig
 
 FIELD_TEXT = 'text'
 FIELD_ABS_PATH = 'abs_path'
@@ -30,23 +29,23 @@ class ActionConfigurator(ABC):
         self.current_wd = current_wd
 
     @abstractmethod
-    def create_form(self, layout, action: ActionConfig, tag="Action"):
+    def create_form(self, layout, action, tag="Action"):
         pass
 
     @abstractmethod
-    def update_params(self, params: Dict[str, Any]) -> bool:
+    def update_params(self, params):
         pass
 
 
 class FieldBuilder:
     def __init__(self, layout, action, current_wd):
-        self.layout = layout
+        self.main_layout = layout
         self.action = action
         self.current_wd = current_wd
         self.fields = {}
 
-    def add_field(self, tag: str, field_type: str, label: str,
-                  required: bool = False, add_to_layout=None, **kwargs):
+    def add_field(self, tag, field_type, label,
+                  required=False, add_to_layout=None, **kwargs):
         if field_type == FIELD_TEXT:
             widget = self.create_text_field(tag, **kwargs)
         elif field_type == FIELD_ABS_PATH:
@@ -93,7 +92,7 @@ class FieldBuilder:
             **kwargs
         }
         if add_to_layout is None:
-            add_to_layout = self.layout
+            add_to_layout = self.main_layout
         add_to_layout.addRow(f"{label}:", widget)
         return widget