diff --git a/src/window/milky-way-page/milky-way-view.c b/src/window/milky-way-page/milky-way-view.c index e65b1b9..a5a26d5 100644 --- a/src/window/milky-way-page/milky-way-view.c +++ b/src/window/milky-way-page/milky-way-view.c @@ -27,6 +27,9 @@ struct _PicplannerMilkyway { GtkBox parent_instance; + + GtkWidget *label_date; + GtkWidget *label_rise_time; GtkWidget *label_rise_azimuth; GtkWidget *label_upper_time; @@ -42,6 +45,22 @@ struct _PicplannerMilkyway G_DEFINE_TYPE (PicplannerMilkyway, picplanner_milkyway, GTK_TYPE_BOX) +void +picplanner_milky_way_set_date (PicplannerMilkyway *milky_way, + GDateTime *date_time) +{ + char *char_label_date; + + char_label_date = g_strdup_printf ("Date: %d.%d.%d", + g_date_time_get_day_of_month (date_time), + g_date_time_get_month (date_time), + g_date_time_get_year (date_time)); + gtk_label_set_text (GTK_LABEL (milky_way->label_date), char_label_date); + + g_free (char_label_date); +} + + void picplanner_milky_way_set_rise_upper_set (PicplannerMilkyway *milky_way, GDateTime *date_time, @@ -265,6 +284,7 @@ picplanner_milkyway_class_init (PicplannerMilkywayClass *class) gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_disturbance_sun); gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_disturbance_moon); gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_visibility_time); + gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_date); } PicplannerMilkyway * diff --git a/src/window/milky-way-page/milky-way-view.h b/src/window/milky-way-page/milky-way-view.h index 4906932..ac1de06 100644 --- a/src/window/milky-way-page/milky-way-view.h +++ b/src/window/milky-way-page/milky-way-view.h @@ -27,20 +27,26 @@ G_BEGIN_DECLS #define PICPLANNER_MILKYWAY_TYPE (picplanner_milkyway_get_type ()) G_DECLARE_FINAL_TYPE (PicplannerMilkyway, picplanner_milkyway, PICPLANNER, MILKYWAY, GtkBox) -void -picplanner_milky_way_set_rise_upper_set (PicplannerMilkyway *milky_way, - GDateTime *date_time, - double *coordinates_array, - int *index_rise_upper_set); void -picplanner_milky_way_set_disturbance (PicplannerMilkyway *milky_way, - GDateTime *date_time_noon, - int *dark_blue_golden_index_sun, - int *rise_upper_set_index_moon, - int *rise_upper_set_index_milky_way, - double elevation_sun, - double elevation_moon); +picplanner_milky_way_set_date (PicplannerMilkyway *milky_way, + GDateTime *date_time); + + +void +picplanner_milky_way_set_rise_upper_set (PicplannerMilkyway *milky_way, + GDateTime *date_time, + double *coordinates_array, + int *index_rise_upper_set); + +void +picplanner_milky_way_set_disturbance (PicplannerMilkyway *milky_way, + GDateTime *date_time_noon, + int *dark_blue_golden_index_sun, + int *rise_upper_set_index_moon, + int *rise_upper_set_index_milky_way, + double elevation_sun, + double elevation_moon); PicplannerMilkyway *picplanner_milkyway_new (); diff --git a/src/window/milky-way-page/milky-way-view.ui b/src/window/milky-way-page/milky-way-view.ui index b136564..812aa2a 100644 --- a/src/window/milky-way-page/milky-way-view.ui +++ b/src/window/milky-way-page/milky-way-view.ui @@ -15,6 +15,16 @@ vertical + + + Date: 01.01.2000 + center + 10 + + + + + Important Positions diff --git a/src/window/moon-page/moon-view.c b/src/window/moon-page/moon-view.c index 2fae014..e466bca 100644 --- a/src/window/moon-page/moon-view.c +++ b/src/window/moon-page/moon-view.c @@ -29,6 +29,9 @@ struct _PicplannerMoon { GtkBox parent_instance; + + GtkWidget *label_date; + GtkWidget *label_rise_time; GtkWidget *label_rise_azimuth; GtkWidget *label_upper_time; @@ -43,6 +46,22 @@ struct _PicplannerMoon G_DEFINE_TYPE (PicplannerMoon, picplanner_moon, GTK_TYPE_BOX) +void +picplanner_moon_set_date (PicplannerMoon *moon, + GDateTime *date_time) +{ + char *char_label_date; + + char_label_date = g_strdup_printf ("Date: %d.%d.%d", + g_date_time_get_day_of_month (date_time), + g_date_time_get_month (date_time), + g_date_time_get_year (date_time)); + gtk_label_set_text (GTK_LABEL (moon->label_date), char_label_date); + + g_free (char_label_date); +} + + void picplanner_moon_set_rise_upper_set (PicplannerMoon *moon, GDateTime *date_time, @@ -158,6 +177,7 @@ picplanner_moon_class_init (PicplannerMoonClass *class) gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_set_azimuth); gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_illumination); gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_phase); + gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_date); } PicplannerMoon * diff --git a/src/window/moon-page/moon-view.h b/src/window/moon-page/moon-view.h index 1bb145e..2e256ff 100644 --- a/src/window/moon-page/moon-view.h +++ b/src/window/moon-page/moon-view.h @@ -29,15 +29,20 @@ G_DECLARE_FINAL_TYPE (PicplannerMoon, picplanner_moon, PICPLANNER, MOON, GtkBox) void -picplanner_moon_set_rise_upper_set (PicplannerMoon *moon, - GDateTime *date_time, - double *coordinates_array, - int *index_rise_upper_set); +picplanner_moon_set_date (PicplannerMoon *moon, + GDateTime *date_time); + void -picplanner_moon_set_illumination_intensity (PicplannerMoon *moon, - double illumination, - char *phase); +picplanner_moon_set_rise_upper_set (PicplannerMoon *moon, + GDateTime *date_time, + double *coordinates_array, + int *index_rise_upper_set); + +void +picplanner_moon_set_illumination_intensity (PicplannerMoon *moon, + double illumination, + char *phase); PicplannerMoon *picplanner_moon_new (); diff --git a/src/window/moon-page/moon-view.ui b/src/window/moon-page/moon-view.ui index a460d50..768f790 100644 --- a/src/window/moon-page/moon-view.ui +++ b/src/window/moon-page/moon-view.ui @@ -15,6 +15,16 @@ vertical + + + Date: 01.01.2000 + center + 10 + + + + + Important Positions diff --git a/src/window/picplanner-window.c b/src/window/picplanner-window.c index 832771c..8122aa3 100644 --- a/src/window/picplanner-window.c +++ b/src/window/picplanner-window.c @@ -270,6 +270,13 @@ calculate_positions (PicplannerWindow *window) rise_upper_set_index_sun = picplanner_get_index_rise_upper_set (array_coordinates_sun); dark_blue_golden_index = picplanner_get_index_dark_blue_golden (array_coordinates_sun); + picplanner_sun_set_date (PICPLANNER_SUN (window->sun_box), + date_time_noon); + picplanner_moon_set_date (PICPLANNER_MOON (window->moon_box), + date_time_noon); + picplanner_milky_way_set_date (PICPLANNER_MILKYWAY (window->milky_way_box), + date_time_noon); + picplanner_overview_set_current_coordinates_sun (PICPLANNER_OVERVIEW (window->overview_box), array_coordinates_sun, rise_upper_set_index_sun, diff --git a/src/window/sun-page/sun-view.c b/src/window/sun-page/sun-view.c index ad7588a..bf3d0b9 100644 --- a/src/window/sun-page/sun-view.c +++ b/src/window/sun-page/sun-view.c @@ -21,13 +21,16 @@ /* - * TODO: Azimuth is "wrong" on the south half of the earth. Measuring from North! + * TODO: Add lower culmination for night photography */ struct _PicplannerSun { GtkBox parent_instance; + + GtkWidget *label_date; + GtkWidget *label_morning_rise_time; GtkWidget *label_morning_rise_azimuth; GtkWidget *label_upper_time; @@ -48,6 +51,21 @@ struct _PicplannerSun G_DEFINE_TYPE (PicplannerSun, picplanner_sun, GTK_TYPE_BOX) +void +picplanner_sun_set_date (PicplannerSun *sun, + GDateTime *date_time) +{ + char *char_label_date; + + char_label_date = g_strdup_printf ("Date: %d.%d.%d", + g_date_time_get_day_of_month (date_time), + g_date_time_get_month (date_time), + g_date_time_get_year (date_time)); + gtk_label_set_text (GTK_LABEL (sun->label_date), char_label_date); + + g_free (char_label_date); +} + void picplanner_sun_set_rise_upper_set (PicplannerSun *sun, GDateTime *date_time, @@ -337,6 +355,7 @@ picplanner_sun_class_init (PicplannerSunClass *class) gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerSun, label_evening_golden); gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerSun, label_evening_blue); gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerSun, label_evening_dark); + gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerSun, label_date); } PicplannerSun * diff --git a/src/window/sun-page/sun-view.h b/src/window/sun-page/sun-view.h index 2034e71..9f2b2d0 100644 --- a/src/window/sun-page/sun-view.h +++ b/src/window/sun-page/sun-view.h @@ -27,17 +27,20 @@ G_BEGIN_DECLS #define PICPLANNER_SUN_TYPE (picplanner_sun_get_type ()) G_DECLARE_FINAL_TYPE (PicplannerSun, picplanner_sun, PICPLANNER, SUN, GtkBox) +void +picplanner_sun_set_date (PicplannerSun *sun, + GDateTime *date_time); void -picplanner_sun_set_rise_upper_set (PicplannerSun *sun, - GDateTime *date_time, - double *coordinates_array, - int *index_rise_upper_set); +picplanner_sun_set_rise_upper_set (PicplannerSun *sun, + GDateTime *date_time, + double *coordinates_array, + int *index_rise_upper_set); void -picplanner_sun_set_dark_blue_golden (PicplannerSun *sun, - GDateTime *date_time, - int *index_dark_blue_golden); +picplanner_sun_set_dark_blue_golden (PicplannerSun *sun, + GDateTime *date_time, + int *index_dark_blue_golden); PicplannerSun *picplanner_sun_new (); diff --git a/src/window/sun-page/sun-view.ui b/src/window/sun-page/sun-view.ui index b935914..3bb7ef2 100644 --- a/src/window/sun-page/sun-view.ui +++ b/src/window/sun-page/sun-view.ui @@ -14,6 +14,16 @@ vertical + + + Date: 01.01.2000 + center + 10 + + + + + Morning