From 1a951ba190e76450dddd8515b3794feed4d5310c Mon Sep 17 00:00:00 2001 From: Joachim Wuttke <j.wuttke@fz-juelich.de> Date: Fri, 7 Apr 2023 16:43:10 +0200 Subject: [PATCH] fct -> local ns --- GUI/Model/Data/JobItemUtil.cpp | 27 ++++++++++++++------------- GUI/Model/Data/JobItemUtil.h | 2 -- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/GUI/Model/Data/JobItemUtil.cpp b/GUI/Model/Data/JobItemUtil.cpp index 1b1e6ab4022..106e7038b3d 100644 --- a/GUI/Model/Data/JobItemUtil.cpp +++ b/GUI/Model/Data/JobItemUtil.cpp @@ -30,6 +30,20 @@ void updateAxesTitle(DataItem* intensityItem, const ICoordSystem& converter, Coo intensityItem->setYaxisTitle(QString::fromStdString(converter.nameOfAxis(1, units))); } + +ComboProperty availableUnits(const ICoordSystem& converter) +{ + ComboProperty result; + for (auto units : converter.availableUnits()) { + auto unit_name = GUI::Util::CoordName::nameFromCoord(units); + if (!unit_name.isEmpty()) + result << unit_name; + } + + result.setCurrentValue(GUI::Util::CoordName::nameFromCoord(converter.defaultUnits())); + return result; +} + } // namespace @@ -101,16 +115,3 @@ void GUI::Model::JobItemUtil::setResults(DataItem* dataItem, const SimulationRes auto selected_units = GUI::Util::CoordName::coordFromName(dataItem->currentAxesUnits()); dataItem->setDatafield(result.datafield(selected_units)); } - -ComboProperty GUI::Model::JobItemUtil::availableUnits(const ICoordSystem& converter) -{ - ComboProperty result; - for (auto units : converter.availableUnits()) { - auto unit_name = GUI::Util::CoordName::nameFromCoord(units); - if (!unit_name.isEmpty()) - result << unit_name; - } - - result.setCurrentValue(GUI::Util::CoordName::nameFromCoord(converter.defaultUnits())); - return result; -} diff --git a/GUI/Model/Data/JobItemUtil.h b/GUI/Model/Data/JobItemUtil.h index 50c18473a3c..3b2db1a3257 100644 --- a/GUI/Model/Data/JobItemUtil.h +++ b/GUI/Model/Data/JobItemUtil.h @@ -41,8 +41,6 @@ void createDefaultDetectorMap(DataItem* dataItem, const InstrumentItem* instrume //! Sets simulation results into the DataItem void setResults(DataItem* dataItem, const SimulationResult& result); -ComboProperty availableUnits(const ICoordSystem& converter); - } // namespace GUI::Model::JobItemUtil #endif // BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_H -- GitLab