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

Tweaks to mosaic character editing

Browse Source
This commit is contained in:
G.K.MacGregor
2024-07-07 19:41:39 +01:00
parent fbdde54fe4
commit c32876600b
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
decode.cpp
View File

@@ -169,7 +169,8 @@ TeletextPageDecode::TeletextPageDecode()
m_rowHeight[r] = NormalHeight;
for (int c=0; c<72; c++) {
if (c < 40) {
m_cellLevel1Mosaic[r][c] = false;
m_cellLevel1MosaicAttr[r][c] = false;
m_cellLevel1MosaicChar[r][c] = false;
m_cellLevel1CharSet[r][c] = 0;
}
m_refresh[r][c] = true;
@@ -723,13 +724,18 @@ void TeletextPageDecode::decodeRow(int r)
}
// Level 1 character
if (c < 40) {
m_cellLevel1CharSet[r][c] = level1CharSet;
m_cellLevel1MosaicAttr[r][c] = level1Mosaics;
// Set to true on mosaic CHARACTER - not on blast through alphanumerics
m_cellLevel1MosaicChar[r][c] = level1Mosaics && (m_levelOnePage->character(r, c) & 0x20);
}
if (c < 40 && m_rowHeight[r] != BottomHalf) {
m_level1ActivePainter.result.character.diacritical = 0;
if (m_levelOnePage->character(r, c) >= 0x20) {
m_level1ActivePainter.result.character.code = m_levelOnePage->character(r, c);
// Set to true on mosaic character - not on blast through alphanumerics
m_cellLevel1Mosaic[r][c] = level1Mosaics && (m_levelOnePage->character(r, c) & 0x20);
if (m_cellLevel1Mosaic[r][c]) {
if (m_cellLevel1MosaicChar[r][c]) {
m_level1ActivePainter.result.character.set = 24 + (level1SeparatedMosaics || m_level1ActivePainter.attribute.display.underlineSeparated);
level1HoldMosaicCharacter = m_levelOnePage->character(r, c);
level1HoldMosaicSeparated = level1SeparatedMosaics;
@@ -743,9 +749,6 @@ void TeletextPageDecode::decodeRow(int r)
// In side panel or on bottom half of Level 1 double height row, no Level 1 characters here
m_level1ActivePainter.result.character = { 0x20, 0, 0 };
if (c < 40)
m_cellLevel1CharSet[r][c] = level1CharSet;
// X/26 characters
// Used to track if character was placed by X/26 data