fixing warnings

diff --git a/src/aweather.c b/src/aweather.c
index 58fc7a857784a7fa7d5ef2970c5cbe9fc724a4f6..e2000fb426c08a199e9d0621397589f0ed84e88a 100644 (file)
--- a/src/aweather.c
+++ b/src/aweather.c
@@ -3,6 +3,8 @@
 #include <gtk/gtkgl.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "opengl.h"
+#include "radar.h"
 #include "cube.h"
 
 static void destroy(GtkWidget *widget, gpointer data)
@@ -20,6 +22,7 @@ static gboolean key_press(GtkWidget *widget, GdkEventKey *event, gpointer data)
 {
        if (event->keyval == GDK_q)
                destroy(widget, data);
+       return TRUE;
 }
 
 int main(int argc, char *argv[])
@@ -69,7 +72,7 @@ int main(int argc, char *argv[])
 
        /* Load plugins */
        opengl_init(GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
-       radar_init (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
+       //radar_init (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
        cube_init  (GTK_DRAWING_AREA(drawing), GTK_NOTEBOOK(tab_area));
 
        gtk_widget_show_all(window);

diff --git a/src/cube.c b/src/cube.c
index 18bdb4c2f84118f3d0b9299914b748ec64891ebb..8592545e865ef4ebf07a3cba87adcb48bf4f455b 100644 (file)
--- a/src/cube.c
+++ b/src/cube.c
@@ -26,8 +26,8 @@ static float ang = 30.;
 
 static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
-       GdkGLContext *glcontext = gtk_widget_get_gl_context (da);
-       GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (da);
+       //GdkGLContext  *glcontext  = gtk_widget_get_gl_context (da);
+       //GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (da);
 
        /* draw in here */
        glPushMatrix();
@@ -123,4 +123,5 @@ gboolean cube_init(GtkDrawingArea *drawing, GtkNotebook *config)
        /* Set up OpenGL Stuff */
        g_signal_connect(drawing, "expose-event", G_CALLBACK(expose), NULL);
        g_timeout_add(1000/60, rotate, drawing);
+       return TRUE;
 }

diff --git a/src/opengl.c b/src/opengl.c
index 18d71c1fed7bf625ff683157d0ad05146b021d52..8ab075a00645cefb07d935ee0fa3fb48e14380c7 100644 (file)
--- a/src/opengl.c
+++ b/src/opengl.c
@@ -14,11 +14,11 @@ static gboolean expose_start(GtkWidget *da, GdkEventExpose *event, gpointer user
 
        /* draw in here */
        glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+       return TRUE;
 }
 /* Plugins run stuff here */
 static gboolean expose_end(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
-       GdkGLContext *glcontext = gtk_widget_get_gl_context(da);
        GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(da);
 
        if (gdk_gl_drawable_is_double_buffered(gldrawable))
@@ -59,4 +59,5 @@ gboolean opengl_init(GtkDrawingArea *drawing, GtkNotebook *config)
        //g_signal_connect(drawing, "expose-event", G_CALLBACK(expose), NULL);
        g_signal_connect      (drawing, "expose-event", G_CALLBACK(expose_start), NULL);
        g_signal_connect_after(drawing, "expose-event", G_CALLBACK(expose_end),   NULL);
+       return TRUE;
 }

diff --git a/src/radar.c b/src/radar.c
index a1b49f139438832330ca6d5d41087a040f46e0c9..78b9b4e763976b31d15e687494aa45c29a6dc8f0 100644 (file)
--- a/src/radar.c
+++ b/src/radar.c
@@ -12,7 +12,7 @@
 GtkWidget *drawing;
 static Sweep *cur_sweep; // make this not global
 static int nred, ngreen, nblue;
-static guint8 red[256], green[256], blue[256];
+static char red[256], green[256], blue[256];
 
 /* Convert a sweep to an 2d array of data points */
 static void bscan_sweep(Sweep *sweep, guint8 **data, int *width, int *height)
@@ -23,7 +23,7 @@ static void bscan_sweep(Sweep *sweep, guint8 **data, int *width, int *height)
                max_bins = MAX(max_bins, sweep->ray[i]->h.nbins);
 
        /* Allocate buffer using max number of bins for each ray */
-       char *buf = g_malloc0(sweep->h.nrays * max_bins * 3);
+       guint8 *buf = g_malloc0(sweep->h.nrays * max_bins * 3);
 
        /* Fill the data */
        int ri, bi;
@@ -32,9 +32,9 @@ static void bscan_sweep(Sweep *sweep, guint8 **data, int *width, int *height)
                for (bi = 0; bi < ray->h.nbins; bi++) {
                        Range bin = ray->range[bi];
                        /* copy RGB into buffer */
-                       buf[(ri*max_bins+bi)*3+0] =   red[(guint8)ray->h.f(bin)];
-                       buf[(ri*max_bins+bi)*3+1] = green[(guint8)ray->h.f(bin)];
-                       buf[(ri*max_bins+bi)*3+2] =  blue[(guint8)ray->h.f(bin)];
+                       buf[(ri*max_bins+bi)*3+0] =   red[(gint8)ray->h.f(bin)];
+                       buf[(ri*max_bins+bi)*3+1] = green[(gint8)ray->h.f(bin)];
+                       buf[(ri*max_bins+bi)*3+2] =  blue[(gint8)ray->h.f(bin)];
                }
        }
 
