merge consecutive static components

5 files changed, 34 insertions, 31 deletions

diff --git a/src/components/color.py b/src/components/color.py
index 82b45b3..da3bcf9 100644
--- a/src/components/color.py
+++ b/src/components/color.py
@@ -15,6 +15,7 @@ class Component(Component):
 
     def widget(self, parent):
         self.parent = parent
+        self.settings = self.parent.core.settings
         page = self.loadUi('color.ui')
 
         self.color1 = (0, 0, 0)
@@ -42,9 +43,9 @@ class Component(Component):
         page.spinBox_x.valueChanged.connect(self.update)
         page.spinBox_y.valueChanged.connect(self.update)
         page.spinBox_width.setValue(
-            int(parent.settings.value("outputWidth")))
+            int(self.settings.value("outputWidth")))
         page.spinBox_height.setValue(
-            int(parent.settings.value("outputHeight")))
+            int(self.settings.value("outputHeight")))
 
         page.lineEdit_color1.textChanged.connect(self.update)
         page.lineEdit_color2.textChanged.connect(self.update)
@@ -113,16 +114,16 @@ class Component(Component):
         super().update()
 
     def previewRender(self, previewWorker):
-        width = int(previewWorker.core.settings.value('outputWidth'))
-        height = int(previewWorker.core.settings.value('outputHeight'))
+        width = int(self.settings.value('outputWidth'))
+        height = int(self.settings.value('outputHeight'))
         return self.drawFrame(width, height)
 
     def properties(self):
         return ['static']
 
     def frameRender(self, layerNo, frameNo):
-        width = int(self.worker.core.settings.value('outputWidth'))
-        height = int(self.worker.core.settings.value('outputHeight'))
+        width = int(self.settings.value('outputWidth'))
+        height = int(self.settings.value('outputHeight'))
         return self.drawFrame(width, height)
 
     def drawFrame(self, width, height):
diff --git a/src/components/image.py b/src/components/image.py
index 07abc3f..6465bc9 100644
--- a/src/components/image.py
+++ b/src/components/image.py
@@ -13,7 +13,7 @@ class Component(Component):
 
     def widget(self, parent):
         self.parent = parent
-        self.settings = parent.settings
+        self.settings = self.parent.core.settings
         page = self.loadUi('image.ui')
 
         page.lineEdit_image.textChanged.connect(self.update)
@@ -42,24 +42,24 @@ class Component(Component):
         super().update()
 
     def previewRender(self, previewWorker):
-        width = int(previewWorker.core.settings.value('outputWidth'))
-        height = int(previewWorker.core.settings.value('outputHeight'))
+        width = int(self.settings.value('outputWidth'))
+        height = int(self.settings.value('outputHeight'))
         return self.drawFrame(width, height)
 
     def properties(self):
         props = ['static']
-        if not os.path.exists(self.imagePath):
+        if self.imagePath and not os.path.exists(self.imagePath):
             props.append('error')
         return props
 
     def error(self):
         if not os.path.exists(self.imagePath):
-            return "The image path selected on " \
-                "layer %s no longer exists!" % str(self.compPos)
+            return "The image selected on " \
+                "layer %s does not exist!" % str(self.compPos)
 
     def frameRender(self, layerNo, frameNo):
-        width = int(self.worker.core.settings.value('outputWidth'))
-        height = int(self.worker.core.settings.value('outputHeight'))
+        width = int(self.settings.value('outputWidth'))
+        height = int(self.settings.value('outputHeight'))
         return self.drawFrame(width, height)
 
     def drawFrame(self, width, height):
diff --git a/src/components/original.py b/src/components/original.py
index 638095d..3599c30 100644
--- a/src/components/original.py
+++ b/src/components/original.py
@@ -21,6 +21,7 @@ class Component(Component):
 
     def widget(self, parent):
         self.parent = parent
