aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--generic/Track.c22
1 files changed, 10 insertions, 12 deletions
diff --git a/generic/Track.c b/generic/Track.c
index 9a1461f..742274d 100644
--- a/generic/Track.c
+++ b/generic/Track.c
@@ -79,8 +79,8 @@ typedef struct _TrackItemStruct {
ZnColor leader_color; /* leader color */
LineStyle leader_style;
LineShape leader_shape;
- LineEnd leader_first_end;
- LineEnd leader_last_end;
+ ZnLineEnd leader_first_end;
+ ZnLineEnd leader_last_end;
int leader_width;
int marker_size; /* world size of error circle */
ZnColor marker_color; /* error circle color */
@@ -912,7 +912,7 @@ ToArea(Item item,
}
inside = BBoxInBBox(&bbox, area);
if (inside == 0) {
- printf("track pos\n");
+ /*printf("track pos\n");*/
return 0;
}
@@ -939,14 +939,14 @@ ToArea(Item item,
width = track->leader_width > 1 ? track->leader_width : 0;
if (PolylineInBBox(points, num_points, width,
CapRound, JoinRound, area) != inside) {
- printf("track leader\n");
+ /*printf("track leader\n");*/
return 0;
}
if (track->leader_first_end != NULL) {
GetLineEnd(&points[0], &points[1], track->leader_width,
CapRound, track->leader_first_end, end_points);
if (PolygonInBBox(end_points, LINE_END_POINTS, area) != inside) {
- printf("track leader\n");
+ /*printf("track leader\n");*/
return 0;
}
}
@@ -954,7 +954,7 @@ ToArea(Item item,
GetLineEnd(&points[num_points-1], &points[num_points-2], track->leader_width,
CapRound, track->leader_last_end, end_points);
if (PolygonInBBox(end_points, LINE_END_POINTS, area) != inside) {
- printf("track leader\n");
+ /*printf("track leader\n");*/
return 0;
}
}
@@ -965,7 +965,7 @@ ToArea(Item item,
*/
if (item->class == ZnTrack) {
if (LineInBBox(&track->dev, &track->speed_vector_dev, area) != inside) {
- printf("track speed vector\n");
+ /*printf("track speed vector\n");*/
return 0;
}
}
@@ -980,7 +980,7 @@ ToArea(Item item,
pts[1] = ((TrackItem) item->connected_item)->dev;
width = track->connection_width > 1 ? track->connection_width : 0;
if (PolylineInBBox(pts, 2, width, CapRound, JoinRound, area) != inside) {
- printf("track connection\n");
+ /*printf("track connection\n");*/
return 0;
}
}
@@ -1053,8 +1053,7 @@ Draw(Item item)
pts[0] = track->dev;
pts[1] = ((TrackItem) item->connected_item)->dev;
- DrawLineShape(wi->dpy, wi->draw_buffer, wi->gc, pts, 2,
- track->connection_style, track->connection_color,
+ DrawLineShape(wi, pts, 2, track->connection_style, track->connection_color,
track->connection_width, LINE_STRAIGHT);
}
@@ -1083,8 +1082,7 @@ Draw(Item item)
points = (ZnPoint *) ZnListArray(track->leader_points);
num_points = ZnListSize(track->leader_points);
- DrawLineShape(wi->dpy, wi->draw_buffer, wi->gc,
- points, num_points,
+ DrawLineShape(wi, points, num_points,
track->leader_style, track->leader_color,
track->leader_width, track->leader_shape);
if (track->leader_first_end != NULL) {