From 8732d85e8e16e91c45d04b7a79da5efefc386bfc Mon Sep 17 00:00:00 2001
From: nifranco <nifranco@IUTCLINFC2101>
Date: Mon, 15 Jan 2024 19:30:00 +0100
Subject: [PATCH] ADD : avancement ColorImageStream

---
 KinectConnection/BodyImageStream.cs           | 25 +++++++++++++++++++
 KinectConnection/ColorImageStream.cs          | 10 +++++++-
 KinectConnection/KinectConnection.csproj      |  2 ++
 KinectConnection/KinectManager.cs             |  2 ++
 KinectConnection/KinectStream.cs              | 11 ++++++--
 KinectSensorStreams/View/MainWindow.xaml      | 13 +++++++---
 KinectSensorStreams/ViewModel/MainWindowVM.cs | 11 ++++++++
 7 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 KinectConnection/BodyImageStream.cs

diff --git a/KinectConnection/BodyImageStream.cs b/KinectConnection/BodyImageStream.cs
new file mode 100644
index 0000000..8ab7ad3
--- /dev/null
+++ b/KinectConnection/BodyImageStream.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Shapes;
+
+namespace KinectConnection
+{
+    public class BodyImageStream : KinectStream
+    {
+
+        public override void Start()
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void Stop()
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/KinectConnection/ColorImageStream.cs b/KinectConnection/ColorImageStream.cs
index 6a91db5..52ae726 100644
--- a/KinectConnection/ColorImageStream.cs
+++ b/KinectConnection/ColorImageStream.cs
@@ -1,4 +1,5 @@
-using Microsoft.Kinect;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.Kinect;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -20,6 +21,13 @@ namespace KinectConnection
         /// </summary>
         private ColorFrameReader reader;
 
+        public WriteableBitmap Bitmap { get { return bitmap; } set { SetProperty(ref bitmap, value); } }
+
+        public ColorImageStream() : base()
+        {
+
+        }
+
         public override void Start()
         {
             // create the colorFrameDescription from the ColorFrameSource using rgba format
diff --git a/KinectConnection/KinectConnection.csproj b/KinectConnection/KinectConnection.csproj
index b86965b..85e64d6 100644
--- a/KinectConnection/KinectConnection.csproj
+++ b/KinectConnection/KinectConnection.csproj
@@ -44,6 +44,7 @@
       <HintPath>..\..\..\..\..\Program Files\Microsoft SDKs\Kinect\v2.0_1409\Assemblies\Microsoft.Kinect.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
@@ -75,6 +76,7 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BodyImageStream.cs" />
     <Compile Include="ColorImageStream.cs" />
     <Compile Include="DepthImageStream.cs" />
     <Compile Include="InfraredImageStream.cs" />
diff --git a/KinectConnection/KinectManager.cs b/KinectConnection/KinectManager.cs
index eedf766..a1e28c2 100644
--- a/KinectConnection/KinectManager.cs
+++ b/KinectConnection/KinectManager.cs
@@ -12,6 +12,8 @@ namespace KinectConnection
         private bool status;
         private string statusText;
 
+        public KinectSensor KinectSensor {  get { return kinectSensor; } }
+
         /// <summary>
         /// Initializes a new instance of the KinectManager class.
         /// </summary>
diff --git a/KinectConnection/KinectStream.cs b/KinectConnection/KinectStream.cs
index 1f258a9..a9a3686 100644
--- a/KinectConnection/KinectStream.cs
+++ b/KinectConnection/KinectStream.cs
@@ -1,11 +1,12 @@
-using Microsoft.Kinect;
+using CommunityToolkit.Mvvm.ComponentModel;
+using Microsoft.Kinect;
 
 namespace KinectConnection
 {
     /// <summary>
     /// Abstract class for Kinect streams.
     /// </summary>
-    public abstract class KinectStream
+    public abstract class KinectStream : ObservableObject
     {
         // Redondant d'avoir KinectSensor et KinectManager ici ? (car sensor dans manager)
         protected KinectSensor KinectSensor { get; set; }
@@ -14,5 +15,11 @@ namespace KinectConnection
         public abstract void Start();
 
         public abstract void Stop();
+
+        public KinectStream()
+        {
+            KinectSensor = KinectSensor.GetDefault();
+            KinectManager = new KinectManager();
+        }
     }
 }
diff --git a/KinectSensorStreams/View/MainWindow.xaml b/KinectSensorStreams/View/MainWindow.xaml
index a29acfd..a3b2c31 100644
--- a/KinectSensorStreams/View/MainWindow.xaml
+++ b/KinectSensorStreams/View/MainWindow.xaml
@@ -16,9 +16,9 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="auto"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="10"/>
             <RowDefinition Height="auto"/>
-            <RowDefinition Height="*"/>
+            <RowDefinition Height="10"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
@@ -59,7 +59,8 @@
             <Button Content="Color"
                     Width="100"
                     Height="30"
-                    Grid.Column="1">
+                    Grid.Column="1"
+                    Command="{Binding ColorCommand}">
                 <Button.Resources>
                     <Style TargetType="Border">
                         <Setter Property="CornerRadius" Value="5"/>
@@ -107,5 +108,11 @@
                 </Button.Resources>
             </Button>
         </Grid>
+
+        <Grid Grid.Row="4">
+            <Viewbox Grid.Row="1" HorizontalAlignment="Center">
+                <Image Source="{Binding ColorImageStream.Bitmap}"/>
+            </Viewbox>
+        </Grid>
     </Grid>
 </Window>
diff --git a/KinectSensorStreams/ViewModel/MainWindowVM.cs b/KinectSensorStreams/ViewModel/MainWindowVM.cs
index 60f41c3..41cbfcd 100644
--- a/KinectSensorStreams/ViewModel/MainWindowVM.cs
+++ b/KinectSensorStreams/ViewModel/MainWindowVM.cs
@@ -13,11 +13,15 @@ namespace KinectSensorStreams.ViewModel
         /// </summary>
         public ICommand StartCommand { get; set; }
 
+        public ICommand ColorCommand { get; set; }
+
         /// <summary>
         /// Propriété liée à l'objet KinectManager
         /// </summary>
         public KinectManager KinectManager { get; set; }
 
+        public ColorImageStream ColorImageStream { get; set; }
+
         #endregion
 
         #region Constructor 
@@ -28,7 +32,9 @@ namespace KinectSensorStreams.ViewModel
         public MainWindowVM()
         {
             KinectManager = new KinectManager();
+            ColorImageStream = new ColorImageStream();
             StartCommand = new RelayCommand(Start);
+            ColorCommand = new RelayCommand(Color);
             // [Question] : StartCommand ici peut être mieux que BeginInit() dans MainWindow.xaml.cs ?
         }
 
@@ -44,6 +50,11 @@ namespace KinectSensorStreams.ViewModel
             KinectManager.StartSensor();
         }
 
+        private void Color()
+        {
+            ColorImageStream.Start();
+        }
+
         #endregion
     }
 }