shinestacker 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

shinestacker/retouch/image_editor.py

@@ -1,61 +1,28 @@
 import traceback
 import numpy as np
-import cv2
 from PySide6.QtWidgets import (QMainWindow, QFileDialog, QMessageBox, QAbstractItemView,
                                QVBoxLayout, QLabel, QDialog, QApplication)
-from PySide6.QtGui import QPixmap, QPainter, QColor, QImage, QPen, QBrush, QRadialGradient, QGuiApplication, QCursor
+from PySide6.QtGui import QPixmap, QPainter, QColor, QImage, QPen, QBrush, QGuiApplication, QCursor
 from PySide6.QtCore import Qt, QTimer, QEvent, QPoint
 from .. config.constants import constants
 from .. config.gui_constants import gui_constants
-from .. core.exceptions import ShapeError, BitDepthError
-from .. algorithms.exif import get_exif, write_image_with_exif_data
-from .. algorithms.multilayer import write_multilayer_tiff_from_images
-from .. algorithms.utils import read_img, validate_image, get_img_metadata
 from .brush import Brush
 from .brush_controller import BrushController
 from .undo_manager import UndoManager
 from .file_loader import FileLoader
 from .exif_data import ExifData
-
-
-def slider_to_brush_size(slider_val):
-    normalized = slider_val / gui_constants.BRUSH_SIZE_SLIDER_MAX
-    size = gui_constants.BRUSH_SIZES['min'] + gui_constants.BRUSH_SIZES['max'] * (normalized ** gui_constants.BRUSH_GAMMA)
-    return max(gui_constants.BRUSH_SIZES['min'], min(gui_constants.BRUSH_SIZES['max'], size))
-
-
-def create_brush_gradient(center_x, center_y, radius, hardness, inner_color=None, outer_color=None, opacity=100):
-    gradient = QRadialGradient(center_x, center_y, float(radius))
-    inner = inner_color if inner_color is not None else QColor(*gui_constants.BRUSH_COLORS['inner'])
-    outer = outer_color if outer_color is not None else QColor(*gui_constants.BRUSH_COLORS['gradient_end'])
-    inner_with_opacity = QColor(inner)
-    inner_with_opacity.setAlpha(int(float(inner.alpha()) * float(opacity) / 100.0))
-    if hardness < 100:
-        hardness_normalized = float(hardness) / 100.0
-        gradient.setColorAt(0.0, inner_with_opacity)
-        gradient.setColorAt(hardness_normalized, inner_with_opacity)
-        gradient.setColorAt(1.0, outer)
-    else:
-        gradient.setColorAt(0.0, inner_with_opacity)
-        gradient.setColorAt(1.0, inner_with_opacity)
-    return gradient
+from .layer_collection import LayerCollection
+from .io_manager import IOManager
+from .brush_gradient import create_brush_gradient
 
 
 class ImageEditor(QMainWindow):
     def __init__(self):
         super().__init__()
-        self.current_stack = None
-        self.master_layer = None
-        self.current_labels = None
-        self.current_layer = 0
-        self.shape = None
-        self.dtype = None
-        self._brush_mask_cache = {}
+        self.layer_collection = LayerCollection()
+        self.io_manager = IOManager(self.layer_collection)
         self.view_mode = 'master'
         self.temp_view_individual = False
-        self.current_file_path = ''
-        self.exif_path = ''
-        self.exif_data = None
         self.modified = False
         self.installEventFilter(self)
         self.update_timer = QTimer(self)
@@ -119,43 +86,14 @@ class ImageEditor(QMainWindow):
             return True
 
     def sort_layers(self, order):
