diff options
| -rw-r--r-- | src/bltGrElemLine.C | 16 | ||||
| -rw-r--r-- | src/bltGrMarker.C | 2 | ||||
| -rw-r--r-- | src/bltGrMarkerLine.C | 4 | ||||
| -rw-r--r-- | src/bltGrMarkerPolygon.C | 2 | ||||
| -rw-r--r-- | src/bltGrMisc.C | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/src/bltGrElemLine.C b/src/bltGrElemLine.C index 29e3048..9cd9337 100644 --- a/src/bltGrElemLine.C +++ b/src/bltGrElemLine.C @@ -1199,7 +1199,7 @@ void LineElement::generateParametricSpline(MapInfo *mapPtr) p = origPts[i]; q = origPts[j]; count++; - if (lineRectClip(&exts, &p, &q)) { + if (LineRectClip(&exts, &p, &q)) { count += (int)(hypot(q.x - p.x, q.y - p.y) * 0.5); } } @@ -1237,7 +1237,7 @@ void LineElement::generateParametricSpline(MapInfo *mapPtr) /* Is any part of the interval (line segment) in the plotting * area? */ - if (lineRectClip(&exts, &p, &q)) { + if (LineRectClip(&exts, &p, &q)) { double dp, dq; /* Distance of original point to p. */ @@ -1786,7 +1786,7 @@ void LineElement::mapErrorBars(LineStyle **styleMap) q = graphPtr_->map2D(low, y, ops->xAxis, ops->yAxis); segPtr->p = p; segPtr->q = q; - if (lineRectClip(&exts, &segPtr->p, &segPtr->q)) { + if (LineRectClip(&exts, &segPtr->p, &segPtr->q)) { segPtr++; *indexPtr++ = i; } @@ -1794,7 +1794,7 @@ void LineElement::mapErrorBars(LineStyle **styleMap) segPtr->p.x = segPtr->q.x = p.x; segPtr->p.y = p.y - stylePtr->errorBarCapWidth; segPtr->q.y = p.y + stylePtr->errorBarCapWidth; - if (lineRectClip(&exts, &segPtr->p, &segPtr->q)) { + if (LineRectClip(&exts, &segPtr->p, &segPtr->q)) { segPtr++; *indexPtr++ = i; } @@ -1802,7 +1802,7 @@ void LineElement::mapErrorBars(LineStyle **styleMap) segPtr->p.x = segPtr->q.x = q.x; segPtr->p.y = q.y - stylePtr->errorBarCapWidth; segPtr->q.y = q.y + stylePtr->errorBarCapWidth; - if (lineRectClip(&exts, &segPtr->p, &segPtr->q)) { + if (LineRectClip(&exts, &segPtr->p, &segPtr->q)) { segPtr++; *indexPtr++ = i; } @@ -1855,7 +1855,7 @@ void LineElement::mapErrorBars(LineStyle **styleMap) q = graphPtr_->map2D(x, low, ops->xAxis, ops->yAxis); segPtr->p = p; segPtr->q = q; - if (lineRectClip(&exts, &segPtr->p, &segPtr->q)) { + if (LineRectClip(&exts, &segPtr->p, &segPtr->q)) { segPtr++; *indexPtr++ = i; } @@ -1863,7 +1863,7 @@ void LineElement::mapErrorBars(LineStyle **styleMap) segPtr->p.y = segPtr->q.y = p.y; segPtr->p.x = p.x - stylePtr->errorBarCapWidth; segPtr->q.x = p.x + stylePtr->errorBarCapWidth; - if (lineRectClip(&exts, &segPtr->p, &segPtr->q)) { + if (LineRectClip(&exts, &segPtr->p, &segPtr->q)) { segPtr++; *indexPtr++ = i; } @@ -1871,7 +1871,7 @@ void LineElement::mapErrorBars(LineStyle **styleMap) segPtr->p.y = segPtr->q.y = q.y; segPtr->p.x = q.x - stylePtr->errorBarCapWidth; segPtr->q.x = q.x + stylePtr->errorBarCapWidth; - if (lineRectClip(&exts, &segPtr->p, &segPtr->q)) { + if (LineRectClip(&exts, &segPtr->p, &segPtr->q)) { segPtr++; *indexPtr++ = i; } diff --git a/src/bltGrMarker.C b/src/bltGrMarker.C index 5b53f03..3ee6bd3 100644 --- a/src/bltGrMarker.C +++ b/src/bltGrMarker.C @@ -165,7 +165,7 @@ int Marker::regionInPolygon(Region2d *regionPtr, Point2d *points, int nPoints, p = *pp; q = *(pp + 1); - if (lineRectClip(regionPtr, &p, &q)) + if (LineRectClip(regionPtr, &p, &q)) return 1; } diff --git a/src/bltGrMarkerLine.C b/src/bltGrMarkerLine.C index 0347dc8..f6644ad 100644 --- a/src/bltGrMarkerLine.C +++ b/src/bltGrMarkerLine.C @@ -180,7 +180,7 @@ void LineMarker::map() next.y += ops->yOffset; Point2d q = next; - if (lineRectClip(&extents, &p, &q)) { + if (LineRectClip(&extents, &p, &q)) { segPtr->p = p; segPtr->q = q; segPtr++; @@ -268,7 +268,7 @@ int LineMarker::regionIn(Region2d *extsPtr, int enclosed) pp < pend; pp++) { Point2d p = mapPoint(pp, ops->xAxis, ops->yAxis); Point2d q = mapPoint(pp + 1, ops->xAxis, ops->yAxis); - if (lineRectClip(extsPtr, &p, &q)) + if (LineRectClip(extsPtr, &p, &q)) count++; } return (count > 0); /* At least 1 segment passes through diff --git a/src/bltGrMarkerPolygon.C b/src/bltGrMarkerPolygon.C index a2e4ed7..be92a25 100644 --- a/src/bltGrMarkerPolygon.C +++ b/src/bltGrMarkerPolygon.C @@ -250,7 +250,7 @@ void PolygonMarker::map() for (sp = screenPts, send = sp + (nScreenPts - 1); sp < send; sp++) { segPtr->p = sp[0]; segPtr->q = sp[1]; - if (lineRectClip(&extents, &segPtr->p, &segPtr->q)) { + if (LineRectClip(&extents, &segPtr->p, &segPtr->q)) { segPtr++; } } diff --git a/src/bltGrMisc.C b/src/bltGrMisc.C index 188e73b..ee2c71f 100644 --- a/src/bltGrMisc.C +++ b/src/bltGrMisc.C @@ -116,7 +116,7 @@ static int ClipTest (double ds, double dr, double *t1, double *t2) * Line Clipping, ACM, TOG,3(1), 1984, pp.1-22. *--------------------------------------------------------------------------- */ -int Blt::lineRectClip(Region2d* regionPtr, Point2d *p, Point2d *q) +int Blt::LineRectClip(Region2d* regionPtr, Point2d *p, Point2d *q) { double t1, t2; double dx, dy; |