Merge branch 'master' into Merge

saddam213 · saddam213 · commit e1a07cb9bea5 · 2025-11-06T14:47:50.000+13:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>0.1.33</Version>
+    <Version>0.1.37</Version>
     <Company>TensorStack</Company>
     <Copyright>TensorStack - 2025</Copyright>
     <RepositoryUrl>https://github.com/TensorStack-AI/TensorStack</RepositoryUrl>
diff --git a/Examples/TensorStack.Example.Extractors/Views/ImageExtractorView.xaml b/Examples/TensorStack.Example.Extractors/Views/ImageExtractorView.xaml
@@ -165,7 +165,7 @@
                         <Grid Margin="20" >
                             <CommonControls:ImageElement 
                                 SplitterVisibility="Auto"
-                                SplitterPosition="Source"
+                                SplitterPosition="Center"
                                 SplitterDirection="LeftToRight"
                                 Progress="{Binding Progress}"
                                 Source="{Binding ResultImage, Mode=TwoWay}" 
diff --git a/TensorStack.Extractors/TensorStack.Extractors.csproj b/TensorStack.Extractors/TensorStack.Extractors.csproj
@@ -7,15 +7,20 @@
   </PropertyGroup>
 
   <!--Projects-->
-  <ItemGroup Condition=" '$(Configuration)' == 'Debug'">
+  <ItemGroup Condition="'$(Configuration)' == 'Debug'">
     <ProjectReference Include="..\TensorStack.Common\TensorStack.Common.csproj" />
   </ItemGroup>
 
   <!--Packages-->
-  <ItemGroup Condition=" '$(Configuration)' == 'Release'">
+  <ItemGroup Condition="'$(Configuration)' == 'Release'">
     <PackageReference Include="TensorStack.Common" Version="$(Version)" />
   </ItemGroup>
 
+  <!--Common Packages-->
+  <ItemGroup>
+    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
+  </ItemGroup>
+
   <!--Nuget Settings-->
   <PropertyGroup>
     <Title>$(AssemblyName)</Title>
@@ -39,8 +44,5 @@
       <PackagePath>\</PackagePath>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="2.1.7" />
-  </ItemGroup>
 
 </Project>
diff --git a/TensorStack.WPF/Controls/ImageElement.xaml.cs b/TensorStack.WPF/Controls/ImageElement.xaml.cs
@@ -95,19 +95,19 @@ protected override async Task OnValueChanged()
                 {
                     GridSplitterColumn.Width = SplitterDirection == SplitterDirection.LeftToRight
                         ? new GridLength(0)
-                        : new GridLength(OverlaySource.Width + 45);
+                        : new GridLength(GridSplitterContainer.ActualWidth + 45);
                 }
                 else if (SplitterPosition == SplitterPosition.Center)
                 {
                     GridSplitterColumn.Width = new GridLength(0);
                     await Task.Delay(10);
-                    GridSplitterColumn.Width = new GridLength(OverlaySource.Width / 2 + 30);
+                    GridSplitterColumn.Width = new GridLength(GridSplitterContainer.ActualWidth / 2);
                 }
                 else if (SplitterPosition == SplitterPosition.Overlay)
                 {
                     GridSplitterColumn.Width = SplitterDirection == SplitterDirection.RightToLeft
                         ? new GridLength(0)
-                        : new GridLength(OverlaySource.Width + 45);
+                        : new GridLength(GridSplitterContainer.ActualWidth + 45);
                 }
             }
         }
@@ -364,6 +364,20 @@ private void SplitterControl_PreviewMouseUp(object sender, MouseButtonEventArgs
         {
             SplitterControl.ReleaseMouseCapture();
         }
+
+
+        /// <summary>
+        /// Load image as an image from file
+        /// </summary>
+        /// <param name="initialFilename">The initial filename.</param>
+        /// <param name="initialImage">The initial image.</param>
+        protected override Task<ImageInput> LoadImageAsync(string initialFilename = null, BitmapSource initialImage = null)
+        {
+            var newImage = base.LoadImageAsync(initialFilename, initialImage);
+            if (newImage != null)
+                OverlaySource = default;
+            return newImage;
+        }
     }
 
     public enum SplitterPosition
