# Init and options
-AC_INIT([aweather], [0.2.0], [spenceal@rose-hulman.edu])
+AC_INIT([aweather], [0.2.1], [spenceal@rose-hulman.edu])
AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability foreign])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
radar.la \
ridge.la
-example_la_SOURCES = \
- example.c \
- example.h
+example_la_SOURCES = example.c example.h
example_la_CPPFLAGS = $(AM_CPPFLAGS) $(SOUP_CFLAGS)
-ridge_la_SOURCES = \
- ridge.c \
- ridge.h
-ridge_la_CPPFLAGS = $(AM_CPPFLAGS) $(SOUP_CFLAGS)
+ridge_la_SOURCES = ridge.c ridge.h
+ridge_la_CPPFLAGS = $(AM_CPPFLAGS) $(SOUP_CFLAGS)
radar_la_SOURCES = \
- radar.c \
- radar.h \
+ radar.c radar.h \
+ marching.c marching.h \
radar-colormap.c
radar_la_CPPFLAGS = $(AM_CPPFLAGS) $(SOUP_CFLAGS) $(RSL_CFLAGS)
radar_la_LIBADD = $(SOUP_LIBS) $(RSL_LIBS)
+++ /dev/null
-#define RSL_FOREACH_VOL(radar, volume, count, index) \
- guint count = 0; \
- for (guint index = 0; index < radar->h.nvolumes; index++) { \
- Volume *volume = radar->v[index]; \
- if (volume == NULL) continue; \
- count++;
-
-#define RSL_FOREACH_SWEEP(volume, sweep, count, index) \
- guint count = 0; \
- for (guint index = 0; index < volume->h.nsweeps; index++) { \
- Sweep *sweep = volume->sweep[index]; \
- if (sweep == NULL || sweep->h.elev == 0) continue; \
- count++;
-
-#define RSL_FOREACH_RAY(sweep, ray, count, index) \
- guint count = 0; \
- for (guint index = 0; index < sweep->h.nrays; index++) { \
- Ray *ray = sweep->ray[index]; \
- if (ray == NULL) continue; \
- count++;
-
-#define RSL_FOREACH_BIN(ray, bin, count, index) \
- guint count = 0; \
- for (guint index = 0; index < ray->h.nbins; index++) { \
- Range bin = ray->range[index]; \
- count++;
-
-#define RSL_FOREACH_END }
#include <gis/gis.h>
-#include "marching.h"
#include "radar.h"
-#include "radar-misc.h"
+#include "marching.h"
/****************
* GObject code *
/* Methods */
GisPluginRadar *gis_plugin_radar_new(GisWorld *world, GisView *view, GisOpenGL *opengl, GisPrefs *prefs);
+/* Misc. RSL helpers */
+#define RSL_FOREACH_VOL(radar, volume, count, index) \
+ guint count = 0; \
+ for (guint index = 0; index < radar->h.nvolumes; index++) { \
+ Volume *volume = radar->v[index]; \
+ if (volume == NULL) continue; \
+ count++;
+
+#define RSL_FOREACH_SWEEP(volume, sweep, count, index) \
+ guint count = 0; \
+ for (guint index = 0; index < volume->h.nsweeps; index++) { \
+ Sweep *sweep = volume->sweep[index]; \
+ if (sweep == NULL || sweep->h.elev == 0) continue; \
+ count++;
+
+#define RSL_FOREACH_RAY(sweep, ray, count, index) \
+ guint count = 0; \
+ for (guint index = 0; index < sweep->h.nrays; index++) { \
+ Ray *ray = sweep->ray[index]; \
+ if (ray == NULL) continue; \
+ count++;
+
+#define RSL_FOREACH_BIN(ray, bin, count, index) \
+ guint count = 0; \
+ for (guint index = 0; index < ray->h.nbins; index++) { \
+ Range bin = ray->range[index]; \
+ count++;
+
+#define RSL_FOREACH_END }
+
#endif