Changeset 14279

Timestamp:

01/22/13 11:44:31 (12 years ago)

Author:

jschierm

Message:

NEW: Prototype of Shp2Exp matlab modules.

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (1 diff)
• c/modules/Shp2Expx (added)
• c/modules/Shp2Expx/Shp2Expx.cpp (copied) (copied from issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp ) (9 diffs)
• c/modules/Shp2Expx/Shp2Expx.h (copied) (copied from issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.h ) (2 diffs)
• c/modules/modules.h (modified) (2 diffs)
• wrappers/Shp2Exp (added)
• wrappers/Shp2Exp/Shp2Exp.cpp (copied) (copied from issm/trunk-jpl/src/wrappers/Shp2Kml/Shp2Kml.cpp ) (6 diffs)
• wrappers/Shp2Exp/Shp2Exp.h (copied) (copied from issm/trunk-jpl/src/wrappers/Shp2Kml/Shp2Kml.h ) (3 diffs)
• wrappers/matlab/Makefile.am (modified) (2 diffs)

issm/trunk-jpl/src/c/Makefile.am ¶

@@ -627 +627 @@
                              ./modules/Kml2Expx/Kml2Expx.h\
                              ./modules/Kml2Expx/Kml2Expx.cpp\
+                             ./modules/Shp2Expx/Shp2Expx.h\
+                             ./modules/Shp2Expx/Shp2Expx.cpp\
                              ./modules/Shp2Kmlx/Shp2Kmlx.h\
                              ./modules/Shp2Kmlx/Shp2Kmlx.cpp\

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

@@ -1 @@
-/*!\file Shp2Kmlx
- * \brief shp to kml conversion routines.
+/*!\file Shp2Expx
+ * \brief shp to exp conversion routines.
  */
 
-#include "./Shp2Kmlx.h"
+#include "./Shp2Expx.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"
@@ -11 +11 @@
 #include "../modules.h"
 
