From 63332b993ecec4dfccbe52127fb71fb77ab9d88e Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Thu, 2 Feb 2017 16:03:11 +0100
Subject: [PATCH] ParameterTreeBuilder renamed to ParameterTreeUtils
---
GUI/coregui/Models/JobModel.cpp | 4 ++--
...rameterTreeBuilder.cpp => ParameterTreeUtils.cpp} | 12 ++++++------
.../{ParameterTreeBuilder.h => ParameterTreeUtils.h} | 12 ++++++------
.../Views/JobWidgets/ParameterTuningWidget.cpp | 2 +-
.../GUI/GUITranslationTest/GUITranslationTest.cpp | 4 ++--
auto/Wrap/libBornAgainCore_wrap.cpp | 2 +-
auto/Wrap/libBornAgainFit_wrap.cpp | 2 +-
7 files changed, 19 insertions(+), 19 deletions(-)
rename GUI/coregui/Models/{ParameterTreeBuilder.cpp => ParameterTreeUtils.cpp} (92%)
rename GUI/coregui/Models/{ParameterTreeBuilder.h => ParameterTreeUtils.h} (81%)
diff --git a/GUI/coregui/Models/JobModel.cpp b/GUI/coregui/Models/JobModel.cpp
index d878c721273..12b3d3420c5 100644
--- a/GUI/coregui/Models/JobModel.cpp
+++ b/GUI/coregui/Models/JobModel.cpp
@@ -23,7 +23,7 @@
#include "JobItemHelper.h"
#include "JobQueueData.h"
#include "MultiLayerItem.h"
-#include "ParameterTreeBuilder.h"
+#include "ParameterTreeUtils.h"
#include "ParameterTreeItems.h"
#include "RealDataItem.h"
#include "SimulationOptionsItem.h"
@@ -94,7 +94,7 @@ JobItem *JobModel::addJob(const MultiLayerItem *multiLayerItem,
jobItem->getItem(JobItem::P_SAMPLE_NAME)->setValue(multiLayerItem->itemName());
jobItem->getItem(JobItem::P_INSTRUMENT_NAME)->setValue(instrumentItem->itemName());
- ParameterTreeBuilder::createParameterTree(jobItem, JobItem::T_PARAMETER_TREE);
+ ParameterTreeUtils::createParameterTree(jobItem, JobItem::T_PARAMETER_TREE);
insertNewItem(Constants::IntensityDataType, indexOfItem(jobItem), -1, JobItem::T_OUTPUT);
diff --git a/GUI/coregui/Models/ParameterTreeBuilder.cpp b/GUI/coregui/Models/ParameterTreeUtils.cpp
similarity index 92%
rename from GUI/coregui/Models/ParameterTreeBuilder.cpp
rename to GUI/coregui/Models/ParameterTreeUtils.cpp
index 66ec9b93288..df6f7d64d62 100644
--- a/GUI/coregui/Models/ParameterTreeBuilder.cpp
+++ b/GUI/coregui/Models/ParameterTreeUtils.cpp
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/Models/ParameterTreeBuilder.cpp
-//! @brief Implements ParameterTreeBuilder namespace
+//! @file GUI/coregui/Models/ParameterTreeUtils.cpp
+//! @brief Implements ParameterTreeUtils namespace
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,7 +14,7 @@
//
// ************************************************************************** //
-#include "ParameterTreeBuilder.h"
+#include "ParameterTreeUtils.h"
#include "FitParameterHelper.h"
#include "GroupItem.h"
#include "JobItem.h"
@@ -29,7 +29,7 @@ namespace {
void handleItem(SessionItem* tree, SessionItem* source);
}
-void ParameterTreeBuilder::createParameterTree(JobItem* item, const QString& tag)
+void ParameterTreeUtils::createParameterTree(JobItem* item, const QString& tag)
{
SessionItem* container
= item->model()->insertNewItem(Constants::ParameterContainerType, item->index(), -1, tag);
@@ -46,13 +46,13 @@ void ParameterTreeBuilder::createParameterTree(JobItem* item, const QString& tag
// Provides all items in "JobItem/Parameter Tree Container" with domain links already
// at the stage of ParameterTree creation. It is necessary for validation, in Release mode
// it will lead for unnecessary large project files.
- ParameterTreeBuilder::populateDomainLinks(item, tag);
+ ParameterTreeUtils::populateDomainLinks(item, tag);
#endif
}
//! For every ParameterItem in JobItem's ParameterTree container creates a link to domain.
-void ParameterTreeBuilder::populateDomainLinks(JobItem* jobItem, const QString& tag)
+void ParameterTreeUtils::populateDomainLinks(JobItem* jobItem, const QString& tag)
{
SessionItem* current = jobItem->getItem(tag); // this is container
QStack<SessionItem*> stack;
diff --git a/GUI/coregui/Models/ParameterTreeBuilder.h b/GUI/coregui/Models/ParameterTreeUtils.h
similarity index 81%
rename from GUI/coregui/Models/ParameterTreeBuilder.h
rename to GUI/coregui/Models/ParameterTreeUtils.h
index 3e70dc72367..49d955b79c8 100644
--- a/GUI/coregui/Models/ParameterTreeBuilder.h
+++ b/GUI/coregui/Models/ParameterTreeUtils.h
@@ -2,8 +2,8 @@
//
// BornAgain: simulate and fit scattering at grazing incidence
//
-//! @file GUI/coregui/Models/ParameterTreeBuilder.h
-//! @brief Defines ParameterTreeBuilder namespace
+//! @file GUI/coregui/Models/ParameterTreeUtils.h
+//! @brief Defines ParameterTreeUtils namespace
//!
//! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING)
@@ -14,8 +14,8 @@
//
// ************************************************************************** //
-#ifndef PARAMETERTREEBUILDER_H
-#define PARAMETERTREEBUILDER_H
+#ifndef PARAMETERTREEUTILS_H
+#define PARAMETERTREEUTILS_H
#include "WinDllMacros.h"
#include <QString>
@@ -27,7 +27,7 @@ class SessionItem;
//! with ParameterItems. The ParameterItem appears in RealTimeView and provides real
//! time tuning of MultiLayerItem and InstrumentItem.
-namespace ParameterTreeBuilder
+namespace ParameterTreeUtils
{
BA_CORE_API_ void createParameterTree(JobItem* item, const QString& tag = QString());
@@ -35,4 +35,4 @@ BA_CORE_API_ void populateDomainLinks(JobItem* jobItem, const QString& tag);
}
-#endif // PARAMETERTREEBUILDER_H
+#endif // PARAMETERTREEUTILS_H
diff --git a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
index 4d19f2cf840..5b48a380e17 100644
--- a/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
+++ b/GUI/coregui/Views/JobWidgets/ParameterTuningWidget.cpp
@@ -22,7 +22,7 @@
#include "JobItem.h"
#include "JobModel.h"
#include "JobQueueData.h"
-#include "ParameterTreeBuilder.h"
+#include "ParameterTreeUtils.h"
#include "ParameterTreeItems.h"
#include "ParameterTuningDelegate.h"
#include "ParameterTuningModel.h"
diff --git a/Tests/Functional/GUI/GUITranslationTest/GUITranslationTest.cpp b/Tests/Functional/GUI/GUITranslationTest/GUITranslationTest.cpp
index b76201b23f3..cbfc95bae1f 100644
--- a/Tests/Functional/GUI/GUITranslationTest/GUITranslationTest.cpp
+++ b/Tests/Functional/GUI/GUITranslationTest/GUITranslationTest.cpp
@@ -25,7 +25,7 @@
#include "JobModel.h"
#include "DocumentModel.h"
#include "JobItem.h"
-#include "ParameterTreeBuilder.h"
+#include "ParameterTreeUtils.h"
#include "ParameterTreeItems.h"
#include "ParameterPool.h"
#include "FitParameterHelper.h"
@@ -89,7 +89,7 @@ void GUITranslationTest::processParameterTree()
0,
m_models->documentModel()->getSimulationOptionsItem());
- ParameterTreeBuilder::populateDomainLinks(jobItem, JobItem::T_PARAMETER_TREE);
+ ParameterTreeUtils::populateDomainLinks(jobItem, JobItem::T_PARAMETER_TREE);
SessionItem *current = jobItem->getItem(JobItem::T_PARAMETER_TREE);
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index b9dac6671b1..25ff2e44b31 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -5983,7 +5983,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig3.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/home/pospelov/software/local/share/swig/3.0.8/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
diff --git a/auto/Wrap/libBornAgainFit_wrap.cpp b/auto/Wrap/libBornAgainFit_wrap.cpp
index 46739cef97b..a8a3c751a80 100644
--- a/auto/Wrap/libBornAgainFit_wrap.cpp
+++ b/auto/Wrap/libBornAgainFit_wrap.cpp
@@ -5626,7 +5626,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
SWIGINTERNINLINE PyObject*
-SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/usr/share/swig3.0/typemaps/swigmacros.swg,104,%ifcplusplus@*/
+SWIG_From_std_complex_Sl_double_Sg_ (/*@SWIG:/home/pospelov/software/local/share/swig/3.0.8/typemaps/swigmacros.swg,104,%ifcplusplus@*/
const std::complex<double>&
--
GitLab