diff --git a/TensorStack.WPF/Controls/VideoElement.xaml.cs b/TensorStack.WPF/Controls/VideoElement.xaml.cs
@@ -241,18 +241,18 @@ private async Task OnValueChanged()
                 {
                     GridSplitterColumn.Width = SplitterDirection == SplitterDirection.LeftToRight
                         ? new GridLength(0)
-                        : new GridLength(OverlaySource.Width + 45);
+                        : new GridLength(GridSplitterContainer.ActualWidth + 45);
                 }
                 else if (SplitterPosition == SplitterPosition.Center)
                 {
                     GridSplitterColumn.Width = new GridLength(0);
-                    GridSplitterColumn.Width = new GridLength(OverlaySource.Width / 2 + 30);
+                    GridSplitterColumn.Width = new GridLength(GridSplitterContainer.ActualWidth / 2);
                 }
                 else if (SplitterPosition == SplitterPosition.Overlay)
                 {
                     GridSplitterColumn.Width = SplitterDirection == SplitterDirection.RightToLeft
                         ? new GridLength(0)
-                        : new GridLength(OverlaySource.Width + 45);
+                        : new GridLength(GridSplitterContainer.ActualWidth + 45);
                 }
             }
         }
diff --git a/TensorStack.WPF/Controls/VideoStreamElement.xaml.cs b/TensorStack.WPF/Controls/VideoStreamElement.xaml.cs
@@ -222,18 +222,18 @@ private Task OnValueChanged()
                 {
                     GridSplitterColumn.Width = SplitterDirection == SplitterDirection.LeftToRight
                         ? new GridLength(0)
-                        : new GridLength(VideoControl.ActualWidth);
+                        : new GridLength(GridSplitterContainer.ActualWidth);
                 }
                 else if (SplitterPosition == SplitterPosition.Center)
                 {
                     GridSplitterColumn.Width = new GridLength(0);
-                    GridSplitterColumn.Width = new GridLength(VideoControl.Width / 2);
+                    GridSplitterColumn.Width = new GridLength(GridSplitterContainer.ActualWidth / 2);
                 }
                 else if (SplitterPosition == SplitterPosition.Overlay)
                 {
                     GridSplitterColumn.Width = SplitterDirection == SplitterDirection.RightToLeft
                         ? new GridLength(0)
-                        : new GridLength(VideoControl.ActualWidth);
+                        : new GridLength(GridSplitterContainer.ActualWidth);
                 }
             }
             return Task.CompletedTask;
diff --git a/TensorStack.WPF/Dialogs/CropImageDialog.xaml.cs b/TensorStack.WPF/Dialogs/CropImageDialog.xaml.cs
@@ -269,7 +269,7 @@ private WriteableBitmap CropAndResizeImage()
                 var scaleTransform = new ScaleTransform(scaleX, scaleY);
                 return new WriteableBitmap(new TransformedBitmap(croppedBitmap, scaleTransform));
             }
