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

clip bars to viewport.

Browse Source
This commit is contained in:
Martin Preuss
2025-12-30 10:50:09 +01:00
parent fb6af5ef1b
commit 87053c5029
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/aqdiagram/graph/w_viewport.c
View File

@@ -533,7 +533,9 @@ void _drawCurveVertBars(AQDG_OBJECT *o, AQDG_DRAW_CONTEXT *dc, const AQDG_GRAPH_
valueMinDist, barWidth, baseLineValueY, baseLinePosY); valueMinDist, barWidth, baseLineValueY, baseLinePosY);
#endif #endif
while(dp) { while(dp) {
int xPos; int pos;
int xPos1;
int xPos2;
int yPos; int yPos;
int h; int h;
double xValue; double xValue;
@@ -542,14 +544,18 @@ void _drawCurveVertBars(AQDG_OBJECT *o, AQDG_DRAW_CONTEXT *dc, const AQDG_GRAPH_
xValue=AQDG_Graph_DataPair_GetValueX(dp); xValue=AQDG_Graph_DataPair_GetValueX(dp);
yValue=AQDG_Graph_DataPair_GetValueY(dp); yValue=AQDG_Graph_DataPair_GetValueY(dp);
xPos=_calcHorizontalPos(xValue, width, minValueX, maxValueX)-barWidth/2; pos=_calcHorizontalPos(xValue, width, minValueX, maxValueX);
xPos1=pos-barWidth/2;
xPos2=pos+barWidth/2;
xPos1=(xPos1<0)?0:xPos1;
xPos2=(width>xPos2)?xPos2:(width-1);
yPos=_calcVerticalPos(yValue, height, minValueY, maxValueY); yPos=_calcVerticalPos(yValue, height, minValueY, maxValueY);
h=baseLinePosY-yPos; h=baseLinePosY-yPos;
if (h<0) { if (h<0) {
yPos+=h; yPos+=h;
h=-h; h=-h;
} }
AQDG_Draw_Context_DrawFilledRect(dc, pen, absX+xPos, absY+yPos, barWidth, h); AQDG_Draw_Context_DrawFilledRect(dc, pen, absX+xPos1, absY+yPos, (xPos2-xPos1)+1, h);
dp=AQDG_Graph_DataPair_List_Next(dp); dp=AQDG_Graph_DataPair_List_Next(dp);
} }
} }