Commit cf57ef92 authored by Samuel Jones's avatar Samuel Jones
Browse files

Re #24350 Clang-format

parent b70a5d19
......@@ -62,7 +62,8 @@ private:
void decodeBinMasks(const QList<QVariant> &list, MaskBinsData &obj);
void decodeSurface(const QMap<QString, QVariant> &map,
boost::shared_ptr<ProjectionSurface> obj);
void decodeProjection3D(const QMap<QString, QVariant> &map, Projection3D &obj);
void decodeProjection3D(const QMap<QString, QVariant> &map,
Projection3D &obj);
void decodeViewPort(const QMap<QString, QVariant> &map, Viewport &obj);
void decodeMaskShapes(const QList<QVariant> &list, Shape2DCollection &obj);
......
......@@ -199,7 +199,8 @@ void InstrumentWidgetDecoder::decodeSurface(
auto projection3D = boost::dynamic_pointer_cast<Projection3D>(obj);
// Decide Projection3D stuff
if (map[QString("projection3DSuccess")].toBool() && projection3D) {
this->decodeProjection3D(map[QString("projection3D")].toMap(), *projection3D);
this->decodeProjection3D(map[QString("projection3D")].toMap(),
*projection3D);
}
QMap<QString, QVariant> color = map[QString("backgroundColor")].toMap();
......@@ -216,7 +217,7 @@ void InstrumentWidgetDecoder::decodeSurface(
void InstrumentWidgetDecoder::decodeProjection3D(
const QMap<QString, QVariant> &map, Projection3D &obj) {
this->decodeViewPort(map[QString("viewport")].toMap(), obj.m_viewport);
}
}
void InstrumentWidgetDecoder::decodeViewPort(const QMap<QString, QVariant> &map,
Viewport &obj) {
......
......@@ -249,9 +249,10 @@ InstrumentWidgetEncoder::encodeSurface(const ProjectionSurface_sptr &obj) {
QMap<QString, QVariant> map;
auto projection3D = boost::dynamic_pointer_cast<Projection3D>(obj);
if (projection3D){
if (projection3D) {
map.insert(QString("projection3DSuccess"), QVariant(true));
map.insert(QString("projection3D"), QVariant(this->encodeProjection3D(*projection3D)));
map.insert(QString("projection3D"),
QVariant(this->encodeProjection3D(*projection3D)));
} else {
map.insert(QString("projection3DSuccess"), QVariant(false));
}
......
......@@ -44,6 +44,7 @@
#endif
#endif
#include <Poco/Path.h>
#include <QAction>
#include <QApplication>
#include <QCheckBox>
......@@ -60,7 +61,6 @@
#include <QTextEdit>
#include <QToolTip>
#include <QVBoxLayout>
#include <Poco/Path.h>
#include "MantidQtWidgets/Common/FileDialogHandler.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment