Work on the VPuzzleLayoutFileReader

This commit is contained in:
Ronan Le Tiec 2020-04-18 20:24:25 +02:00
parent 596707d5b1
commit 9e2c0e9cc5
3 changed files with 248 additions and 2 deletions

View File

@ -26,9 +26,237 @@
** **
** *************************************************************************/ ** *************************************************************************/
#include <QXmlStreamAttributes>
#include "vpuzzlelayoutfilereader.h" #include "vpuzzlelayoutfilereader.h"
VPuzzleLayoutFileReader::VPuzzleLayoutFileReader() VPuzzleLayoutFileReader::VPuzzleLayoutFileReader()
{ {
} }
//---------------------------------------------------------------------------------------------------------------------
VPuzzleLayoutFileReader::~VPuzzleLayoutFileReader()
{
// TODO
}
//---------------------------------------------------------------------------------------------------------------------
bool VPuzzleLayoutFileReader::ReadFile(VPuzzleLayout *layout, QFile *file)
{
setDevice(file);
if (readNextStartElement())
{
// TODO extend the handling
// if it doesn't start with layout, error
// if it starts with version > than current version, error
if (name() == QString("layout")
&& attributes().value(QString("version")) == QLatin1String("1.0.0"))
{
ReadLayout(layout);
}
else
{
raiseError(QObject::tr("The file is not a layout version 1.0.0 file."));
}
}
return !error();
}
//---------------------------------------------------------------------------------------------------------------------
void VPuzzleLayoutFileReader::ReadLayout(VPuzzleLayout *layout)
{
Q_ASSERT(isStartElement() && name() == QString("layout"));
while (readNextStartElement()) {
if (name() == QString("properties"))
{
ReadProperties(layout);
}
else if (name() == QString("layers"))
{
ReadLayers(layout);
}
else
{
// TODO error handling, we encountered a tag that isn't defined in the specification
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void VPuzzleLayoutFileReader::ReadProperties(VPuzzleLayout *layout)
{
Q_ASSERT(isStartElement() && name() == QString("properties"));
while (readNextStartElement()) {
if (name() == QString("unit"))
{
QString unit = readElementText();
// TODO read unit infos
}
else if (name() == QString("description"))
{
QString description = readElementText();
// TODO read the description info
}
else if (name() == QString("size"))
{
QSizeF size = ReadSize();
layout->SetLayoutSize(size);
}
else if (name() == QString("margin"))
{
QMarginsF margins = ReadMargins();
layout->SetLayoutMargins(margins);
}
else if (name() == QString("control"))
{
QXmlStreamAttributes attribs = attributes();
// attribs.value("followGrainLine"); // TODO
layout->SetWarningSuperpositionOfPieces(attribs.value("warningSuperposition") == "true");
layout->SetWarningPiecesOutOfBound(attribs.value("warningOutOfBound") == "true");
layout->SetStickyEdges(attribs.value("stickyEdges") == "true");
layout->SetPiecesGap(attribs.value("piecesGap").toDouble());
}
else if (name() == QString("tiles"))
{
ReadTiles(layout);
}
else
{
// TODO error handling, we encountered a tag that isn't defined in the specification
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void VPuzzleLayoutFileReader::ReadTiles(VPuzzleLayout *layout)
{
Q_UNUSED(layout); // to be removed when used
Q_ASSERT(isStartElement() && name() == QString("tiles"));
QXmlStreamAttributes attribs = attributes();
// attribs.value("visible"); // TODO
// attribs.value("matchingMarks"); // TODO
while (readNextStartElement()) {
if (name() == QString("size"))
{
QSizeF size = ReadSize();
// TODO set layout tiled size
Q_UNUSED(size);
}
else if (name() == QString("margin"))
{
QMarginsF margins = ReadMargins();
// TODO set layout tiled margins
Q_UNUSED(margins);
}
else
{
// TODO error handling, we encountered a tag that isn't defined in the specification
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void VPuzzleLayoutFileReader::ReadLayers(VPuzzleLayout *layout)
{
Q_ASSERT(isStartElement() && name() == QString("layers"));
while (readNextStartElement()) {
if (name() == QString("unplacedPiecesLayer"))
{
ReadLayer(layout->GetUnplacedPiecesLayer());
}
else if (name() == QString("layer"))
{
VPuzzleLayer *layer = layout->AddLayer();
ReadLayer(layer);
}
else
{
// TODO error handling, we encountered a tag that isn't defined in the specification
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void VPuzzleLayoutFileReader::ReadLayer(VPuzzleLayer *layer)
{
Q_ASSERT(isStartElement() && name() == QString("layer"));
QXmlStreamAttributes attribs = attributes();
layer->SetName(attribs.value("name").toString());
layer->SetIsVisible(attribs.value("visible") == "true");
while (readNextStartElement()) {
if (name() == QString("piece"))
{
VPuzzlePiece *piece = new VPuzzlePiece();
ReadPiece(piece);
layer->AddPiece(piece);
}
else
{
// TODO error handling, we encountered a tag that isn't defined in the specification
}
}
}
//---------------------------------------------------------------------------------------------------------------------
void VPuzzleLayoutFileReader::ReadPiece(VPuzzlePiece *piece)
{
Q_ASSERT(isStartElement() && name() == QString("piece"));
// TODO read the attributes
while (readNextStartElement()) {
if (name() == QString("..."))
{
// TODO
}
else
{
// TODO error handling, we encountered a tag that isn't defined in the specification
}
}
}
//---------------------------------------------------------------------------------------------------------------------
QMarginsF VPuzzleLayoutFileReader::ReadMargins()
{
QMarginsF margins = QMarginsF();
QXmlStreamAttributes attribs = attributes();
margins.setLeft(attribs.value("left").toDouble());
margins.setTop(attribs.value("top").toDouble());
margins.setRight(attribs.value("right").toDouble());
margins.setBottom(attribs.value("bottom").toDouble());
return margins;
}
//---------------------------------------------------------------------------------------------------------------------
QSizeF VPuzzleLayoutFileReader::ReadSize()
{
QSizeF size = QSize();
QXmlStreamAttributes attribs = attributes();
size.setWidth(attribs.value("width").toDouble());
size.setHeight(attribs.value("height").toDouble());
return size;
}

View File

@ -30,11 +30,29 @@
#define VPUZZLELAYOUTFILEREADER_H #define VPUZZLELAYOUTFILEREADER_H
#include <QXmlStreamReader> #include <QXmlStreamReader>
#include "vpuzzlelayout.h"
#include "vpuzzlelayer.h"
#include "vpuzzlepiece.h"
class VPuzzleLayoutFileReader : public QXmlStreamReader class VPuzzleLayoutFileReader : public QXmlStreamReader
{ {
public: public:
VPuzzleLayoutFileReader(); VPuzzleLayoutFileReader();
~VPuzzleLayoutFileReader();
bool ReadFile(VPuzzleLayout *layout, QFile *file);
private:
void ReadLayout(VPuzzleLayout *layout);
void ReadProperties(VPuzzleLayout *layout);
void ReadTiles(VPuzzleLayout *layout);
void ReadLayers(VPuzzleLayout *layout);
void ReadLayer(VPuzzleLayer *layer);
void ReadPiece(VPuzzlePiece *piece);
QMarginsF ReadMargins();
QSizeF ReadSize();
}; };
#endif // VPUZZLELAYOUTFILEREADER_H #endif // VPUZZLELAYOUTFILEREADER_H

View File

@ -37,8 +37,6 @@ VPuzzleLayoutFileWriter::VPuzzleLayoutFileWriter()
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VPuzzleLayoutFileWriter::WriteFile(VPuzzleLayout *layout, QFile *file) void VPuzzleLayoutFileWriter::WriteFile(VPuzzleLayout *layout, QFile *file)
{ {
Q_UNUSED(layout);
setDevice(file); setDevice(file);
setAutoFormatting(true); setAutoFormatting(true);
@ -151,6 +149,8 @@ void VPuzzleLayoutFileWriter::WriteLayer(VPuzzleLayer *layer, const QString &tag
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
void VPuzzleLayoutFileWriter::WritePiece(VPuzzlePiece *piece) void VPuzzleLayoutFileWriter::WritePiece(VPuzzlePiece *piece)
{ {
Q_UNUSED(piece);
writeStartElement("piece"); writeStartElement("piece");
writeAttribute("id", "uuid1"); // TODO / Fixme get the right value writeAttribute("id", "uuid1"); // TODO / Fixme get the right value
writeAttribute("name", "Piece name"); // TODO / Fixme get the right value writeAttribute("name", "Piece name"); // TODO / Fixme get the right value