From 0db274dc75a25ae6a628a702039a710bdcb09894 Mon Sep 17 00:00:00 2001 From: lecoanet Date: Thu, 2 Oct 2003 09:12:51 +0000 Subject: Now patterns and symbols are automatically updated if their images changed. Changed the ZnConfigureAttributes api. The current position symbol is now correctly read from the -tracksymbol option and not statically fixed. --- generic/Track.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/generic/Track.c b/generic/Track.c index a6a3cf3..06b231e 100644 --- a/generic/Track.c +++ b/generic/Track.c @@ -388,7 +388,7 @@ Init(ZnItem item, SET(item->part_sensitive, ZnPartToBit(CONNECTION)); SET(item->part_sensitive, ZnPartToBit(SPEED_VECTOR)); track->symbol_color = ZnGetGradientByValue(wi->fore_color); - track->symbol = ZnGetBitmap(wi, Tk_GetUid("AtcSymbol15")); + track->symbol = ZnGetImageByValue(wi->track_symbol, NULL, NULL); track->label_anchor = TK_ANCHOR_CENTER; track->label_angle = DEFAULT_LABEL_ANGLE; track->label_distance = DEFAULT_LABEL_DISTANCE; @@ -513,10 +513,10 @@ Clone(ZnItem item) track->speed_vector_color = ZnGetGradientByValue(track->speed_vector_color); track->history_color = ZnGetGradientByValue(track->history_color); if (track->symbol != ZnUnspecifiedImage) { - track->symbol = ZnGetImageByValue(track->symbol); + track->symbol = ZnGetImageByValue(track->symbol, NULL, NULL); } if (track->marker_fill_pattern != ZnUnspecifiedImage) { - track->marker_fill_pattern = ZnGetImageByValue(track->marker_fill_pattern); + track->marker_fill_pattern = ZnGetImageByValue(track->marker_fill_pattern, NULL, NULL); } } @@ -557,11 +557,11 @@ Destroy(ZnItem item) ZnFreeGradient(track->speed_vector_color); ZnFreeGradient(track->history_color); if (track->symbol != ZnUnspecifiedImage) { - ZnFreeImage(track->symbol); + ZnFreeImage(track->symbol, NULL, NULL); track->symbol = ZnUnspecifiedImage; } if (track->marker_fill_pattern != ZnUnspecifiedImage) { - ZnFreeImage(track->marker_fill_pattern); + ZnFreeImage(track->marker_fill_pattern, NULL, NULL); track->marker_fill_pattern = ZnUnspecifiedImage; } @@ -617,7 +617,7 @@ Configure(ZnItem item, old_pos = track->pos; old_connected = item->connected_item; - if (ZnConfigureAttributes(wi, item, track_attrs, argc, argv, flags) == TCL_ERROR) { + if (ZnConfigureAttributes(wi, item, item, track_attrs, argc, argv, flags) == TCL_ERROR) { return TCL_ERROR; } -- cgit v1.1