fixed issues with undoing relative widgets

5 files changed, 18 insertions, 5 deletions

diff --git a/src/gui/actions.py b/src/gui/actions.py
index 0fe97f2..1444569 100644
--- a/src/gui/actions.py
+++ b/src/gui/actions.py
@@ -20,11 +20,20 @@ class AddComponent(QUndoCommand):
         self.parent = parent
         self.moduleI = moduleI
         self.compI = compI
+        self.comp = None
 
     def redo(self):
-        self.parent.core.insertComponent(self.compI, self.moduleI, self.parent)
+        if self.comp is None:
+            self.parent.core.insertComponent(
+                self.compI, self.moduleI, self.parent)
+        else:
+            # inserting previously-created component
+            self.parent.core.insertComponent(
+                self.compI, self.comp, self.parent)
+
 
     def undo(self):
+        self.comp = self.parent.core.selectedComponents[self.compI]
         self.parent._removeComponent(self.compI)
 
 
diff --git a/src/gui/mainwindow.py b/src/gui/mainwindow.py
index 8000b3b..76c53af 100644
--- a/src/gui/mainwindow.py
+++ b/src/gui/mainwindow.py
@@ -25,7 +25,7 @@ from toolkit import (
 )
 
 
-log = logging.getLogger('AVP.MainWindow')
+log = logging.getLogger('AVP.Gui.MainWindow')
 
 
 class MainWindow(QtWidgets.QMainWindow):
@@ -76,7 +76,7 @@ class MainWindow(QtWidgets.QMainWindow):
         # Create the preview window and its thread, queues, and timers
         log.debug('Creating preview window')
         self.previewWindow = PreviewWindow(self, os.path.join(
-            Core.wd, "background.png"))
+            Core.wd, 'gui', "background.png"))
         window.verticalLayout_previewWrapper.addWidget(self.previewWindow)
 
         log.debug('Starting preview thread')
diff --git a/src/gui/presetmanager.py b/src/gui/presetmanager.py
index dce5333..befa7cd 100644
--- a/src/gui/presetmanager.py
+++ b/src/gui/presetmanager.py
@@ -5,12 +5,16 @@
 from PyQt5 import QtCore, QtWidgets
 import string
 import os
+import logging
 
 from toolkit import badName
 from core import Core
 from gui.actions import *
 
 
+log = logging.getLogger('AVP.Gui.PresetManager')
+
+
 class PresetManager(QtWidgets.QDialog):
     def __init__(self, window, parent):
         super().__init__(parent.window)
diff --git a/src/gui/preview_thread.py b/src/gui/preview_thread.py
index 9615884..33a9e7a 100644
--- a/src/gui/preview_thread.py
+++ b/src/gui/preview_thread.py
@@ -14,7 +14,7 @@ from toolkit.frame import Checkerboard
 from toolkit import disableWhenOpeningProject
 
 
-log = logging.getLogger("AVP.PreviewThread")
+log = logging.getLogger("AVP.Gui.PreviewThread")
 
 
 class Worker(QtCore.QObject):
diff --git a/src/gui/preview_win.py b/src/gui/preview_win.py
index 40c19c6..c6b9a32 100644
--- a/src/gui/preview_win.py
+++ b/src/gui/preview_win.py
@@ -7,7 +7,7 @@ class PreviewWindow(QtWidgets.QLabel):
         Paints the preview QLabel in MainWindow and maintains the aspect ratio
         when the window is resized.
     '''
-    log = logging.getLogger('AVP.PreviewWindow')
+    log = logging.getLogger('AVP.Gui.PreviewWindow')
 
     def __init__(self, parent, img):
         super(PreviewWindow, self).__init__()