daniel/QTeletextMaker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put font bitmap into a shared class

Browse Source
This commit is contained in:
G.K.MacGregor
2021-06-23 11:23:11 +01:00
parent f256e4ed28
commit 38746c7f38
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
render.cpp
View File

@@ -26,11 +26,26 @@
#include "render.h" #include "render.h"
int TeletextFontBitmap::s_instances = 0;
QBitmap *TeletextFontBitmap::s_fontBitmap = nullptr;
TeletextFontBitmap::TeletextFontBitmap()
{
if (s_instances == 0)
s_fontBitmap = new QBitmap(":/images/teletextfont.png");
s_instances++;
}
TeletextFontBitmap::~TeletextFontBitmap()
{
s_instances--;
if (s_instances == 0)
delete s_fontBitmap;
}
TeletextPageRender::TeletextPageRender() TeletextPageRender::TeletextPageRender()
{ {
QPainter pixmapPainter;
m_fontBitmap = new QBitmap(":/images/teletextfont.png");
for (int i=0; i<6; i++) for (int i=0; i<6; i++)
m_pagePixmap[i] = new QPixmap(864, 250); m_pagePixmap[i] = new QPixmap(864, 250);
m_pagePixmap[0]->fill(Qt::transparent); m_pagePixmap[0]->fill(Qt::transparent);
@@ -58,7 +73,6 @@ TeletextPageRender::~TeletextPageRender()
} }
for (int i=0; i<6; i++) for (int i=0; i<6; i++)
delete m_pagePixmap[i]; delete m_pagePixmap[i];
delete m_fontBitmap;
} }
void TeletextPageRender::setTeletextPage(LevelOnePage *newCurrentPage) void TeletextPageRender::setTeletextPage(LevelOnePage *newCurrentPage)
@@ -348,10 +362,10 @@ void TeletextPageRender::renderPage(int r)
pixmapPainter.setBackground(QBrush(backQColour)); pixmapPainter.setBackground(QBrush(backQColour));
} }
pixmapPainter.setPen(foreQColour); pixmapPainter.setPen(foreQColour);
pixmapPainter.drawPixmap(c*12, r*10, charWidth, charHeight, *m_fontBitmap, (resultCharacter.code-32)*12, resultCharacter.set*10, 12, 10); pixmapPainter.drawPixmap(c*12, r*10, charWidth, charHeight, *m_fontBitmap.rawBitmap(), (resultCharacter.code-32)*12, resultCharacter.set*10, 12, 10);
if (resultCharacter.diacritical) { if (resultCharacter.diacritical) {
pixmapPainter.setBackgroundMode(Qt::TransparentMode); pixmapPainter.setBackgroundMode(Qt::TransparentMode);
pixmapPainter.drawPixmap(c*12, r*10, charWidth, charHeight, *m_fontBitmap, 384+resultCharacter.diacritical*12, 70, 12, 10); pixmapPainter.drawPixmap(c*12, r*10, charWidth, charHeight, *m_fontBitmap.rawBitmap(), 384+resultCharacter.diacritical*12, 70, 12, 10);
pixmapPainter.setBackgroundMode(Qt::OpaqueMode); pixmapPainter.setBackgroundMode(Qt::OpaqueMode);
} }
} }
@@ -483,7 +497,7 @@ void TeletextPageRender::renderPage(int r)
if (m_showCodes && c < 40 && m_levelOnePage->character(r, c)<0x20 && !m_level1Layer.isRowBottomHalf(r) && !m_cell[r][c].bottomHalf) { if (m_showCodes && c < 40 && m_levelOnePage->character(r, c)<0x20 && !m_level1Layer.isRowBottomHalf(r) && !m_cell[r][c].bottomHalf) {
pixmapPainter.setBackground(QBrush(QColor(0, 0, 0, 128))); pixmapPainter.setBackground(QBrush(QColor(0, 0, 0, 128)));
pixmapPainter.setPen(QColor(255, 255, 255, 224)); pixmapPainter.setPen(QColor(255, 255, 255, 224));
pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap, (m_levelOnePage->character(r, c)+32)*12, 250, 12, 10); pixmapPainter.drawPixmap(c*12, r*10, 12, 10, *m_fontBitmap.rawBitmap(), (m_levelOnePage->character(r, c)+32)*12, 250, 12, 10);
} }
if (resultAttributes.display.doubleHeight) if (resultAttributes.display.doubleHeight)

14
render.h
View File

@@ -179,6 +179,18 @@ private:
enum rowHeightEnum { RHnormal=-1, RHtophalf, RHbottomhalf } m_rowHeight[25]; enum rowHeightEnum { RHnormal=-1, RHtophalf, RHbottomhalf } m_rowHeight[25];
}; };
class TeletextFontBitmap
{
public:
TeletextFontBitmap();
~TeletextFontBitmap();
QBitmap *rawBitmap() const { return s_fontBitmap; }
private:
static int s_instances;
static QBitmap* s_fontBitmap;
};
class TeletextPageRender : public QObject class TeletextPageRender : public QObject
{ {
Q_OBJECT Q_OBJECT
@@ -217,7 +229,7 @@ protected:
inline void setFullScreenColour(int); inline void setFullScreenColour(int);
inline void setFullRowColour(int, int); inline void setFullRowColour(int, int);
QBitmap* m_fontBitmap; TeletextFontBitmap m_fontBitmap;
QPixmap* m_pagePixmap[6]; QPixmap* m_pagePixmap[6];
int m_finalFullScreenColour, m_renderLevel; int m_finalFullScreenColour, m_renderLevel;
QColor m_finalFullScreenQColor; QColor m_finalFullScreenQColor;