Add milky way disturbance by moon feature

master
Zwarf 2022-06-20 10:52:41 +02:00
rodzic 3f0cf7d271
commit 22b91556ed
1 zmienionych plików z 38 dodań i 20 usunięć

Wyświetl plik

@ -150,7 +150,7 @@ picplanner_milky_way_set_disturbance (PicplannerMilkyway *milky_way,
date_time_dark_begin = g_date_time_add_minutes (date_time_noon,
dark_blue_golden_index_sun[7]*24*60/NUM_DATA_POINTS-12*60);
if (dark_blue_golden_index_sun[0]>=0 && dark_blue_golden_index_sun[7]>=0)
if (dark_blue_golden_index_sun[0]>=0 || dark_blue_golden_index_sun[7]>=0)
{
if (dark_blue_golden_index_sun[7]>=0)
{
@ -194,11 +194,43 @@ picplanner_milky_way_set_disturbance (PicplannerMilkyway *milky_way,
rise_upper_set_index_moon[0]*24*60/NUM_DATA_POINTS-12*60);
date_time_set_moon = g_date_time_add_minutes (date_time_noon,
rise_upper_set_index_moon[2]*24*60/NUM_DATA_POINTS-12*60);
char_label_disturbance_moon = g_strdup_printf ("%02d:%02d - %02d:%02d",
g_date_time_get_hour (date_time_set_moon),
g_date_time_get_minute (date_time_set_moon),
g_date_time_get_hour (date_time_rise_moon),
g_date_time_get_minute (date_time_rise_moon));
if (rise_upper_set_index_moon[0]>=0 || rise_upper_set_index_moon[2]>=0)
{
if (rise_upper_set_index_moon[2]>=0)
{
char_label_disturbance_moon = g_strdup_printf ("%02d:%02d",
g_date_time_get_hour (date_time_set_moon),
g_date_time_get_minute (date_time_set_moon));
}
else
{
char_label_disturbance_moon = g_strdup_printf ("00:00");
}
if (rise_upper_set_index_moon[0]>=0)
{
char_label_disturbance_moon = g_strdup_printf ("%s - %02d:%02d",
char_label_disturbance_moon,
g_date_time_get_hour (date_time_rise_moon),
g_date_time_get_minute (date_time_rise_moon));
}
else
{
char_label_disturbance_moon = g_strdup_printf ("%s - 23:59",
char_label_disturbance_moon);
}
}
else
{
if (elevation_moon < 0)
{
char_label_disturbance_moon = g_strdup_printf ("00:00 - 23:59");
}
else
{
char_label_disturbance_moon = g_strdup_printf ("--:-- - --:--");
}
}
gtk_label_set_text (GTK_LABEL (milky_way->label_disturbance_moon), char_label_disturbance_moon);
@ -206,21 +238,7 @@ picplanner_milky_way_set_disturbance (PicplannerMilkyway *milky_way,
rise_upper_set_index_milky_way[0]*24*60/NUM_DATA_POINTS-12*60);
date_time_set_milky_way = g_date_time_add_minutes (date_time_noon,
rise_upper_set_index_milky_way[2]*24*60/NUM_DATA_POINTS-12*60);
/*
gint64 time_diff_dark;
gint64 time_diff_dark_moon_rise;
gint64 time_diff_dark_moon_set;
time_diff_dark = g_date_time_difference (date_time_dark_end, date_time_dark_begin);
time_diff_dark_moon_rise = g_date_time_difference (date_time_rise_moon, date_time)
g_print ("time_diff: %ld\n", time_diff_dark/1000/1000/60);
g_print ("Begin: %02d:%02d, End: %02d:%02d\n",
g_date_time_get_hour (date_time_dark_begin),
g_date_time_get_minute (date_time_dark_begin),
g_date_time_get_hour (date_time_dark_end),
g_date_time_get_minute (date_time_dark_end));
*/
g_date_time_unref (date_time_dark_end);
g_date_time_unref (date_time_dark_begin);
}