diff --git a/src/meson.build b/src/meson.build
index e2f5fb3..ad7438b 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -17,8 +17,6 @@ picplanner_deps = [
dependency('gtk4'),
dependency('libadwaita-1'),
dependency('shumate-1.0'),
- dependency('libsoup-2.4'),
- dependency('json-glib-1.0'),
meson.get_compiler('c').find_library('m', required: false),
]
diff --git a/src/window/milky-way-page/milky-way-view.c b/src/window/milky-way-page/milky-way-view.c
index 38f5237..f45ef14 100644
--- a/src/window/milky-way-page/milky-way-view.c
+++ b/src/window/milky-way-page/milky-way-view.c
@@ -4,25 +4,67 @@
struct _PicplannerMilkyway
{
GtkBox parent_instance;
+ GtkWidget *label_rise_time;
+ GtkWidget *label_rise_azimuth;
+ GtkWidget *label_upper_time;
+ GtkWidget *label_upper_azimuth;
+ GtkWidget *label_upper_elevation;
+ GtkWidget *label_set_time;
+ GtkWidget *label_set_azimuth;
};
G_DEFINE_TYPE (PicplannerMilkyway, picplanner_milkyway, GTK_TYPE_BOX)
void
-picplanner_milky_way_set_rise_upper_set (GDateTime *date_time,
+picplanner_milky_way_set_rise_upper_set (PicplannerMilkyway *milky_way,
+ GDateTime *date_time,
double *coordinates_array,
int *index_rise_upper_set)
{
+ char *char_rise_time;
+ char *char_rise_azimuth;
+ char *char_upper_time;
+ char *char_upper_azimuth;
+ char *char_upper_elevation;
+ char *char_set_time;
+ char *char_set_azimuth;
GDateTime *date_time_rise;
GDateTime *date_time_upper;
GDateTime *date_time_set;
- (void) coordinates_array;
date_time_rise = g_date_time_add_minutes (date_time, index_rise_upper_set[0]*24*60/NUM_DATA_POINTS-12*60);
date_time_upper = g_date_time_add_minutes (date_time, index_rise_upper_set[1]*24*60/NUM_DATA_POINTS-12*60);
date_time_set = g_date_time_add_minutes (date_time, index_rise_upper_set[2]*24*60/NUM_DATA_POINTS-12*60);
+ char_rise_time = g_strdup_printf ("%02d:%02d",
+ g_date_time_get_hour (date_time_rise),
+ g_date_time_get_minute (date_time_rise));
+ char_rise_azimuth = g_strdup_printf ("Azimuth: %.0f\u00B0",
+ coordinates_array[index_rise_upper_set[0]*2]);
+
+ char_upper_time = g_strdup_printf ("%02d:%02d",
+ g_date_time_get_hour (date_time_upper),
+ g_date_time_get_minute (date_time_upper));
+ char_upper_azimuth = g_strdup_printf ("Azimuth: %.0f\u00B0",
+ coordinates_array[index_rise_upper_set[1]*2]);
+ char_upper_elevation = g_strdup_printf ("Elevation: %.0f\u00B0",
+ coordinates_array[index_rise_upper_set[1]*2+1]);
+
+ char_set_time = g_strdup_printf ("%02d:%02d",
+ g_date_time_get_hour (date_time_set),
+ g_date_time_get_minute (date_time_set));
+ char_set_azimuth = g_strdup_printf ("Azimuth: %.0f\u00B0",
+ coordinates_array[index_rise_upper_set[2]*2]);
+
+ gtk_label_set_text (GTK_LABEL (milky_way->label_rise_time), char_rise_time);
+ gtk_label_set_text (GTK_LABEL (milky_way->label_rise_azimuth), char_rise_azimuth);
+ gtk_label_set_text (GTK_LABEL (milky_way->label_upper_time), char_upper_time);
+ gtk_label_set_text (GTK_LABEL (milky_way->label_upper_azimuth), char_upper_azimuth);
+ gtk_label_set_text (GTK_LABEL (milky_way->label_upper_elevation), char_upper_elevation);
+ gtk_label_set_text (GTK_LABEL (milky_way->label_set_time), char_set_time);
+ gtk_label_set_text (GTK_LABEL (milky_way->label_set_azimuth), char_set_azimuth);
+
g_date_time_unref (date_time_rise);
g_date_time_unref (date_time_upper);
g_date_time_unref (date_time_set);
@@ -40,6 +82,13 @@ picplanner_milkyway_class_init (PicplannerMilkywayClass *class)
{
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/de/zwarf/picplanner/window/milky-way-page/milky-way-view.ui");
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_rise_time);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_rise_azimuth);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_upper_time);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_upper_azimuth);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_upper_elevation);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_set_time);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMilkyway, label_set_azimuth);
}
PicplannerMilkyway *
diff --git a/src/window/milky-way-page/milky-way-view.h b/src/window/milky-way-page/milky-way-view.h
index 43c2e60..6e11323 100644
--- a/src/window/milky-way-page/milky-way-view.h
+++ b/src/window/milky-way-page/milky-way-view.h
@@ -9,7 +9,8 @@ G_BEGIN_DECLS
G_DECLARE_FINAL_TYPE (PicplannerMilkyway, picplanner_milkyway, PICPLANNER, MILKYWAY, GtkBox)
void
-picplanner_milky_way_set_rise_upper_set (GDateTime *date_time,
+picplanner_milky_way_set_rise_upper_set (PicplannerMilkyway *milky_way,
+ GDateTime *date_time,
double *coordinates_array,
int *index_rise_upper_set);
diff --git a/src/window/milky-way-page/milky-way-view.ui b/src/window/milky-way-page/milky-way-view.ui
index 0808e4e..bb2a4ca 100644
--- a/src/window/milky-way-page/milky-way-view.ui
+++ b/src/window/milky-way-page/milky-way-view.ui
@@ -45,12 +45,12 @@
vertical
center
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/src/window/moon-page/moon-view.c b/src/window/moon-page/moon-view.c
index 0995240..7c60084 100644
--- a/src/window/moon-page/moon-view.c
+++ b/src/window/moon-page/moon-view.c
@@ -4,25 +4,68 @@
struct _PicplannerMoon
{
GtkBox parent_instance;
+ GtkWidget *label_rise_time;
+ GtkWidget *label_rise_azimuth;
+ GtkWidget *label_upper_time;
+ GtkWidget *label_upper_azimuth;
+ GtkWidget *label_upper_elevation;
+ GtkWidget *label_set_time;
+ GtkWidget *label_set_azimuth;
};
G_DEFINE_TYPE (PicplannerMoon, picplanner_moon, GTK_TYPE_BOX)
void
-picplanner_moon_set_rise_upper_set (GDateTime *date_time,
+picplanner_moon_set_rise_upper_set (PicplannerMoon *moon,
+ GDateTime *date_time,
double *coordinates_array,
int *index_rise_upper_set)
{
+ char *char_rise_time;
+ char *char_rise_azimuth;
+ char *char_upper_time;
+ char *char_upper_azimuth;
+ char *char_upper_elevation;
+ char *char_set_time;
+ char *char_set_azimuth;
GDateTime *date_time_rise;
GDateTime *date_time_upper;
GDateTime *date_time_set;
- (void) coordinates_array;
date_time_rise = g_date_time_add_minutes (date_time, index_rise_upper_set[0]*24*60/NUM_DATA_POINTS-12*60);
date_time_upper = g_date_time_add_minutes (date_time, index_rise_upper_set[1]*24*60/NUM_DATA_POINTS-12*60);
date_time_set = g_date_time_add_minutes (date_time, index_rise_upper_set[2]*24*60/NUM_DATA_POINTS-12*60);
+ char_rise_time = g_strdup_printf ("%02d:%02d",
+ g_date_time_get_hour (date_time_rise),
+ g_date_time_get_minute (date_time_rise));
+ char_rise_azimuth = g_strdup_printf ("Azimuth: %.0f\u00B0",
+ coordinates_array[index_rise_upper_set[0]*2]);
+
+ char_upper_time = g_strdup_printf ("%02d:%02d",
+ g_date_time_get_hour (date_time_upper),
+ g_date_time_get_minute (date_time_upper));
+ char_upper_azimuth = g_strdup_printf ("Azimuth: %.0f\u00B0",
+ coordinates_array[index_rise_upper_set[1]*2]);
+ char_upper_elevation = g_strdup_printf ("Elevation: %.0f\u00B0",
+ coordinates_array[index_rise_upper_set[1]*2+1]);
+
+ char_set_time = g_strdup_printf ("%02d:%02d",
+ g_date_time_get_hour (date_time_set),
+ g_date_time_get_minute (date_time_set));
+ char_set_azimuth = g_strdup_printf ("Azimuth: %.0f\u00B0",
+ coordinates_array[index_rise_upper_set[2]*2]);
+
+ gtk_label_set_text (GTK_LABEL (moon->label_rise_time), char_rise_time);
+ gtk_label_set_text (GTK_LABEL (moon->label_rise_azimuth), char_rise_azimuth);
+ gtk_label_set_text (GTK_LABEL (moon->label_upper_time), char_upper_time);
+ gtk_label_set_text (GTK_LABEL (moon->label_upper_azimuth), char_upper_azimuth);
+ gtk_label_set_text (GTK_LABEL (moon->label_upper_elevation), char_upper_elevation);
+ gtk_label_set_text (GTK_LABEL (moon->label_set_time), char_set_time);
+ gtk_label_set_text (GTK_LABEL (moon->label_set_azimuth), char_set_azimuth);
+
+
g_date_time_unref (date_time_rise);
g_date_time_unref (date_time_upper);
g_date_time_unref (date_time_set);
@@ -40,6 +83,13 @@ picplanner_moon_class_init (PicplannerMoonClass *class)
{
gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
"/de/zwarf/picplanner/window/moon-page/moon-view.ui");
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_rise_time);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_rise_azimuth);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_upper_time);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_upper_azimuth);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_upper_elevation);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_set_time);
+ gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), PicplannerMoon, label_set_azimuth);
}
PicplannerMoon *
diff --git a/src/window/moon-page/moon-view.h b/src/window/moon-page/moon-view.h
index 35f554e..2d5f2b0 100644
--- a/src/window/moon-page/moon-view.h
+++ b/src/window/moon-page/moon-view.h
@@ -10,7 +10,8 @@ G_DECLARE_FINAL_TYPE (PicplannerMoon, picplanner_moon, PICPLANNER, MOON, GtkBox)
void
-picplanner_moon_set_rise_upper_set (GDateTime *date_time,
+picplanner_moon_set_rise_upper_set (PicplannerMoon *moon,
+ GDateTime *date_time,
double *coordinates_array,
int *index_rise_upper_set);
diff --git a/src/window/moon-page/moon-view.ui b/src/window/moon-page/moon-view.ui
index aaedd1f..ae41d5c 100644
--- a/src/window/moon-page/moon-view.ui
+++ b/src/window/moon-page/moon-view.ui
@@ -45,12 +45,12 @@
vertical
center
-
-
-
-
-
-
@@ -150,7 +150,7 @@
Illumination Intensity
@@ -161,7 +161,7 @@
Phase Trend
diff --git a/src/window/overview-page/overview-view.c b/src/window/overview-page/overview-view.c
index 5ca22f0..76ceb64 100644
--- a/src/window/overview-page/overview-view.c
+++ b/src/window/overview-page/overview-view.c
@@ -61,7 +61,7 @@ picplanner_overview_set_current_coordinates_sun (PicplannerOverview *overview,
from_time = g_date_time_add_minutes (overview->date_time, -12*60);
to_time = g_date_time_add_minutes (overview->date_time, 12*60);
- g_print ("From: %02d.%02d.%02d %02d:%02d, To: %02d.%02d.%02d %02d:%02d",
+ g_print ("From: %02d.%02d.%02d %02d:%02d, To: %02d.%02d.%02d %02d:%02d\n",
g_date_time_get_day_of_month (from_time),
g_date_time_get_month (from_time),
g_date_time_get_year (from_time),
diff --git a/src/window/picplanner-window.c b/src/window/picplanner-window.c
index a809d26..35ce1ba 100644
--- a/src/window/picplanner-window.c
+++ b/src/window/picplanner-window.c
@@ -125,8 +125,9 @@ calculate_positions (PicplannerWindow *window)
picplanner_overview_set_current_coordinates_moon (PICPLANNER_OVERVIEW (window->overview_box),
rise_upper_set_index_moon);
- picplanner_moon_set_rise_upper_set (date_time,
- array_coordinates_sun,
+ picplanner_moon_set_rise_upper_set (PICPLANNER_MOON (window->moon_box),
+ date_time,
+ array_coordinates_moon,
rise_upper_set_index_moon);
@@ -140,10 +141,12 @@ calculate_positions (PicplannerWindow *window)
picplanner_overview_set_current_coordinates_milky_way (PICPLANNER_OVERVIEW (window->overview_box),
rise_upper_set_index_milky_way);
- picplanner_milky_way_set_rise_upper_set (date_time,
- array_coordinates_sun,
+ picplanner_milky_way_set_rise_upper_set (PICPLANNER_MILKYWAY (window->milky_way_box),
+ date_time,
+ array_coordinates_milky_way,
rise_upper_set_index_milky_way);
+
g_free (rise_upper_set_index_sun);
g_free (rise_upper_set_index_moon);
g_free (rise_upper_set_index_milky_way);
diff --git a/src/window/picplanner-window.h b/src/window/picplanner-window.h
index 2d3269e..4ec00e1 100644
--- a/src/window/picplanner-window.h
+++ b/src/window/picplanner-window.h
@@ -21,7 +21,6 @@
#include
#include
#include
-#include
#include "picplanner-config.h"
#include "picplanner-application.h"