Undo feature

10 files changed, 200 insertions, 102 deletions

diff --git a/src/components/color.py b/src/components/color.py
index 5d1233e..7d4f86d 100644
--- a/src/components/color.py
+++ b/src/components/color.py
@@ -17,9 +17,6 @@ class Component(Component):
         self.y = 0
         super().widget(*args)
 
-        self.page.lineEdit_color1.setText('0,0,0')
-        self.page.lineEdit_color2.setText('133,133,133')
-
         # disable color #2 until non-default 'fill' option gets changed
         self.page.lineEdit_color2.setDisabled(True)
         self.page.pushButton_color2.setDisabled(True)
@@ -85,8 +82,6 @@ class Component(Component):
             self.page.pushButton_color2.setEnabled(False)
         self.page.fillWidget.setCurrentIndex(fillType)
 
-        super().update()
-
     def previewRender(self):
         return self.drawFrame(self.width, self.height)
 
@@ -107,7 +102,7 @@ class Component(Component):
         # Return a solid image at x, y
         if self.fillType == 0:
             frame = BlankFrame(width, height)
-            image = Image.new("RGBA", shapeSize, (r, g, b, 255))
+            image = FloodFrame(self.sizeWidth, self.sizeHeight, (r, g, b, 255))
             frame.paste(image, box=(self.x, self.y))
             return frame
 
diff --git a/src/components/color.ui b/src/components/color.ui
index a9dacea..c1713fb 100644
--- a/src/components/color.ui
+++ b/src/components/color.ui
@@ -73,6 +73,9 @@
            <height>0</height>
           </size>
          </property>
+         <property name="text">
+          <string>0,0,0</string>
+         </property>
          <property name="maxLength">
           <number>12</number>
          </property>
@@ -146,6 +149,9 @@
            <height>0</height>
           </size>
          </property>
+         <property name="text">
+          <string>133,133,133</string>
+         </property>
          <property name="maxLength">
           <number>12</number>
          </property>
@@ -198,7 +204,7 @@
           <number>0</number>
          </property>
          <property name="maximum">
-          <number>999999999</number>
+          <number>19200</number>
          </property>
          <property name="value">
           <number>0</number>
@@ -233,7 +239,7 @@
           </size>
          </property>
          <property name="maximum">
-          <number>999999999</number>
+          <number>10800</number>
          </property>
         </widget>
        </item>
diff --git a/src/components/image.py b/src/components/image.py
index 63bee1a..dd363bf 100644
--- a/src/components/image.py
+++ b/src/components/image.py
@@ -83,8 +83,9 @@ class Component(Component):
             "Image Files (%s)" % " ".join(self.core.imageFormats))
         if filename:
             self.settings.setValue("componentDir", os.path.dirname(filename))
+            self.mergeUndo = False
             self.page.lineEdit_image.setText(filename)
-            self.update()
+            self.mergeUndo = True
 
     def command(self, arg):
         if '=' in arg:
@@ -123,4 +124,3 @@ class Component(Component):
         else:
             scaleBox.setVisible(True)
             stretchScaleBox.setVisible(False)
-        super().update()
diff --git a/src/components/life.py b/src/components/life.py
index 2383d30..7a610eb 100644
--- a/src/components/life.py
+++ b/src/components/life.py
@@ -1,4 +1,5 @@
 from PyQt5 import QtGui, QtCore, QtWidgets
+from PyQt5.QtWidgets import QUndoCommand
 from PIL import Image, ImageDraw, ImageEnhance, ImageChops, ImageFilter
 import os
 import math
@@ -35,6 +36,7 @@ class Component(Component):
             self.page.toolButton_left,
             self.page.toolButton_right,
         )
+
         def shiftFunc(i):
             def shift():
                 self.shiftGrid(i)
@@ -52,26 +54,13 @@ class Component(Component):
             "Image Files (%s)" % " ".join(self.core.imageFormats))
         if filename:
             self.settings.setValue("componentDir", os.path.dirname(filename))
