From c2dc3592f92acc40f014ca60da056130563a4e2a Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Tue, 17 May 2016 11:12:49 +0200
Subject: [PATCH] New mime types in SessionXML and minor renaming
---
GUI/coregui/Models/FitParameterAbsModel.cpp | 11 ++--
GUI/coregui/Models/FitParameterAbsModel.h | 3 +-
GUI/coregui/Models/ParameterTuningModel.cpp | 4 +-
GUI/coregui/Models/SessionModel.cpp | 12 ++--
GUI/coregui/Models/SessionXML.h | 4 +-
...etersWidget.cpp => FitParameterWidget.cpp} | 56 +++++++++----------
...arametersWidget.h => FitParameterWidget.h} | 14 ++---
.../Views/FitWidgets/FitSuiteWidget.cpp | 4 +-
GUI/coregui/Views/FitWidgets/FitSuiteWidget.h | 4 +-
.../Views/FitWidgets/TestFitWidgets.cpp | 4 +-
GUI/coregui/Views/FitWidgets/TestFitWidgets.h | 4 +-
.../Views/SampleDesigner/ItemTreeView.cpp | 2 +-
12 files changed, 61 insertions(+), 61 deletions(-)
rename GUI/coregui/Views/FitWidgets/{FitParametersWidget.cpp => FitParameterWidget.cpp} (90%)
rename GUI/coregui/Views/FitWidgets/{FitParametersWidget.h => FitParameterWidget.h} (89%)
diff --git a/GUI/coregui/Models/FitParameterAbsModel.cpp b/GUI/coregui/Models/FitParameterAbsModel.cpp
index b1a3d328eae..2123657fdbe 100644
--- a/GUI/coregui/Models/FitParameterAbsModel.cpp
+++ b/GUI/coregui/Models/FitParameterAbsModel.cpp
@@ -25,7 +25,6 @@
#include <QMimeData>
#include <QDebug>
-const QString FitParameterAbsModel::MIME_TYPE = "application/org.bornagainproject.fittinglink";
FitParameterAbsModel::FitParameterAbsModel(FitParameterContainerItem *fitParContainer, QObject *parent)
@@ -213,7 +212,7 @@ bool FitParameterAbsModel::setData(const QModelIndex &index, const QVariant &val
QStringList FitParameterAbsModel::mimeTypes() const
{
QStringList types;
- types << FitParameterAbsModel::MIME_TYPE;
+ types << SessionXML::LinkMimeType;
return types;
}
@@ -225,7 +224,7 @@ QMimeData *FitParameterAbsModel::mimeData(const QModelIndexList &indexes) const
if (index.isValid()) {
if(SessionItem *item = itemForIndex(index)) {
QString path = item->value().toString();
- mimeData->setData(MIME_TYPE, path.toLatin1());
+ mimeData->setData(SessionXML::LinkMimeType, path.toLatin1());
qDebug() << " FitParameterAbsModel::mimeData" << path;
}
@@ -243,7 +242,7 @@ bool FitParameterAbsModel::canDropMimeData(const QMimeData *data, Qt::DropAction
Q_UNUSED(parent);
// if (column > 0)
// return false;
- QString link = QString::fromLatin1(data->data(MIME_TYPE)).split("#")[0];
+ QString link = QString::fromLatin1(data->data(SessionXML::LinkMimeType)).split("#")[0];
qDebug() << "FitParameterAbsModel::canDropMimeData" << "row:" << row << "column:" << column << "parent:" << parent << link;
if(parent.isValid()) {
@@ -264,12 +263,12 @@ bool FitParameterAbsModel::dropMimeData(const QMimeData *data, Qt::DropAction ac
// if (action == Qt::IgnoreAction) return true;
// if (column > 0) return true;
- qDebug() << "FitParameterAbsModel::dropMimeData row:" << row << "column:" << column << "parent:" << parent << "mime:" << QString::fromLatin1(data->data(MIME_TYPE));
+ qDebug() << "FitParameterAbsModel::dropMimeData row:" << row << "column:" << column << "parent:" << parent << "mime:" << QString::fromLatin1(data->data(SessionXML::LinkMimeType));
if(parent.isValid()) {
if(SessionItem *fitParItem = itemForIndex(parent)) {
Q_ASSERT(fitParItem->modelType() == Constants::FitParameterType);
- ParameterItem *parItem = FitModelHelper::getParameterItem(m_root_item, QString::fromLatin1(data->data(MIME_TYPE)));
+ ParameterItem *parItem = FitModelHelper::getParameterItem(m_root_item, QString::fromLatin1(data->data(SessionXML::LinkMimeType)));
Q_ASSERT(parItem);
FitModelHelper::addToFitParameter(m_root_item, parItem, fitParItem->displayName());
qDebug() << "AAAA" << parItem->getItemValue(ParameterItem::P_LINK);
diff --git a/GUI/coregui/Models/FitParameterAbsModel.h b/GUI/coregui/Models/FitParameterAbsModel.h
index 55025f1fc4b..8c55a0eb90d 100644
--- a/GUI/coregui/Models/FitParameterAbsModel.h
+++ b/GUI/coregui/Models/FitParameterAbsModel.h
@@ -32,11 +32,10 @@ class BA_CORE_API_ FitParameterAbsModel : public QAbstractItemModel
Q_OBJECT
public:
- static const QString MIME_TYPE;
explicit FitParameterAbsModel(FitParameterContainerItem *fitParContainer, QObject *parent = 0);
- enum EColumn {PAR_NAME, PAR_TYPE, PAR_VALUE, PAR_MIN, PAR_MAX, MAX_COLUMNS}; // NEW column usage
+ enum EColumn {PAR_NAME, PAR_TYPE, PAR_VALUE, PAR_MIN, PAR_MAX, MAX_COLUMNS};
Qt::ItemFlags flags(const QModelIndex & index) const Q_DECL_OVERRIDE;
diff --git a/GUI/coregui/Models/ParameterTuningModel.cpp b/GUI/coregui/Models/ParameterTuningModel.cpp
index ad6c7ec8710..bcc13645d85 100644
--- a/GUI/coregui/Models/ParameterTuningModel.cpp
+++ b/GUI/coregui/Models/ParameterTuningModel.cpp
@@ -16,7 +16,7 @@
#include "ParameterTuningModel.h"
#include "FitParameterItems.h"
-#include "FitParameterAbsModel.h"
+#include "SessionXML.h"
#include "FitModelHelper.h"
#include "SessionModel.h"
#include "ParameterTreeItems.h"
@@ -52,7 +52,7 @@ QMimeData *ParameterTuningModel::mimeData(const QModelIndexList &proxyIndexes) c
foreach(QModelIndex proxyIndex, proxyIndexes) {
if(ParameterItem *parameterItem = getParameterItem(proxyIndex)) {
QString path = FitModelHelper::getParameterItemPath(parameterItem);
- mimeData->setData(FitParameterAbsModel::MIME_TYPE, path.toLatin1());
+ mimeData->setData(SessionXML::LinkMimeType, path.toLatin1());
qDebug() << " FilterPropertyProxy::mimeData" << path;
break;
}
diff --git a/GUI/coregui/Models/SessionModel.cpp b/GUI/coregui/Models/SessionModel.cpp
index a105ad177b5..a23c45852fa 100644
--- a/GUI/coregui/Models/SessionModel.cpp
+++ b/GUI/coregui/Models/SessionModel.cpp
@@ -177,7 +177,7 @@ bool SessionModel::removeRows(int row, int count, const QModelIndex &parent)
QStringList SessionModel::mimeTypes() const
{
- return QStringList() << SessionXML::MimeType;
+ return QStringList() << SessionXML::ItemMimeType;
}
QMimeData *SessionModel::mimeData(const QModelIndexList &indices) const
@@ -189,7 +189,7 @@ QMimeData *SessionModel::mimeData(const QModelIndexList &indices) const
QByteArray xml_data;
QXmlStreamWriter writer(&xml_data);
SessionWriter::writeItemAndChildItems(&writer, item);
- mime_data->setData(SessionXML::MimeType, qCompress(xml_data, MaxCompression));
+ mime_data->setData(SessionXML::ItemMimeType, qCompress(xml_data, MaxCompression));
return mime_data;
}
return 0;
@@ -201,12 +201,12 @@ bool SessionModel::canDropMimeData(const QMimeData *data, Qt::DropAction action,
(void)row;
if (action == Qt::IgnoreAction)
return true;
- if (action != Qt::MoveAction || column > 0 || !data || !data->hasFormat(SessionXML::MimeType))
+ if (action != Qt::MoveAction || column > 0 || !data || !data->hasFormat(SessionXML::ItemMimeType))
return false;
if (!parent.isValid())
return true;
QVector<QString> acceptable_child_items = getAcceptableDefaultItemTypes(parent);
- QByteArray xml_data = qUncompress(data->data(SessionXML::MimeType));
+ QByteArray xml_data = qUncompress(data->data(SessionXML::ItemMimeType));
QXmlStreamReader reader(xml_data);
while (!reader.atEnd()) {
reader.readNext();
@@ -226,12 +226,12 @@ bool SessionModel::dropMimeData(const QMimeData *data, Qt::DropAction action, in
{
if (action == Qt::IgnoreAction)
return true;
- if (action != Qt::MoveAction || column > 0 || !data || !data->hasFormat(SessionXML::MimeType))
+ if (action != Qt::MoveAction || column > 0 || !data || !data->hasFormat(SessionXML::ItemMimeType))
return false;
if (!canDropMimeData(data, action, row, column, parent))
return false;
if (SessionItem *item = itemForIndex(parent)) {
- QByteArray xml_data = qUncompress(data->data(SessionXML::MimeType));
+ QByteArray xml_data = qUncompress(data->data(SessionXML::ItemMimeType));
QXmlStreamReader reader(xml_data);
if (row == -1)
row = item->rowCount();
diff --git a/GUI/coregui/Models/SessionXML.h b/GUI/coregui/Models/SessionXML.h
index 20ab00c1e1c..f98fe0b5194 100644
--- a/GUI/coregui/Models/SessionXML.h
+++ b/GUI/coregui/Models/SessionXML.h
@@ -27,7 +27,9 @@ class SessionItem;
class WarningMessageService;
namespace SessionXML {
-const QString MimeType = "application/org.bornagainproject.xml.item.z";
+const QString ItemMimeType = "application/org.bornagainproject.xml.item.z";
+const QString LinkMimeType = "application/org.bornagainproject.fittinglink";
+
const QString ModelTag("SessionModel");
const QString InstrumentModelTag("InstrumentModel");
const QString SampleModelTag("SampleModel");
diff --git a/GUI/coregui/Views/FitWidgets/FitParametersWidget.cpp b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
similarity index 90%
rename from GUI/coregui/Views/FitWidgets/FitParametersWidget.cpp
rename to GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
index a2ebab4956b..7a79b96691c 100644
--- a/GUI/coregui/Views/FitWidgets/FitParametersWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Views/FitWidgets/FitParametersWidget.cpp
-//! @brief Implements class FitParametersWidget
+//! @file coregui/Views/FitWidgets/FitParameterWidget.cpp
+//! @brief Implements class FitParameterWidget
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,7 +14,7 @@
//
// ************************************************************************** //
-#include "FitParametersWidget.h"
+#include "FitParameterWidget.h"
#include "JobItem.h"
#include "JobModel.h"
#include "FitSuiteItem.h"
@@ -35,7 +35,7 @@
#include <QAction>
#include <QDebug>
-FitParametersWidget::FitParametersWidget(QWidget *parent)
+FitParameterWidget::FitParameterWidget(QWidget *parent)
: QWidget(parent)
, m_treeView(new QTreeView)
, m_jobItem(0)
@@ -67,13 +67,13 @@ FitParametersWidget::FitParametersWidget(QWidget *parent)
}
-FitParametersWidget::~FitParametersWidget()
+FitParameterWidget::~FitParameterWidget()
{
qDebug() << "FitParametersWidget::~FitParametersWidget()";
}
-void FitParametersWidget::setItem(JobItem *jobItem)
+void FitParameterWidget::setItem(JobItem *jobItem)
{
if(jobItem == m_jobItem) {
return;
@@ -94,7 +94,7 @@ void FitParametersWidget::setItem(JobItem *jobItem)
//! Our FitParametersWidget will provide model tuning widget with context menu.
//! It also will take care of cross-item-selection between parameterTuningTree
//! and fitParametersTree
-void FitParametersWidget::setModelTuningWidget(ParameterTuningWidget *tuningWidget)
+void FitParameterWidget::setModelTuningWidget(ParameterTuningWidget *tuningWidget)
{
if(tuningWidget == m_tuningWidget) {
return;
@@ -120,7 +120,7 @@ void FitParametersWidget::setModelTuningWidget(ParameterTuningWidget *tuningWidg
}
-void FitParametersWidget::onTuningWidgetContextMenu(const QPoint &point)
+void FitParameterWidget::onTuningWidgetContextMenu(const QPoint &point)
{
QMenu menu;
initTuningWidgetContextMenu(menu);
@@ -128,7 +128,7 @@ void FitParametersWidget::onTuningWidgetContextMenu(const QPoint &point)
setActionsEnabled(true);
}
-void FitParametersWidget::onFitParameterTreeContextMenu(const QPoint &point)
+void FitParameterWidget::onFitParameterTreeContextMenu(const QPoint &point)
{
qDebug() << "FitParametersWidget::onFitParameterTreeContextMenu";
QMenu menu;
@@ -137,12 +137,12 @@ void FitParametersWidget::onFitParameterTreeContextMenu(const QPoint &point)
setActionsEnabled(true);
}
-void FitParametersWidget::onTuningWidgetSelectionChanged(const QItemSelection &selection)
+void FitParameterWidget::onTuningWidgetSelectionChanged(const QItemSelection &selection)
{
Q_UNUSED(selection);
}
-void FitParametersWidget::onFitParametersSelectionChanged(const QItemSelection &selection)
+void FitParameterWidget::onFitParametersSelectionChanged(const QItemSelection &selection)
{
Q_UNUSED(selection);
qDebug() << "onFitParametersSelectionChanged ->";
@@ -177,7 +177,7 @@ void FitParametersWidget::onFitParametersSelectionChanged(const QItemSelection &
}
-void FitParametersWidget::onCreateFitParAction()
+void FitParameterWidget::onCreateFitParAction()
{
foreach(ParameterItem *item, m_tuningWidget->getSelectedParameters()) {
if(!FitModelHelper::getFitParameterItem(m_jobItem->fitParameterContainerItem(), item)) {
@@ -191,7 +191,7 @@ void FitParametersWidget::onCreateFitParAction()
//! All ParameterItem's selected in tuned widget will be removed from link section of corresponding
//! fitParameterItem.
-void FitParametersWidget::onRemoveFromFitParAction()
+void FitParameterWidget::onRemoveFromFitParAction()
{
foreach(ParameterItem *item, m_tuningWidget->getSelectedParameters()) {
if(FitModelHelper::getFitParameterItem(m_jobItem->fitParameterContainerItem(), item)) {
@@ -203,7 +203,7 @@ void FitParametersWidget::onRemoveFromFitParAction()
}
//! All selected FitParameterItems will be removed
-void FitParametersWidget::onRemoveFitParAction()
+void FitParameterWidget::onRemoveFitParAction()
{
FitParameterContainerItem *container = m_jobItem->fitParameterContainerItem();
@@ -226,7 +226,7 @@ void FitParametersWidget::onRemoveFitParAction()
}
//! Add all selected parameters to fitParameter with given index
-void FitParametersWidget::onAddToFitParAction(int ipar)
+void FitParameterWidget::onAddToFitParAction(int ipar)
{
QStringList fitParNames = FitModelHelper::getFitParameterNames(m_jobItem->fitParameterContainerItem());
foreach(ParameterItem *item, m_tuningWidget->getSelectedParameters()) {
@@ -238,12 +238,12 @@ void FitParametersWidget::onAddToFitParAction(int ipar)
}
//! Context menu reimplemented to suppress the default one
-void FitParametersWidget::contextMenuEvent(QContextMenuEvent *event)
+void FitParameterWidget::contextMenuEvent(QContextMenuEvent *event)
{
Q_UNUSED(event);
}
-void FitParametersWidget::init_actions()
+void FitParameterWidget::init_actions()
{
m_createFitParAction = new QAction(QStringLiteral("Create fit parameter"), this);
connect(m_createFitParAction, SIGNAL(triggered()), this, SLOT(onCreateFitParAction()));
@@ -262,7 +262,7 @@ void FitParametersWidget::init_actions()
}
-void FitParametersWidget::initTuningWidgetContextMenu(QMenu &menu)
+void FitParameterWidget::initTuningWidgetContextMenu(QMenu &menu)
{
Q_ASSERT(m_jobItem);
@@ -291,20 +291,20 @@ void FitParametersWidget::initTuningWidgetContextMenu(QMenu &menu)
menu.addAction(m_removeFromFitParAction);
}
-void FitParametersWidget::initFitParameterTreeContextMenu(QMenu &menu)
+void FitParameterWidget::initFitParameterTreeContextMenu(QMenu &menu)
{
menu.addAction(m_removeFitParAction);
}
//! stop tracking job item
-void FitParametersWidget::stop_tracking_job_item()
+void FitParameterWidget::stop_tracking_job_item()
{
Q_ASSERT(m_jobItem);
}
//! init job item: create fit containers if necessary, subscribes for item changing
-void FitParametersWidget::init_job_item()
+void FitParameterWidget::init_job_item()
{
SessionItem *fitSuiteItem = m_jobItem->getItem(JobItem::T_FIT_SUITE);
if (!fitSuiteItem) {
@@ -361,7 +361,7 @@ void FitParametersWidget::init_job_item()
}
//! Make first column in FitParameterItem's link occupy whole space
-void FitParametersWidget::spanParameters()
+void FitParameterWidget::spanParameters()
{
m_treeView->expandAll();
for (int i = 0; i < m_fitParameterModel->rowCount(QModelIndex()); i++){
@@ -380,7 +380,7 @@ void FitParametersWidget::spanParameters()
//! Returns true if it is possible to create fit parameter. There should be some ParameterItem's
//! selected in model tuning widget and they should not be in FitParameterContainer already
-bool FitParametersWidget::isCreateFitParameterPossible()
+bool FitParameterWidget::isCreateFitParameterPossible()
{
QVector<ParameterItem *> selected = m_tuningWidget->getSelectedParameters();
foreach(ParameterItem *item, selected) {
@@ -390,7 +390,7 @@ bool FitParametersWidget::isCreateFitParameterPossible()
return false;
}
-void FitParametersWidget::setActionsEnabled(bool value)
+void FitParameterWidget::setActionsEnabled(bool value)
{
m_createFitParAction->setEnabled(value);
m_removeFromFitParAction->setEnabled(value);
@@ -399,7 +399,7 @@ void FitParametersWidget::setActionsEnabled(bool value)
//! Returns list of FitParameterItem's currently selected in FitParameterItem tree
-QVector<FitParameterItem *> FitParametersWidget::getSelectedFitParameters()
+QVector<FitParameterItem *> FitParameterWidget::getSelectedFitParameters()
{
QVector<FitParameterItem *> result;
QModelIndexList indexes = m_treeView->selectionModel()->selectedIndexes();
@@ -416,7 +416,7 @@ QVector<FitParameterItem *> FitParametersWidget::getSelectedFitParameters()
}
//! Returns links of FitParameterLink's item selected in FitParameterItem tree
-QVector<FitParameterLinkItem *> FitParametersWidget::getSelectedFitParameterLinks()
+QVector<FitParameterLinkItem *> FitParameterWidget::getSelectedFitParameterLinks()
{
QVector<FitParameterLinkItem *> result;
QModelIndexList indexes = m_treeView->selectionModel()->selectedIndexes();
@@ -433,7 +433,7 @@ QVector<FitParameterLinkItem *> FitParametersWidget::getSelectedFitParameterLink
}
-void FitParametersWidget::connectTuningWidgetSelection(bool active)
+void FitParameterWidget::connectTuningWidgetSelection(bool active)
{
Q_ASSERT(m_tuningWidget);
@@ -448,7 +448,7 @@ void FitParametersWidget::connectTuningWidgetSelection(bool active)
}
}
-void FitParametersWidget::connectFitParametersSelection(bool active) {
+void FitParameterWidget::connectFitParametersSelection(bool active) {
if (active) {
connect(m_treeView->selectionModel(),
SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
diff --git a/GUI/coregui/Views/FitWidgets/FitParametersWidget.h b/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
similarity index 89%
rename from GUI/coregui/Views/FitWidgets/FitParametersWidget.h
rename to GUI/coregui/Views/FitWidgets/FitParameterWidget.h
index 6bae74692ff..de5cc409101 100644
--- a/GUI/coregui/Views/FitWidgets/FitParametersWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitParameterWidget.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file coregui/Views/FitWidgets/FitParametersWidget.h
-//! @brief Declares class FitParametersWidget
+//! @file coregui/Views/FitWidgets/FitParameterWidget.h
+//! @brief Declares class FitParameterWidget
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#ifndef FITPARAMETERSWIDGET_H
-#define FITPARAMETERSWIDGET_H
+#ifndef FITPARAMETERWIDGET_H
+#define FITPARAMETERWIDGET_H
#include "WinDllMacros.h"
#include <QWidget>
@@ -39,12 +39,12 @@ class DeleteEventFilter;
//! The FitParametersWidget class contains a tree view to set fit parameters (fix/release,
//! starting value, min/max bounds). It occupies buttom right corner of JobView.
-class BA_CORE_API_ FitParametersWidget : public QWidget
+class BA_CORE_API_ FitParameterWidget : public QWidget
{
Q_OBJECT
public:
- FitParametersWidget(QWidget *parent = 0);
- ~FitParametersWidget();
+ FitParameterWidget(QWidget *parent = 0);
+ ~FitParameterWidget();
void setItem(JobItem *jobItem);
void setModelTuningWidget(ParameterTuningWidget *tuningWidget);
diff --git a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
index be50635a84a..386f818dc20 100644
--- a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
+++ b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.cpp
@@ -19,7 +19,7 @@
#include "JobItem.h"
#include "FitSuiteItem.h"
#include "FitParameterItems.h"
-#include "FitParametersWidget.h"
+#include "FitParameterWidget.h"
#include "RunFitManager.h"
#include "GUIFitObserver.h"
#include "DomainFittingBuilder.h"
@@ -37,7 +37,7 @@
FitSuiteWidget::FitSuiteWidget(JobModel *jobModel, QWidget *parent)
: QWidget(parent)
, m_tabWidget(new QTabWidget)
- , m_fitParametersWidget(new FitParametersWidget(this))
+ , m_fitParametersWidget(new FitParameterWidget(this))
, m_minimizerSettingsWidget(new MinimizerSettingsWidget(this))
, m_fitResultsWidget(new FitResultsWidget(this))
, m_jobModel(jobModel)
diff --git a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h
index 9cc712cf51d..0bcbdfe86f4 100644
--- a/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h
+++ b/GUI/coregui/Views/FitWidgets/FitSuiteWidget.h
@@ -24,7 +24,7 @@
class QTabWidget;
class JobModel;
class JobItem;
-class FitParametersWidget;
+class FitParameterWidget;
class MinimizerSettingsWidget;
class FitResultsWidget;
class ParameterTuningWidget;
@@ -72,7 +72,7 @@ private:
void connectSignals();
QTabWidget *m_tabWidget;
- FitParametersWidget *m_fitParametersWidget;
+ FitParameterWidget *m_fitParametersWidget;
MinimizerSettingsWidget *m_minimizerSettingsWidget;
FitResultsWidget *m_fitResultsWidget;
JobModel *m_jobModel;
diff --git a/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp b/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
index d939b40b8cf..9226c42e28e 100644
--- a/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
+++ b/GUI/coregui/Views/FitWidgets/TestFitWidgets.cpp
@@ -17,7 +17,7 @@
#include "TestFitWidgets.h"
#include "mainwindow.h"
#include "ParameterTuningWidget.h"
-#include "FitParametersWidget.h"
+#include "FitParameterWidget.h"
#include "item_constants.h"
#include "JobModel.h"
#include "JobItem.h"
@@ -31,7 +31,7 @@ TestFitWidgets::TestFitWidgets(MainWindow *mainWindow)
: QWidget(mainWindow)
, m_mainWindow(mainWindow)
, m_tuningWidget(new ParameterTuningWidget(mainWindow->jobModel()))
- , m_fitParametersWidget(new FitParametersWidget(this))
+ , m_fitParametersWidget(new FitParameterWidget(this))
, m_jobTreeView(new QTreeView)
, m_jobItem(0)
{
diff --git a/GUI/coregui/Views/FitWidgets/TestFitWidgets.h b/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
index 17921006761..5afd670ba4b 100644
--- a/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
+++ b/GUI/coregui/Views/FitWidgets/TestFitWidgets.h
@@ -22,7 +22,7 @@
class MainWindow;
class ParameterTuningWidget;
-class FitParametersWidget;
+class FitParameterWidget;
class JobItem;
class QTreeView;
@@ -40,7 +40,7 @@ public:
private:
MainWindow *m_mainWindow;
ParameterTuningWidget *m_tuningWidget;
- FitParametersWidget *m_fitParametersWidget;
+ FitParameterWidget *m_fitParametersWidget;
QTreeView *m_jobTreeView;
JobItem *m_jobItem;
};
diff --git a/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp b/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
index 48c590f202a..b37b0f673dc 100644
--- a/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
+++ b/GUI/coregui/Views/SampleDesigner/ItemTreeView.cpp
@@ -42,7 +42,7 @@ void ItemTreeView::dragMoveEvent(QDragMoveEvent *event)
SessionModel *model = static_cast<SessionModel *>(this->model());
model->setDraggedItemType(QString());
QByteArray xml_data = qUncompress(
- event->mimeData()->data(SessionXML::MimeType));
+ event->mimeData()->data(SessionXML::ItemMimeType));
QXmlStreamReader reader(xml_data);
while (!reader.atEnd()) {
reader.readNext();
--
GitLab