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

Merge pull request #55 from gergelypolonkai/default-altitude

Browse Source 
Create a DEFAULT_ALTITUDE macro
This commit is contained in:
Gergely Polonkai 2014-08-17 09:38:22 +02:00
commit 3f16dcce11
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -18,6 +18,7 @@ AC_PATH_PROGS(UNZIP, [unzip])
have_geonames_perl_modules=no have_geonames_perl_modules=no
AX_PROG_PERL_MODULES([XML::Writer IO::File], [have_geonames_perl_modules=yes], AC_MSG_WARN([XML::Writer and IO::File perl modules are required if you want to regenerate geodata.xml!])) AX_PROG_PERL_MODULES([XML::Writer IO::File], [have_geonames_perl_modules=yes], AC_MSG_WARN([XML::Writer and IO::File perl modules are required if you want to regenerate geodata.xml!]))
AC_SUBST([have_geonames_perl_modules]) AC_SUBST([have_geonames_perl_modules])
AC_DEFINE([DEFAULT_ALTITUDE], [280.0], [Set this to the default altitude value, which is used if there is no value in geodata.xml])
IT_PROG_INTLTOOL([0.35.0]) IT_PROG_INTLTOOL([0.35.0])
GETTEXT_PACKAGE=astrognome GETTEXT_PACKAGE=astrognome
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)

3
src/ag-chart.c
View File

@ -11,6 +11,7 @@
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>
#include "config.h"
#include "ag-db.h" #include "ag-db.h"
#include "ag-chart.h" #include "ag-chart.h"
#include "placidus.h" #include "placidus.h"
@ -1262,7 +1263,7 @@ AgChart *ag_chart_load_from_placidus_file(GFile *file,
chart = ag_chart_new_full( chart = ag_chart_new_full(
timestamp, timestamp,
real_long, real_lat, 280.0, real_long, real_lat, DEFAULT_ALTITUDE,
GSWE_HOUSE_SYSTEM_PLACIDUS GSWE_HOUSE_SYSTEM_PLACIDUS
); );

3
src/ag-db.c
View File

@ -955,8 +955,7 @@ ag_db_get_chart_data_by_id(AgDb *db, guint row_id, GError **err)
attributes = gda_data_model_get_attributes_at(result, COLUMN_ALTITUDE, 0); attributes = gda_data_model_get_attributes_at(result, COLUMN_ALTITUDE, 0);
if (attributes | GDA_VALUE_ATTR_IS_NULL) { if (attributes | GDA_VALUE_ATTR_IS_NULL) {
/* TODO: this value should be macroified */ save_data->altitude = DEFAULT_ALTITUDE;
save_data->altitude = 280.0;
} else { } else {
save_data->altitude = g_value_get_double(value); save_data->altitude = g_value_get_double(value);
} }

3
src/ag-window.c
View File

@ -10,6 +10,7 @@
#include <swe-glib.h> #include <swe-glib.h>
#include "config.h"
#include "ag-app.h" #include "ag-app.h"
#include "ag-window.h" #include "ag-window.h"
#include "ag-chart.h" #include "ag-chart.h"
@ -574,7 +575,7 @@ ag_window_recalculate_chart(AgWindow *window, gboolean set_everything)
} }
// TODO: So as this… // TODO: So as this…
edit_data->altitude = 280.0; edit_data->altitude = DEFAULT_ALTITUDE;
edit_data->year = gtk_spin_button_get_value_as_int( edit_data->year = gtk_spin_button_get_value_as_int(
GTK_SPIN_BUTTON(priv->year) GTK_SPIN_BUTTON(priv->year)
); );