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

Add QIcon to font encapsulation

Browse Source
This commit is contained in:
G.K.MacGregor
2024-07-02 15:52:44 +01:00
parent 9b4ee66e1c
commit 23a0d3c47e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
render.h
View File

@@ -22,6 +22,7 @@
#include <QBitmap> #include <QBitmap>
#include <QColor> #include <QColor>
#include <QIcon>
#include <QImage> #include <QImage>
#include <QPixmap> #include <QPixmap>
@@ -35,6 +36,7 @@ public:
QImage *image() const { return s_fontImage; } QImage *image() const { return s_fontImage; }
QPixmap charBitmap(int c, int s) const { return s_fontBitmap->copy((c-32)*12, s*10, 12, 10); } QPixmap charBitmap(int c, int s) const { return s_fontBitmap->copy((c-32)*12, s*10, 12, 10); }
QIcon charIcon(int c, int s) const { return QIcon(charBitmap(c, s)); }
private: private:
static int s_instances; static int s_instances;

12
x26model.cpp
View File

@@ -376,27 +376,25 @@ QVariant X26Model::data(const QModelIndex &index, int role) const
break; break;
case 0x21: // G1 mosaic character case 0x21: // G1 mosaic character
if (triplet.data() & 0x20) if (triplet.data() & 0x20)
// Returning the bitmap as-is doesn't seem to work here return m_fontBitmap.charIcon(triplet.data(), 24);
// but putting it inside a QIcon... does?
return QIcon(m_fontBitmap.charBitmap(triplet.data(), 24));
else if (triplet.data() >= 0x20) else if (triplet.data() >= 0x20)
// Blast-through // Blast-through
return QIcon(m_fontBitmap.charBitmap(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()))); return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
break; break;
case 0x22: // G3 mosaic character at level 1.5 case 0x22: // G3 mosaic character at level 1.5
case 0x2b: // G3 mosaic character at level >=2.5 case 0x2b: // G3 mosaic character at level >=2.5
if (triplet.data() >= 0x20) if (triplet.data() >= 0x20)
return QIcon(m_fontBitmap.charBitmap(triplet.data(), 26)); return m_fontBitmap.charIcon(triplet.data(), 26);
break; break;
case 0x2f: // G2 character case 0x2f: // G2 character
if (triplet.data() >= 0x20) if (triplet.data() >= 0x20)
return QIcon(m_fontBitmap.charBitmap(triplet.data(), m_parentMainWidget->pageDecode()->cellG2CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()))); return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG2CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
break; break;
default: default:
if (triplet.modeExt() == 0x29 || (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f)) if (triplet.modeExt() == 0x29 || (triplet.modeExt() >= 0x30 && triplet.modeExt() <= 0x3f))
// G0 character or G0 diacritical mark // G0 character or G0 diacritical mark
if (triplet.data() >= 0x20) if (triplet.data() >= 0x20)
return QIcon(m_fontBitmap.charBitmap(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()))); return m_fontBitmap.charIcon(triplet.data(), m_parentMainWidget->pageDecode()->cellG0CharacterSet(triplet.activePositionRow(), triplet.activePositionColumn()));
} }
if (role == Qt::EditRole && index.column() == 2) if (role == Qt::EditRole && index.column() == 2)