+            self.mergeUndo = False
             self.page.lineEdit_image.setText(filename)
-            self.update()
+            self.mergeUndo = True
 
     def shiftGrid(self, d):
-        def newGrid(Xchange, Ychange):
-            return {
-                (x + Xchange, y + Ychange)
-                for x, y in self.startingGrid
-            }
-
-        if d == 0:
-            newGrid = newGrid(0, -1)
-        elif d == 1:
-            newGrid = newGrid(0, 1)
-        elif d == 2:
-            newGrid = newGrid(-1, 0)
-        elif d == 3:
-            newGrid = newGrid(1, 0)
-        self.startingGrid = newGrid
-        self.sendUpdateSignal()
+        action = ShiftGrid(self, d)
+        self.parent.undoStack.push(action)
 
     def update(self):
         self.updateGridSize()
@@ -96,17 +85,14 @@ class Component(Component):
         enabled = (len(self.startingGrid) > 0)
         for widget in self.shiftButtons:
             widget.setEnabled(enabled)
-        super().update()
 
     def previewClickEvent(self, pos, size, button):
         pos = (
             math.ceil((pos[0] / size[0]) * self.gridWidth) - 1,
             math.ceil((pos[1] / size[1]) * self.gridHeight) - 1
         )
-        if button == 1:
-            self.startingGrid.add(pos)
-        elif button == 2:
-            self.startingGrid.discard(pos)
+        action = ClickGrid(self, pos, button)
+        self.parent.undoStack.push(action)
 
     def updateGridSize(self):
         w, h = self.core.resolutions[-1].split('x')
@@ -198,7 +184,7 @@ class Component(Component):
             # Circle
             if shape == 'circle':
                 drawer.ellipse(outlineShape, fill=self.color)
-                drawer.ellipse(smallerShape, fill=(0,0,0,0))
+                drawer.ellipse(smallerShape, fill=(0, 0, 0, 0))
 
             # Lilypad
             elif shape == 'lilypad':
@@ -208,9 +194,9 @@ class Component(Component):
             elif shape == 'pac-man':
                 drawer.pieslice(outlineShape, 35, 320, fill=self.color)
 
-            hX, hY = scale(50, self.pxWidth, self.pxHeight, int) # halfline
-            tX, tY = scale(33, self.pxWidth, self.pxHeight, int) # thirdline
-            qX, qY = scale(20, self.pxWidth, self.pxHeight, int) # quarterline
+            hX, hY = scale(50, self.pxWidth, self.pxHeight, int)  # halfline
+            tX, tY = scale(33, self.pxWidth, self.pxHeight, int)  # thirdline
+            qX, qY = scale(20, self.pxWidth, self.pxHeight, int)  # quarterline
 
             # Path
             if shape == 'path':
@@ -221,7 +207,7 @@ class Component(Component):
                         'up', 'down', 'left', 'right',
                     )
                 }
-                for cell in nearbyCoords(x, y):
+                for cell in self.nearbyCoords(x, y):
                     if cell not in grid:
                         continue
                     if cell[0] == x:
@@ -246,19 +232,19 @@ class Component(Component):
                             sect = (
                                 (drawPtX, drawPtY + hY),
                                 (drawPtX + self.pxWidth,
-                                drawPtY + self.pxHeight)
+                                    drawPtY + self.pxHeight)
                             )
                         elif direction == 'left':
                             sect = (
                                 (drawPtX, drawPtY),
                                 (drawPtX + hX,
-                                drawPtY + self.pxHeight)
+                                    drawPtY + self.pxHeight)
                             )
                         elif direction == 'right':
                             sect = (
                                 (drawPtX + hX, drawPtY),
                                 (drawPtX + self.pxWidth,
-                                drawPtY + self.pxHeight)
+                                    drawPtY + self.pxHeight)
                             )
                         drawer.rectangle(sect, fill=self.color)
 
@@ -288,20 +274,25 @@ class Component(Component):
 
             # Peace
             elif shape == 'peace':
