diff --git a/GUI/Models/FTDecayFunctionItems.h b/GUI/Models/FTDecayFunctionItems.h index 44f05425d96f22af561fdfbb2328fe8bab580bc8..50b8bcaa312bceb511ea21b90cd61125c1fd4127 100644 --- a/GUI/Models/FTDecayFunctionItems.h +++ b/GUI/Models/FTDecayFunctionItems.h @@ -42,7 +42,7 @@ public: static constexpr auto M_TYPE{"FTDecayFunction1DCauchy"}; FTDecayFunction1DCauchyItem(); - std::unique_ptr<IFTDecayFunction1D> createFTDecayFunction() const; + std::unique_ptr<IFTDecayFunction1D> createFTDecayFunction() const override; }; class FTDecayFunction1DGaussItem : public FTDecayFunction1DItem { @@ -50,7 +50,7 @@ public: static constexpr auto M_TYPE{"FTDecayFunction1DGauss"}; FTDecayFunction1DGaussItem(); - std::unique_ptr<IFTDecayFunction1D> createFTDecayFunction() const; + std::unique_ptr<IFTDecayFunction1D> createFTDecayFunction() const override; }; class FTDecayFunction1DTriangleItem : public FTDecayFunction1DItem { @@ -58,7 +58,7 @@ public: static constexpr auto M_TYPE{"FTDecayFunction1DTriangle"}; FTDecayFunction1DTriangleItem(); - std::unique_ptr<IFTDecayFunction1D> createFTDecayFunction() const; + std::unique_ptr<IFTDecayFunction1D> createFTDecayFunction() const override; }; class FTDecayFunction1DVoigtItem : public FTDecayFunction1DItem { @@ -69,7 +69,7 @@ public: static constexpr auto M_TYPE{"FTDecayFunction1DVoigt"}; FTDecayFunction1DVoigtItem(); - std::unique_ptr<IFTDecayFunction1D> createFTDecayFunction() const; + std::unique_ptr<IFTDecayFunction1D> createFTDecayFunction() const override; DoubleDescriptor eta() const; virtual DoubleDescriptors valueDescriptors() const override; @@ -107,7 +107,7 @@ public: static constexpr auto M_TYPE{"FTDecayFunction2DCauchy"}; FTDecayFunction2DCauchyItem(); - std::unique_ptr<IFTDecayFunction2D> createFTDecayFunction() const; + std::unique_ptr<IFTDecayFunction2D> createFTDecayFunction() const override; }; class FTDecayFunction2DGaussItem : public FTDecayFunction2DItem { @@ -115,7 +115,7 @@ public: static constexpr auto M_TYPE{"FTDecayFunction2DGauss"}; FTDecayFunction2DGaussItem(); - std::unique_ptr<IFTDecayFunction2D> createFTDecayFunction() const; + std::unique_ptr<IFTDecayFunction2D> createFTDecayFunction() const override; }; class FTDecayFunction2DVoigtItem : public FTDecayFunction2DItem { @@ -126,7 +126,7 @@ public: static constexpr auto M_TYPE{"FTDecayFunction2DVoigt"}; FTDecayFunction2DVoigtItem(); - std::unique_ptr<IFTDecayFunction2D> createFTDecayFunction() const; + std::unique_ptr<IFTDecayFunction2D> createFTDecayFunction() const override; void setEta(double eta); }; diff --git a/GUI/Models/FTDistributionItems.h b/GUI/Models/FTDistributionItems.h index 5cc5318c80d02a2dd2e4cb0ab5f69ba0b4e6014f..01b8ff947cab88ec3771c2174e7056d5d36e8517 100644 --- a/GUI/Models/FTDistributionItems.h +++ b/GUI/Models/FTDistributionItems.h @@ -42,7 +42,7 @@ public: static constexpr auto M_TYPE{"FTDistribution1DCauchy"}; FTDistribution1DCauchyItem(); - std::unique_ptr<IFTDistribution1D> createFTDistribution() const; + std::unique_ptr<IFTDistribution1D> createFTDistribution() const override; }; class FTDistribution1DGaussItem : public FTDistribution1DItem { @@ -50,7 +50,7 @@ public: static constexpr auto M_TYPE{"FTDistribution1DGauss"}; FTDistribution1DGaussItem(); - std::unique_ptr<IFTDistribution1D> createFTDistribution() const; + std::unique_ptr<IFTDistribution1D> createFTDistribution() const override; }; class FTDistribution1DGateItem : public FTDistribution1DItem { @@ -58,7 +58,7 @@ public: static constexpr auto M_TYPE{"FTDistribution1DGate"}; FTDistribution1DGateItem(); - std::unique_ptr<IFTDistribution1D> createFTDistribution() const; + std::unique_ptr<IFTDistribution1D> createFTDistribution() const override; }; class FTDistribution1DTriangleItem : public FTDistribution1DItem { @@ -66,7 +66,7 @@ public: static constexpr auto M_TYPE{"FTDistribution1DTriangle"}; FTDistribution1DTriangleItem(); - std::unique_ptr<IFTDistribution1D> createFTDistribution() const; + std::unique_ptr<IFTDistribution1D> createFTDistribution() const override; }; class FTDistribution1DCosineItem : public FTDistribution1DItem { @@ -74,7 +74,7 @@ public: static constexpr auto M_TYPE{"FTDistribution1DCosine"}; FTDistribution1DCosineItem(); - std::unique_ptr<IFTDistribution1D> createFTDistribution() const; + std::unique_ptr<IFTDistribution1D> createFTDistribution() const override; }; class FTDistribution1DVoigtItem : public FTDistribution1DItem { @@ -85,7 +85,7 @@ public: static constexpr auto M_TYPE{"FTDistribution1DVoigt"}; FTDistribution1DVoigtItem(); - std::unique_ptr<IFTDistribution1D> createFTDistribution() const; + std::unique_ptr<IFTDistribution1D> createFTDistribution() const override; DoubleDescriptor eta() const; virtual DoubleDescriptors valueDescriptors() const override; @@ -122,7 +122,7 @@ public: static constexpr auto M_TYPE{"FTDistribution2DCauchy"}; FTDistribution2DCauchyItem(); - std::unique_ptr<IFTDistribution2D> createFTDistribution() const; + std::unique_ptr<IFTDistribution2D> createFTDistribution() const override; }; class FTDistribution2DGaussItem : public FTDistribution2DItem { @@ -130,7 +130,7 @@ public: static constexpr auto M_TYPE{"FTDistribution2DGauss"}; FTDistribution2DGaussItem(); - std::unique_ptr<IFTDistribution2D> createFTDistribution() const; + std::unique_ptr<IFTDistribution2D> createFTDistribution() const override; }; class FTDistribution2DGateItem : public FTDistribution2DItem { @@ -138,7 +138,7 @@ public: static constexpr auto M_TYPE{"FTDistribution2DGate"}; FTDistribution2DGateItem(); - std::unique_ptr<IFTDistribution2D> createFTDistribution() const; + std::unique_ptr<IFTDistribution2D> createFTDistribution() const override; }; class FTDistribution2DConeItem : public FTDistribution2DItem { @@ -146,7 +146,7 @@ public: static constexpr auto M_TYPE{"FTDistribution2DCone"}; FTDistribution2DConeItem(); - std::unique_ptr<IFTDistribution2D> createFTDistribution() const; + std::unique_ptr<IFTDistribution2D> createFTDistribution() const override; }; class FTDistribution2DVoigtItem : public FTDistribution2DItem { @@ -157,7 +157,7 @@ public: static constexpr auto M_TYPE{"FTDistribution2DVoigt"}; FTDistribution2DVoigtItem(); - std::unique_ptr<IFTDistribution2D> createFTDistribution() const; + std::unique_ptr<IFTDistribution2D> createFTDistribution() const override; void setEta(double eta); }; diff --git a/GUI/Views/JobWidgets/JobPropertiesTableModel.cpp b/GUI/Views/JobWidgets/JobPropertiesTableModel.cpp index 04c55fb0bfd934bc1efeb06ba00395793e4897ab..081357adad5c3c110c7782343644f10336a31d5b 100644 --- a/GUI/Views/JobWidgets/JobPropertiesTableModel.cpp +++ b/GUI/Views/JobWidgets/JobPropertiesTableModel.cpp @@ -14,6 +14,7 @@ #include "GUI/Views/JobWidgets/JobPropertiesTableModel.h" #include "GUI/Models/JobItem.h" +#include <QLocale> namespace { namespace Column { @@ -86,11 +87,11 @@ QVariant JobPropertiesTableModel::data(const QModelIndex& index, int role) const return jobStatusToString(m_item->getStatus()); case Row::Begin: if (role == Qt::ToolTipRole) - return m_item->beginTime().toString(Qt::DefaultLocaleLongDate); + return QLocale().toString(m_item->beginTime(), QLocale::LongFormat); return m_item->beginTime().toString(ModelDateShortFormat); case Row::End: if (role == Qt::ToolTipRole) - return m_item->endTime().toString(Qt::DefaultLocaleLongDate); + return QLocale().toString(m_item->endTime(), QLocale::LongFormat); return m_item->endTime().toString(ModelDateShortFormat); case Row::Duration: { std::optional<size_t> duration = m_item->duration(); diff --git a/GUI/Views/JobWidgets/JobPropertiesTableModel.h b/GUI/Views/JobWidgets/JobPropertiesTableModel.h index 92481115eec7e68999fdc296f1ad9edf95c94f81..e42e897aeca8466a1f1c76c5ff60d6f832d05002 100644 --- a/GUI/Views/JobWidgets/JobPropertiesTableModel.h +++ b/GUI/Views/JobWidgets/JobPropertiesTableModel.h @@ -13,7 +13,7 @@ // ************************************************************************************************ #ifndef BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROPERTIESTABLEMODEL_H -#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROPERTIESTABLEMODE_H +#define BORNAGAIN_GUI_VIEWS_JOBWIDGETS_JOBPROPERTIESTABLEMODEL_H #include <QAbstractTableModel>