dim-dim on x-y

Author: schaumb

CHANGELOG.md

@@ -16,6 +16,7 @@
 - Tooltip with 'seriesName' does not rewrite first series data.
 - Handle as different category the empty string and the missing value.
 - On chart resize, the font size is recalculated. 
+- Dim-Dim on x-y shows separated rectangles.
 
 ### Added
 

src/chart/generator/marker.cpp

@@ -12,7 +12,8 @@ Marker::Marker(const Options &options,
     ChannelsStats &stats,
     const Data::MultiIndex &index,
     MarkerIndex idx,
-    bool needMarkerInfo) :
+    bool needMarkerInfo,
+    bool rectangleSpacing) :
     enabled(data.empty() || !index.isEmpty()),
     cellInfo(enabled || needMarkerInfo
                  ? data.cellInfo(index, idx, needMarkerInfo)
@@ -75,7 +76,12 @@ Marker::Marker(const Options &options,
 	    index,
 	    horizontal ? &mainId->value : subAxisId);
 
-	spacing.x = (horizontal || (lineOrCircle && !polar))
+	spacing.x = (horizontal || (lineOrCircle && !polar)
+	                || (channels.at(ChannelId::y).isDimension()
+	                    && channels.at(ChannelId::y).hasDimension()
+	                    && options.geometry == ShapeType::rectangle
+	                    && options.align != Base::Align::Type::stretch
+	                    && rectangleSpacing))
 	                 && options.getChannels().anyAxisSet()
 	                 && channels.at(ChannelId::x).isDimension()
 	              ? 1
@@ -88,7 +94,12 @@ Marker::Marker(const Options &options,
 	    index,
 	    !horizontal ? &mainId->value : subAxisId);
 
-	spacing.y = (!horizontal || lineOrCircle)
+	spacing.y = (!horizontal || lineOrCircle
+	                || (channels.at(ChannelId::x).isDimension()
+	                    && channels.at(ChannelId::y).hasDimension()
+	                    && options.geometry == ShapeType::rectangle
+	                    && options.align != Base::Align::Type::stretch
+	                    && rectangleSpacing))
 	                 && options.getChannels().anyAxisSet()
 	                 && channels.at(ChannelId::y).isDimension()
 	              ? 1

src/chart/generator/marker.h

@@ -29,7 +29,8 @@ class Marker
 	    ChannelsStats &stats,
 	    const Data::MultiIndex &index,
 	    MarkerIndex idx,
-	    bool needMarkerInfo);
+	    bool needMarkerInfo,
+	    bool rectangleSpacing);
 
 	::Anim::Interpolated<ColorBase> colorBase;
 	Geom::Point position;

src/chart/generator/plot.cpp

@@ -129,6 +129,11 @@ Buckets Plot::generateMarkers()
 	for (auto &&[ix, mid] : options->markersInfo)
 		map.emplace(mid, ix);
 
+	bool rectangleSpacing{true};
+	if (auto &&sp = style.plot.marker.rectangleSpacing;
+	    sp && sp->get().has_value())
+		rectangleSpacing = *sp->get() > 0.0;
+
 	for (auto first = map.begin(), last = map.end();
 	     auto &&index : getDataCube()) {
 		auto &&markerId = markers.size();
@@ -139,7 +144,8 @@ Buckets Plot::generateMarkers()
 		    getStats(),
 		    index,
 		    markerId,
-		    needInfo);
+		    needInfo,
+		    rectangleSpacing);
 
 		mainBuckets[marker.mainId.get().seriesId]
 		           [marker.mainId.get().itemId] = ▮

src/chart/options/options.cpp

@@ -115,6 +115,9 @@ void Options::drilldownTo(const Options &other)
 	for (auto &&dim : other.getChannels().getDimensions())
 		if (!getChannels().isSeriesUsed(dim))
 			stackChannel.addSeries(dim);
+	if (stackChannel.isDimension()
+	    && geometry == ShapeType::rectangle)
+		this->align = Base::Align::Type::stretch;
 }
 
 void Options::intersection(const Options &other)

test/e2e/test_cases/test_cases.json

@@ -1775,7 +1775,7 @@
 			"refs": ["2352b28"]
 		},
 		"ww_next_steps/next_steps/38_C_L_line": {
-			"refs": ["b8ffd23"]
+			"refs": ["d03e139"]
 		},
 		"ww_next_steps/next_steps_Tests/02_C_R": {
 			"refs": ["c550e7b"]
@@ -1802,7 +1802,7 @@
 			"refs": ["feed828"]
 		},
 		"ww_next_steps/next_steps_Tests/38_C_L_line": {
-			"refs": ["a19aa52"]
+			"refs": ["3b273c7"]
 		},
 		"ww_next_steps/next_steps_Tests/axisLabel_problem": {
 			"refs": ["d33f180"]
@@ -3146,10 +3146,10 @@
 			"refs": ["dfa1f88"]
 		},
 		"ww_samples_for_presets/without_coo_sys/602_W_R_heatmap3": {
-			"refs": ["4905e0d"]
+			"refs": ["049e495"]
 		},
 		"ww_samples_for_presets/without_coo_sys/60_W_R_heatmap": {
-			"refs": ["4d4090e"]
+			"refs": ["6276534"]
 		},
 		"www_new_analytical_operations/operations/01_drilldown/Bar_Bar": {
 			"refs": ["6396b85"]
@@ -3236,7 +3236,7 @@
 			"refs": ["bd104b0"]
 		},
 		"web_content/cookbook/style/dark_theme": {
-			"refs": ["5c4e3c1"]
+			"refs": ["b38086a"]
 		},
 		"web_content/cookbook/style/highligh_markers": {
 			"refs": ["48d6207"]

test/e2e/tests/config_tests.json

@@ -41,7 +41,7 @@
 			"refs": ["5949df4"]
 		},
 		"dimension_axis_title": {
-			"refs": ["d9bab94"]
+			"refs": ["6b8167a"]
 		},
 		"dimension_axis_density": {
 			"refs": ["9b330fb"]

test/e2e/tests/fixes.json

@@ -35,10 +35,10 @@
 			"refs": ["2ad1738"]
 		},
 		"41932946": {
-			"refs": ["bf6b3a9"]
+			"refs": ["3ca57ce"]
 		},
 		"42836788": {
-			"refs": ["b0eeac3"]
+			"refs": ["4d761f7"]
 		},
 		"47977099": {
 			"refs": ["5f58727"]