-                line = (
-                    (drawPtX + hX - int(tenthX / 2), drawPtY + int(tenthY / 2)),
+                line = ((
+                    drawPtX + hX - int(tenthX / 2), drawPtY + int(tenthY / 2)),
                     (drawPtX + hX + int(tenthX / 2),
-                    drawPtY + self.pxHeight - int(tenthY / 2))
+                        drawPtY + self.pxHeight - int(tenthY / 2))
                 )
                 drawer.ellipse(outlineShape, fill=self.color)
-                drawer.ellipse(smallerShape, fill=(0,0,0,0))
+                drawer.ellipse(smallerShape, fill=(0, 0, 0, 0))
                 drawer.rectangle(line, fill=self.color)
-                slantLine = lambda difference: (
-                    ((drawPtX + difference),
-                        (drawPtY + self.pxHeight - qY)),
-                    ((drawPtX + hX),
-                        (drawPtY + hY)),
-                )
+
+                def slantLine(difference):
+                    return (
+                        (drawPtX + difference),
+                        (drawPtY + self.pxHeight - qY)
+                    ),
+                    (
+                        (drawPtX + hX),
+                        (drawPtY + hY)
+                    )
+
                 drawer.line(
                     slantLine(qX),
                     fill=self.color,
@@ -338,13 +329,13 @@ class Component(Component):
             for x in range(self.pxWidth, self.width, self.pxWidth):
                 drawer.rectangle(
                     ((x, 0),
-                    (x + w, self.height)),
+                        (x + w, self.height)),
                     fill=self.color,
                 )
             for y in range(self.pxHeight, self.height, self.pxHeight):
                 drawer.rectangle(
                     ((0, y),
-                    (self.width, y + h)),
+                        (self.width, y + h)),
                     fill=self.color,
                 )
 
@@ -356,7 +347,7 @@ class Component(Component):
 
         def neighbours(x, y):
             return {
-                cell for cell in nearbyCoords(x, y)
+                cell for cell in self.nearbyCoords(x, y)
                 if cell in lastGrid
             }
 
@@ -367,7 +358,7 @@ class Component(Component):
                 newGrid.add((x, y))
         potentialNewCells = {
             coordTup for origin in lastGrid
-            for coordTup in list(nearbyCoords(*origin))
+            for coordTup in list(self.nearbyCoords(*origin))
         }
         for x, y in potentialNewCells:
             if (x, y) in newGrid:
@@ -390,13 +381,95 @@ class Component(Component):
                 widget.setEnabled(True)
         super().loadPreset(pr, *args)
 
+    def nearbyCoords(self, x, y):
+        yield x + 1, y + 1
+        yield x + 1, y - 1
+        yield x - 1, y + 1
+        yield x - 1, y - 1
+        yield x, y + 1
+        yield x, y - 1
+        yield x + 1, y
+        yield x - 1, y
+
+
+class ClickGrid(QUndoCommand):
+    def __init__(self, comp, pos, id_):
+        super().__init__(
+            "click %s component #%s" % (comp.name, comp.compPos))
+        self.comp = comp
+        self.pos = [pos]
+        self.id_ = id_
+
+    def id(self):
+        return self.id_
+
+    def mergeWith(self, other):
+        self.pos.extend(other.pos)
+        return True
+
+    def add(self):
+        for pos in self.pos[:]:
+            self.comp.startingGrid.add(pos)
+        self.comp.update(auto=True)
+
+    def remove(self):
+        for pos in self.pos[:]:
+            self.comp.startingGrid.discard(pos)
+        self.comp.update(auto=True)
+
+    def redo(self):
+        if self.id_ == 1:  # Left-click
+            self.add()
+        elif self.id_ == 2:  # Right-click
+            self.remove()
+
+    def undo(self):
+        if self.id_ == 1:  # Left-click
+            self.remove()
+        elif self.id_ == 2:  # Right-click
+            self.add()
+
+class ShiftGrid(QUndoCommand):
+    def __init__(self, comp, direction):
+        super().__init__(
+            "change %s component #%s" % (comp.name, comp.compPos))
+        self.comp = comp
+        self.direction = direction
+        self.distance = 1
+
+    def id(self):
+        return self.direction
+
+    def mergeWith(self, other):
+        self.distance += other.distance
+        return True
+
+    def newGrid(self, Xchange, Ychange):
+        return {
+            (x + Xchange, y + Ychange)
+            for x, y in self.comp.startingGrid
+        }
 