@@ -68,7 +68,7 @@ static void load_sweep(Sweep *sweep)
        glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
        glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB8, width, height, 0, GL_RGB, GL_UNSIGNED_BYTE, data);
-       free(data);
+       g_free(data);
        glEnable(GL_TEXTURE_2D);
        gdk_window_invalidate_rect(drawing->window, &drawing->allocation, FALSE);
 }
@@ -94,8 +94,8 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 {
        Sweep *sweep = cur_sweep;
 
-       GdkGLContext *glcontext = gtk_widget_get_gl_context(da);
-       GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(da);
+       //GdkGLContext *glcontext = gtk_widget_get_gl_context(da);
+       //GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable(da);
 
        /* draw in here */
        glPushMatrix();
@@ -112,7 +112,7 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
 
                /* right and left looking out from radar */
                double left  = ((ray->h.azimuth - ((double)ray->h.beam_width/2.))*M_PI)/180.0; 
-               double right = ((ray->h.azimuth + ((double)ray->h.beam_width/2.))*M_PI)/180.0; 
+               //double right = ((ray->h.azimuth + ((double)ray->h.beam_width/2.))*M_PI)/180.0; 
 
                double lx = sin(left);
                double ly = cos(left);
@@ -126,7 +126,7 @@ static gboolean expose(GtkWidget *da, GdkEventExpose *event, gpointer user_data)
                glTexCoord2d(0.0, ((double)ri)/sweep->h.nrays); glVertex3f(lx*near_dist, ly*near_dist, 0.); // near left
                glTexCoord2d(0.7, ((double)ri)/sweep->h.nrays); glVertex3f(lx*far_dist,  ly*far_dist,  0.); // far  left
        }
-       g_printf("ri=%d, nr=%d, bw=%f\n", _ri, sweep->h.nrays, sweep->h.beam_width);
+       g_print("ri=%d, nr=%d, bw=%f\n", _ri, sweep->h.nrays, sweep->h.beam_width);
        glEnd();
        /* Texture debug */
        //glBegin(GL_QUADS);
@@ -164,8 +164,7 @@ gboolean radar_init(GtkDrawingArea *_drawing, GtkNotebook *config)
        /* Parse hard coded file.. */
        RSL_read_these_sweeps("all", NULL);
        //RSL_read_these_sweeps("all", NULL);
-       Radar *radar = RSL_wsr88d_to_radar("/scratch/aweather/src/KABR_20080609_0224", "KABR");
-       //radar = RSL_wsr88d_to_radar("/scratch/aweather/src/KABX_20080622_2229", "KABX");
+       Radar *radar = RSL_wsr88d_to_radar("/scratch/aweather/data/KNQA_20090501_1925", "KNQA");
        RSL_load_refl_color_table();
        RSL_get_color_table(RSL_RED_TABLE,   red,   &nred);
        RSL_get_color_table(RSL_GREEN_TABLE, green, &ngreen);
@@ -190,10 +189,10 @@ gboolean radar_init(GtkDrawingArea *_drawing, GtkNotebook *config)
                        button = gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON(button), label);
                        g_signal_connect_swapped(button, "clicked", G_CALLBACK(load_sweep), sweep);
                        gtk_box_pack_start(GTK_BOX(vbox), button, TRUE, TRUE, 0);
-                       free(label);
+                       g_free(label);
                }
        }
        GtkWidget *label = gtk_label_new("Radar");
        gtk_notebook_append_page(GTK_NOTEBOOK(config), hbox, label);
-
+       return TRUE;
 }