-        if not hasattr(self, 'current_stack') or not hasattr(self, 'current_labels'):
-            return
-        master_index = -1
-        master_label = None
-        master_layer = None
-        for i, label in enumerate(self.current_labels):
-            if label.lower() == "master":
-                master_index = i
-                master_label = self.current_labels.pop(i)
-                master_layer = self.current_stack[i]
-                self.current_stack = np.delete(self.current_stack, i, axis=0)
-                break
-        if order == 'asc':
-            self.sorted_indices = sorted(range(len(self.current_labels)),
-                                         key=lambda i: self.current_labels[i].lower())
-        elif order == 'desc':
-            self.sorted_indices = sorted(range(len(self.current_labels)),
-                                         key=lambda i: self.current_labels[i].lower(),
-                                         reverse=True)
-        else:
-            raise ValueError(f"Invalid sorting order: {order}")
-        self.current_labels = [self.current_labels[i] for i in self.sorted_indices]
-        self.current_stack = self.current_stack[self.sorted_indices]
-        if master_index != -1:
-            self.current_labels.insert(0, master_label)
-            self.current_stack = np.insert(self.current_stack, 0, master_layer, axis=0)
-            self.master_layer = master_layer.copy()
-            self.master_layer.setflags(write=True)
+        self.layer_collection.sort_layers(order)
         self.update_thumbnails()
-        if self.current_layer >= len(self.current_stack):
-            self.current_layer = len(self.current_stack) - 1
-        self.change_layer(self.current_layer)
+        self.change_layer(self.layer_collection.current_layer)
 
     def update_title(self):
         title = constants.APP_TITLE
-        if self.current_file_path:
-            title += f" - {self.current_file_path.split('/')[-1]}"
+        if self.io_manager.current_file_path:
+            title += f" - {self.io_manager.current_file_path.split('/')[-1]}"
             if self.modified:
                 title += " *"
         self.window().setWindowTitle(title)
@@ -173,7 +111,7 @@ class ImageEditor(QMainWindow):
             self.import_frames_from_files(file_paths)
             return
         path = file_paths[0] if isinstance(file_paths, list) else file_paths
-        self.current_file_path = path
+        self.io_manager.current_file_path = path
         QGuiApplication.setOverrideCursor(QCursor(Qt.BusyCursor))
         self.loading_dialog = QDialog(self)
         self.loading_dialog.setWindowTitle("Loading")
@@ -195,14 +133,12 @@ class ImageEditor(QMainWindow):
         QApplication.restoreOverrideCursor()
         self.loading_timer.stop()
         self.loading_dialog.hide()
-        self.current_stack = stack
+        self.layer_collection.layer_stack = stack
         if labels is None:
-            self.current_labels = [f'Layer {i:03d}' for i in range(len(stack))]
+            self.layer_collection.layer_labels = [f'Layer {i:03d}' for i in range(len(stack))]
         else:
-            self.current_labels = labels
-        self.master_layer = master_layer
-        self.shape = np.array(master_layer).shape
-        self.dtype = master_layer.dtype
+            self.layer_collection.layer_labels = labels
+        self.layer_collection.master_layer = master_layer
         self.modified = False
         self.undo_manager.reset()
         self.blank_layer = np.zeros(master_layer.shape[:2])
@@ -210,7 +146,7 @@ class ImageEditor(QMainWindow):
         self.image_viewer.setup_brush_cursor()
         self.change_layer(0)
         self.image_viewer.reset_zoom()
-        self.statusBar().showMessage(f"Loaded: {self.current_file_path}")
+        self.statusBar().showMessage(f"Loaded: {self.io_manager.current_file_path}")
         self.thumbnail_list.setFocus()
         self.update_title()
 
@@ -220,7 +156,7 @@ class ImageEditor(QMainWindow):
         self.loading_dialog.accept()
         self.loading_dialog.deleteLater()
         QMessageBox.critical(self, "Error", error_msg)
-        self.statusBar().showMessage(f"Error loading: {self.current_file_path}")
+        self.statusBar().showMessage(f"Error loading: {self.io_manager.current_file_path}")
 
     def mark_as_modified(self):
         self.modified = True
@@ -231,68 +167,32 @@ class ImageEditor(QMainWindow):
                                                      "Images Images (*.tif *.tiff *.jpg *.jpeg);;All Files (*)")
         if file_paths:
             self.import_frames_from_files(file_paths)
