Skip to content
Snippets Groups Projects
Commit 124f918d authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

clang-format

parent db48ad38
No related branches found
No related tags found
1 merge request!1072GUI: RealModel is refactored
......@@ -402,8 +402,10 @@ void RealItem::readFrom(QXmlStreamReader* reader)
// binary data
if (reader->name() == Tags::BinaryData) {
if (reader->attributes().value(Tags::Attributes::version).toInt() == 1) {
QString valueAsBase64 = reader->readElementText(QXmlStreamReader::SkipChildElements);
const auto data = QByteArray::fromBase64(valueAsBase64.toLatin1()); // #baimport add a unit test for this!
QString valueAsBase64 =
reader->readElementText(QXmlStreamReader::SkipChildElements);
const auto data = QByteArray::fromBase64(
valueAsBase64.toLatin1()); // #baimport add a unit test for this!
deserializeBinaryData(data);
}
GUI::Session::XML::gotoEndElementOfTag(reader, GUI::Session::XML::Tags::BinaryData);
......
......@@ -60,7 +60,7 @@ namespace Attributes {
const QString value("value");
}// namespace Attributes
} // namespace Attributes
} // namespace Tags
......@@ -479,12 +479,14 @@ void JobItem::writeTo(QXmlStreamWriter* writer) const
// begin time
writer->writeStartElement(Tags::BeginTime);
GUI::Session::XML::writeAttribute(writer, Tags::Attributes::value, m_beginTime.toString(Qt::ISODateWithMs));
GUI::Session::XML::writeAttribute(writer, Tags::Attributes::value,
m_beginTime.toString(Qt::ISODateWithMs));
writer->writeEndElement();
// end time
writer->writeStartElement(Tags::EndTime);
GUI::Session::XML::writeAttribute(writer, Tags::Attributes::value, m_endTime.toString(Qt::ISODateWithMs));
GUI::Session::XML::writeAttribute(writer, Tags::Attributes::value,
m_endTime.toString(Qt::ISODateWithMs));
writer->writeEndElement();
// status
......
......@@ -55,13 +55,12 @@ void RealModel::clear()
removeRealItem(realItem);
}
void RealModel::writeTo(QXmlStreamWriter *writer)
void RealModel::writeTo(QXmlStreamWriter* writer)
{
ASSERT(writer);
for (auto* realItem : realItems()) {
writer->writeStartElement(Tags::RealItemTag);
// The following attribute is intended to simplify navigation in the project file. No need
// to read it.
// Write item name to simplify navigation in the project file. No need to read it.
writer->writeAttribute(Tags::Attributes::name, realItem->realItemName());
// write content
......@@ -88,7 +87,7 @@ void RealModel::readFrom(QXmlStreamReader* reader, MessageService* messageServic
endResetModel();
}
RealItem *RealModel::createRealItem()
RealItem* RealModel::createRealItem()
{
auto realItem = std::make_unique<RealItem>();
realItem->setParentAndModel(nullptr, this);
......
......@@ -319,8 +319,9 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
if (reader.isStartElement()) {
if (reader.name() == Tags::BornAgainTag) {
Streamer(&reader).assertVersion(2);
m_currentVersion =
reader.attributes().value(Tags::Attributes::BornAgainVersionAttribute).toString();
m_currentVersion = reader.attributes()
.value(Tags::Attributes::BornAgainVersionAttribute)
.toString();
if (!GUI::Util::Path::isVersionMatchMinimal(m_currentVersion,
minimal_supported_version)) {
......@@ -338,7 +339,8 @@ ProjectDocument::ReadResult ProjectDocument::readProject(QIODevice* device,
else if (reader.name() == Tags::SimulationOptionsTag) {
m_simulationOptionsItem.readContentFrom(&reader);
reader.skipCurrentElement();
GUI::Session::XML::assertExpectedTag(&reader, Tags::SimulationOptionsTag);
GUI::Session::XML::assertExpectedTag(&reader,
Tags::SimulationOptionsTag);
} else if (reader.name() == Tags::SamplesTag) {
Streamer s(&reader);
m_sampleItems.serialize(s);
......
......@@ -53,8 +53,7 @@ std::unique_ptr<Datafield> UTest::GUI::createData(double value, DIM n_dim)
return result;
}
RealItem* UTest::GUI::createRealData(const QString& name, RealModel& model, double value,
DIM n_dim)
RealItem* UTest::GUI::createRealData(const QString& name, RealModel& model, double value, DIM n_dim)
{
RealItem* result = model.createRealItem();
result->setDatafield(createData(value, n_dim).release());
......
......@@ -37,7 +37,7 @@ void create_dir(const QString& dir_name);
std::unique_ptr<Datafield> createData(double value = 0.0, DIM n_dim = DIM::D2);
//! Creates real data item initialized with Datafield for testing purposes
RealItem* createRealData(const QString& name, RealModel &model, double value = 0.0,
RealItem* createRealData(const QString& name, RealModel& model, double value = 0.0,
DIM n_dim = DIM::D2);
//! Converts property to XML string
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment