aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Siess2017-04-21 01:00:17 +0200
committerMaximilian Siess2017-04-21 01:00:17 +0200
commit4aef5bfdb7f04dde13b1c6a94172824ce143be6e (patch)
tree9677c2cf51695134e6ffbfc288e33fb74a7ba667
parent018f5900f0703ad8a2a962d076ac291b0805657d (diff)
changed differentiater of text alignment from string to int
-rw-r--r--core.py6
-rw-r--r--main.py8
-rw-r--r--preview_thread.py2
-rw-r--r--video_thread.py2
4 files changed, 9 insertions, 9 deletions
diff --git a/core.py b/core.py
index 1dd6438..b362087 100644
--- a/core.py
+++ b/core.py
@@ -52,11 +52,11 @@ class Core():
yPosition = yOffset
fm = QtGui.QFontMetrics(font)
- if alignment == "Left":
+ if alignment == 0: #Left
xPosition = xOffset
- if alignment == "Middle":
+ if alignment == 1: #Middle
xPosition = xOffset - fm.width(titleText)/2
- if alignment == "Right":
+ if alignment == 2: #Right
xPosition = xOffset - fm.width(titleText)
painter.drawText(xPosition, yPosition, titleText)
painter.end()
diff --git a/main.py b/main.py
index ae85f50..8c1d48d 100644
--- a/main.py
+++ b/main.py
@@ -14,9 +14,9 @@ import preview_thread, core, video_thread
class Main(QtCore.QObject):
- newTask = QtCore.pyqtSignal(str, str, QFont, int, str, int, int)
+ newTask = QtCore.pyqtSignal(str, str, QFont, int, int, int, int)
processTask = QtCore.pyqtSignal()
- videoTask = QtCore.pyqtSignal(str, str, QFont, int, str, int, int, str, str)
+ videoTask = QtCore.pyqtSignal(str, str, QFont, int, int, int, int, str, str)
def __init__(self, window):
@@ -153,7 +153,7 @@ class Main(QtCore.QObject):
self.window.lineEdit_title.text(),
self.window.fontComboBox.currentFont(),
self.window.fontsizeSpinBox.value(),
- self.window.alignmentComboBox.currentText(),
+ self.window.alignmentComboBox.currentIndex(),
self.window.textXSpinBox.value(),
self.window.textYSpinBox.value(),
self.window.label_input.text(),
@@ -172,7 +172,7 @@ class Main(QtCore.QObject):
self.window.lineEdit_title.text(),
self.window.fontComboBox.currentFont(),
self.window.fontsizeSpinBox.value(),
- self.window.alignmentComboBox.currentText(),
+ self.window.alignmentComboBox.currentIndex(),
self.window.textXSpinBox.value(),
self.window.textYSpinBox.value())
# self.processTask.emit()
diff --git a/preview_thread.py b/preview_thread.py
index 8f759be..9dc7e4c 100644
--- a/preview_thread.py
+++ b/preview_thread.py
@@ -19,7 +19,7 @@ class Worker(QtCore.QObject):
self.queue = queue
- @pyqtSlot(str, str, QtGui.QFont, int, str, int, int)
+ @pyqtSlot(str, str, QtGui.QFont, int, int, int, int)
def createPreviewImage(self, backgroundImage, titleText, titleFont, fontSize, alignment, xOffset, yOffset):
# print('worker thread id: {}'.format(QtCore.QThread.currentThreadId()))
dic = {
diff --git a/video_thread.py b/video_thread.py
index 8f7c8d8..1d1d44b 100644
--- a/video_thread.py
+++ b/video_thread.py
@@ -18,7 +18,7 @@ class Worker(QtCore.QObject):
self.core = core.Core()
- @pyqtSlot(str, str, QtGui.QFont, int, str, int, int, str, str)
+ @pyqtSlot(str, str, QtGui.QFont, int, int, int, int, str, str)
def createVideo(self, backgroundImage, titleText, titleFont, fontSize, alignment, xOffset, yOffset, inputFile, outputFile):
# print('worker thread id: {}'.format(QtCore.QThread.currentThreadId()))