kopia lustrzana https://gitlab.com/Zwarf/picplanner
Fix memory leak, add milky-way-symbolic icon to UI
rodzic
36b8fcd961
commit
d4ef2636de
|
@ -12,7 +12,7 @@ install_data(
|
||||||
install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir)
|
install_dir: join_paths(get_option('datadir'), 'icons', symbolic_dir)
|
||||||
)
|
)
|
||||||
|
|
||||||
#install_data(
|
install_data(
|
||||||
# 'milky-way.svg',
|
'milky-way-symbolic.svg',
|
||||||
# install_dir: join_paths(get_option('datadir'), 'icons')
|
install_dir: join_paths(get_option('datadir'), 'icons')
|
||||||
#)
|
)
|
||||||
|
|
Przed Szerokość: | Wysokość: | Rozmiar: 3.3 KiB Po Szerokość: | Wysokość: | Rozmiar: 3.3 KiB |
|
@ -24,7 +24,7 @@ double
|
||||||
{
|
{
|
||||||
double siderial_time;
|
double siderial_time;
|
||||||
double *coordinates_milky_way;
|
double *coordinates_milky_way;
|
||||||
double *coordinates_horizontal_milky_way = malloc (sizeof (double) * 2 * NUM_DATA_POINTS);
|
double *coordinates_horizontal_milky_way;
|
||||||
|
|
||||||
coordinates_milky_way = picplanner_get_coordinates_rotational_milky_way ();
|
coordinates_milky_way = picplanner_get_coordinates_rotational_milky_way ();
|
||||||
siderial_time = time_jd_to_sidereal_time (longitude, date_time);
|
siderial_time = time_jd_to_sidereal_time (longitude, date_time);
|
||||||
|
|
|
@ -54,7 +54,7 @@ double
|
||||||
{
|
{
|
||||||
double siderial_time;
|
double siderial_time;
|
||||||
double *coordinates_moon;
|
double *coordinates_moon;
|
||||||
double *coordinates_horizontal_moon = malloc (sizeof (double) * 2 * 288);
|
double *coordinates_horizontal_moon;
|
||||||
|
|
||||||
coordinates_moon = picplanner_get_coordinates_rotational_moon (date_time);
|
coordinates_moon = picplanner_get_coordinates_rotational_moon (date_time);
|
||||||
siderial_time = time_jd_to_sidereal_time (longitude, date_time);
|
siderial_time = time_jd_to_sidereal_time (longitude, date_time);
|
||||||
|
|
|
@ -46,7 +46,7 @@ double
|
||||||
{
|
{
|
||||||
double siderial_time;
|
double siderial_time;
|
||||||
double *coordinates_sun;
|
double *coordinates_sun;
|
||||||
double *coordinates_horizontal_sun = malloc (sizeof (double) * 2 * 288);
|
double *coordinates_horizontal_sun;
|
||||||
|
|
||||||
|
|
||||||
coordinates_sun = picplanner_get_coordinates_rotational_sun (date_time);
|
coordinates_sun = picplanner_get_coordinates_rotational_sun (date_time);
|
||||||
|
|
|
@ -115,7 +115,9 @@ picplanner_application_show_about (GSimpleAction *action,
|
||||||
|
|
||||||
PicplannerApplication *self = PICPLANNER_APPLICATION (user_data);
|
PicplannerApplication *self = PICPLANNER_APPLICATION (user_data);
|
||||||
GtkWindow *window = NULL;
|
GtkWindow *window = NULL;
|
||||||
const gchar *authors[] = {"Zwarf", NULL};
|
const gchar *authors[] = {"Zwarf <zwarf@mail.de>", NULL};
|
||||||
|
const gchar *artists[] = {"Zwarf <zwarf@mail.de>",
|
||||||
|
"Rajdeep Singha", NULL};
|
||||||
|
|
||||||
g_return_if_fail (PICPLANNER_IS_APPLICATION (self));
|
g_return_if_fail (PICPLANNER_IS_APPLICATION (self));
|
||||||
|
|
||||||
|
@ -130,6 +132,7 @@ picplanner_application_show_about (GSimpleAction *action,
|
||||||
"copyright", "Copyright \xC2\xA9 2020 Zwarf",
|
"copyright", "Copyright \xC2\xA9 2020 Zwarf",
|
||||||
"license-type", GTK_LICENSE_GPL_3_0,
|
"license-type", GTK_LICENSE_GPL_3_0,
|
||||||
"authors", authors,
|
"authors", authors,
|
||||||
|
"artists", artists,
|
||||||
NULL);
|
NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,6 @@
|
||||||
<file>window/sun-page/sun-view.ui</file>
|
<file>window/sun-page/sun-view.ui</file>
|
||||||
<file>window/moon-page/moon-view.ui</file>
|
<file>window/moon-page/moon-view.ui</file>
|
||||||
<file>window/milky-way-page/milky-way-view.ui</file>
|
<file>window/milky-way-page/milky-way-view.ui</file>
|
||||||
<!--file>../data/icons/milky-way.svg-->
|
<file>../data/icons/milky-way-symbolic.svg</file>
|
||||||
</gresource>
|
</gresource>
|
||||||
</gresources>
|
</gresources>
|
||||||
|
|
|
@ -111,7 +111,6 @@ calculate_positions (PicplannerWindow *window)
|
||||||
|
|
||||||
|
|
||||||
/* Moon */
|
/* Moon */
|
||||||
/*
|
|
||||||
array_coordinates_moon = picplanner_get_array_coordinates_moon (date_time,
|
array_coordinates_moon = picplanner_get_array_coordinates_moon (date_time,
|
||||||
longitude,
|
longitude,
|
||||||
latitude);
|
latitude);
|
||||||
|
@ -119,9 +118,8 @@ calculate_positions (PicplannerWindow *window)
|
||||||
picplanner_moon_set_rise_upper_set (date_time,
|
picplanner_moon_set_rise_upper_set (date_time,
|
||||||
array_coordinates_sun,
|
array_coordinates_sun,
|
||||||
rise_upper_set_index_moon);
|
rise_upper_set_index_moon);
|
||||||
*/
|
|
||||||
/* Milky Way */
|
/* Milky Way */
|
||||||
/*
|
|
||||||
array_coordinates_milky_way = picplanner_get_array_coordinates_milky_way (date_time,
|
array_coordinates_milky_way = picplanner_get_array_coordinates_milky_way (date_time,
|
||||||
longitude,
|
longitude,
|
||||||
latitude);
|
latitude);
|
||||||
|
@ -129,14 +127,14 @@ calculate_positions (PicplannerWindow *window)
|
||||||
picplanner_milky_way_set_rise_upper_set (date_time,
|
picplanner_milky_way_set_rise_upper_set (date_time,
|
||||||
array_coordinates_sun,
|
array_coordinates_sun,
|
||||||
rise_upper_set_index_milky_way);
|
rise_upper_set_index_milky_way);
|
||||||
*/
|
|
||||||
g_free (rise_upper_set_index_sun);
|
g_free (rise_upper_set_index_sun);
|
||||||
//g_free (rise_upper_set_index_moon);
|
g_free (rise_upper_set_index_moon);
|
||||||
//g_free (rise_upper_set_index_milky_way);
|
g_free (rise_upper_set_index_milky_way);
|
||||||
g_free (dark_blue_golden_index);
|
g_free (dark_blue_golden_index);
|
||||||
g_free (array_coordinates_sun);
|
g_free (array_coordinates_sun);
|
||||||
//g_free (array_coordinates_moon);
|
g_free (array_coordinates_moon);
|
||||||
//g_free (array_coordinates_milky_way);
|
g_free (array_coordinates_milky_way);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -163,7 +163,7 @@
|
||||||
<property name="name">page4</property>
|
<property name="name">page4</property>
|
||||||
<property name="title">Milky Way</property>
|
<property name="title">Milky Way</property>
|
||||||
<property name="child">milky_way_box</property>
|
<property name="child">milky_way_box</property>
|
||||||
<property name="icon-name">milky-way</property>
|
<property name="icon-name">milky-way-symbolic</property>
|
||||||
</object>
|
</object>
|
||||||
</child>
|
</child>
|
||||||
</object>
|
</object>
|
||||||
|
|
Ładowanie…
Reference in New Issue