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

ParameterTreeBuilder renamed to ParameterTreeUtils

parent 4a55ff40
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "JobItemHelper.h" #include "JobItemHelper.h"
#include "JobQueueData.h" #include "JobQueueData.h"
#include "MultiLayerItem.h" #include "MultiLayerItem.h"
#include "ParameterTreeBuilder.h" #include "ParameterTreeUtils.h"
#include "ParameterTreeItems.h" #include "ParameterTreeItems.h"
#include "RealDataItem.h" #include "RealDataItem.h"
#include "SimulationOptionsItem.h" #include "SimulationOptionsItem.h"
...@@ -94,7 +94,7 @@ JobItem *JobModel::addJob(const MultiLayerItem *multiLayerItem, ...@@ -94,7 +94,7 @@ JobItem *JobModel::addJob(const MultiLayerItem *multiLayerItem,
jobItem->getItem(JobItem::P_SAMPLE_NAME)->setValue(multiLayerItem->itemName()); jobItem->getItem(JobItem::P_SAMPLE_NAME)->setValue(multiLayerItem->itemName());
jobItem->getItem(JobItem::P_INSTRUMENT_NAME)->setValue(instrumentItem->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); insertNewItem(Constants::IntensityDataType, indexOfItem(jobItem), -1, JobItem::T_OUTPUT);
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// //
// BornAgain: simulate and fit scattering at grazing incidence // BornAgain: simulate and fit scattering at grazing incidence
// //
//! @file GUI/coregui/Models/ParameterTreeBuilder.cpp //! @file GUI/coregui/Models/ParameterTreeUtils.cpp
//! @brief Implements ParameterTreeBuilder namespace //! @brief Implements ParameterTreeUtils namespace
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING) //! @license GNU General Public License v3 or higher (see COPYING)
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
// //
// ************************************************************************** // // ************************************************************************** //
#include "ParameterTreeBuilder.h" #include "ParameterTreeUtils.h"
#include "FitParameterHelper.h" #include "FitParameterHelper.h"
#include "GroupItem.h" #include "GroupItem.h"
#include "JobItem.h" #include "JobItem.h"
...@@ -29,7 +29,7 @@ namespace { ...@@ -29,7 +29,7 @@ namespace {
void handleItem(SessionItem* tree, SessionItem* source); void handleItem(SessionItem* tree, SessionItem* source);
} }
void ParameterTreeBuilder::createParameterTree(JobItem* item, const QString& tag) void ParameterTreeUtils::createParameterTree(JobItem* item, const QString& tag)
{ {
SessionItem* container SessionItem* container
= item->model()->insertNewItem(Constants::ParameterContainerType, item->index(), -1, tag); = item->model()->insertNewItem(Constants::ParameterContainerType, item->index(), -1, tag);
...@@ -46,13 +46,13 @@ void ParameterTreeBuilder::createParameterTree(JobItem* item, const QString& 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 // 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 // at the stage of ParameterTree creation. It is necessary for validation, in Release mode
// it will lead for unnecessary large project files. // it will lead for unnecessary large project files.
ParameterTreeBuilder::populateDomainLinks(item, tag); ParameterTreeUtils::populateDomainLinks(item, tag);
#endif #endif
} }
//! For every ParameterItem in JobItem's ParameterTree container creates a link to domain. //! 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 SessionItem* current = jobItem->getItem(tag); // this is container
QStack<SessionItem*> stack; QStack<SessionItem*> stack;
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// //
// BornAgain: simulate and fit scattering at grazing incidence // BornAgain: simulate and fit scattering at grazing incidence
// //
//! @file GUI/coregui/Models/ParameterTreeBuilder.h //! @file GUI/coregui/Models/ParameterTreeUtils.h
//! @brief Defines ParameterTreeBuilder namespace //! @brief Defines ParameterTreeUtils namespace
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
//! @license GNU General Public License v3 or higher (see COPYING) //! @license GNU General Public License v3 or higher (see COPYING)
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
// //
// ************************************************************************** // // ************************************************************************** //
#ifndef PARAMETERTREEBUILDER_H #ifndef PARAMETERTREEUTILS_H
#define PARAMETERTREEBUILDER_H #define PARAMETERTREEUTILS_H
#include "WinDllMacros.h" #include "WinDllMacros.h"
#include <QString> #include <QString>
...@@ -27,7 +27,7 @@ class SessionItem; ...@@ -27,7 +27,7 @@ class SessionItem;
//! with ParameterItems. The ParameterItem appears in RealTimeView and provides real //! with ParameterItems. The ParameterItem appears in RealTimeView and provides real
//! time tuning of MultiLayerItem and InstrumentItem. //! time tuning of MultiLayerItem and InstrumentItem.
namespace ParameterTreeBuilder namespace ParameterTreeUtils
{ {
BA_CORE_API_ void createParameterTree(JobItem* item, const QString& tag = QString()); 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); ...@@ -35,4 +35,4 @@ BA_CORE_API_ void populateDomainLinks(JobItem* jobItem, const QString& tag);
} }
#endif // PARAMETERTREEBUILDER_H #endif // PARAMETERTREEUTILS_H
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include "JobItem.h" #include "JobItem.h"
#include "JobModel.h" #include "JobModel.h"
#include "JobQueueData.h" #include "JobQueueData.h"
#include "ParameterTreeBuilder.h" #include "ParameterTreeUtils.h"
#include "ParameterTreeItems.h" #include "ParameterTreeItems.h"
#include "ParameterTuningDelegate.h" #include "ParameterTuningDelegate.h"
#include "ParameterTuningModel.h" #include "ParameterTuningModel.h"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "JobModel.h" #include "JobModel.h"
#include "DocumentModel.h" #include "DocumentModel.h"
#include "JobItem.h" #include "JobItem.h"
#include "ParameterTreeBuilder.h" #include "ParameterTreeUtils.h"
#include "ParameterTreeItems.h" #include "ParameterTreeItems.h"
#include "ParameterPool.h" #include "ParameterPool.h"
#include "FitParameterHelper.h" #include "FitParameterHelper.h"
...@@ -89,7 +89,7 @@ void GUITranslationTest::processParameterTree() ...@@ -89,7 +89,7 @@ void GUITranslationTest::processParameterTree()
0, 0,
m_models->documentModel()->getSimulationOptionsItem()); 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); SessionItem *current = jobItem->getItem(JobItem::T_PARAMETER_TREE);
......
...@@ -5983,7 +5983,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val) ...@@ -5983,7 +5983,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
   
   
SWIGINTERNINLINE PyObject* 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>& const std::complex<double>&
   
...@@ -5626,7 +5626,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val) ...@@ -5626,7 +5626,7 @@ SWIG_AsVal_std_complex_Sl_double_Sg_ (PyObject *o, std::complex<double>* val)
   
   
SWIGINTERNINLINE PyObject* 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>& const std::complex<double>&
   
......
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