From 1179edfb9c5e1d43283807e46aef455ef798a91b Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 1 Aug 2022 15:03:29 +0200
Subject: [PATCH] clang-format all sources
---
GUI/Model/CatDevice/MaskItemCatalog.cpp | 4 +-
GUI/Model/Data/DataItem.cpp | 6 +-
GUI/Model/Data/IntensityDataItem.cpp | 5 +-
GUI/Model/Data/RealDataItem.cpp | 28 ++--
GUI/Model/Data/RealDataItem.h | 1 -
GUI/Model/Data/SpecularDataItem.cpp | 18 +--
GUI/Model/Data/SpecularDataItem.h | 1 +
GUI/Model/Descriptor/AxisProperty.h | 5 +-
GUI/Model/Descriptor/DoubleProperty.h | 10 +-
GUI/Model/Descriptor/UIntProperty.h | 20 +--
GUI/Model/Descriptor/VectorProperty.h | 10 +-
GUI/Model/Device/MaskItems.cpp | 44 ++---
GUI/Model/Job/JobItem.cpp | 1 -
GUI/Model/Job/JobItem.h | 11 +-
GUI/Model/Job/MinimizerItem.cpp | 13 +-
GUI/Model/Model/FitParameterModel.cpp | 4 +-
GUI/Model/Model/SessionXML.cpp | 2 +-
GUI/Model/Project/IOService.cpp | 3 +-
GUI/View/Common/DataAccessWidget.cpp | 8 +-
GUI/View/Common/DataAccessWidget.h | 18 +--
GUI/View/Common/DataItemBundleWidget.cpp | 8 +-
GUI/View/Common/DataItemBundleWidget.h | 20 +--
GUI/View/Common/ItemComboToolbar.cpp | 11 +-
GUI/View/Common/ItemComboWidget.cpp | 5 +-
GUI/View/Common/ScientificSpinBox.cpp | 4 +-
GUI/View/Fit/MinimizerSettingsWidget.cpp | 13 +-
GUI/View/Fit/ParameterTuningWidget.cpp | 12 +-
GUI/View/Import/RealDataMaskWidget.cpp | 8 +-
GUI/View/Import/RealDataPresenter.cpp | 2 +-
.../Instrument/DetectorAlignmentEditor.cpp | 10 +-
GUI/View/Instrument/DetectorEditor.cpp | 11 +-
GUI/View/Instrument/DistributionEditor.cpp | 10 +-
GUI/View/Instrument/DistributionPlot.h | 2 +-
.../Instrument/ResolutionFunctionEditor.cpp | 10 +-
GUI/View/Job/JobListView.h | 2 +-
GUI/View/Plot2D/ColorMap.cpp | 24 +--
GUI/View/Plot2D/IntensityDataCanvas.cpp | 8 +-
.../Plot2D/IntensityDataPropertyWidget.cpp | 151 +++++++++++-------
GUI/View/Plot2D/IntensityDataWidget.cpp | 6 +-
.../PlotComparison/FitComparisonWidget.cpp | 20 ++-
.../PlotComparison/FitComparisonWidget1D.cpp | 24 ++-
GUI/View/PlotComparison/HistogramPlot.h | 2 +-
GUI/View/PlotSpecular/SpecularDataCanvas.cpp | 2 +-
.../SpecularDataPropertyWidget.cpp | 94 +++++++----
GUI/View/PlotSpecular/SpecularDataWidget.cpp | 2 +-
GUI/View/PlotSpecular/SpecularPlot.cpp | 36 ++---
GUI/View/PlotUtil/DataPropertyWidget.cpp | 12 +-
GUI/View/PlotUtil/FontScalingEvent.cpp | 2 +-
GUI/View/PlotUtil/RangeUtils.cpp | 16 +-
GUI/View/PlotUtil/RangeUtils.h | 2 +-
GUI/View/PlotUtil/ScientificPlotEvent.cpp | 2 +-
.../IntensityDataProjectionsWidget.cpp | 4 +-
GUI/View/Projection/ProjectionsPlot.h | 2 +-
GUI/View/Tool/WidgetUtils.cpp | 31 ++--
GUI/View/Tool/WidgetUtils.h | 50 +++---
GUI/View/Toplevel/SimulationView.cpp | 3 +-
Tests/Unit/GUI/TestSessionModel.cpp | 2 +-
57 files changed, 407 insertions(+), 428 deletions(-)
diff --git a/GUI/Model/CatDevice/MaskItemCatalog.cpp b/GUI/Model/CatDevice/MaskItemCatalog.cpp
index cade981d901..4a90e159c9b 100644
--- a/GUI/Model/CatDevice/MaskItemCatalog.cpp
+++ b/GUI/Model/CatDevice/MaskItemCatalog.cpp
@@ -39,8 +39,8 @@ MaskItem* MaskItemCatalog::create(Type type)
QVector<MaskItemCatalog::Type> MaskItemCatalog::types()
{
- return {Type::RegionOfInterest, Type::Rectangle, Type::Polygon,
- Type::VerticalLine, Type::HorizontalLine, Type::MaskAll, Type::Ellipse};
+ return {Type::RegionOfInterest, Type::Rectangle, Type::Polygon, Type::VerticalLine,
+ Type::HorizontalLine, Type::MaskAll, Type::Ellipse};
}
MaskItemCatalog::Type MaskItemCatalog::type(const MaskItem* item)
diff --git a/GUI/Model/Data/DataItem.cpp b/GUI/Model/Data/DataItem.cpp
index 475e830c880..1da00afbf40 100644
--- a/GUI/Model/Data/DataItem.cpp
+++ b/GUI/Model/Data/DataItem.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Data/DataItem.h"
-#include "GUI/Model/Device/AxesItems.h"
#include "Device/IO/IOFactory.h"
+#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Util/ComboProperty.h"
#include "GUI/Util/Error.h"
@@ -161,7 +161,7 @@ void DataItem::setUpperY(double value)
void DataItem::copyXRangeFromItem(DataItem* sourceItem)
{
- if(sourceItem == this)
+ if (sourceItem == this)
return;
setLowerX(sourceItem->lowerX());
setUpperX(sourceItem->upperX());
@@ -169,7 +169,7 @@ void DataItem::copyXRangeFromItem(DataItem* sourceItem)
void DataItem::copyYRangeFromItem(DataItem* sourceItem)
{
- if(sourceItem == this)
+ if (sourceItem == this)
return;
setLowerY(sourceItem->lowerY());
setUpperY(sourceItem->upperY());
diff --git a/GUI/Model/Data/IntensityDataItem.cpp b/GUI/Model/Data/IntensityDataItem.cpp
index 3ba252bbac1..57e65d7fd86 100644
--- a/GUI/Model/Data/IntensityDataItem.cpp
+++ b/GUI/Model/Data/IntensityDataItem.cpp
@@ -37,8 +37,7 @@ const QMap<QString, QCPColorGradient::GradientPreset> gradient_map = {
{"Polar", QCPColorGradient::gpPolar},
{"Spectrum", QCPColorGradient::gpSpectrum},
{"Jet", QCPColorGradient::gpJet},
- {"Hues", QCPColorGradient::gpHues}
-};
+ {"Hues", QCPColorGradient::gpHues}};
} // namespace
@@ -128,7 +127,7 @@ void IntensityDataItem::setLowerAndUpperZ(double zmin, double zmax)
void IntensityDataItem::copyZRangeFromItem(DataItem* sourceItem)
{
IntensityDataItem* source = dynamic_cast<IntensityDataItem*>(sourceItem);
- if(!source || source == this)
+ if (!source || source == this)
return;
setLowerZ(source->lowerZ());
setUpperZ(source->upperZ());
diff --git a/GUI/Model/Data/RealDataItem.cpp b/GUI/Model/Data/RealDataItem.cpp
index 4c2089ea367..b912a7385ec 100644
--- a/GUI/Model/Data/RealDataItem.cpp
+++ b/GUI/Model/Data/RealDataItem.cpp
@@ -460,8 +460,7 @@ void RealDataItem::writeNonSessionItems(QXmlStreamWriter* writer) const
template <class T>
inline T* readItemToEnd(QXmlStreamReader* reader, SessionItem* parent_item, const QString& tag)
{
- T* item = dynamic_cast<T*>(
- GUI::Session::XML::readItemAndChildItems(reader, parent_item, tag));
+ T* item = dynamic_cast<T*>(GUI::Session::XML::readItemAndChildItems(reader, parent_item, tag));
GUI::Session::XML::gotoEndElementOfTag(reader, tag);
return item;
}
@@ -483,8 +482,7 @@ void RealDataItem::readNonSessionItems(QXmlStreamReader* reader)
} else if (reader->name() == Tags::Data) {
m_dataItem.reset(readItemToEnd<DataItem>(reader, this, Tags::Data));
} else if (reader->name() == Tags::NativeData) {
- m_nativeDataItem.reset(
- readItemToEnd<DataItem>(reader, this, Tags::NativeData));
+ m_nativeDataItem.reset(readItemToEnd<DataItem>(reader, this, Tags::NativeData));
} else if (reader->name() == Tags::NativeDataUnits) {
GUI::Session::XML::readAttribute(reader, Tags::value, &m_nativeDataUnits);
GUI::Session::XML::gotoEndElementOfTag(reader, Tags::NativeDataUnits);
@@ -508,22 +506,16 @@ void RealDataItem::copyTo(RealDataItem* const realdata_dst) const
// copy DataItems
// NOTE: For consistency, the DataItem's parent is set to the destination RealDataItem
// and its model is inherited from the destination RealDataItem.
- if(m_dataItem) {
- realdata_dst->m_dataItem.reset(
- dynamic_cast<DataItem*>(
- GUI::Session::XML::copyItem(m_dataItem.get(),
- realdata_dst /* parent */)));
- realdata_dst->m_dataItem->setParentAndModel(realdata_dst,
- realdata_dst->model());
+ if (m_dataItem) {
+ realdata_dst->m_dataItem.reset(dynamic_cast<DataItem*>(
+ GUI::Session::XML::copyItem(m_dataItem.get(), realdata_dst /* parent */)));
+ realdata_dst->m_dataItem->setParentAndModel(realdata_dst, realdata_dst->model());
}
- if(m_nativeDataItem) {
- realdata_dst->m_nativeDataItem.reset(
- dynamic_cast<DataItem*>(
- GUI::Session::XML::copyItem(m_nativeDataItem.get(),
- realdata_dst /* parent */)));
- realdata_dst->m_nativeDataItem->setParentAndModel(realdata_dst,
- realdata_dst->model());
+ if (m_nativeDataItem) {
+ realdata_dst->m_nativeDataItem.reset(dynamic_cast<DataItem*>(
+ GUI::Session::XML::copyItem(m_nativeDataItem.get(), realdata_dst /* parent */)));
+ realdata_dst->m_nativeDataItem->setParentAndModel(realdata_dst, realdata_dst->model());
}
// discard DataLoader
diff --git a/GUI/Model/Data/RealDataItem.h b/GUI/Model/Data/RealDataItem.h
index 979c9aafae9..4c982237adf 100644
--- a/GUI/Model/Data/RealDataItem.h
+++ b/GUI/Model/Data/RealDataItem.h
@@ -18,7 +18,6 @@
#include "GUI/Model/BaseItem/JobRealBase.h"
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Support/IO/AbstractDataLoader.h"
-#include "GUI/Model/Data/DataItem.h"
class InstrumentItem;
class IntensityDataItem;
diff --git a/GUI/Model/Data/SpecularDataItem.cpp b/GUI/Model/Data/SpecularDataItem.cpp
index 75c5eb7d304..06198eaef96 100644
--- a/GUI/Model/Data/SpecularDataItem.cpp
+++ b/GUI/Model/Data/SpecularDataItem.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
+#include "GUI/Model/Data/SpecularDataItem.h"
#include "Base/Axis/IAxis.h"
#include "GUI/Model/Data/JobItemUtils.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Support/IO/ImportDataInfo.h"
#include "GUI/Util/Error.h"
@@ -23,13 +23,9 @@ namespace {
// set of simple colors for representation of 1D graphs
const QMap<QString, Qt::GlobalColor> color_map = {
- {"Blue", Qt::GlobalColor::blue},
- {"Black", Qt::GlobalColor::black},
- {"Red", Qt::GlobalColor::darkRed},
- {"Cyan", Qt::GlobalColor::darkCyan},
- {"Gray", Qt::GlobalColor::darkGray},
- {"Magenta", Qt::GlobalColor::darkMagenta}
-};
+ {"Blue", Qt::GlobalColor::blue}, {"Black", Qt::GlobalColor::black},
+ {"Red", Qt::GlobalColor::darkRed}, {"Cyan", Qt::GlobalColor::darkCyan},
+ {"Gray", Qt::GlobalColor::darkGray}, {"Magenta", Qt::GlobalColor::darkMagenta}};
// scatters for representation of 1D graphs
const QMap<QString, QCPScatterStyle::ScatterShape> scatter_map = {
{"None", QCPScatterStyle::ScatterShape::ssNone},
@@ -37,8 +33,7 @@ const QMap<QString, QCPScatterStyle::ScatterShape> scatter_map = {
{"Circle", QCPScatterStyle::ScatterShape::ssCircle},
{"Cross", QCPScatterStyle::ScatterShape::ssCross},
{"Diamond", QCPScatterStyle::ScatterShape::ssDiamond},
- {"Star", QCPScatterStyle::ScatterShape::ssStar}
-};
+ {"Star", QCPScatterStyle::ScatterShape::ssStar}};
// connection lines for representation of 1D graphs
const QMap<QString, QCPGraph::LineStyle> line_map = {
{"None", QCPGraph::LineStyle::lsNone},
@@ -46,8 +41,7 @@ const QMap<QString, QCPGraph::LineStyle> line_map = {
{"StepLeft", QCPGraph::LineStyle::lsStepLeft},
{"StepRight", QCPGraph::LineStyle::lsStepRight},
{"StepCenter", QCPGraph::LineStyle::lsStepCenter},
- {"Impulse", QCPGraph::LineStyle::lsImpulse}
-};
+ {"Impulse", QCPGraph::LineStyle::lsImpulse}};
} // namespace
diff --git a/GUI/Model/Data/SpecularDataItem.h b/GUI/Model/Data/SpecularDataItem.h
index 5852dc075d3..9a8eb624c58 100644
--- a/GUI/Model/Data/SpecularDataItem.h
+++ b/GUI/Model/Data/SpecularDataItem.h
@@ -33,6 +33,7 @@ private:
protected:
SpecularDataItem(const QString& modelType);
+
public:
static constexpr auto M_TYPE{"SpecularData"};
diff --git a/GUI/Model/Descriptor/AxisProperty.h b/GUI/Model/Descriptor/AxisProperty.h
index 6ace7b48b1f..d69bc2b21b0 100644
--- a/GUI/Model/Descriptor/AxisProperty.h
+++ b/GUI/Model/Descriptor/AxisProperty.h
@@ -65,9 +65,6 @@ protected:
AxisProperty m_##nameLower; \
\
public: \
- AxisProperty& nameLower() const \
- { \
- return *const_cast<AxisProperty*>(&m_##nameLower); \
- }
+ AxisProperty& nameLower() const { return *const_cast<AxisProperty*>(&m_##nameLower); }
#endif // BORNAGAIN_GUI_MODEL_DESCRIPTOR_AXISPROPERTY_H
diff --git a/GUI/Model/Descriptor/DoubleProperty.h b/GUI/Model/Descriptor/DoubleProperty.h
index 472a98ddc2f..3581fd838c6 100644
--- a/GUI/Model/Descriptor/DoubleProperty.h
+++ b/GUI/Model/Descriptor/DoubleProperty.h
@@ -109,14 +109,8 @@ protected:
DoubleProperty m_##nameLower; \
\
public: \
- DoubleDescriptor nameLower() const \
- { \
- return m_##nameLower; \
- } \
- void set##nameUpper(double v) \
- { \
- m_##nameLower.set(v); \
- }
+ DoubleDescriptor nameLower() const { return m_##nameLower; } \
+ void set##nameUpper(double v) { m_##nameLower.set(v); }
#endif // BORNAGAIN_GUI_MODEL_DESCRIPTOR_DOUBLEPROPERTY_H
diff --git a/GUI/Model/Descriptor/UIntProperty.h b/GUI/Model/Descriptor/UIntProperty.h
index 81487b605c4..924c4329556 100644
--- a/GUI/Model/Descriptor/UIntProperty.h
+++ b/GUI/Model/Descriptor/UIntProperty.h
@@ -66,22 +66,10 @@ private:
UIntProperty m_##nameLower; \
\
public: \
- UIntDescriptor nameLower() const \
- { \
- return m_##nameLower; \
- } \
- void set##nameUpper(int v) \
- { \
- m_##nameLower.set(v); \
- } \
- void set##nameUpper(uint v) \
- { \
- m_##nameLower.set(v); \
- } \
- void set##nameUpper(size_t v) \
- { \
- m_##nameLower.set((int)v); \
- }
+ UIntDescriptor nameLower() const { return m_##nameLower; } \
+ void set##nameUpper(int v) { m_##nameLower.set(v); } \
+ void set##nameUpper(uint v) { m_##nameLower.set(v); } \
+ void set##nameUpper(size_t v) { m_##nameLower.set((int)v); }
#endif // BORNAGAIN_GUI_MODEL_DESCRIPTOR_UINTPROPERTY_H
diff --git a/GUI/Model/Descriptor/VectorProperty.h b/GUI/Model/Descriptor/VectorProperty.h
index 4670f2ce2fc..120ff6747d4 100644
--- a/GUI/Model/Descriptor/VectorProperty.h
+++ b/GUI/Model/Descriptor/VectorProperty.h
@@ -65,14 +65,8 @@ protected:
VectorProperty m_##nameLower; \
\
public: \
- VectorDescriptor nameLower() const \
- { \
- return m_##nameLower; \
- } \
- void set##nameUpper(const R3& v) \
- { \
- m_##nameLower.set(v); \
- }
+ VectorDescriptor nameLower() const { return m_##nameLower; } \
+ void set##nameUpper(const R3& v) { m_##nameLower.set(v); }
;
diff --git a/GUI/Model/Device/MaskItems.cpp b/GUI/Model/Device/MaskItems.cpp
index ff2982e4123..245ee674ad4 100644
--- a/GUI/Model/Device/MaskItems.cpp
+++ b/GUI/Model/Device/MaskItems.cpp
@@ -150,9 +150,7 @@ std::unique_ptr<IShape2D> RectangleItem::createShape(double scale) const
DoubleDescriptor RectangleItem::xLow() const
{
DoubleDescriptor d(getItem(P_XLOW), Unit::other);
- d.set = [=](double v) {
- const_cast<RectangleItem*>(this)->setXLow(v);
- };
+ d.set = [=](double v) { const_cast<RectangleItem*>(this)->setXLow(v); };
return d;
}
@@ -165,9 +163,7 @@ void RectangleItem::setXLow(const double x_low)
DoubleDescriptor RectangleItem::yLow() const
{
DoubleDescriptor d(getItem(P_YLOW), Unit::other);
- d.set = [=](double v) {
- const_cast<RectangleItem*>(this)->setYLow(v);
- };
+ d.set = [=](double v) { const_cast<RectangleItem*>(this)->setYLow(v); };
return d;
}
@@ -180,9 +176,7 @@ void RectangleItem::setYLow(const double y_low)
DoubleDescriptor RectangleItem::xUp() const
{
DoubleDescriptor d(getItem(P_XUP), Unit::other);
- d.set = [=](double v) {
- const_cast<RectangleItem*>(this)->setXUp(v);
- };
+ d.set = [=](double v) { const_cast<RectangleItem*>(this)->setXUp(v); };
return d;
}
@@ -195,9 +189,7 @@ void RectangleItem::setXUp(const double x_up)
DoubleDescriptor RectangleItem::yUp() const
{
DoubleDescriptor d(getItem(P_YUP), Unit::other);
- d.set = [=](double v) {
- const_cast<RectangleItem*>(this)->setYUp(v);
- };
+ d.set = [=](double v) { const_cast<RectangleItem*>(this)->setYUp(v); };
return d;
}
@@ -354,9 +346,7 @@ std::unique_ptr<IShape2D> VerticalLineItem::createShape(double scale) const
DoubleDescriptor VerticalLineItem::posX() const
{
DoubleDescriptor d(getItem(P_POSX), Unit::other);
- d.set = [=](double v) {
- const_cast<VerticalLineItem*>(this)->setPosX(v);
- };
+ d.set = [=](double v) { const_cast<VerticalLineItem*>(this)->setPosX(v); };
return d;
}
@@ -392,9 +382,7 @@ std::unique_ptr<IShape2D> HorizontalLineItem::createShape(double scale) const
DoubleDescriptor HorizontalLineItem::posY() const
{
DoubleDescriptor d(getItem(P_POSY), Unit::other);
- d.set = [=](double v) {
- const_cast<HorizontalLineItem*>(this)->setPosY(v);
- };
+ d.set = [=](double v) { const_cast<HorizontalLineItem*>(this)->setPosY(v); };
return d;
}
@@ -439,9 +427,7 @@ std::unique_ptr<IShape2D> EllipseItem::createShape(double scale) const
DoubleDescriptor EllipseItem::xCenter() const
{
DoubleDescriptor d(getItem(P_XCENTER), Unit::other);
- d.set = [=](double v) {
- const_cast<EllipseItem*>(this)->setXCenter(v);
- };
+ d.set = [=](double v) { const_cast<EllipseItem*>(this)->setXCenter(v); };
return d;
}
@@ -454,9 +440,7 @@ void EllipseItem::setXCenter(const double x_center)
DoubleDescriptor EllipseItem::yCenter() const
{
DoubleDescriptor d(getItem(P_YCENTER), Unit::other);
- d.set = [=](double v) {
- const_cast<EllipseItem*>(this)->setYCenter(v);
- };
+ d.set = [=](double v) { const_cast<EllipseItem*>(this)->setYCenter(v); };
return d;
}
@@ -469,9 +453,7 @@ void EllipseItem::setYCenter(const double y_center)
DoubleDescriptor EllipseItem::xRadius() const
{
DoubleDescriptor d(getItem(P_XRADIUS), Unit::other);
- d.set = [=](double v) {
- const_cast<EllipseItem*>(this)->setXRadius(v);
- };
+ d.set = [=](double v) { const_cast<EllipseItem*>(this)->setXRadius(v); };
return d;
}
@@ -484,9 +466,7 @@ void EllipseItem::setXRadius(const double x_radius)
DoubleDescriptor EllipseItem::yRadius() const
{
DoubleDescriptor d(getItem(P_YRADIUS), Unit::other);
- d.set = [=](double v) {
- const_cast<EllipseItem*>(this)->setYRadius(v);
- };
+ d.set = [=](double v) { const_cast<EllipseItem*>(this)->setYRadius(v); };
return d;
}
@@ -499,9 +479,7 @@ void EllipseItem::setYRadius(const double y_radius)
DoubleDescriptor EllipseItem::angle() const
{
DoubleDescriptor d(getItem(P_ANGLE), Unit::degree);
- d.set = [=](double v) {
- const_cast<EllipseItem*>(this)->setAngle(v);
- };
+ d.set = [=](double v) { const_cast<EllipseItem*>(this)->setAngle(v); };
return d;
}
diff --git a/GUI/Model/Job/JobItem.cpp b/GUI/Model/Job/JobItem.cpp
index 768b3716420..8a0201dbd15 100644
--- a/GUI/Model/Job/JobItem.cpp
+++ b/GUI/Model/Job/JobItem.cpp
@@ -453,7 +453,6 @@ void JobItem::writeNonSessionItems(QXmlStreamWriter* writer) const
GUI::Session::XML::writeItemAndChildItems(writer, m_fitSuiteItem.get());
writer->writeEndElement();
}
-
}
diff --git a/GUI/Model/Job/JobItem.h b/GUI/Model/Job/JobItem.h
index 83fc753a5e1..20eb2266c75 100644
--- a/GUI/Model/Job/JobItem.h
+++ b/GUI/Model/Job/JobItem.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_MODEL_JOB_JOBITEM_H
#define BORNAGAIN_GUI_MODEL_JOB_JOBITEM_H
-#include "GUI/Model/BaseItem/SessionItem.h"
#include "GUI/Model/BaseItem/JobRealBase.h"
+#include "GUI/Model/BaseItem/SessionItem.h"
#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Device/InstrumentItems.h"
@@ -27,7 +27,6 @@
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Support/Data/JobStatus.h" // enum cannot be forward declared
#include "GUI/Support/Data/SimulationOptionsItem.h"
-#include "GUI/Model/Data/DataItem.h"
#include <QDateTime>
#include <optional>
@@ -153,10 +152,10 @@ private:
QDateTime m_beginTime;
QDateTime m_endTime;
int m_progress;
- std::unique_ptr<DataItem> m_outputDataItem; // TODO: Can be replaced by std::variant
- std::unique_ptr<DataItem> m_diffDataItem; // TODO: Can be replaced by std::variant
- std::unique_ptr<RealDataItem> m_realDataItem; // TODO: Can be replaced by optional
- std::unique_ptr<FitSuiteItem> m_fitSuiteItem; // TODO: Can be replaced by optional
+ std::unique_ptr<DataItem> m_outputDataItem; // TODO: Can be replaced by std::variant
+ std::unique_ptr<DataItem> m_diffDataItem; // TODO: Can be replaced by std::variant
+ std::unique_ptr<RealDataItem> m_realDataItem; // TODO: Can be replaced by optional
+ std::unique_ptr<FitSuiteItem> m_fitSuiteItem; // TODO: Can be replaced by optional
};
template <typename T>
diff --git a/GUI/Model/Job/MinimizerItem.cpp b/GUI/Model/Job/MinimizerItem.cpp
index f9c7f4a2c5c..a8a9635569a 100644
--- a/GUI/Model/Job/MinimizerItem.cpp
+++ b/GUI/Model/Job/MinimizerItem.cpp
@@ -25,12 +25,11 @@
namespace {
const QMap<QString, QString> minimizer_names_map = {
- { "Minuit2", MinuitMinimizerItem::M_TYPE },
- { "GSL MultiMin", GSLMultiMinimizerItem::M_TYPE },
- { "TMVA Genetic", GeneticMinimizerItem::M_TYPE },
- { "GSL Simulated Annealing", SimAnMinimizerItem::M_TYPE },
- { "GSL Levenberg-Marquardt", GSLLMAMinimizerItem::M_TYPE }
-};
+ {"Minuit2", MinuitMinimizerItem::M_TYPE},
+ {"GSL MultiMin", GSLMultiMinimizerItem::M_TYPE},
+ {"TMVA Genetic", GeneticMinimizerItem::M_TYPE},
+ {"GSL Simulated Annealing", SimAnMinimizerItem::M_TYPE},
+ {"GSL Levenberg-Marquardt", GSLLMAMinimizerItem::M_TYPE}};
const QString default_minimizer = minimizer_names_map.key(MinuitMinimizerItem::M_TYPE);
} // namespace
@@ -53,7 +52,7 @@ MinimizerContainerItem::MinimizerContainerItem()
addProperty<GSLLMAMinimizerItem>(GSLLMAMinimizerItem::M_TYPE);
ComboProperty minimizer_combo = ComboProperty::fromList(
- minimizer_names_map.keys(), minimizer_names_map.key(MinuitMinimizerItem::M_TYPE));
+ minimizer_names_map.keys(), minimizer_names_map.key(MinuitMinimizerItem::M_TYPE));
addProperty(P_MINIMIZERS, minimizer_combo.variant())->setToolTip("Minimizer library");
ComboProperty metric_combo;
diff --git a/GUI/Model/Model/FitParameterModel.cpp b/GUI/Model/Model/FitParameterModel.cpp
index 396603db71b..ca44a6d11d2 100644
--- a/GUI/Model/Model/FitParameterModel.cpp
+++ b/GUI/Model/Model/FitParameterModel.cpp
@@ -20,8 +20,8 @@
#include "GUI/Model/Model/JobModel.h"
#include "GUI/Model/Model/ModelPath.h"
#include "GUI/Model/Model/SessionXML.h"
-#include "GUI/Util/Error.h"
#include "GUI/Util/ComboProperty.h"
+#include "GUI/Util/Error.h"
#include <QColor>
#include <QMimeData>
@@ -217,7 +217,7 @@ bool FitParameterModel::setData(const QModelIndex& index, const QVariant& value,
return false;
if (SessionItem* item = itemForIndex(index)) {
if (role == Qt::EditRole) {
- if(item->itemParent()->hasModelType<FitParameterItem>()) {
+ if (item->itemParent()->hasModelType<FitParameterItem>()) {
FitParameterItem* fitParItem = dynamic_cast<FitParameterItem*>(item->itemParent());
if (index.column() == COL_TYPE)
fitParItem->setType(value.value<ComboProperty>());
diff --git a/GUI/Model/Model/SessionXML.cpp b/GUI/Model/Model/SessionXML.cpp
index a916d53600d..c52bdc56170 100644
--- a/GUI/Model/Model/SessionXML.cpp
+++ b/GUI/Model/Model/SessionXML.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/Model/Model/SessionXML.h"
-#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Model/MakeItem/ItemFactory.h"
+#include "GUI/Model/Model/SessionModel.h"
#include "GUI/Model/Sample/MaterialItem.h"
#include "GUI/Support/Data/SessionFlags.h"
#include "GUI/Support/Data/SessionItemTags.h"
diff --git a/GUI/Model/Project/IOService.cpp b/GUI/Model/Project/IOService.cpp
index 9079711c542..33c1419ef2f 100644
--- a/GUI/Model/Project/IOService.cpp
+++ b/GUI/Model/Project/IOService.cpp
@@ -129,8 +129,7 @@ QSet<T> QListToQSet(const QList<T>& qlist)
return QSet<T>(qlist.constBegin(), qlist.constEnd());
}
-void DatafieldIOService::cleanOldFiles(const QString& projectDir,
- const QStringList& oldSaves,
+void DatafieldIOService::cleanOldFiles(const QString& projectDir, const QStringList& oldSaves,
const QStringList& newSaves)
{
const auto toRemove = QListToQSet(oldSaves).subtract(QListToQSet(newSaves));
diff --git a/GUI/View/Common/DataAccessWidget.cpp b/GUI/View/Common/DataAccessWidget.cpp
index 7dd524cd449..4a4563a1d12 100644
--- a/GUI/View/Common/DataAccessWidget.cpp
+++ b/GUI/View/Common/DataAccessWidget.cpp
@@ -27,10 +27,10 @@ DataAccessWidget::~DataAccessWidget() = default;
void DataAccessWidget::setJobOrRealItem(JobRealBase* item)
{
m_item = item;
- ASSERT(jobItem()||realItem());
+ ASSERT(jobItem() || realItem());
disconnect(m_item, &QObject::destroyed, this, nullptr);
- connect(m_item, &QObject::destroyed, this, [=](){ m_item = nullptr; });
+ connect(m_item, &QObject::destroyed, this, [=]() { m_item = nullptr; });
}
void DataAccessWidget::setFourierItem(IntensityDataItem* fftItem)
@@ -106,14 +106,14 @@ SpecularDataItem* DataAccessWidget::currentSpecularDataItem() const
QList<IntensityDataItem*> DataAccessWidget::mainIntensityDataItems() const
{
- if(m_fftItem)
+ if (m_fftItem)
return {m_fftItem};
return mainDataItems<IntensityDataItem>();
}
QList<IntensityDataItem*> DataAccessWidget::allIntensityDataItems() const
{
- if(m_fftItem)
+ if (m_fftItem)
return {m_fftItem};
return allDataItems<IntensityDataItem>();
}
diff --git a/GUI/View/Common/DataAccessWidget.h b/GUI/View/Common/DataAccessWidget.h
index 2d897427a4e..e01f4662295 100644
--- a/GUI/View/Common/DataAccessWidget.h
+++ b/GUI/View/Common/DataAccessWidget.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_COMMON_DATAACCESSWIDGET_H
#define BORNAGAIN_GUI_VIEW_COMMON_DATAACCESSWIDGET_H
-#include "GUI/Model/Job/JobItem.h"
#include "GUI/Model/Data/RealDataItem.h"
+#include "GUI/Model/Job/JobItem.h"
#include <QWidget>
//! The DataAccessWidget class is a base for widgets, working data, stored in JobItem or RealItem.
@@ -122,13 +122,13 @@ private:
template <class T>
T* DataAccessWidget::realDataItem() const
{
- if(jobItem()) {
+ if (jobItem()) {
RealDataItem* real_item_from_job = jobItem()->realDataItem();
- if(real_item_from_job)
+ if (real_item_from_job)
return dynamic_cast<T*>(real_item_from_job->dataItem());
else
return nullptr;
- } else if(realItem())
+ } else if (realItem())
return dynamic_cast<T*>(realItem()->dataItem());
else
ASSERT(0);
@@ -137,7 +137,7 @@ T* DataAccessWidget::realDataItem() const
template <class T>
T* DataAccessWidget::simuDataItem() const
{
- if(!jobItem())
+ if (!jobItem())
return nullptr;
return dynamic_cast<T*>(jobItem()->dataItem());
}
@@ -145,7 +145,7 @@ T* DataAccessWidget::simuDataItem() const
template <class T>
T* DataAccessWidget::diffDataItem() const
{
- if(!jobItem())
+ if (!jobItem())
return nullptr;
return dynamic_cast<T*>(jobItem()->diffDataItem());
}
@@ -156,9 +156,9 @@ QList<T*> DataAccessWidget::mainDataItems() const
QList<T*> output;
auto* simu = simuDataItem<T>();
auto* real = realDataItem<T>();
- if(simu)
+ if (simu)
output.append(simu);
- if(real)
+ if (real)
output.append(real);
return output;
}
@@ -168,7 +168,7 @@ QList<T*> DataAccessWidget::diffDataItems() const
{
QList<T*> output;
auto* diff = diffDataItem<T>();
- if(diff)
+ if (diff)
output.append(diff);
return output;
}
diff --git a/GUI/View/Common/DataItemBundleWidget.cpp b/GUI/View/Common/DataItemBundleWidget.cpp
index 2ba74370b8a..9b6a136cd07 100644
--- a/GUI/View/Common/DataItemBundleWidget.cpp
+++ b/GUI/View/Common/DataItemBundleWidget.cpp
@@ -30,17 +30,17 @@ void DataItemBundleWidget::setDataItems(const QList<DataItem*>& dataItems)
m_dataItems = dataItems;
// remove nullptrs
- for(DataItem* item : m_dataItems)
- if(!item)
+ for (DataItem* item : m_dataItems)
+ if (!item)
m_dataItems.removeOne(item);
// we shouldn't work with empty list
ASSERT(m_dataItems.size());
// set nullptr at destruction
- for(DataItem*& item : m_dataItems) {
+ for (DataItem*& item : m_dataItems) {
disconnect(item, &DataItem::destroyed, this, nullptr);
- connect(item, &DataItem::destroyed, this, [&](){ item = nullptr; });
+ connect(item, &DataItem::destroyed, this, [&]() { item = nullptr; });
}
}
diff --git a/GUI/View/Common/DataItemBundleWidget.h b/GUI/View/Common/DataItemBundleWidget.h
index 4483f7bf905..c8922b18677 100644
--- a/GUI/View/Common/DataItemBundleWidget.h
+++ b/GUI/View/Common/DataItemBundleWidget.h
@@ -15,16 +15,16 @@
#ifndef DATAITEMBUNDLEWIDGET_H
#define DATAITEMBUNDLEWIDGET_H
-#include "GUI/View/Common/SessionItemWidget.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Model/Data/SpecularDataItem.h"
+#include "GUI/View/Common/SessionItemWidget.h"
#include <QWidget>
//! The DataItemBundleWidget class is a base for widgets, representing the derivatives of DataItem,
//! namely SpecularDataItem and IntensityDataItem. It stores a list of items that are required for
//! simultaneous, synchronous work while plotting and changing their properties.
-//class DataItemBundleWidget : public QWidget {
+// class DataItemBundleWidget : public QWidget {
class DataItemBundleWidget : public SessionItemWidget { // temp
Q_OBJECT
public:
@@ -42,7 +42,7 @@ public:
SpecularDataItem* currentSpecularDataItem() const;
IntensityDataItem* currentIntensityDataItem() const;
-private:
+private:
template <typename T>
QList<T*> tItems() const;
template <typename T>
@@ -55,20 +55,20 @@ template <typename T>
QList<T*> DataItemBundleWidget::tItems() const
{
QList<T*> output;
- for(DataItem* item : m_dataItems) {
+ for (DataItem* item : m_dataItems) {
T* tItem = dynamic_cast<T*>(item);
-// ASSERT(tItem);
- if(tItem)
+ // ASSERT(tItem);
+ if (tItem)
output.push_back(tItem);
}
return output;
}
-template<typename T>
+template <typename T>
T* DataItemBundleWidget::tFirstItem() const
-{
+{
T* item = dynamic_cast<T*>(m_dataItems.first());
-// ASSERT(item);
+ // ASSERT(item);
return item;
}
diff --git a/GUI/View/Common/ItemComboToolbar.cpp b/GUI/View/Common/ItemComboToolbar.cpp
index e092ee302d8..c8cc7a15f35 100644
--- a/GUI/View/Common/ItemComboToolbar.cpp
+++ b/GUI/View/Common/ItemComboToolbar.cpp
@@ -78,14 +78,11 @@ void ItemComboToolbar::setActionList(const QList<QAction*>& actionList)
void ItemComboToolbar::setComboConnected(bool value)
{
if (value)
- connect(m_comboBox,
- &QComboBox::currentIndexChanged,
- this, &ItemComboToolbar::_comboChanged, Qt::UniqueConnection);
+ connect(m_comboBox, &QComboBox::currentIndexChanged, this, &ItemComboToolbar::_comboChanged,
+ Qt::UniqueConnection);
else
- disconnect(
- m_comboBox,
- &QComboBox::currentIndexChanged, this,
- &ItemComboToolbar::_comboChanged);
+ disconnect(m_comboBox, &QComboBox::currentIndexChanged, this,
+ &ItemComboToolbar::_comboChanged);
}
void ItemComboToolbar::_comboChanged(const int index)
diff --git a/GUI/View/Common/ItemComboWidget.cpp b/GUI/View/Common/ItemComboWidget.cpp
index ae145afe05d..11de72b695b 100644
--- a/GUI/View/Common/ItemComboWidget.cpp
+++ b/GUI/View/Common/ItemComboWidget.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/Common/ItemComboWidget.h"
-#include "GUI/View/Common/ItemComboToolbar.h"
#include "Base/Util/Assert.h"
+#include "GUI/View/Common/ItemComboToolbar.h"
#include <QStackedWidget>
#include <QVBoxLayout>
@@ -94,8 +94,7 @@ void ItemComboWidget::setJobOrRealItem(JobRealBase* job_or_real_item)
DataAccessWidget::setJobOrRealItem(job_or_real_item);
setToolbarVisible(!itemPresentation().isEmpty());
- m_toolbar->setPresentationList(presentationList(),
- activePresentationList());
+ m_toolbar->setPresentationList(presentationList(), activePresentationList());
setPresentation(itemPresentation());
}
diff --git a/GUI/View/Common/ScientificSpinBox.cpp b/GUI/View/Common/ScientificSpinBox.cpp
index b60b9fd683b..69d2f79e8d9 100644
--- a/GUI/View/Common/ScientificSpinBox.cpp
+++ b/GUI/View/Common/ScientificSpinBox.cpp
@@ -135,8 +135,8 @@ QString ScientificSpinBox::toString(double val, int decimal_points)
QString result = useExponentialNotation(val) ? QString::number(val, 'e', decimal_points)
: QString::number(val, 'f', decimal_points);
- return result.replace(
- QRegularExpression("(\\.?0+)?((e{1}[\\+|-]{1})(0+)?([1-9]{1}.*))?$"), "\\3\\5");
+ return result.replace(QRegularExpression("(\\.?0+)?((e{1}[\\+|-]{1})(0+)?([1-9]{1}.*))?$"),
+ "\\3\\5");
}
double ScientificSpinBox::toDouble(QString text, const QDoubleValidator& validator, double min,
diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/Fit/MinimizerSettingsWidget.cpp
index b4562000087..3384efe0550 100644
--- a/GUI/View/Fit/MinimizerSettingsWidget.cpp
+++ b/GUI/View/Fit/MinimizerSettingsWidget.cpp
@@ -55,10 +55,9 @@ void MinimizerSettingsWidget::setMinItem(MinimizerContainerItem* minimizerItem)
if (!m_currentItem)
return;
- m_mainLayout->addRow(
- "Minimizer:", GUI::Util::createComboBoxUpdScrollFromDescriptor(m_currentItem->minimizers(),
- &m_updaters,
- [=](int) { createMimimizerEdits(); }));
+ m_mainLayout->addRow("Minimizer:", GUI::Util::createComboBoxUpdScrollFromDescriptor(
+ m_currentItem->minimizers(), &m_updaters,
+ [=](int) { createMimimizerEdits(); }));
auto* w = new QWidget(this);
m_minimizerLayout = new QFormLayout(w);
@@ -78,15 +77,15 @@ void MinimizerSettingsWidget::createMimimizerEdits()
{
GUI::Util::Layout::clearLayout(m_minimizerLayout);
- for (auto v : m_currentItem->currentMinimizerItem()->valueDescriptorsForUI() ) {
+ for (auto v : m_currentItem->currentMinimizerItem()->valueDescriptorsForUI()) {
if (std::holds_alternative<DoubleDescriptor>(v)) {
auto d = std::get<DoubleDescriptor>(v);
m_minimizerLayout->addRow(d.label + ":",
GUI::Util::createDoubleSpinboxFromDescriptor(d, &m_updaters));
} else if (std::holds_alternative<SelectionDescriptor<QString>>(v)) {
auto d = std::get<SelectionDescriptor<QString>>(v);
- m_minimizerLayout->addRow(d.label + ":",
- GUI::Util::createComboBoxUpdScrollFromDescriptor(d, &m_updaters));
+ m_minimizerLayout->addRow(
+ d.label + ":", GUI::Util::createComboBoxUpdScrollFromDescriptor(d, &m_updaters));
} else if (std::holds_alternative<UIntDescriptor>(v)) {
auto d = std::get<UIntDescriptor>(v);
m_minimizerLayout->addRow(d.label + ":",
diff --git a/GUI/View/Fit/ParameterTuningWidget.cpp b/GUI/View/Fit/ParameterTuningWidget.cpp
index eb2acea87db..2cd5f9c4eae 100644
--- a/GUI/View/Fit/ParameterTuningWidget.cpp
+++ b/GUI/View/Fit/ParameterTuningWidget.cpp
@@ -12,16 +12,16 @@
//
// ************************************************************************************************
-#include "GUI/View/Common/StyledToolbar.h"
-#include "GUI/View/Info/CautionSign.h"
#include "GUI/View/Fit/ParameterTuningWidget.h"
-#include "GUI/View/Fit/ParameterTuningDelegate.h"
-#include "GUI/View/Fit/SliderSettingsWidget.h"
-#include "GUI/Model/Model/JobModel.h"
-#include "GUI/Model/Model/ParameterTuningModel.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Job/ParameterTreeItems.h"
+#include "GUI/Model/Model/JobModel.h"
+#include "GUI/Model/Model/ParameterTuningModel.h"
#include "GUI/Util/Error.h"
+#include "GUI/View/Common/StyledToolbar.h"
+#include "GUI/View/Fit/ParameterTuningDelegate.h"
+#include "GUI/View/Fit/SliderSettingsWidget.h"
+#include "GUI/View/Info/CautionSign.h"
#include <QAction>
#include <QTreeView>
#include <QVBoxLayout>
diff --git a/GUI/View/Import/RealDataMaskWidget.cpp b/GUI/View/Import/RealDataMaskWidget.cpp
index a765cae3de1..8b4b52de4d1 100644
--- a/GUI/View/Import/RealDataMaskWidget.cpp
+++ b/GUI/View/Import/RealDataMaskWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/Import/RealDataMaskWidget.h"
-#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/ProjectionItems.h"
+#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Model/SessionModel.h"
#include "GUI/View/Mask/MaskEditorActions.h"
#include "GUI/View/Mask/MaskEditorCanvas.h"
@@ -44,7 +44,7 @@ RealDataMaskWidget::RealDataMaskWidget(QWidget* parent)
QHBoxLayout* mainLayout = new QHBoxLayout(this);
mainLayout->addWidget(splitter);
mainLayout->setSpacing(0);
- mainLayout->setContentsMargins(0,0,0,0);
+ mainLayout->setContentsMargins(0, 0, 0, 0);
m_toolbar->setOrientation(Qt::Vertical);
m_toolbar->setStyleSheet("QToolBar{border-left:1px solid rgb(180,180,180);}");
@@ -101,12 +101,12 @@ void RealDataMaskWidget::resetContext()
m_editorCanvas->resetContext();
}
-void RealDataMaskWidget::showEvent(QShowEvent *)
+void RealDataMaskWidget::showEvent(QShowEvent*)
{
setContext();
}
-void RealDataMaskWidget::hideEvent(QHideEvent *)
+void RealDataMaskWidget::hideEvent(QHideEvent*)
{
resetContext();
}
diff --git a/GUI/View/Import/RealDataPresenter.cpp b/GUI/View/Import/RealDataPresenter.cpp
index fe50c7064cc..a4ca1163978 100644
--- a/GUI/View/Import/RealDataPresenter.cpp
+++ b/GUI/View/Import/RealDataPresenter.cpp
@@ -13,12 +13,12 @@
// ************************************************************************************************
#include "GUI/View/Import/RealDataPresenter.h"
+#include "GUI/Util/Error.h"
#include "GUI/View/Import/RealDataMaskWidget.h"
#include "GUI/View/Import/SpecularDataImportWidget.h"
#include "GUI/View/Plot2D/IntensityDataWidget.h"
#include "GUI/View/PlotSpecular/SpecularDataWidget.h"
#include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
-#include "GUI/Util/Error.h"
RealDataPresenter::RealDataPresenter(QWidget* parent)
: ItemComboWidget(parent)
diff --git a/GUI/View/Instrument/DetectorAlignmentEditor.cpp b/GUI/View/Instrument/DetectorAlignmentEditor.cpp
index 10455368647..b81fc7f5d86 100644
--- a/GUI/View/Instrument/DetectorAlignmentEditor.cpp
+++ b/GUI/View/Instrument/DetectorAlignmentEditor.cpp
@@ -50,11 +50,11 @@ DetectorAlignmentEditor::DetectorAlignmentEditor(QWidget* parent, RectangularDet
m_formLayout->setContentsMargins(0, 15, 0, 0);
m_formLayout->setSpacing(8);
- auto* m_combo = GUI::Util::createComboBoxFromDescriptor(item->detectorAlignmentSelection(),
- [=](int) {
- createAligmentWidgets();
- emit dataChanged();
- });
+ auto* m_combo =
+ GUI::Util::createComboBoxFromDescriptor(item->detectorAlignmentSelection(), [=](int) {
+ createAligmentWidgets();
+ emit dataChanged();
+ });
m_formLayout->addRow("Alignment:", m_combo);
diff --git a/GUI/View/Instrument/DetectorEditor.cpp b/GUI/View/Instrument/DetectorEditor.cpp
index 4b1915d271d..7ecdb9455dd 100644
--- a/GUI/View/Instrument/DetectorEditor.cpp
+++ b/GUI/View/Instrument/DetectorEditor.cpp
@@ -30,12 +30,11 @@ DetectorEditor::DetectorEditor(QWidget* parent, Instrument2DItem* instrument)
ASSERT(instrument);
m_formLayout = new QFormLayout(this);
- auto* detectorTypeCombo = GUI::Util::createComboBoxFromDescriptor(
- instrument->detectorSelection(),
- [=](int) {
- createDetectorWidgets();
- emit dataChanged();
- });
+ auto* detectorTypeCombo =
+ GUI::Util::createComboBoxFromDescriptor(instrument->detectorSelection(), [=](int) {
+ createDetectorWidgets();
+ emit dataChanged();
+ });
m_formLayout->addRow("Detector:", detectorTypeCombo);
GroupBoxCollapser::installIntoGroupBox(this);
diff --git a/GUI/View/Instrument/DistributionEditor.cpp b/GUI/View/Instrument/DistributionEditor.cpp
index 8d79334ffbb..2f84886f905 100644
--- a/GUI/View/Instrument/DistributionEditor.cpp
+++ b/GUI/View/Instrument/DistributionEditor.cpp
@@ -45,11 +45,11 @@ DistributionSelector::DistributionSelector(std::optional<MeanConfig> mean_config
m_formLayout = new QFormLayout(this);
m_formLayout->setContentsMargins(0, 0, 0, 0);
- m_distributionCombo = GUI::Util::createComboBoxFromDescriptor(item->distributionSelection(),
- [=](int) {
- createDistributionWidgets();
- emit distributionChanged();
- });
+ m_distributionCombo =
+ GUI::Util::createComboBoxFromDescriptor(item->distributionSelection(), [=](int) {
+ createDistributionWidgets();
+ emit distributionChanged();
+ });
m_formLayout->addRow("Distribution:", m_distributionCombo);
createDistributionWidgets();
diff --git a/GUI/View/Instrument/DistributionPlot.h b/GUI/View/Instrument/DistributionPlot.h
index 544df72ecc6..80f5b02821e 100644
--- a/GUI/View/Instrument/DistributionPlot.h
+++ b/GUI/View/Instrument/DistributionPlot.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONPLOT_H
#define BORNAGAIN_GUI_VIEW_INSTRUMENT_DISTRIBUTIONPLOT_H
-#include <QWidget>
#include "qcustomplot.h"
+#include <QWidget>
class SessionItem;
class QLabel;
diff --git a/GUI/View/Instrument/ResolutionFunctionEditor.cpp b/GUI/View/Instrument/ResolutionFunctionEditor.cpp
index 9d6bb491381..9d6f18ef2c0 100644
--- a/GUI/View/Instrument/ResolutionFunctionEditor.cpp
+++ b/GUI/View/Instrument/ResolutionFunctionEditor.cpp
@@ -31,11 +31,11 @@ ResolutionFunctionEditor::ResolutionFunctionEditor(Unit unit, QWidget* parent, D
m_formLayout = new QFormLayout(this);
m_formLayout->setFieldGrowthPolicy(QFormLayout::FieldsStayAtSizeHint);
- auto* typeCombo = GUI::Util::createComboBoxFromDescriptor(item->resolutionFunctionSelection(),
- [=](int) {
- createResolutionWidgets();
- emit dataChanged();
- });
+ auto* typeCombo =
+ GUI::Util::createComboBoxFromDescriptor(item->resolutionFunctionSelection(), [=](int) {
+ createResolutionWidgets();
+ emit dataChanged();
+ });
m_formLayout->addRow("Type:", typeCombo);
GroupBoxCollapser::installIntoGroupBox(this);
diff --git a/GUI/View/Job/JobListView.h b/GUI/View/Job/JobListView.h
index a4bf64a2dc7..d357cba157d 100644
--- a/GUI/View/Job/JobListView.h
+++ b/GUI/View/Job/JobListView.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_JOB_JOBLISTVIEW_H
#define BORNAGAIN_GUI_VIEW_JOB_JOBLISTVIEW_H
-#include <QWidget>
#include "GUI/Model/Job/JobItem.h"
+#include <QWidget>
class JobModel;
class QAction;
diff --git a/GUI/View/Plot2D/ColorMap.cpp b/GUI/View/Plot2D/ColorMap.cpp
index 2060308f6d0..bd5fcf36677 100644
--- a/GUI/View/Plot2D/ColorMap.cpp
+++ b/GUI/View/Plot2D/ColorMap.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
+#include "GUI/View/Plot2D/ColorMap.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Device/AxesItems.h"
-#include "GUI/View/Plot2D/ColorMap.h"
#include "GUI/View/PlotUtil/PlotConstants.h"
#include "GUI/View/PlotUtil/PlotEventInfo.h"
#include "GUI/View/PlotUtil/RangeUtils.h"
@@ -94,7 +94,7 @@ PlotEventInfo ColorMap::eventInfo(double xpos, double ypos) const
//! sets logarithmic scale
void ColorMap::setLogz()
{
- if(!intensityItem())
+ if (!intensityItem())
return;
bool logz = intensityItem()->isLog();
m_colorBarLayout->setMinimumSize(logz ? colorbar_width_logz : colorbar_width, 10);
@@ -117,7 +117,7 @@ void ColorMap::onUnitsChanged()
void ColorMap::setGradient()
{
- if(!intensityItem())
+ if (!intensityItem())
return;
m_colorMap->setGradient(intensityItem()->currentGradientQCP());
replot();
@@ -125,7 +125,7 @@ void ColorMap::setGradient()
void ColorMap::setInterpolation()
{
- if(!intensityItem())
+ if (!intensityItem())
return;
m_colorMap->setInterpolate(intensityItem()->isInterpolated());
replot();
@@ -205,8 +205,8 @@ void ColorMap::connectItem()
&ColorMap::onUnitsChanged, Qt::UniqueConnection);
// color scheme
- connect(intensityItem(), &IntensityDataItem::gradientChanged, this,
- &ColorMap::setGradient, Qt::UniqueConnection);
+ connect(intensityItem(), &IntensityDataItem::gradientChanged, this, &ColorMap::setGradient,
+ Qt::UniqueConnection);
// interpolation
connect(intensityItem(), &IntensityDataItem::interpolationChanged, this,
@@ -308,7 +308,7 @@ void ColorMap::setColorMapFromItem()
void ColorMap::setAxesRangeFromItem()
{
- if(!intensityItem())
+ if (!intensityItem())
return;
m_customPlot->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom);
m_customPlot->axisRect()->setupFullAxesBox(true);
@@ -322,7 +322,7 @@ void ColorMap::setAxesRangeFromItem()
void ColorMap::setAxesZoomFromItem()
{
- if(!intensityItem())
+ if (!intensityItem())
return;
setAxesRangeConnected(false);
m_customPlot->xAxis->setRange(intensityItem()->lowerX(), intensityItem()->upperX());
@@ -335,7 +335,7 @@ void ColorMap::setAxesZoomFromItem()
void ColorMap::setAxesLabelsFromItem()
{
- if(!intensityItem())
+ if (!intensityItem())
return;
if (intensityItem()->xAxisItem()->isTitleVisible())
m_customPlot->xAxis->setLabel(intensityItem()->XaxisTitle());
@@ -355,7 +355,7 @@ void ColorMap::setAxesLabelsFromItem()
void ColorMap::setDataFromItem()
{
- if(!intensityItem())
+ if (!intensityItem())
return;
Datafield* data = intensityItem()->getDatafield();
if (!data) {
@@ -386,7 +386,7 @@ void ColorMap::setColorScaleAppearanceFromItem()
void ColorMap::setDataRangeFromItem()
{
- if(!intensityItem())
+ if (!intensityItem())
return;
setDataRangeConnected(false);
m_colorMap->setDataRange(GUI::View::RangeUtils::itemDataZoom(intensityItem()));
@@ -396,7 +396,7 @@ void ColorMap::setDataRangeFromItem()
void ColorMap::setColorScaleVisible()
{
- if(!intensityItem())
+ if (!intensityItem())
return;
bool visibility_flag = intensityItem()->zAxisItem()->isVisible();
diff --git a/GUI/View/Plot2D/IntensityDataCanvas.cpp b/GUI/View/Plot2D/IntensityDataCanvas.cpp
index 72d6bfb6934..5de4b3fcb3f 100644
--- a/GUI/View/Plot2D/IntensityDataCanvas.cpp
+++ b/GUI/View/Plot2D/IntensityDataCanvas.cpp
@@ -12,10 +12,10 @@
//
// ************************************************************************************************
+#include "GUI/View/Plot2D/IntensityDataCanvas.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Data/SessionData.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/View/Plot2D/IntensityDataCanvas.h"
#include "GUI/View/Global/Globals.h"
#include "GUI/View/Info/MessageBox.h"
#include "GUI/View/Plot2D/ColorMap.h"
@@ -89,12 +89,12 @@ QList<QAction*> IntensityDataCanvas::actionList()
}
void IntensityDataCanvas::onResetViewAction()
-{
- for(auto item : allIntensityDataItems())
+{
+ for (auto item : allIntensityDataItems())
item->resetView();
// synchronize real item data range with current item
- if(realIntensityDataItem())
+ if (realIntensityDataItem())
realIntensityDataItem()->copyZRangeFromItem(currentIntensityDataItem());
}
diff --git a/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp b/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp
index 2afc4961ec1..7fabdebe16d 100644
--- a/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp
+++ b/GUI/View/Plot2D/IntensityDataPropertyWidget.cpp
@@ -38,7 +38,7 @@ void IntensityDataPropertyWidget::setFourierItem(IntensityDataItem* fftItem)
void IntensityDataPropertyWidget::unsubscribe()
{
- for(auto item : allIntensityDataItems())
+ for (auto item : allIntensityDataItems())
disconnect(item, nullptr, this, nullptr);
}
@@ -51,20 +51,31 @@ void IntensityDataPropertyWidget::createPanelElements()
GUI::Util::Layout::clearLayout(m_mainLayout);
m_updaters.clear();
- m_mainLayout->addRow("Axes units:", GUI::Util::createComboBoxUpdScroll(
- [=]{ return currentIntensityDataItem()->axesUnitsCombo(); }, [=](const QString& newVal) {
- for(auto item : allIntensityDataItems())
- item->setCurrentAxesUnits(newVal); }, &m_updaters));
-
- m_mainLayout->addRow("Color scheme:", GUI::Util::createComboBoxUpdScroll(
- [=]{ return currentIntensityDataItem()->gradientCombo(); }, [=](const QString& newVal) {
- for(auto item : allIntensityDataItems())
- item->setCurrentGradient(newVal); }, &m_updaters));
-
- m_mainLayout->addRow(GUI::Util::createCheckBox("Interpolate",
- [=]{ return currentIntensityDataItem()->isInterpolated(); }, [=](bool b) {
- for(auto item : allIntensityDataItems())
- item->setInterpolated(b); }, &m_updaters));
+ m_mainLayout->addRow("Axes units:",
+ GUI::Util::createComboBoxUpdScroll(
+ [=] { return currentIntensityDataItem()->axesUnitsCombo(); },
+ [=](const QString& newVal) {
+ for (auto item : allIntensityDataItems())
+ item->setCurrentAxesUnits(newVal);
+ },
+ &m_updaters));
+
+ m_mainLayout->addRow("Color scheme:",
+ GUI::Util::createComboBoxUpdScroll(
+ [=] { return currentIntensityDataItem()->gradientCombo(); },
+ [=](const QString& newVal) {
+ for (auto item : allIntensityDataItems())
+ item->setCurrentGradient(newVal);
+ },
+ &m_updaters));
+
+ m_mainLayout->addRow(GUI::Util::createCheckBox(
+ "Interpolate", [=] { return currentIntensityDataItem()->isInterpolated(); },
+ [=](bool b) {
+ for (auto item : allIntensityDataItems())
+ item->setInterpolated(b);
+ },
+ &m_updaters));
// -- x-axis
auto* xGroup = new QGroupBox("X axis", this);
@@ -73,19 +84,29 @@ void IntensityDataPropertyWidget::createPanelElements()
xFormLayout->setSpacing(5);
xFormLayout->addRow("Min:", GUI::Util::createDoubleSpinboxUpdScroll(
- [=]{ return currentIntensityDataItem()->xAxisItem()->min(); }, [=](double newValue) {
- for(auto item : allIntensityDataItems())
- item->xAxisItem()->setMin(newValue); }, &m_updaters));
+ [=] { return currentIntensityDataItem()->xAxisItem()->min(); },
+ [=](double newValue) {
+ for (auto item : allIntensityDataItems())
+ item->xAxisItem()->setMin(newValue);
+ },
+ &m_updaters));
xFormLayout->addRow("Max:", GUI::Util::createDoubleSpinboxUpdScroll(
- [=]{ return currentIntensityDataItem()->xAxisItem()->max(); }, [=](double newValue) {
- for(auto item : allIntensityDataItems())
- item->xAxisItem()->setMax(newValue); }, &m_updaters));
-
- xFormLayout->addRow("Title:", GUI::Util::createTextEdit(
- [=]{ return currentIntensityDataItem()->xAxisItem()->title(); }, [=](QString newText) {
- for(auto item : allIntensityDataItems())
- item->xAxisItem()->setTitle(newText); }, &m_updaters));
+ [=] { return currentIntensityDataItem()->xAxisItem()->max(); },
+ [=](double newValue) {
+ for (auto item : allIntensityDataItems())
+ item->xAxisItem()->setMax(newValue);
+ },
+ &m_updaters));
+
+ xFormLayout->addRow(
+ "Title:",
+ GUI::Util::createTextEdit([=] { return currentIntensityDataItem()->xAxisItem()->title(); },
+ [=](QString newText) {
+ for (auto item : allIntensityDataItems())
+ item->xAxisItem()->setTitle(newText);
+ },
+ &m_updaters));
m_mainLayout->addRow(xGroup);
@@ -96,19 +117,29 @@ void IntensityDataPropertyWidget::createPanelElements()
yFormLayout->setSpacing(5);
yFormLayout->addRow("Min:", GUI::Util::createDoubleSpinboxUpdScroll(
- [=]{ return currentIntensityDataItem()->yAxisItem()->min(); }, [=](double newValue) {
- for(auto item : allIntensityDataItems())
- item->yAxisItem()->setMin(newValue); }, &m_updaters));
+ [=] { return currentIntensityDataItem()->yAxisItem()->min(); },
+ [=](double newValue) {
+ for (auto item : allIntensityDataItems())
+ item->yAxisItem()->setMin(newValue);
+ },
+ &m_updaters));
yFormLayout->addRow("Max:", GUI::Util::createDoubleSpinboxUpdScroll(
- [=]{ return currentIntensityDataItem()->yAxisItem()->max(); }, [=](double newValue) {
- for(auto item : allIntensityDataItems())
- item->yAxisItem()->setMax(newValue); }, &m_updaters));
-
- yFormLayout->addRow("Title:", GUI::Util::createTextEdit(
- [=]{ return currentIntensityDataItem()->yAxisItem()->title(); }, [=](QString newText) {
- for(auto item : allIntensityDataItems())
- item->yAxisItem()->setTitle(newText); }, &m_updaters));
+ [=] { return currentIntensityDataItem()->yAxisItem()->max(); },
+ [=](double newValue) {
+ for (auto item : allIntensityDataItems())
+ item->yAxisItem()->setMax(newValue);
+ },
+ &m_updaters));
+
+ yFormLayout->addRow(
+ "Title:",
+ GUI::Util::createTextEdit([=] { return currentIntensityDataItem()->yAxisItem()->title(); },
+ [=](QString newText) {
+ for (auto item : allIntensityDataItems())
+ item->yAxisItem()->setTitle(newText);
+ },
+ &m_updaters));
m_mainLayout->addRow(yGroup);
@@ -119,24 +150,36 @@ void IntensityDataPropertyWidget::createPanelElements()
zFormLayout->setSpacing(5);
zFormLayout->addRow("Min:", GUI::Util::createDoubleSpinboxUpdScroll(
- [=]{ return currentIntensityDataItem()->zAxisItem()->min(); }, [=](double newValue) {
- for(auto item : allIntensityDataItems())
- item->zAxisItem()->setMin(newValue); }, &m_updaters));
+ [=] { return currentIntensityDataItem()->zAxisItem()->min(); },
+ [=](double newValue) {
+ for (auto item : allIntensityDataItems())
+ item->zAxisItem()->setMin(newValue);
+ },
+ &m_updaters));
yFormLayout->addRow("Max:", GUI::Util::createDoubleSpinboxUpdScroll(
- [=]{ return currentIntensityDataItem()->zAxisItem()->max(); }, [=](double newValue) {
- for(auto item : mainIntensityDataItems())
- item->zAxisItem()->setMax(newValue); }, &m_updaters));
-
- zFormLayout->addRow(GUI::Util::createCheckBox("log10",
- [=]{ return currentIntensityDataItem()->zAxisItem()->isLogScale(); }, [=](bool b) {
- for(auto item : allIntensityDataItems())
- item->zAxisItem()->setLogScale(b); }, &m_updaters));
-
- zFormLayout->addRow(GUI::Util::createCheckBox("Visible",
- [=]{ return currentIntensityDataItem()->zAxisItem()->isVisible(); }, [=](bool b) {
- for(auto item : allIntensityDataItems())
- item->zAxisItem()->setVisibilityValue(b); }, &m_updaters));
+ [=] { return currentIntensityDataItem()->zAxisItem()->max(); },
+ [=](double newValue) {
+ for (auto item : mainIntensityDataItems())
+ item->zAxisItem()->setMax(newValue);
+ },
+ &m_updaters));
+
+ zFormLayout->addRow(GUI::Util::createCheckBox(
+ "log10", [=] { return currentIntensityDataItem()->zAxisItem()->isLogScale(); },
+ [=](bool b) {
+ for (auto item : allIntensityDataItems())
+ item->zAxisItem()->setLogScale(b);
+ },
+ &m_updaters));
+
+ zFormLayout->addRow(GUI::Util::createCheckBox(
+ "Visible", [=] { return currentIntensityDataItem()->zAxisItem()->isVisible(); },
+ [=](bool b) {
+ for (auto item : allIntensityDataItems())
+ item->zAxisItem()->setVisibilityValue(b);
+ },
+ &m_updaters));
m_mainLayout->addRow(zGroup);
@@ -147,7 +190,7 @@ void IntensityDataPropertyWidget::createPanelElements()
&IntensityDataPropertyWidget::updateUIValues, Qt::UniqueConnection);
// update coordinates on axes units change
- for(auto item : allIntensityDataItems())
+ for (auto item : allIntensityDataItems())
connect(item, &DataItem::axesUnitsChanged, this,
&IntensityDataPropertyWidget::updateItemCoords, Qt::UniqueConnection);
}
diff --git a/GUI/View/Plot2D/IntensityDataWidget.cpp b/GUI/View/Plot2D/IntensityDataWidget.cpp
index 3117cbaffff..0892106a533 100644
--- a/GUI/View/Plot2D/IntensityDataWidget.cpp
+++ b/GUI/View/Plot2D/IntensityDataWidget.cpp
@@ -12,12 +12,12 @@
//
// ************************************************************************************************
-#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/View/Plot2D/IntensityDataWidget.h"
+#include "GUI/Model/Data/IntensityDataItem.h"
+#include "GUI/Util/ActionFactory.h"
#include "GUI/View/Plot2D/IntensityDataCanvas.h"
#include "GUI/View/Plot2D/IntensityDataFFTPresenter.h"
#include "GUI/View/Plot2D/IntensityDataPropertyWidget.h"
-#include "GUI/Util/ActionFactory.h"
#include <QBoxLayout>
#include <QMenu>
@@ -56,7 +56,7 @@ void IntensityDataWidget::setJobOrRealItem(JobRealBase* job_or_real_item)
m_intensityCanvas->setJobOrRealItem(job_or_real_item);
m_propertyWidget->setJobOrRealItem(job_or_real_item);
- if(oldJob != jobItem())
+ if (oldJob != jobItem())
m_fftPresenter->reset();
onFFTAction();
}
diff --git a/GUI/View/PlotComparison/FitComparisonWidget.cpp b/GUI/View/PlotComparison/FitComparisonWidget.cpp
index 604796ea78b..2c71e0fb5da 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget.cpp
@@ -12,18 +12,17 @@
//
// ************************************************************************************************
+#include "GUI/View/PlotComparison/FitComparisonWidget.h"
+#include "Device/Histo/DiffUtil.h"
#include "GUI/Model/Data/IntensityDataItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
-#include "GUI/View/PlotComparison/FitComparisonWidget.h"
-#include "GUI/View/PlotComparison/FitFlowWidget.h"
+#include "GUI/Util/ActionFactory.h"
#include "GUI/View/Plot2D/ColorMap.h"
#include "GUI/View/Plot2D/ColorMapCanvas.h"
#include "GUI/View/Plot2D/IntensityDataPropertyWidget.h"
#include "GUI/View/PlotComparison/FitFlowWidget.h"
#include "GUI/View/PlotUtil/PlotStatusLabel.h"
#include "GUI/View/PlotUtil/RangeUtils.h"
-#include "GUI/Util/ActionFactory.h"
-#include "Device/Histo/DiffUtil.h"
#include <QAction>
FitComparisonWidget::FitComparisonWidget(QWidget* parent)
@@ -84,7 +83,7 @@ void FitComparisonWidget::setJobOrRealItem(JobRealBase* job_item)
DataAccessWidget::setJobOrRealItem(job_item);
ASSERT(jobItem());
- if(oldJob != jobItem())
+ if (oldJob != jobItem())
GUI::View::RangeUtils::setCommonRangeZ(mainIntensityDataItems());
updateDiffData();
connectItems();
@@ -115,9 +114,9 @@ void FitComparisonWidget::onResetViewAction()
void FitComparisonWidget::connectItems()
{
// sync XY view area between sumulated, real and difference plots
- for(auto senderItem : allIntensityDataItems())
- for(auto receiverItem : allIntensityDataItems())
- if(receiverItem != senderItem)
+ for (auto senderItem : allIntensityDataItems())
+ for (auto receiverItem : allIntensityDataItems())
+ if (receiverItem != senderItem)
connect(senderItem, &DataItem::updateOtherPlots, receiverItem,
&DataItem::copyXYRangesFromItem, Qt::UniqueConnection);
@@ -139,9 +138,8 @@ void FitComparisonWidget::updateDiffData()
ASSERT(simuIntensityDataItem() && diffIntensityDataItem() && realIntensityDataItem());
ASSERT(simuIntensityDataItem()->getDatafield() && realIntensityDataItem()->getDatafield());
- diffIntensityDataItem()->setDatafield(
- DiffUtil::relativeDifferenceField(*simuIntensityDataItem()->getDatafield(),
- *realIntensityDataItem()->getDatafield()));
+ diffIntensityDataItem()->setDatafield(DiffUtil::relativeDifferenceField(
+ *simuIntensityDataItem()->getDatafield(), *realIntensityDataItem()->getDatafield()));
// keep Z axis range up with data range
diffIntensityDataItem()->computeDataRange();
diff --git a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
index 381811f183a..a0933fc76ef 100644
--- a/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
+++ b/GUI/View/PlotComparison/FitComparisonWidget1D.cpp
@@ -12,18 +12,18 @@
//
// ************************************************************************************************
+#include "GUI/View/PlotComparison/FitComparisonWidget1D.h"
+#include "Device/Histo/DiffUtil.h"
+#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Model/Job/FitSuiteItem.h"
#include "GUI/Model/Job/JobItem.h"
-#include "GUI/Model/Data/SpecularDataItem.h"
-#include "GUI/View/PlotComparison/FitComparisonWidget1D.h"
+#include "GUI/Util/ActionFactory.h"
#include "GUI/View/PlotComparison/FitFlowWidget.h"
-#include "GUI/View/PlotUtil/PlotStatusLabel.h"
-#include "GUI/View/PlotUtil/RangeUtils.h"
#include "GUI/View/PlotSpecular/SpecularDataPropertyWidget.h"
-#include "GUI/View/PlotSpecular/SpecularPlotCanvas.h"
#include "GUI/View/PlotSpecular/SpecularPlot.h"
-#include "GUI/Util/ActionFactory.h"
-#include "Device/Histo/DiffUtil.h"
+#include "GUI/View/PlotSpecular/SpecularPlotCanvas.h"
+#include "GUI/View/PlotUtil/PlotStatusLabel.h"
+#include "GUI/View/PlotUtil/RangeUtils.h"
FitComparisonWidget1D::FitComparisonWidget1D(QWidget* parent)
: DataAccessWidget(parent)
@@ -81,13 +81,12 @@ void FitComparisonWidget1D::setJobOrRealItem(JobRealBase* job_item)
DataAccessWidget::setJobOrRealItem(job_item);
ASSERT(jobItem());
- if(oldJob != jobItem())
+ if (oldJob != jobItem())
GUI::View::RangeUtils::setCommonRangeY(mainSpecularDataItems());
updateDiffData();
connectItems();
- m_data_canvas->setSpecularItems({simuSpecularDataItem(),
- realSpecularDataItem()});
+ m_data_canvas->setSpecularItems({simuSpecularDataItem(), realSpecularDataItem()});
m_diff_canvas->setSpecularItems({diffSpecularDataItem()});
m_fitFlowWidget->setItem(jobItem()->fitSuiteItem());
m_propertyWidget->setJobOrRealItem(job_item);
@@ -129,9 +128,8 @@ void FitComparisonWidget1D::updateDiffData()
ASSERT(simuSpecularDataItem() && diffSpecularDataItem() && realSpecularDataItem());
ASSERT(simuSpecularDataItem()->getDatafield() && realSpecularDataItem()->getDatafield());
- diffSpecularDataItem()->setDatafield(
- DiffUtil::relativeDifferenceField(*simuSpecularDataItem()->getDatafield(),
- *realSpecularDataItem()->getDatafield()));
+ diffSpecularDataItem()->setDatafield(DiffUtil::relativeDifferenceField(
+ *simuSpecularDataItem()->getDatafield(), *realSpecularDataItem()->getDatafield()));
// keep Y axis range up with data range
diffSpecularDataItem()->setLowerY(diffSpecularDataItem()->yMin());
diff --git a/GUI/View/PlotComparison/HistogramPlot.h b/GUI/View/PlotComparison/HistogramPlot.h
index e5680143e3b..feaf33c3f8c 100644
--- a/GUI/View/PlotComparison/HistogramPlot.h
+++ b/GUI/View/PlotComparison/HistogramPlot.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_HISTOGRAMPLOT_H
#define BORNAGAIN_GUI_VIEW_PLOTCOMPARISON_HISTOGRAMPLOT_H
-#include <QWidget>
#include "qcustomplot.h"
+#include <QWidget>
class HistogramPlot : public QWidget {
Q_OBJECT
diff --git a/GUI/View/PlotSpecular/SpecularDataCanvas.cpp b/GUI/View/PlotSpecular/SpecularDataCanvas.cpp
index 7d10269a735..4ac9fd27878 100644
--- a/GUI/View/PlotSpecular/SpecularDataCanvas.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataCanvas.cpp
@@ -79,7 +79,7 @@ void SpecularDataCanvas::enableDeprecatedOnMousePress(bool b)
void SpecularDataCanvas::onResetViewAction()
{
- for(auto item : allSpecularDataItems())
+ for (auto item : allSpecularDataItems())
item->resetView();
}
diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
index 7f3c5d5047c..4d22c6aea66 100644
--- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
@@ -30,7 +30,7 @@ SpecularDataPropertyWidget::SpecularDataPropertyWidget(QWidget* parent)
void SpecularDataPropertyWidget::unsubscribe()
{
- for(auto item : allSpecularDataItems())
+ for (auto item : allSpecularDataItems())
disconnect(item, nullptr, this, nullptr);
}
@@ -43,10 +43,14 @@ void SpecularDataPropertyWidget::createPanelElements()
GUI::Util::Layout::clearLayout(m_mainLayout);
m_updaters.clear();
- m_mainLayout->addRow("Axes units:", GUI::Util::createComboBoxUpdScroll(
- [=]{ return currentSpecularDataItem()->axesUnitsCombo(); }, [=](const QString& newVal) {
- for(auto item : allSpecularDataItems())
- item->setCurrentAxesUnits(newVal); }, &m_updaters));
+ m_mainLayout->addRow("Axes units:",
+ GUI::Util::createComboBoxUpdScroll(
+ [=] { return currentSpecularDataItem()->axesUnitsCombo(); },
+ [=](const QString& newVal) {
+ for (auto item : allSpecularDataItems())
+ item->setCurrentAxesUnits(newVal);
+ },
+ &m_updaters));
// -- x-axis
auto* xGroup = new QGroupBox("X axis", this);
@@ -55,19 +59,29 @@ void SpecularDataPropertyWidget::createPanelElements()
xFormLayout->setSpacing(5);
xFormLayout->addRow("Min:", GUI::Util::createDoubleSpinboxUpdScroll(
- [=]{ return currentSpecularDataItem()->xAxisItem()->min(); }, [=](double newValue) {
- for(auto item : allSpecularDataItems())
- item->xAxisItem()->setMin(newValue); }, &m_updaters));
+ [=] { return currentSpecularDataItem()->xAxisItem()->min(); },
+ [=](double newValue) {
+ for (auto item : allSpecularDataItems())
+ item->xAxisItem()->setMin(newValue);
+ },
+ &m_updaters));
xFormLayout->addRow("Max:", GUI::Util::createDoubleSpinboxUpdScroll(
- [=]{ return currentSpecularDataItem()->xAxisItem()->max(); }, [=](double newValue) {
- for(auto item : allSpecularDataItems())
- item->xAxisItem()->setMax(newValue); }, &m_updaters));
-
- xFormLayout->addRow("Title:", GUI::Util::createTextEdit(
- [=]{ return currentSpecularDataItem()->xAxisItem()->title(); }, [=](QString newText) {
- for(auto item : allSpecularDataItems())
- item->xAxisItem()->setTitle(newText); }, &m_updaters));
+ [=] { return currentSpecularDataItem()->xAxisItem()->max(); },
+ [=](double newValue) {
+ for (auto item : allSpecularDataItems())
+ item->xAxisItem()->setMax(newValue);
+ },
+ &m_updaters));
+
+ xFormLayout->addRow(
+ "Title:",
+ GUI::Util::createTextEdit([=] { return currentSpecularDataItem()->xAxisItem()->title(); },
+ [=](QString newText) {
+ for (auto item : allSpecularDataItems())
+ item->xAxisItem()->setTitle(newText);
+ },
+ &m_updaters));
m_mainLayout->addRow(xGroup);
@@ -78,24 +92,38 @@ void SpecularDataPropertyWidget::createPanelElements()
yFormLayout->setSpacing(5);
yFormLayout->addRow("Min:", GUI::Util::createDoubleSpinboxUpdScroll(
- [=]{ return currentSpecularDataItem()->yAxisItem()->min(); }, [=](double newValue) {
- for(auto item : mainSpecularDataItems())
- item->yAxisItem()->setMin(newValue); }, &m_updaters));
+ [=] { return currentSpecularDataItem()->yAxisItem()->min(); },
+ [=](double newValue) {
+ for (auto item : mainSpecularDataItems())
+ item->yAxisItem()->setMin(newValue);
+ },
+ &m_updaters));
yFormLayout->addRow("Max:", GUI::Util::createDoubleSpinboxUpdScroll(
- [=]{ return currentSpecularDataItem()->yAxisItem()->max(); }, [=](double newValue) {
- for(auto item : mainSpecularDataItems())
- item->yAxisItem()->setMax(newValue); }, &m_updaters));
-
- yFormLayout->addRow("Title:", GUI::Util::createTextEdit(
- [=]{ return currentSpecularDataItem()->yAxisItem()->title(); }, [=](QString newText) {
- for(auto item : mainSpecularDataItems()) {
- item->yAxisItem()->setTitle(newText); }}, &m_updaters));
-
- yFormLayout->addRow(GUI::Util::createCheckBox("log10",
- [=]{ return currentSpecularDataItem()->yAxisItem()->isLogScale(); }, [=](bool b) {
- for(auto item : allSpecularDataItems())
- item->yAxisItem()->setLogScale(b); }, &m_updaters));
+ [=] { return currentSpecularDataItem()->yAxisItem()->max(); },
+ [=](double newValue) {
+ for (auto item : mainSpecularDataItems())
+ item->yAxisItem()->setMax(newValue);
+ },
+ &m_updaters));
+
+ yFormLayout->addRow(
+ "Title:",
+ GUI::Util::createTextEdit([=] { return currentSpecularDataItem()->yAxisItem()->title(); },
+ [=](QString newText) {
+ for (auto item : mainSpecularDataItems()) {
+ item->yAxisItem()->setTitle(newText);
+ }
+ },
+ &m_updaters));
+
+ yFormLayout->addRow(GUI::Util::createCheckBox(
+ "log10", [=] { return currentSpecularDataItem()->yAxisItem()->isLogScale(); },
+ [=](bool b) {
+ for (auto item : allSpecularDataItems())
+ item->yAxisItem()->setLogScale(b);
+ },
+ &m_updaters));
m_mainLayout->addRow(yGroup);
@@ -106,7 +134,7 @@ void SpecularDataPropertyWidget::createPanelElements()
&SpecularDataPropertyWidget::updateUIValues, Qt::UniqueConnection);
// update coordinates on axes units change
- for(auto item : allSpecularDataItems())
+ for (auto item : allSpecularDataItems())
connect(item, &DataItem::axesUnitsChanged, this,
&SpecularDataPropertyWidget::updateItemCoords, Qt::UniqueConnection);
}
diff --git a/GUI/View/PlotSpecular/SpecularDataWidget.cpp b/GUI/View/PlotSpecular/SpecularDataWidget.cpp
index 628cc8e0527..5551979da96 100644
--- a/GUI/View/PlotSpecular/SpecularDataWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataWidget.cpp
@@ -12,9 +12,9 @@
//
// ************************************************************************************************
+#include "GUI/View/PlotSpecular/SpecularDataWidget.h"
#include "GUI/Model/Data/SpecularDataItem.h"
#include "GUI/Util/ActionFactory.h"
-#include "GUI/View/PlotSpecular/SpecularDataWidget.h"
#include "GUI/View/PlotSpecular/SpecularDataCanvas.h"
#include "GUI/View/PlotSpecular/SpecularDataPropertyWidget.h"
#include <QBoxLayout>
diff --git a/GUI/View/PlotSpecular/SpecularPlot.cpp b/GUI/View/PlotSpecular/SpecularPlot.cpp
index 7be5b625e0c..647e201b99c 100644
--- a/GUI/View/PlotSpecular/SpecularPlot.cpp
+++ b/GUI/View/PlotSpecular/SpecularPlot.cpp
@@ -67,30 +67,30 @@ PlotEventInfo SpecularPlot::eventInfo(double xpos, double ypos) const
void SpecularPlot::setLog()
{
- if(!currentSpecularDataItem())
+ if (!currentSpecularDataItem())
return;
- GUI::View::RangeUtils::setLogz(m_custom_plot->yAxis, currentSpecularDataItem()->isLog());
+ GUI::View::RangeUtils::setLogz(m_custom_plot->yAxis, currentSpecularDataItem()->isLog());
GUI::View::RangeUtils::setLogz(m_custom_plot->yAxis2, currentSpecularDataItem()->isLog());
replot();
}
void SpecularPlot::onXaxisRangeChanged(QCPRange newRange)
{
- for(auto item : specularDataItems()) {
+ for (auto item : specularDataItems()) {
item->setLowerX(newRange.lower);
item->setUpperX(newRange.upper);
}
- if(currentSpecularDataItem())
+ if (currentSpecularDataItem())
emit currentSpecularDataItem()->updateOtherPlots(currentSpecularDataItem());
}
void SpecularPlot::onYaxisRangeChanged(QCPRange newRange)
{
- for(auto item : specularDataItems()) {
+ for (auto item : specularDataItems()) {
item->setLowerY(newRange.lower);
item->setUpperY(newRange.upper);
}
- if(currentSpecularDataItem())
+ if (currentSpecularDataItem())
emit currentSpecularDataItem()->updateOtherPlots(currentSpecularDataItem());
}
@@ -102,14 +102,14 @@ void SpecularPlot::onTimeToReplot()
void SpecularPlot::connectItems()
{
// data
- for(auto item : specularDataItems())
- connect(item, &DataItem::datafieldChanged, this,
- &SpecularPlot::setPlot, Qt::UniqueConnection);
+ for (auto item : specularDataItems())
+ connect(item, &DataItem::datafieldChanged, this, &SpecularPlot::setPlot,
+ Qt::UniqueConnection);
// units
- for(auto item : specularDataItems())
- connect(item, &DataItem::axesUnitsReplotRequested, this,
- &SpecularPlot::setPlot, Qt::UniqueConnection);
+ for (auto item : specularDataItems())
+ connect(item, &DataItem::axesUnitsReplotRequested, this, &SpecularPlot::setPlot,
+ Qt::UniqueConnection);
// x axis
connect(currentSpecularDataItem()->xAxisItem(), &BasicAxisItem::axisTitleChanged, this,
@@ -132,13 +132,13 @@ void SpecularPlot::initPlot()
{
m_custom_plot->clearGraphs();
m_graph_map.clear();
- for(auto item : specularDataItems()) {
+ for (auto item : specularDataItems()) {
m_custom_plot->addGraph();
m_graph_map.insert(item, m_custom_plot->graph());
m_custom_plot->graph()->setLineStyle(item->lineStyle());
m_custom_plot->graph()->setPen(QPen(item->color(), item->thickness()));
m_custom_plot->graph()->setScatterStyle(
- QCPScatterStyle(item->scatter(), item->scatterSize()));
+ QCPScatterStyle(item->scatter(), item->scatterSize()));
}
m_custom_plot->xAxis->setTickLabelFont(
@@ -187,7 +187,7 @@ void SpecularPlot::setUpdateTimerConnected(bool isConnected)
void SpecularPlot::setPlot()
{
- for(auto item : specularDataItems())
+ for (auto item : specularDataItems())
setDataFromItem(item);
setAxes();
setAxesLabels();
@@ -204,7 +204,7 @@ void SpecularPlot::setAxes()
void SpecularPlot::setAxesRanges()
{
- if(!currentSpecularDataItem())
+ if (!currentSpecularDataItem())
return;
setAxesRangeConnected(false);
m_custom_plot->xAxis->setRange(currentSpecularDataItem()->lowerX(),
@@ -217,7 +217,7 @@ void SpecularPlot::setAxesRanges()
void SpecularPlot::setAxesLabels()
{
- if(!currentSpecularDataItem())
+ if (!currentSpecularDataItem())
return;
setLabel(currentSpecularDataItem()->xAxisItem(), m_custom_plot->xAxis);
setLabel(currentSpecularDataItem()->yAxisItem(), m_custom_plot->yAxis);
@@ -243,7 +243,7 @@ void SpecularPlot::setDataFromItem(SpecularDataItem* item)
if (!data)
return;
- for (size_t i = 0; i<data->size(); ++i) {
+ for (size_t i = 0; i < data->size(); ++i) {
double x = data->frame().projectedCoord(i, 0);
double y = data->operator[](i);
graph->addData(x, y);
diff --git a/GUI/View/PlotUtil/DataPropertyWidget.cpp b/GUI/View/PlotUtil/DataPropertyWidget.cpp
index f00381df5a8..4ea2729cacc 100644
--- a/GUI/View/PlotUtil/DataPropertyWidget.cpp
+++ b/GUI/View/PlotUtil/DataPropertyWidget.cpp
@@ -13,9 +13,9 @@
// ************************************************************************************************
#include "GUI/View/PlotUtil/DataPropertyWidget.h"
+#include "GUI/Model/Data/DataItem.h"
#include "GUI/Model/Data/SessionData.h"
#include "GUI/Model/Project/ProjectDocument.h"
-#include "GUI/Model/Data/DataItem.h"
#include <QFormLayout>
DataPropertyWidget::DataPropertyWidget(QWidget* parent)
@@ -42,15 +42,15 @@ void DataPropertyWidget::updateItemCoords(DataItem* item)
return;
InstrumentItem* instrument = nullptr;
- if(jobItem())
+ if (jobItem())
instrument = jobItem()->instrumentItem();
- else if(realItem()) {
- instrument = gSessionData->projectDocument.value()->collectedItems()
- ->findInstrumentById(realItem()->instrumentId());
+ else if (realItem()) {
+ instrument = gSessionData->projectDocument.value()->collectedItems()->findInstrumentById(
+ realItem()->instrumentId());
} else
ASSERT(0);
- if(instrument) {
+ if (instrument) {
item->blockSignals(true);
item->updateCoords(instrument);
item->blockSignals(false);
diff --git a/GUI/View/PlotUtil/FontScalingEvent.cpp b/GUI/View/PlotUtil/FontScalingEvent.cpp
index a838517eda6..512727f19ca 100644
--- a/GUI/View/PlotUtil/FontScalingEvent.cpp
+++ b/GUI/View/PlotUtil/FontScalingEvent.cpp
@@ -15,8 +15,8 @@
#include "GUI/View/PlotUtil/FontScalingEvent.h"
#include "Base/Util/Assert.h"
#include "GUI/View/Plot2D/ColorMap.h"
-#include <QResizeEvent>
#include "qcustomplot.h"
+#include <QResizeEvent>
namespace {
diff --git a/GUI/View/PlotUtil/RangeUtils.cpp b/GUI/View/PlotUtil/RangeUtils.cpp
index b20fc9d5cdb..19a430812fc 100644
--- a/GUI/View/PlotUtil/RangeUtils.cpp
+++ b/GUI/View/PlotUtil/RangeUtils.cpp
@@ -110,8 +110,8 @@ void GUI::View::RangeUtils::setDefaultMargins(QCustomPlot* customPlot)
double GUI::View::RangeUtils::commonMin(const QList<AmplitudeAxisItem*>& axes)
{
double min = +std::numeric_limits<double>::max();
- for(auto axis : axes)
- if(min>axis->min())
+ for (auto axis : axes)
+ if (min > axis->min())
min = axis->min();
return min;
}
@@ -119,8 +119,8 @@ double GUI::View::RangeUtils::commonMin(const QList<AmplitudeAxisItem*>& axes)
double GUI::View::RangeUtils::commonMax(const QList<AmplitudeAxisItem*>& axes)
{
double max = -std::numeric_limits<double>::max();
- for(auto axis : axes)
- if(max<axis->max())
+ for (auto axis : axes)
+ if (max < axis->max())
max = axis->max();
return max;
}
@@ -133,7 +133,7 @@ QCPRange GUI::View::RangeUtils::commonRange(const QList<AmplitudeAxisItem*>& axe
void GUI::View::RangeUtils::setCommonRangeY(QList<SpecularDataItem*> items)
{
QCPRange range = commonRange(valueAxesFromSpecularItems(items));
- for(auto item : items) {
+ for (auto item : items) {
item->setLowerY(range.lower);
item->setUpperY(range.upper);
}
@@ -142,7 +142,7 @@ void GUI::View::RangeUtils::setCommonRangeY(QList<SpecularDataItem*> items)
void GUI::View::RangeUtils::setCommonRangeZ(QList<IntensityDataItem*> items)
{
QCPRange range = commonRange(valueAxesFromIntensityItems(items));
- for(auto item : items) {
+ for (auto item : items) {
item->setLowerZ(range.lower);
item->setUpperZ(range.upper);
}
@@ -152,7 +152,7 @@ QList<AmplitudeAxisItem*>
GUI::View::RangeUtils::valueAxesFromSpecularItems(const QList<SpecularDataItem*>& items)
{
QList<AmplitudeAxisItem*> axes;
- for(auto item : items)
+ for (auto item : items)
axes.append(item->yAxisItem());
return axes;
}
@@ -161,7 +161,7 @@ QList<AmplitudeAxisItem*>
GUI::View::RangeUtils::valueAxesFromIntensityItems(const QList<IntensityDataItem*>& items)
{
QList<AmplitudeAxisItem*> axes;
- for(auto item : items)
+ for (auto item : items)
axes.append(item->zAxisItem());
return axes;
}
diff --git a/GUI/View/PlotUtil/RangeUtils.h b/GUI/View/PlotUtil/RangeUtils.h
index f836430c5d4..ba9fa325e06 100644
--- a/GUI/View/PlotUtil/RangeUtils.h
+++ b/GUI/View/PlotUtil/RangeUtils.h
@@ -15,10 +15,10 @@
#ifndef BORNAGAIN_GUI_VIEW_PLOTUTIL_RANGEUTILS_H
#define BORNAGAIN_GUI_VIEW_PLOTUTIL_RANGEUTILS_H
+#include "qcustomplot.h"
#include <QMap>
#include <QMargins>
#include <QString>
-#include "qcustomplot.h"
class IntensityDataItem;
class SpecularDataItem;
diff --git a/GUI/View/PlotUtil/ScientificPlotEvent.cpp b/GUI/View/PlotUtil/ScientificPlotEvent.cpp
index a0af18a0b54..ace955a63f7 100644
--- a/GUI/View/PlotUtil/ScientificPlotEvent.cpp
+++ b/GUI/View/PlotUtil/ScientificPlotEvent.cpp
@@ -13,8 +13,8 @@
// ************************************************************************************************
#include "GUI/View/PlotUtil/ScientificPlotEvent.h"
-#include <QMouseEvent>
#include "qcustomplot.h"
+#include <QMouseEvent>
ScientificPlotEvent::ScientificPlotEvent(ScientificPlot* scientific_plot)
: QObject(scientific_plot)
diff --git a/GUI/View/Projection/IntensityDataProjectionsWidget.cpp b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
index 9dae7a9aa20..94871113e22 100644
--- a/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
+++ b/GUI/View/Projection/IntensityDataProjectionsWidget.cpp
@@ -41,7 +41,7 @@ IntensityDataProjectionsWidget::IntensityDataProjectionsWidget(QWidget* parent)
auto* mainLayout = new QHBoxLayout(this);
mainLayout->setContentsMargins(0, 0, 0, 0);
mainLayout->setSpacing(0);
- mainLayout->setContentsMargins(0,0,0,0);
+ mainLayout->setContentsMargins(0, 0, 0, 0);
mainLayout->addWidget(splitter);
mainLayout->addWidget(m_propertyPanel);
@@ -64,7 +64,7 @@ void IntensityDataProjectionsWidget::setJobOrRealItem(JobRealBase* job_or_real_i
void IntensityDataProjectionsWidget::setContext()
{
ProjectionContainerItem* container =
- currentIntensityDataItem()->getOrCreateProjectionContainerItem();
+ currentIntensityDataItem()->getOrCreateProjectionContainerItem();
QModelIndex shapeContainerIndex = container->index();
SessionModel* model = currentIntensityDataItem()->model();
diff --git a/GUI/View/Projection/ProjectionsPlot.h b/GUI/View/Projection/ProjectionsPlot.h
index 84aee204ff3..d71daa990b6 100644
--- a/GUI/View/Projection/ProjectionsPlot.h
+++ b/GUI/View/Projection/ProjectionsPlot.h
@@ -16,9 +16,9 @@
#define BORNAGAIN_GUI_VIEW_PROJECTION_PROJECTIONSPLOT_H
#include "GUI/View/Common/SessionItemWidget.h"
+#include "qcustomplot.h"
#include <QMap>
#include <memory>
-#include "qcustomplot.h"
class IntensityDataItem;
class ProjectionContainerItem;
diff --git a/GUI/View/Tool/WidgetUtils.cpp b/GUI/View/Tool/WidgetUtils.cpp
index c56b90ce735..ddea8a1f431 100644
--- a/GUI/View/Tool/WidgetUtils.cpp
+++ b/GUI/View/Tool/WidgetUtils.cpp
@@ -29,8 +29,7 @@ using std::variant;
QComboBox* GUI::Util::createComboBox(function<ComboProperty()> comboFunction,
function<void(const QString&)> slot,
- QList<function<void()>>* updaters,
- bool isScrollable)
+ QList<function<void()>>* updaters, bool isScrollable)
{
QComboBox* combo = new QComboBox;
combo->addItems(comboFunction().values());
@@ -38,14 +37,14 @@ QComboBox* GUI::Util::createComboBox(function<ComboProperty()> comboFunction,
combo->setToolTip(comboFunction().toolTip());
combo->setCurrentText(comboFunction().currentValue());
- if(comboFunction().toolTips().size() == combo->count())
- for(int index=0; index<combo->count(); index++)
+ if (comboFunction().toolTips().size() == combo->count())
+ for (int index = 0; index < combo->count(); index++)
combo->setItemData(index, comboFunction().toolTips().at(index), Qt::ToolTipRole);
if (!isScrollable)
WheelEventEater::install(combo);
- QObject::connect(combo, &QComboBox::currentTextChanged, [=]{ slot(combo->currentText()); });
+ QObject::connect(combo, &QComboBox::currentTextChanged, [=] { slot(combo->currentText()); });
if (updaters)
(*updaters) << [=]() {
@@ -63,10 +62,8 @@ QComboBox* GUI::Util::createComboBoxUpdScroll(function<ComboProperty()> comboFun
return GUI::Util::createComboBox(comboFunction, slot, updaters, true);
}
-SafeSpinBox* GUI::Util::createSpinBox(const UIntDescriptor& d,
- QList<function<void()>>* updaters,
- function<void(uint)> slot,
- bool easyScrollable)
+SafeSpinBox* GUI::Util::createSpinBox(const UIntDescriptor& d, QList<function<void()>>* updaters,
+ function<void(uint)> slot, bool easyScrollable)
{
auto* spinBox = new SafeSpinBox(easyScrollable);
spinBox->setToolTip(d.tooltip);
@@ -102,8 +99,7 @@ SafeSpinBox* GUI::Util::createSpinBoxScroll(const UIntDescriptor& d,
return GUI::Util::createSpinBox(d, updaters, slot, true);
}
-SafeSpinBox* GUI::Util::createSpinBoxRow(QFormLayout* parentLayout,
- const UIntDescriptor& d)
+SafeSpinBox* GUI::Util::createSpinBoxRow(QFormLayout* parentLayout, const UIntDescriptor& d)
{
auto* sb = createSpinBox(d);
parentLayout->addRow(labelWithUnit(d.label, d.unit) + ":", sb);
@@ -157,10 +153,8 @@ ScientificSpinBox* GUI::Util::createScientificSpinBox(QFormLayout* parentLayout,
return spinBox;
}
-QCheckBox* GUI::Util::createCheckBox(const QString& title,
- function<bool()> getter,
- function<void(bool)> setter,
- QList<function<void()>>* updaters)
+QCheckBox* GUI::Util::createCheckBox(const QString& title, function<bool()> getter,
+ function<void(bool)> setter, QList<function<void()>>* updaters)
{
QCheckBox* checkBox = new QCheckBox(title);
checkBox->setChecked(getter());
@@ -176,8 +170,7 @@ QCheckBox* GUI::Util::createCheckBox(const QString& title,
return checkBox;
}
-QLineEdit* GUI::Util::createTextEdit(function<QString()> getter,
- function<void(QString)> setter,
+QLineEdit* GUI::Util::createTextEdit(function<QString()> getter, function<void(QString)> setter,
QList<function<void()>>* updaters)
{
QLineEdit* edit = new QLineEdit;
@@ -230,7 +223,7 @@ QDoubleSpinBox* GUI::Util::createDoubleSpinbox(function<double()> getter,
QDoubleSpinBox* spin = new QDoubleSpinBox;
spin->setFocusPolicy(Qt::StrongFocus);
spin->setMinimum(-std::numeric_limits<double>::max());
- spin->setMaximum( std::numeric_limits<double>::max());
+ spin->setMaximum(std::numeric_limits<double>::max());
spin->setDecimals(3);
spin->setSingleStep(0.01);
spin->setValue(getter());
@@ -238,7 +231,7 @@ QDoubleSpinBox* GUI::Util::createDoubleSpinbox(function<double()> getter,
if (!easyScrollable)
WheelEventEater::install(spin);
- QObject::connect(spin, &QDoubleSpinBox::valueChanged, [=]{ slot(spin->value()); });
+ QObject::connect(spin, &QDoubleSpinBox::valueChanged, [=] { slot(spin->value()); });
if (updaters)
(*updaters) << [=]() {
diff --git a/GUI/View/Tool/WidgetUtils.h b/GUI/View/Tool/WidgetUtils.h
index b3128962a10..e501e588a97 100644
--- a/GUI/View/Tool/WidgetUtils.h
+++ b/GUI/View/Tool/WidgetUtils.h
@@ -36,10 +36,10 @@ namespace GUI::Util {
//! Create a combo box with the information found in a ComboProperty.
//!
//! The combo box will be filled with the available options and will get the found tooltips,
-//! the common one and individual for each item. The current text will be just passes to "slot" function.
-//! Furthermore, the combo box can prohibit accidental changes by the mouse wheel. Otherwise it
-//! would be dangerous if the combo is on a scrollable form - unintended and unnoticed changes would
-//! take place when just scrolling through the form.
+//! the common one and individual for each item. The current text will be just passes to "slot"
+//! function. Furthermore, the combo box can prohibit accidental changes by the mouse wheel.
+//! Otherwise it would be dangerous if the combo is on a scrollable form - unintended and unnoticed
+//! changes would take place when just scrolling through the form.
//!
//! The combo can be updated from outside using "updaters" list.
//!
@@ -68,9 +68,9 @@ QComboBox* createComboBoxUpdScroll(std::function<ComboProperty()> comboFunction,
//!
template <typename T>
QComboBox* createComboBoxFromDescriptor(SelectionDescriptor<T> d,
- std::function<void(int)> slot = nullptr,
- QList<std::function<void()>>* updaters = nullptr,
- bool isScrollable = false)
+ std::function<void(int)> slot = nullptr,
+ QList<std::function<void()>>* updaters = nullptr,
+ bool isScrollable = false)
{
QComboBox* combo = new QComboBox;
combo->addItems(d.options);
@@ -99,8 +99,8 @@ QComboBox* createComboBoxFromDescriptor(SelectionDescriptor<T> d,
//! Scrollable and updatable version
template <typename T>
QComboBox* createComboBoxUpdScrollFromDescriptor(SelectionDescriptor<T> d,
- QList<std::function<void()>>* updaters = nullptr,
- std::function<void(int)> slot = nullptr)
+ QList<std::function<void()>>* updaters = nullptr,
+ std::function<void(int)> slot = nullptr)
{
return GUI::Util::createComboBoxFromDescriptor(d, slot, updaters, true);
}
@@ -108,7 +108,7 @@ QComboBox* createComboBoxUpdScrollFromDescriptor(SelectionDescriptor<T> d,
//! Scrollable, but non-updatable version
template <typename T>
QComboBox* createComboBoxScrollFromDescriptor(SelectionDescriptor<T> d,
- std::function<void(int)> slot = nullptr)
+ std::function<void(int)> slot = nullptr)
{
return GUI::Util::createComboBoxFromDescriptor(d, slot, nullptr, true);
}
@@ -125,8 +125,7 @@ QComboBox* createComboBoxScrollFromDescriptor(SelectionDescriptor<T> d,
//! notified about a value change.
SafeSpinBox* createSpinBox(const UIntDescriptor& d,
QList<std::function<void()>>* updaters = nullptr,
- std::function<void(uint)> slot = nullptr,
- bool easyScrollable = false);
+ std::function<void(uint)> slot = nullptr, bool easyScrollable = false);
//! Creates a scrollable spinbox
SafeSpinBox* createSpinBoxScroll(const UIntDescriptor& d,
@@ -138,8 +137,7 @@ SafeSpinBox* createSpinBoxScroll(const UIntDescriptor& d,
//!
//! The label will also contain the unit, if present.
//! Regarding the spin box creation see the method above.
-SafeSpinBox* createSpinBoxRow(QFormLayout* parentLayout,
- const UIntDescriptor& d);
+SafeSpinBox* createSpinBoxRow(QFormLayout* parentLayout, const UIntDescriptor& d);
//! Create a label and a spin box with the information found in a DoubleDescriptor and place them in
//! a row in a form layout.
@@ -153,8 +151,7 @@ SafeSpinBox* createSpinBoxRow(QFormLayout* parentLayout,
//! will *not* be notified to the descriptor. The additional (and optional) slot can be used to be
//! notified about a value change (the notified new value is in the base unit of the
//! DoubleDescriptor).
-DoubleSpinBox* createDoubleSpinBoxRow(QFormLayout* parentLayout,
- const DoubleDescriptor& d,
+DoubleSpinBox* createDoubleSpinBoxRow(QFormLayout* parentLayout, const DoubleDescriptor& d,
std::function<void(double)> slot = nullptr);
//! Create a label and a scientific spin box with the information found in a DoubleDescriptor and
@@ -182,32 +179,29 @@ QString labelWithUnit(const QString& label, std::variant<QString, Unit> unit);
QString labelWithUnit(const DoubleDescriptor& d);
//! Creates an updatable checkbox
-QCheckBox* createCheckBox(const QString& title,
- std::function<bool()> getter,
- std::function<void(bool)> setter,
- QList<std::function<void()>>* updaters);
+QCheckBox* createCheckBox(const QString& title, std::function<bool()> getter,
+ std::function<void(bool)> setter, QList<std::function<void()>>* updaters);
//! Creates an updatable lineedit
-QLineEdit* createTextEdit(std::function<QString()> getter,
- std::function<void(QString)> setter,
+QLineEdit* createTextEdit(std::function<QString()> getter, std::function<void(QString)> setter,
QList<std::function<void()>>* updaters);
//! Creates an updatable doublespinBox from DoubleDescriptor
DoubleSpinBox* createDoubleSpinboxFromDescriptor(DoubleDescriptor d,
- QList<std::function<void ()>>* updaters = nullptr,
+ QList<std::function<void()>>* updaters = nullptr,
std::function<void(double)> slot = nullptr,
bool easyScrollable = false);
//! Creates a scrollable updatable doublespinBox from DoubleDescriptor
-DoubleSpinBox* createDoubleSpinboxScrollFromDescriptor(DoubleDescriptor d,
- QList<std::function<void()>>* updaters = nullptr,
- std::function<void(double)> slot = nullptr);
+DoubleSpinBox*
+createDoubleSpinboxScrollFromDescriptor(DoubleDescriptor d,
+ QList<std::function<void()>>* updaters = nullptr,
+ std::function<void(double)> slot = nullptr);
//! Creates a scrollable updatable doublespinBox
QDoubleSpinBox* createDoubleSpinbox(std::function<double()> getter,
std::function<void(double)> slot,
- QList<std::function<void()>>* updaters,
- bool easyScrollable);
+ QList<std::function<void()>>* updaters, bool easyScrollable);
//! Creates a doublespinBox with enabled scrolling
QDoubleSpinBox* createDoubleSpinboxUpdScroll(std::function<double()> getter,
diff --git a/GUI/View/Toplevel/SimulationView.cpp b/GUI/View/Toplevel/SimulationView.cpp
index e54a601789d..3c07bc26583 100644
--- a/GUI/View/Toplevel/SimulationView.cpp
+++ b/GUI/View/Toplevel/SimulationView.cpp
@@ -69,8 +69,7 @@ SimulationView::SimulationView(QWidget* parent, ProjectDocument* document)
connect(m_ui->simulateButton, &QPushButton::clicked, this, &SimulationView::simulate);
connect(m_ui->exportToPyScriptButton, &QPushButton::clicked, this,
&SimulationView::exportPythonScript);
- connect(computationButtonGroup,
- &QButtonGroup::buttonClicked, this,
+ connect(computationButtonGroup, &QButtonGroup::buttonClicked, this,
&SimulationView::updateEnabling);
connect(m_ui->runPolicyImmediatelyRadio, &QRadioButton::toggled,
diff --git a/Tests/Unit/GUI/TestSessionModel.cpp b/Tests/Unit/GUI/TestSessionModel.cpp
index 892bc2ba24a..97ba971fd26 100644
--- a/Tests/Unit/GUI/TestSessionModel.cpp
+++ b/Tests/Unit/GUI/TestSessionModel.cpp
@@ -1,5 +1,6 @@
#include "GUI/Model/BaseItem/PropertyItem.h"
#include "GUI/Model/Data/DataItem.h"
+#include "GUI/Model/Data/RealDataItem.h"
#include "GUI/Model/Device/InstrumentCollection.h"
#include "GUI/Model/Device/MaskItems.h"
#include "GUI/Model/Job/JobItem.h"
@@ -7,7 +8,6 @@
#include "GUI/Model/Sample/LayerItem.h"
#include "GUI/Model/Sample/MultiLayerItem.h"
#include "GUI/Support/Data/SessionItemTags.h"
-#include "GUI/Model/Data/RealDataItem.h"
#include "Tests/GTestWrapper/google_test.h"
#include <QSignalSpy>
#include <QXmlStreamWriter>
--
GitLab