IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 1440 for trunk/psLib/src/astro


Ignore:
Timestamp:
Aug 9, 2004, 1:34:58 PM (22 years ago)
Author:
desonia
Message:

cleanup of some indent-induced madness.

Location:
trunk/psLib/src/astro
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/src/astro/psCoord.c

    r1407 r1440  
    1111*  @author George Gusciora, MHPCC
    1212*
    13 *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2004-08-07 00:06:06 $
     13*  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2004-08-09 23:34:57 $
    1515*
    1616*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    3232
    3333// This is the only function in this file which I understand.
    34 psPlane *psPlaneTransformApply(psPlane * out, const psPlaneTransform * transform, const psPlane * coords)
     34psPlane* psPlaneTransformApply(psPlane* out, const psPlaneTransform* transform, const psPlane* coords)
    3535{
    3636    if (out == NULL) {
    37         out = (psPlane *) psAlloc(sizeof(psPlane));
     37        out = (psPlane* ) psAlloc(sizeof(psPlane));
    3838    }
    3939    out->x = transform->x->coeff[0][0] +
    … …  
    4848// This transformation takes into account parameters beyond an objects
    4949// spatial coordinates: term3 and term4.
    50 psPlane *psPlaneDistortApply(psPlane * out,
    51                              const psPlaneDistort * transform,
    52                              const psPlane * coords, float term3, float term4)
     50psPlane* psPlaneDistortApply(psPlane* out,
     51                             const psPlaneDistort* transform,
     52                             const psPlane* coords, float term3, float term4)
    5353{
    5454    if (out == NULL) {
    55         out = (psPlane *) psAlloc(sizeof(psPlane));
     55        out = (psPlane* ) psAlloc(sizeof(psPlane));
    5656    }
    5757
    … …  
    7070
    7171// This function prototype has been modified since the SDRS.
    72 psSphereTransform *psSphereTransformAlloc(double NPlat, double Xo, double xo)
    73 {
    74     psSphereTransform *tmp = (psSphereTransform *) psAlloc(sizeof(psSphereTransform));
     72psSphereTransform* psSphereTransformAlloc(double NPlat, double Xo, double xo)
     73{
     74    psSphereTransform* tmp = (psSphereTransform* ) psAlloc(sizeof(psSphereTransform));
    7575
    7676    tmp->sinPhi = sin(NPlat);
    … …  
    8989// there are no typo's.
    9090
    91 psSphere *psSphereTransformApply(psSphere * out, const psSphereTransform * transform, const psSphere * coord)
     91psSphere* psSphereTransformApply(psSphere* out, const psSphereTransform* transform, const psSphere* coord)
    9292{
    9393    double sinY = 0.0;
    … …  
    100100
    101101    if (out == NULL) {
    102         out = (psSphere *) psAlloc(sizeof(psSphere));
     102        out = (psSphere* ) psAlloc(sizeof(psSphere));
    103103    }
    104104
    … …  
    117117}
    118118
    119 psSphereTransform *psSphereTransformICRStoEcliptic(psTime time)
     119psSphereTransform* psSphereTransformICRStoEcliptic(psTime time)
    120120{
    121121    struct tm *tmTime = psTimeToTM(time);
    … …  
    129129}
    130130
    131 psSphereTransform *psSphereTransformEcliptictoICRS(psTime time)
     131psSphereTransform* psSphereTransformEcliptictoICRS(psTime time)
    132132{
    133133    struct tm *tmTime = psTimeToTM(time);
    … …  
    141141}
    142142
    143 psSphereTransform *psSphereTransformICRStoGalatic(void)
     143psSphereTransform* psSphereTransformICRStoGalatic(void)
    144144{
    145145    return (psSphereTransformAlloc(62.6, 282.25, 33.0));
    146146}
    147147
    148 psSphereTransform *psSphereTransformGalatictoICRS(void)
     148psSphereTransform* psSphereTransformGalatictoICRS(void)
    149149{
    150150    return (psSphereTransformAlloc(-62.6, 33.0, 282.25));
    … …  
    178178// XXX: Waiting for the definition of the PS_PROJ_PAR projection.
    179179// XXX: Waiting for the definition of the PS_PROJ_GLS projection.
    180 psPlane *psProject(const psSphere * coord, const psProjection * projection)
     180psPlane* psProject(const psSphere* coord, const psProjection* projection)
    181181{
    182182    float R = 0.0;
    183183    float alpha = 0.0;
    184     psPlane *tmp = (psPlane *) psAlloc(sizeof(psPlane));
     184    psPlane* tmp = (psPlane* ) psAlloc(sizeof(psPlane));
    185185
    186186    if (projection->type == PS_PROJ_TAN) {
    … …  
    220220// XXX: Waiting for the definition of the PS_PROJ_PAR projection.
    221221// XXX: Waiting for the definition of the PS_PROJ_GLS projection.
    222 psSphere *psDeproject(const psPlane * coord, const psProjection * projection)
     222psSphere* psDeproject(const psPlane* coord, const psProjection* projection)
    223223{
    224224    float R = 0.0;
    … …  
    226226    float chu1 = 0.0;
    227227    float chu2 = 0.0;
    228     psSphere *tmp = (psSphere *) psAlloc(sizeof(psSphere));
     228    psSphere* tmp = (psSphere* ) psAlloc(sizeof(psSphere));
    229229
    230230    if (projection->type == PS_PROJ_TAN) {
    … …  
    267267// XXX: Do I need to check for unacceptable transformation parameters?
    268268// Maybe, if the points are on the North/South Pole, etc?
    269 psSphere *psSphereGetOffset(const psSphere * restrict position1,
    270                             const psSphere * restrict position2,
     269psSphere* psSphereGetOffset(const psSphere* restrict position1,
     270                            const psSphere* restrict position2,
    271271                            psSphereOffsetMode mode, psSphereOffsetUnit unit)
    272272{
    273     // psPlane *lin;
     273    // psPlane* lin;
    274274    psProjection proj;
    275     psSphere *tmp;
     275    psSphere* tmp;
    276276    double tmpR = 0.0;
    277277    double tmpD = 0.0;
    … …  
    313313        }
    314314
    315         tmp = (psSphere *) psAlloc(sizeof(psSphere));
     315        tmp = (psSphere* ) psAlloc(sizeof(psSphere));
    316316        tmp->r = tmpR;
    317317        tmp->d = tmpD;
    … …  
    328328// Maybe, if the points are on the North/South Pole, etc?
    329329// XXX: I copied the algorithm from the ADD exactly.
    330 psSphere *psSphereSetOffset(const psSphere * restrict position,
    331                             const psSphere * restrict offset,
     330psSphere* psSphereSetOffset(const psSphere* restrict position,
     331                            const psSphere* restrict offset,
    332332                            psSphereOffsetMode mode, psSphereOffsetUnit unit)
    333333{
    334334    psPlane lin;
    335     psSphere *tmp;
     335    psSphere* tmp;
    336336    psProjection proj;
    337337    double tmpR = 0.0;
    … …  
    368368        }
    369369
    370         tmp = (psSphere *) psAlloc(sizeof(psSphere));
     370        tmp = (psSphere* ) psAlloc(sizeof(psSphere));
    371371        tmp->r = position->r + tmpR;
    372372        tmp->r = position->d + tmpD;

  • trunk/psLib/src/astro/psCoord.h

    r1426 r1440  
    1111*  @author George Gusciora, MHPCC
    1212*
    13 *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
    14 *  @date $Date: 2004-08-09 22:44:25 $
     13*  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
     14*  @date $Date: 2004-08-09 23:34:57 $
    1515*
    1616*  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
    … …  
    7272typedef struct
    7373{
    74     psDPolynomial2D *x;         ///< 2D polynomial transform of X coordinates
    75     psDPolynomial2D *y;         ///< 2D polynomial transform of Y coordinates
     74    psDPolynomial2D* x;         ///< 2D polynomial transform of X coordinates
     75    psDPolynomial2D* y;         ///< 2D polynomial transform of Y coordinates
    7676}
    7777psPlaneTransform;
    … …  
    9191typedef struct
    9292{
    93     psDPolynomial4D *x;         ///< 4D polynomial transform of X coordinates
    94     psDPolynomial4D *y;         ///< 4D polynomial transform of Y coordinates
     93    psDPolynomial4D* x;         ///< 4D polynomial transform of X coordinates
     94    psDPolynomial4D* y;         ///< 4D polynomial transform of Y coordinates
    9595}
    9696psPlaneDistort;
    … …  
    171171 *
    172172 */
    173 psPlane *psPlaneTransformApply(psPlane * out,   ///< a psPlane to recycle.  If NULL, a new one is generated.
    174                                const psPlaneTransform * transform,      ///< the transform to apply
    175                                const psPlane * coords   ///< the coordinate to apply the transform above.
     173psPlane* psPlaneTransformApply(psPlane* out,   ///< a psPlane to recycle.  If NULL, a new one is generated.
     174                               const psPlaneTransform* transform,      ///< the transform to apply
     175                               const psPlane* coords   ///< the coordinate to apply the transform above.
    176176                              );
    177177
    … …  
    179179 *
    180180 */
    181 psPlane *psPlaneDistortApply(psPlane * out,     ///< a psPlane to recycle.  If NULL, a new one is generated.
    182                              const psPlaneDistort * transform,  ///< the transform to apply
    183                              const psPlane * coords,    ///< the coordinate to apply the transform above.
     181psPlane* psPlaneDistortApply(psPlane* out,     ///< a psPlane to recycle.  If NULL, a new one is generated.
     182                             const psPlaneDistort* transform,  ///< the transform to apply
     183                             const psPlane* coords,    ///< the coordinate to apply the transform above.
    184184                             float term3,       ///< third term -- maybe magnitude
    185185                             float term4        ///< forth term -- maybe color
    … …  
    189189 *
    190190 */
    191 psSphereTransform *psSphereTransformAlloc(double NPlat, ///< north pole latitude
     191psSphereTransform* psSphereTransformAlloc(double NPlat, ///< north pole latitude
    192192        double Xo,    ///< First PT of Ares lon
    193193        double xo     ///< First PT of Ares equiv lon
    … …  
    197197 *
    198198 */
    199 psSphere *psSphereTransformApply(psSphere * out,        ///< a psSphere to recycle.  If NULL, a new one is
     199psSphere* psSphereTransformApply(psSphere* out,        ///< a psSphere to recycle.  If NULL, a new one is
    200200                                 // generated.
    201                                  const psSphereTransform * transform,   ///< the transform to apply
    202                                  const psSphere * coord ///< the coordinate to apply the transform above.x
     201                                 const psSphereTransform* transform,   ///< the transform to apply
     202                                 const psSphere* coord ///< the coordinate to apply the transform above.x
    203203                                );
    204204
    205 psSphereTransform *psSphereTransformICRStoEcliptic(psTime time);
    206 
    207 psSphereTransform *psSphereTransformEcliptictoICRS(psTime time);
    208 
    209 psSphereTransform *psSphereTransformICRStoGalatic(void);
    210 
    211 psSphereTransform *psSphereTransformGalatictoICRS(void);
    212 
    213 psPlane *psProject(const psSphere * coord, const psProjection * projection);
    214 
    215 psSphere *psDeproject(const psPlane * coord, const psProjection * projection);
    216 
    217 psSphere *psSphereGetOffset(const psSphere * restrict position1,
    218                             const psSphere * restrict position2,
     205psSphereTransform* psSphereTransformICRStoEcliptic(psTime time);
     206
     207psSphereTransform* psSphereTransformEcliptictoICRS(psTime time);
     208
     209psSphereTransform* psSphereTransformICRStoGalatic(void);
     210
     211psSphereTransform* psSphereTransformGalatictoICRS(void);
     212
     213psPlane* psProject(const psSphere* coord, const psProjection* projection);
     214
     215psSphere* psDeproject(const psPlane* coord, const psProjection* projection);
     216
     217psSphere* psSphereGetOffset(const psSphere* restrict position1,
     218                            const psSphere* restrict position2,
    219219                            psSphereOffsetMode mode, psSphereOffsetUnit unit);
    220220
    221 psSphere *psSphereSetOffset(const psSphere * restrict position,
    222                             const psSphere * restrict offset,
     221psSphere* psSphereSetOffset(const psSphere* restrict position,
     222                            const psSphere* restrict offset,
    223223                            psSphereOffsetMode mode, psSphereOffsetUnit unit);
    224224
Note: See TracChangeset for help on using the changeset viewer.