Changeset 12737

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:

• psCoord.c (modified) (12 diffs)
• psCoord.h (modified) (2 diffs)

trunk/psLib/src/astro/psCoord.c

@@ -10 +10 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.137 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-04-04 19:46:28 $
+*  @version $Revision: 1.138 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-04-04 21:10:03 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -356 +356 @@
 
 typedef enum {
-    PS_PROJ_NONE,
-    PS_PROJ_CARTESIAN,
-    PS_PROJ_ZENITHAL,
-    PS_PROJ_PSEUDOCYL,
+    PS_PROJECTION_CLASS_NONE,
+    PS_PROJECTION_CLASS_CARTESIAN,
+    PS_PROJECTION_CLASS_ZENITHAL,
+    PS_PROJECTION_CLASS_PSEUDOCYL,
 }psProjectionClass;
 
@@ -377 +377 @@
     psF64 sinDp, cosDp, sinAlpha, cosAlpha, sinDelta, cosDelta, zeta;
 
-    psProjectionClass class = PS_PROJ_NONE;
+    psProjectionClass class = PS_PROJECTION_CLASS_NONE;
     switch (projection->type) {
     case PS_PROJ_LIN:
     case PS_PROJ_PLY:
     case PS_PROJ_WRP:
-        class = PS_PROJ_CARTESIAN;
+        class = PS_PROJECTION_CLASS_CARTESIAN;
         break;
     case PS_PROJ_TAN:
@@ -390 +390 @@
     case PS_PROJ_ZEA:
     case PS_PROJ_ZPL:
-        class = PS_PROJ_ZENITHAL;
+        class = PS_PROJECTION_CLASS_ZENITHAL;
         break;
     case PS_PROJ_AIT:
@@ -397 +397 @@
     case PS_PROJ_MER:
     case PS_PROJ_CAR:
-        class = PS_PROJ_PSEUDOCYL;
+        class = PS_PROJECTION_CLASS_PSEUDOCYL;
         break;
 
@@ -414 +414 @@
 
     switch (class) {
-    case PS_PROJ_CARTESIAN:
+    case PS_PROJECTION_CLASS_CARTESIAN:
         out->x = (coord->r - projection->R);
         out->y = (coord->d - projection->D);
         break;
 
-    case PS_PROJ_ZENITHAL:
+    case PS_PROJECTION_CLASS_ZENITHAL:
         sinDp = sin(projection->D);
         cosDp = cos(projection->D);
@@ -470 +470 @@
         break;
 
-    case PS_PROJ_PSEUDOCYL:
+    case PS_PROJECTION_CLASS_PSEUDOCYL:
         phi = coord->r - projection->R;
         theta = coord->d - projection->D;
@@ -533 +533 @@
     psF64  x = 0, y = 0, R = 0;
 
-    psProjectionClass class = PS_PROJ_NONE;
+    psProjectionClass class = PS_PROJECTION_CLASS_NONE;
     switch (projection->type) {
     case PS_PROJ_LIN:
     case PS_PROJ_PLY:
     case PS_PROJ_WRP:
-        class = PS_PROJ_CARTESIAN;
+        class = PS_PROJECTION_CLASS_CARTESIAN;
         break;
     case PS_PROJ_TAN:
@@ -546 +546 @@
     case PS_PROJ_ZEA:
     case PS_PROJ_ZPL:
-        class = PS_PROJ_ZENITHAL;
+        class = PS_PROJECTION_CLASS_ZENITHAL;
         break;
     case PS_PROJ_AIT:
@@ -553 +553 @@
     case PS_PROJ_CAR:
     case PS_PROJ_MER:
-        class = PS_PROJ_PSEUDOCYL;
+        class = PS_PROJECTION_CLASS_PSEUDOCYL;
         break;
 
@@ -575 +575 @@
     // Perform inverse projection
     switch (class) {
-    case PS_PROJ_CARTESIAN:
+    case PS_PROJECTION_CLASS_CARTESIAN:
         out->r = coord->x*projection->Xs + projection->R;
         out->d = coord->y*projection->Ys + projection->D;
         break;
 
-    case PS_PROJ_ZENITHAL:
+    case PS_PROJECTION_CLASS_ZENITHAL:
         // Remove plate scales
         x = coord->x*projection->Xs;
@@ -638 +638 @@
         break;
 
-    case PS_PROJ_PSEUDOCYL:
+    case PS_PROJECTION_CLASS_PSEUDOCYL:
         switch (projection->type)
         {

trunk/psLib/src/astro/psCoord.h

@@ -8 +8 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-04-04 19:46:28 $
+ *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-04-04 21:10:03 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -119 +119 @@
  */
 typedef enum {
-    PS_PROJ_NONE,                      ///< No projection
-    PS_PROJ_LIN,                       ///< Linear projection
-    PS_PROJ_PLY,                       ///< Linear polynomial projection
-    PS_PROJ_WRP,                       ///< Linear polynomial projection
-    PS_PROJ_TAN,                       ///< Tangent projection
-    PS_PROJ_DIS,                       ///< Sine projection
-    PS_PROJ_SIN,                       ///< Sine projection
-    PS_PROJ_STG,                       ///< Sine projection
-    PS_PROJ_ZEA,                       ///< Sine projection
-    PS_PROJ_ZPL,                       ///< Sine projection
-    PS_PROJ_AIT,                       ///< Aitoff projection
-    PS_PROJ_PAR,                       ///< Par projection
-    PS_PROJ_GLS,                ///< GLS projection
-    PS_PROJ_CAR,                ///< CAR projection
-    PS_PROJ_MER,                ///< MER projection
-    PS_PROJ_NTYPE                      ///< Number of types; must be last.
+    PS_PROJ_NONE,                       ///< No projection
+    PS_PROJ_LIN,                        ///< Linear projection
+    PS_PROJ_PLY,                        ///< Linear polynomial projection
+    PS_PROJ_WRP,                        ///< Linear polynomial projection
+    PS_PROJ_TAN,                        ///< Tangent projection
+    PS_PROJ_DIS,                        ///< Sine projection
+    PS_PROJ_SIN,                        ///< Sine projection
+    PS_PROJ_STG,                        ///< Sine projection
+    PS_PROJ_ZEA,                        ///< Sine projection
+    PS_PROJ_ZPL,                        ///< Sine projection
+    PS_PROJ_AIT,                        ///< Aitoff projection
+    PS_PROJ_PAR,                        ///< Par projection
+    PS_PROJ_GLS,                        ///< GLS projection
+    PS_PROJ_CAR,                        ///< CAR projection
+    PS_PROJ_MER,                        ///< MER projection
+    PS_PROJ_NTYPE                       ///< Number of types; must be last.
 } psProjectionType;