aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Siess2017-04-20 19:25:34 +0200
committerMaximilian Siess2017-04-20 19:25:34 +0200
commita170996259d2a135a0e559e0f674cf997e58769e (patch)
tree07408bc760161abcddad2595634614203ddc9e33
parent8423d958201f0230f4c4887a4b75f14f54a2161a (diff)
added font size and text position to video thread
-rw-r--r--main.py5
-rw-r--r--video_thread.py9
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)