+        self.statusBar().showMessage("Imported selected frames")
 
     def import_frames_from_files(self, file_paths):
-        if file_paths is None or len(file_paths) == 0:
+        try:
+            stack, labels, master = self.io_manager.import_frames(file_paths)
+        except Exception as e:
+            msg = QMessageBox()
+            msg.setIcon(QMessageBox.Critical)
+            msg.setWindowTitle("Import error")
+            msg.setText(str(e))
+            msg.exec()
             return
-        if self.current_stack is None and len(file_paths) > 0:
-            path = file_paths[0]
-            img = cv2.cvtColor(read_img(path), cv2.COLOR_BGR2RGB)
-            self.current_stack = np.array([img])
-            self.shape, self.dtype = get_img_metadata(img)
-            label = path.split("/")[-1].split(".")[0]
-            self.current_labels = [label]
-            if self.master_layer is None:
-                self.master_layer = img.copy()
-            self.blank_layer = np.zeros(self.master_layer.shape[:2])
-            next_paths = file_paths[1:]
+        if self.layer_collection.layer_stack is None and len(stack) > 0:
+            self.layer_collection.layer_stack = np.array(stack)
+            self.layer_collection.layer_labels = labels
+            self.layer_collection.master_layer = master
+            self.blank_layer = np.zeros(master.shape[:2])
         else:
-            next_paths = file_paths
-        for path in next_paths:
-            try:
-                label = path.split("/")[-1].split(".")[0]
-                img = cv2.cvtColor(read_img(path), cv2.COLOR_BGR2RGB)
-                try:
-                    validate_image(img, self.shape, self.dtype)
-                except ShapeError as e:
-                    msg = QMessageBox()
-                    msg.setIcon(QMessageBox.Critical)
-                    msg.setWindowTitle("Import error")
-                    msg.setText(f"All files must have the same shape.\n{str(e)}")
-                    msg.exec()
-                    return
-                except BitDepthError as e:
-                    msg = QMessageBox()
-                    msg.setIcon(QMessageBox.Critical)
-                    msg.setWindowTitle("Import error")
-                    msg.setText(f"All flies must have the same bit depth.\n{str(e)}")
-                    msg.exec()
-                    return
-                except Exception as e:
-                    traceback.print_tb(e.__traceback__)
-                    raise e
-                    return
-                label_x = label
-                i = 0
-                while label_x in self.current_labels:
-                    i += 1
-                    label_x = f"{label} ({i})"
-                self.current_labels.append(label_x)
-                self.current_stack = np.append(self.current_stack, [img], axis=0)
-            except Exception as e:
-                traceback.print_tb(e.__traceback__)
-                msg = QMessageBox()
-                msg.setIcon(QMessageBox.Critical)
-                msg.setWindowTitle("Import error")
-                msg.setText(f"Error loading file: {path}.\n{str(e)}")
-                msg.exec()
-                self.statusBar().showMessage(f"Error loading file: {path}")
-                break
+            for img, label in zip(stack, labels):
+                self.layer_collection.layer_labels.append(label)
+                self.layer_collection.layer_stack = np.append(
+                    self.layer_collection.layer_stack, [img], axis=0)
         self.mark_as_modified()
         self.change_layer(0)
         self.image_viewer.reset_zoom()
         self.thumbnail_list.setFocus()
-
         self.update_thumbnails()
 
     def save_file(self):
@@ -308,7 +208,7 @@ class ImageEditor(QMainWindow):
             self.save_multilayer_as()
 
     def save_multilayer(self):
-        if self.current_stack is None:
+        if self.layer_collection.layer_stack is None:
             return
         if self.current_file_path != '':
             extension = self.current_file_path.split('.')[-1]
@@ -318,7 +218,7 @@ class ImageEditor(QMainWindow):
         self.save_multilayer_file_as()
 
     def save_multilayer_as(self):
-        if self.current_stack is None:
+        if self.layer_collection.layer_stack is None:
             return
         path, _ = QFileDialog.getSaveFileName(self, "Save Image", "",
                                               "TIFF Files (*.tif *.tiff);;All Files (*)")
