From c7be694896c4319c16c52727e5619d2c8a6cc95e Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Wed, 1 Oct 2025 23:10:58 +0200 Subject: [PATCH] use defines. --- src/lib/aqdiagram/graph/w_xaxis.c | 13 ++++++++++--- src/lib/aqdiagram/graph/w_yaxis.c | 13 ++++++++++--- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/lib/aqdiagram/graph/w_xaxis.c b/src/lib/aqdiagram/graph/w_xaxis.c index 9abe676..629eb75 100644 --- a/src/lib/aqdiagram/graph/w_xaxis.c +++ b/src/lib/aqdiagram/graph/w_xaxis.c @@ -20,6 +20,15 @@ +/* ------------------------------------------------------------------------------------------------ + * definitions + * ------------------------------------------------------------------------------------------------ + */ + +#define AQDG_WIDGET_XAXIS_TICK_MIN_X 10 + + + /* ------------------------------------------------------------------------------------------------ * forward declarations * ------------------------------------------------------------------------------------------------ @@ -131,7 +140,7 @@ void _drawTicks(AQDG_OBJECT *o, AQDG_DRAW_CONTEXT *dc, int absY) minValue=AQDG_AxisWidget_GetMinValue(o); maxValue=AQDG_AxisWidget_GetMaxValue(o); pen=AQDG_DrawableWidget_GetForegroundPenId(o); - showLevel1=(_screenDistBetweenLevelTicks(tickList, 1, contentSize, minValue, maxValue)>15)?1:0; + showLevel1=(_screenDistBetweenLevelTicks(tickList, 1, contentSize, minValue, maxValue)>AQDG_WIDGET_XAXIS_TICK_MIN_X)?1:0; tick=AQDG_Graph_Tick_List_First(tickList); while(tick) { @@ -162,9 +171,7 @@ int _screenDistBetweenLevelTicks(const AQDG_GRAPH_TICK_LIST *tickList, int lvl, int pts; v=AQDG_Graph_Tick_List_DistanceBetweenTicks(tickList, lvl); - DBG_ERROR(NULL, "Value diff: %.2f", v); pts=v*(contentSize/(maxValue-minValue)); - DBG_ERROR(NULL, "Point diff: %d", pts); return pts; } diff --git a/src/lib/aqdiagram/graph/w_yaxis.c b/src/lib/aqdiagram/graph/w_yaxis.c index 2bad21a..70c00bd 100644 --- a/src/lib/aqdiagram/graph/w_yaxis.c +++ b/src/lib/aqdiagram/graph/w_yaxis.c @@ -19,6 +19,15 @@ +/* ------------------------------------------------------------------------------------------------ + * definitions + * ------------------------------------------------------------------------------------------------ + */ + +#define AQDG_WIDGET_YAXIS_TICK_MIN_Y 20 + + + /* ------------------------------------------------------------------------------------------------ * forward declarations * ------------------------------------------------------------------------------------------------ @@ -158,7 +167,7 @@ void _drawTicks(AQDG_OBJECT *o, AQDG_DRAW_CONTEXT *dc, int absX) minValue=AQDG_AxisWidget_GetMinValue(o); maxValue=AQDG_AxisWidget_GetMaxValue(o); pen=AQDG_DrawableWidget_GetForegroundPenId(o); - showLevel1=(_screenDistBetweenLevelTicks(tickList, 1, contentSize, minValue, maxValue)>15)?1:0; + showLevel1=(_screenDistBetweenLevelTicks(tickList, 1, contentSize, minValue, maxValue)>AQDG_WIDGET_YAXIS_TICK_MIN_Y)?1:0; tick=AQDG_Graph_Tick_List_First(tickList); while(tick) { @@ -189,9 +198,7 @@ int _screenDistBetweenLevelTicks(const AQDG_GRAPH_TICK_LIST *tickList, int lvl, int pts; v=AQDG_Graph_Tick_List_DistanceBetweenTicks(tickList, lvl); - DBG_ERROR(NULL, "Value diff: %.2f", v); pts=(v*(contentSize/(maxValue-minValue))); - DBG_ERROR(NULL, "Point diff: %d", pts); return pts; }