Index: trunk/psLib/src/astro/psCoord.c =================================================================== --- trunk/psLib/src/astro/psCoord.c (revision 1426) +++ trunk/psLib/src/astro/psCoord.c (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-07 00:06:06 $ +* @version $Revision: 1.13 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -32,8 +32,8 @@ // This is the only function in this file which I understand. -psPlane *psPlaneTransformApply(psPlane * out, const psPlaneTransform * transform, const psPlane * coords) +psPlane* psPlaneTransformApply(psPlane* out, const psPlaneTransform* transform, const psPlane* coords) { if (out == NULL) { - out = (psPlane *) psAlloc(sizeof(psPlane)); + out = (psPlane* ) psAlloc(sizeof(psPlane)); } out->x = transform->x->coeff[0][0] + @@ -48,10 +48,10 @@ // This transformation takes into account parameters beyond an objects // spatial coordinates: term3 and term4. -psPlane *psPlaneDistortApply(psPlane * out, - const psPlaneDistort * transform, - const psPlane * coords, float term3, float term4) +psPlane* psPlaneDistortApply(psPlane* out, + const psPlaneDistort* transform, + const psPlane* coords, float term3, float term4) { if (out == NULL) { - out = (psPlane *) psAlloc(sizeof(psPlane)); + out = (psPlane* ) psAlloc(sizeof(psPlane)); } @@ -70,7 +70,7 @@ // This function prototype has been modified since the SDRS. -psSphereTransform *psSphereTransformAlloc(double NPlat, double Xo, double xo) -{ - psSphereTransform *tmp = (psSphereTransform *) psAlloc(sizeof(psSphereTransform)); +psSphereTransform* psSphereTransformAlloc(double NPlat, double Xo, double xo) +{ + psSphereTransform* tmp = (psSphereTransform* ) psAlloc(sizeof(psSphereTransform)); tmp->sinPhi = sin(NPlat); @@ -89,5 +89,5 @@ // there are no typo's. -psSphere *psSphereTransformApply(psSphere * out, const psSphereTransform * transform, const psSphere * coord) +psSphere* psSphereTransformApply(psSphere* out, const psSphereTransform* transform, const psSphere* coord) { double sinY = 0.0; @@ -100,5 +100,5 @@ if (out == NULL) { - out = (psSphere *) psAlloc(sizeof(psSphere)); + out = (psSphere* ) psAlloc(sizeof(psSphere)); } @@ -117,5 +117,5 @@ } -psSphereTransform *psSphereTransformICRStoEcliptic(psTime time) +psSphereTransform* psSphereTransformICRStoEcliptic(psTime time) { struct tm *tmTime = psTimeToTM(time); @@ -129,5 +129,5 @@ } -psSphereTransform *psSphereTransformEcliptictoICRS(psTime time) +psSphereTransform* psSphereTransformEcliptictoICRS(psTime time) { struct tm *tmTime = psTimeToTM(time); @@ -141,10 +141,10 @@ } -psSphereTransform *psSphereTransformICRStoGalatic(void) +psSphereTransform* psSphereTransformICRStoGalatic(void) { return (psSphereTransformAlloc(62.6, 282.25, 33.0)); } -psSphereTransform *psSphereTransformGalatictoICRS(void) +psSphereTransform* psSphereTransformGalatictoICRS(void) { return (psSphereTransformAlloc(-62.6, 33.0, 282.25)); @@ -178,9 +178,9 @@ // XXX: Waiting for the definition of the PS_PROJ_PAR projection. // XXX: Waiting for the definition of the PS_PROJ_GLS projection. -psPlane *psProject(const psSphere * coord, const psProjection * projection) +psPlane* psProject(const psSphere* coord, const psProjection* projection) { float R = 0.0; float alpha = 0.0; - psPlane *tmp = (psPlane *) psAlloc(sizeof(psPlane)); + psPlane* tmp = (psPlane* ) psAlloc(sizeof(psPlane)); if (projection->type == PS_PROJ_TAN) { @@ -220,5 +220,5 @@ // XXX: Waiting for the definition of the PS_PROJ_PAR projection. // XXX: Waiting for the definition of the PS_PROJ_GLS projection. -psSphere *psDeproject(const psPlane * coord, const psProjection * projection) +psSphere* psDeproject(const psPlane* coord, const psProjection* projection) { float R = 0.0; @@ -226,5 +226,5 @@ float chu1 = 0.0; float chu2 = 0.0; - psSphere *tmp = (psSphere *) psAlloc(sizeof(psSphere)); + psSphere* tmp = (psSphere* ) psAlloc(sizeof(psSphere)); if (projection->type == PS_PROJ_TAN) { @@ -267,11 +267,11 @@ // XXX: Do I need to check for unacceptable transformation parameters? // Maybe, if the points are on the North/South Pole, etc? -psSphere *psSphereGetOffset(const psSphere * restrict position1, - const psSphere * restrict position2, +psSphere* psSphereGetOffset(const psSphere* restrict position1, + const psSphere* restrict position2, psSphereOffsetMode mode, psSphereOffsetUnit unit) { - // psPlane *lin; + // psPlane* lin; psProjection proj; - psSphere *tmp; + psSphere* tmp; double tmpR = 0.0; double tmpD = 0.0; @@ -313,5 +313,5 @@ } - tmp = (psSphere *) psAlloc(sizeof(psSphere)); + tmp = (psSphere* ) psAlloc(sizeof(psSphere)); tmp->r = tmpR; tmp->d = tmpD; @@ -328,10 +328,10 @@ // Maybe, if the points are on the North/South Pole, etc? // XXX: I copied the algorithm from the ADD exactly. -psSphere *psSphereSetOffset(const psSphere * restrict position, - const psSphere * restrict offset, +psSphere* psSphereSetOffset(const psSphere* restrict position, + const psSphere* restrict offset, psSphereOffsetMode mode, psSphereOffsetUnit unit) { psPlane lin; - psSphere *tmp; + psSphere* tmp; psProjection proj; double tmpR = 0.0; @@ -368,5 +368,5 @@ } - tmp = (psSphere *) psAlloc(sizeof(psSphere)); + tmp = (psSphere* ) psAlloc(sizeof(psSphere)); tmp->r = position->r + tmpR; tmp->r = position->d + tmpD; Index: trunk/psLib/src/astro/psCoord.h =================================================================== --- trunk/psLib/src/astro/psCoord.h (revision 1426) +++ trunk/psLib/src/astro/psCoord.h (revision 1440) @@ -11,6 +11,6 @@ * @author George Gusciora, MHPCC * -* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-08-09 22:44:25 $ +* @version $Revision: 1.12 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-08-09 23:34:57 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -72,6 +72,6 @@ typedef struct { - psDPolynomial2D *x; ///< 2D polynomial transform of X coordinates - psDPolynomial2D *y; ///< 2D polynomial transform of Y coordinates + psDPolynomial2D* x; ///< 2D polynomial transform of X coordinates + psDPolynomial2D* y; ///< 2D polynomial transform of Y coordinates } psPlaneTransform; @@ -91,6 +91,6 @@ typedef struct { - psDPolynomial4D *x; ///< 4D polynomial transform of X coordinates - psDPolynomial4D *y; ///< 4D polynomial transform of Y coordinates + psDPolynomial4D* x; ///< 4D polynomial transform of X coordinates + psDPolynomial4D* y; ///< 4D polynomial transform of Y coordinates } psPlaneDistort; @@ -171,7 +171,7 @@ * */ -psPlane *psPlaneTransformApply(psPlane * out, ///< a psPlane to recycle. If NULL, a new one is generated. - const psPlaneTransform * transform, ///< the transform to apply - const psPlane * coords ///< the coordinate to apply the transform above. +psPlane* psPlaneTransformApply(psPlane* out, ///< a psPlane to recycle. If NULL, a new one is generated. + const psPlaneTransform* transform, ///< the transform to apply + const psPlane* coords ///< the coordinate to apply the transform above. ); @@ -179,7 +179,7 @@ * */ -psPlane *psPlaneDistortApply(psPlane * out, ///< a psPlane to recycle. If NULL, a new one is generated. - const psPlaneDistort * transform, ///< the transform to apply - const psPlane * coords, ///< the coordinate to apply the transform above. +psPlane* psPlaneDistortApply(psPlane* out, ///< a psPlane to recycle. If NULL, a new one is generated. + const psPlaneDistort* transform, ///< the transform to apply + const psPlane* coords, ///< the coordinate to apply the transform above. float term3, ///< third term -- maybe magnitude float term4 ///< forth term -- maybe color @@ -189,5 +189,5 @@ * */ -psSphereTransform *psSphereTransformAlloc(double NPlat, ///< north pole latitude +psSphereTransform* psSphereTransformAlloc(double NPlat, ///< north pole latitude double Xo, ///< First PT of Ares lon double xo ///< First PT of Ares equiv lon @@ -197,28 +197,28 @@ * */ -psSphere *psSphereTransformApply(psSphere * out, ///< a psSphere to recycle. If NULL, a new one is +psSphere* psSphereTransformApply(psSphere* out, ///< a psSphere to recycle. If NULL, a new one is // generated. - const psSphereTransform * transform, ///< the transform to apply - const psSphere * coord ///< the coordinate to apply the transform above.x + const psSphereTransform* transform, ///< the transform to apply + const psSphere* coord ///< the coordinate to apply the transform above.x ); -psSphereTransform *psSphereTransformICRStoEcliptic(psTime time); - -psSphereTransform *psSphereTransformEcliptictoICRS(psTime time); - -psSphereTransform *psSphereTransformICRStoGalatic(void); - -psSphereTransform *psSphereTransformGalatictoICRS(void); - -psPlane *psProject(const psSphere * coord, const psProjection * projection); - -psSphere *psDeproject(const psPlane * coord, const psProjection * projection); - -psSphere *psSphereGetOffset(const psSphere * restrict position1, - const psSphere * restrict position2, +psSphereTransform* psSphereTransformICRStoEcliptic(psTime time); + +psSphereTransform* psSphereTransformEcliptictoICRS(psTime time); + +psSphereTransform* psSphereTransformICRStoGalatic(void); + +psSphereTransform* psSphereTransformGalatictoICRS(void); + +psPlane* psProject(const psSphere* coord, const psProjection* projection); + +psSphere* psDeproject(const psPlane* coord, const psProjection* projection); + +psSphere* psSphereGetOffset(const psSphere* restrict position1, + const psSphere* restrict position2, psSphereOffsetMode mode, psSphereOffsetUnit unit); -psSphere *psSphereSetOffset(const psSphere * restrict position, - const psSphere * restrict offset, +psSphere* psSphereSetOffset(const psSphere* restrict position, + const psSphere* restrict offset, psSphereOffsetMode mode, psSphereOffsetUnit unit);