Fixed Emgu.TF.Lite MAUI demo.

emgucv · Jun 27, 2023 · f3d0435 · f3d0435
1 parent 41454c1
commit f3d0435
Show file tree

Hide file tree

Showing 20 changed files with 797 additions and 87 deletions.
diff --git a/Emgu.TF.Example/CVInterop.Lite/MainForm.cs b/Emgu.TF.Example/CVInterop.Lite/MainForm.cs
@@ -34,9 +34,13 @@ public MainForm()
             _mobileNet.OnDownloadProgressChanged += OnDownloadProgressChangedEventHandler;
         }
 
-        public void OnDownloadProgressChangedEventHandler(object sender, System.Net.DownloadProgressChangedEventArgs e)
+        public void OnDownloadProgressChangedEventHandler(long? totalBytesToReceive, long bytesReceived, double? progressPercentage)
         {
-            String msg = String.Format("Downloading models, please wait... {0} of {1} bytes ({2}%) downloaded.", e.BytesReceived, e.TotalBytesToReceive, e.ProgressPercentage);
+            String msg = String.Format("Downloading models, please wait... ");
+            if (totalBytesToReceive.HasValue && totalBytesToReceive > 0)
+                msg += String.Format("{0} of {1} bytes downloaded ({2}%)", bytesReceived, totalBytesToReceive, progressPercentage);
+            else
+                msg += String.Format("{0} bytes downloaded.", bytesReceived);
             if (InvokeRequired)
             {
                 this.Invoke((MethodInvoker)(() =>

diff --git a/Emgu.TF.Example/Inception.Console.Lite.NetCore/Program.cs b/Emgu.TF.Example/Inception.Console.Lite.NetCore/Program.cs
@@ -55,12 +55,12 @@ static async Task Main(string[] args)
             System.Console.ReadKey();
         }
 
-        private static void onDownloadProgressChanged(object sender, System.Net.DownloadProgressChangedEventArgs e)
+        private static void onDownloadProgressChanged(long? totalBytesToReceive, long bytesReceived, double? progressPercentage)
         {
-            if (e.TotalBytesToReceive <= 0)
-                System.Console.WriteLine(String.Format("{0} bytes downloaded", e.BytesReceived, e.ProgressPercentage));
+            if (totalBytesToReceive.HasValue && totalBytesToReceive > 0)
+                System.Console.WriteLine(String.Format("{0} of {1} bytes downloaded ({2}%)", bytesReceived, totalBytesToReceive, progressPercentage));
             else
-                System.Console.WriteLine(String.Format("{0} of {1} bytes downloaded ({2}%)", e.BytesReceived, e.TotalBytesToReceive, e.ProgressPercentage));
+                System.Console.WriteLine(String.Format("{0} bytes downloaded.", bytesReceived));
         }
 
 

diff --git a/Emgu.TF.Example/Maui.Lite/CocoSsdMobilenetPage.cs b/Emgu.TF.Example/Maui.Lite/CocoSsdMobilenetPage.cs
@@ -38,12 +38,12 @@ public CocoSsdMobilenetPage()
         }
 
 
-        private void onDownloadProgressChanged(object sender, System.Net.DownloadProgressChangedEventArgs e)
+        private void onDownloadProgressChanged(long? totalBytesToReceive, long bytesReceived, double? progressPercentage)
         {
-            if (e.TotalBytesToReceive <= 0)
-                SetMessage(String.Format("{0} bytes downloaded.", e.BytesReceived));
+            if (totalBytesToReceive.HasValue && totalBytesToReceive > 0)
+                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", bytesReceived, totalBytesToReceive, progressPercentage));
             else
-                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", e.BytesReceived, e.TotalBytesToReceive, e.ProgressPercentage));
+                SetMessage(String.Format("{0} bytes downloaded.", bytesReceived));
         }
 
         private static Annotation[] GetAnnotations(CocoSsdMobilenetV3.RecognitionResult[] result)

diff --git a/Emgu.TF.Example/Maui.Lite/InceptionPage.cs b/Emgu.TF.Example/Maui.Lite/InceptionPage.cs
@@ -38,12 +38,12 @@ public InceptionPage()
 
         }
 
-        private void onDownloadProgressChanged(object sender, System.Net.DownloadProgressChangedEventArgs e)
+        private void onDownloadProgressChanged(long? totalBytesToReceive, long bytesReceived, double? progressPercentage)
         {
-            if (e.TotalBytesToReceive <= 0)
-                SetMessage(String.Format("{0} bytes downloaded", e.BytesReceived));
+            if (totalBytesToReceive.HasValue && totalBytesToReceive > 0)
+                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", bytesReceived, totalBytesToReceive, progressPercentage));
             else
-                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", e.BytesReceived, e.TotalBytesToReceive, e.ProgressPercentage));
+                SetMessage(String.Format("{0} bytes downloaded", bytesReceived, progressPercentage));
         }
 
         private void onDownloadCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)