-            catch (Exception ex)
+            catch (Exception)
             {
                 DialogResult = false;
                 return null;
diff --git a/TensorStack.WPF/TensorStack.WPF.csproj b/TensorStack.WPF/TensorStack.WPF.csproj
@@ -86,7 +86,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ColorPicker.dll">
+    <Content Include="ColorPicker.dll" PackagePath="lib\$(TargetFramework)">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <PackageCopyToOutput>true</PackageCopyToOutput>
       <Pack>true</Pack>

Original file line number	Diff line number	Diff line change
`@@ -95,19 +95,19 @@ protected override async Task OnValueChanged()`
`95`	`95`	`{`
`96`	`96`	`GridSplitterColumn.Width = SplitterDirection == SplitterDirection.LeftToRight`
`97`	`97`	`? new GridLength(0)`
`98`		`- : new GridLength(OverlaySource.Width + 45);`
	`98`	`+ : new GridLength(GridSplitterContainer.ActualWidth + 45);`
`99`	`99`	`}`
`100`	`100`	`else if (SplitterPosition == SplitterPosition.Center)`
`101`	`101`	`{`
`102`	`102`	`GridSplitterColumn.Width = new GridLength(0);`
`103`	`103`	`await Task.Delay(10);`
`104`		`- GridSplitterColumn.Width = new GridLength(OverlaySource.Width / 2 + 30);`
	`104`	`+ GridSplitterColumn.Width = new GridLength(GridSplitterContainer.ActualWidth / 2);`
`105`	`105`	`}`
`106`	`106`	`else if (SplitterPosition == SplitterPosition.Overlay)`
`107`	`107`	`{`
`108`	`108`	`GridSplitterColumn.Width = SplitterDirection == SplitterDirection.RightToLeft`
`109`	`109`	`? new GridLength(0)`
`110`		`- : new GridLength(OverlaySource.Width + 45);`
	`110`	`+ : new GridLength(GridSplitterContainer.ActualWidth + 45);`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`}`
`@@ -364,6 +364,20 @@ private void SplitterControl_PreviewMouseUp(object sender, MouseButtonEventArgs`
`364`	`364`	`{`
`365`	`365`	`SplitterControl.ReleaseMouseCapture();`
`366`	`366`	`}`
	`367`	`+`
	`368`	`+`
	`369`	`+ /// <summary>`
	`370`	`+ /// Load image as an image from file`
	`371`	`+ /// </summary>`
	`372`	`+ /// <param name="initialFilename">The initial filename.</param>`
	`373`	`+ /// <param name="initialImage">The initial image.</param>`
	`374`	`+ protected override Task<ImageInput> LoadImageAsync(string initialFilename = null, BitmapSource initialImage = null)`
	`375`	`+ {`
	`376`	`+ var newImage = base.LoadImageAsync(initialFilename, initialImage);`
	`377`	`+ if (newImage != null)`
	`378`	`+ OverlaySource = default;`
	`379`	`+ return newImage;`
	`380`	`+ }`
`367`	`381`	`}`
`368`	`382`
`369`	`383`	`public enum SplitterPosition`
Original file line number	Diff line number	Diff line change
`@@ -241,18 +241,18 @@ private async Task OnValueChanged()`
`241`	`241`	`{`
`242`	`242`	`GridSplitterColumn.Width = SplitterDirection == SplitterDirection.LeftToRight`
`243`	`243`	`? new GridLength(0)`
`244`		`- : new GridLength(OverlaySource.Width + 45);`
	`244`	`+ : new GridLength(GridSplitterContainer.ActualWidth + 45);`
`245`	`245`	`}`
`246`	`246`	`else if (SplitterPosition == SplitterPosition.Center)`
`247`	`247`	`{`
`248`	`248`	`GridSplitterColumn.Width = new GridLength(0);`
`249`		`- GridSplitterColumn.Width = new GridLength(OverlaySource.Width / 2 + 30);`
	`249`	`+ GridSplitterColumn.Width = new GridLength(GridSplitterContainer.ActualWidth / 2);`
`250`	`250`	`}`
`251`	`251`	`else if (SplitterPosition == SplitterPosition.Overlay)`
`252`	`252`	`{`
`253`	`253`	`GridSplitterColumn.Width = SplitterDirection == SplitterDirection.RightToLeft`
`254`	`254`	`? new GridLength(0)`
`255`		`- : new GridLength(OverlaySource.Width + 45);`
	`255`	`+ : new GridLength(GridSplitterContainer.ActualWidth + 45);`
`256`	`256`	`}`
`257`	`257`	`}`
`258`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -222,18 +222,18 @@ private Task OnValueChanged()`
`222`	`222`	`{`
`223`	`223`	`GridSplitterColumn.Width = SplitterDirection == SplitterDirection.LeftToRight`
`224`	`224`	`? new GridLength(0)`
`225`		`- : new GridLength(VideoControl.ActualWidth);`
	`225`	`+ : new GridLength(GridSplitterContainer.ActualWidth);`
`226`	`226`	`}`
`227`	`227`	`else if (SplitterPosition == SplitterPosition.Center)`
`228`	`228`	`{`
`229`	`229`	`GridSplitterColumn.Width = new GridLength(0);`
`230`		`- GridSplitterColumn.Width = new GridLength(VideoControl.Width / 2);`
	`230`	`+ GridSplitterColumn.Width = new GridLength(GridSplitterContainer.ActualWidth / 2);`
`231`	`231`	`}`
`232`	`232`	`else if (SplitterPosition == SplitterPosition.Overlay)`
`233`	`233`	`{`
`234`	`234`	`GridSplitterColumn.Width = SplitterDirection == SplitterDirection.RightToLeft`
`235`	`235`	`? new GridLength(0)`
`236`		`- : new GridLength(VideoControl.ActualWidth);`
	`236`	`+ : new GridLength(GridSplitterContainer.ActualWidth);`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`	`return Task.CompletedTask;`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@ private WriteableBitmap CropAndResizeImage()`
`269`	`269`	`var scaleTransform = new ScaleTransform(scaleX, scaleY);`
`270`	`270`	`return new WriteableBitmap(new TransformedBitmap(croppedBitmap, scaleTransform));`
`271`	`271`	`}`
`272`		`- catch (Exception ex)`
	`272`	`+ catch (Exception)`
`273`	`273`	`{`
`274`	`274`	`DialogResult = false;`
`275`	`275`	`return null;`