-def nearbyCoords(x, y):
-    yield x + 1, y + 1
-    yield x + 1, y - 1
-    yield x - 1, y + 1
-    yield x - 1, y - 1
-    yield x, y + 1
-    yield x, y - 1
-    yield x + 1, y
-    yield x - 1, y
+    def redo(self):
+        if self.direction == 0:
+            newGrid = self.newGrid(0, -self.distance)
+        elif self.direction == 1:
+            newGrid = self.newGrid(0, self.distance)
+        elif self.direction == 2:
+            newGrid = self.newGrid(-self.distance, 0)
+        elif self.direction == 3:
+            newGrid = self.newGrid(self.distance, 0)
+        self.comp.startingGrid = newGrid
+        self.comp._sendUpdateSignal()
+
+    def undo(self):
+        if self.direction == 0:
+            newGrid = self.newGrid(0, self.distance)
+        elif self.direction == 1:
+            newGrid = self.newGrid(0, -self.distance)
+        elif self.direction == 2:
+            newGrid = self.newGrid(self.distance, 0)
+        elif self.direction == 3:
+            newGrid = self.newGrid(-self.distance, 0)
+        self.comp.startingGrid = newGrid
+        self.comp._sendUpdateSignal()
diff --git a/src/components/sound.py b/src/components/sound.py
index 26ecf93..18d2a65 100644
--- a/src/components/sound.py
+++ b/src/components/sound.py
@@ -52,8 +52,9 @@ class Component(Component):
             "Audio Files (%s)" % " ".join(self.core.audioFormats))
         if filename:
             self.settings.setValue("componentDir", os.path.dirname(filename))
+            self.mergeUndo = False
             self.page.lineEdit_sound.setText(filename)
-            self.update()
+            self.mergeUndo = True
 
     def commandHelp(self):
         print('Path to audio file:\n    path=/filepath/to/sound.ogg')
diff --git a/src/components/spectrum.py b/src/components/spectrum.py
index 89130a2..6675f5b 100644
--- a/src/components/spectrum.py
+++ b/src/components/spectrum.py
@@ -76,8 +76,6 @@ class Component(Component):
         else:
             self.page.checkBox_mono.setEnabled(True)
 
-        super().update()
-
     def previewRender(self):
         changedSize = self.updateChunksize()
         if not changedSize \
@@ -100,7 +98,8 @@ class Component(Component):
 
     def preFrameRender(self, **kwargs):
         super().preFrameRender(**kwargs)
-        self.previewPipe.wait()
+        if self.previewPipe is not None:
+            self.previewPipe.wait()
         self.updateChunksize()
         w, h = scale(self.scale, self.width, self.height, str)
         self.video = FfmpegVideo(
@@ -138,7 +137,7 @@ class Component(Component):
             '-r', self.settings.value("outputFrameRate"),
             '-ss', "{0:.3f}".format(startPt),
             '-i',
-            os.path.join(self.core.wd, 'background.png')
+            self.core.junkStream
             if genericPreview else inputFile,
             '-f', 'image2pipe',
             '-pix_fmt', 'rgba',
@@ -150,15 +149,22 @@ class Component(Component):
             '-codec:v', 'rawvideo', '-',
             '-frames:v', '1',
         ])
