From ca43571eb3f9d985595341f49ba2d64a8b46ab32 Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Sun, 16 Jun 2024 19:36:11 +0200 Subject: [PATCH] removed pens and fonts from graph (will be handled in graph window). --- src/lib/aqdiagram/graph/graph.c | 125 ------------------------------ src/lib/aqdiagram/graph/graph.h | 78 ------------------- src/lib/aqdiagram/graph/graph_p.h | 5 -- src/lib/aqdiagram/graph/o_graph.c | 16 ++-- 4 files changed, 8 insertions(+), 216 deletions(-) diff --git a/src/lib/aqdiagram/graph/graph.c b/src/lib/aqdiagram/graph/graph.c index 2a7d424..c68fe93 100644 --- a/src/lib/aqdiagram/graph/graph.c +++ b/src/lib/aqdiagram/graph/graph.c @@ -18,36 +18,12 @@ -static uint32_t _curveColors[]={ - AQDG_GRAPH_COL_LIME, - AQDG_GRAPH_COL_BLUE, - AQDG_GRAPH_COL_CYAN, - AQDG_GRAPH_COL_MAGENTA, - AQDG_GRAPH_COL_GREEN, - AQDG_GRAPH_COL_TURQUOISE, - AQDG_GRAPH_COL_DEEPPINK, - AQDG_GRAPH_COL_NAVY -}; - - - - -static void _presetPens(AQDG_GRAPH *g); -static void _presetFonts(AQDG_GRAPH *g); -static void _releasePens(AQDG_GRAPH *g); -static void _releaseFonts(AQDG_GRAPH *g); - - - - AQDG_GRAPH *AQDG_Graph_new(void) { AQDG_GRAPH *g; GWEN_NEW_OBJECT(AQDG_GRAPH, g); - _presetPens(g); - _presetFonts(g); g->subGraphList=AQDG_Graph_SubGraph_List_new(); return g; @@ -60,8 +36,6 @@ void AQDG_Graph_free(AQDG_GRAPH *g) if (g) { int i; - _releaseFonts(g); - _releasePens(g); for (i=0; iaxisArray[i]); g->axisArray[i]=NULL; @@ -74,60 +48,6 @@ void AQDG_Graph_free(AQDG_GRAPH *g) -void _presetPens(AQDG_GRAPH *g) -{ - if (g) { - int i; - - for (i=0; ipenArray[i]=-1; - } - } -} - - - -void _presetFonts(AQDG_GRAPH *g) -{ - if (g) { - int i; - - for (i=0; ifontArray[i]=-1; - } - } -} - - - -void _releasePens(AQDG_GRAPH *g) -{ - if (g) { - int i; - - for (i=0; idrawContext, g->penArray[i]); - g->penArray[i]=-1; - } - } -} - - - -void _releaseFonts(AQDG_GRAPH *g) -{ - if (g) { - int i; - - for (i=0; idrawContext, g->fontArray[i]); - g->fontArray[i]=-1; - } - } -} - - - const char *AQDG_Graph_GetTitle(const AQDG_GRAPH *g) { return g?g->title:NULL; @@ -215,48 +135,3 @@ void AQDG_Graph_AddSubGraph(AQDG_GRAPH *g, AQDG_GRAPH_SUBGRAPH *sg) -int AQDG_Graph_GetPen(const AQDG_GRAPH *g, int idx) -{ - return (g && idxpenArray[idx]:-1; -} - - - -void AQDG_Graph_SetPen(AQDG_GRAPH *g, int idx, int penId) -{ - if (g && idxpenArray[idx]>=0) - AQDG_Draw_Context_PenRelease(g->drawContext, g->penArray[idx]); - g->penArray[idx]=penId; - } -} - - - -int AQDG_Graph_GetFont(const AQDG_GRAPH *g, int idx) -{ - return (g && idxfontArray[idx]:-1; -} - - - -void AQDG_Graph_SetFont(AQDG_GRAPH *g, int idx, int fontId) -{ - if (g && idxfontArray[idx]>=0) - AQDG_Draw_Context_FontRelease(g->drawContext, g->fontArray[idx]); - g->fontArray[idx]=fontId; - } -} - - - -uint32_t AQDG_Graph_GetStandardCurveColor(int idx, uint32_t defCol) -{ - if (idx -/* see https://www.rapidtables.com/web/color/RGB_Color.html */ -#define AQDG_GRAPH_COL_BLACK ((uint32_t) 0x00000000) -#define AQDG_GRAPH_COL_WHITE ((uint32_t) 0xFFFFFF00) -#define AQDG_GRAPH_COL_RED ((uint32_t) 0xFF000000) -#define AQDG_GRAPH_COL_LIME ((uint32_t) 0x00FF0000) -#define AQDG_GRAPH_COL_BLUE ((uint32_t) 0x0000FF00) -#define AQDG_GRAPH_COL_YELLOW ((uint32_t) 0xFFFF0000) -#define AQDG_GRAPH_COL_CYAN ((uint32_t) 0x00FFFF00) -#define AQDG_GRAPH_COL_MAGENTA ((uint32_t) 0xFF00FF00) -#define AQDG_GRAPH_COL_SILVER ((uint32_t) 0xC0C0C000) -#define AQDG_GRAPH_COL_GRAY ((uint32_t) 0x80808000) -#define AQDG_GRAPH_COL_MAROON ((uint32_t) 0x80000000) -#define AQDG_GRAPH_COL_OLIVE ((uint32_t) 0x80800000) -#define AQDG_GRAPH_COL_GREEN ((uint32_t) 0x00800000) -#define AQDG_GRAPH_COL_PURPLE ((uint32_t) 0x80008000) -#define AQDG_GRAPH_COL_TEAL ((uint32_t) 0x00808000) -#define AQDG_GRAPH_COL_NAVY ((uint32_t) 0x00008000) - -#define AQDG_GRAPH_COL_ORANGE ((uint32_t) 0xFFA50000) -#define AQDG_GRAPH_COL_GOLD ((uint32_t) 0xFFD70000) -#define AQDG_GRAPH_COL_TURQUOISE ((uint32_t) 0x40E0D000) -#define AQDG_GRAPH_COL_SKYBLUE ((uint32_t) 0x87CEEB00) -#define AQDG_GRAPH_COL_DEEPPINK ((uint32_t) 0xFF149300) -#define AQDG_GRAPH_COL_COMSILK ((uint32_t) 0xFFF8DC00) -#define AQDG_GRAPH_COL_GAINSBORO ((uint32_t) 0xDCDCDC00) -#define AQDG_GRAPH_COL_WHITESMOKE ((uint32_t) 0xF5F5F500) - - - -enum { - AQDG_GRAPH_PEN_IDX_TITLE=0, - AQDG_GRAPH_PEN_IDX_SUBTITLE, - AQDG_GRAPH_PEN_IDX_AXISLINE, - AQDG_GRAPH_PEN_IDX_AXISLABEL, - AQDG_GRAPH_PEN_IDX_TICKLABELMAINLEVEL, - AQDG_GRAPH_PEN_IDX_TICKLABELSUBLEVEL, - AQDG_GRAPH_PEN_IDX_TICKMAINLEVEL, - AQDG_GRAPH_PEN_IDX_TICKSUBLEVEL, - AQDG_GRAPH_PEN_IDX_GRAPHBACKGROUND, - AQDG_GRAPH_PEN_IDX_GRID, - AQDG_GRAPH_PEN_IDX_BACKGROUND, - AQDG_GRAPH_PEN_IDX_CURVE0, - AQDG_GRAPH_PEN_IDX_CURVE1, - AQDG_GRAPH_PEN_IDX_CURVE2, - AQDG_GRAPH_PEN_IDX_CURVE3, - AQDG_GRAPH_PEN_IDX_CURVE4, - AQDG_GRAPH_PEN_IDX_CURVE5, - AQDG_GRAPH_PEN_IDX_CURVE6, - AQDG_GRAPH_PEN_IDX_CURVE7, - - AQDG_GRAPH_PEN_IDX_LAST -}; - - - -enum { - AQDG_GRAPH_FONT_IDX_TITLE=0, - AQDG_GRAPH_FONT_IDX_SUBTITLE, - AQDG_GRAPH_FONT_IDX_AXISLABEL, - AQDG_GRAPH_FONT_IDX_TICKLABELMAINLEVEL, - AQDG_GRAPH_FONT_IDX_TICKLABELSUBLEVEL, - - AQDG_GRAPH_FONT_IDX_LAST -}; - - enum { AQDG_GRAPH_TYPE_UNKNOWN=-1, @@ -133,18 +67,6 @@ void AQDG_Graph_AddSubGraph(AQDG_GRAPH *g, AQDG_GRAPH_SUBGRAPH *sg); AQDG_DRAW_CONTEXT *AQDG_Graph_GetDrawContext(const AQDG_GRAPH *g); void AQDG_Graph_SetDrawContext(AQDG_GRAPH *g, AQDG_DRAW_CONTEXT *dc); -int AQDG_Graph_GetPen(const AQDG_GRAPH *g, int idx); -void AQDG_Graph_SetPen(AQDG_GRAPH *g, int idx, int penId); - -int AQDG_Graph_GetFont(const AQDG_GRAPH *g, int idx); -void AQDG_Graph_SetFont(AQDG_GRAPH *g, int idx, int fontId); - -int AQDG_Graph_CreatePenFromDb(AQDG_GRAPH *g, GWEN_DB_NODE *db, const char *name, uint32_t defColor, int defWidth, int defDash); -int AQDG_Graph_CreateFontFromDb(AQDG_GRAPH *gr, GWEN_DB_NODE *db, const char *name, int defaultFontSize); -uint32_t AQDG_Graph_GetStandardCurveColor(int idx, uint32_t defCol); - - - #endif diff --git a/src/lib/aqdiagram/graph/graph_p.h b/src/lib/aqdiagram/graph/graph_p.h index ee69c03..a1104b7 100644 --- a/src/lib/aqdiagram/graph/graph_p.h +++ b/src/lib/aqdiagram/graph/graph_p.h @@ -13,8 +13,6 @@ #define AQDG_GRAPH_NUMAXIS 4 -#define AQDG_GRAPH_NUMPENS AQDG_GRAPH_PEN_IDX_LAST -#define AQDG_GRAPH_NUMFONTS AQDG_GRAPH_FONT_IDX_LAST typedef struct AQDG_GRAPH AQDG_GRAPH; @@ -26,9 +24,6 @@ struct AQDG_GRAPH { AQDG_DRAW_CONTEXT *drawContext; - int penArray[AQDG_GRAPH_NUMPENS]; - int fontArray[AQDG_GRAPH_NUMFONTS]; - }; diff --git a/src/lib/aqdiagram/graph/o_graph.c b/src/lib/aqdiagram/graph/o_graph.c index 7b02fb7..8367d08 100644 --- a/src/lib/aqdiagram/graph/o_graph.c +++ b/src/lib/aqdiagram/graph/o_graph.c @@ -37,14 +37,14 @@ AQDG_OBJECT *_createLabel(AQDG_OBJECT *o, AQDG_OBJECT *parent, uint32_t options, */ static uint32_t _curveColors[]={ - AQDG_GRAPH_COL_LIME, - AQDG_GRAPH_COL_BLUE, - AQDG_GRAPH_COL_CYAN, - AQDG_GRAPH_COL_MAGENTA, - AQDG_GRAPH_COL_GREEN, - AQDG_GRAPH_COL_TURQUOISE, - AQDG_GRAPH_COL_DEEPPINK, - AQDG_GRAPH_COL_NAVY + AQDG_GRAPHOBJECT_COL_LIME, + AQDG_GRAPHOBJECT_COL_BLUE, + AQDG_GRAPHOBJECT_COL_CYAN, + AQDG_GRAPHOBJECT_COL_MAGENTA, + AQDG_GRAPHOBJECT_COL_GREEN, + AQDG_GRAPHOBJECT_COL_TURQUOISE, + AQDG_GRAPHOBJECT_COL_DEEPPINK, + AQDG_GRAPHOBJECT_COL_NAVY };