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

disambiguate -> certainIndex

parent 365fa969
No related branches found
No related tags found
1 merge request!2698follow-up
...@@ -24,7 +24,7 @@ public: ...@@ -24,7 +24,7 @@ public:
QStringList menuEntries() const { return m_menu_entries; } QStringList menuEntries() const { return m_menu_entries; }
virtual void setCertainIndex(int index) = 0; virtual void setCertainIndex(int index) = 0;
virtual int currentIndex() const = 0; virtual int certainIndex() const = 0;
protected: protected:
QString m_label; //!< A label text (short, no trailing colon) QString m_label; //!< A label text (short, no trailing colon)
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
template <typename... Args> void readFrom(QXmlStreamReader* r, Args... args); template <typename... Args> void readFrom(QXmlStreamReader* r, Args... args);
void setCertainIndex(int index) override { m_item.reset(Catalog::create(m_types[index])); } void setCertainIndex(int index) override { m_item.reset(Catalog::create(m_types[index])); }
int currentIndex() const override { return m_types.indexOf(Catalog::type(m_item.get())); } int certainIndex() const override { return m_types.indexOf(Catalog::type(m_item.get())); }
private: private:
std::unique_ptr<BaseItem> m_item; //!< Current selection std::unique_ptr<BaseItem> m_item; //!< Current selection
......
...@@ -117,6 +117,6 @@ void DistributionSelector::createMeanSpinBox(DoubleProperty& d) ...@@ -117,6 +117,6 @@ void DistributionSelector::createMeanSpinBox(DoubleProperty& d)
void DistributionSelector::refresh() void DistributionSelector::refresh()
{ {
QSignalBlocker b(m_distribution_combo); QSignalBlocker b(m_distribution_combo);
m_distribution_combo->setCurrentIndex(m_item->distributionSelection().currentIndex()); m_distribution_combo->setCurrentIndex(m_item->distributionSelection().certainIndex());
createDistributionWidgets(); createDistributionWidgets();
} }
...@@ -54,7 +54,7 @@ QComboBox* createComboBoxFromPolyPtr(PolyPtr<B, C>& d, std::function<void(int)> ...@@ -54,7 +54,7 @@ QComboBox* createComboBoxFromPolyPtr(PolyPtr<B, C>& d, std::function<void(int)>
combo->addItems(d.menuEntries()); combo->addItems(d.menuEntries());
combo->setMaxCount(d.menuEntries().size()); combo->setMaxCount(d.menuEntries().size());
combo->setToolTip(d.piTooltip()); combo->setToolTip(d.piTooltip());
combo->setCurrentIndex(d.currentIndex()); combo->setCurrentIndex(d.certainIndex());
if (inScrollArea) if (inScrollArea)
WheelEventEater::install(combo); WheelEventEater::install(combo);
......
...@@ -43,7 +43,7 @@ protected: ...@@ -43,7 +43,7 @@ protected:
m_combo = new QComboBox; m_combo = new QComboBox;
WheelEventEater::install(m_combo); WheelEventEater::install(m_combo);
m_combo->addItems(d.menuEntries()); m_combo->addItems(d.menuEntries());
m_combo->setCurrentIndex(d.currentIndex()); m_combo->setCurrentIndex(d.certainIndex());
m_combo->setMaxVisibleItems(m_combo->count()); m_combo->setMaxVisibleItems(m_combo->count());
QObject::connect(m_combo, &QComboBox::currentIndexChanged, [this, &d](int current) { QObject::connect(m_combo, &QComboBox::currentIndexChanged, [this, &d](int current) {
......
...@@ -36,7 +36,7 @@ InterferenceForm::InterferenceForm(QWidget* parent, ParticleLayoutItem* layoutIt ...@@ -36,7 +36,7 @@ InterferenceForm::InterferenceForm(QWidget* parent, ParticleLayoutItem* layoutIt
WheelEventEater::install(m_interference_type_combo); WheelEventEater::install(m_interference_type_combo);
const auto& d = layoutItem->interferenceSelection(); const auto& d = layoutItem->interferenceSelection();
m_interference_type_combo->addItems(d.menuEntries()); m_interference_type_combo->addItems(d.menuEntries());
m_interference_type_combo->setCurrentIndex(d.currentIndex()); m_interference_type_combo->setCurrentIndex(d.certainIndex());
m_interference_type_combo->setMaxVisibleItems(m_interference_type_combo->count()); m_interference_type_combo->setMaxVisibleItems(m_interference_type_combo->count());
m_interference_type_combo->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); m_interference_type_combo->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
m_layout->addBoldRow("Type:", m_interference_type_combo); m_layout->addBoldRow("Type:", m_interference_type_combo);
......
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