gergely/astrognome
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated for SWE-GLib 2.0 API

Browse Source
This commit is contained in:
Gergely Polonkai 2013-10-04 00:16:55 +02:00
parent d5011879f9
commit 096111684e
3 changed files with 67 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -33,7 +33,7 @@ PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= 3.8])
PKG_CHECK_MODULES([LIBXML], [libxml-2.0]) PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
PKG_CHECK_MODULES([LIBXSLT], [libexslt]) PKG_CHECK_MODULES([LIBXSLT], [libexslt])
PKG_CHECK_MODULES([WEBKIT], [webkitgtk-3.0]) PKG_CHECK_MODULES([WEBKIT], [webkitgtk-3.0])
PKG_CHECK_MODULES([SWE_GLIB], [swe-glib]) PKG_CHECK_MODULES([SWE_GLIB], [swe-glib >= 2.0.0])
LIBGD_INIT([ LIBGD_INIT([
header-bar header-bar

7
src/ag-app.c
View File

@ -112,7 +112,12 @@ ag_app_open_chart(AgApp *app, GFile *file)
GError *err = NULL; GError *err = NULL;
gchar *uri; gchar *uri;
chart = ag_chart_load_from_file(file, &err); if ((chart = ag_chart_load_from_file(file, &err)) == NULL) {
g_print("Error: '%s'\n", err->message);
return;
}
window = ag_app_create_window(app); window = ag_app_create_window(app);
ag_window_set_chart(AG_WINDOW(window), chart); ag_window_set_chart(AG_WINDOW(window), chart);
ag_window_update_from_chart(AG_WINDOW(window)); ag_window_update_from_chart(AG_WINDOW(window));

52
src/ag-chart.c
View File

@ -633,8 +633,8 @@ ag_chart_create_svg(AgChart *chart, GError **err)
GList *planet; GList *planet;
GList *aspect; GList *aspect;
GList *antiscion; GList *antiscion;
const GswePlanetData *planet_data; GswePlanetData *planet_data;
const GsweAspectData *aspect_data; GsweAspectData *aspect_data;
GEnumClass *planets_class; GEnumClass *planets_class;
GEnumClass *aspects_class; GEnumClass *aspects_class;
GEnumClass *antiscia_class; GEnumClass *antiscia_class;
@ -654,9 +654,9 @@ ag_chart_create_svg(AgChart *chart, GError **err)
node = xmlNewChild(ascmcs_node, NULL, BAD_CAST "ascendant", NULL); node = xmlNewChild(ascmcs_node, NULL, BAD_CAST "ascendant", NULL);
planet_data = gswe_moment_get_planet(GSWE_MOMENT(chart), GSWE_PLANET_ASCENDENT, NULL); planet_data = gswe_moment_get_planet(GSWE_MOMENT(chart), GSWE_PLANET_ASCENDANT, NULL);
value = g_malloc0(12); value = g_malloc0(12);
g_ascii_dtostr(value, 12, planet_data->position); g_ascii_dtostr(value, 12, gswe_planet_data_get_position(planet_data));
xmlNewProp(node, BAD_CAST "degree_ut", BAD_CAST value); xmlNewProp(node, BAD_CAST "degree_ut", BAD_CAST value);
g_free(value); g_free(value);
@ -664,7 +664,7 @@ ag_chart_create_svg(AgChart *chart, GError **err)
planet_data = gswe_moment_get_planet(GSWE_MOMENT(chart), GSWE_PLANET_MC, NULL); planet_data = gswe_moment_get_planet(GSWE_MOMENT(chart), GSWE_PLANET_MC, NULL);
value = g_malloc0(12); value = g_malloc0(12);
g_ascii_dtostr(value, 12, planet_data->position); g_ascii_dtostr(value, 12, gswe_planet_data_get_position(planet_data));
xmlNewProp(node, BAD_CAST "degree_ut", BAD_CAST value); xmlNewProp(node, BAD_CAST "degree_ut", BAD_CAST value);
g_free(value); g_free(value);
@ -672,7 +672,7 @@ ag_chart_create_svg(AgChart *chart, GError **err)
planet_data = gswe_moment_get_planet(GSWE_MOMENT(chart), GSWE_PLANET_VERTEX, NULL); planet_data = gswe_moment_get_planet(GSWE_MOMENT(chart), GSWE_PLANET_VERTEX, NULL);
value = g_malloc0(12); value = g_malloc0(12);
g_ascii_dtostr(value, 12, planet_data->position); g_ascii_dtostr(value, 12, gswe_planet_data_get_position(planet_data));
xmlNewProp(node, BAD_CAST "degree_ut", BAD_CAST value); xmlNewProp(node, BAD_CAST "degree_ut", BAD_CAST value);
g_free(value); g_free(value);
@ -686,12 +686,12 @@ ag_chart_create_svg(AgChart *chart, GError **err)
node = xmlNewChild(houses_node, NULL, BAD_CAST "house", NULL); node = xmlNewChild(houses_node, NULL, BAD_CAST "house", NULL);
value = g_malloc0(3); value = g_malloc0(3);
g_ascii_dtostr(value, 3, house_data->house); g_ascii_dtostr(value, 3, gswe_house_data_get_house(house_data));
xmlNewProp(node, BAD_CAST "number", BAD_CAST value); xmlNewProp(node, BAD_CAST "number", BAD_CAST value);
g_free(value); g_free(value);
value = g_malloc0(12); value = g_malloc0(12);
g_ascii_dtostr(value, 12, house_data->cusp_position); g_ascii_dtostr(value, 12, gswe_house_data_get_cusp_position(house_data));
xmlNewProp(node, BAD_CAST "degree", BAD_CAST value); xmlNewProp(node, BAD_CAST "degree", BAD_CAST value);
g_free(value); g_free(value);
} }
@ -707,20 +707,20 @@ ag_chart_create_svg(AgChart *chart, GError **err)
GEnumValue *enum_value; GEnumValue *enum_value;
if ( if (
(planet_data->planet_id == GSWE_PLANET_ASCENDENT) || (gswe_planet_data_get_planet(planet_data) == GSWE_PLANET_ASCENDANT) ||
(planet_data->planet_id == GSWE_PLANET_MC) || (gswe_planet_data_get_planet(planet_data) == GSWE_PLANET_MC) ||
(planet_data->planet_id == GSWE_PLANET_VERTEX) (gswe_planet_data_get_planet(planet_data) == GSWE_PLANET_VERTEX)
) { ) {
continue; continue;
} }
node = xmlNewChild(bodies_node, NULL, BAD_CAST "body", NULL); node = xmlNewChild(bodies_node, NULL, BAD_CAST "body", NULL);
enum_value = g_enum_get_value(G_ENUM_CLASS(planets_class), planet_data->planet_id); enum_value = g_enum_get_value(G_ENUM_CLASS(planets_class), gswe_planet_data_get_planet(planet_data));
xmlNewProp(node, BAD_CAST "name", BAD_CAST enum_value->value_name); xmlNewProp(node, BAD_CAST "name", BAD_CAST enum_value->value_name);
value = g_malloc0(12); value = g_malloc0(12);
g_ascii_dtostr(value, 12, planet_data->position); g_ascii_dtostr(value, 12, gswe_planet_data_get_position(planet_data));
xmlNewProp(node, BAD_CAST "degree", BAD_CAST value); xmlNewProp(node, BAD_CAST "degree", BAD_CAST value);
g_free(value); g_free(value);
} }
@ -732,22 +732,27 @@ ag_chart_create_svg(AgChart *chart, GError **err)
aspects_class = g_type_class_ref(GSWE_TYPE_ASPECT); aspects_class = g_type_class_ref(GSWE_TYPE_ASPECT);
for (aspect = gswe_moment_get_all_aspects(GSWE_MOMENT(chart)); aspect; aspect = g_list_next(aspect)) { for (aspect = gswe_moment_get_all_aspects(GSWE_MOMENT(chart)); aspect; aspect = g_list_next(aspect)) {
GswePlanetData *planet_data;
GEnumValue *enum_value; GEnumValue *enum_value;
aspect_data = aspect->data; aspect_data = aspect->data;
if (aspect_data->aspect == GSWE_ASPECT_NONE) { if (gswe_aspect_data_get_aspect(aspect_data) == GSWE_ASPECT_NONE) {
continue; continue;
} }
node = xmlNewChild(aspects_node, NULL, BAD_CAST "aspect", NULL); node = xmlNewChild(aspects_node, NULL, BAD_CAST "aspect", NULL);
enum_value = g_enum_get_value(G_ENUM_CLASS(planets_class), aspect_data->planet1->planet_id); planet_data = gswe_aspect_data_get_planet1(aspect_data);
enum_value = g_enum_get_value(G_ENUM_CLASS(planets_class), gswe_planet_data_get_planet(planet_data));
xmlNewProp(node, BAD_CAST "body1", BAD_CAST enum_value->value_name); xmlNewProp(node, BAD_CAST "body1", BAD_CAST enum_value->value_name);
gswe_planet_data_unref(planet_data);
enum_value = g_enum_get_value(G_ENUM_CLASS(planets_class), aspect_data->planet2->planet_id); planet_data = gswe_aspect_data_get_planet2(aspect_data);
enum_value = g_enum_get_value(G_ENUM_CLASS(planets_class), gswe_planet_data_get_planet(planet_data));
xmlNewProp(node, BAD_CAST "body2", BAD_CAST enum_value->value_name); xmlNewProp(node, BAD_CAST "body2", BAD_CAST enum_value->value_name);
gswe_planet_data_unref(planet_data);
enum_value = g_enum_get_value(G_ENUM_CLASS(aspects_class), aspect_data->aspect); enum_value = g_enum_get_value(G_ENUM_CLASS(aspects_class), gswe_aspect_data_get_aspect(aspect_data));
xmlNewProp(node, BAD_CAST "type", BAD_CAST enum_value->value_name); xmlNewProp(node, BAD_CAST "type", BAD_CAST enum_value->value_name);
} }
@ -759,22 +764,27 @@ ag_chart_create_svg(AgChart *chart, GError **err)
antiscia_class = g_type_class_ref(GSWE_TYPE_ANTISCION_AXIS); antiscia_class = g_type_class_ref(GSWE_TYPE_ANTISCION_AXIS);
for (antiscion = gswe_moment_get_all_antiscia(GSWE_MOMENT(chart)); antiscion; antiscion = g_list_next(antiscion)) { for (antiscion = gswe_moment_get_all_antiscia(GSWE_MOMENT(chart)); antiscion; antiscion = g_list_next(antiscion)) {
GswePlanetData *planet_data;
GsweAntiscionData *antiscion_data = antiscion->data; GsweAntiscionData *antiscion_data = antiscion->data;
GEnumValue *enum_value; GEnumValue *enum_value;
if (antiscion_data->axis == GSWE_ANTISCION_AXIS_NONE) { if (gswe_antiscion_data_get_axis(antiscion_data) == GSWE_ANTISCION_AXIS_NONE) {
continue; continue;
} }
node = xmlNewChild(antiscia_node, NULL, BAD_CAST "antiscia", NULL); node = xmlNewChild(antiscia_node, NULL, BAD_CAST "antiscia", NULL);
enum_value = g_enum_get_value(G_ENUM_CLASS(planets_class), antiscion_data->planet1->planet_id); planet_data = gswe_antiscion_data_get_planet1(antiscion_data);
enum_value = g_enum_get_value(G_ENUM_CLASS(planets_class), gswe_planet_data_get_planet(planet_data));
xmlNewProp(node, BAD_CAST "body1", BAD_CAST enum_value->value_name); xmlNewProp(node, BAD_CAST "body1", BAD_CAST enum_value->value_name);
gswe_planet_data_unref(planet_data);
enum_value = g_enum_get_value(G_ENUM_CLASS(planets_class), antiscion_data->planet2->planet_id); planet_data = gswe_antiscion_data_get_planet2(antiscion_data);
enum_value = g_enum_get_value(G_ENUM_CLASS(planets_class), gswe_planet_data_get_planet(planet_data));
xmlNewProp(node, BAD_CAST "body2", BAD_CAST enum_value->value_name); xmlNewProp(node, BAD_CAST "body2", BAD_CAST enum_value->value_name);
gswe_planet_data_unref(planet_data);
enum_value = g_enum_get_value(G_ENUM_CLASS(antiscia_class), antiscion_data->axis); enum_value = g_enum_get_value(G_ENUM_CLASS(antiscia_class), gswe_antiscion_data_get_axis(antiscion_data));
xmlNewProp(node, BAD_CAST "axis", BAD_CAST enum_value->value_name); xmlNewProp(node, BAD_CAST "axis", BAD_CAST enum_value->value_name);
} }