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

Load files into QList of PageBase objects

Browse Source 
A document is first loaded as a generic PageBase before being converted to
level one pages afterwards.

This is preparation for loading pages of other types such as DRCS and Public
Object Pages. The latter will need further work as the non-TTI file loaders
blindly assume X/1 to X/25 are 7-bit odd parity coded.

This also reverts 0a1c018 putting back the copy constructor that allows
a PageBase to be converted to a LevelOnePage.
This commit is contained in:
Gavin MacGregor
2025-05-27 17:34:18 +01:00
parent 42fd870749
commit 8675cef6c5
7 changed files with 69 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/qteletextmaker/loadformats.h
View File

@@ -23,12 +23,11 @@
#include <QByteArray>
#include <QDataStream>
#include <QFile>
#include <QList>
#include <QString>
#include <QStringList>
#include <QVariant>
#include "document.h"
#include "levelonepage.h"
#include "pagebase.h"
class LoadFormat
@@ -36,7 +35,7 @@ class LoadFormat
public:
virtual ~LoadFormat() {};
virtual bool load(QFile *inFile, TeletextDocument *document, QVariantHash *metadata = nullptr) =0;
virtual bool load(QFile *inFile, QList<PageBase> &subPages, QVariantHash *metadata = nullptr) =0;
virtual QString description() const =0;
virtual QStringList extensions() const =0;
@@ -46,7 +45,6 @@ public:
bool reExportWarning() const { return m_reExportWarning; };
protected:
TeletextDocument const *m_document;
QStringList m_warnings;
QString m_error;
bool m_reExportWarning = false;
@@ -55,7 +53,7 @@ protected:
class LoadTTIFormat : public LoadFormat
{
public:
bool load(QFile *inFile, TeletextDocument *document, QVariantHash *metadata = nullptr) override;
bool load(QFile *inFile, QList<PageBase> &subPages, QVariantHash *metadata = nullptr) override;
QString description() const override { return QString("MRG Systems TTI"); };
QStringList extensions() const override { return QStringList { "tti", "ttix" }; };
@@ -64,7 +62,7 @@ public:
class LoadT42Format : public LoadFormat
{
public:
bool load(QFile *inFile, TeletextDocument *document, QVariantHash *metadata = nullptr) override;
bool load(QFile *inFile, QList<PageBase> &subPages, QVariantHash *metadata = nullptr) override;
QString description() const override { return QString("t42 packet stream"); };
QStringList extensions() const override { return QStringList { "t42" }; };
@@ -89,7 +87,7 @@ protected:
class LoadEP1Format : public LoadFormat
{
public:
bool load(QFile *inFile, TeletextDocument *document, QVariantHash *metadata = nullptr) override;
bool load(QFile *inFile, QList<PageBase> &subPages, QVariantHash *metadata = nullptr) override;
QString description() const override { return QString("Softel EP1"); };
QStringList extensions() const override { return QStringList { "ep1", "epx" }; };