Skip to content
Snippets Groups Projects

more systematic namespace names

Merged Wuttke, Joachim requested to merge j.1 into main
1 file
+ 6
6
Compare changes
  • Side-by-side
  • Inline
@@ -16,7 +16,7 @@
#include "GUI/Model/Axis/AmplitudeAxisItem.h"
#include "GUI/Model/Data/Data1DItem.h"
#include "GUI/Model/Data/Data2DItem.h"
#include <qcustomplot.h>
#include <utility>
namespace {
@@ -38,7 +38,7 @@ double commonMax(const QList<AmplitudeAxisItem*>& axes)
return max;
}
QCPRange commonRange(const QList<AmplitudeAxisItem*>& axes)
std::pair<double, double> commonRange(const QList<AmplitudeAxisItem*>& axes)
{
return {commonMin(axes), commonMax(axes)};
}
@@ -63,14 +63,14 @@ QList<AmplitudeAxisItem*> valueAxesFromData2DItems(const QList<Data2DItem*>& ite
void GUI::View::RangeUtil::setCommonRangeY(QList<Data1DItem*> items)
{
QCPRange range = commonRange(valueAxesFromData1DItems(items));
std::pair<double, double> range = commonRange(valueAxesFromData1DItems(items));
for (auto* item : items)
item->setYrange(range.lower, range.upper);
item->setYrange(range.first, range.second);
}
void GUI::View::RangeUtil::setCommonRangeZ(QList<Data2DItem*> items)
{
QCPRange range = commonRange(valueAxesFromData2DItems(items));
std::pair<double, double> range = commonRange(valueAxesFromData2DItems(items));
for (auto* item : items)
item->setZrange(range.lower, range.upper);
item->setZrange(range.first, range.second);
}
Loading