Makes use of TreeViewComboBox::plotColumnTopLevelClasses() also in Ba…

…rPlotDock and in ErrorBarWidget.
KDE · Oct 5, 2024 · 44135ee · 44135ee
1 parent a41362c
commit 44135ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 32 deletions.
diff --git a/src/frontend/dockwidgets/BarPlotDock.cpp b/src/frontend/dockwidgets/BarPlotDock.cpp
@@ -311,24 +311,11 @@ void BarPlotDock::removeXColumn() {
 
 void BarPlotDock::addDataColumn() {
  auto* cb = new TreeViewComboBox(this);
-
- static const QList<AspectType> list{AspectType::Folder,
- AspectType::Workbook,
- AspectType::Datapicker,
- AspectType::DatapickerCurve,
- AspectType::Spreadsheet,
- AspectType::LiveDataSource,
- AspectType::Column,
- AspectType::Worksheet,
- AspectType::CartesianPlot,
- AspectType::XYFitCurve,
- AspectType::XYSmoothCurve,
- AspectType::Notebook};
- cb->setTopLevelClasses(list);
+ cb->setTopLevelClasses(TreeViewComboBox::plotColumnTopLevelClasses());
  cb->setModel(aspectModel());
  connect(cb, &TreeViewComboBox::currentModelIndexChanged, this, &BarPlotDock::dataColumnChanged);
 
- int index = m_dataComboBoxes.size();
+ const int index = m_dataComboBoxes.size();
 
  if (index == 0) {
  QSizePolicy sizePolicy1(QSizePolicy::Expanding, QSizePolicy::Preferred);
@@ -373,19 +360,17 @@ void BarPlotDock::removeDataColumn() {
  }
 
  // TODO
- if (!m_removeButtons.isEmpty()) {
+ if (!m_removeButtons.isEmpty())
  ui.lDataColumn->setText(i18n("Columns:"));
- } else {
+ else
  ui.lDataColumn->setText(i18n("Column:"));
- }
 
  if (!m_initializing)
  setDataColumns();
 }
 
 void BarPlotDock::dataColumnChanged(const QModelIndex&) {
  CONDITIONAL_LOCK_RETURN;
-
  setDataColumns();
 }
 

diff --git a/src/frontend/widgets/ErrorBarWidget.cpp b/src/frontend/widgets/ErrorBarWidget.cpp
@@ -166,21 +166,9 @@ void ErrorBarWidget::setErrorBars(const QList<ErrorBar*>& errorBars) {
 }
 
 void ErrorBarWidget::setModel(AspectTreeModel* model) {
- QList<AspectType> list{AspectType::Folder,
- AspectType::Workbook,
- AspectType::Datapicker,
- AspectType::DatapickerCurve,
- AspectType::Spreadsheet,
- AspectType::LiveDataSource,
- AspectType::Column,
- AspectType::Worksheet,
- AspectType::CartesianPlot,
- AspectType::XYFitCurve,
- AspectType::XYSmoothCurve,
- AspectType::Notebook};
-
  cbXPlusColumn->setModel(model);
  cbXMinusColumn->setModel(model);
+ const auto& list = TreeViewComboBox::plotColumnTopLevelClasses();
  cbXPlusColumn->setTopLevelClasses(list);
  cbXMinusColumn->setTopLevelClasses(list);