#include "level2.h"
+#include "../compat.h"
+
#define ISO_MIN 30
#define ISO_MAX 80
/* Load the radar file */
RSL_read_these_sweeps("all", NULL);
- g_message("read start");
+ g_debug("AWeatherLevel2: rsl read start");
Radar *radar = RSL_wsr88d_to_radar(raw, (gchar*)site);
- g_message("read done");
+ g_debug("AWeatherLevel2: rsl read done");
g_free(raw);
if (!radar)
return NULL;
aweather_level2_set_iso(level2, level);
}
+static gchar *_on_format_value(GtkScale *scale, gdouble value, gpointer _level2)
+{
+ return g_strdup_printf("%.1lf dBZ ", value);
+}
+
GtkWidget *aweather_level2_get_config(AWeatherLevel2 *level2)
{
Radar *radar = level2->radar;
/* Add date */
gchar *date_str = g_strdup_printf("<b><i>%04d-%02d-%02d %02d:%02d</i></b>",
- radar->h.year, radar->h.month, radar->h.day+1,
+ radar->h.year, radar->h.month, radar->h.day,
radar->h.hour, radar->h.minute);
GtkWidget *date_label = gtk_label_new(date_str);
gtk_label_set_use_markup(GTK_LABEL(date_label), TRUE);
cols-1,cols, 0,1, GTK_FILL,GTK_FILL, 0,0);
}
- elev_box = gtk_hbox_new(TRUE, 0);
+ elev_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
+ gtk_box_set_homogeneous(GTK_BOX(elev_box), TRUE);
gtk_table_attach(GTK_TABLE(table), elev_box,
cols-1,cols, rows-1,rows, GTK_FILL,GTK_FILL, 0,0);
}
gtk_misc_set_alignment(GTK_MISC(row_label), 1, 0.5);
gtk_table_attach(GTK_TABLE(table), row_label,
0,1, rows,rows+1, GTK_FILL,GTK_FILL, 5,0);
- GtkWidget *scale = gtk_hscale_new_with_range(ISO_MIN, ISO_MAX, 0.5);
+ GtkWidget *scale = gtk_scale_new_with_range(GTK_ORIENTATION_HORIZONTAL, ISO_MIN, ISO_MAX, 0.5);
gtk_widget_set_size_request(scale, -1, 26);
gtk_scale_set_value_pos(GTK_SCALE(scale), GTK_POS_LEFT);
gtk_range_set_inverted(GTK_RANGE(scale), TRUE);
gtk_range_set_value(GTK_RANGE(scale), ISO_MAX);
- g_signal_connect(scale, "value-changed", G_CALLBACK(_on_iso_changed), level2);
+ g_signal_connect(scale, "value-changed", G_CALLBACK(_on_iso_changed), level2);
+ g_signal_connect(scale, "format-value", G_CALLBACK(_on_format_value), level2);
gtk_table_attach(GTK_TABLE(table), scale,
1,cols+1, rows,rows+1, GTK_FILL|GTK_EXPAND,GTK_FILL, 0,0);
/* Shove all the buttons to the left, but keep the slider expanded */
{
AWeatherLevel2 *level2 = AWEATHER_LEVEL2(_level2);
g_debug("AWeatherLevel2: dispose - %p", _level2);
- if (level2->volume) {
- grits_viewer_remove(GRITS_OBJECT(level2->volume)->viewer,
- GRITS_OBJECT(level2->volume));
- level2->volume = NULL;
- }
+ grits_object_destroy_pointer(&level2->volume);
G_OBJECT_CLASS(aweather_level2_parent_class)->dispose(_level2);
}
static void aweather_level2_finalize(GObject *_level2)