Changeset 13459

Timestamp:

12/28/07 20:49:15 (6 months ago)

Author:

tamas

Message:

Implement GDALProgressFunc callback for C# (fix for #2122)

Files:

• branches/1.5/gdal/swig/csharp/apps/GDALOverviews.cs (modified) (3 diffs)
• branches/1.5/gdal/swig/include/csharp/gdal_csharp.i (modified) (4 diffs)

branches/1.5/gdal/swig/csharp/apps/GDALOverviews.cs

@@ -24 +24 @@
-        { 
-                Console.WriteLine("usage: gdaloverviews {GDAL dataset name} {resamplealg} {level1} {level2} ....");
+                Console.WriteLine("example: gdaloverviews sample.tif \"NEAREST\" 2 4");
-                System.Environment.Exit(-1);
-        }
@@ -64 +65 @@
-                levels[i-2] = int.Parse(args[i]);
-            }
-
+, new Gdal.GDALProgressFuncDelegate(ProgressFunc), "Sample Data"
-            {
-                Console.WriteLine("The BuildOverviews operation doesn't work");
@@ -98 +99 @@
-        }
-    }
+
+        public static int ProgressFunc(double Complete, IntPtr Message, IntPtr Data)
+        {
+                Console.Write("Processing ... " + Complete * 100 + "% Completed.");
+                if (Message != IntPtr.Zero)
+                        Console.Write(" Message:" + System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Message));
+                if (Data != IntPtr.Zero)
+                        Console.Write(" Data:" + System.Runtime.InteropServices.Marshal.PtrToStringAnsi(Data));
+        
+                Console.WriteLine("");
+                return 1;
+        }
-}

branches/1.5/gdal/swig/include/csharp/gdal_csharp.i

@@ -9 +9 @@
-
-%include typemaps_csharp.i
+
+%pragma(csharp) modulecode="public delegate int GDALProgressFuncDelegate(double Complete, IntPtr Message, IntPtr Data);"
+
+%typemap(imtype) (GDALProgressFunc callback)  "$module.GDALProgressFuncDelegate"
+%typemap(cstype) (GDALProgressFunc callback) "$module.GDALProgressFuncDelegate"
+%typemap(csin) (GDALProgressFunc callback)  "$csinput"
+%typemap(in) (GDALProgressFunc callback) %{ $1 = ($1_ltype)$input; %}
+%typemap(imtype) (void* callback_data) "string"
+%typemap(cstype) (void* callback_data) "string"
+%typemap(csin) (void* callback_data) "$csinput"
-
-%define %rasterio_functions(GDALTYPE,CSTYPE)
@@ -92 +102 @@
-/*! Sixty four bit floating point */ %ds_rasterio_functions(DataType.GDT_Float64,double)
-
-
+, $module.GDALProgressFuncDelegate callback, string callback_data
-      int retval;
-      if (overviewlist.Length <= 0)
@@ -100 +110 @@
-      try {
-          Marshal.Copy(overviewlist, 0, ptr, overviewlist.Length);
-null, null
+callback, callback_data
-      } finally {
-          Marshal.FreeHGlobal(ptr);
@@ -106 +116 @@
-      GC.KeepAlive(this);
-      return retval;
+  }
+public int BuildOverviews( string resampling, int[] overviewlist) {
+      return BuildOverviews( resampling, overviewlist, null, null);
-  }
-}