+        self.settings = self.parent.core.settings
         self.visColor = (255, 255, 255)
         self.scale = 20
         self.y = 0
@@ -76,8 +77,8 @@ class Component(Component):
     def previewRender(self, previewWorker):
         spectrum = numpy.fromfunction(
             lambda x: float(self.scale)/2500*(x-128)**2, (255,), dtype="int16")
-        width = int(previewWorker.core.settings.value('outputWidth'))
-        height = int(previewWorker.core.settings.value('outputHeight'))
+        width = int(self.settings.value('outputWidth'))
+        height = int(self.settings.value('outputHeight'))
         return self.drawBars(
             width, height, spectrum, self.visColor, self.layout
         )
@@ -88,8 +89,8 @@ class Component(Component):
         self.smoothConstantUp = 0.8
         self.lastSpectrum = None
         self.spectrumArray = {}
-        self.width = int(self.worker.core.settings.value('outputWidth'))
-        self.height = int(self.worker.core.settings.value('outputHeight'))
+        self.width = int(self.settings.value('outputWidth'))
+        self.height = int(self.settings.value('outputHeight'))
 
         for i in range(0, len(self.completeAudioArray), self.sampleSize):
             if self.canceled:
diff --git a/src/components/text.py b/src/components/text.py
index ed50064..4435b80 100644
--- a/src/components/text.py
+++ b/src/components/text.py
@@ -17,10 +17,11 @@ class Component(Component):
         self.titleFont = QFont()
 
     def widget(self, parent):
-        height = int(parent.settings.value('outputHeight'))
-        width = int(parent.settings.value('outputWidth'))
-
         self.parent = parent
+        self.settings = self.parent.core.settings
+        height = int(self.settings.value('outputHeight'))
+        width = int(self.settings.value('outputWidth'))
+
         self.textColor = (255, 255, 255)
         self.title = 'Text'
         self.alignment = 1
@@ -78,12 +79,12 @@ class Component(Component):
             x = int(self.xPosition)
 
         if self.alignment == 1:             # Middle
-            offset = fm.width(self.title)/2
-            x = int(self.xPosition - offset)
+            offset = int(fm.width(self.title)/2)
+            x = self.xPosition - offset
 
         if self.alignment == 2:             # Right
             offset = fm.width(self.title)
-            x = int(self.xPosition - offset)
+            x = self.xPosition - offset
         return x, self.yPosition
 
     def loadPreset(self, pr, presetName=None):
@@ -115,16 +116,16 @@ class Component(Component):
         }
 
     def previewRender(self, previewWorker):
-        width = int(previewWorker.core.settings.value('outputWidth'))
-        height = int(previewWorker.core.settings.value('outputHeight'))
+        width = int(self.settings.value('outputWidth'))
+        height = int(self.settings.value('outputHeight'))
         return self.addText(width, height)
 
     def properties(self):
         return ['static']
 
     def frameRender(self, layerNo, frameNo):
-        width = int(self.worker.core.settings.value('outputWidth'))
-        height = int(self.worker.core.settings.value('outputHeight'))
+        width = int(self.settings.value('outputWidth'))
+        height = int(self.settings.value('outputHeight'))
         return self.addText(width, height)
 
     def addText(self, width, height):
diff --git a/src/components/video.py b/src/components/video.py
index 5303e3a..49bd145 100644
--- a/src/components/video.py
+++ b/src/components/video.py
@@ -158,14 +158,14 @@ class Component(Component):
         if self.useAudio:
             # props.append('audio')
             pass
-        if not os.path.exists(self.videoPath):
+        if self.videoPath and not os.path.exists(self.videoPath):
             props.append('error')
         return props
 
     def error(self):
         if not os.path.exists(self.videoPath):
-            return "The video path selected on " \
-                "layer %s no longer exists!" % str(self.compPos)
+            return "The video selected on " \
+                "layer %s does not exist!" % str(self.compPos)
 
     def audio(self):
         return (self.videoPath, {})