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

Add wrappers to manipulate local object pointers

Browse Source
This commit is contained in:
G.K.MacGregor
2021-09-09 14:44:52 +01:00
parent d8afb84861
commit 279eaaad3e
2 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
x26triplets.cpp
View File

@@ -51,6 +51,23 @@ void X26Triplet::setAddressColumn(int addressColumn)
m_address = addressColumn; m_address = addressColumn;
} }
void X26Triplet::setObjectLocalDesignationCode(int i)
{
m_address = 0x28 | (i >> 3);
m_data = (m_data & 0x0f) | ((i & 0x07) << 4);
}
void X26Triplet::setObjectLocalTripletNumber(int i)
{
m_data = (m_data & 0x70) | i;
}
void X26Triplet::setObjectLocalIndex(int i)
{
m_address = 0x28 + (i >= 104); // Set bit 0 of address if triplet >= 8
m_data = (((i / 13) & 0x07) << 4) | (i % 13);
}
void X26TripletList::updateInternalData(int r) void X26TripletList::updateInternalData(int r)
{ {
@@ -62,7 +79,7 @@ void X26TripletList::updateInternalData(int r)
activePosition.setColumn(m_list[r-1].m_activePositionColumn); activePosition.setColumn(m_list[r-1].m_activePositionColumn);
} }
for (int i = r; i < m_list.size(); i++) { for (int i=r; i < m_list.size(); i++) {
triplet = &m_list[i]; triplet = &m_list[i];
triplet->m_error = X26Triplet::NoError; triplet->m_error = X26Triplet::NoError;
if (triplet->isRowTriplet()) { if (triplet->isRowTriplet()) {
@@ -94,10 +111,7 @@ void X26TripletList::updateInternalData(int r)
activePosition.reset(); activePosition.reset();
// Make sure data field holds correct place of triplet // Make sure data field holds correct place of triplet
// otherwise the object won't appear // otherwise the object won't appear
triplet->m_address &= 0x3c; triplet->setObjectLocalIndex(i);
if (i >= 104) // Triplet 8
triplet->m_address |= 0x01;
triplet->m_data = (((i / 13) & 0x07) << 4) | (i % 13);
break; break;
}; };
// Column triplet: make sure that PDC and reserved triplets don't affect the Active Position // Column triplet: make sure that PDC and reserved triplets don't affect the Active Position

7
x26triplets.h
View File

@@ -48,6 +48,13 @@ public:
void setAddressRow(int); void setAddressRow(int);
void setAddressColumn(int); void setAddressColumn(int);
int objectLocalDesignationCode() const { return (((m_address & 0x01) << 3) | (m_data >> 4)); }
int objectLocalTripletNumber() const { return m_data & 0x0f; }
int objectLocalIndex() const { return objectLocalDesignationCode() * 13 + objectLocalTripletNumber(); }
void setObjectLocalDesignationCode(int);
void setObjectLocalTripletNumber(int);
void setObjectLocalIndex(int);
int activePositionRow() const { return m_activePositionRow; } int activePositionRow() const { return m_activePositionRow; }
int activePositionColumn() const { return m_activePositionColumn; } int activePositionColumn() const { return m_activePositionColumn; }
X26TripletError error() const { return m_error; } X26TripletError error() const { return m_error; }