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

Removed function get_sign() from calculate.[ch]

Browse Source
This commit is contained in:
Gergely Polonkai 2013-09-02 23:32:14 +02:00
parent c94ae14203
commit 157bca2707
3 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/astrognome.c
View File

@ -295,12 +295,9 @@ free_planet_data(gpointer data)
void void
print_house_cusp(gpointer data, gpointer user_data) print_house_cusp(gpointer data, gpointer user_data)
{ {
gdouble *cusp = data; GsweHouseData *house_data = data;
gint *house = user_data;
printf("House %2d..: %s (%f)\n", *house, signName[get_sign(*cusp)], *cusp); printf("House %2d..: %s (%f)\n", house_data->house, house_data->sign->name, house_data->cusp_position);
*house += 1;
} }
int int
@ -311,8 +308,7 @@ main(int argc, char *argv[])
day = 11, day = 11,
hour = 23, hour = 23,
min = 39, min = 39,
sec = 34, sec = 34;
p;
double timezone = 1.0, double timezone = 1.0,
lon = 20.766666, lon = 20.766666,
lat = 48.2, lat = 48.2,
@ -403,8 +399,7 @@ main(int argc, char *argv[])
swe_houses(te, lat, lon, 'P', cusps, ascmc); swe_houses(te, lat, lon, 'P', cusps, ascmc);
p = 1; g_list_foreach(gswe_moment_get_house_cusps(moment), print_house_cusp, NULL);
g_list_foreach(gswe_moment_get_house_cusps(moment), print_house_cusp, &p);
printf("\nPLANETS AND POINTS\n==================\n\n"); printf("\nPLANETS AND POINTS\n==================\n\n");
@ -413,8 +408,8 @@ main(int argc, char *argv[])
printf("%s: %s (%f)\n", planet_data->planet_info->name, planet_data->sign->name, planet_data->position); printf("%s: %s (%f)\n", planet_data->planet_info->name, planet_data->sign->name, planet_data->position);
planetInfo = g_new0(planetInfo_t, 1); planetInfo = g_new0(planetInfo_t, 1);
planetInfo->position = ascmc[0]; planetInfo->position = planet_data->position;
planetInfo->sign = get_sign(ascmc[0]); planetInfo->sign = planet_data->sign->sign_id;
planetInfo->house = 1; planetInfo->house = 1;
planetInfo->retrograde = FALSE; planetInfo->retrograde = FALSE;
g_hash_table_replace(planetInfoTable, GINT_TO_POINTER(SE_NPLANETS + SE_ASC), planetInfo); g_hash_table_replace(planetInfoTable, GINT_TO_POINTER(SE_NPLANETS + SE_ASC), planetInfo);
@ -424,8 +419,8 @@ main(int argc, char *argv[])
printf("%s: %s (%f)\n", planet_data->planet_info->name, planet_data->sign->name, planet_data->position); printf("%s: %s (%f)\n", planet_data->planet_info->name, planet_data->sign->name, planet_data->position);
planetInfo = g_new0(planetInfo_t, 1); planetInfo = g_new0(planetInfo_t, 1);
planetInfo->position = ascmc[1]; planetInfo->position = planet_data->position;
planetInfo->sign = get_sign(ascmc[1]); planetInfo->sign = planet_data->sign->sign_id;
planetInfo->house = 10; planetInfo->house = 10;
planetInfo->retrograde = FALSE; planetInfo->retrograde = FALSE;
g_hash_table_replace(planetInfoTable, GINT_TO_POINTER(SE_NPLANETS + SE_MC), planetInfo); g_hash_table_replace(planetInfoTable, GINT_TO_POINTER(SE_NPLANETS + SE_MC), planetInfo);
@ -435,9 +430,9 @@ main(int argc, char *argv[])
printf("%s: %s (%f)\n", planet_data->planet_info->name, planet_data->sign->name, planet_data->position); printf("%s: %s (%f)\n", planet_data->planet_info->name, planet_data->sign->name, planet_data->position);
planetInfo = g_new0(planetInfo_t, 1); planetInfo = g_new0(planetInfo_t, 1);
planetInfo->position = ascmc[3]; planetInfo->position = planet_data->position;
planetInfo->sign = get_sign(ascmc[3]); planetInfo->sign = planet_data->sign->sign_id;
planetInfo->house = get_house(ascmc[3], cusps); planetInfo->house = planet_data->house;
planetInfo->retrograde = FALSE; planetInfo->retrograde = FALSE;
g_hash_table_replace(planetInfoTable, GINT_TO_POINTER(SE_NPLANETS + SE_VERTEX), planetInfo); g_hash_table_replace(planetInfoTable, GINT_TO_POINTER(SE_NPLANETS + SE_VERTEX), planetInfo);

6
src/calculate.c
View File

@ -124,9 +124,3 @@ set_location_and_time(double lon, double lat, double alt, int year, int month, i
return 1; return 1;
} }
long int
get_sign(double pos)
{
return (int)ceilf(pos / 30.0);
}

1
src/calculate.h
View File

@ -71,4 +71,3 @@ typedef struct {
guint get_house(gdouble position, gdouble cusps[]); guint get_house(gdouble position, gdouble cusps[]);
planetInfo_t *get_planet_info(int32 planetNo, double date, double cusps[]); planetInfo_t *get_planet_info(int32 planetNo, double date, double cusps[]);
int set_location_and_time(double lon, double lat, double alt, int year, int month, int day, int hour, int min, double sec, double d_timezone, double *jd); int set_location_and_time(double lon, double lat, double alt, int year, int month, int day, int hour, int min, double sec, double d_timezone, double *jd);
long int get_sign(double pos);