diff options
Diffstat (limited to 'generic/OverlapMan.c')
| -rw-r--r-- | generic/OverlapMan.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/generic/OverlapMan.c b/generic/OverlapMan.c index 97b0648..e986efa 100644 --- a/generic/OverlapMan.c +++ b/generic/OverlapMan.c @@ -85,14 +85,14 @@ typedef struct _INFOS { BOOLEAN Refresh; } INFOS; -typedef struct _RADARS { +typedef struct _ZINCS { void *rw; void *(*_next_track)(); void (*_set_label_angle)(); INFOS *infos; int NBinfos; int NBalloc_infos; -} RADARS; +} ZINCS; /* @@ -100,10 +100,10 @@ typedef struct _RADARS { * */ -static RADARS *wr = NULL; +static ZINCS *wr = NULL; -static int NBradars=0; -static int NBalloc_radars=0; +static int NBzincs=0; +static int NBalloc_zincs=0; static INFOS info1; static double K0 = 2100.0; /* Repulsion factor */ @@ -169,7 +169,7 @@ Mrealloc(void *p, **************************************************************************** * * FindPosW -- - * Find the radar position in the database, + * Find the zinc position in the database, * if not found, gets the positon to insert in. * **************************************************************************** @@ -179,7 +179,7 @@ FindPosW(void *w, int *mid) { int left=0; - int right=NBradars-1; + int right=NBzincs-1; if (w < wr[0].rw) { *mid = 0; @@ -218,7 +218,7 @@ FindPosW(void *w, **************************************************************************** * * AllocW -- - * Allocate cells in database for the specified radar. + * Allocate cells in database for the specified zinc. * **************************************************************************** */ @@ -228,17 +228,17 @@ AllocW(void *w, { int i; - if (NBradars == NBalloc_radars) { - NBalloc_radars += NB_ALLOC; - wr = (RADARS *) Mrealloc((void *) wr, sizeof(RADARS) * NBalloc_radars); + if (NBzincs == NBalloc_zincs) { + NBalloc_zincs += NB_ALLOC; + wr = (ZINCS *) Mrealloc((void *) wr, sizeof(ZINCS) * NBalloc_zincs); } - for (i = NBradars-1; i >= pos; i--) { - memcpy((char *) &wr[i+1], (char *) &wr[i], sizeof(RADARS)); + for (i = NBzincs-1; i >= pos; i--) { + memcpy((char *) &wr[i+1], (char *) &wr[i], sizeof(ZINCS)); } - /*memcpy((char *)&wr[pos+1], (char *)&wr[pos], (NBradars-pos) * sizeof(RADARS) );*/ + /*memcpy((char *)&wr[pos+1], (char *)&wr[pos], (NBzincs-pos) * sizeof(ZINCS) );*/ - NBradars++; + NBzincs++; wr[pos].rw = w; wr[pos].infos = NULL; wr[pos].NBinfos = 0; @@ -319,7 +319,7 @@ DegreesToRadians(int x) **************************************************************************** * * OmRegister -- - * Create a database entry for the specified radar. + * Create a database entry for the specified zinc. * **************************************************************************** */ @@ -332,7 +332,7 @@ OmRegister(void *w, int iw=0; BOOLEAN found=FALSE; - if (NBradars > 0) { + if (NBzincs > 0) { found = FindPosW(w, &iw); } if (found == FALSE) { @@ -347,7 +347,7 @@ OmRegister(void *w, **************************************************************************** * * OmUnregister -- - * Cancel database information about the specified radar. + * Cancel database information about the specified zinc. * **************************************************************************** */ @@ -358,8 +358,8 @@ OmUnregister(void *w) if (FindPosW(w, &i) == TRUE) { free(wr[i].infos); - memcpy((char *) &wr[i], (char *) &wr[i+1], (NBradars-i-1)*sizeof(RADARS)); - NBradars--; + memcpy((char *) &wr[i], (char *) &wr[i+1], (NBzincs-i-1)*sizeof(ZINCS)); + NBzincs--; } } @@ -507,7 +507,7 @@ PutTrackLoaded(int iw) *************************************************************************** * * ReadTracks -- - * Get track labels information from radar. + * Get track labels information from zinc. * *************************************************************************** */ @@ -941,7 +941,7 @@ RefineSetup(int iw, *************************************************************************** */ void -OmProcessOverlap(void *radar, +OmProcessOverlap(void *zinc, int width, int height, double scale) @@ -949,7 +949,7 @@ OmProcessOverlap(void *radar, double acceleration = 0.0; int ip, iw; - if (NBradars != 0 && FindPosW(radar, &iw) == TRUE) { + if (NBzincs != 0 && FindPosW(zinc, &iw) == TRUE) { ReadTracks(iw); for (ip = 0; ip < wr[iw].NBinfos; ip++) { |