martin/aqdiagram
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

add margins also for x axis.

Browse Source
This commit is contained in:
Martin Preuss
2025-12-30 12:57:49 +01:00
parent 42c81e32ce
commit 2a641f7a25
1 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib/aqdiagram/graph/timegraph.c
View File

@@ -28,6 +28,7 @@
* ------------------------------------------------------------------------------------------------ * ------------------------------------------------------------------------------------------------
*/ */
static void _addMarginsToAxis(AQDG_GRAPH_AXIS *axis, double percent);
static void _setupTicksForTimeAxis(AQDG_GRAPH_AXIS *axis); static void _setupTicksForTimeAxis(AQDG_GRAPH_AXIS *axis);
static void _setupTicksForDataAxis(AQDG_GRAPH_AXIS *axis); static void _setupTicksForDataAxis(AQDG_GRAPH_AXIS *axis);
static int _readNumFromString(const char **sPtr); static int _readNumFromString(const char **sPtr);
@@ -104,12 +105,26 @@ void AQDG_TimeGraph_SetupTicks(AQDG_GRAPH *g, uint32_t flags, double minY, doubl
/* create ticks for X axis */ /* create ticks for X axis */
axis=AQDG_Graph_GetAxisByIndex(g, AQDG_GRAPH_AXISPOS_BOTTOM); axis=AQDG_Graph_GetAxisByIndex(g, AQDG_GRAPH_AXISPOS_BOTTOM);
if (axis) { if (axis) {
_addMarginsToAxis(axis, 2.0);
_setupTicksForTimeAxis(axis); _setupTicksForTimeAxis(axis);
} }
/* create ticks for Y axis */ /* create ticks for Y axis */
axis=AQDG_Graph_GetAxisByIndex(g, AQDG_GRAPH_AXISPOS_LEFT); axis=AQDG_Graph_GetAxisByIndex(g, AQDG_GRAPH_AXISPOS_LEFT);
if (axis) { if (axis) {
_addMarginsToAxis(axis, 10.0);
if (flags & AQDG_TIMEGRAPH_SETUPTICKS_FLAGS_MINY)
AQDG_Graph_Axis_SetMinValue(axis, minY);
if (flags & AQDG_TIMEGRAPH_SETUPTICKS_FLAGS_MAXY)
AQDG_Graph_Axis_SetMaxValue(axis, maxY);
_setupTicksForDataAxis(axis);
}
}
void _addMarginsToAxis(AQDG_GRAPH_AXIS *axis, double percent)
{
double vMax; double vMax;
double vMin; double vMin;
double vDiff; double vDiff;
@@ -126,23 +141,16 @@ void AQDG_TimeGraph_SetupTicks(AQDG_GRAPH *g, uint32_t flags, double minY, doubl
vDiff=1.0; vDiff=1.0;
} }
if (vDiff>0.0) { if (vDiff>0.0) {
double vDiffBy10; double vDiffForPercent;
DBG_ERROR(NULL, "Setting vmin and vmax"); DBG_ERROR(NULL, "Setting vmin and vmax");
vDiffBy10=vDiff/10.0; vDiffForPercent=vDiff*(percent/100.0);
vMin-=vDiffBy10; vMin-=vDiffForPercent;
vMax+=vDiffBy10; vMax+=vDiffForPercent;
DBG_ERROR(NULL, "new vMin=%.2f, vMax=%.2f", vMin, vMax); DBG_ERROR(NULL, "new vMin=%.2f, vMax=%.2f", vMin, vMax);
AQDG_Graph_Axis_SetMinValue(axis, vMin); AQDG_Graph_Axis_SetMinValue(axis, vMin);
AQDG_Graph_Axis_SetMaxValue(axis, vMax); AQDG_Graph_Axis_SetMaxValue(axis, vMax);
} }
if (flags & AQDG_TIMEGRAPH_SETUPTICKS_FLAGS_MINY)
AQDG_Graph_Axis_SetMinValue(axis, minY);
if (flags & AQDG_TIMEGRAPH_SETUPTICKS_FLAGS_MAXY)
AQDG_Graph_Axis_SetMaxValue(axis, maxY);
_setupTicksForDataAxis(axis);
}
} }