diff options
| author | Maximilian Siess | 2017-04-18 13:46:24 +0200 |
|---|---|---|
| committer | Maximilian Siess | 2017-04-18 13:46:24 +0200 |
| commit | 5d796c76b796d65d1fd08812b6d038ba01bb001e (patch) | |
| tree | f98c2e0d4689414e25800e7829d1fe7c921b774a | |
| parent | c772bf5583dec23513371392ca6d2018518483cb (diff) | |
Alignment options added to render task
| -rw-r--r-- | .main.py.swp | bin | 20480 -> 20480 bytes | |||
| -rw-r--r-- | .main.ui.swp | bin | 24576 -> 0 bytes | |||
| -rw-r--r-- | .video_thread.py.swp | bin | 0 -> 12288 bytes | |||
| -rw-r--r-- | main.py | 3 | ||||
| -rw-r--r-- | video_thread.py | 7 |
5 files changed, 6 insertions, 4 deletions
diff --git a/.main.py.swp b/.main.py.swp Binary files differindex 4705a19..e57f30f 100644 --- a/.main.py.swp +++ b/.main.py.swp diff --git a/.main.ui.swp b/.main.ui.swp Binary files differdeleted file mode 100644 index bd61a94..0000000 --- a/.main.ui.swp +++ /dev/null diff --git a/.video_thread.py.swp b/.video_thread.py.swp Binary files differnew file mode 100644 index 0000000..12dd93f --- /dev/null +++ b/.video_thread.py.swp @@ -16,7 +16,7 @@ class Main(QtCore.QObject): newTask = QtCore.pyqtSignal(str, str, QFont, str) processTask = QtCore.pyqtSignal() - videoTask = QtCore.pyqtSignal(str, str, QFont, str, str) + videoTask = QtCore.pyqtSignal(str, str, QFont, str, str, str) def __init__(self, window): @@ -128,6 +128,7 @@ class Main(QtCore.QObject): self.videoTask.emit(self.window.label_background.text(), self.window.lineEdit_title.text(), self.window.fontComboBox.currentFont(), + self.window.alignmentComboBox.currentText(), self.window.label_input.text(), self.window.label_output.text()) diff --git a/video_thread.py b/video_thread.py index 9f4ce7b..2bd767c 100644 --- a/video_thread.py +++ b/video_thread.py @@ -18,14 +18,15 @@ class Worker(QtCore.QObject): self.core = core.Core() - @pyqtSlot(str, str, QtGui.QFont, str, str) - def createVideo(self, backgroundImage, titleText, titleFont, inputFile, outputFile): + @pyqtSlot(str, str, QtGui.QFont, str, str, str) + def createVideo(self, backgroundImage, titleText, titleFont, alignment, inputFile, outputFile): # print('worker thread id: {}'.format(QtCore.QThread.currentThreadId())) imBackground = self.core.drawBaseImage( backgroundImage, titleText, - titleFont) + titleFont, + alignment) self.progressBarUpdate.emit(0) |