@@ -329,10 +229,8 @@ class ImageEditor(QMainWindow):
 
     def save_multilayer_to_path(self, path):
         try:
-            master_layer = {'Master': self.master_layer}
-            individual_layers = {label: image for label, image in zip(self.current_labels, self.current_stack)}
-            write_multilayer_tiff_from_images({**master_layer, **individual_layers}, path, exif_path=self.exif_path)
-            self.current_file_path = path
+            self.io_manager.save_multilayer(path)
+            self.io_manager.current_file_path = path
             self.modified = False
             self.update_title()
             self.statusBar().showMessage(f"Saved multilayer to: {path}")
@@ -341,7 +239,7 @@ class ImageEditor(QMainWindow):
             QMessageBox.critical(self, "Save Error", f"Could not save file: {str(e)}")
 
     def save_master(self):
-        if self.master_layer is None:
+        if self.layer_collection.master_layer is None:
             return
         if self.current_file_path != '':
             self.save_master_to_path(self.current_file_path)
@@ -349,7 +247,7 @@ class ImageEditor(QMainWindow):
         self.save_master_as()
 
     def save_master_as(self):
-        if self.current_stack is None:
+        if self.layer_collection.layer_stack is None:
             return
         path, _ = QFileDialog.getSaveFileName(self, "Save Image", "",
                                               "TIFF Files (*.tif *.tiff);;JPEG Files (*.jpg *.jpeg);;All Files (*)")
@@ -358,8 +256,8 @@ class ImageEditor(QMainWindow):
 
     def save_master_to_path(self, path):
         try:
-            write_image_with_exif_data(self.exif_data, cv2.cvtColor(self.master_layer, cv2.COLOR_RGB2BGR), path)
-            self.current_file_path = path
+            self.io_manager.save_master(path)
+            self.io_manager.current_file_path = path
             self.modified = False
             self.update_title()
             self.statusBar().showMessage(f"Saved master layer to: {path}")
@@ -370,20 +268,19 @@ class ImageEditor(QMainWindow):
     def select_exif_path(self):
         path, _ = QFileDialog.getOpenFileName(None, "Select file with exif data")
         if path:
-            self.exif_path = path
-            self.exif_data = get_exif(path)
+            self.io_manager.set_exif_data(path)
             self.statusBar().showMessage(f"EXIF data extracted from {path}.")
-        self._exif_dialog = ExifData(self.exif_data, self)
+        self._exif_dialog = ExifData(self.io_manager.exif_data, self)
         self._exif_dialog.exec()
 
     def close_file(self):
         if self._check_unsaved_changes():
-            self.master_layer = None
+            self.layer_collection.master_layer = None
             self.blank_layer = None
             self.current_stack = None
-            self.master_layer = None
-            self.current_layer = 0
-            self.current_file_path = ''
+            self.layer_collection.master_layer = None
+            self.layer_collection.current_layer_idx = 0
+            self.io_manager.current_file_path = ''
             self.modified = False
             self.undo_manager.reset()
             self.image_viewer.clear_image()
@@ -423,10 +320,10 @@ class ImageEditor(QMainWindow):
             self.display_master_layer()
 
     def display_master_layer(self):
-        if self.master_layer is None:
+        if self.layer_collection.master_layer is None:
             self.image_viewer.clear_image()
         else:
-            qimage = self.numpy_to_qimage(self.master_layer)
+            qimage = self.numpy_to_qimage(self.layer_collection.master_layer)
             self.image_viewer.set_image(qimage)
 
     def create_thumbnail(self, layer, size):
@@ -440,30 +337,30 @@ class ImageEditor(QMainWindow):
         return QPixmap.fromImage(qimg.scaled(*gui_constants.UI_SIZES['thumbnail'], Qt.KeepAspectRatio))
 
     def update_master_thumbnail(self):
-        if self.master_layer is None:
+        if self.layer_collection.master_layer is None:
             self.master_thumbnail_label.clear()
         else:
             thumb_size = gui_constants.UI_SIZES['thumbnail']
