shinestacker 1.6.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

shinestacker/_version.py

@@ -1 +1 @@
-__version__ = '1.6.0'
+__version__ = '1.7.0'

shinestacker/algorithms/corrections.py

@@ -0,0 +1,26 @@
+# pylint: disable=C0114, C0115, C0116, E1101
+import numpy as np
+import cv2
+from ..config.constants import constants
+
+
+def gamma_correction(img, gamma):
+    max_px_val = constants.MAX_UINT8 if img.dtype == np.uint8 else constants.MAX_UINT16
+    ar = np.arange(0, max_px_val + 1, dtype=np.float64)
+    lut = (((ar / max_px_val) ** (1.0 / gamma)) * max_px_val).astype(img.dtype)
+    return cv2.LUT(img, lut) if img.dtype == np.uint8 else np.take(lut, img)
+
+
+def contrast_correction(img, k):
+    max_px_val = constants.MAX_UINT8 if img.dtype == np.uint8 else constants.MAX_UINT16
+    ar = np.arange(0, max_px_val + 1, dtype=np.float64)
+    x = 2.0 * (ar / max_px_val) - 1.0
+    # f(x) = x * exp(k) / (1 + (exp(k) - 1)|x|),  -1 < x < +1
+    # note that: f(f(x, k), -k) = x
+    exp_k = np.exp(k)
+    numerator = x * exp_k
+    denominator = 1 + (exp_k - 1) * np.abs(x)
+    corrected = numerator / denominator
+    corrected = (corrected + 1.0) * 0.5 * max_px_val
+    lut = np.clip(corrected, 0, max_px_val).astype(img.dtype)
+    return cv2.LUT(img, lut) if img.dtype == np.uint8 else np.take(lut, img)

shinestacker/app/args_parser_opts.py

@@ -1,4 +1,6 @@
 # pylint: disable=C0114, C0116
