IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 12737 for trunk/psLib


Ignore:
Timestamp:
Apr 4, 2007, 11:10:03 AM (19 years ago)
Author:
Paul Price
Message:

Fixing up enums --- psProjectionClass was using PS_PROJ_WHATEVER, as was psProjectionType.

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

Legend:

Unmodified
Added
Removed

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

    r12735 r12737  
    1010*  @author GLG, MHPCC
    1111*
    12 *  @version $Revision: 1.137 $ $Name: not supported by cvs2svn $
    13 *  @date $Date: 2007-04-04 19:46:28 $
     12*  @version $Revision: 1.138 $ $Name: not supported by cvs2svn $
     13*  @date $Date: 2007-04-04 21:10:03 $
    1414*
    1515*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    356356
    357357typedef enum {
    358     PS_PROJ_NONE,
    359     PS_PROJ_CARTESIAN,
    360     PS_PROJ_ZENITHAL,
    361     PS_PROJ_PSEUDOCYL,
     358    PS_PROJECTION_CLASS_NONE,
     359    PS_PROJECTION_CLASS_CARTESIAN,
     360    PS_PROJECTION_CLASS_ZENITHAL,
     361    PS_PROJECTION_CLASS_PSEUDOCYL,
    362362}psProjectionClass;
    363363
    … …  
    377377    psF64 sinDp, cosDp, sinAlpha, cosAlpha, sinDelta, cosDelta, zeta;
    378378
    379     psProjectionClass class = PS_PROJ_NONE;
     379    psProjectionClass class = PS_PROJECTION_CLASS_NONE;
    380380    switch (projection->type) {
    381381    case PS_PROJ_LIN:
    382382    case PS_PROJ_PLY:
    383383    case PS_PROJ_WRP:
    384         class = PS_PROJ_CARTESIAN;
     384        class = PS_PROJECTION_CLASS_CARTESIAN;
    385385        break;
    386386    case PS_PROJ_TAN:
    … …  
    390390    case PS_PROJ_ZEA:
    391391    case PS_PROJ_ZPL:
    392         class = PS_PROJ_ZENITHAL;
     392        class = PS_PROJECTION_CLASS_ZENITHAL;
    393393        break;
    394394    case PS_PROJ_AIT:
    … …  
    397397    case PS_PROJ_MER:
    398398    case PS_PROJ_CAR:
    399         class = PS_PROJ_PSEUDOCYL;
     399        class = PS_PROJECTION_CLASS_PSEUDOCYL;
    400400        break;
    401401
    … …  
    414414
    415415    switch (class) {
    416     case PS_PROJ_CARTESIAN:
     416    case PS_PROJECTION_CLASS_CARTESIAN:
    417417        out->x = (coord->r - projection->R);
    418418        out->y = (coord->d - projection->D);
    419419        break;
    420420
    421     case PS_PROJ_ZENITHAL:
     421    case PS_PROJECTION_CLASS_ZENITHAL:
    422422        sinDp = sin(projection->D);
    423423        cosDp = cos(projection->D);
    … …  
    470470        break;
    471471
    472     case PS_PROJ_PSEUDOCYL:
     472    case PS_PROJECTION_CLASS_PSEUDOCYL:
    473473        phi = coord->r - projection->R;
    474474        theta = coord->d - projection->D;
    … …  
    533533    psF64  x = 0, y = 0, R = 0;
    534534
    535     psProjectionClass class = PS_PROJ_NONE;
     535    psProjectionClass class = PS_PROJECTION_CLASS_NONE;
    536536    switch (projection->type) {
    537537    case PS_PROJ_LIN:
    538538    case PS_PROJ_PLY:
    539539    case PS_PROJ_WRP:
    540         class = PS_PROJ_CARTESIAN;
     540        class = PS_PROJECTION_CLASS_CARTESIAN;
    541541        break;
    542542    case PS_PROJ_TAN:
    … …  
    546546    case PS_PROJ_ZEA:
    547547    case PS_PROJ_ZPL:
    548         class = PS_PROJ_ZENITHAL;
     548        class = PS_PROJECTION_CLASS_ZENITHAL;
    549549        break;
    550550    case PS_PROJ_AIT:
    … …  
    553553    case PS_PROJ_CAR:
    554554    case PS_PROJ_MER:
    555         class = PS_PROJ_PSEUDOCYL;
     555        class = PS_PROJECTION_CLASS_PSEUDOCYL;
    556556        break;
    557557
    … …  
    575575    // Perform inverse projection
    576576    switch (class) {
    577     case PS_PROJ_CARTESIAN:
     577    case PS_PROJECTION_CLASS_CARTESIAN:
    578578        out->r = coord->x*projection->Xs + projection->R;
    579579        out->d = coord->y*projection->Ys + projection->D;
    580580        break;
    581581
    582     case PS_PROJ_ZENITHAL:
     582    case PS_PROJECTION_CLASS_ZENITHAL:
    583583        // Remove plate scales
    584584        x = coord->x*projection->Xs;
    … …  
    638638        break;
    639639
    640     case PS_PROJ_PSEUDOCYL:
     640    case PS_PROJECTION_CLASS_PSEUDOCYL:
    641641        switch (projection->type)
    642642        {

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

    r12735 r12737  
    88 *  @author GLG, MHPCC
    99 *
    10  *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2007-04-04 19:46:28 $
     10 *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2007-04-04 21:10:03 $
    1212 *
    1313 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    119119 */
    120120typedef enum {
    121     PS_PROJ_NONE,                      ///< No projection
    122     PS_PROJ_LIN,                       ///< Linear projection
    123     PS_PROJ_PLY,                       ///< Linear polynomial projection
    124     PS_PROJ_WRP,                       ///< Linear polynomial projection
    125     PS_PROJ_TAN,                       ///< Tangent projection
    126     PS_PROJ_DIS,                       ///< Sine projection
    127     PS_PROJ_SIN,                       ///< Sine projection
    128     PS_PROJ_STG,                       ///< Sine projection
    129     PS_PROJ_ZEA,                       ///< Sine projection
    130     PS_PROJ_ZPL,                       ///< Sine projection
    131     PS_PROJ_AIT,                       ///< Aitoff projection
    132     PS_PROJ_PAR,                       ///< Par projection
    133     PS_PROJ_GLS,                ///< GLS projection
    134     PS_PROJ_CAR,                ///< CAR projection
    135     PS_PROJ_MER,                ///< MER projection
    136     PS_PROJ_NTYPE                      ///< Number of types; must be last.
     121    PS_PROJ_NONE,                       ///< No projection
     122    PS_PROJ_LIN,                        ///< Linear projection
     123    PS_PROJ_PLY,                        ///< Linear polynomial projection
     124    PS_PROJ_WRP,                        ///< Linear polynomial projection
     125    PS_PROJ_TAN,                        ///< Tangent projection
     126    PS_PROJ_DIS,                        ///< Sine projection
     127    PS_PROJ_SIN,                        ///< Sine projection
     128    PS_PROJ_STG,                        ///< Sine projection
     129    PS_PROJ_ZEA,                        ///< Sine projection
     130    PS_PROJ_ZPL,                        ///< Sine projection
     131    PS_PROJ_AIT,                        ///< Aitoff projection
     132    PS_PROJ_PAR,                        ///< Par projection
     133    PS_PROJ_GLS,                        ///< GLS projection
     134    PS_PROJ_CAR,                        ///< CAR projection
     135    PS_PROJ_MER,                        ///< MER projection
     136    PS_PROJ_NTYPE                       ///< Number of types; must be last.
    137137} psProjectionType;
    138138
Note: See TracChangeset for help on using the changeset viewer.