Changeset 10829

Timestamp:

11/21/11 15:25:38 (13 years ago)

Author:

jschierm

Message:

KMLFileRead: Added capability to write to stdout and fixed usage message.

File:

• issm/trunk/src/mex/KMLMeshWrite/KMLFileRead.cpp (modified) (3 diffs)

issm/trunk/src/mex/KMLMeshWrite/KMLFileRead.cpp

@@ -73 +73 @@
         options=new Options(NRHS,nrhs,prhs);
         if (options->Size()) for(i=0;i<options->Size();i++) ((Option*)options->GetObjectByOffset(i))->DeepEcho();
-        options->Get(&echo    ,"echo"    ,"no");
-        options->Get(&deepecho,"deepecho","no");
-        options->Get(&write   ,"write"   ,"no");
+        options->Get(&echo    ,"echo"    ,"off");
+        options->Get(&deepecho,"deepecho","off");
+        options->Get(&write   ,"write"   ,"off");
 
         /*some checks*/
@@ -94 +94 @@
 
         if (kobj) {
-                if (!strncmp(echo    ,"y",1) || !strncmp(echo    ,"on",2))
+                if (!strncmp(echo    ,"on",2) || !strncmp(echo    ,"y",1))
                         kobj->Echo();
-                if (!strncmp(deepecho,"y",1) || !strncmp(deepecho,"on",2))
+                if (!strncmp(deepecho,"on",2) || !strncmp(deepecho,"y",1))
                         kobj->DeepEcho();
-                if (strncmp(write,"no",2) && strncmp(write,"off",3)) {
-                        if (verbose) printf("Opening file \"%s\".\n",write);
-                        fido=fopen(write,"w");
-
-                        kobj->Write(fido,"");
-
-                        if (verbose) printf("Closing file \"%s\".\n",write);
-                        fclose(fido);
+                if (strncmp(write,"off",3) && strncmp(write,"no",2)) {
+                        if (!strncmp(write,"on",2) || !strncmp(write,"yes",3) || !strncmp(write,"stdout",6)) {
+                                kobj->Write(stdout,"");
+                        }
+                        else {
+                                if (verbose) printf("Opening file \"%s\".\n",write);
+                                fido=fopen(write,"w");
+                                kobj->Write(fido,"");
+                                if (verbose) printf("Closing file \"%s\".\n",write);
+                                ierror=fclose(fido);
+                        }
                 }
 
@@ -131 +134 @@
         _printf_(true,"\n");
         _printf_(true,"   Usage:\n");
-        _printf_(true,"      ierror=KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);\n");
+        _printf_(true,"      [ierror]=KMLFileRead(kmlfile,'param name',param,...);\n");
         _printf_(true,"\n");
-        _printf_(true,"      name       model name (string, may be empty)\n");
-        _printf_(true,"      notes      model notes (string or cell array of strings, may be empty)\n");
-        _printf_(true,"      elem       elements (double array)\n");
-        _printf_(true,"      nodecon    nodal connectivity array (double array, may be empty)\n");
-        _printf_(true,"      lat        nodal latititudes (double vector)\n");
-        _printf_(true,"      long       nodal longitudes (double vector)\n");
-        _printf_(true,"      part       nodal partitions (double vector, may be empty)\n");
-        _printf_(true,"      data       nodal or element data (double vector, may be empty)\n");
-        _printf_(true,"      cmap       color map (double nx3 array, may be empty)\n");
-        _printf_(true,"      kmlfile    KML file name (string)\n");
+        _printf_(true,"      kmlfile      file name of kml file to be read (char)\n");
         _printf_(true,"\n");
-        _printf_(true,"      ierror     error flag (double, non-zero for error)\n");
+        _printf_(true,"      echo         echo command (char, optional, 'off'/'on')\n");
+        _printf_(true,"      deepecho     deep echo command (char, optional, 'off'/'on')\n");
+        _printf_(true,"      write        write command (char, optional, 'off'/'stdout'/kmlfile)\n");
         _printf_(true,"\n");
-        _printf_(true,"   Example:\n");
-        _printf_(true,"      KMLMeshWrite(md.name,md.notes,md.elements,md.nodeconnectivity,md.lat,md.long,md.part,md.fm_criterion,options.cmap,filekml);\n");
+        _printf_(true,"      ierror       return code (non-zero for error)\n");
+        _printf_(true,"\n");
+        _printf_(true,"   Examples:\n");
+        _printf_(true,"      [ierror]=KMLFileRead('file.kml','deepecho','on');\n");
+        _printf_(true,"      [ierror]=KMLFileRead('filin.kml','echo','on','write','filout.kml');\n");
         _printf_(true,"\n");
 }