diff --git a/Fit/Minimizer/MinimizerOptions.cpp b/Fit/Minimizer/MinimizerOptions.cpp
index d511f910d6dfeac4decbcabf8f8c28fdd93f7674..4381b047f0fadb2e07bb954708315b430d7066d4 100644
--- a/Fit/Minimizer/MinimizerOptions.cpp
+++ b/Fit/Minimizer/MinimizerOptions.cpp
@@ -21,7 +21,9 @@
namespace {
const std::string delimeter = ";";
-}
+
+} // namespace
+
std::string MinimizerOptions::toOptionString() const
{
diff --git a/GUI/View/Job/JobResultsPresenter.cpp b/GUI/View/Job/JobResultsPresenter.cpp
index 34b191c89b70728027d32f813262c677006eb231..f3491b26d22895edb9c4cef5a9ba5887367c595b 100644
--- a/GUI/View/Job/JobResultsPresenter.cpp
+++ b/GUI/View/Job/JobResultsPresenter.cpp
@@ -20,6 +20,27 @@
#include "GUI/View/PlotSpecular/SpecularDataWidget.h"
#include "GUI/View/Projection/IntensityDataProjectionsWidget.h"
+namespace {
+
+QString fitPresentationOfInstrument(JobItem* ji)
+{
+ return ji->isSpecularJob() ? "Fit 1D Data" : "Fit 2D Data";
+}
+
+QStringList defaultActivePresentationsOfInstrument(JobItem* ji)
+{
+ return ji->isSpecularJob() ? QStringList{"Reflectometry"}
+ : QStringList{"Heat Map", "Projections"};
+}
+
+QString defaultPresentationOfInstrument(JobItem* ji)
+{
+ return ji->isSpecularJob() ? "Reflectometry" : "Heat Map";
+}
+
+} // namespace
+
+
JobResultsPresenter::JobResultsPresenter(QWidget* parent)
: ItemComboWidget(parent)
{
@@ -67,12 +88,12 @@ void JobResultsPresenter::setPresentationForActivity(JobViewActivity activity)
QString presentation = "";
switch (activity) {
case JobViewActivity::Fitting:
- presentation = fitPresentationOfInstrument();
+ presentation = fitPresentationOfInstrument(jobItem());
break;
case JobViewActivity::RealTime:
case JobViewActivity::JobView:
- presentation = defaultPresentationOfInstrument();
+ presentation = defaultPresentationOfInstrument(jobItem());
break;
}
setPresentation(presentation);
@@ -86,10 +107,10 @@ QStringList JobResultsPresenter::activePresentationList() const
if (!jobItem() || jobItem()->isRunning())
return {};
- auto result = defaultActivePresentationsOfInstrument();
+ auto result = defaultActivePresentationsOfInstrument(jobItem());
if (jobItem()->isValidForFitting())
- result << fitPresentationOfInstrument();
+ result << fitPresentationOfInstrument(jobItem());
return result;
}
@@ -99,32 +120,8 @@ QStringList JobResultsPresenter::presentationList() const
if (!jobItem() || jobItem()->isRunning())
return {};
- auto result = defaultActivePresentationsOfInstrument();
- result << fitPresentationOfInstrument();
+ auto result = defaultActivePresentationsOfInstrument(jobItem());
+ result << fitPresentationOfInstrument(jobItem());
return result;
}
-
-QString JobResultsPresenter::defaultPresentationOfInstrument() const
-{
- if (jobItem()->isSpecularJob())
- return "Reflectometry";
-
- return "Heat Map";
-}
-
-QStringList JobResultsPresenter::defaultActivePresentationsOfInstrument() const
-{
- if (jobItem()->isSpecularJob())
- return {"Reflectometry"};
-
- return {"Heat Map", "Projections"};
-}
-
-QString JobResultsPresenter::fitPresentationOfInstrument() const
-{
- if (jobItem()->isSpecularJob())
- return "Fit 1D Data";
-
- return "Fit 2D Data";
-}
diff --git a/GUI/View/Job/JobResultsPresenter.h b/GUI/View/Job/JobResultsPresenter.h
index 73311c841c34a2f8737324d63d33d8bfaf3a85d8..ea3bd76e7044dd9a8feb2cc8e868e979fde5f413 100644
--- a/GUI/View/Job/JobResultsPresenter.h
+++ b/GUI/View/Job/JobResultsPresenter.h
@@ -29,18 +29,12 @@ public:
void setJobItem(JobItem* jobItem);
void setPresentation(const QString& presentationType) override;
-
void setPresentationForActivity(JobViewActivity activity);
-protected:
+private:
QString itemPresentation() const override;
QStringList activePresentationList() const override;
QStringList presentationList() const override;
-
-private:
- QString defaultPresentationOfInstrument() const;
- QStringList defaultActivePresentationsOfInstrument() const;
- QString fitPresentationOfInstrument() const;
};
#endif // BORNAGAIN_GUI_VIEW_JOB_JOBRESULTSPRESENTER_H
diff --git a/GUI/View/Main/AboutDialog.cpp b/GUI/View/Main/AboutDialog.cpp
index 390d482f6c9425d1debd026e2c5a8d020342c012..398c7a0788c676af841bd8c459a7c6693bbcf02e 100644
--- a/GUI/View/Main/AboutDialog.cpp
+++ b/GUI/View/Main/AboutDialog.cpp
@@ -41,32 +41,7 @@ QLabel* createLogoLabel()
return result;
}
-} // namespace
-
-AboutDialog::AboutDialog(QWidget* parent)
- : QDialog(parent)
-{
- QColor bgColor(240, 240, 240, 255);
- QPalette palette;
- palette.setColor(QPalette::Window, bgColor);
- setAutoFillBackground(true);
- setPalette(palette);
-
- setWindowTitle("About BornAgain");
- setWindowFlags(Qt::Dialog);
-
- auto* detailsLayout = new QHBoxLayout;
- detailsLayout->addLayout(createLogoLayout());
- detailsLayout->addLayout(createTextLayout());
-
- auto* mainLayout = new QVBoxLayout;
- mainLayout->addLayout(detailsLayout);
- mainLayout->addLayout(createButtonLayout());
-
- setLayout(mainLayout);
-}
-
-QBoxLayout* AboutDialog::createLogoLayout()
+QBoxLayout* createLogoLayout()
{
auto* result = new QVBoxLayout;
@@ -81,7 +56,7 @@ QBoxLayout* AboutDialog::createLogoLayout()
return result;
}
-QBoxLayout* AboutDialog::createTextLayout()
+QBoxLayout* createTextLayout()
{
auto* result = new QVBoxLayout;
@@ -138,21 +113,46 @@ QBoxLayout* AboutDialog::createTextLayout()
return result;
}
-QBoxLayout* AboutDialog::createButtonLayout()
+QBoxLayout* createButtonLayout(AboutDialog* parent)
{
auto* result = new QHBoxLayout;
auto* closeButton = new QPushButton("Close");
- connect(closeButton, &QPushButton::clicked, this, &QDialog::reject);
+ QObject::connect(closeButton, &QPushButton::clicked, parent, &QDialog::reject);
result->addStretch(1);
result->addWidget(closeButton);
+ return result;
+}
+
+} // namespace
+
+AboutDialog::AboutDialog(QWidget* parent)
+ : QDialog(parent)
+{
+ QColor bgColor(240, 240, 240, 255);
+ QPalette palette;
+ palette.setColor(QPalette::Window, bgColor);
+ setAutoFillBackground(true);
+ setPalette(palette);
+
+ setWindowTitle("About BornAgain");
+ setWindowFlags(Qt::Dialog);
+
+ auto* detailsLayout = new QHBoxLayout;
+ detailsLayout->addLayout(createLogoLayout());
+ detailsLayout->addLayout(createTextLayout());
+
+ auto* mainLayout = new QVBoxLayout;
+ mainLayout->addLayout(detailsLayout);
+ mainLayout->addLayout(createButtonLayout(this));
+
+ setLayout(mainLayout);
+
static const char mydata[] = {0x64, 0x65, 0x76, 0x73};
QByteArray b = QByteArray::fromRawData(mydata, sizeof(mydata));
auto* f = new ShortcodeFilter(b, this);
- connect(f, &ShortcodeFilter::found, this, [=]() { layout()->addWidget(createLogoLabel()); });
+ connect(f, &ShortcodeFilter::found, parent, [=]() { layout()->addWidget(createLogoLabel()); });
installEventFilter(f);
-
- return result;
}
diff --git a/GUI/View/Main/AboutDialog.h b/GUI/View/Main/AboutDialog.h
index 79416d39675f0dbc515388f7676fb127d8c76d16..d93f6738f957e5ca5261255385c42eadc722615f 100644
--- a/GUI/View/Main/AboutDialog.h
+++ b/GUI/View/Main/AboutDialog.h
@@ -17,18 +17,11 @@
#include <QDialog>
-class QBoxLayout;
-
//! About BornAgain dialog.
class AboutDialog : public QDialog {
public:
AboutDialog(QWidget* parent = nullptr);
-
-private:
- QBoxLayout* createLogoLayout();
- QBoxLayout* createTextLayout();
- QBoxLayout* createButtonLayout();
};
#endif // BORNAGAIN_GUI_VIEW_MAIN_ABOUTDIALOG_H
diff --git a/GUI/View/Numeric/SafeSpinBox.cpp b/GUI/View/Numeric/SafeSpinBox.cpp
index 571e6a6c69f7a58ad4a5c3240899f270429fe817..b7473ae16a49c2628af5c0fb071ba016fda26de9 100644
--- a/GUI/View/Numeric/SafeSpinBox.cpp
+++ b/GUI/View/Numeric/SafeSpinBox.cpp
@@ -17,14 +17,14 @@
SafeSpinBox::SafeSpinBox(bool easyScrollable, QWidget* parent)
: QSpinBox{parent}
- , easyScrollable(easyScrollable)
+ , m_easyScrollable(easyScrollable)
{
setFocusPolicy(Qt::StrongFocus);
}
void SafeSpinBox::wheelEvent(QWheelEvent* event)
{
- if (hasFocus() || easyScrollable)
+ if (hasFocus() || m_easyScrollable)
QSpinBox::wheelEvent(event);
else
event->ignore();
diff --git a/GUI/View/Numeric/SafeSpinBox.h b/GUI/View/Numeric/SafeSpinBox.h
index ed57c6f647679629203d9c8c31a672ba635b2719..ae122b2427ffa74298be5d0dd3d51184b1c6837f 100644
--- a/GUI/View/Numeric/SafeSpinBox.h
+++ b/GUI/View/Numeric/SafeSpinBox.h
@@ -27,7 +27,7 @@ protected:
void wheelEvent(QWheelEvent* event) override;
private:
- bool easyScrollable;
+ bool m_easyScrollable;
};
#endif // BORNAGAIN_GUI_VIEW_NUMERIC_SAFESPINBOX_H
diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
index dbb9e8b4119e4d3bd57c04ef55ffc4872c0cf22e..e0b607ad4dd1646cf82a7798af1ada5d82a49047 100644
--- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
+++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.cpp
@@ -30,18 +30,14 @@ SpecularDataPropertyWidget::SpecularDataPropertyWidget(QWidget* parent)
{
}
-void SpecularDataPropertyWidget::unsubscribe()
-{
- for (auto item : allSpecularDataItems())
- disconnect(item, nullptr, this, nullptr);
-}
-
void SpecularDataPropertyWidget::createPanelElements()
{
if (allSpecularDataItems().size() == 0)
return;
- unsubscribe();
+ for (auto item : allSpecularDataItems())
+ disconnect(item, nullptr, this, nullptr);
+
GUI::Util::Layout::clearLayout(m_mainLayout);
m_updaters.clear();
diff --git a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.h b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.h
index 234a1b917f18f084398532112f85f2151edceeb1..778555e63b31caaead1bdbd4b8543cc5d2e55ed8 100644
--- a/GUI/View/PlotSpecular/SpecularDataPropertyWidget.h
+++ b/GUI/View/PlotSpecular/SpecularDataPropertyWidget.h
@@ -24,7 +24,6 @@ public:
explicit SpecularDataPropertyWidget(QWidget* parent = nullptr);
private:
- void unsubscribe();
void createPanelElements() override;
};
diff --git a/GUI/View/Tool/ItemDelegateForHTML.cpp b/GUI/View/Tool/ItemDelegateForHTML.cpp
index 09f5250921e8730555a57b0e6144cf7183000b51..a7a5d0257f0c5357682631f46d54824ae26a91db 100644
--- a/GUI/View/Tool/ItemDelegateForHTML.cpp
+++ b/GUI/View/Tool/ItemDelegateForHTML.cpp
@@ -26,6 +26,15 @@ bool hasHtml(const QString& t)
return t.contains("<") && t.contains(">");
}
+QSize mySizeHint(const QString& text)
+{
+ QTextDocument doc;
+ doc.setHtml(text);
+ doc.setTextWidth(10000 /*options.rect.width()*/);
+ QSize size = QSize(doc.idealWidth(), doc.size().height());
+ return size;
+}
+
} // namespace
@@ -86,22 +95,13 @@ QSize ItemDelegateForHTML::sizeHint(const QStyleOptionViewItem& option,
QStyleOptionViewItem options = option;
initStyleOption(&options, index);
- auto s2 = sizeHint(options.text);
+ auto s2 = mySizeHint(options.text);
s.setHeight(std::max(s.height(), s2.height() + 10));
s.setWidth(s2.width() + h); // +h: icon
return s;
}
-QSize ItemDelegateForHTML::sizeHint(const QString& text)
-{
- QTextDocument doc;
- doc.setHtml(text);
- doc.setTextWidth(10000 /*options.rect.width()*/);
- QSize size = QSize(doc.idealWidth(), doc.size().height());
- return size;
-}
-
QString ItemDelegateForHTML::anchorAtGlobalPos(QAbstractItemView* view, const QModelIndex& index,
const QPoint& globalPos) const
{
diff --git a/GUI/View/Tool/ItemDelegateForHTML.h b/GUI/View/Tool/ItemDelegateForHTML.h
index 1d5fb399a3df36aaf15a841efe70759ebe89166f..064b289a1b4a0e8db22585b906031447637cc12f 100644
--- a/GUI/View/Tool/ItemDelegateForHTML.h
+++ b/GUI/View/Tool/ItemDelegateForHTML.h
@@ -29,10 +29,7 @@ protected:
void paint(QPainter* painter, const QStyleOptionViewItem& option,
const QModelIndex& index) const override;
QSize sizeHint(const QStyleOptionViewItem& option, const QModelIndex& index) const override;
-
-private:
- static QSize sizeHint(const QString& text);
};
-#endif // BORNAGAIN_GUI_VIEW_TOOL_ITEMDELEGATEFORHTML_H
\ No newline at end of file
+#endif // BORNAGAIN_GUI_VIEW_TOOL_ITEMDELEGATEFORHTML_H