From 0948afd6e8b0cf29cf4bdf570e48350caa225c0a Mon Sep 17 00:00:00 2001
From: DH4
Date: Tue, 6 Jun 2017 08:53:27 -0500
Subject: Use bytes instead of encoding a PNG in text module.

---
 components/text.py | 77 +++++++++++++++++++++++++++---------------------------
 1 file changed, 39 insertions(+), 38 deletions(-)

diff --git a/components/text.py b/components/text.py
index d2bd684..56a9502 100644
--- a/components/text.py
+++ b/components/text.py
@@ -2,7 +2,8 @@ from PIL import Image, ImageDraw
 from PyQt4.QtGui import QPainter, QColor, QFont
 from PyQt4 import uic, QtGui, QtCore
 from PIL.ImageQt import ImageQt
-import os, io
+import os
+import io
 from . import __base__
 
 
@@ -16,21 +17,25 @@ class Component(__base__.Component):
         height = int(parent.settings.value('outputHeight'))
         width = int(parent.settings.value('outputWidth'))
         self.parent = parent
-        self.textColor = (255,255,255)
+        self.textColor = (255, 255, 255)
         self.title = 'Text'
         self.alignment = 1
         self.fontSize = height / 13.5
         self.xPosition = width / 2
         self.yPosition = height / 2 * 1.036
-        
-        page = uic.loadUi(os.path.join(os.path.dirname(os.path.realpath(__file__)), 'text.ui'))
+
+        page = uic.loadUi(os.path.join(
+            os.path.dirname(os.path.realpath(__file__)),
+            'text.ui'
+        ))
         page.comboBox_textAlign.addItem("Left")
         page.comboBox_textAlign.addItem("Middle")
         page.comboBox_textAlign.addItem("Right")
 
         page.lineEdit_textColor.setText('%s,%s,%s' % self.textColor)
         page.pushButton_textColor.clicked.connect(lambda: self.pickColor())
-        btnStyle = "QPushButton { background-color : %s; outline: none; }" % QColor(*self.textColor).name()
+        btnStyle = "QPushButton { background-color : %s; outline: none; }" \
+            % QColor(*self.textColor).name()
         page.pushButton_textColor.setStyleSheet(btnStyle)
 
         page.lineEdit_title.setText(self.title)
@@ -57,44 +62,46 @@ class Component(__base__.Component):
         self.xPosition = self.page.spinBox_xTextAlign.value()
         self.yPosition = self.page.spinBox_yTextAlign.value()
         self.textColor = self.RGBFromString(self.page.lineEdit_textColor.text())
-        
         self.parent.drawPreview()
-        
+
     def getXY(self):
         '''Returns true x, y after considering alignment settings'''
         fm = QtGui.QFontMetrics(self.titleFont)
-        if self.alignment == 0:      #Left
-           x = self.xPosition
-        if self.alignment == 1:      #Middle
-           offset = fm.width(self.title)/2
-           x = self.xPosition - offset
-        if self.alignment == 2:      #Right
-           offset = fm.width(self.title)
-           x = self.xPosition - offset
+        if self.alignment == 0:             # Left
+            x = self.xPosition
+
+        if self.alignment == 1:             # Middle
+            offset = fm.width(self.title)/2
+            x = self.xPosition - offset
+
+        if self.alignment == 2:             # Right
+            offset = fm.width(self.title)
+            x = self.xPosition - offset
         return x, self.yPosition
-        
-        
+
     def loadPreset(self, pr):
         self.page.lineEdit_title.setText(pr['title'])
-        font = QFont(); font.fromString(pr['titleFont'])
+        font = QFont()
+        font.fromString(pr['titleFont'])
         self.page.fontComboBox_titleFont.setCurrentFont(font)
         self.page.spinBox_fontSize.setValue(pr['fontSize'])
         self.page.comboBox_textAlign.setCurrentIndex(pr['alignment'])
         self.page.spinBox_xTextAlign.setValue(pr['xPosition'])
         self.page.spinBox_yTextAlign.setValue(pr['yPosition'])
         self.page.lineEdit_textColor.setText('%s,%s,%s' % pr['textColor'])
-        btnStyle = "QPushButton { background-color : %s; outline: none; }" % QColor(*pr['textColor']).name()
+        btnStyle = "QPushButton { background-color : %s; outline: none; }" \
+            % QColor(*pr['textColor']).name()
         self.page.pushButton_textColor.setStyleSheet(btnStyle)
-        
+
     def savePreset(self):
         return {
-                'title' : self.title,
-                'titleFont' : self.titleFont.toString(),
-                'alignment' : self.alignment,
-                'fontSize' : self.fontSize,
-                'xPosition' : self.xPosition,
-                'yPosition' : self.yPosition,
-                'textColor' : self.textColor
+                'title': self.title,
+                'titleFont': self.titleFont.toString(),
+                'alignment': self.alignment,
+                'fontSize': self.fontSize,
+                'xPosition': self.xPosition,
+                'yPosition': self.yPosition,
+                'textColor': self.textColor
                 }
 
     def previewRender(self, previewWorker):
@@ -105,7 +112,7 @@ class Component(__base__.Component):
     def preFrameRender(self, **kwargs):
         super().preFrameRender(**kwargs)
         return ['static']
-        
+
     def frameRender(self, moduleNo, arrayNo, frameNo):
         width = int(self.worker.core.settings.value('outputWidth'))
         height = int(self.worker.core.settings.value('outputHeight'))
@@ -113,9 +120,9 @@ class Component(__base__.Component):
 
     def addText(self, width, height):
         x, y = self.getXY()
-        im = Image.new("RGBA", (width, height),(0,0,0,0))
+        im = Image.new("RGBA", (width, height), (0, 0, 0, 0))
         image = ImageQt(im)
-   
+
         painter = QPainter(image)
         self.titleFont.setPixelSize(self.fontSize)
         painter.setFont(self.titleFont)
@@ -123,15 +130,9 @@ class Component(__base__.Component):
         painter.drawText(x, y, self.title)
         painter.end()
 
-        buffer = QtCore.QBuffer()
-        buffer.open(QtCore.QIODevice.ReadWrite)
-        image.save(buffer, "PNG")
+        imBytes = image.bits().asstring(image.numBytes())
 
-        strio = io.BytesIO()
-        strio.write(buffer.data())
-        buffer.close()
-        strio.seek(0)
-        return Image.open(strio)
+        return Image.frombytes('RGBA', (width, height), imBytes)
 
     def pickColor(self):
         RGBstring, btnStyle = super().pickColor()
-- 
cgit v1.2.3