Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
mantidproject
mantid
Commits
cf57ef92
Commit
cf57ef92
authored
Jan 29, 2019
by
Samuel Jones
Browse files
Re #24350 Clang-format
parent
b70a5d19
Changes
5
Hide whitespace changes
Inline
Side-by-side
qt/widgets/instrumentview/inc/MantidQtWidgets/InstrumentView/InstrumentWidgetDecoder.h
View file @
cf57ef92
...
...
@@ -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
);
...
...
qt/widgets/instrumentview/src/InstrumentWidgetDecoder.cpp
View file @
cf57ef92
...
...
@@ -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
();
...
...
@@ -215,8 +216,8 @@ void InstrumentWidgetDecoder::decodeSurface(
void
InstrumentWidgetDecoder
::
decodeProjection3D
(
const
QMap
<
QString
,
QVariant
>
&
map
,
Projection3D
&
obj
)
{
this
->
decodeViewPort
(
map
[
QString
(
"viewport"
)].
toMap
(),
obj
.
m_viewport
);
}
this
->
decodeViewPort
(
map
[
QString
(
"viewport"
)].
toMap
(),
obj
.
m_viewport
);
}
void
InstrumentWidgetDecoder
::
decodeViewPort
(
const
QMap
<
QString
,
QVariant
>
&
map
,
Viewport
&
obj
)
{
...
...
qt/widgets/instrumentview/src/InstrumentWidgetEncoder.cpp
View file @
cf57ef92
...
...
@@ -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
));
}
...
...
qt/widgets/instrumentview/src/InstrumentWidgetMaskTab.cpp
View file @
cf57ef92
...
...
@@ -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"
...
...
qt/widgets/instrumentview/src/Shape2DCollection.cpp
View file @
cf57ef92
...
...
@@ -53,7 +53,7 @@ void Shape2DCollection::draw(QPainter &painter) const {
nonscalable
<<
shape
;
}
}
// first draw the scalable ones
painter
.
save
();
painter
.
setTransform
(
m_transform
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment