Bug Fixes & Dependency Updates

BiologyTools · Aug 17, 2023 · 2084506 · 2084506
1 parent 404662f
commit 2084506
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 27 deletions.
diff --git a/BioGTK.csproj b/BioGTK.csproj
@@ -248,6 +248,7 @@
     <None Include="F:\Shared\Bio\BioGTK\BioGTK\.editorconfig" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="AForgeBio" Version="1.4.2" />
     <PackageReference Include="BioFormats.NET6" Version="7.0.0" />
     <PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.649" />
     <PackageReference Include="CS-Script" Version="4.8.1" />
@@ -257,12 +258,13 @@
     <PackageReference Include="MathNet.Numerics" Version="5.0.0" />
     <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.15.1" />
     <PackageReference Include="NetVips" Version="2.3.1" />
-    <PackageReference Include="NetVips.Native" Version="8.14.3" />
-    <PackageReference Include="NetVips.Native.linux-arm64" Version="8.14.3" />
-    <PackageReference Include="NetVips.Native.linux-x64" Version="8.14.3" />
-    <PackageReference Include="NetVips.Native.osx-arm64" Version="8.14.3" />
-    <PackageReference Include="NetVips.Native.osx-x64" Version="8.14.3" />
-    <PackageReference Include="NetVips.Native.win-x64" Version="8.14.3" />
+    <PackageReference Include="NetVips.Native" Version="8.14.4" />
+    <PackageReference Include="NetVips.Native.linux-arm64" Version="8.14.4" />
+    <PackageReference Include="NetVips.Native.linux-x64" Version="8.14.4" />
+    <PackageReference Include="NetVips.Native.osx-arm64" Version="8.14.4" />
+    <PackageReference Include="NetVips.Native.osx-x64" Version="8.14.4" />
+    <PackageReference Include="NetVips.Native.win-arm64" Version="8.14.4" />
+    <PackageReference Include="NetVips.Native.win-x64" Version="8.14.4" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="NuGet.Build.Tasks.Pack" Version="6.7.0">
       <PrivateAssets>all</PrivateAssets>
@@ -285,10 +287,6 @@
     <EditorConfigFiles Remove="F:\Shared\Bio\BioGTK\BioGTK\.editorconfig" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\AForgeBio\AForgeBio\AForgeBio\AForgeBio.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <Reference Include="bioformats_package">
       <HintPath>bioformats_package.dll</HintPath>

diff --git a/BioGTK.sln b/BioGTK.sln
@@ -0,0 +1,65 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.4.33403.182
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BioGTK", "BioGTK.csproj", "{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AForgeBio", "..\..\..\Shared\AForgeBio\AForgeBio\AForgeBio\AForgeBio.csproj", "{29DD258B-5D44-4876-AAFB-9A3CB124810A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BioGTKApp", "..\..\BioGTKApp\BioGTKApp.csproj", "{6A6A7589-4EF0-48E7-9BA2-859817E450EC}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|ARM64 = Debug|ARM64
+		Debug|x64 = Debug|x64
+		Release|Any CPU = Release|Any CPU
+		Release|ARM64 = Release|ARM64
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Debug|ARM64.Build.0 = Debug|ARM64
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Debug|x64.ActiveCfg = Debug|x64
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Debug|x64.Build.0 = Debug|x64
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Release|ARM64.Build.0 = Release|ARM64
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Release|x64.ActiveCfg = Release|x64
+		{6D79563D-FFA4-4FFA-BCE7-320B0D3A968C}.Release|x64.Build.0 = Release|x64
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Debug|ARM64.Build.0 = Debug|ARM64
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Debug|x64.ActiveCfg = Debug|x64
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Debug|x64.Build.0 = Debug|x64
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Release|ARM64.ActiveCfg = Release|ARM64
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Release|ARM64.Build.0 = Release|ARM64
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Release|x64.ActiveCfg = Release|x64
+		{29DD258B-5D44-4876-AAFB-9A3CB124810A}.Release|x64.Build.0 = Release|x64
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Debug|ARM64.Build.0 = Debug|ARM64
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Debug|x64.ActiveCfg = Debug|x64
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Debug|x64.Build.0 = Debug|x64
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Release|ARM64.ActiveCfg = Release|ARM64
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Release|ARM64.Build.0 = Release|ARM64
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Release|x64.ActiveCfg = Release|x64
+		{6A6A7589-4EF0-48E7-9BA2-859817E450EC}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {98044411-50A3-4E9B-A573-579AE7410907}
+	EndGlobalSection
+EndGlobal
diff --git a/Graphics/Graphics.cs b/Graphics/Graphics.cs
@@ -178,22 +178,10 @@ public void FillRectangle(RectangleF r, ColorS col)
         /// @param Rectangle The rectangle to draw
         public void DrawRectangle(Rectangle r)
         {
-            for (int x = r.X; x < r.Width + r.X; x++)
-            {
-                for (int i = 0; i < pen.width; i++)
-                {
-                    buf.SetPixel(x + i, r.Y, pen.color);
-                    buf.SetPixel(x + i, r.Y + r.Height, pen.color);
-                }
-            }
-            for (int y = r.Y; y < r.Height + r.Y; y++)
-            {
-                for (int i = 0; i < pen.width; i++)
-                {
-                    buf.SetPixel(r.X, y + i, pen.color);
-                    buf.SetPixel(r.X + r.Width, y + i, pen.color);
-                }
-            }
+            DrawLine(new PointF(r.X, r.Y), new PointF(r.X + r.Width, r.Y));
+            DrawLine(new PointF(r.X + r.Width, r.Y), new PointF(r.X + r.Width, r.Y + r.Height));
+            DrawLine(new PointF(r.X, r.Y), new PointF(r.X, r.Y + r.Height));
+            DrawLine(new PointF(r.X, r.Y + r.Height), new PointF(r.X + r.Width, r.Y + r.Height));
         }
         /// "Draw a rectangle with the top left corner at (x,y) and the bottom right corner at
         /// (x+width,y+height)."

diff --git a/Source/Bio.cs b/Source/Bio.cs
@@ -2598,7 +2598,6 @@ public void To48Bit()
                     for (int i = 0; i < Buffers.Count; i++)
                     {
                         Buffers[i].Image = AForge.Imaging.Image.Convert8bppTo16bpp(Buffers[i]);
-                        Buffers[i].SwitchRedBlue();
                     }
                 }
                 List<Bitmap> bfs = new List<Bitmap>();