# HG changeset patch
# User sl
# Date 1401257187 -7200
# Node ID b1b049e28772fd16b2476589d2d3b77a1ca24efc
# Parent  62a1d3631dcb3489c3bd9cac5486b334b9137312
Basic font rendering now working nicely.

diff -r 62a1d3631dcb -r b1b049e28772 MiniDisplay/BitArray.cpp
--- a/MiniDisplay/BitArray.cpp	Tue May 27 22:14:29 2014 +0200
+++ b/MiniDisplay/BitArray.cpp	Wed May 28 08:06:27 2014 +0200
@@ -124,7 +124,9 @@
 *   Returned   : None
 ***************************************************************************/
 BitArray::BitArray(const int numBits):
-    m_NumBits(numBits)
+    m_NumBits(numBits),
+    m_Array(NULL),
+    m_OwnsBuffer(true)
 {
     m_SizeInBytes = BITS_TO_CHARS(numBits);
 
@@ -146,10 +148,12 @@
 *   Effects    : Allocates vectory for array bits
 *   Returned   : None
 ***************************************************************************/
-BitArray::BitArray(unsigned char *array, const int numBits):
+BitArray::BitArray(unsigned char *array, const int numBits,bool aOwnsBuffer):
     m_NumBits(numBits),
-    m_Array(array)
+    m_Array(array),
+    m_OwnsBuffer(aOwnsBuffer)
 {
+
 }
 
 /***************************************************************************
@@ -162,7 +166,11 @@
 ***************************************************************************/
 BitArray::~BitArray(void)
 {
-    delete[] m_Array;
+    if (m_OwnsBuffer)
+    {
+        delete[] m_Array;
+        m_Array = NULL;
+    }
 }
 
 /***************************************************************************
diff -r 62a1d3631dcb -r b1b049e28772 MiniDisplay/BitArray.h
--- a/MiniDisplay/BitArray.h	Tue May 27 22:14:29 2014 +0200
+++ b/MiniDisplay/BitArray.h	Wed May 28 08:06:27 2014 +0200
@@ -95,14 +95,14 @@
 {
     public:
         BitArray(const int numBits);
-        BitArray(unsigned char *array, const int numBits);
+        BitArray(unsigned char *array, const int numBits, bool aOwnsBuffer);
 
         virtual ~BitArray(void);
 
         void Dump(std::ostream &outStream);
 
-        const unsigned int SizeInBits() { return m_NumBits; };
-		const unsigned int SizeInBytes() { return m_SizeInBytes; };
+        const unsigned int SizeInBits() { return m_NumBits; }
+        const unsigned int SizeInBytes() { return m_SizeInBytes; }
 
         /* set/clear functions */
         void SetAll(void);
@@ -155,6 +155,7 @@
         unsigned int m_NumBits;                 /* number of bits in the array */
 		unsigned int m_SizeInBytes;
         unsigned char *m_Array;                 /* vector of characters */
+        bool m_OwnsBuffer;
 };
 
 #endif  /* ndef BIT_ARRAY_H */
diff -r 62a1d3631dcb -r b1b049e28772 MiniDisplay/FutabaVfd.cpp
--- a/MiniDisplay/FutabaVfd.cpp	Tue May 27 22:14:29 2014 +0200
+++ b/MiniDisplay/FutabaVfd.cpp	Wed May 28 08:06:27 2014 +0200
@@ -131,7 +131,7 @@
 
 /**
 */
-void GP1212A01A::BitBlit(BitArray& aBitmap, int aSrcWidth, int aSrcHeight, int aTargetX, int aTargetY) const
+void GP1212A01A::BitBlit(const BitArray& aBitmap, int aSrcWidth, int aSrcHeight, int aTargetX, int aTargetY) const
 	{
 	//TODO: amend loop values so that we don't keep on looping past our frame buffer dimensions.
 	for (int i=0;i<aSrcWidth;i++)
@@ -443,4 +443,4 @@
 	Clear();
 	SwapBuffers();
 	Clear();
-	}
\ No newline at end of file
+	}
diff -r 62a1d3631dcb -r b1b049e28772 MiniDisplay/FutabaVfd.h
--- a/MiniDisplay/FutabaVfd.h	Tue May 27 22:14:29 2014 +0200
+++ b/MiniDisplay/FutabaVfd.h	Wed May 28 08:06:27 2014 +0200
@@ -127,7 +127,7 @@
 	virtual void SetPixel(unsigned char aX, unsigned char aY, bool aOn);
 	virtual void SetAllPixels(unsigned char aPattern);
     virtual int FrameBufferSizeInBytes() const {return KGP12xFrameBufferSizeInBytes;}
-	virtual void BitBlit(BitArray& aBitmap, int aSrcWidth, int aSrcHeight, int aTargetX, int aTargetY) const;
+    virtual void BitBlit(const BitArray& aBitmap, int aSrcWidth, int aSrcHeight, int aTargetX, int aTargetY) const;
 	//From FutabaVfd
 	virtual void SetBrightness(int aBrightness);
 	virtual void Clear();
diff -r 62a1d3631dcb -r b1b049e28772 MiniDisplay/minidisplay.cpp
--- a/MiniDisplay/minidisplay.cpp	Tue May 27 22:14:29 2014 +0200
+++ b/MiniDisplay/minidisplay.cpp	Wed May 28 08:06:27 2014 +0200
@@ -73,11 +73,15 @@
 void MiniDisplay::setFont(const QFont& aFont)
 {
     iFont=aFont;
+    iFont.setStyleStrategy(QFont::NoAntialias);
     QString strDemo="0123456789ABCDEF";
     QFontMetrics metrics(iFont);
-    QSize size(metrics.width(strDemo),metrics.height());
+    int w=metrics.width(strDemo);
+    int h=metrics.height();
+    QSize size(w,h);
     QImage image(size,QImage::Format_Mono);
     image.fill(0xFFFFFFFF);
+    //Draw some text into our image
     {
         QPainter painter(&image);
         //painter.begin(&image);
@@ -85,6 +89,27 @@
         painter.setFont(iFont);
         painter.drawText(0,metrics.ascent(),strDemo);
     }
-    //painter.end();
+    //Save image as PNG for validation
     image.save("font.png");
+    //
+    //int sizeInBytes=image.byteCount();
+    int pixelCount=w*h;
+    BitArray bits(pixelCount);
+
+    for (int i=0;i<w;i++)
+        {
+        for (int j=0;j<h;j++)
+            {
+            QRgb color=image.pixel(i,j);
+            if (color!=0xffffffff)
+                {
+                bits.SetBit(i*h+j);
+                }
+            }
+        }
+
+    iDisplay.Clear();
+    iDisplay.BitBlit(bits,w,h,0,0);
+    iDisplay.SwapBuffers();
+    //
 }