diff --git a/Emgu.TF.Example/Maui.Lite/Maui.Demo.Lite.csproj b/Emgu.TF.Example/Maui.Lite/Maui.Demo.Lite.csproj
@@ -55,7 +55,7 @@
 
 
 	<ItemGroup>
-		<ProjectReference Include="..\..\Emgu.TF.Platform\Maui\UI\Emgu.TF.Lite.Platform.Maui.UI.csproj" />
+		<ProjectReference Include="..\..\Emgu.TF.Platform\Maui\UI\Lite\Emgu.TF.Lite.Platform.Maui.UI.csproj" />
 	    <ProjectReference Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'" Include="..\..\Emgu.TF.Lite\Emgu.TF.Lite.Netstandard.IOS\Emgu.TF.Lite.Netstandard.IOS.csproj" />
 	    <ProjectReference Condition="!($([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios')" Include="..\..\Emgu.TF.Lite\Emgu.TF.Lite.Netstandard\Emgu.TF.Lite.Netstandard.csproj" />
 

diff --git a/Emgu.TF.Example/Maui.Lite/MobilenetPage.cs b/Emgu.TF.Example/Maui.Lite/MobilenetPage.cs
@@ -81,12 +81,12 @@ public MobilenetPage()
             };
         }
 
-        private void onDownloadProgressChanged(object sender, System.Net.DownloadProgressChangedEventArgs e)
+        private void onDownloadProgressChanged(long? totalBytesToReceive, long bytesReceived, double? progressPercentage)
         {
-            if (e.TotalBytesToReceive <= 0)
-                SetMessage(String.Format("{0} bytes downloaded", e.BytesReceived, e.ProgressPercentage));
+            if (totalBytesToReceive.HasValue && totalBytesToReceive > 0)
+                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", bytesReceived, totalBytesToReceive, progressPercentage));
             else
-                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", e.BytesReceived, e.TotalBytesToReceive, e.ProgressPercentage));
+                SetMessage(String.Format("{0} bytes downloaded", bytesReceived, progressPercentage));
         }
 
         private async void OnButtonClicked(Object sender, EventArgs args)

diff --git a/Emgu.TF.Example/XamarinForms/XamarinForms.Android/Resources/Resource.Designer.cs b/Emgu.TF.Example/XamarinForms/XamarinForms.Android/Resources/Resource.Designer.cs
diff --git a/Emgu.TF.Example/XamarinForms/XamarinForms.Lite.Android/Resources/Resource.Designer.cs b/Emgu.TF.Example/XamarinForms/XamarinForms.Lite.Android/Resources/Resource.Designer.cs
diff --git a/Emgu.TF.Example/XamarinForms/XamarinForms.Lite/CocoSsdMobilenetPage.cs b/Emgu.TF.Example/XamarinForms/XamarinForms.Lite/CocoSsdMobilenetPage.cs
@@ -114,12 +114,12 @@ private void OutputRecorder_BufferReceived(object sender, OutputRecorder.BufferR
         }
 #endif
 