+import sys
+
 
 def add_project_arguments(parser):
     parser.add_argument('-x', '--expert', action='store_true', help='''
@@ -25,3 +27,40 @@ set side-by-side view.
     view_group.add_argument('-v3', '--view-top-bottom', action='store_true', help='''
 set top-bottom view.
 ''')
+
+
+def extract_positional_filename():
+    positional_filename = None
+    filtered_args = []
+    for arg in sys.argv[1:]:
+        if not arg.startswith('-') and not positional_filename:
+            positional_filename = arg
+        else:
+            filtered_args.append(arg)
+    return positional_filename, filtered_args
+
+
+def setup_filename_argument(parser, use_const=True):
+    if use_const:
+        parser.add_argument('-f', '--filename', nargs='?', const=True, help='''
+filename to open. Can be a project file or image file.
+Multiple files can be specified separated by ';'.
+''')
+    else:
+        parser.add_argument('-f', '--filename', nargs='?', help='''
+filename to open. Can be a project file or image file.
+Multiple files can be specified separated by ';'.
+''')
+
+
+def process_filename_argument(args, positional_filename):
+    filename = args.get('filename')
+    if positional_filename and not filename:
+        filename = positional_filename
+    if filename is True:
+        if positional_filename:
+            filename = positional_filename
+        else:
+            print("Error: -f flag used but no filename provided", file=sys.stderr)
+            sys.exit(1)
+    return filename

shinestacker/app/gui_utils.py

@@ -1,12 +1,15 @@
 # pylint: disable=C0114, C0116, E0611, R0913, R0917
 import os
 import sys
-from PySide6.QtCore import QCoreApplication, QProcess
-from PySide6.QtGui import QAction
+import logging
+from PySide6.QtCore import Qt, QCoreApplication, QProcess
+from PySide6.QtGui import QAction, QIcon
 from shinestacker.config.constants import constants
 from shinestacker.config.config import config
+from shinestacker.config.settings import StdPathFile
 from shinestacker.app.about_dialog import show_about_dialog
 from shinestacker.app.settings_dialog import show_settings_dialog
+from shinestacker.core.logging import setup_logging
 
 
 def disable_macos_special_menu_items():
@@ -71,3 +74,17 @@ def set_css_style(app):
         }
 """
     app.setStyleSheet(css_style)
+
+
+def make_app(application_class):
+    setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True,
+                  log_file=StdPathFile('shinestacker.log').get_file_path())
+    app = application_class(sys.argv)
+    if config.DONT_USE_NATIVE_MENU:
+        app.setAttribute(Qt.AA_DontUseNativeMenuBar)
+    else:
+        disable_macos_special_menu_items()
+    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
+    app.setWindowIcon(QIcon(icon_path))
+    set_css_style(app)
+    return app

shinestacker/app/main.py

@@ -1,26 +1,26 @@
 # pylint: disable=C0114, C0115, C0116, C0413, E0611, R0903, E1121, W0201, R0915, R0912
 import sys
-import os
-import logging
 import argparse
 import matplotlib
 import matplotlib.backends.backend_pdf
 matplotlib.use('agg')
 from PySide6.QtWidgets import (QApplication, QMainWindow, QVBoxLayout, QHBoxLayout, QStackedWidget,
                                QMenu, QMessageBox, QDialog, QLabel, QListWidget, QPushButton)
-from PySide6.QtGui import QAction, QIcon, QGuiApplication
-from PySide6.QtCore import Qt, QEvent, QTimer, Signal
+from PySide6.QtGui import QAction, QGuiApplication
+from PySide6.QtCore import 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.core.logging import setup_logging
 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, fill_app_menu, set_css_style)
+from shinestacker.app.gui_utils import fill_app_menu
 from shinestacker.app.help_menu import add_help_action
 from shinestacker.app.open_frames import open_frames
-from shinestacker.app.args_parser_opts import add_project_arguments, add_retouch_arguments
+from shinestacker.app.args_parser_opts import (
+    add_project_arguments, add_retouch_arguments, extract_positional_filename,
+    setup_filename_argument, process_filename_argument
+)
+from shinestacker.app.gui_utils import make_app
 
 
 class SelectionDialog(QDialog):
@@ -205,15 +205,12 @@ class Application(QApplication):
 
 
 def main():
+    positional_filename, filtered_args = extract_positional_filename()
     parser = argparse.ArgumentParser(
-        prog=f'{constants.APP_STRING.lower()}-retouch',
+        prog=f'{constants.APP_STRING.lower()}',
         description='Focus stacking App.',
         epilog=f'This app is part of the {constants.APP_STRING} package.')
-    parser.add_argument('-f', '--filename', nargs='?', help='''
-if a single file is specified, it can be either a project or an image.
-Multiple frames can be specified as a list of files.
-Multiple files can be specified separated by ';'.
-''')
+    setup_filename_argument(parser, use_const=True)
     app_group = parser.add_mutually_exclusive_group()
     app_group.add_argument('-j', '--project', action='store_true', help='''
 open project window at startup instead of project windows (default).
@@ -223,23 +220,17 @@ open retouch window at startup instead of project windows.
 ''')
     add_project_arguments(parser)
     add_retouch_arguments(parser)
-    args = vars(parser.parse_args(sys.argv[1:]))
-    filename = args['filename']
+    args = vars(parser.parse_args(filtered_args))
+    filename = process_filename_argument(args, positional_filename)
     path = args['path']
     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)
-    app = Application(sys.argv)
-    if config.DONT_USE_NATIVE_MENU:
-        app.setAttribute(Qt.AA_DontUseNativeMenuBar)
-    else:
-        disable_macos_special_menu_items()
-    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
-    app.setWindowIcon(QIcon(icon_path))
+
+    app = make_app(Application)
     main_app = MainApp()
     app.main_app = main_app
-    set_css_style(app)
+
     main_app.show()
     main_app.activateWindow()
     if args['expert']:

shinestacker/app/project.py

@@ -1,23 +1,23 @@
 # pylint: disable=C0114, C0115, C0116, C0413, E0611, R0903, E1121, W0201
 import os
 import sys
-import logging
 import argparse
 import matplotlib
 import matplotlib.backends.backend_pdf
 matplotlib.use('agg')
 from PySide6.QtWidgets import QApplication, QMenu
-from PySide6.QtGui import QIcon
-from PySide6.QtCore import Qt, QTimer, QEvent
+from PySide6.QtCore import 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.core.logging import setup_logging
 from shinestacker.gui.main_window import MainWindow
-from shinestacker.app.gui_utils import (
-    disable_macos_special_menu_items, fill_app_menu, set_css_style)
+from shinestacker.app.gui_utils import fill_app_menu
 from shinestacker.app.help_menu import add_help_action
-from shinestacker.app.args_parser_opts import add_project_arguments
+from shinestacker.app.args_parser_opts import (
+    add_project_arguments, extract_positional_filename,
+    setup_filename_argument, process_filename_argument
+)
+from shinestacker.app.gui_utils import make_app
 
 
 class ProjectApp(MainWindow):
@@ -48,30 +48,21 @@ class Application(QApplication):
 
 
 def main():
+    positional_filename, filtered_args = extract_positional_filename()
     parser = argparse.ArgumentParser(
         prog=f'{constants.APP_STRING.lower()}-project',
         description='Manage and run focus stack jobs.',
         epilog=f'This app is part of the {constants.APP_STRING} package.')
-    parser.add_argument('-f', '--filename', nargs='?', help='''
-project filename.
-''')
+    setup_filename_argument(parser, use_const=True)
     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)
-    app = Application(sys.argv)
-    if config.DONT_USE_NATIVE_MENU:
-        app.setAttribute(Qt.AA_DontUseNativeMenuBar)
-    else:
-        disable_macos_special_menu_items()
-    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
-    app.setWindowIcon(QIcon(icon_path))
-    set_css_style(app)
+    args = vars(parser.parse_args(filtered_args))
+    filename = process_filename_argument(args, positional_filename)
+    app = make_app(Application)
     window = ProjectApp()
     if args['expert']:
         window.set_expert_options()
     app.window = window
     window.show()
-    filename = args['filename']
     if filename:
         QTimer.singleShot(100, lambda: window.project_controller.open_project(filename))
     elif args['new-project']:

shinestacker/app/retouch.py

@@ -1,19 +1,20 @@
 # pylint: disable=C0114, C0115, C0116, C0413, E0611, R0903, E1121, W0201
-import os
 import sys
 import argparse
 from PySide6.QtWidgets import QApplication, QMenu
-from PySide6.QtGui import QIcon
-from PySide6.QtCore import Qt, QEvent
+from PySide6.QtCore import 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.retouch.image_editor_ui import ImageEditorUI
-from shinestacker.app.gui_utils import (
-    disable_macos_special_menu_items, fill_app_menu, set_css_style)
+from shinestacker.app.gui_utils import fill_app_menu
 from shinestacker.app.help_menu import add_help_action
 from shinestacker.app.open_frames import open_frames
-from shinestacker.app.args_parser_opts import add_retouch_arguments
+from shinestacker.app.args_parser_opts import (
+    add_retouch_arguments, extract_positional_filename,
+    setup_filename_argument, process_filename_argument
+)
+from shinestacker.app.gui_utils import make_app
 
 
 class RetouchApp(ImageEditorUI):
@@ -39,29 +40,20 @@ class Application(QApplication):
 
 
 def main():
+    positional_filename, filtered_args = extract_positional_filename()
     parser = argparse.ArgumentParser(
         prog=f'{constants.APP_STRING.lower()}-retouch',
         description='Final retouch focus stack image from individual frames.',
         epilog=f'This app is part of the {constants.APP_STRING} package.')
-    parser.add_argument('-f', '--filename', nargs='?', help='''
-import frames from files.
-Multiple files can be specified separated by ';'.
-''')
+    setup_filename_argument(parser, use_const=True)
     add_retouch_arguments(parser)
-    args = vars(parser.parse_args(sys.argv[1:]))
-    filename = args['filename']
+    args = vars(parser.parse_args(filtered_args))
+    filename = process_filename_argument(args, positional_filename)
     path = args['path']
     if filename and path:
         print("can't specify both arguments --filename and --path", file=sys.stderr)
         sys.exit(1)
-    app = Application(sys.argv)
-    if config.DONT_USE_NATIVE_MENU:
-        app.setAttribute(Qt.AA_DontUseNativeMenuBar)
-    else:
-        disable_macos_special_menu_items()
-    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
-    app.setWindowIcon(QIcon(icon_path))
-    set_css_style(app)
+    app = make_app(Application)
     editor = RetouchApp()
     app.editor = editor
     editor.show()

shinestacker/core/core_utils.py

@@ -26,19 +26,9 @@ 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))
+    return os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 
 
 def running_under_windows() -> bool:

shinestacker/core/logging.py

@@ -1,4 +1,5 @@
 # pylint: disable=C0114, C0115, C0116
+import os
 import logging
 import sys
 from pathlib import Path
@@ -63,9 +64,9 @@ def setup_logging(console_level=logging.INFO, file_level=logging.DEBUG, log_file
     if log_file is not None:
         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}'
+            log_file = os.path.join('logs', f"{constants.APP_STRING.lower()}-{today}.log")
+        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/gui/tab_widget.py

@@ -3,7 +3,6 @@ import os
 from PySide6.QtCore import Qt, Signal
 from PySide6.QtGui import QPixmap
 from PySide6.QtWidgets import QWidget, QVBoxLayout, QTabWidget, QLabel, QStackedWidget
-from .. core.core_utils import get_app_base_path
 
 
 class TabWidgetWithPlaceholder(QWidget):
@@ -20,10 +19,7 @@ class TabWidgetWithPlaceholder(QWidget):
         self.stacked_widget.addWidget(self.tab_widget)
         self.placeholder = QLabel()
         self.placeholder.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        rel_path = 'ico/focus_stack_bkg.png'
-        icon_path = f'{get_app_base_path()}/{rel_path}'
-        if not os.path.exists(icon_path):
-            icon_path = f'{get_app_base_path()}/../{rel_path}'
+        icon_path = f"{os.path.dirname(__file__)}/ico/shinestacker_bkg.png"
         if os.path.exists(icon_path):
             pixmap = QPixmap(icon_path)
             pixmap = pixmap.scaled(250, 250, Qt.AspectRatioMode.KeepAspectRatio,

shinestacker/retouch/adjustments.py

@@ -0,0 +1,93 @@
+# pylint: disable=C0114, C0115, C0116, E0611, W0221, R0913, R0917, R0902, R0914, E1101
+import math
+import cv2
+from .base_filter import BaseFilter
+from .. algorithms.utils import bgr_to_hls, hls_to_bgr
+from .. algorithms.corrections import gamma_correction, contrast_correction
+
+
+class GammaSCurveFilter(BaseFilter):
+    def __init__(
+            self, name, parent, image_viewer, layer_collection, undo_manager,
+            window_title, gamma_label, scurve_label):
+        super().__init__(name, parent, image_viewer, layer_collection, undo_manager,
+                         preview_at_startup=True)
+        self.window_title = window_title
+        self.gamma_label = gamma_label
+        self.scurve_label = scurve_label
+        self.min_gamma = -1
+        self.max_gamma = +1
+        self.initial_gamma = 0
+        self.min_scurve = -1
+        self.max_scurve = 1
+        self.initial_scurve = 0
+        self.lumi_slider = None
+        self.contrast_slider = None
+
+    def setup_ui(self, dlg, layout, do_preview, restore_original, **kwargs):
+        dlg.setWindowTitle(self.window_title)
+        dlg.setMinimumWidth(600)
+        params = {
+            self.gamma_label: (self.min_gamma, self.max_gamma, self.initial_gamma, "{:.1%}"),
+            self.scurve_label: (self.min_scurve, self.max_scurve, self.initial_scurve, "{:.1%}"),
+        }
+
+        def set_slider(name, slider):
+            if name == self.gamma_label:
+                self.lumi_slider = slider
+            elif name == self.scurve_label:
+                self.contrast_slider = slider
+
+        value_labels = self.create_sliders(params, dlg, layout, set_slider)
+
+        def update_value(name, slider_value, min_val, max_val, fmt):
+            value = self.value_from_slider(slider_value, min_val, max_val)
+            value_labels[name].setText(fmt.format(value))
+            if self.preview_check.isChecked():
+                self.preview_timer.start()
+
+        self.lumi_slider.valueChanged.connect(
+            lambda v: update_value(
+                self.gamma_label, v, self.min_gamma,
+                self.max_gamma, params[self.gamma_label][3]))
+        self.contrast_slider.valueChanged.connect(
+            lambda v: update_value(
+                self.scurve_label, v, self.min_scurve,
+                self.max_scurve, params[self.scurve_label][3]))
+        self.set_timer(do_preview, restore_original, dlg)
+
+    def get_params(self):
+        return (
+            self.value_from_slider(
+                self.lumi_slider.value(), self.min_gamma, self.max_gamma),
+            self.value_from_slider(
+                self.contrast_slider.value(), self.min_scurve, self.max_scurve)
+        )
+
+
+class LumiContrastFilter(GammaSCurveFilter):
+    def __init__(self, name, parent, image_viewer, layer_collection, undo_manager):
+        super().__init__(
+            name, parent, image_viewer, layer_collection, undo_manager,
+            "Luminosity, Contrast", "Luminosity", "Constrat")
+
+    def apply(self, image, luminosity, contrast):
+        img_corr = contrast_correction(image, 0.5 * contrast)
+        img_corr = gamma_correction(img_corr, math.exp(0.5 * luminosity))
+        return img_corr
+
+
+class SaturationVibranceFilter(GammaSCurveFilter):
+    def __init__(self, name, parent, image_viewer, layer_collection, undo_manager):
+        super().__init__(
+            name, parent, image_viewer, layer_collection, undo_manager,
+            "Saturation, Vibrance", "Saturation", "Vibrance")
+
+    def apply(self, image, stauration, vibrance):
+        img_corr = bgr_to_hls(image)
+        h, l, s = cv2.split(img_corr)
+        s_corr = contrast_correction(s, - vibrance)
+        s_corr = gamma_correction(s_corr, math.exp(0.5 * stauration))
+        img_corr = cv2.merge([h, l, s_corr])
+        img_corr = hls_to_bgr(img_corr)
+        return img_corr

shinestacker/retouch/base_filter.py

@@ -3,6 +3,7 @@ import traceback
 from abc import abstractmethod
 import numpy as np
 from PySide6.QtCore import Qt, QThread, QTimer, QObject, Signal
+from PySide6.QtGui import QFontMetrics
 from PySide6.QtWidgets import (
     QHBoxLayout, QLabel, QSlider, QDialog, QVBoxLayout, QCheckBox, QDialogButtonBox)
 from .layer_collection import LayerCollectionHandler
@@ -27,6 +28,7 @@ class BaseFilter(QObject, LayerCollectionHandler):
         self.preview_check = None
         self.button_box = None
         self.preview_timer = None
+        self.max_range = 500
 
     @abstractmethod
     def setup_ui(self, dlg, layout, do_preview, restore_original, **kwargs):
@@ -40,6 +42,47 @@ class BaseFilter(QObject, LayerCollectionHandler):
     def apply(self, image, *params):
         pass
 
+    def slider_from_value(self, value, min_val, max_val):
+        return (value - min_val) / (max_val - min_val) * self.max_range
+
+    def value_from_slider(self, slider_value, min_val, max_val):
+        return min_val + (max_val - min_val) * float(slider_value) / self.max_range
+
+    def create_sliders(self, params, dlg, layout, set_slider):
+        value_labels = {}
+        font_metrics = QFontMetrics(dlg.font())
+        max_name_width = 0
+        max_value_width = 0
+        for name, (min_val, max_val, init_val, fmt) in params.items():
+            name_width = font_metrics.horizontalAdvance(f"{name}:")
+            max_name_width = max(max_name_width, name_width)
+            sample_values = [min_val, max_val, init_val]
+            for val in sample_values:
+                value_width = font_metrics.horizontalAdvance(fmt.format(val))
+                max_value_width = max(max_value_width, value_width)
+        max_name_width += 10
+        max_value_width += 10
+        for name, (min_val, max_val, init_val, fmt) in params.items():
+            param_layout = QHBoxLayout()
+            name_label = QLabel(f"{name}:")
+            name_label.setFixedWidth(max_name_width)
+            name_label.setAlignment(Qt.AlignRight | Qt.AlignVCenter)
+            param_layout.addWidget(name_label)
+            slider = QSlider(Qt.Horizontal)
+            slider.setRange(0, self.max_range)
+            slider.setValue(self.slider_from_value(init_val, min_val, max_val))
+            param_layout.addWidget(slider, 1)
+            value_label = QLabel(fmt.format(init_val))
+            value_label.setFixedWidth(max_value_width)
+            value_label.setAlignment(Qt.AlignLeft | Qt.AlignVCenter)
+            param_layout.addWidget(value_label)
+            layout.addLayout(param_layout)
+            set_slider(name, slider)
+            value_labels[name] = value_label
+        self.create_base_widgets(
+            layout, QDialogButtonBox.Ok | QDialogButtonBox.Cancel, 200, dlg)
+        return value_labels
+
     def connect_signals(self, update_master_thumbnail, mark_as_modified, filter_gui_set_enabled):
         self.update_master_thumbnail_requested.connect(update_master_thumbnail)
         self.mark_as_modified_requested.connect(mark_as_modified)
@@ -157,7 +200,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
@@ -191,6 +234,13 @@ class BaseFilter(QObject, LayerCollectionHandler):
         self.preview_timer.setSingleShot(True)
         self.preview_timer.setInterval(preview_latency)
 
+    def set_timer(self, do_preview, restore_original, dlg):
+        self.preview_timer.timeout.connect(do_preview)
+        self.connect_preview_toggle(self.preview_check, do_preview, restore_original)
+        self.button_box.accepted.connect(dlg.accept)
+        self.button_box.rejected.connect(dlg.reject)
+        QTimer.singleShot(0, do_preview)
+
     class PreviewWorker(QThread):
         finished = Signal(np.ndarray, int, tuple)
 
@@ -222,14 +272,14 @@ class BaseFilter(QObject, LayerCollectionHandler):
 
 class OneSliderBaseFilter(BaseFilter):
     def __init__(self, name, parent, image_viewer, layer_collection, undo_manager,
-                 max_value, initial_value, title,
+                 min_value, max_value, initial_value, title,
                  allow_partial_preview=True, partial_preview_threshold=0.5,
                  preview_at_startup=True):
         super().__init__(name, parent, image_viewer, layer_collection, undo_manager,
                          allow_partial_preview,
                          partial_preview_threshold, preview_at_startup)
-        self.max_range = 500
         self.max_value = max_value
+        self.min_value = min_value
         self.initial_value = initial_value
         self.slider = None
         self.value_label = None
@@ -239,6 +289,13 @@ class OneSliderBaseFilter(BaseFilter):
     def add_widgets(self, layout, dlg):
         pass
 
+    def slider_from_value_1(self, value):
+        return int((value - self.min_value) / (self.max_value - self.min_value) * self.max_range)
+
+    def value_from_slider_1(self, slider_value):
+        return self.min_value + \
+            (self.max_value - self.min_value) * float(slider_value) / self.max_range
+
     def setup_ui(self, dlg, layout, do_preview, restore_original, **kwargs):
         dlg.setWindowTitle(self.title)
         dlg.setMinimumWidth(600)
@@ -246,7 +303,7 @@ class OneSliderBaseFilter(BaseFilter):
         slider_layout.addWidget(QLabel("Amount:"))
         slider_local = QSlider(Qt.Horizontal)
         slider_local.setRange(0, self.max_range)
-        slider_local.setValue(int(self.initial_value / self.max_value * self.max_range))
+        slider_local.setValue(self.slider_from_value_1(self.initial_value))
         slider_layout.addWidget(slider_local)
         self.value_label = QLabel(self.format.format(self.initial_value))
         slider_layout.addWidget(self.value_label)
@@ -254,9 +311,7 @@ class OneSliderBaseFilter(BaseFilter):
         self.add_widgets(layout, dlg)
         self.create_base_widgets(
             layout, QDialogButtonBox.Ok | QDialogButtonBox.Cancel, 200, dlg)
-
         self.preview_timer.timeout.connect(do_preview)
-
         slider_local.valueChanged.connect(self.config_changed)
         self.connect_preview_toggle(
             self.preview_check, self.do_preview_delayed, restore_original)
@@ -269,7 +324,7 @@ class OneSliderBaseFilter(BaseFilter):
             self.do_preview_delayed()
 
     def config_changed(self, val):
-        float_val = self.max_value * float(val) / self.max_range
+        float_val = self.value_from_slider_1(val)
         self.value_label.setText(self.format.format(float_val))
         self.param_changed(val)
 
@@ -277,7 +332,7 @@ class OneSliderBaseFilter(BaseFilter):
         self.preview_timer.start()
 
     def get_params(self):
-        return (self.max_value * self.slider.value() / self.max_range,)
+        return (self.value_from_slider_1(self.slider.value()),)
 
     def apply(self, image, *params):
         assert False

shinestacker/retouch/denoise_filter.py

@@ -6,7 +6,7 @@ from .. algorithms.denoise import denoise
 class DenoiseFilter(OneSliderBaseFilter):
     def __init__(self, name, parent, image_viewer, layer_collection, undo_manager):
         super().__init__(name, parent, image_viewer, layer_collection, undo_manager,
-                         10.0, 2.5, "Denoise",
+                         0.0, 10.0, 2.5, "Denoise",
                          allow_partial_preview=True, preview_at_startup=False)
 
     def apply(self, image, strength):

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):