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

No need to keep page number within every subpage

Browse Source
This commit is contained in:
G.K.MacGregor
2020-11-15 11:34:15 +00:00
parent 8d0b222672
commit c1f5445465
3 changed files with 1 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
document.cpp
View File

@@ -31,7 +31,6 @@ TeletextDocument::TeletextDocument()
m_description.clear(); m_description.clear();
m_empty = true; m_empty = true;
m_subPages.push_back(new LevelOnePage); m_subPages.push_back(new LevelOnePage);
m_subPages[0]->setPageNumber(m_pageNumber);
m_currentSubPageIndex = 0; m_currentSubPageIndex = 0;
m_undoStack = new QUndoStack(this); m_undoStack = new QUndoStack(this);
m_cursorRow = 1; m_cursorRow = 1;
@@ -70,7 +69,6 @@ void TeletextDocument::loadDocument(QFile *inFile)
// This assumes that PN is the first command of a new subpage... // This assumes that PN is the first command of a new subpage...
if (firstSubPageFound) { if (firstSubPageFound) {
m_subPages.push_back(new LevelOnePage); m_subPages.push_back(new LevelOnePage);
m_subPages.back()->setPageNumber(m_pageNumber);
loadingPage = m_subPages.back(); loadingPage = m_subPages.back();
} }
m_pageNumber = pageNumberRead; m_pageNumber = pageNumberRead;
@@ -200,7 +198,6 @@ void TeletextDocument::insertSubPage(int beforeSubPageIndex, bool copySubPage)
insertedSubPage = new LevelOnePage(*m_subPages.at(beforeSubPageIndex)); insertedSubPage = new LevelOnePage(*m_subPages.at(beforeSubPageIndex));
else else
insertedSubPage = new LevelOnePage; insertedSubPage = new LevelOnePage;
insertedSubPage->setPageNumber(m_pageNumber);
if (beforeSubPageIndex == m_subPages.size()) if (beforeSubPageIndex == m_subPages.size())
m_subPages.push_back(insertedSubPage); m_subPages.push_back(insertedSubPage);
else else
@@ -234,15 +231,13 @@ void TeletextDocument::setPageNumber(QString pageNumberString)
m_pageNumber = pageNumberRead; m_pageNumber = pageNumberRead;
for (auto &subPage : m_subPages) { for (auto &subPage : m_subPages)
subPage->setPageNumber(pageNumberRead);
if (magazineFlip) { if (magazineFlip) {
for (int i=0; i<6; i++) for (int i=0; i<6; i++)
subPage->setFastTextLinkPageNumber(i, subPage->fastTextLinkPageNumber(i) ^ magazineFlip); subPage->setFastTextLinkPageNumber(i, subPage->fastTextLinkPageNumber(i) ^ magazineFlip);
for (int i=0; i<8; i++) for (int i=0; i<8; i++)
subPage->setComposeLinkPageNumber(i, subPage->composeLinkPageNumber(i) ^ magazineFlip); subPage->setComposeLinkPageNumber(i, subPage->composeLinkPageNumber(i) ^ magazineFlip);
} }
}
} }
void TeletextDocument::setDescription(QString newDescription) void TeletextDocument::setDescription(QString newDescription)

8
pagebase.cpp
View File

@@ -23,7 +23,6 @@
PageBase::PageBase() PageBase::PageBase()
{ {
m_pageNumber = 0x8ff;
m_pageFunction = PFLOP; m_pageFunction = PFLOP;
m_packetCoding = PC7bit; m_packetCoding = PC7bit;
// We use nullptrs to keep track of allocated packets, so initialise them this way // We use nullptrs to keep track of allocated packets, so initialise them this way
@@ -35,7 +34,6 @@ PageBase::PageBase()
PageBase::PageBase(const PageBase &other) PageBase::PageBase(const PageBase &other)
{ {
setPageNumber(other.pageNumber());
setPageFunction(other.pageFunction()); setPageFunction(other.pageFunction());
setPacketCoding(other.packetCoding()); setPacketCoding(other.packetCoding());
for (int i=0; i<8; i++) for (int i=0; i<8; i++)
@@ -53,12 +51,6 @@ PageBase::~PageBase()
if (m_packets[i] != nullptr) if (m_packets[i] != nullptr)
delete m_packets[i]; delete m_packets[i];
} }
void PageBase::setPageNumber(int newPageNumber)
{
m_pageNumber = newPageNumber;
}
QByteArray PageBase::packet(int packetNumber, int designationCode) const QByteArray PageBase::packet(int packetNumber, int designationCode) const
{ {
int arrayIndex = packetNumber; int arrayIndex = packetNumber;

4
pagebase.h
View File

@@ -37,9 +37,6 @@ public:
PageBase(const PageBase &); PageBase(const PageBase &);
~PageBase(); ~PageBase();
int pageNumber() const { return m_pageNumber; }
void setPageNumber(int);
QByteArray packet(int, int=0) const; QByteArray packet(int, int=0) const;
bool packetNeeded(int, int=0) const; bool packetNeeded(int, int=0) const;
bool setPacket(int, QByteArray); bool setPacket(int, QByteArray);
@@ -60,7 +57,6 @@ public:
bool setPacketCoding(PacketCodingEnum); bool setPacketCoding(PacketCodingEnum);
private: private:
int m_pageNumber;
bool m_controlBits[8]; bool m_controlBits[8];
PageFunctionEnum m_pageFunction; PageFunctionEnum m_pageFunction;
PacketCodingEnum m_packetCoding; PacketCodingEnum m_packetCoding;