-            master_thumb = self.create_thumbnail(self.master_layer, thumb_size)
+            master_thumb = self.create_thumbnail(self.layer_collection.master_layer, thumb_size)
             self.master_thumbnail_label.setPixmap(master_thumb)
 
     def update_thumbnails(self):
         self.update_master_thumbnail()
         self.thumbnail_list.clear()
         thumb_size = gui_constants.UI_SIZES['thumbnail']
-        if self.current_stack is None:
+        if self.layer_collection.layer_stack is None:
             return
-        for i, (layer, label) in enumerate(zip(self.current_stack, self.current_labels)):
+        for i, (layer, label) in enumerate(zip(self.layer_collection.layer_stack, self.layer_collection.layer_labels)):
             thumbnail = self.create_thumbnail(layer, thumb_size)
-            self._add_thumbnail_item(thumbnail, label, i, i == self.current_layer)
+            self._add_thumbnail_item(thumbnail, label, i, i == self.layer_collection.current_layer_idx)
 
     def _add_thumbnail_item(self, thumbnail, label, i, is_current):
         pass
 
     def change_layer(self, layer_idx):
-        if 0 <= layer_idx < len(self.current_stack):
+        if 0 <= layer_idx < self.layer_collection.number_of_layers():
             view_state = self.image_viewer.get_view_state()
-            self.current_layer = layer_idx
+            self.layer_collection.current_layer_idx = layer_idx
             self.display_current_view()
             self.image_viewer.set_view_state(view_state)
             self.thumbnail_list.setCurrentRow(layer_idx)
@@ -471,14 +368,10 @@ class ImageEditor(QMainWindow):
             self.image_viewer.update_brush_cursor()
             self.image_viewer.setFocus()
 
-    def change_layer_item(self, item):
-        layer_idx = self.thumbnail_list.row(item)
-        self.change_layer(layer_idx)
-
     def display_current_layer(self):
-        if self.current_stack is None:
+        if self.layer_collection.layer_stack is None:
             return
-        layer = self.current_stack[self.current_layer]
+        layer = self.layer_collection.current_layer()
         qimage = self.numpy_to_qimage(layer)
         self.image_viewer.set_image(qimage)
 
@@ -497,65 +390,65 @@ class ImageEditor(QMainWindow):
         return QImage()
 
     def prev_layer(self):
-        if self.current_stack is not None:
-            new_idx = max(0, self.current_layer - 1)
-            if new_idx != self.current_layer:
+        if self.layer_collection.layer_stack is not None:
+            new_idx = max(0, self.layer_collection.current_layer_idx - 1)
+            if new_idx != self.layer_collection.current_layer_idx:
                 self.change_layer(new_idx)
                 self.highlight_thumbnail(new_idx)
 
     def next_layer(self):
-        if self.current_stack is not None:
-            new_idx = min(len(self.current_stack) - 1, self.current_layer + 1)
-            if new_idx != self.current_layer:
+        if self.layer_collection.layer_stack is not None:
+            new_idx = min(self.layer_collection.number_of_layers() - 1, self.layer_collection.current_layer_idx + 1)
+            if new_idx != self.layer_collection.current_layer_idx:
                 self.change_layer(new_idx)
                 self.highlight_thumbnail(new_idx)
 
     def highlight_thumbnail(self, index):
         self.thumbnail_list.setCurrentRow(index)
-        self.thumbnail_list.scrollToItem(self.thumbnail_list.item(index),
-                                         QAbstractItemView.PositionAtCenter)
+        self.thumbnail_list.scrollToItem(self.thumbnail_list.item(index), QAbstractItemView.PositionAtCenter)
 
     def update_brush_size(self, slider_val):
