Changeset 22758 for issm/trunk/src/wrappers/matlab/io/ApiPrintf.cpp

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wrappers (modified) (1 prop)
• src/wrappers/matlab/io/ApiPrintf.cpp (modified) (1 diff)

issm/trunk/src/wrappers

@@ -17 +17 @@
 *.exe.manifest
 .dirstamp
+EnumToString
+Exp2Kml
+Issm/.deps
+KMLFileRead
+KMLMeshWrite
+KMLOverlay
+Kml2Exp
+Ll2xy
+Shp2Kml
+StringToEnum
+TriaSearch
+Xy2ll

@@ -17 +17 @@
 *.exe.manifest
 .dirstamp
+EnumToString
+Exp2Kml
+Issm/.deps
+KMLFileRead
+KMLMeshWrite
+KMLOverlay
+Kml2Exp
+Ll2xy
+Shp2Kml
+StringToEnum
+TriaSearch
+Xy2ll

issm/trunk/src/wrappers/matlab/io/ApiPrintf.cpp

@@ -15 +15 @@
 
         /*use mexPrintf in matlab: */
-        mexPrintf(string);
+        //mexPrintf(string); /*Messes up percentages (like "interpolation progress: 100.00%")*/
+        printf("%s",string);
         return;
 }

@@ -17 +17 @@
 *.exe.manifest
 .dirstamp
+EnumToString
+Exp2Kml
+Issm/.deps
+KMLFileRead
+KMLMeshWrite
+KMLOverlay
+Kml2Exp
+Ll2xy
+Shp2Kml
+StringToEnum
+TriaSearch
+Xy2ll