Merge branch 'main' into add_chart_tests

Author: schaumb

CHANGELOG.md

@@ -28,6 +28,7 @@
 - When X axis dimension labels are close to each other, they are rotated to avoid overlapping.
 - The event handler registration order changed. Now the handlers are called in the opposite order of the registration.
 - Added the padded rectangle, the bounding rectangle and the align parameter to the draw text event object.
+- Tooltip works on marker labels too.
 
 ## [0.9.3] - 2023-12-20
 

src/apps/weblib/interface.cpp

@@ -322,7 +322,7 @@ void Interface::addRecord(ObjectRegistry::Handle chart,
 const char *Interface::dataMetaInfo(ObjectRegistry::Handle chart)
 {
 	thread_local std::string res;
-	res = Conv::toJSON(getChart(chart)->getTable().getInfos());
+	res = getChart(chart)->getTable().getInfos();
 	return res.c_str();
 }
 

src/apps/weblib/ts-api/plugins/tooltip.ts

@@ -1,5 +1,5 @@
 import { Snapshot } from '../module/cchart.js'
-import { Element, Marker, PointerEvent } from '../events.js'
+import { Element, Marker, MarkerLabel, PointerEvent } from '../events.js'
 import { Plugin, type PluginHooks, type PrepareAnimationContext } from '../plugins.js'
 
 import Vizzu from '../vizzu.js'
@@ -71,8 +71,8 @@ export class Tooltip implements Plugin {
 	_mouseon(param: PointerEvent): void {
 		this._id++
 		const id = this._id
-		if (param.target && this._isMarker(param.target)) {
-			const markerId = param.target.index
+		const markerId = this._getMarkerId(param.target)
+		if (markerId !== null) {
 			setTimeout(() => {
 				this._in(id, markerId)
 			}, 0)
@@ -86,6 +86,8 @@ export class Tooltip implements Plugin {
 	_getMarkerId(target: Element | null): number | null {
 		if (target && this._isMarker(target)) {
 			return target.index
+		} else if (target && this._isMarkerLabel(target)) {
+			return target.parent.index
 		} else {
 			return null
 		}
@@ -95,6 +97,10 @@ export class Tooltip implements Plugin {
 		return target.tagName === 'plot-marker'
 	}
 
+	_isMarkerLabel(target: Element): target is MarkerLabel {
+		return target.tagName === 'plot-marker-label'
+	}
+
 	_in(id: number, markerId: number): void {
 		if (this._id === id) {
 			if (!this._animating) {

src/chart/generator/marker.cpp

@@ -158,15 +158,17 @@ Conv::JSONObj &&Marker::appendToJSON(Conv::JSONObj &&jsonObj) const
 	    std::ranges::views::transform(cellInfo.categories,
 	        [this](const auto &pair)
 	        {
-		        return std::make_pair(pair.first.toString(table),
+		        return std::make_pair(
+		            pair.first.toString(table.get()),
 		            table.get()
 		                .getInfo(pair.first.getColIndex().value())
 		                .categories()[pair.second]);
 	        }))("values",
 	    std::ranges::views::transform(cellInfo.values,
 	        [this](const auto &pair)
 	        {
-		        return std::make_pair(pair.first.toString(table),
+		        return std::make_pair(
+		            pair.first.toString(table.get()),
 		            pair.second);
 	        }))("index", idx);
 }

src/chart/options/optionssetter.h

@@ -5,15 +5,7 @@
 
 #include "options.h"
 
-namespace Vizzu
-{
-
-namespace Data
-{
-class DataTable;
-}
-
-namespace Gen
+namespace Vizzu::Gen
 {
 
 class OptionsSetter
@@ -59,7 +51,6 @@ class OptionsSetter
 	const Data::DataTable *table{};
 };
 
-}
 }
 
 #endif

src/data/datacube/datacube.cpp

@@ -23,7 +23,8 @@ DataCube::DataCube(const DataTable &table,
 		auto size =
 		    idx.getType().isReal()
 		        ? table.getInfo(idx.getColIndex().value())
-		              .dimensionValueCnt()
+		              .categories()
+		              .size()
 		    : idx.getType() == SeriesType::Index
 		        ? table.getRowCount()
 		        : throw std::logic_error("internal error: cannot "
@@ -63,7 +64,7 @@ DataCube::DataCube(const DataTable &table,
 	}
 }
 
-MultiIndex DataCube::getIndex(const TableRow<double> &row,
+MultiIndex DataCube::getIndex(const DataTable::Row &row,
     const std::vector<SeriesIndex> &indices,
     size_t rowIndex)
 {
@@ -238,9 +239,9 @@ MultiDim::SubSliceIndex DataCube::subSliceIndex(
 	for (const auto &pair : stringMarkerId) {
 		auto colIdx = table->getColumn(pair.first);
 		auto seriesIdx = table->getIndex(colIdx);
-		const auto &values =
-		    table->getInfo(colIdx).dimensionValueIndexes();
-		auto valIdx = values.at(pair.second);
+		auto valIdx =
+		    table->getInfo(colIdx).dimensionValueIndexes().at(
+		        pair.second);
 		auto dimIdx = getDimBySeries(SeriesIndex(seriesIdx));
 		index.push_back(
 		    MultiDim::SliceIndex{dimIdx, MultiDim::Index{valIdx}});

src/data/datacube/datacube.h

@@ -15,7 +15,6 @@
 namespace Vizzu::Data
 {
 
-class DataTable;
 template <typename T> class TableRow;
 
 using SubCellIndex =
@@ -101,7 +100,7 @@ class DataCube
 	std::map<SeriesIndex, SubCellIndex> subIndexBySeries;
 	std::vector<SeriesIndex> seriesBySubIndex;
 
-	static MultiDim::MultiIndex getIndex(const TableRow<double> &row,
+	static MultiDim::MultiIndex getIndex(const DataTable::Row &row,
 	    const std::vector<SeriesIndex> &indices,
 	    size_t rowIndex);
 

src/data/datacube/datastat.cpp

@@ -11,7 +11,8 @@ DataStat::DataStat(const DataTable &table,
 	for (const auto &idx : indices) {
 		if (idx.getType().isReal()) {
 			auto valueCnt = table.getInfo(idx.getColIndex().value())
-			                    .dimensionValueCnt();
+			                    .categories()
+			                    .size();
 			usedColumnIDs.insert(
 			    {static_cast<size_t>(idx.getColIndex().value()),
 			        usedValues.size()});
@@ -37,7 +38,7 @@ size_t DataStat::usedValueCntOf(const SeriesIndex &index) const
 	return 0;
 }
 
-void DataStat::trackIndex(const TableRow<double> &row,
+void DataStat::trackIndex(const DataTable::Row &row,
     const std::vector<SeriesIndex> &indices)
 {
 	for (auto i = 0U; i < indices.size(); ++i) {

src/data/datacube/datastat.h

@@ -9,8 +9,6 @@
 namespace Vizzu::Data
 {
 
-class DataTable;
-
 class DataStat
 {
 public:
@@ -21,7 +19,7 @@ class DataStat
 	size_t usedValueCntOf(const SeriesIndex &index) const;
 
 private:
-	void trackIndex(const TableRow<double> &row,
+	void trackIndex(const DataTable::Row &row,
 	    const std::vector<SeriesIndex> &indices);
 
 	void countValues();

src/data/table/columninfo.cpp

@@ -71,11 +71,9 @@ const ColumnInfo::Values &ColumnInfo::categories() const
 	return values;
 }
 
-size_t ColumnInfo::dimensionValueCnt() const { return values.size(); }
-
 std::string ColumnInfo::getName() const { return name; }
 
-std::string ColumnInfo::getUnit() const { return unit; }
+const std::string &ColumnInfo::getUnit() const { return unit; }
 
 Math::Range<double> ColumnInfo::getRange() const { return range; }