Changeset 14283

Timestamp:

01/23/13 10:42:37 (12 years ago)

Author:

jschierm

Message:

CHG: Change Shp2Exp wrapper to remove transformation specs.

Location:

issm/trunk-jpl/src

Files:

• c/modules/Shp2Expx/Shp2Expx.cpp (modified) (1 diff)
• c/modules/Shp2Expx/Shp2Expx.h (modified) (1 diff)
• wrappers/Shp2Exp/Shp2Exp.cpp (modified) (4 diffs)
• wrappers/Shp2Exp/Shp2Exp.h (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../modules.h"
+
+int Shp2Expx(char* filshp,char* filexp){
+
+        #ifdef _HAVE_SHAPELIB_ //only works if Shapelib library has been compiled in.
+
+        return(Shp2Expx(filshp,filexp,
+                                        0));
+
+        #else //ifdef _HAVE_SHAPELIB_
+        return 0;
+        #endif
+}
 
 int Shp2Expx(char* filshp,char* filexp,

issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.h

@@ -22 +22 @@
 
 /* local prototypes: */
+int Shp2Expx(char* filshp,char* filexp);
 int Shp2Expx(char* filshp,char* filexp, int sgn);
 int Shp2Expx(char* filshp,char* filexp, int sgn,double cm,double sp);

issm/trunk-jpl/src/wrappers/Shp2Exp/Shp2Exp.cpp

@@ -21 +21 @@
         _pprintLine_("      filshp      file name of shp file to be read (char, extension optional)");
         _pprintLine_("      filexp      file name of exp file to be written (char)");
-        _pprintLine_("      sgn         sign for hemisphere (double, +1 (north); -1 (south); or 0 (no translation))");
-        _pprintLine_("");
-        _pprintLine_("      central_meridian     central meridian (double, optional, but must specify with sp)");
-        _pprintLine_("      standard_parallel    standard parallel (double, optional, but must specify with cm)");
         _pprintLine_("");
         _pprintLine_("      ret         return code (non-zero for warning)");
         _pprintLine_("");
         _pprintLine_("   Examples:");
-        _pprintLine_("      [ret]=Shp2Exp('file.shp','file.exp', 0);");
-        _pprintLine_("      [ret]=Shp2Exp('file.shp','file.exp', 1,'central_meridian',45,'standard_parallel',70);");
-        _pprintLine_("      [ret]=Shp2Exp('file.shp','file.exp',-1,'central_meridian', 0,'standard_parallel',71);");
+        _pprintLine_("      [ret]=Shp2Exp('file.shp','file.exp');");
         _pprintLine_("");
 }/*}}}*/
@@ -40 +34 @@
         /*input: */
         char    *filshp=NULL,*filexp=NULL;
-        int     sgn;
-        Options* options=NULL;
-        double   cm=0.,sp=0.;
 
         /* output: */
@@ -65 +56 @@
         FetchData(&filshp,SHP_IN);
         FetchData(&filexp,EXP_IN);
-        FetchData(&sgn,SGN_IN);
-        FetchData(&options,NRHS,nrhs,prhs);
-
-        /*  defaults are in Xy2lldef, so don't duplicate them here, and only use user values if both have been specified  */
-        if (options->GetOption("central_meridian") || options->GetOption("standard_parallel")) {
-                options->Get(&cm,"central_meridian");
-                if (verbose) _printLine_("  cm=" << cm);
-                options->Get(&sp,"standard_parallel");
-                if (verbose) _printLine_("  sp=" << sp);
-        }
-
-        /*some checks*/
-        if (sgn < -1 || sgn > +1) _error_("Hemisphere sgn=" << sgn << " must be +1 (north), -1 (south), or 0 (no translation).");
-        if (fabs(cm)      > 180.) _error_("Central meridian cm=" << cm << " must be between -180 (west) and +180 (east) degrees.");
-        if (sp < 0. || sp >  90.) _error_("Standard parallel sp=" << sp << " must be between 0 and 90 degrees (in specified hemisphere).");
 
         /* Run core computations: */
-        if (options->GetOption("central_meridian") && options->GetOption("standard_parallel"))
-                iret=Shp2Expx(filshp,filexp,sgn,cm,sp);
-        else
-                iret=Shp2Expx(filshp,filexp,sgn);
+        iret=Shp2Expx(filshp,filexp);
 
         /*Write data: */
@@ -91 +64 @@
 
         /*Clean-up*/
-        delete options;
         xDelete<char>(filexp);
         xDelete<char>(filshp);

issm/trunk-jpl/src/wrappers/Shp2Exp/Shp2Exp.h

@@ -30 +30 @@
 #define SHP_IN  prhs[0]
 #define EXP_IN  prhs[1]
-#define SGN_IN  prhs[2]
 /* serial output macros: */
 #define RET_OUT (mxArray**)&plhs[0]
@@ -39 +38 @@
 #define SHP_IN PyTuple_GetItem(args,0)
 #define EXP_IN PyTuple_GetItem(args,1)
-#define SGN_IN PyTuple_GetItem(args,2)
 /* serial output macros: */
 #define RET_OUT output,0
@@ -46 +44 @@
 /* serial arg counts: */
 #undef NRHS
-#define NRHS  3
+#define NRHS  2
 #undef NLHS
 #define NLHS  1