From 635a3d161182d10191a17fb558a026b624de7a92 Mon Sep 17 00:00:00 2001
From: Joachim Wuttke <j.wuttke@fz-juelich.de>
Date: Fri, 26 Jul 2024 08:13:35 +0200
Subject: [PATCH] temporarily disambiguate fcts -> PolyItem::piLabel, piTooltip
---
GUI/Model/Descriptor/PolyItem.h | 4 ++--
GUI/View/Numeric/ComboUtil.h | 2 +-
GUI/View/Sample/HeinzFormLayout.h | 2 +-
GUI/View/Sample/InterferenceForm.cpp | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/GUI/Model/Descriptor/PolyItem.h b/GUI/Model/Descriptor/PolyItem.h
index 7673832bd89..ad6f81925e3 100644
--- a/GUI/Model/Descriptor/PolyItem.h
+++ b/GUI/Model/Descriptor/PolyItem.h
@@ -44,8 +44,8 @@ public:
m_item.reset(XML::readItemFrom<Catalog>(r, args...));
}
- QString label() const { return m_label; }
- QString tooltip() const { return m_tooltip; }
+ QString piLabel() const { return m_label; }
+ QString piTooltip() const { return m_tooltip; }
QStringList menuEntries() const { return m_menu_entries; }
void setCurrentIndex(int newIndex) { currentIndexSetter(newIndex); }
diff --git a/GUI/View/Numeric/ComboUtil.h b/GUI/View/Numeric/ComboUtil.h
index bafd7c2f6a5..5fd0e833c74 100644
--- a/GUI/View/Numeric/ComboUtil.h
+++ b/GUI/View/Numeric/ComboUtil.h
@@ -53,7 +53,7 @@ QComboBox* createComboBoxFromPolyitem(PolyItem<T>& d, std::function<void(int)> s
auto* combo = new QComboBox;
combo->addItems(d.menuEntries());
combo->setMaxCount(d.menuEntries().size());
- combo->setToolTip(d.tooltip());
+ combo->setToolTip(d.piTooltip());
combo->setCurrentIndex(d.currentIndex());
if (inScrollArea)
diff --git a/GUI/View/Sample/HeinzFormLayout.h b/GUI/View/Sample/HeinzFormLayout.h
index c84700a2b0a..890e500d43b 100644
--- a/GUI/View/Sample/HeinzFormLayout.h
+++ b/GUI/View/Sample/HeinzFormLayout.h
@@ -58,7 +58,7 @@ public:
//! Returns the newly added row.
template <typename T> void addSelection(PolyItem<T>& d)
{
- addBoldRow(d.label(), new PolyForm(QFormLayout::parentWidget(), d, m_ec));
+ addBoldRow(d.piLabel(), new PolyForm(QFormLayout::parentWidget(), d, m_ec));
}
//! Adds a row with a bold printed label and a DSpinBox.
diff --git a/GUI/View/Sample/InterferenceForm.cpp b/GUI/View/Sample/InterferenceForm.cpp
index 5117ec6ea6a..dacd1862578 100644
--- a/GUI/View/Sample/InterferenceForm.cpp
+++ b/GUI/View/Sample/InterferenceForm.cpp
@@ -88,7 +88,7 @@ void InterferenceForm::createInterferenceWidgets()
} else if (auto* itf = dynamic_cast<Interference2DLatticeItem*>(interference)) {
m_layout->addValue(itf->positionVariance());
auto* w = new LatticeTypeSelectionForm(this, itf, m_ec);
- m_layout->addBoldRow(itf->latticeTypeSelection().label(), w);
+ m_layout->addBoldRow(itf->latticeTypeSelection().piLabel(), w);
m_layout->addSelection(itf->decayFunctionSelection());
} else if (auto* itf = dynamic_cast<InterferenceFinite2DLatticeItem*>(interference)) {
m_layout->addValue(itf->positionVariance());
@@ -110,14 +110,14 @@ void InterferenceForm::createInterferenceWidgets()
"Domain size 2 in number of unit cells"));
auto* w = new LatticeTypeSelectionForm(this, itf, m_ec);
- m_layout->addBoldRow(itf->latticeTypeSelection().label(), w);
+ m_layout->addBoldRow(itf->latticeTypeSelection().piLabel(), w);
} else if (auto* itf = dynamic_cast<Interference2DParacrystalItem*>(interference)) {
m_layout->addValue(itf->positionVariance());
m_layout->addValue(itf->dampingLength());
m_layout->addValue(itf->domainSize1());
m_layout->addValue(itf->domainSize2());
auto* w = new LatticeTypeSelectionForm(this, itf, m_ec);
- m_layout->addBoldRow(itf->latticeTypeSelection().label(), w);
+ m_layout->addBoldRow(itf->latticeTypeSelection().piLabel(), w);
m_layout->addSelection(itf->probabilityDistributionSelection1());
m_layout->addSelection(itf->probabilityDistributionSelection2());
}
--
GitLab