Changeset 10256

Timestamp:

10/20/11 15:16:57 (13 years ago)

Author:

jschierm

Message:

KML: Addition of KML_Point object and associated utility.

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• objects/KML/KMLFileReadUtils.cpp (modified) (1 diff)
• objects/KML/KMLFileReadUtils.h (modified) (1 diff)
• objects/KML/KML_Point.cpp (added)
• objects/KML/KML_Point.h (added)
• objects/objects.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -111 +111 @@
                                         ./objects/KML/KML_Overlay.cpp\
                                         ./objects/KML/KML_Overlay.h\
+                                        ./objects/KML/KML_Point.cpp\
+                                        ./objects/KML/KML_Point.h\
                                         ./objects/KML/KML_Placemark.cpp\
                                         ./objects/KML/KML_Placemark.h\

issm/trunk/src/c/objects/KML/KMLFileReadUtils.cpp

@@ -353 +353 @@
 
 /*FUNCTION  KMLFileTokenParse {{{1*/
+int KMLFileTokenParse(double **pdval,int* m,int maxlen,
+                                          char* ktag,
+                                          FILE* fid){
+
+        int     i=-1,j;
+        char*   kstr;
+        char*   ktok;
+        char    delim[]={' ',',','\f','\n','\r','\t','\v','\0'};
+
+/*  get next token and allocate if necessary  */
+
+        if (!(kstr=KMLFileToken(fid)) ||
+                (kstr[0] == '<'))
+                _error_("KMLFileTokenParse -- Missing double [m] field for %s.\n",ktag);
+
+        if (!*pdval)
+                if (maxlen)
+                        *pdval=(double *) xmalloc(maxlen              *sizeof(double));
+                else
+                        *pdval=(double *) xmalloc(((strlen(kstr)+1)/2)*sizeof(double));
+
+/*  loop through string to get all values  */
+
+        ktok=strtok(kstr,delim);
+        while (ktok) {
+                i++;
+                if (maxlen && (maxlen < i+1))
+                        _error_("KMLFileTokenParse -- Double [m] field too short for %s.\n",ktag);
+                sscanf(ktok,"%lg",&((*pdval)[i]));
+                ktok=strtok(NULL,delim);
+        }
+        xfree((void**)&kstr);
+
+        if (!maxlen)
+                *pdval=(double *) xrealloc(*pdval,(i+1)*sizeof(double));
+
+        if (m)
+                *m=i+1;
+
+/*  get additional token and compare to closing tag  */
+
+        if (ktag)
+                if (!(kstr=KMLFileToken(fid)) ||
+                        (kstr[0] != '<') ||
+                        (kstr[1] != '/') ||
+                        (strncmp(&(kstr[2]),&(ktag[1]),strlen(ktag)-1)))
+                        _error_("KMLFileTokenParse -- Missing closing tag for %s.\n",ktag);
+                else
+                        xfree((void**)&kstr);
+
+//      _printf_(true,"KMLFileTokenParse -- %s=...\n",ktag);
+//      for (j=0; j<=i; j++)
+//              _printf_(true,"   [%d]: %g\n",j,(*pdval)[j]);
+
+        return(0);
+}
+/*}}}*/
+
+/*FUNCTION  KMLFileTokenParse {{{1*/
 int KMLFileTokenParse(double (**pdval3)[3],int* m,int maxlen,
                                           char* ktag,

issm/trunk/src/c/objects/KML/KMLFileReadUtils.h

@@ -36 +36 @@
                                           char* ktag,
                                           FILE* fid);
+int KMLFileTokenParse(double **pdval,int* m,int maxlen,
+                                          char* ktag,
+                                          FILE* fid);
 int KMLFileTokenParse(double (**pdval3)[3],int* m,int maxlen,
                                           char* ktag,

issm/trunk/src/c/objects/objects.h

@@ -64 +64 @@
 #include "./KML/KML_Object.h"
 #include "./KML/KML_Overlay.h"
+#include "./KML/KML_Point.h"
 #include "./KML/KML_Placemark.h"
 #include "./KML/KML_Polygon.h"