+
+        def slider_to_brush_size(slider_val):
+            normalized = slider_val / gui_constants.BRUSH_SIZE_SLIDER_MAX
+            size = gui_constants.BRUSH_SIZES['min'] + \
+                gui_constants.BRUSH_SIZES['max'] * (normalized ** gui_constants.BRUSH_GAMMA)
+            return max(gui_constants.BRUSH_SIZES['min'], min(gui_constants.BRUSH_SIZES['max'], size))
+
         self.brush.size = slider_to_brush_size(slider_val)
         self.update_brush_thumb()
-        self.image_viewer.update_brush_cursor()
-        self.clear_brush_cache()
 
     def increase_brush_size(self, amount=5):
-        val = self.brush_size_slider.value()
-        self.brush_size_slider.setValue(min(val + amount, self.brush_size_slider.maximum()))
+        val = min(self.brush_size_slider.value() + amount, self.brush_size_slider.maximum())
+        self.brush_size_slider.setValue(val)
         self.update_brush_size(val)
 
     def decrease_brush_size(self, amount=5):
-        val = self.brush_size_slider.value()
-        self.brush_size_slider.setValue(max(val - amount, self.brush_size_slider.minimum()))
+        val = max(self.brush_size_slider.value() - amount, self.brush_size_slider.minimum())
+        self.brush_size_slider.setValue(val)
         self.update_brush_size(val)
 
     def increase_brush_hardness(self, amount=2):
-        val = self.hardness_slider.value()
-        self.hardness_slider.setValue(min(val + amount, self.hardness_slider.maximum()))
+        val = min(self.hardness_slider.value() + amount, self.hardness_slider.maximum())
+        self.hardness_slider.setValue(val)
         self.update_brush_hardness(val)
 
     def decrease_brush_hardness(self, amount=2):
-        val = self.hardness_slider.value()
-        self.hardness_slider.setValue(max(val - amount, self.hardness_slider.minimum()))
+        val = max(self.hardness_slider.value() - amount, self.hardness_slider.minimum())
+        self.hardness_slider.setValue(val)
         self.update_brush_hardness(val)
 
     def update_brush_hardness(self, hardness):
         self.brush.hardness = hardness
         self.update_brush_thumb()
-        self.image_viewer.update_brush_cursor()
-        self.clear_brush_cache()
 
     def update_brush_opacity(self, opacity):
         self.brush.opacity = opacity
         self.update_brush_thumb()
-        self.image_viewer.update_brush_cursor()
 
     def update_brush_flow(self, flow):
         self.brush.flow = flow
         self.update_brush_thumb()
-        self.image_viewer.update_brush_cursor()
 
     def update_brush_thumb(self):
         width, height = gui_constants.UI_SIZES['brush_preview']
@@ -591,15 +484,13 @@ class ImageEditor(QMainWindow):
             painter.drawText(0, 55, f"Flow: {self.brush.flow}%")
         painter.end()
         self.brush_preview.setPixmap(pixmap)
-
-    def clear_brush_cache(self):
-        self._brush_mask_cache.clear()
+        self.image_viewer.update_brush_cursor()
 
     def allow_cursor_preview(self):
         return self.view_mode == 'master' and not self.temp_view_individual
 
     def copy_layer_to_master(self):
-        if self.current_stack is None or self.master_layer is None:
+        if self.layer_collection.layer_stack is None or self.layer_collection.master_layer is None:
             return
         reply = QMessageBox.question(
             self,
@@ -609,27 +500,27 @@ class ImageEditor(QMainWindow):
             QMessageBox.No
         )
         if reply == QMessageBox.Yes:
-            self.master_layer = self.current_stack[self.current_layer].copy()
-            self.master_layer.setflags(write=True)
+            self.layer_collection.master_layer = self.layer_collection.current_layer().copy()
+            self.layer_collection.master_layer.setflags(write=True)
             self.display_current_view()
             self.update_thumbnails()
             self.mark_as_modified()
-            self.statusBar().showMessage(f"Copied layer {self.current_layer + 1} to master")
+            self.statusBar().showMessage(f"Copied layer {self.layer_collection.current_layer_idx + 1} to master")
 
     def copy_brush_area_to_master(self, view_pos):
-        if self.current_layer is None or self.current_stack is None or len(self.current_stack) == 0 \
+        if self.layer_collection.layer_stack is None or self.layer_collection.number_of_layers() == 0 \
            or self.view_mode != 'master' or self.temp_view_individual:
             return
-        area = self.brush_controller.apply_brush_operation(self.master_layer_copy,
-                                                           self.current_stack[self.current_layer],
-                                                           self.master_layer, self.mask_layer,
+        area = self.brush_controller.apply_brush_operation(self.layer_collection.master_layer_copy,
+                                                           self.layer_collection.current_layer(),
+                                                           self.layer_collection.master_layer, self.mask_layer,
                                                            view_pos, self.image_viewer)
         self.undo_manager.extend_undo_area(*area)
 
     def begin_copy_brush_area(self, pos):
         if self.view_mode == 'master' and not self.temp_view_individual:
             self.mask_layer = self.blank_layer.copy()
-            self.master_layer_copy = self.master_layer.copy()
+            self.layer_collection.copy_master_layer()
             self.undo_manager.reset_undo_area()
             self.copy_brush_area_to_master(pos)
             self.needs_update = True
@@ -649,7 +540,7 @@ class ImageEditor(QMainWindow):
         if self.update_timer.isActive():
             self.display_master_layer()
             self.update_master_thumbnail()
-            self.undo_manager.save_undo_state(self.master_layer_copy, 'Brush Stroke')
+            self.undo_manager.save_undo_state(self.layer_collection.master_layer_copy, 'Brush Stroke')
             self.update_timer.stop()
             self.mark_as_modified()
 

shinestacker/retouch/image_editor_ui.py

@@ -172,7 +172,12 @@ class ImageEditorUI(ImageFilters):
         self.thumbnail_list.setFixedWidth(gui_constants.THUMB_WIDTH)
         self.thumbnail_list.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.thumbnail_list.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
-        self.thumbnail_list.itemClicked.connect(self.change_layer_item)
+
+        def change_layer_item(item):
+            layer_idx = self.thumbnail_list.row(item)
+            self.change_layer(layer_idx)
+
+        self.thumbnail_list.itemClicked.connect(change_layer_item)
         self.thumbnail_list.setStyleSheet("""
             QListWidget {
                 background-color: #f5f5f5;
@@ -226,12 +231,12 @@ class ImageEditorUI(ImageFilters):
         self.undo_action = QAction("Undo", self)
         self.undo_action.setEnabled(False)
         self.undo_action.setShortcut("Ctrl+Z")
-        self.undo_action.triggered.connect(self.undo_last_brush)
+        self.undo_action.triggered.connect(self.undo)
         edit_menu.addAction(self.undo_action)
         self.redo_action = QAction("Redo", self)
         self.redo_action.setEnabled(False)
         self.redo_action.setShortcut("Ctrl+Y")
-        self.redo_action.triggered.connect(self.redo_last_brush)
+        self.redo_action.triggered.connect(self.redo)
         edit_menu.addAction(self.redo_action)
         edit_menu.addSeparator()
 
@@ -381,17 +386,19 @@ class ImageEditorUI(ImageFilters):
             self._update_label_in_data(old_label, new_label, i)
 
     def _update_label_in_data(self, old_label, new_label, i):
-        self.current_labels[i] = new_label
+        self.layer_collection.layer_labels[i] = new_label
 
-    def undo_last_brush(self):
-        if self.undo_manager.undo(self.master_layer):
+    def undo(self):
+        if self.undo_manager.undo(self.layer_collection.master_layer):
             self.display_current_view()
+            self.update_master_thumbnail()
             self.mark_as_modified()
             self.statusBar().showMessage("Undo applied", 2000)
 
-    def redo_last_brush(self):
-        if self.undo_manager.redo(self.master_layer):
+    def redo(self):
+        if self.undo_manager.redo(self.layer_collection.master_layer):
             self.display_current_view()
+            self.update_master_thumbnail()
             self.mark_as_modified()
             self.statusBar().showMessage("Redo applied", 2000)