diff --git a/GUI/View/Sample/InterferenceForm.cpp b/GUI/View/Sample/InterferenceForm.cpp index 009eaa875a535d8cfc3d5b2be76c5057bc4e1c09..9d0cc286134f56dc08d0f3d6ef80729434050464 100644 --- a/GUI/View/Sample/InterferenceForm.cpp +++ b/GUI/View/Sample/InterferenceForm.cpp @@ -25,25 +25,25 @@ InterferenceForm::InterferenceForm(QWidget* parent, ParticleLayoutItem* layoutItem, SampleEditorController* ec) : CollapsibleGroupBox("Interference Function", parent, layoutItem->expandInterference) - , m_interference_type_combo(new QComboBox(this)) + , m_cb(new QComboBox(this)) , m_layout_item(layoutItem) , m_ec(ec) { m_layout = new HeinzFormLayout(m_ec); body()->setLayout(m_layout); - WheelEventEater::install(m_interference_type_combo); + WheelEventEater::install(m_cb); const auto& d = layoutItem->interferenceSelection(); - m_interference_type_combo->addItems(d.menuEntries()); - m_interference_type_combo->setCurrentIndex(d.certainIndex()); - m_interference_type_combo->setMaxVisibleItems(m_interference_type_combo->count()); - m_interference_type_combo->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); - m_layout->addBoldRow("Type:", m_interference_type_combo); + m_cb->addItems(d.menuEntries()); + m_cb->setCurrentIndex(d.certainIndex()); + m_cb->setMaxVisibleItems(m_cb->count()); + m_cb->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); + m_layout->addBoldRow("Type:", m_cb); createInterferenceWidgets(); updateTitle(); - connect(m_interference_type_combo, &QComboBox::currentIndexChanged, + connect(m_cb, &QComboBox::currentIndexChanged, [this](int newIndex) { m_ec->selectInterference(this, newIndex); }); } @@ -127,5 +127,5 @@ void InterferenceForm::createInterferenceWidgets() void InterferenceForm::updateTitle() { - setTitle("Interference Function (" + m_interference_type_combo->currentText() + ")"); + setTitle("Interference Function (" + m_cb->currentText() + ")"); } diff --git a/GUI/View/Sample/InterferenceForm.h b/GUI/View/Sample/InterferenceForm.h index 33cef82df16ffc94f38f6d43353c3ddb1b441013..eb0353866457c7c70e2f0ff6ac44fe118aa64150 100644 --- a/GUI/View/Sample/InterferenceForm.h +++ b/GUI/View/Sample/InterferenceForm.h @@ -36,7 +36,7 @@ private: void updateTitle(); HeinzFormLayout* m_layout; - QComboBox* m_interference_type_combo; + QComboBox* m_cb; ParticleLayoutItem* m_layout_item; SampleEditorController* m_ec; };