- Fix bug in AGG text sizing

- Clean up comments in GraphLayout/Heatmap

Author: karwa

Sources/AGGRenderer/CPPAGGRenderer/CPPAGGRenderer.cpp

@@ -506,7 +506,7 @@ namespace CPPAGGRenderer{
         if (outW)
             *outW = x;
         if (outH)
-          *outH = maxY - abs(minY);
+          *outH = abs(maxY - minY);
     }
 
     unsigned save_image(const char *s, const char** errorDesc){

Sources/SwiftPlot/GraphLayout.swift

@@ -5,11 +5,6 @@ public enum LegendIcon {
     case shape(ScatterPlotSeriesOptions.ScatterPattern, Color)
 }
 
-// TODO: Add layout tests for:
-// - No axes labels
-// - No plot markers
-// - No axes labels or plot markers
-
 /// A component for laying-out and rendering rectangular graphs.
 ///
 /// The principle 3 components of a `GraphLayout` are:
@@ -134,7 +129,7 @@ extension GraphLayout {
                           .padding(.all(Self.xLabelPadding))
             elements.bottom.append(label)
             // Add a space, otherwise the label looks misaligned.
-            elements.bottom.append(FixedSpace(size: Self.titleLabelPadding))
+            elements.bottom.append(FixedSpace(size: Self.xLabelPadding/2))
         } else {
             elements.bottom.append(FixedSpace(size: Self.xLabelPadding))
         }

Sources/SwiftPlot/Heatmap.swift

@@ -1,6 +1,7 @@
 // Todo list for Heatmap:
 // - Spacing between blocks
 // - Setting X/Y axis labels
+// - Setting element label
 // - Displaying colormap next to plot
 
 /// A heatmap is a plot of 2-dimensional data, where each value is assigned a colour value along a gradient.
@@ -135,12 +136,7 @@ extension Heatmap: HasGraphLayout, Plot {
                 let offset = mapping.interpolate(element, range.min, range.max)
                 let color = colorMap.colorForOffset(offset)
                 renderer.drawSolidRect(rect, fillColor: color, hatchPattern: .none)
-                //        renderer.drawText(text: String(describing: element),
-                //                          location: rect.origin + Point(50,50),
-                //                          textSize: 20,
-                //                          color: .white,
-                //                          strokeWidth: 2,
-                //                          angle: 0)
+                // TODO: Element text.
             }
         }
     }

Tests/SwiftPlotTests/Heatmap/heatmap.swift

@@ -30,8 +30,6 @@ final class HeatmapTests: SwiftPlotTestCase {
         }
         try renderAndVerify(heatmap, size: Size(width: 900, height: 450))
     }
-    try renderAndVerify(summer, size: Size(width: 900, height: 450))
-  }
 }
 
 // Data used to generate Heatmaps.