diff --git a/VECTO/VECTO.vbproj b/VECTO/VECTO.vbproj index e074e14c989598d807ea16631322588589303f5c..eef56be592e44a6d989da543fc31cd6f1927143f 100644 --- a/VECTO/VECTO.vbproj +++ b/VECTO/VECTO.vbproj @@ -25,27 +25,23 @@ </PackageReference> </ItemGroup> - - <ItemGroup Condition="'$(TargetFramework)'=='net45'"> - <Reference Include="Microsoft.Build.Framework" /> + <ItemGroup Condition="'$(TargetFramework)' == 'net45'"> <Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.Windows.Forms.DataVisualization" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)'=='net48'"> - <Reference Include="Microsoft.Build.Framework" /> + <ItemGroup Condition="'$(TargetFramework)' == 'net48'"> <Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.Windows.Forms.DataVisualization" /> </ItemGroup> - <ItemGroup Condition="'$(TargetFramework)'=='net5.0-windows'"> - <PackageReference Include="System.Drawing.Common" Version="6.0.0" /> - <Reference Include="System.Windows.Forms" NoWarn="NU1701"> - <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Windows.Forms.dll</HintPath> - </Reference> - <Reference Include="System.Windows.Forms.DataVisualization"> - <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Windows.Forms.DataVisualization.dll</HintPath> - </Reference> + <ItemGroup Condition="'$(TargetFramework)' == 'net5.0-windows'"> + <PackageReference Include="System.Data.SqlClient"> + <Version>4.8.3</Version> + </PackageReference> + <PackageReference Include="System.Windows.Forms.DataVisualization"> + <Version>1.0.0-prerelease.20110.1</Version> + </PackageReference> </ItemGroup> <ItemGroup> @@ -53,8 +49,6 @@ <ProjectReference Include="..\VectoCore\VectoCore\VectoCore.csproj" /> </ItemGroup> - - <ItemGroup> <Import Include="Microsoft.VisualBasic" /> <Import Include="System" /> @@ -112,4 +106,6 @@ <EmbeddedResource Update="Resources\6x2tt.png" /> <EmbeddedResource Update="Resources\Undef.png" /> </ItemGroup> + + </Project> \ No newline at end of file diff --git a/VectoCore/VectoCore/Utils/DelaunayMap.cs b/VectoCore/VectoCore/Utils/DelaunayMap.cs index bd42c4ab5d56015f29063753d7b4d728f7d91093..26a6c09dc6ab3c1222c15c2beb3cbf3aed68cb05 100644 --- a/VectoCore/VectoCore/Utils/DelaunayMap.cs +++ b/VectoCore/VectoCore/Utils/DelaunayMap.cs @@ -178,11 +178,13 @@ namespace TUGraz.VectoCore.Utils private static void DrawGraph(int i, IEnumerable<Triangle> triangles, Triangle superTriangle, Point[] points, Point lastPoint = null) { +#if !NET5_0_OR_GREATER var xmin = Math.Min(points.Min(p => p.X), lastPoint?.X ?? double.NaN); var xmax = Math.Max(points.Max(p => p.X), lastPoint?.X ?? double.NaN); var ymin = Math.Min(points.Min(p => p.Y), lastPoint?.Y ?? double.NaN); var ymax = Math.Max(points.Max(p => p.Y), lastPoint?.Y ?? double.NaN); + using (var chart = new Chart { Width = 1000, Height = 1000 }) { chart.ChartAreas.Add(new ChartArea("main") { AxisX = new Axis { Minimum = Math.Min(xmin, xmin), Maximum = Math.Max(xmax, xmax) }, @@ -225,6 +227,7 @@ namespace TUGraz.VectoCore.Utils chart.SaveImage($"delaunay\\{type}_{methodName}_{superTriangle.GetHashCode()}_{i}.png", ChartImageFormat.Png); } +#endif } [MethodImpl(MethodImplOptions.AggressiveInlining)] diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj index 819ecfad0b5e5820b5d619b13e1b5501bfc7eb93..b97b7fe1771a852229c7f37227d197eb7419eee8 100644 --- a/VectoCore/VectoCore/VectoCore.csproj +++ b/VectoCore/VectoCore/VectoCore.csproj @@ -29,13 +29,9 @@ </ItemGroup> <ItemGroup Condition="'$(TargetFramework)'=='net5.0'"> - <PackageReference Include="System.Drawing.Common" Version="6.0.0" /> - <Reference Include="System.Windows.Forms"> - <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Windows.Forms.dll</HintPath> - </Reference> - <Reference Include="System.Windows.Forms.DataVisualization"> - <HintPath>C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Windows.Forms.DataVisualization.dll</HintPath> - </Reference> + <PackageReference Include="System.Windows.Forms.DataVisualization"> + <Version>1.0.0-prerelease.20110.1</Version> + </PackageReference> </ItemGroup>