Use/update reflectivity colormap

- Use reflectivity regardless, should really determine which radar the
  user is looking at.
- _Finally_ interpolate the reflectivity colormap..

diff --git a/src/aweather-colormap.c b/src/aweather-colormap.c
index 0fb289a76106ab1351631c1c0f0f55c5e8064255..cd133f6b7ced67b47d92a2998f8d999bc3a32c27 100644 (file)
--- a/src/aweather-colormap.c
+++ b/src/aweather-colormap.c
@@ -29,84 +29,84 @@ AWeatherColormap colormaps[] = {
         {{0x00,0x00,0x00,0x00}, //  0 dBZ
           {0x00,0x00,0x00,0x00}, //  1 dBZ
           {0x00,0x00,0x00,0x00}, //  2 dBZ
-          {0x00,0x00,0x00,0x00}, //  3 dBZ
-          {0x04,0xe9,0xe7,0x00}, //  4 dBZ
-          {0x04,0xe9,0xe7,0x00}, //  5 dBZ
-          {0x04,0xe9,0xe7,0x10}, //  6 dBZ
+          {0x01,0x25,0x23,0x00}, //  3 dBZ
+          {0x02,0x5b,0x56,0x00}, //  4 dBZ
+          {0x03,0x97,0x8f,0x00}, //  5 dBZ
+          {0x04,0xca,0xc3,0x10}, //  6 dBZ
           {0x04,0xe9,0xe7,0x20}, //  7 dBZ
-          {0x04,0xe9,0xe7,0x30}, //  8 dBZ
-          {0x01,0x9f,0xf4,0x40}, //  9 dBZ
-          {0x01,0x9f,0xf4,0x50}, // 10 dBZ
-          {0x01,0x9f,0xf4,0x60}, // 11 dBZ
+          {0x04,0xef,0xf8,0x30}, //  8 dBZ
+          {0x03,0xe6,0xfd,0x40}, //  9 dBZ
+          {0x02,0xd1,0xfa,0x50}, // 10 dBZ
+          {0x01,0xb8,0xf6,0x60}, // 11 dBZ
           {0x01,0x9f,0xf4,0x70}, // 12 dBZ
-          {0x01,0x9f,0xf4,0x80}, // 13 dBZ
-          {0x03,0x00,0xf4,0x90}, // 14 dBZ
-          {0x03,0x00,0xf4,0xa0}, // 15 dBZ
-          {0x03,0x00,0xf4,0xb0}, // 16 dBZ
+          {0x01,0x7e,0xf9,0x80}, // 13 dBZ
+          {0x02,0x52,0xff,0x90}, // 14 dBZ
+          {0x02,0x26,0xff,0xa0}, // 15 dBZ
+          {0x03,0x07,0xff,0xb0}, // 16 dBZ
           {0x03,0x00,0xf4,0xc0}, // 17 dBZ
-          {0x03,0x00,0xf4,0xd0}, // 18 dBZ
-          {0x02,0xfd,0x02,0xe0}, // 19 dBZ
-          {0x02,0xfd,0x02,0xf0}, // 20 dBZ
-          {0x02,0xfd,0x02,0xff}, // 21 dBZ
+          {0x03,0x1d,0xcf,0xd0}, // 18 dBZ
+          {0x03,0x56,0x99,0xe0}, // 19 dBZ
+          {0x03,0x9a,0x5d,0xf0}, // 20 dBZ
+          {0x02,0xd8,0x27,0xff}, // 21 dBZ
           {0x02,0xfd,0x02,0xff}, // 22 dBZ
-          {0x02,0xfd,0x02,0xff}, // 23 dBZ
-          {0x01,0xc5,0x01,0xff}, // 24 dBZ
-          {0x01,0xc5,0x01,0xff}, // 25 dBZ
-          {0x01,0xc5,0x01,0xff}, // 26 dBZ
+          {0x02,0xff,0x00,0xff}, // 23 dBZ
+          {0x02,0xfd,0x00,0xff}, // 24 dBZ
+          {0x01,0xea,0x00,0xff}, // 25 dBZ
+          {0x01,0xd5,0x00,0xff}, // 26 dBZ
           {0x01,0xc5,0x01,0xff}, // 27 dBZ
-          {0x01,0xc5,0x01,0xff}, // 28 dBZ
-          {0x00,0x8e,0x00,0xff}, // 29 dBZ
-          {0x00,0x8e,0x00,0xff}, // 30 dBZ
-          {0x00,0x8e,0x00,0xff}, // 31 dBZ
+          {0x00,0xb7,0x01,0xff}, // 28 dBZ
+          {0x00,0xa7,0x00,0xff}, // 29 dBZ
+          {0x00,0x98,0x00,0xff}, // 30 dBZ
+          {0x00,0x8f,0x00,0xff}, // 31 dBZ
           {0x00,0x8e,0x00,0xff}, // 32 dBZ
-          {0x00,0x8e,0x00,0xff}, // 33 dBZ
-          {0xfd,0xf8,0x02,0xff}, // 34 dBZ
-          {0xfd,0xf8,0x02,0xff}, // 35 dBZ
-          {0xfd,0xf8,0x02,0xff}, // 36 dBZ
+          {0x27,0x9c,0x00,0xff}, // 33 dBZ
+          {0x60,0xb5,0x01,0xff}, // 34 dBZ
+          {0xa0,0xd2,0x01,0xff}, // 35 dBZ
+          {0xd8,0xeb,0x02,0xff}, // 36 dBZ
           {0xfd,0xf8,0x02,0xff}, // 37 dBZ
-          {0xfd,0xf8,0x02,0xff}, // 38 dBZ
-          {0xe5,0xbc,0x00,0xff}, // 39 dBZ
-          {0xe5,0xbc,0x00,0xff}, // 40 dBZ
-          {0xe5,0xbc,0x00,0xff}, // 41 dBZ
+          {0xff,0xf6,0x02,0xff}, // 38 dBZ
+          {0xff,0xeb,0x01,0xff}, // 39 dBZ
+          {0xf8,0xda,0x01,0xff}, // 40 dBZ
+          {0xeb,0xc9,0x00,0xff}, // 41 dBZ
           {0xe5,0xbc,0x00,0xff}, // 42 dBZ
-          {0xe5,0xbc,0x00,0xff}, // 43 dBZ
-          {0xfd,0x95,0x00,0xff}, // 44 dBZ
-          {0xfd,0x95,0x00,0xff}, // 45 dBZ
-          {0xfd,0x95,0x00,0xff}, // 46 dBZ
+          {0xe7,0xb5,0x00,0xff}, // 43 dBZ
+          {0xec,0xb0,0x00,0xff}, // 44 dBZ
+          {0xf3,0xac,0x00,0xff}, // 45 dBZ
+          {0xf9,0xa4,0x00,0xff}, // 46 dBZ
           {0xfd,0x95,0x00,0xff}, // 47 dBZ
-          {0xfd,0x95,0x00,0xff}, // 48 dBZ
-          {0xfd,0x00,0x00,0xff}, // 49 dBZ
-          {0xfd,0x00,0x00,0xff}, // 50 dBZ
-          {0xfd,0x00,0x00,0xff}, // 51 dBZ
+          {0xff,0x7c,0x00,0xff}, // 48 dBZ
+          {0xff,0x5a,0x00,0xff}, // 49 dBZ
+          {0xff,0x36,0x00,0xff}, // 50 dBZ
+          {0xff,0x16,0x00,0xff}, // 51 dBZ
           {0xfd,0x00,0x00,0xff}, // 52 dBZ
-          {0xfd,0x00,0x00,0xff}, // 53 dBZ
-          {0xd4,0x00,0x00,0xff}, // 54 dBZ
-          {0xd4,0x00,0x00,0xff}, // 55 dBZ
-          {0xd4,0x00,0x00,0xff}, // 56 dBZ
+          {0xf7,0x00,0x00,0xff}, // 53 dBZ
+          {0xef,0x00,0x00,0xff}, // 54 dBZ
+          {0xe5,0x00,0x00,0xff}, // 55 dBZ
+          {0xdc,0x00,0x00,0xff}, // 56 dBZ
           {0xd4,0x00,0x00,0xff}, // 57 dBZ
-          {0xd4,0x00,0x00,0xff}, // 58 dBZ
-          {0xbc,0x00,0x00,0xff}, // 59 dBZ
-          {0xbc,0x00,0x00,0xff}, // 60 dBZ
-          {0xbc,0x00,0x00,0xff}, // 61 dBZ
+          {0xcd,0x00,0x00,0xff}, // 58 dBZ
+          {0xc5,0x00,0x00,0xff}, // 59 dBZ
+          {0xbf,0x00,0x00,0xff}, // 60 dBZ
+          {0xbb,0x00,0x00,0xff}, // 61 dBZ
           {0xbc,0x00,0x00,0xff}, // 62 dBZ
-          {0xbc,0x00,0x00,0xff}, // 63 dBZ
-          {0xf8,0x00,0xfd,0xff}, // 64 dBZ
-          {0xf8,0x00,0xfd,0xff}, // 65 dBZ
-          {0xf8,0x00,0xfd,0xff}, // 66 dBZ
+          {0xc5,0x00,0x27,0xff}, // 63 dBZ
+          {0xd5,0x00,0x62,0xff}, // 64 dBZ
+          {0xe7,0x00,0xa2,0xff}, // 65 dBZ
+          {0xf5,0x00,0xda,0xff}, // 66 dBZ
           {0xf8,0x00,0xfd,0xff}, // 67 dBZ
-          {0xf8,0x00,0xfd,0xff}, // 68 dBZ
-          {0x98,0x54,0xc6,0xff}, // 69 dBZ
-          {0x98,0x54,0xc6,0xff}, // 70 dBZ
-          {0x98,0x54,0xc6,0xff}, // 71 dBZ
+          {0xec,0x0a,0xff,0xff}, // 68 dBZ
+          {0xd3,0x17,0xf8,0xff}, // 69 dBZ
+          {0xb8,0x28,0xe3,0xff}, // 70 dBZ
+          {0xa1,0x3c,0xcf,0xff}, // 71 dBZ
           {0x98,0x54,0xc6,0xff}, // 72 dBZ
-          {0x98,0x54,0xc6,0xff}, // 73 dBZ
-          {0xfd,0xfd,0xfd,0xff}, // 74 dBZ
-         {0xfd,0xfd,0xfd,0xff}, // 75 dBZ
-         {0xfd,0xfd,0xfd,0xff}, // 76 dBZ
+          {0xa1,0x73,0xcb,0xff}, // 73 dBZ
+          {0xb7,0x9a,0xd7,0xff}, // 74 dBZ
+         {0xd2,0xc1,0xe6,0xff}, // 75 dBZ
+         {0xec,0xe5,0xf4,0xff}, // 76 dBZ
          {0xfd,0xfd,0xfd,0xff}, // 77 dBZ
-         {0xfd,0xfd,0xfd,0xff}, // 78 dBZ
-         {0xfd,0xfd,0xfd,0xff}, // 79 dBZ
-         {0xfd,0xfd,0xfd,0xff}, // 80 dBZ
+         {0xff,0xff,0xff,0xff}, // 78 dBZ
+         {0xff,0xff,0xff,0xff}, // 79 dBZ
+         {0xff,0xff,0xff,0xff}, // 80 dBZ
          {0x00,0x00,0x00,0x00},
          {0x00,0x00,0x00,0x00},
          {0x00,0x00,0x00,0x00},

diff --git a/src/plugins/radar.c b/src/plugins/radar.c
index 072bc97af3f09a6f8f7ed0b2a5bea484f65bb8a4..37ed9e3723435aea3e8c5709d83ca062681457cf 100644 (file)
--- a/src/plugins/radar.c
+++ b/src/plugins/radar.c
@@ -622,10 +622,8 @@ void radar_conus_free(RadarConus *conus)
  ******************/
 static void _draw_hud(GisCallback *callback, GisOpenGL *opengl, gpointer _self)
 {
-       /* TODO */
-       GisPluginRadar *self = GIS_PLUGIN_RADAR(_self);
-       if (!self->colormap)
-               return;
+       /* TODO, pick correct colormaps */
+       AWeatherColormap *colormap = &colormaps[0];
 
        g_debug("GisPluginRadar: _draw_hud");
        /* Print the color table */
@@ -639,7 +637,7 @@ static void _draw_hud(GisCallback *callback, GisOpenGL *opengl, gpointer _self)
        glBegin(GL_QUADS);
        int i;
        for (i = 0; i < 256; i++) {
-               glColor4ubv(self->colormap->data[i]);
+               glColor4ubv(colormap->data[i]);
                glVertex3f(-1.0, (float)((i  ) - 256/2)/(256/2), 0.0); // bot left
                glVertex3f(-1.0, (float)((i+1) - 256/2)/(256/2), 0.0); // top left
                glVertex3f(-0.9, (float)((i+1) - 256/2)/(256/2), 0.0); // top right