Skip to content

Commit

Permalink
Bug fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@BiologyTools
BiologyTools committed Dec 12, 2022
1 parent 7d53c8c commit 5490a09
Show file tree
Hide file tree
Showing 7 changed files with 36 additions and 24 deletions.
10 changes: 5 additions & 5 deletions BioCore.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 17.1.32210.238
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BioCore", "BioCore\BioCore.csproj", "{9A5177C9-401B-44C3-8F2E-D4327A25DDCC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NugetTest", "..\..\NugetTest\NugetTest\NugetTest\NugetTest.csproj", "{038FFD81-A452-4F9F-9BB9-56740B871589}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BioCoreApp", "..\BioCoreApp\BioCoreApp\BioCoreApp.csproj", "{BCD01681-CD22-44E6-AAFA-ED2A857F70E9}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -17,10 +17,10 @@ Global
{9A5177C9-401B-44C3-8F2E-D4327A25DDCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A5177C9-401B-44C3-8F2E-D4327A25DDCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9A5177C9-401B-44C3-8F2E-D4327A25DDCC}.Release|Any CPU.Build.0 = Release|Any CPU
{038FFD81-A452-4F9F-9BB9-56740B871589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{038FFD81-A452-4F9F-9BB9-56740B871589}.Debug|Any CPU.Build.0 = Debug|Any CPU
{038FFD81-A452-4F9F-9BB9-56740B871589}.Release|Any CPU.ActiveCfg = Release|Any CPU
{038FFD81-A452-4F9F-9BB9-56740B871589}.Release|Any CPU.Build.0 = Release|Any CPU
{BCD01681-CD22-44E6-AAFA-ED2A857F70E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BCD01681-CD22-44E6-AAFA-ED2A857F70E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BCD01681-CD22-44E6-AAFA-ED2A857F70E9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BCD01681-CD22-44E6-AAFA-ED2A857F70E9}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
24 changes: 13 additions & 11 deletions BioCore/BioCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,24 @@
<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<Version>2.7.6</Version>
<Version>2.7.8.1</Version>
<UseWindowsForms>true</UseWindowsForms>
<ImplicitUsings>enable</ImplicitUsings>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<ApplicationIcon>Bio.ico</ApplicationIcon>
<Authors>ErikRepo</Authors>
<PackageIcon>banner.jpg</PackageIcon>
<PackageProjectUrl>https://github.com/BiologyTools/BioNETCore</PackageProjectUrl>
<PackageProjectUrl>https://github.com/BiologyTools/BioCore</PackageProjectUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageTags>biology; bio-formats; microscopy; imagej; whole-slide-image;</PackageTags>
<RepositoryUrl>https://github.com/BiologyTools/BioNETCore</RepositoryUrl>
<RepositoryUrl>https://github.com/BiologyTools/BioCore</RepositoryUrl>
<Copyright>GNU GPL-3.0</Copyright>
<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
<Title>BioCore</Title>
<AnalysisLevel>6.0-recommended</AnalysisLevel>
<PackageId></PackageId>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
Expand All @@ -38,18 +41,24 @@
</ItemGroup>

<ItemGroup>
<None Remove="banner.jpg" />
<None Remove="Source\avr5q1sl.vlz~" />
</ItemGroup>

<ItemGroup>
<Content Include="banner.jpg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Bio.ico" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AForgeImagingCore" Version="2.2.5" />
<PackageReference Include="BioFormats.NET6" Version="1.0.0" />
<PackageReference Include="BitMiracle.LibTiff.NET" Version="2.4.649" />
<PackageReference Include="CS-Script" Version="4.4.6" />
<PackageReference Include="H.InputSimulator" Version="1.3.0" />
<PackageReference Include="IKVM" Version="8.3.3" />
<PackageReference Include="InputSimulator" Version="1.0.4" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="SharpDX" Version="4.2.0" />
<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" />
Expand Down Expand Up @@ -88,20 +97,13 @@
</ItemGroup>

<ItemGroup>
<None Include="..\..\..\Bio\banner.jpg">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<None Include="..\README.md">
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<Reference Include="AForgeCore">
<HintPath>..\..\..\AForgeCore\AForgeCore\bin\Release\net6.0-windows\AForgeCore.dll</HintPath>
</Reference>
<Reference Include="bioformats_package">
<HintPath>..\..\..\BioFormats\bioformats_package.dll</HintPath>
</Reference>
Expand Down
1 change: 0 additions & 1 deletion BioCore/BioNETCore
Submodule BioNETCore deleted from 45cc52
20 changes: 16 additions & 4 deletions BioCore/Source/Bio.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4610,7 +4610,12 @@ public Channel BChannel
get
{
if (Channels[0].range.Length == 1)
return Channels[rgbChannels[2]];
{
if (Channels.Count < 3)
return GChannel;
else
return Channels[rgbChannels[2]];
}
else
return Channels[0];
}
Expand Down Expand Up @@ -5217,10 +5222,17 @@ public void To48Bit()
for (int i = 0; i < Buffers.Count; i += Channels.Count)
{
BufferInfo[] bs = new BufferInfo[3];
bs[0] = new BufferInfo(ID, SizeX, SizeY, Buffers[i].PixelFormat, Buffers[i].Bytes, new ZCT(Buffers[i].Coordinate.Z, 0, Buffers[i].Coordinate.T), i, Buffers[i].Plane);
bs[1] = new BufferInfo(ID, SizeX, SizeY, Buffers[i + 1].PixelFormat, Buffers[i + 1].Bytes, new ZCT(Buffers[i + 1].Coordinate.Z, 0, Buffers[i + 1].Coordinate.T), i + 1, Buffers[i + 1].Plane);
if (Channels.Count > 2)
bs[2] = new BufferInfo(ID, SizeX, SizeY, Buffers[i+2].PixelFormat, Buffers[i + 2].Bytes, new ZCT(Buffers[i + 2].Coordinate.Z, 0, Buffers[i + 2].Coordinate.T), i + 2, Buffers[i + 2].Plane);
{
bs[2] = new BufferInfo(ID, SizeX, SizeY, Buffers[i].PixelFormat, Buffers[i].Bytes, new ZCT(Buffers[i].Coordinate.Z, 0, Buffers[i].Coordinate.T), i, Buffers[i].Plane);
bs[1] = new BufferInfo(ID, SizeX, SizeY, Buffers[i + 1].PixelFormat, Buffers[i + 1].Bytes, new ZCT(Buffers[i + 1].Coordinate.Z, 0, Buffers[i + 1].Coordinate.T), i + 1, Buffers[i + 1].Plane);
bs[0] = new BufferInfo(ID, SizeX, SizeY, Buffers[i + 2].PixelFormat, Buffers[i + 2].Bytes, new ZCT(Buffers[i + 2].Coordinate.Z, 0, Buffers[i + 2].Coordinate.T), i + 2, Buffers[i + 2].Plane);
}
else
{
bs[0] = new BufferInfo(ID, SizeX, SizeY, Buffers[i].PixelFormat, Buffers[i].Bytes, new ZCT(Buffers[i].Coordinate.Z, 0, Buffers[i].Coordinate.T), i, Buffers[i].Plane);
bs[1] = new BufferInfo(ID, SizeX, SizeY, Buffers[i + 1].PixelFormat, Buffers[i + 1].Bytes, new ZCT(Buffers[i + 1].Coordinate.Z, 0, Buffers[i + 1].Coordinate.T), i + 1, Buffers[i + 1].Plane);
}
BufferInfo bbs = BufferInfo.RGB16To48(bs);
for (int b = 0; b < 3; b++)
{
Expand Down
1 change: 0 additions & 1 deletion BioCore/Source/FunctionForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using WindowsInput;
using WindowsInput.Native;
using System.IO;
using Newtonsoft.Json;

Expand Down
Binary file added BioCore/banner.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

A .NET6 version of Bio library. The difference being no Windows GUI Automation functions. Bio is a application & library for editing & annotating various microscopy image formats. Supports all bioformats supported images. Integrates with ImageJ, running ImageJ filters & macro functions. Download the [nuget package](https://www.nuget.org/packages/BioCore/2.7.7.2) for easy usage. Also check out the wiki for [library usage.](https://github.com/BiologyTools/Bio/wiki/Library-Usage) or check out the [documentation.](https://biologytools.github.io/)

[![NuGet version (BioCore)](https://img.shields.io/nuget/v/BioCore.svg?style=flat-square)](https://www.nuget.org/packages/BioCore/2.7.7.2)
[![NuGet version (BioCore)](https://img.shields.io/nuget/dt/BioCore?color=g)](https://www.nuget.org/packages/BioCore/2.7.7.2)
[![NuGet version (BioCore)](https://img.shields.io/nuget/v/BioCore.svg?style=flat-square)](https://www.nuget.org/packages/BioCore/2.7.8.1)
[![NuGet version (BioCore)](https://img.shields.io/nuget/dt/BioCore?color=g)](https://www.nuget.org/packages/BioCore/2.7.8.1)
## Features

- C# scripting with sample tool-script and other sample scripts in "/Scripts/" folder. [See samples](https://github.com/BioMicroscopy/BioImage-Scripts)
Expand Down

0 comments on commit 5490a09

Please sign in to comment.