-        private void onDownloadProgressChanged(object sender, System.Net.DownloadProgressChangedEventArgs e)
+        private void onDownloadProgressChanged(long? totalBytesToReceive, long bytesReceived, double? progressPercentage)
         {
-            if (e.TotalBytesToReceive <= 0)
-                SetMessage(String.Format("{0} bytes downloaded.", e.BytesReceived));
+            if (totalBytesToReceive.HasValue && totalBytesToReceive > 0)
+                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", bytesReceived, totalBytesToReceive, progressPercentage)); 
             else
-                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", e.BytesReceived, e.TotalBytesToReceive, e.ProgressPercentage));
+                SetMessage(String.Format("{0} bytes downloaded.", bytesReceived));
         }
 
         private static Annotation[] GetAnnotations(CocoSsdMobilenetV3.RecognitionResult[] result)

diff --git a/Emgu.TF.Example/XamarinForms/XamarinForms.Lite/InceptionPage.cs b/Emgu.TF.Example/XamarinForms/XamarinForms.Lite/InceptionPage.cs
@@ -49,12 +49,12 @@ public InceptionPage()
 
         }
 
-        private void onDownloadProgressChanged(object sender, System.Net.DownloadProgressChangedEventArgs e)
+        private void onDownloadProgressChanged(long? totalBytesToReceive, long bytesReceived, double? progressPercentage)
         {
-            if (e.TotalBytesToReceive <= 0)
-                SetMessage(String.Format("{0} bytes downloaded", e.BytesReceived, e.ProgressPercentage));
+            if (totalBytesToReceive.HasValue && totalBytesToReceive > 0)
+                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", bytesReceived, totalBytesToReceive, progressPercentage)); 
             else
-                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", e.BytesReceived, e.TotalBytesToReceive, e.ProgressPercentage));
+                SetMessage(String.Format("{0} bytes downloaded", bytesReceived, progressPercentage));
         }
 
         private void onDownloadCompleted(object sender, System.ComponentModel.AsyncCompletedEventArgs e)

diff --git a/Emgu.TF.Example/XamarinForms/XamarinForms.Lite/MobilenetPage.cs b/Emgu.TF.Example/XamarinForms/XamarinForms.Lite/MobilenetPage.cs
@@ -75,12 +75,12 @@ public MobilenetPage()
             };
         }
 
-        private void onDownloadProgressChanged(object sender, System.Net.DownloadProgressChangedEventArgs e)
+        private void onDownloadProgressChanged(long? totalBytesToReceive, long bytesReceived, double? progressPercentage)
         {
-            if (e.TotalBytesToReceive <= 0)
-                SetMessage(String.Format("{0} bytes downloaded", e.BytesReceived, e.ProgressPercentage));
+            if (totalBytesToReceive.HasValue && totalBytesToReceive > 0)
+                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", bytesReceived, totalBytesToReceive, progressPercentage));
             else
-                SetMessage(String.Format("{0} of {1} bytes downloaded ({2}%)", e.BytesReceived, e.TotalBytesToReceive, e.ProgressPercentage));
+                SetMessage(String.Format("{0} bytes downloaded.", bytesReceived));
         }
 
         private async void OnButtonClicked(Object sender, EventArgs args)

diff --git a/Emgu.TF.Lite.Models/CocoSsdMobilenet.cs b/Emgu.TF.Lite.Models/CocoSsdMobilenet.cs
@@ -74,17 +74,16 @@ public CocoSsdMobilenet()
             _downloadManager = new FileDownloadManager();
             _downloadManager.OnDownloadProgressChanged += onDownloadProgressChanged;
         }
-
-        private void onDownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+        private void onDownloadProgressChanged(long? totalBytesToReceive, long bytesReceived, double? progressPercentage)
         {
             if (OnDownloadProgressChanged != null)
-                OnDownloadProgressChanged(sender, e);
+                OnDownloadProgressChanged(totalBytesToReceive, bytesReceived, progressPercentage);
         }
 
         /// <summary>
-        /// Event handler that triggers when download progress changed.
+        /// Callback when model download progress is changed.
         /// </summary>
-        public event System.Net.DownloadProgressChangedEventHandler OnDownloadProgressChanged;
+        public event FileDownloadManager.DownloadProgressChangedEventHandler OnDownloadProgressChanged;
 
         /// <summary>
         /// Initialize the CocoSSDMobileNet model

