Skip to content
Snippets Groups Projects
Commit 635a3d16 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

temporarily disambiguate fcts -> PolyItem::piLabel, piTooltip

parent 019be443
No related branches found
No related tags found
1 merge request!2694PolyItem: simplify; disambiguate fcts
...@@ -44,8 +44,8 @@ public: ...@@ -44,8 +44,8 @@ public:
m_item.reset(XML::readItemFrom<Catalog>(r, args...)); m_item.reset(XML::readItemFrom<Catalog>(r, args...));
} }
QString label() const { return m_label; } QString piLabel() const { return m_label; }
QString tooltip() const { return m_tooltip; } QString piTooltip() const { return m_tooltip; }
QStringList menuEntries() const { return m_menu_entries; } QStringList menuEntries() const { return m_menu_entries; }
void setCurrentIndex(int newIndex) { currentIndexSetter(newIndex); } void setCurrentIndex(int newIndex) { currentIndexSetter(newIndex); }
......
...@@ -53,7 +53,7 @@ QComboBox* createComboBoxFromPolyitem(PolyItem<T>& d, std::function<void(int)> s ...@@ -53,7 +53,7 @@ QComboBox* createComboBoxFromPolyitem(PolyItem<T>& d, std::function<void(int)> s
auto* combo = new QComboBox; auto* combo = new QComboBox;
combo->addItems(d.menuEntries()); combo->addItems(d.menuEntries());
combo->setMaxCount(d.menuEntries().size()); combo->setMaxCount(d.menuEntries().size());
combo->setToolTip(d.tooltip()); combo->setToolTip(d.piTooltip());
combo->setCurrentIndex(d.currentIndex()); combo->setCurrentIndex(d.currentIndex());
if (inScrollArea) if (inScrollArea)
......
...@@ -58,7 +58,7 @@ public: ...@@ -58,7 +58,7 @@ public:
//! Returns the newly added row. //! Returns the newly added row.
template <typename T> void addSelection(PolyItem<T>& d) 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. //! Adds a row with a bold printed label and a DSpinBox.
......
...@@ -88,7 +88,7 @@ void InterferenceForm::createInterferenceWidgets() ...@@ -88,7 +88,7 @@ void InterferenceForm::createInterferenceWidgets()
} else if (auto* itf = dynamic_cast<Interference2DLatticeItem*>(interference)) { } else if (auto* itf = dynamic_cast<Interference2DLatticeItem*>(interference)) {
m_layout->addValue(itf->positionVariance()); m_layout->addValue(itf->positionVariance());
auto* w = new LatticeTypeSelectionForm(this, itf, m_ec); 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()); m_layout->addSelection(itf->decayFunctionSelection());
} else if (auto* itf = dynamic_cast<InterferenceFinite2DLatticeItem*>(interference)) { } else if (auto* itf = dynamic_cast<InterferenceFinite2DLatticeItem*>(interference)) {
m_layout->addValue(itf->positionVariance()); m_layout->addValue(itf->positionVariance());
...@@ -110,14 +110,14 @@ void InterferenceForm::createInterferenceWidgets() ...@@ -110,14 +110,14 @@ void InterferenceForm::createInterferenceWidgets()
"Domain size 2 in number of unit cells")); "Domain size 2 in number of unit cells"));
auto* w = new LatticeTypeSelectionForm(this, itf, m_ec); 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)) { } else if (auto* itf = dynamic_cast<Interference2DParacrystalItem*>(interference)) {
m_layout->addValue(itf->positionVariance()); m_layout->addValue(itf->positionVariance());
m_layout->addValue(itf->dampingLength()); m_layout->addValue(itf->dampingLength());
m_layout->addValue(itf->domainSize1()); m_layout->addValue(itf->domainSize1());
m_layout->addValue(itf->domainSize2()); m_layout->addValue(itf->domainSize2());
auto* w = new LatticeTypeSelectionForm(this, itf, m_ec); 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->probabilityDistributionSelection1());
m_layout->addSelection(itf->probabilityDistributionSelection2()); m_layout->addSelection(itf->probabilityDistributionSelection2());
} }
......
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