-        logFilename = os.path.join(
-            self.core.logDir, 'preview_%s.log' % str(self.compPos))
-        log.debug('Creating ffmpeg process (log at %s)' % logFilename)
-        with open(logFilename, 'w') as logf:
-            logf.write(" ".join(command) + '\n\n')
-        with open(logFilename, 'a') as logf:
+
+        if self.core.logEnabled:
+            logFilename = os.path.join(
+                self.core.logDir, 'preview_%s.log' % str(self.compPos))
+            log.debug('Creating ffmpeg process (log at %s)' % logFilename)
+            with open(logFilename, 'w') as logf:
+                logf.write(" ".join(command) + '\n\n')
+            with open(logFilename, 'a') as logf:
+                self.previewPipe = openPipe(
+                    command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
+                    stderr=logf, bufsize=10**8
+                )
+        else:
             self.previewPipe = openPipe(
                 command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
-                stderr=logf, bufsize=10**8
+                stderr=subprocess.DEVNULL, bufsize=10**8
             )
         byteFrame = self.previewPipe.stdout.read(self.chunkSize)
         closePipe(self.previewPipe)
diff --git a/src/components/text.py b/src/components/text.py
index 4d4f5d3..32a108e 100644
--- a/src/components/text.py
+++ b/src/components/text.py
@@ -2,10 +2,13 @@ from PIL import ImageEnhance, ImageFilter, ImageChops
 from PyQt5.QtGui import QColor, QFont
 from PyQt5 import QtGui, QtCore, QtWidgets
 import os
+import logging
 
 from component import Component
 from toolkit.frame import FramePainter, PaintColor
 
+log = logging.getLogger('AVP.Components.Text')
+
 
 class Component(Component):
     name = 'Title Text'
@@ -13,8 +16,6 @@ class Component(Component):
 
     def widget(self, *args):
         super().widget(*args)
-        self.textColor = (255, 255, 255)
-        self.strokeColor = (0, 0, 0)
         self.title = 'Text'
         self.alignment = 1
         self.titleFont = QFont()
@@ -25,8 +26,6 @@ class Component(Component):
         self.page.comboBox_textAlign.addItem("Right")
         self.page.comboBox_textAlign.setCurrentIndex(int(self.alignment))
 
-        self.page.lineEdit_textColor.setText('%s,%s,%s' % self.textColor)
-        self.page.lineEdit_strokeColor.setText('%s,%s,%s' % self.strokeColor)
         self.page.spinBox_fontSize.setValue(int(self.fontSize))
         self.page.lineEdit_title.setText(self.title)
 
@@ -72,7 +71,6 @@ class Component(Component):
             self.page.spinBox_shadY.setHidden(True)
             self.page.label_shadBlur.setHidden(True)
             self.page.spinBox_shadBlur.setHidden(True)
-        super().update()
 
     def centerXY(self):
         self.setRelativeWidget('xPosition', 0.5)
@@ -81,16 +79,15 @@ class Component(Component):
     def getXY(self):
         '''Returns true x, y after considering alignment settings'''
         fm = QtGui.QFontMetrics(self.titleFont)
-        if self.alignment == 0:             # Left
-            x = int(self.xPosition)
+        x = self.pixelValForAttr('xPosition')
 
         if self.alignment == 1:             # Middle
             offset = int(fm.width(self.title)/2)
-            x = self.xPosition - offset
-
+            x -= offset
         if self.alignment == 2:             # Right
             offset = fm.width(self.title)
-            x = self.xPosition - offset
+            x -= offset
+
         return x, self.yPosition
 
     def loadPreset(self, pr, *args):
@@ -142,6 +139,7 @@ class Component(Component):
 
         image = FramePainter(width, height)
         x, y = self.getXY()
+        log.debug('Text position translates to %s, %s', x, y)
         if self.stroke > 0:
             outliner = QtGui.QPainterPathStroker()
             outliner.setWidth(self.stroke)
diff --git a/src/components/text.ui b/src/components/text.ui
index 13d3467..b62e0ed 100644
--- a/src/components/text.ui
+++ b/src/components/text.ui
@@ -427,6 +427,9 @@
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
+         <property name="text">
+          <string>255,255,255</string>
+         </property>
         </widget>
        </item>
        <item>
@@ -485,6 +488,9 @@
          <property name="focusPolicy">
           <enum>Qt::NoFocus</enum>
          </property>
