diff --git a/GUI/Model/Model/ParameterTreeUtil.cpp b/GUI/Model/Model/ParameterTreeUtil.cpp index 2f58ccbbd95f0a82942e59b698ffab261cfb2124..6d8c2981613521c8ad06a551393d5abb9e7f357e 100644 --- a/GUI/Model/Model/ParameterTreeUtil.cpp +++ b/GUI/Model/Model/ParameterTreeUtil.cpp @@ -37,17 +37,6 @@ using std::variant; namespace { -QString labelWithUnit(const QString& label, variant<QString, Unit> unit) -{ - const QString s = std::holds_alternative<QString>(unit) ? std::get<QString>(unit) - : unitAsString(std::get<Unit>(unit)); - - if (!s.isEmpty()) - return label + " (" + s + ")"; - - return label; -} - template <typename Catalog> ParameterLabelItem* addLabel(ParameterLabelItem* parent, const QString& category, const typename Catalog::CatalogedType* p) @@ -138,10 +127,10 @@ void ParameterTreeBuilder::addSample() } void ParameterTreeBuilder::addParameterItem(ParameterLabelItem* parent, DoubleProperty& d, - const QString& label) + const QString& label) { auto* parameterItem = new ParameterItem(parent); - parameterItem->setTitle(labelWithUnit(label.isEmpty() ? d.label() : label, d.unit())); + parameterItem->setTitle(label.isEmpty() ? d.label() : label); parameterItem->linkToProperty(d); if (m_recreateBackupValues) m_jobItem->parameterContainerItem()->setBackupValue(parameterItem->link(), d.value()); @@ -411,8 +400,7 @@ void ParameterTreeBuilder::addBackground(ParameterLabelItem* instrumentLabel, BackgroundItem* backgroundItem) { if (auto* b = dynamic_cast<ConstantBackgroundItem*>(backgroundItem)) - addParameterItem(instrumentLabel, b->backgroundValue(), - labelWithUnit("Constant background", b->backgroundValue().unit())); + addParameterItem(instrumentLabel, b->backgroundValue()); } void ParameterTreeBuilder::addPolarization(ParameterLabelItem* instrumentLabel, diff --git a/GUI/Model/Model/ParameterTreeUtil.h b/GUI/Model/Model/ParameterTreeUtil.h index a23008029c950a5d33e1cdc83d65fa7428824661..24c0ffcda92e0ede6965c659cb9d69cf317c803a 100644 --- a/GUI/Model/Model/ParameterTreeUtil.h +++ b/GUI/Model/Model/ParameterTreeUtil.h @@ -54,7 +54,7 @@ private: void addSample(); void addInstrument(); void addParameterItem(ParameterLabelItem* parent, DoubleProperty& d, - const QString& label = QString()); + const QString& label = ""); void addParameterItem(ParameterLabelItem* parent, VectorProperty& d); void addMagnetizationNoZ(ParameterLabelItem* parent, VectorProperty& d); ParameterContainerItem* parameterContainerItem();