gergely/swe-glib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made HOUSE_SYSTEM_NONE a valid and working house system

Browse Source 
Solves #1
This commit is contained in:
Gergely Polonkai 2013-09-22 18:59:01 +02:00
parent 4f61aea449
commit 67979d9890
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/gswe-moment.c
View File

@ -419,7 +419,7 @@ gswe_moment_new(void)
* @altitude: the altitude part of the coordinates, in meters. As also noted in * @altitude: the altitude part of the coordinates, in meters. As also noted in
* the README, it is safe to pass a value of around 400.0, unless * the README, it is safe to pass a value of around 400.0, unless
* you want to create a *really* precise chart * you want to create a *really* precise chart
* @house_system: the house system you want to use. WARNING! Using GSWE_HOUSE_SYSTEM_NONE is currently a bad idea, the results are unpredicted * @house_system: the house system you want to use
* *
* Creates a new GsweMoment object with the timestamp, coordinates and house system set. This is the preferred way to create a GsweMoment object. * Creates a new GsweMoment object with the timestamp, coordinates and house system set. This is the preferred way to create a GsweMoment object.
* *
@ -438,10 +438,6 @@ gswe_moment_new_full(GsweTimestamp *timestamp, gdouble longitude, gdouble latitu
moment->priv->coordinates.altitude = altitude; moment->priv->coordinates.altitude = altitude;
moment->priv->house_system = house_system; moment->priv->house_system = house_system;
if (house_system == GSWE_HOUSE_SYSTEM_NONE) {
g_warning("Using GSWE_HOUSE_SYSTEM_NONE is unsafe. You have been warned!");
}
return moment; return moment;
} }
@ -505,6 +501,17 @@ gswe_moment_calculate_house_positions(GsweMoment *moment, GError **err)
return; return;
} }
g_list_free_full(moment->priv->house_list, g_free);
moment->priv->house_list = NULL;
// If no house system is set, we need no calculations at all. Just leave
// the list empty and return
if (moment->priv->house_system = GSWE_HOUSE_SYSTEM_NONE) {
moment->priv->house_revision = moment->priv->revision;
return;
}
if ((house_system_data = g_hash_table_lookup(gswe_house_system_info_table, GINT_TO_POINTER(moment->priv->house_system))) == NULL) { if ((house_system_data = g_hash_table_lookup(gswe_house_system_info_table, GINT_TO_POINTER(moment->priv->house_system))) == NULL) {
g_set_error(err, GSWE_MOMENT_ERROR, GSWE_MOMENT_ERROR_UNKNOWN_HSYS, "Unknown house system"); g_set_error(err, GSWE_MOMENT_ERROR, GSWE_MOMENT_ERROR_UNKNOWN_HSYS, "Unknown house system");
@ -519,9 +526,6 @@ gswe_moment_calculate_house_positions(GsweMoment *moment, GError **err)
swe_houses(jd, moment->priv->coordinates.latitude, moment->priv->coordinates.longitude, house_system_data->sweph_id, cusps, ascmc); swe_houses(jd, moment->priv->coordinates.latitude, moment->priv->coordinates.longitude, house_system_data->sweph_id, cusps, ascmc);
g_list_free_full(moment->priv->house_list, g_free);
moment->priv->house_list = NULL;
/* TODO: SWE house system 'G' (Gauquelin sector cusps) have 36 houses; we /* TODO: SWE house system 'G' (Gauquelin sector cusps) have 36 houses; we
* should detect that somehow (house system 'G' is not implemented yet in * should detect that somehow (house system 'G' is not implemented yet in
* GsweHouseSystem, and all other house systems have exactly 12 houses, so * GsweHouseSystem, and all other house systems have exactly 12 houses, so
@ -619,7 +623,7 @@ gswe_moment_add_planet(GsweMoment *moment, GswePlanet planet)
planet_data->planet_id = planet; planet_data->planet_id = planet;
planet_data->planet_info = planet_info; planet_data->planet_info = planet_info;
planet_data->position = 0.0; planet_data->position = 0.0;
planet_data->house = 1; planet_data->house = 0;
planet_data->sign = NULL; planet_data->sign = NULL;
planet_data->revision = 0; planet_data->revision = 0;
@ -772,6 +776,11 @@ gswe_moment_get_house_planets(GsweMoment *moment, guint house)
GList *ret = NULL, GList *ret = NULL,
*planet; *planet;
// If the house system is none, we always return NULL
if (moment->priv->house_system == GSWE_HOUSE_SYSTEM_NONE) {
return NULL;
}
gswe_moment_calculate_all_planets(moment); gswe_moment_calculate_all_planets(moment);
for (planet = moment->priv->planet_list; planet; planet = g_list_next(planet)) { for (planet = moment->priv->planet_list; planet; planet = g_list_next(planet)) {