Merge pull request #547 from vizzuhq/rectangleSpacing

Add default no rectangle spacing on heatmap and coxcomb

Author: schaumb

CHANGELOG.md

@@ -6,6 +6,7 @@
 
 ### Fixed
 
+- Add default no rectangle spacing on heatmap and coxcomb.
 - Change bubblechart behavior on failure.
 - Fix reference markers on bubblechart with negative values. 
 - From now lightness channel goes from light (low value) to dark (high value) colors. 

src/chart/main/stylesheet.cpp

@@ -126,11 +126,26 @@ void Sheet::setMarkers()
 			defaultParams.plot.marker.borderWidth = 1;
 			defaultParams.plot.marker.fillOpacity = 0.8;
 		}
-
-		if (options->geometry == Gen::ShapeType::rectangle
-		    && options->coordSystem.get() == Gen::CoordSystem::polar
-		    && options->getVeritalAxis().isEmpty())
-			defaultParams.plot.marker.rectangleSpacing = 0;
+		else if (options->geometry == Gen::ShapeType::rectangle) {
+			const auto &vertical = options->getVeritalAxis();
+			const auto &horizontal = options->getHorizontalAxis();
+			if (auto polar = options->coordSystem.get()
+			              == Gen::CoordSystem::polar;
+			    polar && vertical.isEmpty())
+				defaultParams.plot.marker.rectangleSpacing = 0;
+			else if (auto needRectangleSpacing =
+			             vertical.isMeasure()
+			                 != horizontal.isMeasure()
+			             && (!polar || vertical.isDimension());
+			         !needRectangleSpacing) {
+				defaultParams.plot.marker.rectangleSpacing = 0;
+				if (vertical.isDimension()
+				    || horizontal.isDimension()) {
+					defaultParams.plot.marker.borderWidth = 0.5;
+					defaultParams.plot.marker.borderOpacity = 0.7;
+				}
+			}
+		}
 	}
 }
 

test/e2e/test_cases/static_chart_types/polar_coo_sys/coxcomb_rectangle_1dis_1con.mjs

@@ -14,13 +14,6 @@ const testSteps = [
 				title: 'Coxcomb Chart',
 				orientation: 'horizontal',
 				coordSystem: 'polar'
-			},
-			style: {
-				plot: {
-					marker: {
-						rectangleSpacing: 0
-					}
-				}
 			}
 		})
 ]