-int Shp2Kmlx(char* filshp,char* filkml,
+int Shp2Expx(char* filshp,char* filexp,
                          int sgn){
 
@@ -21 +21 @@
                 Xy2lldef(&cm,&sp,sgn);
 
-        return(Shp2Kmlx(filshp,filkml,
+        return(Shp2Expx(filshp,filexp,
                                         sgn,cm,sp));
 
@@ -29 +29 @@
 }
 
-int Shp2Kmlx(char* filshp,char* filkml,
+int Shp2Expx(char* filshp,char* filexp,
                          int sgn,double cm,double sp){
 
@@ -49 +49 @@
 
         char    indent[81]="";
-        KML_File          *kfile  = NULL;
-        KML_Document      *kdoc   = NULL;
-        KML_Style         *kstyle = NULL;
-        KML_LineStyle     *klsty  = NULL;
-        KML_PolyStyle     *kpsty  = NULL;
         KML_Folder        *kfold  = NULL;
         KML_Placemark     *kplace = NULL;
@@ -68 +63 @@
         clock0=clock();
         time0 =time(NULL);
-        _pprintString_("\nShp2Kmlx Module -- " << ctime(&time0));
+        _pprintString_("\nShp2Expx Module -- " << ctime(&time0));
 
 /*  note that much of the following code is taken from shpdump.c in shapelib.  */
@@ -204 +199 @@
 
         SHPClose( hSHP );
-
-/*  construct kml file  */
-
-        kfile =new KML_File();
-        kfile->AddAttrib("xmlns","http://www.opengis.net/kml/2.2");
-
-/*  construct kml document  */
-
-        kdoc  =new KML_Document();
-        sprintf(kdoc->name      ,"Shp2Kmlx Module -- %s",ctime(&time0));
-        kdoc->open      =1;
-
-/*  construct style templates for defaults  */
-
-        klsty =new KML_LineStyle();
-        sprintf(klsty->color     ,"ff000000");
-        sprintf(klsty->colormode ,"normal");
-        klsty->width     =lwidth;
-        kpsty =new KML_PolyStyle();
-        sprintf(kpsty->color     ,"%02xffffff",(int)floor(popac*255+0.5));
-        sprintf(kpsty->colormode ,"random");
-        kstyle=new KML_Style();
-        kstyle->AddAttrib("id","BlackLineRandomPoly");
-        kstyle->line      =klsty;
-        kstyle->poly      =kpsty;
-        (kdoc->style     )->AddObject((Object*)kstyle);
-
-        klsty =new KML_LineStyle();
-        sprintf(klsty->color     ,"ff000000");
-        sprintf(klsty->colormode ,"normal");
-        klsty->width     ,lwidth;
-        kpsty =new KML_PolyStyle();
-        sprintf(kpsty->color     ,"00ffffff");
-        sprintf(kpsty->colormode ,"random");
-        kstyle=new KML_Style();
-        kstyle->AddAttrib("id","BlackLineEmptyPoly");
-        kstyle->line      =klsty;
-        kstyle->poly      =kpsty;
-        (kdoc->style     )->AddObject((Object*)kstyle);
-
-        klsty =new KML_LineStyle();
-        sprintf(klsty->color     ,"%02xffffff",(int)floor(popac*255+0.5));
-        sprintf(klsty->colormode ,"random");
-        klsty->width     =lwidth*2;
-        kpsty =new KML_PolyStyle();
-        sprintf(kpsty->color     ,"00ffffff");
-        sprintf(kpsty->colormode ,"random");
-        kstyle=new KML_Style();
-        kstyle->AddAttrib("id","RandomLineEmptyPoly");
-        kstyle->line      =klsty;
-        kstyle->poly      =kpsty;
-        (kdoc->style     )->AddObject((Object*)kstyle);
 
 /*  construct kml folder for shapes  */
@@ -564 +507 @@
         }
 
-/*  assemble the rest of the kml hierarchy  */
-
-        (kdoc ->feature   )->AddObject((Object*)kfold);
-        kfold=NULL;
-        (kfile->kmlobj    )->AddObject((Object*)kdoc);
-        kdoc =NULL;
-
-/*  write kml file  */
-
-        _pprintLine_("Writing kml document to file.");
-        fid=fopen(filkml,"w");
-        fprintf(fid,"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
-        kfile->Write(fid,indent);
-        fclose(fid);
-
-        delete kfile;
+/*  open exp file  */
+
+    _pprintLine_("Writing exp profiles to file.");
+    fid=fopen(filexp,"w");
+
+/*  write the polygons and linestrings  */
+
+    kfold->WriteExp(fid,"",sgn,cm,sp);
+
+/*  close exp file  */
+
+    fclose(fid);
+
+        delete kfold;
         for (i=nshape-1; i>=0; i--) {
                 xDelete<double>((pshapm[i]));
@@ -602 +543 @@
         clock1=clock();
         time1 =time(NULL);
-        _printf_(true,"Shp2Kmlx Module -- %f CPU seconds; %f elapsed seconds.\n\n",
+        _printf_(true,"Shp2Expx Module -- %f CPU seconds; %f elapsed seconds.\n\n",
                          ((double)(clock1-clock0))/CLOCKS_PER_SEC,difftime(time1,time0));
 

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

@@ -1 @@
-/*!\file:  Shp2Kmlx.h
- * \brief header file for shp to kml conversion routines.
+/*!\file:  Shp2Expx.h
+ * \brief header file for shp to exp conversion routines.
  */ 
 
-#ifndef _SHP2KMLX_H
-#define _SHP2KMLX_H
+#ifndef _SHP2EXPX_H
+#define _SHP2EXPX_H
 
 #ifdef HAVE_CONFIG_H
@@ -22 +22 @@
 
 /* local prototypes: */
-int Shp2Kmlx(char* filshp,char* filkml, int sgn);
-int Shp2Kmlx(char* filshp,char* filkml, int sgn,double cm,double sp);
+int Shp2Expx(char* filshp,char* filexp, int sgn);
+int Shp2Expx(char* filshp,char* filexp, int sgn,double cm,double sp);
 
-#endif  /* _SHP2KMLX_H */
+#endif  /* _SHP2EXPX_H */

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

@@ -60 +60 @@
 #include "./Kml2Expx/Kml2Expx.h"
 #include "./Krigingx/Krigingx.h"
-#include "./Shp2Kmlx/Shp2Kmlx.h"
 #include "./Mergesolutionfromftogx/Mergesolutionfromftogx.h"
 #include "./MeshPartitionx/MeshPartitionx.h"
@@ -87 +86 @@
 #include "./RheologyBbarAbsGradientx/RheologyBbarAbsGradientx.h"
 #include "./Scotchx/Scotchx.h"
+#include "./Shp2Expx/Shp2Expx.h"
+#include "./Shp2Kmlx/Shp2Kmlx.h"
 #include "./SmbGradientsx/SmbGradientsx.h"
 #include "./Solverx/Solverx.h"

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

@@ -1 @@
-/*\file Shp2Kml.c
- *\brief: shp to kml file conversion mex module.
+/*\file Shp2Exp.c
+ *\brief: shp to exp file conversion mex module.
  */
 
@@ -9 +9 @@
 #endif
 
-#include "./Shp2Kml.h"
+#include "./Shp2Exp.h"
 
-void Shp2KmlUsage(void){/*{{{*/
-        _pprintLine_("Shp2Kml - shp to kml file conversion module:");
+void Shp2ExpUsage(void){/*{{{*/
+        _pprintLine_("Shp2Exp - shp to exp file conversion module:");
         _pprintLine_("");
-        _pprintLine_("   This module converts a file from shp to kml format.");
+        _pprintLine_("   This module converts a file from shp to exp format.");
         _pprintLine_("");
         _pprintLine_("   Usage:");
-        _pprintLine_("      [ret]=Shp2Kml(filshp,filkml,sgn,'param name',param,...);");
+        _pprintLine_("      [ret]=Shp2Exp(filshp,filexp,sgn,'param name',param,...);");
         _pprintLine_("");
         _pprintLine_("      filshp      file name of shp file to be read (char, extension optional)");
-        _pprintLine_("      filkml      file name of kml file to be written (char)");
+        _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_("");
@@ -29 +29 @@
         _pprintLine_("");
         _pprintLine_("   Examples:");
-        _pprintLine_("      [ret]=Shp2Kml('file.shp','file.kml', 0);");
-        _pprintLine_("      [ret]=Shp2Kml('file.shp','file.kml', 1,'central_meridian',45,'standard_parallel',70);");
-        _pprintLine_("      [ret]=Shp2Kml('file.shp','file.kml',-1,'central_meridian', 0,'standard_parallel',71);");
+        _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_("");
 }/*}}}*/
-WRAPPER(Shp2Kml){
+WRAPPER(Shp2Exp){
 
         int i,verbose=1;
 
         /*input: */
-        char    *filshp=NULL,*filkml=NULL;
+        char    *filshp=NULL,*filexp=NULL;
         int     sgn;
         Options* options=NULL;
@@ -56 +56 @@
         /*checks on arguments on the matlab side: */
         if (nlhs > NLHS) {
-                Shp2KmlUsage(); _error_("Shp2Kml usage error");
+                Shp2ExpUsage(); _error_("Shp2Exp usage error");
         }
         if (nrhs < NRHS) {
-                Shp2KmlUsage(); _error_("Shp2Kml usage error");
+                Shp2ExpUsage(); _error_("Shp2Exp usage error");
         }
 
         /*Input datasets: */
         FetchData(&filshp,SHP_IN);
-        FetchData(&filkml,KML_IN);
+        FetchData(&filexp,EXP_IN);
         FetchData(&sgn,SGN_IN);
         FetchData(&options,NRHS,nrhs,prhs);
@@ -83 +83 @@
         /* Run core computations: */
         if (options->GetOption("central_meridian") && options->GetOption("standard_parallel"))
-                iret=Shp2Kmlx(filshp,filkml,sgn,cm,sp);
+                iret=Shp2Expx(filshp,filexp,sgn,cm,sp);
         else
-                iret=Shp2Kmlx(filshp,filkml,sgn);
+                iret=Shp2Expx(filshp,filexp,sgn);
 
         /*Write data: */
@@ -92 +92 @@
         /*Clean-up*/
         delete options;
-        xDelete<char>(filkml);
+        xDelete<char>(filexp);
         xDelete<char>(filshp);
 

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

@@ -1 @@
-/*!\file Shp2Kml.h
- * \brief: prototype for shp to kml file conversion mex module.
+/*!\file Shp2Exp.h
+ * \brief: prototype for shp to exp file conversion mex module.
  */
 
-#ifndef _SHP2KML_H
-#define _SHP2KML_H
+#ifndef _SHP2EXP_H
+#define _SHP2EXP_H
 
 #ifdef HAVE_CONFIG_H
@@ -24 +24 @@
 
 #undef __FUNCT__ 
-#define __FUNCT__  "Shp2Kml"
+#define __FUNCT__  "Shp2Exp"
 
 #ifdef _HAVE_MATLAB_MODULES_
 /* serial input macros: */
 #define SHP_IN  prhs[0]
-#define KML_IN  prhs[1]
+#define EXP_IN  prhs[1]
 #define SGN_IN  prhs[2]
 /* serial output macros: */
@@ -38 +38 @@
 /* serial input macros: */
 #define SHP_IN PyTuple_GetItem(args,0)
-#define KML_IN PyTuple_GetItem(args,1)
+#define EXP_IN PyTuple_GetItem(args,1)
 #define SGN_IN PyTuple_GetItem(args,2)
 /* serial output macros: */

issm/trunk-jpl/src/wrappers/matlab/Makefile.am ¶

@@ -76 +76 @@
                                    KMLMeshWrite.la\
                                    KMLOverlay.la\
-                                   Shp2Kml.la\
                                    Exp2Kml.la\
-                                   Kml2Exp.la
+                                   Kml2Exp.la\
+                                   Shp2Exp.la\
+                                   Shp2Kml.la
 endif
 endif 
@@ -246 +247 @@
 Scotch_la_LIBADD = ${deps} $(SCOTCHLIB) $(MPILIB)
 
+Shp2Exp_la_SOURCES = ../Shp2Exp/Shp2Exp.cpp\
+                                                        ../Shp2Exp/Shp2Exp.h
+Shp2Exp_la_LIBADD = ${deps} $(SHAPELIBLIB) $(MPILIB) $(PETSCLIB)
+
 Shp2Kml_la_SOURCES = ../Shp2Kml/Shp2Kml.cpp\
                                                         ../Shp2Kml/Shp2Kml.h