+         <property name="text">
+          <string>0,0,0</string>
+         </property>
         </widget>
        </item>
        <item>
diff --git a/src/components/video.py b/src/components/video.py
index a189f60..8ad21b5 100644
--- a/src/components/video.py
+++ b/src/components/video.py
@@ -52,7 +52,6 @@ class Component(Component):
         else:
             self.page.label_volume.setEnabled(False)
             self.page.spinBox_volume.setEnabled(False)
-        super().update()
 
     def previewRender(self):
         self.updateChunksize()
@@ -118,8 +117,9 @@ class Component(Component):
         )
         if filename:
             self.settings.setValue("componentDir", os.path.dirname(filename))
+            self.mergeUndo = False
             self.page.lineEdit_video.setText(filename)
-            self.update()
+            self.mergeUndo = True
 
     def getPreviewFrame(self, width, height):
         if not self.videoPath or not os.path.exists(self.videoPath):
@@ -139,16 +139,23 @@ class Component(Component):
             '-frames:v', '1',
         ])
 
-        logFilename = os.path.join(
-            self.core.logDir, 'preview_%s.log' % str(self.compPos))
-        log.debug('Creating ffmpeg process (log at %s)' % logFilename)
-        with open(logFilename, 'w') as logf:
-            logf.write(" ".join(command) + '\n\n')
-        with open(logFilename, 'a') as logf:
+        if self.core.logEnabled:
+            logFilename = os.path.join(
+                self.core.logDir, 'preview_%s.log' % str(self.compPos))
+            log.debug('Creating ffmpeg process (log at %s)' % logFilename)
+            with open(logFilename, 'w') as logf:
+                logf.write(" ".join(command) + '\n\n')
+            with open(logFilename, 'a') as logf:
+                pipe = openPipe(
+                    command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
+                    stderr=logf, bufsize=10**8
+                )
+        else:
             pipe = openPipe(
                 command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
-                stderr=logf, bufsize=10**8
+                stderr=subprocess.DEVNULL, bufsize=10**8
             )
+
         byteFrame = pipe.stdout.read(self.chunkSize)
         closePipe(pipe)
 
diff --git a/src/components/waveform.py b/src/components/waveform.py
index 0743e55..cbfc47f 100644
--- a/src/components/waveform.py
+++ b/src/components/waveform.py
@@ -98,7 +98,7 @@ class Component(Component):
             '-r', self.settings.value("outputFrameRate"),
             '-ss', "{0:.3f}".format(startPt),
             '-i',
-            os.path.join(self.core.wd, 'background.png')
+            self.core.junkStream
             if genericPreview else inputFile,
             '-f', 'image2pipe',
             '-pix_fmt', 'rgba',
@@ -110,15 +110,21 @@ class Component(Component):
             '-codec:v', 'rawvideo', '-',
             '-frames:v', '1',
         ])
-        logFilename = os.path.join(
-            self.core.logDir, 'preview_%s.log' % str(self.compPos))
-        log.debug('Creating ffmpeg process (log at %s)' % logFilename)
-        with open(logFilename, 'w') as logf:
-            logf.write(" ".join(command) + '\n\n')
-        with open(logFilename, 'a') as logf:
+        if self.core.logEnabled:
+            logFilename = os.path.join(
+                self.core.logDir, 'preview_%s.log' % str(self.compPos))
+            log.debug('Creating ffmpeg log at %s', logFilename)
+            with open(logFilename, 'w') as logf:
+                logf.write(" ".join(command) + '\n\n')
+            with open(logFilename, 'a') as logf:
+                pipe = openPipe(
+                    command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
+                    stderr=logf, bufsize=10**8
+                )
+        else:
             pipe = openPipe(
                 command, stdin=subprocess.DEVNULL, stdout=subprocess.PIPE,
-                stderr=logf, bufsize=10**8
+                stderr=subprocess.DEVNULL, bufsize=10**8
             )
         byteFrame = pipe.stdout.read(self.chunkSize)
         closePipe(pipe)