From 9a405b56cb71d83fdc9c6a422b6e2dcd4b719369 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Fri, 22 Apr 2016 13:01:33 +0200
Subject: [PATCH] The rest of fit items which will be refactored, renamed to
obsoleteItems.
---
GUI/coregui/Models/FitParameterItems.cpp | 85 -------------------
GUI/coregui/Models/ItemFactory.cpp | 14 +--
GUI/coregui/Models/ObsoleteFitModel.cpp | 40 ++++-----
GUI/coregui/Models/ObsoleteFitModel.h | 16 ++--
.../Models/ObsoleteFitParameterItems.cpp | 85 +++++++++++++++++++
...terItems.h => ObsoleteFitParameterItems.h} | 32 +++----
...odel.cpp => ObsoleteFitParameterModel.cpp} | 58 ++++++-------
...terModel.h => ObsoleteFitParameterModel.h} | 14 +--
...Model.cpp => ObsoleteFitSelectorModel.cpp} | 16 ++--
...ctorModel.h => ObsoleteFitSelectorModel.h} | 11 +--
GUI/coregui/Models/item_constants.h | 12 +--
GUI/coregui/Views/FitWidgets/FitTools.cpp | 4 +-
GUI/coregui/Views/FitWidgets/FitTools.h | 4 +-
...get.cpp => ObsoleteFitParameterWidget.cpp} | 54 ++++++------
...rWidget.h => ObsoleteFitParameterWidget.h} | 20 ++---
...dget.cpp => ObsoleteFitProgressWidget.cpp} | 24 +++---
...ssWidget.h => ObsoleteFitProgressWidget.h} | 12 +--
.../FitWidgets/ObsoleteFitSettingsWidget.cpp | 4 +-
.../FitWidgets/ObsoleteFitSettingsWidget.h | 4 +-
.../FitWidgets/ObsoleteImportDataWidget.cpp | 2 +-
...pp => ObsoleteMinimizerSettingsWidget.cpp} | 10 +--
...et.h => ObsoleteMinimizerSettingsWidget.h} | 12 +--
...aWindow.cpp => ObsoleteRealDataWindow.cpp} | 10 +--
...lDataWindow.h => ObsoleteRealDataWindow.h} | 12 +--
.../Views/FitWidgets/ObsoleteRunFitWidget.cpp | 14 +--
.../Views/FitWidgets/ObsoleteRunFitWidget.h | 4 +-
GUI/coregui/Views/TestView.cpp | 2 +-
27 files changed, 288 insertions(+), 287 deletions(-)
delete mode 100644 GUI/coregui/Models/FitParameterItems.cpp
create mode 100644 GUI/coregui/Models/ObsoleteFitParameterItems.cpp
rename GUI/coregui/Models/{FitParameterItems.h => ObsoleteFitParameterItems.h} (54%)
rename GUI/coregui/Models/{FitParameterModel.cpp => ObsoleteFitParameterModel.cpp} (63%)
rename GUI/coregui/Models/{FitParameterModel.h => ObsoleteFitParameterModel.h} (82%)
rename GUI/coregui/Models/{FitSelectorModel.cpp => ObsoleteFitSelectorModel.cpp} (76%)
rename GUI/coregui/Models/{FitSelectorModel.h => ObsoleteFitSelectorModel.h} (77%)
rename GUI/coregui/Views/FitWidgets/{FitParameterWidget.cpp => ObsoleteFitParameterWidget.cpp} (87%)
rename GUI/coregui/Views/FitWidgets/{FitParameterWidget.h => ObsoleteFitParameterWidget.h} (78%)
rename GUI/coregui/Views/FitWidgets/{FitProgressWidget.cpp => ObsoleteFitProgressWidget.cpp} (85%)
rename GUI/coregui/Views/FitWidgets/{FitProgressWidget.h => ObsoleteFitProgressWidget.h} (83%)
rename GUI/coregui/Views/FitWidgets/{MinimizerSettingsWidget.cpp => ObsoleteMinimizerSettingsWidget.cpp} (73%)
rename GUI/coregui/Views/FitWidgets/{MinimizerSettingsWidget.h => ObsoleteMinimizerSettingsWidget.h} (64%)
rename GUI/coregui/Views/FitWidgets/{RealDataWindow.cpp => ObsoleteRealDataWindow.cpp} (74%)
rename GUI/coregui/Views/FitWidgets/{RealDataWindow.h => ObsoleteRealDataWindow.h} (73%)
diff --git a/GUI/coregui/Models/FitParameterItems.cpp b/GUI/coregui/Models/FitParameterItems.cpp
deleted file mode 100644
index 47fbbc8aa89..00000000000
--- a/GUI/coregui/Models/FitParameterItems.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// ************************************************************************** //
-//
-// BornAgain: simulate and fit scattering at grazing incidence
-//
-//! @file coregui/Models/FitParameterItems.cpp
-//! @brief Implements class FitParameterItems
-//!
-//! @homepage http://www.bornagainproject.org
-//! @license GNU General Public License v3 or higher (see COPYING)
-//! @copyright Forschungszentrum Jülich GmbH 2016
-//! @authors Scientific Computing Group at MLZ Garching
-//! @authors Céline Durniak, Marina Ganeva, David Li, Gennady Pospelov
-//! @authors Walter Van Herck, Joachim Wuttke
-//
-// ************************************************************************** //
-
-#include "FitParameterItems.h"
-#include "ComboProperty.h"
-
-FitParameterContainer::FitParameterContainer()
- : SessionItem(Constants::FitParameterContainerType)
-{
- const QString T_DATA = "Data tag";
- registerTag(T_DATA, 0, -1, QStringList() << Constants::FitParameterType);
- setDefaultTag(T_DATA);
-}
-
-
-const QString FitParameterItem::P_USE = "Use";
-const QString FitParameterItem::P_INIT = "Starting Value";
-const QString FitParameterItem::P_MIN = "Min";
-const QString FitParameterItem::P_MAX = "Max";
-
-FitParameterItem::FitParameterItem()
- : SessionItem(Constants::FitParameterType)
-{
- addProperty(P_USE, true);
- addProperty(P_INIT, 0.0);
- addProperty(P_MIN, 0.0);
- addProperty(P_MAX, 0.0);
- const QString T_LINK = "Link tag";
- registerTag(T_LINK, 0, -1, QStringList() << Constants::FitParameterLinkType);
- setDefaultTag(T_LINK);
-}
-
-
-
-const QString FitParameterLinkItem::P_LINK = "Link";
-
-FitParameterLinkItem::FitParameterLinkItem()
- : SessionItem(Constants::FitParameterLinkType)
-{
- addProperty(P_LINK, "");
-}
-
-
-const QString FitSelectionItem::P_SAMPLE = "Sample";
-const QString FitSelectionItem::P_INSTRUMENT = "Instrument";
-
-FitSelectionItem::FitSelectionItem()
- : SessionItem(Constants::FitSelectionType)
-{
- addProperty(P_SAMPLE, "");
- addProperty(P_INSTRUMENT, "");
-}
-
-const QString MinimizerSettingsItem::P_ALGO = "Algorithm";
-
-MinimizerSettingsItem::MinimizerSettingsItem()
- : SessionItem(Constants::MinimizerSettingsType)
-{
- ComboProperty algo;
- algo << "Migrad" << "Simplex" << "Combined" << "Scan" << "Fumili";
- addProperty(P_ALGO, algo.getVariant());
-}
-
-const QString InputDataItem::P_PATH = "Path";
-
-InputDataItem::InputDataItem()
- : SessionItem(Constants::InputDataType)
-{
- addProperty(P_PATH, "");
-}
-
-
diff --git a/GUI/coregui/Models/ItemFactory.cpp b/GUI/coregui/Models/ItemFactory.cpp
index 09a5d9ea306..76b6ab1a0e5 100644
--- a/GUI/coregui/Models/ItemFactory.cpp
+++ b/GUI/coregui/Models/ItemFactory.cpp
@@ -49,7 +49,7 @@
#include "BeamWavelengthItem.h"
#include "BeamAngleItems.h"
#include "MaskItems.h"
-#include "FitParameterItems.h"
+#include "ObsoleteFitParameterItems.h"
#include "ParameterTreeItems.h"
#include "SimulationOptionsItem.h"
#include <QDebug>
@@ -175,12 +175,12 @@ ItemFactory::ItemMap_t initializeItemMap() {
result[Constants::EllipseMaskType] = &createInstance<EllipseItem>;
result[Constants::MaskAllType] = &createInstance<MaskAllItem>;
- result[Constants::FitParameterContainerType] = &createInstance<FitParameterContainer>;
- result[Constants::FitParameterType] = &createInstance<FitParameterItem>;
- result[Constants::FitParameterLinkType] = &createInstance<FitParameterLinkItem>;
- result[Constants::FitSelectionType] = &createInstance<FitSelectionItem>;
- result[Constants::MinimizerSettingsType] = &createInstance<MinimizerSettingsItem>;
- result[Constants::InputDataType] = &createInstance<InputDataItem>;
+ result[Constants::ObsoleteFitParameterContainerType] = &createInstance<ObsoleteFitParameterContainer>;
+ result[Constants::ObsoleteFitParameterType] = &createInstance<ObsoleteFitParameterItem>;
+ result[Constants::ObsoleteFitParameterLinkType] = &createInstance<ObsoleteFitParameterLinkItem>;
+ result[Constants::ObsoleteFitSelectionType] = &createInstance<ObsoleteFitSelectionItem>;
+ result[Constants::ObsoleteMinimizerSettingsType] = &createInstance<ObsoleteMinimizerSettingsItem>;
+ result[Constants::ObsoleteInputDataType] = &createInstance<ObsoleteInputDataItem>;
result[Constants::GroupItemType] = &createInstance<GroupItem>;
result[Constants::ParameterLabelType] = &createInstance<ParameterLabelItem>;
result[Constants::ParameterType] = &createInstance<ParameterItem>;
diff --git a/GUI/coregui/Models/ObsoleteFitModel.cpp b/GUI/coregui/Models/ObsoleteFitModel.cpp
index d3c63776f0f..8d0bac9b94b 100644
--- a/GUI/coregui/Models/ObsoleteFitModel.cpp
+++ b/GUI/coregui/Models/ObsoleteFitModel.cpp
@@ -17,7 +17,7 @@
#include "ObsoleteFitModel.h"
#include "SampleModel.h"
#include "InstrumentModel.h"
-#include "FitParameterItems.h"
+#include "ObsoleteFitParameterItems.h"
#include "SessionItem.h"
#include "SessionModel.h"
#include "ComboProperty.h"
@@ -32,27 +32,27 @@ ObsoleteFitModel::ObsoleteFitModel(SampleModel *samples, InstrumentModel *instru
}
-FitParameterContainer *ObsoleteFitModel::getFitParameterContainer() {
- return dynamic_cast<FitParameterContainer *>
- (itemForIndex(QModelIndex())->getChildOfType(Constants::FitParameterContainerType));
+ObsoleteFitParameterContainer *ObsoleteFitModel::getFitParameterContainer() {
+ return dynamic_cast<ObsoleteFitParameterContainer *>
+ (itemForIndex(QModelIndex())->getChildOfType(Constants::ObsoleteFitParameterContainerType));
}
-FitSelectionItem *ObsoleteFitModel::getFitSelection() {
- return dynamic_cast<FitSelectionItem *>
- (itemForIndex(QModelIndex())->getChildOfType(Constants::FitSelectionType));
+ObsoleteFitSelectionItem *ObsoleteFitModel::getFitSelection() {
+ return dynamic_cast<ObsoleteFitSelectionItem *>
+ (itemForIndex(QModelIndex())->getChildOfType(Constants::ObsoleteFitSelectionType));
}
-InputDataItem *ObsoleteFitModel::getInputData() {
- return dynamic_cast<InputDataItem *>
- (itemForIndex(QModelIndex())->getChildOfType(Constants::InputDataType));
+ObsoleteInputDataItem *ObsoleteFitModel::getInputData() {
+ return dynamic_cast<ObsoleteInputDataItem *>
+ (itemForIndex(QModelIndex())->getChildOfType(Constants::ObsoleteInputDataType));
}
QString ObsoleteFitModel::getSelectedSampleName () {
- return getFitSelection()->getItemValue(FitSelectionItem::P_SAMPLE).toString();
+ return getFitSelection()->getItemValue(ObsoleteFitSelectionItem::P_SAMPLE).toString();
}
QString ObsoleteFitModel::getSelectedInstrumentName(){
- return getFitSelection()->getItemValue(FitSelectionItem::P_INSTRUMENT).toString();
+ return getFitSelection()->getItemValue(ObsoleteFitSelectionItem::P_INSTRUMENT).toString();
}
QStringList ObsoleteFitModel::getSampleNames() {
@@ -102,22 +102,22 @@ SessionItem *ObsoleteFitModel::getSelectedInstrumentItem() {
void ObsoleteFitModel::setSelectedSample(const QString &displayName) {
SessionItem *selection = getFitSelection();
- selection->setItemValue(FitSelectionItem::P_SAMPLE, displayName);
+ selection->setItemValue(ObsoleteFitSelectionItem::P_SAMPLE, displayName);
}
void ObsoleteFitModel::setSelectedInstrument(const QString &displayName) {
SessionItem *selection = getFitSelection();
- selection->setItemValue(FitSelectionItem::P_INSTRUMENT, displayName);
+ selection->setItemValue(ObsoleteFitSelectionItem::P_INSTRUMENT, displayName);
}
-MinimizerSettingsItem *ObsoleteFitModel::getMinimizerSettings() {
- return dynamic_cast<MinimizerSettingsItem *>
- (itemForIndex(QModelIndex())->getChildOfType(Constants::MinimizerSettingsType));
+ObsoleteMinimizerSettingsItem *ObsoleteFitModel::getMinimizerSettings() {
+ return dynamic_cast<ObsoleteMinimizerSettingsItem *>
+ (itemForIndex(QModelIndex())->getChildOfType(Constants::ObsoleteMinimizerSettingsType));
}
QString ObsoleteFitModel::getMinimizerAlgorithm() {
if (auto *item = getMinimizerSettings()) {
- return item->getItemValue(MinimizerSettingsItem::P_ALGO).value<ComboProperty>()
+ return item->getItemValue(ObsoleteMinimizerSettingsItem::P_ALGO).value<ComboProperty>()
.getValue();
}
return QString();
@@ -125,14 +125,14 @@ QString ObsoleteFitModel::getMinimizerAlgorithm() {
QString ObsoleteFitModel::getInputDataPath() {
if (auto *item = getInputData()) {
- return item->getItemValue(InputDataItem::P_PATH).toString();
+ return item->getItemValue(ObsoleteInputDataItem::P_PATH).toString();
}
return "";
}
void ObsoleteFitModel::setInputDataPath(const QString &path) {
if (auto *item = getInputData()) {
- item->setItemValue(InputDataItem::P_PATH, path);
+ item->setItemValue(ObsoleteInputDataItem::P_PATH, path);
}
}
diff --git a/GUI/coregui/Models/ObsoleteFitModel.h b/GUI/coregui/Models/ObsoleteFitModel.h
index 8c8d750179b..960b1457b4d 100644
--- a/GUI/coregui/Models/ObsoleteFitModel.h
+++ b/GUI/coregui/Models/ObsoleteFitModel.h
@@ -22,11 +22,11 @@
class QModelIndex;
class SampleModel;
class InstrumentModel;
-class FitParameterContainer;
-class FitSelectionItem;
+class ObsoleteFitParameterContainer;
+class ObsoleteFitSelectionItem;
class SessionModel;
-class MinimizerSettingsItem;
-class InputDataItem;
+class ObsoleteMinimizerSettingsItem;
+class ObsoleteInputDataItem;
class BA_CORE_API_ ObsoleteFitModel : public SessionModel
@@ -38,12 +38,12 @@ public:
explicit ObsoleteFitModel(SampleModel *samples, InstrumentModel *instruments, QObject *parent = 0);
//! returns child of type FitParameterContainer
- FitParameterContainer *getFitParameterContainer();
+ ObsoleteFitParameterContainer *getFitParameterContainer();
//! returns child fo type FitSelectionItem
- FitSelectionItem *getFitSelection();
+ ObsoleteFitSelectionItem *getFitSelection();
- InputDataItem *getInputData();
+ ObsoleteInputDataItem *getInputData();
//! returns displayName of currently selected sample, "" when nothing selected
QString getSelectedSampleName();
@@ -74,7 +74,7 @@ public:
QString getInstrumentItemNameForDisplayName(const QString &displayName);
//! return minimizer settings item
- MinimizerSettingsItem *getMinimizerSettings();
+ ObsoleteMinimizerSettingsItem *getMinimizerSettings();
QString getMinimizerAlgorithm();
diff --git a/GUI/coregui/Models/ObsoleteFitParameterItems.cpp b/GUI/coregui/Models/ObsoleteFitParameterItems.cpp
new file mode 100644
index 00000000000..2bd8b853ed0
--- /dev/null
+++ b/GUI/coregui/Models/ObsoleteFitParameterItems.cpp
@@ -0,0 +1,85 @@
+// ************************************************************************** //
+//
+// BornAgain: simulate and fit scattering at grazing incidence
+//
+//! @file coregui/Models/ObsoleteFitParameterItems.cpp
+//! @brief Implements class ObsoleteFitParameterItems
+//!
+//! @homepage http://www.bornagainproject.org
+//! @license GNU General Public License v3 or higher (see COPYING)
+//! @copyright Forschungszentrum Jülich GmbH 2016
+//! @authors Scientific Computing Group at MLZ Garching
+//! @authors Céline Durniak, Marina Ganeva, David Li, Gennady Pospelov
+//! @authors Walter Van Herck, Joachim Wuttke
+//
+// ************************************************************************** //
+
+#include "ObsoleteFitParameterItems.h"
+#include "ComboProperty.h"
+
+ObsoleteFitParameterContainer::ObsoleteFitParameterContainer()
+ : SessionItem(Constants::ObsoleteFitParameterContainerType)
+{
+ const QString T_DATA = "Data tag";
+ registerTag(T_DATA, 0, -1, QStringList() << Constants::ObsoleteFitParameterType);
+ setDefaultTag(T_DATA);
+}
+
+
+const QString ObsoleteFitParameterItem::P_USE = "Use";
+const QString ObsoleteFitParameterItem::P_INIT = "Starting Value";
+const QString ObsoleteFitParameterItem::P_MIN = "Min";
+const QString ObsoleteFitParameterItem::P_MAX = "Max";
+
+ObsoleteFitParameterItem::ObsoleteFitParameterItem()
+ : SessionItem(Constants::ObsoleteFitParameterType)
+{
+ addProperty(P_USE, true);
+ addProperty(P_INIT, 0.0);
+ addProperty(P_MIN, 0.0);
+ addProperty(P_MAX, 0.0);
+ const QString T_LINK = "Link tag";
+ registerTag(T_LINK, 0, -1, QStringList() << Constants::ObsoleteFitParameterLinkType);
+ setDefaultTag(T_LINK);
+}
+
+
+
+const QString ObsoleteFitParameterLinkItem::P_LINK = "Link";
+
+ObsoleteFitParameterLinkItem::ObsoleteFitParameterLinkItem()
+ : SessionItem(Constants::ObsoleteFitParameterLinkType)
+{
+ addProperty(P_LINK, "");
+}
+
+
+const QString ObsoleteFitSelectionItem::P_SAMPLE = "Sample";
+const QString ObsoleteFitSelectionItem::P_INSTRUMENT = "Instrument";
+
+ObsoleteFitSelectionItem::ObsoleteFitSelectionItem()
+ : SessionItem(Constants::ObsoleteFitSelectionType)
+{
+ addProperty(P_SAMPLE, "");
+ addProperty(P_INSTRUMENT, "");
+}
+
+const QString ObsoleteMinimizerSettingsItem::P_ALGO = "Algorithm";
+
+ObsoleteMinimizerSettingsItem::ObsoleteMinimizerSettingsItem()
+ : SessionItem(Constants::ObsoleteMinimizerSettingsType)
+{
+ ComboProperty algo;
+ algo << "Migrad" << "Simplex" << "Combined" << "Scan" << "Fumili";
+ addProperty(P_ALGO, algo.getVariant());
+}
+
+const QString ObsoleteInputDataItem::P_PATH = "Path";
+
+ObsoleteInputDataItem::ObsoleteInputDataItem()
+ : SessionItem(Constants::ObsoleteInputDataType)
+{
+ addProperty(P_PATH, "");
+}
+
+
diff --git a/GUI/coregui/Models/FitParameterItems.h b/GUI/coregui/Models/ObsoleteFitParameterItems.h
similarity index 54%
rename from GUI/coregui/Models/FitParameterItems.h
rename to GUI/coregui/Models/ObsoleteFitParameterItems.h
index f7a12075abf..15a8d1c72ed 100644
--- a/GUI/coregui/Models/FitParameterItems.h
+++ b/GUI/coregui/Models/ObsoleteFitParameterItems.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Models/FitParameterItems.h
-//! @brief Declares class FitParameterItems
+//! @file coregui/Models/ObsoleteFitParameterItems.h
+//! @brief Declares class ObsoleteFitParameterItems
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -13,19 +13,19 @@
//! @authors Walter Van Herck, Joachim Wuttke
//
// ************************************************************************** //
-#ifndef FITPARAMETERITEMS_H
-#define FITPARAMETERITEMS_H
+#ifndef OBSOLETEFITPARAMETERITEMS_H
+#define OBSOLETEFITPARAMETERITEMS_H
#include "SessionItem.h"
-class BA_CORE_API_ FitParameterContainer : public SessionItem
+class BA_CORE_API_ ObsoleteFitParameterContainer : public SessionItem
{
public:
- explicit FitParameterContainer();
+ explicit ObsoleteFitParameterContainer();
};
-class BA_CORE_API_ FitParameterItem : public SessionItem
+class BA_CORE_API_ ObsoleteFitParameterItem : public SessionItem
{
public:
@@ -33,42 +33,42 @@ public:
static const QString P_INIT;
static const QString P_MIN;
static const QString P_MAX;
- explicit FitParameterItem();
+ explicit ObsoleteFitParameterItem();
};
-class BA_CORE_API_ FitParameterLinkItem : public SessionItem
+class BA_CORE_API_ ObsoleteFitParameterLinkItem : public SessionItem
{
public:
static const QString P_LINK;
- explicit FitParameterLinkItem();
+ explicit ObsoleteFitParameterLinkItem();
};
-class BA_CORE_API_ FitSelectionItem : public SessionItem
+class BA_CORE_API_ ObsoleteFitSelectionItem : public SessionItem
{
public:
static const QString P_SAMPLE;
static const QString P_INSTRUMENT;
- explicit FitSelectionItem();
+ explicit ObsoleteFitSelectionItem();
};
-class BA_CORE_API_ MinimizerSettingsItem : public SessionItem
+class BA_CORE_API_ ObsoleteMinimizerSettingsItem : public SessionItem
{
public:
static const QString P_ALGO;
- explicit MinimizerSettingsItem();
+ explicit ObsoleteMinimizerSettingsItem();
};
-class BA_CORE_API_ InputDataItem : public SessionItem
+class BA_CORE_API_ ObsoleteInputDataItem : public SessionItem
{
public:
static const QString P_PATH;
- explicit InputDataItem();
+ explicit ObsoleteInputDataItem();
};
#endif
diff --git a/GUI/coregui/Models/FitParameterModel.cpp b/GUI/coregui/Models/ObsoleteFitParameterModel.cpp
similarity index 63%
rename from GUI/coregui/Models/FitParameterModel.cpp
rename to GUI/coregui/Models/ObsoleteFitParameterModel.cpp
index 6fadf01069e..5efdaedfa8d 100644
--- a/GUI/coregui/Models/FitParameterModel.cpp
+++ b/GUI/coregui/Models/ObsoleteFitParameterModel.cpp
@@ -14,48 +14,48 @@
//
// ************************************************************************** //
-#include "FitParameterModel.h"
+#include "ObsoleteFitParameterModel.h"
#include "SessionModel.h"
#include "ObsoleteFitModel.h"
-#include "FitParameterItems.h"
-#include "FitParameterWidget.h"
+#include "ObsoleteFitParameterItems.h"
+#include "ObsoleteFitParameterWidget.h"
#include <QMimeData>
-FitParameterModel::FitParameterModel(ObsoleteFitModel *fitmodel, QWidget *parent)
+ObsoleteFitParameterModel::ObsoleteFitParameterModel(ObsoleteFitModel *fitmodel, QWidget *parent)
: SessionModel("FitParameterModel", parent)
, m_columnNames(new QMap<int, QString>())
{
setRootItem(fitmodel->itemForIndex(QModelIndex())->
- getChildOfType(Constants::FitParameterContainerType));
+ getChildOfType(Constants::ObsoleteFitParameterContainerType));
m_columnNames->insert(0, "FitParameterItem::OBSOLETE_P_NAME");
- m_columnNames->insert(1, FitParameterItem::P_USE);
- m_columnNames->insert(3, FitParameterItem::P_MIN);
- m_columnNames->insert(2, FitParameterItem::P_INIT);
- m_columnNames->insert(4, FitParameterItem::P_MAX);
+ m_columnNames->insert(1, ObsoleteFitParameterItem::P_USE);
+ m_columnNames->insert(3, ObsoleteFitParameterItem::P_MIN);
+ m_columnNames->insert(2, ObsoleteFitParameterItem::P_INIT);
+ m_columnNames->insert(4, ObsoleteFitParameterItem::P_MAX);
}
-FitParameterModel::~FitParameterModel()
+ObsoleteFitParameterModel::~ObsoleteFitParameterModel()
{
setRootItem(0);
delete m_columnNames;
}
-SessionItem *FitParameterModel::addParameter()
+SessionItem *ObsoleteFitParameterModel::addParameter()
{
- return insertNewItem(Constants::FitParameterType, indexOfItem(itemForIndex(QModelIndex())));
+ return insertNewItem(Constants::ObsoleteFitParameterType, indexOfItem(itemForIndex(QModelIndex())));
}
-QModelIndex FitParameterModel::itemForLink(const QString &link) const
+QModelIndex ObsoleteFitParameterModel::itemForLink(const QString &link) const
{
for (int i=0; i<rowCount(QModelIndex()); i++){
int rowcount = rowCount(index(i,0,QModelIndex()));
for (int j = 0; j < rowcount; j++) {
QModelIndex curIndex = index(j,0,index(i,0,QModelIndex()));
QString value = itemForIndex(curIndex)
- ->getItemValue(FitParameterLinkItem::P_LINK).toString();
+ ->getItemValue(ObsoleteFitParameterLinkItem::P_LINK).toString();
if (value == link)
return curIndex;
}
@@ -63,7 +63,7 @@ QModelIndex FitParameterModel::itemForLink(const QString &link) const
return QModelIndex();
}
-Qt::ItemFlags FitParameterModel::flags(const QModelIndex & index) const
+Qt::ItemFlags ObsoleteFitParameterModel::flags(const QModelIndex & index) const
{
Qt::ItemFlags returnVal = Qt::ItemIsEnabled | Qt::ItemIsSelectable;
if (index.isValid() && index.parent() == QModelIndex()) {
@@ -77,14 +77,14 @@ Qt::ItemFlags FitParameterModel::flags(const QModelIndex & index) const
return returnVal;
}
-QStringList FitParameterModel::mimeTypes() const
+QStringList ObsoleteFitParameterModel::mimeTypes() const
{
QStringList types;
- types << FitParameterWidget::MIME_TYPE;
+ types << ObsoleteFitParameterWidget::MIME_TYPE;
return types;
}
-bool FitParameterModel::canDropMimeData(const QMimeData *data, Qt::DropAction action,
+bool ObsoleteFitParameterModel::canDropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent) const
{
Q_UNUSED(action);
@@ -92,38 +92,38 @@ bool FitParameterModel::canDropMimeData(const QMimeData *data, Qt::DropAction ac
Q_UNUSED(parent);
if (column > 0)
return false;
- QString link = QString::fromLatin1(data->data(FitParameterWidget::MIME_TYPE)).split("#")[0];
+ QString link = QString::fromLatin1(data->data(ObsoleteFitParameterWidget::MIME_TYPE)).split("#")[0];
QModelIndex cur = itemForLink(link);
return !cur.isValid();
}
-Qt::DropActions FitParameterModel::supportedDropActions() const
+Qt::DropActions ObsoleteFitParameterModel::supportedDropActions() const
{
return Qt::CopyAction | Qt::MoveAction;
}
-bool FitParameterModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row,
+bool ObsoleteFitParameterModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row,
int column, const QModelIndex &parent)
{
if (action == Qt::IgnoreAction) return true;
if (column > 0) return true;
- QStringList parts = QString::fromLatin1(data->data(FitParameterWidget::MIME_TYPE))
+ QStringList parts = QString::fromLatin1(data->data(ObsoleteFitParameterWidget::MIME_TYPE))
.split("#");
if (parts.size() != 2) return true;
QModelIndex cur = parent;
if (!parent.isValid()) {
auto newlink = addParameter();
double value = parts[1].toDouble();
- newlink->setItemValue(FitParameterItem::P_INIT, value);
+ newlink->setItemValue(ObsoleteFitParameterItem::P_INIT, value);
cur = indexOfItem(newlink);
}
- auto link = insertNewItem(Constants::FitParameterLinkType, cur, row);
- if (link) link->setItemValue(FitParameterLinkItem::P_LINK, parts[0]);
+ auto link = insertNewItem(Constants::ObsoleteFitParameterLinkType, cur, row);
+ if (link) link->setItemValue(ObsoleteFitParameterLinkItem::P_LINK, parts[0]);
emit dataChanged(cur, cur);
return true;
}
-QVariant FitParameterModel::data(const QModelIndex & index, int role) const
+QVariant ObsoleteFitParameterModel::data(const QModelIndex & index, int role) const
{
if ( !index.isValid() || index.column() < 0 || index.column() >= 5) {
return QVariant();
@@ -133,7 +133,7 @@ QVariant FitParameterModel::data(const QModelIndex & index, int role) const
if (item->parent() != itemForIndex(QModelIndex()))
{
if (index.column() == 0)
- return item->getItemValue(FitParameterLinkItem::P_LINK);
+ return item->getItemValue(ObsoleteFitParameterLinkItem::P_LINK);
else
return QVariant();
}
@@ -146,7 +146,7 @@ QVariant FitParameterModel::data(const QModelIndex & index, int role) const
return QVariant();
}
-bool FitParameterModel::setData(const QModelIndex &index, const QVariant &value, int role)
+bool ObsoleteFitParameterModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if (!index.isValid())
return false;
@@ -160,7 +160,7 @@ bool FitParameterModel::setData(const QModelIndex &index, const QVariant &value,
return false;
}
-QVariant FitParameterModel::headerData(int section, Qt::Orientation orientation, int role) const
+QVariant ObsoleteFitParameterModel::headerData(int section, Qt::Orientation orientation, int role) const
{
if (role == Qt::DisplayRole && orientation == Qt::Horizontal) {
return m_columnNames->value(section);
diff --git a/GUI/coregui/Models/FitParameterModel.h b/GUI/coregui/Models/ObsoleteFitParameterModel.h
similarity index 82%
rename from GUI/coregui/Models/FitParameterModel.h
rename to GUI/coregui/Models/ObsoleteFitParameterModel.h
index 3eede73ef66..a2b0ca2989e 100644
--- a/GUI/coregui/Models/FitParameterModel.h
+++ b/GUI/coregui/Models/ObsoleteFitParameterModel.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Models/FitParameterModel.h
-//! @brief Declares class FitParameterModel
+//! @file coregui/Models/ObsoleteFitParameterModel.h
+//! @brief Declares class ObsoleteFitParameterModel
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#ifndef FITPARAMETERMODEL_H
-#define FITPARAMETERMODEL_H
+#ifndef OBSOLETEFITPARAMETERMODEL_H
+#define OBSOLETEFITPARAMETERMODEL_H
#include "WinDllMacros.h"
#include "SessionModel.h"
@@ -26,13 +26,13 @@ class QModelIndex;
class QParameterizedItem;
-class BA_CORE_API_ FitParameterModel : public SessionModel
+class BA_CORE_API_ ObsoleteFitParameterModel : public SessionModel
{
Q_OBJECT
public:
- explicit FitParameterModel(ObsoleteFitModel *fitmodel, QWidget *parent);
- ~FitParameterModel();
+ explicit ObsoleteFitParameterModel(ObsoleteFitModel *fitmodel, QWidget *parent);
+ ~ObsoleteFitParameterModel();
QModelIndex itemForLink(const QString &link) const;
Qt::ItemFlags flags(const QModelIndex & index) const Q_DECL_OVERRIDE;
diff --git a/GUI/coregui/Models/FitSelectorModel.cpp b/GUI/coregui/Models/ObsoleteFitSelectorModel.cpp
similarity index 76%
rename from GUI/coregui/Models/FitSelectorModel.cpp
rename to GUI/coregui/Models/ObsoleteFitSelectorModel.cpp
index 2830261aeb9..c4914ea0738 100644
--- a/GUI/coregui/Models/FitSelectorModel.cpp
+++ b/GUI/coregui/Models/ObsoleteFitSelectorModel.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Models/FitSelectorModel.cpp
-//! @brief Implements class FitSelectorModel
+//! @file coregui/Models/ObsoleteFitSelectorModel.cpp
+//! @brief Implements class ObsoleteFitSelectorModel
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
-#include "FitSelectorModel.h"
-#include "FitParameterWidget.h"
+#include "ObsoleteFitSelectorModel.h"
+#include "ObsoleteFitParameterWidget.h"
#include <QStandardItem>
#include <QMimeData>
#include <QModelIndexList>
-QMimeData *FitSelectorModel::mimeData(const QModelIndexList &indexes) const
+QMimeData *ObsoleteFitSelectorModel::mimeData(const QModelIndexList &indexes) const
{
QMimeData *mimeData = new QMimeData();
QModelIndex index = indexes.first();
@@ -28,12 +28,12 @@ QMimeData *FitSelectorModel::mimeData(const QModelIndexList &indexes) const
QString path = getPathFromIndex(index);
path = path.append("#%1").arg(itemFromIndex(index.sibling(index.row(), 1))
->data(Qt::EditRole).toDouble());
- mimeData->setData(FitParameterWidget::MIME_TYPE, path.toLatin1());
+ mimeData->setData(ObsoleteFitParameterWidget::MIME_TYPE, path.toLatin1());
}
return mimeData;
}
-QString FitSelectorModel::getPathFromIndex(const QModelIndex &index) const
+QString ObsoleteFitSelectorModel::getPathFromIndex(const QModelIndex &index) const
{
if (index.isValid()) {
QStringList namePath;
@@ -48,7 +48,7 @@ QString FitSelectorModel::getPathFromIndex(const QModelIndex &index) const
return QString();
}
-QStandardItem *FitSelectorModel::getItemFromPath(const QString &path)
+QStandardItem *ObsoleteFitSelectorModel::getItemFromPath(const QString &path)
{
QStringList parts = path.split("/");
QStandardItem *t = invisibleRootItem();
diff --git a/GUI/coregui/Models/FitSelectorModel.h b/GUI/coregui/Models/ObsoleteFitSelectorModel.h
similarity index 77%
rename from GUI/coregui/Models/FitSelectorModel.h
rename to GUI/coregui/Models/ObsoleteFitSelectorModel.h
index 1eb0aafcf49..c775941b448 100644
--- a/GUI/coregui/Models/FitSelectorModel.h
+++ b/GUI/coregui/Models/ObsoleteFitSelectorModel.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Models/FitSelectorModel.h
-//! @brief Declares class FitSelectorModel
+//! @file coregui/Models/ObsoleteFitSelectorModel.h
+//! @brief Declares class ObsoleteFitSelectorModel
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -13,8 +13,9 @@
//! @authors Walter Van Herck, Joachim Wuttke
//
// ************************************************************************** //
-#ifndef FITSELECTORMODEL_H
-#define FITSELECTORMODEL_H
+
+#ifndef OBSOLETEFITSELECTORMODEL_H
+#define OBSOLETEFITSELECTORMODEL_H
#include "WinDllMacros.h"
#include <QStandardItemModel>
@@ -22,7 +23,7 @@
class QMimeData;
class QStandardItem;
-class BA_CORE_API_ FitSelectorModel : public QStandardItemModel
+class BA_CORE_API_ ObsoleteFitSelectorModel : public QStandardItemModel
{
Q_OBJECT
diff --git a/GUI/coregui/Models/item_constants.h b/GUI/coregui/Models/item_constants.h
index f99d3ddb927..a14ed167bb3 100644
--- a/GUI/coregui/Models/item_constants.h
+++ b/GUI/coregui/Models/item_constants.h
@@ -120,12 +120,12 @@ const ModelType RefractiveIndexType = "RefractiveIndex";
const ModelType MagneticFieldType = "MagneticField";
-const ModelType FitParameterContainerType = "FitParameterContainer";
-const ModelType FitParameterType = "FitParameter";
-const ModelType FitParameterLinkType = "FitParameterLink";
-const ModelType FitSelectionType = "FitSelection";
-const ModelType MinimizerSettingsType = "Minimizer Settings";
-const ModelType InputDataType = "Input Data";
+const ModelType ObsoleteFitParameterContainerType = "ObsoleteFitParameterContainer";
+const ModelType ObsoleteFitParameterType = "ObsoleteFitParameter";
+const ModelType ObsoleteFitParameterLinkType = "ObsoleteFitParameterLink";
+const ModelType ObsoleteFitSelectionType = "ObsoleteFitSelection";
+const ModelType ObsoleteMinimizerSettingsType = "ObsoleteMinimizer Settings";
+const ModelType ObsoleteInputDataType = "Obsolete Input Data";
const ModelType ParameterType = "Parameter";
const ModelType ParameterLabelType = "Parameter Label";
diff --git a/GUI/coregui/Views/FitWidgets/FitTools.cpp b/GUI/coregui/Views/FitWidgets/FitTools.cpp
index 22e3e32709a..ed8c36759ff 100644
--- a/GUI/coregui/Views/FitWidgets/FitTools.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitTools.cpp
@@ -29,7 +29,7 @@
#include "MultiLayerItem.h"
#include "ParameterTreeItems.h"
#include "SessionItem.h"
-#include "RealDataWindow.h"
+#include "ObsoleteRealDataWindow.h"
#include "FitTools.h"
@@ -56,7 +56,7 @@ FitTools::FitTools(JobModel *jobModel, QWidget *parent)
, m_realData(new QPushButton)
, m_manager(new RunFitManager(parent))
, m_observer(0)
- , m_realDataWindow(new RealDataWindow(this))
+ , m_realDataWindow(new ObsoleteRealDataWindow(this))
{
m_observer = std::shared_ptr<GUIFitObserver>(new GUIFitObserver());
this->hide();
diff --git a/GUI/coregui/Views/FitWidgets/FitTools.h b/GUI/coregui/Views/FitWidgets/FitTools.h
index f53bc114b6a..92947129a3b 100644
--- a/GUI/coregui/Views/FitWidgets/FitTools.h
+++ b/GUI/coregui/Views/FitWidgets/FitTools.h
@@ -29,7 +29,7 @@ class QPushButton;
class RunFitManager;
class GUIFitObserver;
class QSlider;
-class RealDataWindow;
+class ObsoleteRealDataWindow;
class FitTools : public QWidget
{
@@ -60,7 +60,7 @@ private:
QPushButton *m_realData;
RunFitManager *m_manager;
std::shared_ptr<GUIFitObserver> m_observer;
- RealDataWindow *m_realDataWindow;
+ ObsoleteRealDataWindow *m_realDataWindow;
};
#endif
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.cpp
similarity index 87%
rename from GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
rename to GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.cpp
index 7345eaff204..00786e2d35b 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Views/FitWidgets/FitParameterWidget.cpp
-//! @brief Implements class FitParameterWidget
+//! @file coregui/Views/FitWidgets/ObsoleteFitParameterWidget.cpp
+//! @brief Implements class ObsoleteFitParameterWidget
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
-#include "FitParameterWidget.h"
+#include "ObsoleteFitParameterWidget.h"
#include "ObsoleteFitModel.h"
-#include "FitParameterItems.h"
-#include "FitParameterModel.h"
-#include "FitSelectorModel.h"
+#include "ObsoleteFitParameterItems.h"
+#include "ObsoleteFitParameterModel.h"
+#include "ObsoleteFitSelectorModel.h"
#include "DeleteEventFilter.h"
-#include "MinimizerSettingsWidget.h"
+#include "ObsoleteMinimizerSettingsWidget.h"
#include "minisplitter.h"
#include "ModelPath.h"
#include <QVBoxLayout>
@@ -38,9 +38,9 @@
#include <QMimeData>
#include <QDragEnterEvent>
-const QString FitParameterWidget::MIME_TYPE = "application/org.bornagainproject.fittinglink";
+const QString ObsoleteFitParameterWidget::MIME_TYPE = "application/org.bornagainproject.fittinglink";
-FitParameterWidget::FitParameterWidget(ObsoleteFitModel *fitModel, QWidget *parent)
+ObsoleteFitParameterWidget::ObsoleteFitParameterWidget(ObsoleteFitModel *fitModel, QWidget *parent)
: QWidget(parent)
, m_fitModel(fitModel)
, m_selectorTreeView(new QTreeView())
@@ -52,7 +52,7 @@ FitParameterWidget::FitParameterWidget(ObsoleteFitModel *fitModel, QWidget *pare
, m_keyboardFilter(new DeleteEventFilter(this))
{
- m_parameterModel = new FitParameterModel(m_fitModel, this);
+ m_parameterModel = new ObsoleteFitParameterModel(m_fitModel, this);
QString style(
"QTreeView::branch {background: palette(base);}QTreeView::branch:has-siblings:!adjoins-item "
@@ -126,9 +126,9 @@ FitParameterWidget::FitParameterWidget(ObsoleteFitModel *fitModel, QWidget *pare
}
-void FitParameterWidget::updateSelector()
+void ObsoleteFitParameterWidget::updateSelector()
{
- m_parameterModel = new FitParameterModel(m_fitModel, this);
+ m_parameterModel = new ObsoleteFitParameterModel(m_fitModel, this);
m_parameterTreeview->setModel(m_parameterModel);
connect(m_parameterModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)),
m_fitModel, SLOT(dataChangedProxy(QModelIndex,QModelIndex,QVector<int>)));
@@ -147,13 +147,13 @@ void FitParameterWidget::updateSelector()
connectSelectorView();
}
-void FitParameterWidget::clearParameter() {
+void ObsoleteFitParameterWidget::clearParameter() {
while (m_parameterModel->rowCount(QModelIndex())) {
m_parameterModel->removeRow(0, QModelIndex());
}
}
-void FitParameterWidget::buildTree(QStandardItem *root, SessionItem *top)
+void ObsoleteFitParameterWidget::buildTree(QStandardItem *root, SessionItem *top)
{
QStringList parameterTree = ModelPath::getParameterTreeList(top);
@@ -190,9 +190,9 @@ void FitParameterWidget::buildTree(QStandardItem *root, SessionItem *top)
}
}
-void FitParameterWidget::buildSelectorModel() {
+void ObsoleteFitParameterWidget::buildSelectorModel() {
- m_selectorModel = new FitSelectorModel();
+ m_selectorModel = new ObsoleteFitSelectorModel();
m_selectorModel->setHorizontalHeaderItem(0, new QStandardItem("Property"));
m_selectorModel->setHorizontalHeaderItem(1, new QStandardItem("Value"));
QStandardItem *root = m_selectorModel->invisibleRootItem();
@@ -210,7 +210,7 @@ void FitParameterWidget::buildSelectorModel() {
}
}
-void FitParameterWidget::spanParameters()
+void ObsoleteFitParameterWidget::spanParameters()
{
m_parameterTreeview->expandAll();
for (int i = 0; i < m_parameterModel->rowCount(QModelIndex()); i++){
@@ -226,7 +226,7 @@ void FitParameterWidget::spanParameters()
}
}
-void FitParameterWidget::onCustomContextMenu(const QPoint &point) {
+void ObsoleteFitParameterWidget::onCustomContextMenu(const QPoint &point) {
m_removeAction->setEnabled(false);
QModelIndex index = m_parameterTreeview->indexAt(point);
if (index.isValid()) {
@@ -239,14 +239,14 @@ void FitParameterWidget::onCustomContextMenu(const QPoint &point) {
m_contextMenu->exec(m_parameterTreeview->mapToGlobal(point + QPoint(2, 22)));
}
-void FitParameterWidget::onRemoveParameter() {
+void ObsoleteFitParameterWidget::onRemoveParameter() {
QModelIndex index = m_parameterTreeview->currentIndex();
if (index.isValid()) {
m_parameterModel->removeRow(index.row(), index.parent());
}
}
-void FitParameterWidget::onParameterSelectionChanged(const QItemSelection &selection)
+void ObsoleteFitParameterWidget::onParameterSelectionChanged(const QItemSelection &selection)
{
if (selection.indexes().isEmpty())
return;
@@ -254,7 +254,7 @@ void FitParameterWidget::onParameterSelectionChanged(const QItemSelection &selec
QModelIndex newSelection = QModelIndex();
if (index.isValid() && index.parent().isValid()) {
SessionItem *val = m_fitModel->itemForIndex(index);
- QString link = val->getItemValue(FitParameterLinkItem::P_LINK).toString();
+ QString link = val->getItemValue(ObsoleteFitParameterLinkItem::P_LINK).toString();
QStandardItem *t = m_selectorModel->getItemFromPath(link);
newSelection = m_selectorModel->indexFromItem(t);
}
@@ -269,7 +269,7 @@ void FitParameterWidget::onParameterSelectionChanged(const QItemSelection &selec
connectSelectorView();
}
-void FitParameterWidget::onSelectorSelectionChanged(const QItemSelection &selection)
+void ObsoleteFitParameterWidget::onSelectorSelectionChanged(const QItemSelection &selection)
{
if (selection.indexes().isEmpty())
return;
@@ -286,7 +286,7 @@ void FitParameterWidget::onSelectorSelectionChanged(const QItemSelection &select
connectParameterView();
}
-void FitParameterWidget::connectSelectorView(bool active) {
+void ObsoleteFitParameterWidget::connectSelectorView(bool active) {
if (active) {
connect(m_selectorTreeView->selectionModel(),
SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
@@ -298,7 +298,7 @@ void FitParameterWidget::connectSelectorView(bool active) {
}
}
-void FitParameterWidget::connectParameterView(bool active) {
+void ObsoleteFitParameterWidget::connectParameterView(bool active) {
if (active) {
connect(m_parameterTreeview->selectionModel(),
SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
@@ -310,7 +310,7 @@ void FitParameterWidget::connectParameterView(bool active) {
}
}
-void FitParameterWidget::removeEmptyParameter() {
+void ObsoleteFitParameterWidget::removeEmptyParameter() {
bool finished = false;
while (!finished) {
int rowCount = m_parameterModel->rowCount(QModelIndex());
@@ -329,7 +329,7 @@ void FitParameterWidget::removeEmptyParameter() {
}
}
-void FitParameterWidget::removeSelectedItem() {
+void ObsoleteFitParameterWidget::removeSelectedItem() {
QModelIndex selection = m_parameterTreeview->currentIndex();
if (selection.isValid()) {
m_parameterModel->removeRow(selection.row(), selection.parent());
@@ -337,7 +337,7 @@ void FitParameterWidget::removeSelectedItem() {
removeEmptyParameter();
}
-void FitParameterWidget::onDoubleclick(const QModelIndex index) {
+void ObsoleteFitParameterWidget::onDoubleclick(const QModelIndex index) {
QModelIndex entryIndex = index.sibling(index.row(), 0);
if (m_selectorModel->itemFromIndex(entryIndex)->isDragEnabled()) {
QMimeData *data = m_selectorModel->mimeData(QModelIndexList() << entryIndex);
diff --git a/GUI/coregui/Views/FitWidgets/FitParameterWidget.h b/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.h
similarity index 78%
rename from GUI/coregui/Views/FitWidgets/FitParameterWidget.h
rename to GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.h
index ea23a05db11..b11b7d8b9dd 100644
--- a/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitParameterWidget.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Views/FitWidgets/FitParameterWidget.h
-//! @brief Declares class FitParameterWidget
+//! @file coregui/Views/FitWidgets/ObsoleteFitParameterWidget.h
+//! @brief Declares class ObsoleteFitParameterWidget
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#ifndef FITPARAMETERWIDGET_H
-#define FITPARAMETERWIDGET_H
+#ifndef OBSOLETEFITPARAMETERWIDGET_H
+#define OBSOLETEFITPARAMETERWIDGET_H
#include "WinDllMacros.h"
#include "SessionModel.h"
@@ -25,24 +25,24 @@
class QTreeView;
class MainWindow;
-class FitSelectorModel;
+class ObsoleteFitSelectorModel;
class QMenu;
class SampleModel;
class InstrumentModel;
class ObsoleteFitModel;
class SessionItem;
-class FitParameterModel;
+class ObsoleteFitParameterModel;
class QItemSelection;
class QSplitter;
class DeleteEventFilter;
-class BA_CORE_API_ FitParameterWidget : public QWidget
+class BA_CORE_API_ ObsoleteFitParameterWidget : public QWidget
{
Q_OBJECT
public:
static const QString MIME_TYPE;
- FitParameterWidget(ObsoleteFitModel *fitModel, QWidget *parent = 0);
+ ObsoleteFitParameterWidget(ObsoleteFitModel *fitModel, QWidget *parent = 0);
void clearParameter();
public slots:
@@ -68,8 +68,8 @@ private:
ObsoleteFitModel *m_fitModel;
QTreeView *m_selectorTreeView;
QTreeView *m_parameterTreeview;
- FitSelectorModel *m_selectorModel;
- FitParameterModel *m_parameterModel;
+ ObsoleteFitSelectorModel *m_selectorModel;
+ ObsoleteFitParameterModel *m_parameterModel;
QMenu *m_contextMenu;
QAction *m_removeAction;
QAction *m_addAction;
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.cpp
similarity index 85%
rename from GUI/coregui/Views/FitWidgets/FitProgressWidget.cpp
rename to GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.cpp
index f91955cdaa8..006215f32e6 100644
--- a/GUI/coregui/Views/FitWidgets/FitProgressWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Views/FitWidgets/FitProgressWidget.h
-//! @brief Defines class FitProgressWidget
+//! @file coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h
+//! @brief Defines class ObsoleteFitProgressWidget
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,7 +14,7 @@
//
// ************************************************************************** //
-#include "FitProgressWidget.h"
+#include "ObsoleteFitProgressWidget.h"
#include "ColorMapPlot.h"
#include "IntensityDataItem.h"
#include "GUIFitObserver.h"
@@ -29,7 +29,7 @@
#include <QFont>
#include <QSlider>
-FitProgressWidget::FitProgressWidget(QWidget *parent)
+ObsoleteFitProgressWidget::ObsoleteFitProgressWidget(QWidget *parent)
: QWidget(parent)
, m_status(new QLabel(this))
, m_realdataplot(new ColorMapPlot(this))
@@ -84,7 +84,7 @@ FitProgressWidget::FitProgressWidget(QWidget *parent)
setLayout(layout);
}
-void FitProgressWidget::startFitting(OutputData<double> *real)
+void ObsoleteFitProgressWidget::startFitting(OutputData<double> *real)
{
m_realdata->setOutputData(real);
m_simulated->setOutputData(real->clone());
@@ -93,23 +93,23 @@ void FitProgressWidget::startFitting(OutputData<double> *real)
m_log->clear();
}
-void FitProgressWidget::connectSlider(QSlider *slider)
+void ObsoleteFitProgressWidget::connectSlider(QSlider *slider)
{
connect(slider, SIGNAL(valueChanged(int)),
m_guifitobserver.get(), SLOT(setInterval(int)));
}
-void FitProgressWidget::setObserverToSuite(FitSuite *suite)
+void ObsoleteFitProgressWidget::setObserverToSuite(FitSuite *suite)
{
suite->attachObserver(m_guifitobserver);
}
-void FitProgressWidget::updateStatus(const QString &text)
+void ObsoleteFitProgressWidget::updateStatus(const QString &text)
{
m_status->setText(text);
}
-void FitProgressWidget::updateLog(const QString &msg)
+void ObsoleteFitProgressWidget::updateLog(const QString &msg)
{
QScrollBar *scrollbar = m_log->verticalScrollBar();
bool autoscroll = scrollbar->value() == scrollbar->maximum();
@@ -121,7 +121,7 @@ void FitProgressWidget::updateLog(const QString &msg)
}
}
-void FitProgressWidget::updatePlots(OutputData<double> *sim, OutputData<double> *chi)
+void ObsoleteFitProgressWidget::updatePlots(OutputData<double> *sim, OutputData<double> *chi)
{
m_simulated->setOutputData(sim);
m_simulated->setLowerAndUpperZ(m_realdata->getLowerZ(), m_realdata->getUpperZ());
@@ -129,12 +129,12 @@ void FitProgressWidget::updatePlots(OutputData<double> *sim, OutputData<double>
disableInteractions();
}
-void FitProgressWidget::afterReplot()
+void ObsoleteFitProgressWidget::afterReplot()
{
m_guifitobserver->finishedPlotting();
}
-void FitProgressWidget::disableInteractions()
+void ObsoleteFitProgressWidget::disableInteractions()
{
// as ColorMapPlot enables Interactions every time, we must disenable them as well
m_realdataplot->getCustomPlot()->setInteraction(QCP::iRangeDrag, false);
diff --git a/GUI/coregui/Views/FitWidgets/FitProgressWidget.h b/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h
similarity index 83%
rename from GUI/coregui/Views/FitWidgets/FitProgressWidget.h
rename to GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h
index 41c6d5c3375..782880e36e6 100644
--- a/GUI/coregui/Views/FitWidgets/FitProgressWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Views/FitWidgets/FitProgressWidget.h
-//! @brief Declares class FitProgressWidget
+//! @file coregui/Views/FitWidgets/ObsoleteFitProgressWidget.h
+//! @brief Declares class ObsoleteFitProgressWidget
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#ifndef FITPROGRESSWIDGET_H
-#define FITPROGRESSWIDGET_H
+#ifndef OBSOLETEFITPROGRESSWIDGET_H
+#define OBSOLETEFITPROGRESSWIDGET_H
#include "WinDllMacros.h"
#include "OutputData.h"
@@ -31,13 +31,13 @@ class GUIFitObserver;
class QSlider;
class FitSuite;
-class BA_CORE_API_ FitProgressWidget : public QWidget
+class BA_CORE_API_ ObsoleteFitProgressWidget : public QWidget
{
Q_OBJECT
public:
- FitProgressWidget(QWidget *parent = 0);
+ ObsoleteFitProgressWidget(QWidget *parent = 0);
void connectSlider(QSlider *slider);
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.cpp
index e76f515d981..f95abde2b4d 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.cpp
@@ -15,7 +15,7 @@
// ************************************************************************** //
#include "ObsoleteFitSettingsWidget.h"
-#include "FitParameterWidget.h"
+#include "ObsoleteFitParameterWidget.h"
#include "ObsoleteFitModel.h"
#include <QVBoxLayout>
@@ -27,7 +27,7 @@
ObsoleteFitSettingsWidget::ObsoleteFitSettingsWidget(ObsoleteFitModel *fitModel, QWidget *parent)
: QWidget(parent)
, m_fitModel(fitModel)
- , m_fitParameter(new FitParameterWidget(m_fitModel, this))
+ , m_fitParameter(new ObsoleteFitParameterWidget(m_fitModel, this))
, m_sampleCombo(new QComboBox())
, m_instrumentCombo(new QComboBox())
{
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.h b/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.h
index 79e8b322dfa..0ccf1496af2 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteFitSettingsWidget.h
@@ -21,7 +21,7 @@
#include <QWidget>
class ObsoleteFitModel;
-class FitParameterWidget;
+class ObsoleteFitParameterWidget;
class QComboBox;
@@ -49,7 +49,7 @@ public slots:
private:
ObsoleteFitModel *m_fitModel;
- FitParameterWidget *m_fitParameter;
+ ObsoleteFitParameterWidget *m_fitParameter;
QComboBox *m_sampleCombo;
QComboBox *m_instrumentCombo;
};
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.cpp
index 2b1a5adbb12..b7395851ff1 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteImportDataWidget.cpp
@@ -19,7 +19,7 @@
#include "IHistogram.h"
#include "IntensityDataIOFactory.h"
#include "IntensityDataItem.h"
-#include "FitParameterItems.h"
+#include "ObsoleteFitParameterItems.h"
#include "ObsoleteFitModel.h"
#include <QLineEdit>
#include <QVBoxLayout>
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.cpp
similarity index 73%
rename from GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
rename to GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.cpp
index c8d3aee2335..1b88921036d 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Views/FitWidgets/MinimizerSettingsWidget.cpp
-//! @brief Implements class MinimizerSettingsWidget
+//! @file coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.cpp
+//! @brief Implements class ObsoleteMinimizerSettingsWidget
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,14 +14,14 @@
//
// ************************************************************************** //
-#include "MinimizerSettingsWidget.h"
+#include "ObsoleteMinimizerSettingsWidget.h"
#include "ObsoleteFitModel.h"
#include "ComponentEditor.h"
-#include "FitParameterItems.h"
+#include "ObsoleteFitParameterItems.h"
#include <QHBoxLayout>
#include <QSplitter>
-MinimizerSettingsWidget::MinimizerSettingsWidget(ObsoleteFitModel *fitModel, QWidget *parent)
+ObsoleteMinimizerSettingsWidget::ObsoleteMinimizerSettingsWidget(ObsoleteFitModel *fitModel, QWidget *parent)
: QWidget(parent)
{
QHBoxLayout *layout = new QHBoxLayout;
diff --git a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h b/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.h
similarity index 64%
rename from GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
rename to GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.h
index 11b1386fe47..0f6466146b9 100644
--- a/GUI/coregui/Views/FitWidgets/MinimizerSettingsWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Views/FitWidgets/MinimizerSettingsWidget.h
-//! @brief Declares class MinimizerSettingsWidget
+//! @file coregui/Views/FitWidgets/ObsoleteMinimizerSettingsWidget.h
+//! @brief Declares class ObsoleteMinimizerSettingsWidget
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,20 +14,20 @@
//
// ************************************************************************** //
-#ifndef MINIMIZERSETTTINGSWIDGET_H
-#define MINIMIZERSETTTINGSWIDGET_H
+#ifndef OBSOLETEMINIMIZERSETTTINGSWIDGET_H
+#define OBSOLETEMINIMIZERSETTTINGSWIDGET_H
#include "WinDllMacros.h"
#include <QWidget>
class ObsoleteFitModel;
-class BA_CORE_API_ MinimizerSettingsWidget : public QWidget
+class BA_CORE_API_ ObsoleteMinimizerSettingsWidget : public QWidget
{
Q_OBJECT
public:
- MinimizerSettingsWidget(ObsoleteFitModel *fitModel, QWidget *parent = 0);
+ ObsoleteMinimizerSettingsWidget(ObsoleteFitModel *fitModel, QWidget *parent = 0);
};
diff --git a/GUI/coregui/Views/FitWidgets/RealDataWindow.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.cpp
similarity index 74%
rename from GUI/coregui/Views/FitWidgets/RealDataWindow.cpp
rename to GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.cpp
index 42d02cfa82a..e7aff880cbf 100644
--- a/GUI/coregui/Views/FitWidgets/RealDataWindow.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Views/JobWidgets/RealDataWindow.cpp
-//! @brief Implements class RealDataWindow
+//! @file coregui/Views/JobWidgets/ObsoleteRealDataWindow.cpp
+//! @brief Implements class ObsoleteRealDataWindow
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,13 +14,13 @@
//
// ************************************************************************** //
-#include "RealDataWindow.h"
+#include "ObsoleteRealDataWindow.h"
#include "JobItem.h"
#include "ColorMapPlot.h"
#include "IntensityDataItem.h"
-RealDataWindow::RealDataWindow(QWidget *parent)
+ObsoleteRealDataWindow::ObsoleteRealDataWindow(QWidget *parent)
: QMainWindow(parent)
, m_plot(new ColorMapPlot(this))
{
@@ -28,7 +28,7 @@ RealDataWindow::RealDataWindow(QWidget *parent)
setWindowTitle("Real Data");
}
-void RealDataWindow::setItem(IntensityDataItem *item)
+void ObsoleteRealDataWindow::setItem(IntensityDataItem *item)
{
m_plot->setItem(item);
}
diff --git a/GUI/coregui/Views/FitWidgets/RealDataWindow.h b/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.h
similarity index 73%
rename from GUI/coregui/Views/FitWidgets/RealDataWindow.h
rename to GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.h
index f55d7570bd5..9c7006d6679 100644
--- a/GUI/coregui/Views/FitWidgets/RealDataWindow.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteRealDataWindow.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Views/FitWidgets/RealDataWindow.h
-//! @brief Declares class RealDataWindow
+//! @file coregui/Views/FitWidgets/ObsoleteRealDataWindow.h
+//! @brief Declares class ObsoleteRealDataWindow
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,20 +14,20 @@
//
// ************************************************************************** //
-#ifndef REALDATAWINDOW_H
-#define REALDATAWINDOW_H
+#ifndef OBSOLETEREALDATAWINDOW_H
+#define OBSOLETEREALDATAWINDOW_H
#include <QMainWindow>
class IntensityDataItem;
class ColorMapPlot;
-class RealDataWindow : public QMainWindow
+class ObsoleteRealDataWindow : public QMainWindow
{
Q_OBJECT
public:
- RealDataWindow(QWidget *parent = 0);
+ ObsoleteRealDataWindow(QWidget *parent = 0);
void setItem(IntensityDataItem *item);
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.cpp b/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.cpp
index 787759d4bfd..5323b78f752 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.cpp
@@ -19,12 +19,12 @@
#include "SimulationRegistry.h"
#include "FitSuite.h"
#include "GUIFitObserver.h"
-#include "FitProgressWidget.h"
+#include "ObsoleteFitProgressWidget.h"
#include "SampleModel.h"
#include "InstrumentModel.h"
#include "ObsoleteFitModel.h"
#include "DomainSimulationBuilder.h"
-#include "FitParameterItems.h"
+#include "ObsoleteFitParameterItems.h"
#include "SessionItem.h"
#include "MultiLayerItem.h"
#include "InstrumentItem.h"
@@ -49,7 +49,7 @@ ObsoleteRunFitWidget::ObsoleteRunFitWidget(ObsoleteFitModel *fitModel, QWidget *
, m_interval_label(new QLabel())
, m_interval_slider(new QSlider())
, m_runfitmanager(new RunFitManager(this))
- , m_fitprogress(new FitProgressWidget(this))
+ , m_fitprogress(new ObsoleteFitProgressWidget(this))
, m_fitModel(fitModel)
{
// setup ui
@@ -172,7 +172,7 @@ std::shared_ptr<FitSuite> ObsoleteRunFitWidget::init_test_fitsuite()
SessionItem *parameter = m_fitModel->itemForIndex(child);
for (int j = 0; j < m_fitModel->rowCount(child); j++) {
SessionItem *link = m_fitModel->itemForIndex(m_fitModel->index(j,0,child));
- QString value = link->getItemValue(FitParameterLinkItem::P_LINK).toString();
+ QString value = link->getItemValue(ObsoleteFitParameterLinkItem::P_LINK).toString();
value = value.replace("Position Offset/X", "PositionX");
value = value.replace("Position Offset/Y", "PositionY");
value = value.replace("Position Offset/Z", "PositionZ");
@@ -184,9 +184,9 @@ std::shared_ptr<FitSuite> ObsoleteRunFitWidget::init_test_fitsuite()
std::string translated = "*" + value.toStdString();
std::cout << translated;
std::cout.flush();
- double min = parameter->getItemValue(FitParameterItem::P_MIN).toDouble();
- double max = parameter->getItemValue(FitParameterItem::P_MAX).toDouble();
- double init = parameter->getItemValue(FitParameterItem::P_INIT).toDouble();
+ double min = parameter->getItemValue(ObsoleteFitParameterItem::P_MIN).toDouble();
+ double max = parameter->getItemValue(ObsoleteFitParameterItem::P_MAX).toDouble();
+ double init = parameter->getItemValue(ObsoleteFitParameterItem::P_INIT).toDouble();
AttLimits limits;
if (min==max && min < init) {
limits = AttLimits::lowerLimited(min);
diff --git a/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.h b/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.h
index aa4cf8c0710..7a1358e4f10 100644
--- a/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.h
+++ b/GUI/coregui/Views/FitWidgets/ObsoleteRunFitWidget.h
@@ -26,7 +26,7 @@ class QLabel;
class QPushButton;
class RunFitManager;
class FitSuite;
-class FitProgressWidget;
+class ObsoleteFitProgressWidget;
class ObsoleteFitModel;
class SampleModel;
class InstrumentModel;
@@ -55,7 +55,7 @@ private:
QLabel *m_interval_label;
QSlider *m_interval_slider;
RunFitManager *m_runfitmanager;
- FitProgressWidget *m_fitprogress;
+ ObsoleteFitProgressWidget *m_fitprogress;
ObsoleteFitModel *m_fitModel;
SessionItem *getTopItemFromSelection(
diff --git a/GUI/coregui/Views/TestView.cpp b/GUI/coregui/Views/TestView.cpp
index 3a6559d0b99..609571ca8db 100644
--- a/GUI/coregui/Views/TestView.cpp
+++ b/GUI/coregui/Views/TestView.cpp
@@ -18,7 +18,7 @@
#include "ObsoleteRunFitWidget.h"
#include "ObsoleteFitView.h"
#include "mainwindow.h"
-#include "FitParameterWidget.h"
+#include "ObsoleteFitParameterWidget.h"
#include "JobModel.h"
#include "MaterialEditor.h"
#include <QMimeData>
--
GitLab