Merge pull request #452 from Capsize-Games/develop

clear canvas on file new

src/airunner/enums.py

@@ -80,6 +80,7 @@ class SignalCode(Enum):
     CANVAS_RESIZE_SIGNAL = "canvas_resize_signal"
     CANVAS_UPDATE_CURSOR = "canvas_update_cursor"
     CANVAS_ZOOM_LEVEL_CHANGED = "zoom_level_changed"
+    CANVAS_CLEAR = "clear_canvas"
 
     CLEAR_MEMORY_SIGNAL = "clear_memory_signal"
     CONTROLNET_IMAGE_GENERATED_SIGNAL = "controlnet_image_generated_signal"

src/airunner/widgets/canvas_plus/canvas_plus_widget.py

@@ -124,6 +124,7 @@ def __init__(self, *args, **kwargs):
         self.register(SignalCode.CANVAS_UPDATE_SIGNAL, self.on_update_canvas_signal)
         self.register(SignalCode.LAYER_SET_CURRENT_SIGNAL, self.on_set_current_layer_signal)
         self.register(SignalCode.APPLICATION_SETTINGS_CHANGED_SIGNAL, self.on_application_settings_changed_signal)
+        self.register(SignalCode.CANVAS_CLEAR, self.on_canvas_clear_signal)
 
         self.register_service("canvas_drag_pos", self.canvas_drag_pos)
         self.register_service("canvas_current_active_image", self.canvas_current_active_image)
@@ -537,6 +538,17 @@ def draw_layers(self):
                     self.scene.addItem(self.pixmaps[index])
             continue
 
+    def on_canvas_clear_signal(self):
+        print("on canvas clear signal")
+        self.scene.clear()
+        self.line_group = QGraphicsItemGroup()
+        self.pixmaps = {}
+        settings = self.settings
+        settings["layers"] = []
+        self.settings = settings
+        self.add_layer()
+        self.do_draw()
+
     def set_scene_rect(self):
         self.scene.setSceneRect(0, 0, self.view_size.width(), self.view_size.height())
 

src/airunner/windows/main/layer_mixin.py

@@ -123,10 +123,10 @@ def delete_layer(self, index, layer):
     def on_clear_layers_signal(self, _ignore):
         # delete all widgets from self.container.layout()
         layers = self.settings["layers"]
-        for index, layer in enumerate(layers):
-            if not layer.layer_widget:
-                continue
-            layer.layer_widget.deleteLater()
+        # for index, layer in enumerate(layers):
+        #     if not layer["layer_widget"]:
+        #         continue
+        #     layer["layer_widget"].deleteLater()
         self.add_layer()
         settings = self.settings
         settings["layers"] = layers

src/airunner/windows/main/main_window.py

@@ -383,6 +383,7 @@ def quick_export(self):
     """
     def action_new_document_triggered(self):
         self.new_document()
+        self.emit(SignalCode.CANVAS_CLEAR)
 
     def action_quick_export_image_triggered(self):
         self.quick_export()
@@ -963,7 +964,6 @@ def set_window_title(self):
 
     def new_document(self):
         self.ui.layer_widget.clear_layers()
-        self.clear_history()
         self.is_saved = False
         self._document_name = "Untitled"
         self.set_window_title()