Wrong y axis label position for line/circle in case of both axis dimension

CHANGELOG.md

@@ -5,6 +5,7 @@
 ### Fixed
 
 - next() can be called multiple times from Plugin hooks
+- Line and circle chats with only dimensions on x, and y axes the markers were off the axis labels.
 
 ### Added
 

src/chart/animator/planner.cpp

@@ -410,6 +410,14 @@ bool Planner::needVertical() const
 	                   != target->dimensionAxises.at(
 	                       Gen::ChannelId::size)))
 	    || source->anyAxisSet != target->anyAxisSet
+	    || (source->markerConnectionOrientation
+	            != target->markerConnectionOrientation
+	        && ((source->markerConnectionOrientation.value_or(
+	                 Gen::Orientation::horizontal)
+	                == Gen::Orientation::vertical)
+	            || (target->markerConnectionOrientation.value_or(
+	                    Gen::Orientation::horizontal)
+	                == Gen::Orientation::vertical)))
 	    || anyMarker(
 	        [&](const auto &source, const auto &target)
 	        {
@@ -434,6 +442,14 @@ bool Planner::needHorizontal() const
 	           != target->guides.at(Gen::ChannelId::x)
 	    || source->anyAxisSet != target->anyAxisSet
 	    || source->keepAspectRatio != target->keepAspectRatio
+	    || (source->markerConnectionOrientation
+	            != target->markerConnectionOrientation
+	        && ((source->markerConnectionOrientation.value_or(
+	                 Gen::Orientation::vertical)
+	                == Gen::Orientation::horizontal)
+	            || (target->markerConnectionOrientation.value_or(
+	                    Gen::Orientation::vertical)
+	                == Gen::Orientation::horizontal)))
 	    || anyMarker(
 	        [&](const auto &source, const auto &target)
 	        {

src/chart/generator/marker.cpp

@@ -64,15 +64,20 @@ Marker::Marker(const Options &options,
 	}
 
 	auto horizontal = options.isHorizontal();
+	auto lineOrCircle = options.geometry == ShapeType::line
+	                 || options.geometry == ShapeType::circle;
+	auto polar = options.coordSystem.get() == CoordSystem::polar;
+
 	position.x = size.x = getValueForChannel(channels,
 	    ChannelId::x,
 	    data,
 	    stats,
 	    options.subAxisOf(ChannelId::x),
 	    !horizontal && stackInhibitingShape);
 
-	spacing.x = (horizontal && options.getChannels().anyAxisSet()
-	                && channels.at(ChannelId::x).isDimension())
+	spacing.x = (horizontal || (lineOrCircle && !polar))
+	                 && options.getChannels().anyAxisSet()
+	                 && channels.at(ChannelId::x).isDimension()
 	              ? 1
 	              : 0;
 
@@ -83,8 +88,9 @@ Marker::Marker(const Options &options,
 	    options.subAxisOf(ChannelId::y),
 	    horizontal && stackInhibitingShape);
 
-	spacing.y = (!horizontal && options.getChannels().anyAxisSet()
-	                && channels.at(ChannelId::y).isDimension())
+	spacing.y = (!horizontal || lineOrCircle)
+	                 && options.getChannels().anyAxisSet()
+	                 && channels.at(ChannelId::y).isDimension()
 	              ? 1
 	              : 0;
 
@@ -110,20 +116,18 @@ Marker::Marker(const Options &options,
 }
 
 void Marker::setNextMarker(uint64_t itemId,
-    Marker *marker,
+    Marker &marker,
     bool horizontal,
     bool main)
 {
-	if (marker) {
-		(main ? nextMainMarkerIdx : nextSubMarkerIdx) = marker->idx;
+	(main ? nextMainMarkerIdx : nextSubMarkerIdx) = marker.idx;
 
-		if (main) marker->prevMainMarkerIdx = idx;
+	if (main) marker.prevMainMarkerIdx = idx;
 
-		if (itemId != 0) {
-			double Geom::Point::*const coord =
-			    horizontal ? &Geom::Point::x : &Geom::Point::y;
-			marker->position.*coord += position.*coord;
-		}
+	if (itemId != 0) {
+		double Geom::Point::*const coord =
+		    horizontal ? &Geom::Point::x : &Geom::Point::y;
+		marker.position.*coord += position.*coord;
 	}
 }
 

src/chart/generator/marker.h

@@ -89,7 +89,7 @@ class Marker
 	::Anim::Interpolated<uint64_t> nextSubMarkerIdx;
 
 	void setNextMarker(uint64_t itemId,
-	    Marker *marker,
+	    Marker &marker,
 	    bool horizontal,
 	    bool main);
 	void resetSize(bool horizontal);

src/chart/generator/plot.cpp

@@ -159,8 +159,15 @@ void Plot::generateMarkers(const Data::DataTable &table)
 	}
 	clearEmptyBuckets(mainBuckets, true);
 	clearEmptyBuckets(subBuckets, false);
-	linkMarkers(mainBuckets, true);
+	auto conn = linkMarkers(mainBuckets, true);
 	linkMarkers(subBuckets, false);
+
+	if (conn && options->geometry.get() == ShapeType::line
+	    && options->getChannels().at(ChannelId::x).isDimension()
+	    && options->getChannels().at(ChannelId::y).isDimension()) {
+		markerConnectionOrientation.emplace(
+		    *options->orientation.get());
+	}
 }
 
 void Plot::generateMarkersInfo()
@@ -232,10 +239,11 @@ void Plot::clearEmptyBuckets(const Buckets &buckets, bool main)
 	}
 }
 
-void Plot::linkMarkers(const Buckets &buckets, bool main)
+bool Plot::linkMarkers(const Buckets &buckets, bool main)
 {
 	auto sorted = sortedBuckets(buckets, main);
 
+	bool hasConnection{};
 	for (const auto &pair : buckets) {
 		const auto &bucket = pair.second;
 
@@ -246,12 +254,16 @@ void Plot::linkMarkers(const Buckets &buckets, bool main)
 			auto iNext = (i + 1) % sorted.size();
 			auto idNext = sorted[iNext].first;
 			auto indexNext = bucket.at(idNext);
+			auto &next = markers[indexNext];
 			act.setNextMarker(iNext,
-			    &markers[indexNext],
+			    next,
 			    options->isHorizontal() == main,
 			    main);
+			if (act.enabled && next.enabled && indexAct != indexNext)
+				hasConnection = true;
 		}
 	}
+	return hasConnection;
 }
 
 void Plot::normalizeXY()

src/chart/generator/plot.h

@@ -67,6 +67,7 @@ class Plot
 	Guides guides;
 	DimensionAxises dimensionAxises;
 	Math::FuzzyBool keepAspectRatio;
+	std::optional<Orientation> markerConnectionOrientation;
 
 	Plot(const Plot &other) = default;
 	Plot(PlotOptionsPtr options, const Plot &other);
@@ -124,7 +125,7 @@ class Plot
 
 	void generateMarkers(const Data::DataTable &table);
 	void generateMarkersInfo();
-	void linkMarkers(const Buckets &buckets, bool main);
+	bool linkMarkers(const Buckets &buckets, bool main);
 	void normalizeXY();
 	void calcMeasureAxises(const Data::DataTable &dataTable);
 	void calcMeasureAxis(ChannelId type,