Add titles

Author: vtereshkov

umplot.c

@@ -43,11 +43,20 @@ typedef struct
 } Grid;
 
 
+typedef struct
+{
+    char *x, *y, *graph;
+    uint32_t color;
+    int64_t fontSize;
+} Titles;
+
+
 typedef struct
 {
     Series *series;
     int64_t numSeries;
     Grid grid;
+    Titles titles;
 } Plot;
 
 
@@ -187,7 +196,7 @@ static void drawGraph(const Plot *plot, const ScreenTransform *transform)
 }
 
 
-static void drawGrid(const Plot *plot, const ScreenTransform *transform)
+static void drawGrid(const Plot *plot, const ScreenTransform *transform, int *maxYLabelWidth)
 {
     if (plot->grid.xNumLines <= 0 || plot->grid.yNumLines <= 0)
         return;
@@ -231,6 +240,9 @@ static void drawGrid(const Plot *plot, const ScreenTransform *transform)
     }
 
     // Horizontal grid
+    if (maxYLabelWidth)
+        *maxYLabelWidth = 0;
+
     for (int j = 0, y = startPtScreen.y; y > clientRect.y; j++, y = startPtScreen.y + j * yStep * transform->yScale)
     {
         // Line
@@ -245,12 +257,54 @@ static void drawGrid(const Plot *plot, const ScreenTransform *transform)
             const int labelX = clientRect.x - labelWidth - plot->grid.fontSize;
             const int labelY = y - plot->grid.fontSize / 2;
 
-            DrawText(label, labelX, labelY, plot->grid.fontSize, *(Color *)&plot->grid.color);           
+            DrawText(label, labelX, labelY, plot->grid.fontSize, *(Color *)&plot->grid.color);
+
+            if (maxYLabelWidth && labelWidth > *maxYLabelWidth)
+                *maxYLabelWidth = labelWidth;                       
         }
     }
 }
 
 
+static void drawTitles(const Plot *plot, const ScreenTransform *transform, int maxYLabelWidth)
+{
+    Rectangle clientRect = getClientRect();
+
+    // Horizontal axis
+    if (plot->titles.x && TextLength(plot->titles.x) > 0)
+    {
+        const int titleWidth = MeasureText(plot->titles.x, plot->titles.fontSize);
+
+        const int titleX = clientRect.x + clientRect.width / 2 - titleWidth / 2;
+        const int titleY = clientRect.y + clientRect.height + 2 * plot->grid.fontSize + plot->titles.fontSize;
+
+        DrawText(plot->titles.x, titleX, titleY, plot->titles.fontSize, *(Color *)&plot->titles.color);
+    }
+
+    // Vertical axis
+    if (plot->titles.y && TextLength(plot->titles.y) > 0)
+    {
+        const int titleWidth = MeasureText(plot->titles.y, plot->titles.fontSize);
+
+        const int titleX = clientRect.x - 2 * plot->grid.fontSize - plot->titles.fontSize - maxYLabelWidth;
+        const int titleY = clientRect.y + clientRect.height / 2 + titleWidth / 2;
+
+        DrawTextPro(GetFontDefault(), plot->titles.y, (Vector2){titleX, titleY}, (Vector2){0, 0}, -90.0, plot->titles.fontSize, 1, *(Color *)&plot->titles.color);
+    }
+
+    // Graph
+    if (plot->titles.graph && TextLength(plot->titles.graph) > 0)
+    {
+        const int titleWidth = MeasureText(plot->titles.graph, plot->titles.fontSize);
+
+        const int titleX = clientRect.x + clientRect.width / 2 - titleWidth / 2;
+        const int titleY = clientRect.y - 2 * plot->titles.fontSize;
+
+        DrawText(plot->titles.graph, titleX, titleY, plot->titles.fontSize, *(Color *)&plot->titles.color);
+    }        
+}
+
+
 static void drawZoomRect(Rectangle zoomRect, const ScreenTransform *transform)
 {
     if (zoomRect.width < 0)
@@ -275,7 +329,7 @@ void umplot_plot(UmkaStackSlot *params, UmkaStackSlot *result)
     SetTraceLogLevel(LOG_ERROR);
     SetConfigFlags(FLAG_WINDOW_RESIZABLE);
     InitWindow(640, 480, "UmPlot");
-    SetTargetFPS(60);
+    SetTargetFPS(30);
 
     Rectangle clientRect = getClientRect();
     Rectangle zoomRect = clientRect;
@@ -327,15 +381,19 @@ void umplot_plot(UmkaStackSlot *params, UmkaStackSlot *result)
         BeginDrawing();
         ClearBackground(WHITE);
 
-        // Graph border
+        // Border
         DrawRectangleLinesEx(clientRect, 1, BLACK);
 
         // Grid
-        drawGrid(plot, &transform);
+        int maxYLabelWidth = 0;
+        drawGrid(plot, &transform, &maxYLabelWidth);
 
         // Graph
         drawGraph(plot, &transform);
 
+        // Titles
+        drawTitles(plot, &transform, maxYLabelWidth);
+
         // Zoom rectangle
         if (showZoomRect)
             drawZoomRect(zoomRect, &transform);

umplot.um

@@ -31,17 +31,25 @@ type (
 		color: uint32
 		labelled: bool
 		fontSize: int
+	}
+
+	Titles* = struct {
+		x, y, graph: str
+		color: uint32
+		fontSize: int
 	}		
 
 	Plot* = struct {
 		series: []Series
 		grid: Grid
+		titles: Titles
 	}
 
 	PlotImpl = struct {
 		series: ^SeriesImpl
 		numSeries: int
 		grid: Grid
+		titles: Titles
 	}
 )
 
@@ -98,6 +106,7 @@ fn init*(numSeries: int = 1, kind: int = STYLE_LINE): Plot {
 	}
 
 	plt.grid = Grid{xNumLines: 5, yNumLines: 5, color: 0xFF808080, labelled: true, fontSize: 10}
+	plt.titles = Titles{x: "", y: "", graph: "", color: 0xFF808080, fontSize: 10}
 	return plt
 }
 
@@ -112,7 +121,7 @@ fn (p: ^Plot) plot*() {
 		seriesImpl[i] = SeriesImpl{&s.points[0], len(s.points), s.style}		
 	}
 
-	plotImpl := PlotImpl{&seriesImpl[0], len(seriesImpl), p.grid}
+	plotImpl := PlotImpl{&seriesImpl[0], len(seriesImpl), p.grid, p.titles}
 	umplot_plot(&plotImpl)
 }
 

umplottest.um

@@ -12,5 +12,9 @@ fn main() {
 
     plt.series[1].style.kind = umplot.STYLE_SCATTER
 
+    plt.titles.graph = "UmPlot demo"
+    plt.titles.x = "Time (seconds)"
+    plt.titles.y = "Value"
+
     plt.plot()
 }