Skip to content
Snippets Groups Projects
Commit 77a311d7 authored by Matthias Puchner's avatar Matthias Puchner
Browse files

rm debug-only or unused code regarding domain links/paths (GUI side)

parent e391276e
No related branches found
No related tags found
1 merge request!65Refactor Distribution Handling
......@@ -48,12 +48,10 @@ const double range_factor = 0.5;
// ----------------------------------------------------------------------------
const QString FitParameterLinkItem::P_LINK = "Link";
const QString FitParameterLinkItem::P_DOMAIN = "Domain";
FitParameterLinkItem::FitParameterLinkItem() : SessionItem("FitParameterLink")
{
addProperty(P_LINK, QString());
addProperty(P_DOMAIN, QString());
}
// ----------------------------------------------------------------------------
......
......@@ -26,7 +26,6 @@ class BA_CORE_API_ FitParameterLinkItem : public SessionItem {
public:
static const QString P_LINK;
static const QString P_DOMAIN;
FitParameterLinkItem();
};
......
......@@ -26,27 +26,6 @@ const QStringList expectedRoughnessPars =
IPathTranslator::~IPathTranslator() = default;
ModelTypeTranslator::ModelTypeTranslator(QString gui_model_type, QString domain_name)
: m_gui_model_type{std::move(gui_model_type)}, m_domain_name{std::move(domain_name)}
{
}
ModelTypeTranslator* ModelTypeTranslator::clone() const
{
return new ModelTypeTranslator(m_gui_model_type, m_domain_name);
}
QStringList ModelTypeTranslator::translate(const QStringList& list) const
{
if (list.back() != m_gui_model_type)
return list;
QStringList result = list;
result.removeLast();
result << m_domain_name;
return result;
}
AddElementTranslator::AddElementTranslator(QString gui_name, QString additional_name)
: m_gui_name{std::move(gui_name)}, m_additional_name{std::move(additional_name)}
{
......
......@@ -28,20 +28,6 @@ public:
virtual QStringList translate(const QStringList& list) const = 0;
};
class ModelTypeTranslator : public IPathTranslator {
public:
ModelTypeTranslator(QString gui_model_type, QString domain_name);
~ModelTypeTranslator() override {}
ModelTypeTranslator* clone() const override;
QStringList translate(const QStringList& list) const override;
private:
QString m_gui_model_type;
QString m_domain_name;
};
class AddElementTranslator : public IPathTranslator {
public:
AddElementTranslator(QString gui_name, QString additional_name);
......
......@@ -30,15 +30,12 @@ ParameterLabelItem::ParameterLabelItem() : SessionItem("Parameter Label")
const QString ParameterItem::P_LINK = "Link";
const QString ParameterItem::P_BACKUP = "Backup";
const QString ParameterItem::P_DOMAIN = "Domain";
ParameterItem::ParameterItem() : SessionItem("Parameter")
{
// Link to original PropertyItem in one of components of MultiLayerItem or InstrumentItem
addProperty(P_LINK, QString());
// The back up value of PropertyItem to be able to reset parameter tuning tree to initial state
addProperty(P_BACKUP, 0.0);
// The domain name of corresponding ISampleNode's registered parameter
addProperty(P_DOMAIN, QString());
}
// ----------------------------------------------------------------------------
......
......@@ -34,7 +34,6 @@ class BA_CORE_API_ ParameterItem : public SessionItem {
public:
static const QString P_LINK;
static const QString P_BACKUP;
static const QString P_DOMAIN;
ParameterItem();
void propagateValueToLink(double newValue);
......
......@@ -30,25 +30,6 @@ QString removeLeadingSlash(const QString& name)
return name.indexOf('/') == 0 ? name.mid(1) : name;
}
#ifndef NDEBUG
//! For every ParameterItem in a container creates a link to the domain.
void populateDomainLinks(SessionItem* container)
{
if (container->modelType() != "Parameter Container")
throw GUIHelpers::Error("ParameterTreeUtils::populateParameterContainer() -> Error. "
"Not a ParameterContainerType.");
ParameterTreeUtils::visitParameterContainer(container, [container](ParameterItem* parItem) {
QString translation =
"*/" + ModelPath::itemPathTranslation(*parItem->linkedItem(), container->parent());
parItem->setItemValue(ParameterItem::P_DOMAIN, translation);
});
}
#endif
void handleItem(SessionItem* tree, const SessionItem* source);
} // namespace
......@@ -63,13 +44,6 @@ void ParameterTreeUtils::createParameterTree(JobItem* jobItem)
populateParameterContainer(container, jobItem->getItem(JobItem::T_SAMPLE));
populateParameterContainer(container, jobItem->getItem(JobItem::T_INSTRUMENT));
#ifndef NDEBUG
// 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.
populateDomainLinks(container);
#endif
}
//! Populates ParameterContainer with ParameterItem's corresponding to all properties found
......
......@@ -163,12 +163,8 @@ void GUITranslationTest::processParameterTree()
std::string parPath = FitParameterHelper::getParameterItemPath(parItem).toStdString();
std::string domainName =
std::string("*")
+ parItem->getItemValue(ParameterItem::P_DOMAIN).toString().toStdString();
QString translation = ModelPath::itemPathTranslation(*parItem->linkedItem(), jobItem);
domainName = std::string("*/") + translation.toStdString();
std::string domainName = std::string("*/") + translation.toStdString();
m_translations.push_back({sampleParLink, parPath, domainName});
}
......
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