Merge pull request #437 from vizzuhq/getseries-rename

Channels' and DataCubeOptions' getSeries() renamed to getMeasures()

Author: simzer

src/chart/options/channels.cpp

@@ -39,7 +39,7 @@ Data::DataCubeOptions::IndexSet Channels::getDimensions() const
 	return dimensions;
 }
 
-Data::DataCubeOptions::IndexSet Channels::getSeries() const
+Data::DataCubeOptions::IndexSet Channels::getMeasures() const
 {
 	Data::DataCubeOptions::IndexSet series;
 
@@ -74,7 +74,7 @@ Data::DataCubeOptions::IndexSet Channels::getRealSeries(
 
 Data::DataCubeOptions Channels::getDataCubeOptions() const
 {
-	return {getDimensions(), getSeries()};
+	return {getDimensions(), getMeasures()};
 }
 
 std::pair<bool, Channel::OptionalIndex> Channels::addSeries(

src/chart/options/channels.h

@@ -29,7 +29,7 @@ class Channels
 
 	[[nodiscard]] Data::DataCubeOptions::IndexSet
 	getDimensions() const;
-	[[nodiscard]] Data::DataCubeOptions::IndexSet getSeries() const;
+	[[nodiscard]] Data::DataCubeOptions::IndexSet getMeasures() const;
 	[[nodiscard]] Data::DataCubeOptions::IndexSet getDimensions(
 	    const std::vector<ChannelId> &channelTypes) const;
 	[[nodiscard]] Data::DataCubeOptions::IndexSet getRealSeries(

src/chart/options/options.cpp

@@ -276,7 +276,7 @@ Gen::Orientation Options::getAutoOrientation() const
 std::optional<Options::LegendId> Options::getAutoLegend() const
 {
 	auto series = channels.getDimensions();
-	series.merge(channels.getSeries());
+	series.merge(channels.getMeasures());
 
 	for (auto id : channels.at(ChannelId::label).dimensionIds)
 		series.erase(id);

src/chart/options/options.h

@@ -115,10 +115,10 @@ class Options
 	Heading title{std::nullopt};
 	Heading subtitle{std::nullopt};
 	Heading caption{std::nullopt};
-	Anim::Interpolated<CoordSystem> coordSystem{
+	::Anim::Interpolated<CoordSystem> coordSystem{
 	    CoordSystem::cartesian};
 	double angle{};
-	Anim::Interpolated<ShapeType> geometry{ShapeType::rectangle};
+	::Anim::Interpolated<ShapeType> geometry{ShapeType::rectangle};
 	Orientation orientation{OrientationType{}};
 	Math::FuzzyBool split;
 	Base::Align::Type align{Base::Align::Type::none};

src/data/datacube/datacube.cpp

@@ -15,7 +15,7 @@ DataCube::DataCube(const DataTable &table,
     table(&table)
 {
 	if (options.getDimensions().empty()
-	    && options.getSeries().empty())
+	    && options.getMeasures().empty())
 		return;
 
 	MultiIndex sizes;
@@ -35,7 +35,7 @@ DataCube::DataCube(const DataTable &table,
 		dimBySeries.insert({idx, DimIndex(sizes.size() - 1)});
 	}
 
-	auto series = options.getSeries();
+	auto series = options.getMeasures();
 
 	if (series.empty()) series.emplace_back(SeriesType::Exists);
 

src/data/datacube/datacubeoptions.h

@@ -15,24 +15,25 @@ class DataCubeOptions
 	using IndexSet = std::set<SeriesIndex>;
 	using IndexVector = std::vector<SeriesIndex>;
 
-	DataCubeOptions(const IndexSet &dims, const IndexSet &sers)
+	DataCubeOptions(const IndexSet &dims, const IndexSet &msrs)
 	{
 		dimensions.insert(dimensions.end(), dims.begin(), dims.end());
-		series.insert(series.end(), sers.begin(), sers.end());
+		measures.insert(measures.end(), msrs.begin(), msrs.end());
 	}
 
 	[[nodiscard]] const IndexVector &getDimensions() const
 	{
 		return dimensions;
 	}
-	[[nodiscard]] const IndexVector &getSeries() const
+
+	[[nodiscard]] const IndexVector &getMeasures() const
 	{
-		return series;
+		return measures;
 	}
 
 private:
 	IndexVector dimensions;
-	IndexVector series;
+	IndexVector measures;
 };
 
 }