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

fct -> local ns

parent 9b86c598
No related branches found
No related tags found
1 merge request!1571minor cleanup in AxisItem context
...@@ -30,6 +30,20 @@ void updateAxesTitle(DataItem* intensityItem, const ICoordSystem& converter, Coo ...@@ -30,6 +30,20 @@ void updateAxesTitle(DataItem* intensityItem, const ICoordSystem& converter, Coo
intensityItem->setYaxisTitle(QString::fromStdString(converter.nameOfAxis(1, units))); 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 } // namespace
...@@ -101,16 +115,3 @@ void GUI::Model::JobItemUtil::setResults(DataItem* dataItem, const SimulationRes ...@@ -101,16 +115,3 @@ void GUI::Model::JobItemUtil::setResults(DataItem* dataItem, const SimulationRes
auto selected_units = GUI::Util::CoordName::coordFromName(dataItem->currentAxesUnits()); auto selected_units = GUI::Util::CoordName::coordFromName(dataItem->currentAxesUnits());
dataItem->setDatafield(result.datafield(selected_units)); 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;
}
...@@ -41,8 +41,6 @@ void createDefaultDetectorMap(DataItem* dataItem, const InstrumentItem* instrume ...@@ -41,8 +41,6 @@ void createDefaultDetectorMap(DataItem* dataItem, const InstrumentItem* instrume
//! Sets simulation results into the DataItem //! Sets simulation results into the DataItem
void setResults(DataItem* dataItem, const SimulationResult& result); void setResults(DataItem* dataItem, const SimulationResult& result);
ComboProperty availableUnits(const ICoordSystem& converter);
} // namespace GUI::Model::JobItemUtil } // namespace GUI::Model::JobItemUtil
#endif // BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_H #endif // BORNAGAIN_GUI_MODEL_DATA_JOBITEMUTIL_H
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