From a170996259d2a135a0e559e0f674cf997e58769e Mon Sep 17 00:00:00 2001
From: Maximilian Siess
Date: Thu, 20 Apr 2017 19:25:34 +0200
Subject: added font size and text position to video thread

---
 main.py         | 5 ++++-
 video_thread.py | 9 ++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/main.py b/main.py
index bc0a015..5808baa 100644
--- a/main.py
+++ b/main.py
@@ -16,7 +16,7 @@ class Main(QtCore.QObject):
 
   newTask = QtCore.pyqtSignal(str, str, QFont, int, str, int, int)
   processTask = QtCore.pyqtSignal()
-  videoTask = QtCore.pyqtSignal(str, str, QFont, str, str, str)
+  videoTask = QtCore.pyqtSignal(str, str, QFont, int, str, int, int, str, str)
 
   def __init__(self, window):
 
@@ -134,7 +134,10 @@ class Main(QtCore.QObject):
     self.videoTask.emit(self.window.label_background.text(),
       self.window.lineEdit_title.text(),
       self.window.fontComboBox.currentFont(),
+      self.window.fontsizeSpinBox.value(),
       self.window.alignmentComboBox.currentText(),
+      self.window.textXSpinBox.value(),
+      self.window.textYSpinBox.value(),
       self.window.label_input.text(),
       self.window.label_output.text())
     
diff --git a/video_thread.py b/video_thread.py
index 2bd767c..8f7c8d8 100644
--- a/video_thread.py
+++ b/video_thread.py
@@ -18,15 +18,18 @@ class Worker(QtCore.QObject):
     self.core = core.Core()
 
 
-  @pyqtSlot(str, str, QtGui.QFont, str, str, str)
-  def createVideo(self, backgroundImage, titleText, titleFont, alignment, inputFile, outputFile):
+  @pyqtSlot(str, str, QtGui.QFont, int, str, int, int, str, str)
+  def createVideo(self, backgroundImage, titleText, titleFont, fontSize, alignment, xOffset, yOffset,  inputFile, outputFile):
     # print('worker thread id: {}'.format(QtCore.QThread.currentThreadId()))
     
     imBackground = self.core.drawBaseImage(
       backgroundImage,
       titleText,
       titleFont,
-      alignment)
+      fontSize,
+      alignment,
+      xOffset,
+      yOffset)
 
     self.progressBarUpdate.emit(0)
     
-- 
cgit v1.2.3