diff --git a/Emgu.TF.Lite.Models/Emgu.TF.Lite.Models.Android/Emgu.TF.Lite.Models.Android.csproj b/Emgu.TF.Lite.Models/Emgu.TF.Lite.Models.Android/Emgu.TF.Lite.Models.Android.csproj
@@ -47,6 +47,7 @@
     <Reference Include="mscorlib" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
   </ItemGroup>

diff --git a/Emgu.TF.Lite.Models/Emgu.TF.Lite.Models.IOS/Emgu.TF.Lite.Models.IOS.csproj b/Emgu.TF.Lite.Models/Emgu.TF.Lite.Models.IOS/Emgu.TF.Lite.Models.IOS.csproj
@@ -36,6 +36,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
     <Reference Include="Xamarin.iOS" />

diff --git a/Emgu.TF.Lite.Models/Inception.cs b/Emgu.TF.Lite.Models/Inception.cs
@@ -73,17 +73,16 @@ public Inception()
 
             _downloadManager.OnDownloadProgressChanged += onDownloadProgressChanged;
         }
-
-        private void onDownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+        private void onDownloadProgressChanged(long? totalBytesToReceive, long bytesReceived, double? progressPercentage)
         {
             if (OnDownloadProgressChanged != null)
-                OnDownloadProgressChanged(sender, e);
+                OnDownloadProgressChanged(totalBytesToReceive, bytesReceived, progressPercentage);
         }
 
         /// <summary>
-        /// Callback when the download progress has been changed.
+        /// Callback when model download progress is changed.
         /// </summary>
-        public event System.Net.DownloadProgressChangedEventHandler OnDownloadProgressChanged;
+        public event FileDownloadManager.DownloadProgressChangedEventHandler OnDownloadProgressChanged;
 
         /// <summary>
         /// Initialize the graph by downloading the model from the Internet

diff --git a/Emgu.TF.Lite.Models/Mobilenet.cs b/Emgu.TF.Lite.Models/Mobilenet.cs
@@ -74,16 +74,17 @@ public Mobilenet()
             _downloadManager.OnDownloadProgressChanged += onDownloadProgressChanged;
         }
 
-        private void onDownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
+        private void onDownloadProgressChanged(long? totalBytesToReceive, long bytesReceived, double? progressPercentage)
         {
             if (OnDownloadProgressChanged != null)
-                OnDownloadProgressChanged(sender, e);
+                OnDownloadProgressChanged(totalBytesToReceive, bytesReceived, progressPercentage);
         }
 
         /// <summary>
-        /// Callback when the download progress has been changed.
+        /// Callback when model download progress is changed.
         /// </summary>
-        public event System.Net.DownloadProgressChangedEventHandler OnDownloadProgressChanged;
+        public event FileDownloadManager.DownloadProgressChangedEventHandler OnDownloadProgressChanged;
+
 
         /// <summary>
         /// Initialize the graph by downloading the model from the internet

diff --git a/Emgu.TF.Models/Emgu.TF.Models.Android/Emgu.TF.Models.Android.csproj b/Emgu.TF.Models/Emgu.TF.Models.Android/Emgu.TF.Models.Android.csproj
@@ -45,6 +45,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
   </ItemGroup>

diff --git a/Emgu.TF.Platform/Maui/Android/Lite/Emgu.TF.Lite.Platform.Maui.Android.csproj b/Emgu.TF.Platform/Maui/Android/Lite/Emgu.TF.Lite.Platform.Maui.Android.csproj
@@ -102,7 +102,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)\..\..\Android\*.cs" />
   </ItemGroup>
     <ItemGroup>
-      <ProjectReference Include="..\..\..\Emgu.TF.Lite\Emgu.TF.Lite.NetStandard\Emgu.TF.Lite.Netstandard.csproj" />
+      <ProjectReference Include="..\..\..\..\Emgu.TF.Lite\Emgu.TF.Lite.NetStandard\Emgu.TF.Lite.Netstandard.csproj" />
     </ItemGroup>
   <Target Name="EmguTfLiteMauiAndroidPackageBuildImports" BeforeTargets="PrepareForBuild">
     <Warning Text="'$(EmguTfLiteMauiAndroidErrorMessage)'" Condition="'$(EmguTfLiteMauiAndroidErrorMessage)'!=''" />