Skip to content
Snippets Groups Projects
Commit 00e27e3c authored by Pospelov, Gennady's avatar Pospelov, Gennady
Browse files

FitProgressInfo removed from Qt meta system

parent 6cfa45f9
No related branches found
No related tags found
No related merge requests found
...@@ -14,27 +14,6 @@ ...@@ -14,27 +14,6 @@
#include "FitProgressInfo.h" #include "FitProgressInfo.h"
FitProgressInfo::FitProgressInfo() FitProgressInfo::FitProgressInfo() : m_chi2(0.0), m_iteration_count(0)
: m_chi2(0.0)
, m_iteration_count(0)
{ {
}
//! Copy constructor is reimplemented as required by Qt's meta-object system
FitProgressInfo::FitProgressInfo(const FitProgressInfo &other)
{
m_chi2 = other.m_chi2;
m_iteration_count = other.m_iteration_count;
m_values = other.m_values;
m_log_info = other.m_log_info;
m_sim_values = other.m_sim_values;
}
//! Destructor is reimplemented as required by Qt's meta-object system
FitProgressInfo::~FitProgressInfo()
{
} }
...@@ -16,21 +16,16 @@ ...@@ -16,21 +16,16 @@
#define FITPROGRESSINFO_H #define FITPROGRESSINFO_H
#include "WinDllMacros.h" #include "WinDllMacros.h"
#include <QMetaType>
#include <QVector> #include <QVector>
#include <vector> #include <vector>
//! The FitProgressInfo class contains all essential information about fit progress. //! The FitProgressInfo class contains all essential information about fit progress.
//! It is send from GUIFitObserver to FitSuiteWidget on every nth iteration. //! It is send from GUIFitObserver to FitSuiteWidget on every nth iteration.
//! Important: the class is used for Qt::QueuedConnection type, when sender leaves in another class BA_CORE_API_ FitProgressInfo
//! thread. To make it possible, it is also registered in main.cpp. {
class BA_CORE_API_ FitProgressInfo {
public: public:
FitProgressInfo(); FitProgressInfo();
FitProgressInfo(const FitProgressInfo &other);
~FitProgressInfo();
double chi2() const { return m_chi2; } double chi2() const { return m_chi2; }
int iterationCount() const { return m_iteration_count; } int iterationCount() const { return m_iteration_count; }
...@@ -39,6 +34,7 @@ public: ...@@ -39,6 +34,7 @@ public:
std::vector<double> simValues() const { return m_sim_values; } std::vector<double> simValues() const { return m_sim_values; }
friend class GUIFitObserver; friend class GUIFitObserver;
private: private:
double m_chi2; double m_chi2;
int m_iteration_count; int m_iteration_count;
...@@ -47,6 +43,4 @@ private: ...@@ -47,6 +43,4 @@ private:
std::vector<double> m_sim_values; std::vector<double> m_sim_values;
}; };
Q_DECLARE_METATYPE(FitProgressInfo)
#endif // FITPROGRESSINFO_H #endif // FITPROGRESSINFO_H
...@@ -30,7 +30,6 @@ int main(int argc, char* argv[]) ...@@ -30,7 +30,6 @@ int main(int argc, char* argv[])
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates)); QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));
qRegisterMetaType<QVector<double>>("QVector<double>"); qRegisterMetaType<QVector<double>>("QVector<double>");
qRegisterMetaType<FitProgressInfo>("FitProgressInfo");
if( options.enableHighDPISupport()) if( options.enableHighDPISupport())
QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment