ok
264d3af0d28f29e542d236d65cc49c5857df72bc
15 files changed
Properties/PublishProfiles/FolderProfile.pubxmlProperties/PublishProfiles/FolderProfile.pubxml.userProperties/Resources.Designer.csProperties/Resources.resxProperties/Settings.Designer.csProperties/Settings.settingsREADME.mdZedGraph.csprojZedGraph.csproj.userZedGraph/CurveItem.csZedGraph/MasterPane.csZedGraph/PointPair.csZedGraph/PointPairBase.csZedGraph6Key.snkZedGraphKey.snk
diff --git a/Properties/PublishProfiles/FolderProfile.pubxml b/Properties/PublishProfiles/FolderProfile.pubxml
new file mode 100644
index 0000000..ad48f8b
--- /dev/null
+++ b/Properties/PublishProfiles/FolderProfile.pubxml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <Configuration>Release</Configuration>
+ <Platform>Any CPU</Platform>
+ <PublishDir>bin\Release\net8.0-windows\publish\</PublishDir>
+ <PublishProtocol>FileSystem</PublishProtocol>
+ <_TargetId>Folder</_TargetId>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Properties/PublishProfiles/FolderProfile.pubxml.user b/Properties/PublishProfiles/FolderProfile.pubxml.user
new file mode 100644
index 0000000..f9e996e
--- /dev/null
+++ b/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+ <PropertyGroup>
+ <History>True|2024-11-20T13:47:07.7390433Z||;True|2024-11-20T14:46:34.8011085+01:00||;True|2024-11-20T14:44:40.3713134+01:00||;True|2024-11-20T14:40:32.1449821+01:00||;</History>
+ <LastFailureDetails />
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
deleted file mode 100644
index 627693e..0000000
--- a/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ZedGraph.Properties {
- using System;
-
-
- /// <summary>
- /// A strongly-typed resource class, for looking up localized strings, etc.
- /// </summary>
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- internal class Resources {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources() {
- }
-
- /// <summary>
- /// Returns the cached ResourceManager instance used by this class.
- /// </summary>
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Resources.ResourceManager ResourceManager {
- get {
- if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ZedGraph.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- /// <summary>
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
- /// </summary>
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static global::System.Globalization.CultureInfo Culture {
- get {
- return resourceCulture;
- }
- set {
- resourceCulture = value;
- }
- }
- }
-}
diff --git a/Properties/Resources.resx b/Properties/Resources.resx
deleted file mode 100644
index 007a093..0000000
--- a/Properties/Resources.resx
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
- <data name="ZG6icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
- <value>..\ZG6icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
- </data>
-</root>
\ No newline at end of file
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
deleted file mode 100644
index 6a83531..0000000
--- a/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace ZedGraph.Properties {
-
-
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.8.0.0")]
- internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-
- private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-
- public static Settings Default {
- get {
- return defaultInstance;
- }
- }
- }
-}
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
deleted file mode 100644
index 049245f..0000000
--- a/Properties/Settings.settings
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
- <Profiles>
- <Profile Name="(Default)" />
- </Profiles>
-</SettingsFile>
diff --git a/README.md b/README.md
index 941bf14..eb1d51f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# ZedGraph6
+# ZedGraph
-*The charting library for .NET*
+*The charting library for .NET Core*
-created by John Champion, modified by Ingineer to include DynFilteredPointList and target .Net 6.
+created by John Champion, modified by Ingineer to include DynFilteredPointList and target .Net 8.
forked from https://sourceforge.net/projects/zedgraph/
@@ -10,5 +10,5 @@ ZedGraph is a class library, user control, and web control for .net, written in
## Download
-ZedGraph6 is available via NuGet:
-- [ZedGraph6](http://nuget.org/packages/ZedGraph6)
+ZedGraph is available via NuGet:
+- [ZedGraph](http://nuget.org/packages/ZedGraph)
diff --git a/ZedGraph.csproj b/ZedGraph.csproj
index d4a5275..d992d6b 100644
--- a/ZedGraph.csproj
+++ b/ZedGraph.csproj
@@ -1,64 +1,43 @@
<Project Sdk="Microsoft.NET.Sdk">
- <PropertyGroup>
- <TargetFramework>net6.0-windows</TargetFramework>
- <Nullable>enable</Nullable>
- <UseWindowsForms>true</UseWindowsForms>
- <ImplicitUsings>enable</ImplicitUsings>
- <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
- <AssemblyVersion>6.0.0.0</AssemblyVersion>
- <FileVersion>6.0.0.0</FileVersion>
- <SignAssembly>True</SignAssembly>
- <Title>ZedGraph6 Library</Title>
- <Description>ZedGraph6 is a fork of ZedGraph plus the DynFilteredPointList class. ZedGraph is a class library and user control for .Net, written in C#, for drawing 2D Line, Bar, and Pie Charts. It features full, detailed customization capabilities, but most options have defaults for ease of use.</Description>
- <Copyright>Copyright © 2003-2007 John Champion</Copyright>
- <RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
- <RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
- <EnableNETAnalyzers>False</EnableNETAnalyzers>
- <NeutralLanguage>en</NeutralLanguage>
- <Version>$(VersionPrefix)6.0.0</Version>
- <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
- <PackageProjectUrl>https://github.com/LimeyDev/ZedGraph</PackageProjectUrl>
- <Authors>John Champion and Ingineer.</Authors>
- <AssemblyName>ZedGraph6</AssemblyName>
- <AssemblyOriginatorKeyFile>ZedGraph6Key.snk</AssemblyOriginatorKeyFile>
- <PackageIcon>ZG6icon.png</PackageIcon>
- <PackageReadmeFile>README.md</PackageReadmeFile>
- </PropertyGroup>
+ <PropertyGroup>
+ <TargetFramework>net8.0-windows</TargetFramework>
+ <Nullable>disable</Nullable>
+ <UseWindowsForms>true</UseWindowsForms>
+ <ImplicitUsings>enable</ImplicitUsings>
+ <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
+ <AssemblyVersion>8.0.0.1</AssemblyVersion>
+ <FileVersion>8.0.0.1</FileVersion>
+ <SignAssembly>True</SignAssembly>
+ <Title>ZedGraph .NET Core Library</Title>
+ <Description>ZedGraph is a fork of ZedGraph plus the DynFilteredPointList class. ZedGraph is a class library and user control for .Net Core, written in C#, for drawing 2D Line, Bar, and Pie Charts. It features full, detailed customization capabilities, but most options have defaults for ease of use.</Description>
+ <Copyright>Copyright © 2003-2007 John Champion</Copyright>
+ <RunAnalyzersDuringLiveAnalysis>False</RunAnalyzersDuringLiveAnalysis>
+ <RunAnalyzersDuringBuild>False</RunAnalyzersDuringBuild>
+ <EnableNETAnalyzers>False</EnableNETAnalyzers>
+ <NeutralLanguage>en</NeutralLanguage>
+ <Version>$(VersionPrefix)0.0.1</Version>
+ <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
+ <PackageProjectUrl>https://github.com/alphons/ZedGraph</PackageProjectUrl>
+ <Authors>John Champion,Ingineer and Alphons van der Heijden.</Authors>
+ <AssemblyName>ZedGraph8</AssemblyName>
+ <AssemblyOriginatorKeyFile>ZedGraphKey.snk</AssemblyOriginatorKeyFile>
+ <PackageReadmeFile>README.md</PackageReadmeFile>
+ </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
- <DebugType>embedded</DebugType>
- </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+ <DebugType>embedded</DebugType>
+ </PropertyGroup>
- <ItemGroup>
- <Resource Include="ZG6icon.png" />
- </ItemGroup>
-
- <ItemGroup>
- <Compile Update="Properties\Settings.Designer.cs">
- <DesignTimeSharedInput>True</DesignTimeSharedInput>
- <AutoGen>True</AutoGen>
- <DependentUpon>Settings.settings</DependentUpon>
- </Compile>
- </ItemGroup>
-
- <ItemGroup>
- <None Update="LICENSE.txt">
- <Pack>True</Pack>
- <PackagePath>\</PackagePath>
- </None>
- <None Update="Properties\Settings.settings">
- <Generator>SettingsSingleFileGenerator</Generator>
- <LastGenOutput>Settings.Designer.cs</LastGenOutput>
- </None>
- <None Update="README.md">
- <Pack>True</Pack>
- <PackagePath>\</PackagePath>
- </None>
- <None Update="ZG6icon.png">
- <Pack>True</Pack>
- <PackagePath>\</PackagePath>
- </None>
- </ItemGroup>
+ <ItemGroup>
+ <None Update="LICENSE.txt">
+ <Pack>True</Pack>
+ <PackagePath>\</PackagePath>
+ </None>
+ <None Update="README.md">
+ <Pack>True</Pack>
+ <PackagePath>\</PackagePath>
+ </None>
+ </ItemGroup>
</Project>
diff --git a/ZedGraph.csproj.user b/ZedGraph.csproj.user
new file mode 100644
index 0000000..61c4e16
--- /dev/null
+++ b/ZedGraph.csproj.user
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <_LastSelectedProfileId>C:\git\ZedGraph\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
+ </PropertyGroup>
+ <ItemGroup>
+ <Compile Update="ZedGraph\ZedGraphControl.ContextMenu.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="ZedGraph\ZedGraphControl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="ZedGraph\ZedGraphControl.Events.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="ZedGraph\ZedGraphControl.Printing.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="ZedGraph\ZedGraphControl.Properties.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="ZedGraph\ZedGraphControl.ScrollBars.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/ZedGraph/CurveItem.cs b/ZedGraph/CurveItem.cs
index 50789ee..fef8a2e 100644
--- a/ZedGraph/CurveItem.cs
+++ b/ZedGraph/CurveItem.cs
@@ -171,7 +171,7 @@ namespace ZedGraph
/// <param name="label">A string label (legend entry) for this curve</param>
/// <param name="points">A <see cref="IPointList"/> of double precision value pairs that define
/// the X and Y values for this curve</param>
- public CurveItem( string label, IPointList? points )
+ public CurveItem( string label, IPointList points )
{
Init( label );
@@ -1174,7 +1174,7 @@ namespace ZedGraph
/// <param name="l">Curve to the left.</param>
/// <param name="r">Curve to the right.</param>
/// <returns>-1, 0, or 1 depending on l.X's relation to r.X</returns>
- public int Compare( CurveItem? l, CurveItem? r )
+ public int Compare( CurveItem l, CurveItem r )
{
if (l == null && r == null )
return 0;
diff --git a/ZedGraph/MasterPane.cs b/ZedGraph/MasterPane.cs
index 6aca1fa..d5f7fcf 100644
--- a/ZedGraph/MasterPane.cs
+++ b/ZedGraph/MasterPane.cs
@@ -397,7 +397,7 @@ namespace ZedGraph
/// Respond to the callback when the MasterPane objects are fully initialized.
/// </summary>
/// <param name="sender"></param>
- public void OnDeserialization(object? sender)
+ public void OnDeserialization(object sender)
{
Bitmap bitmap = new Bitmap( 10, 10 );
Graphics g = Graphics.FromImage( bitmap );
diff --git a/ZedGraph/PointPair.cs b/ZedGraph/PointPair.cs
index 441d27e..1f120a1 100644
--- a/ZedGraph/PointPair.cs
+++ b/ZedGraph/PointPair.cs
@@ -393,7 +393,7 @@ namespace ZedGraph
/// <param name="l">Point to the left.</param>
/// <param name="r">Point to the right.</param>
/// <returns>-1, 0, or 1 depending on l.Y's relation to r.Y</returns>
- public int Compare( PointPair? l, PointPair? r )
+ public int Compare( PointPair l, PointPair r )
{
if ( l == null && r == null )
{
@@ -442,7 +442,7 @@ namespace ZedGraph
/// <param name="l">Point to the left.</param>
/// <param name="r">Point to the right.</param>
/// <returns>-1, 0, or 1 depending on l.X's relation to r.X</returns>
- public int Compare( PointPair? l, PointPair? r )
+ public int Compare( PointPair l, PointPair r )
{
if ( l == null && r == null )
return 0;
diff --git a/ZedGraph/PointPairBase.cs b/ZedGraph/PointPairBase.cs
index 8a585fe..eed4e3b 100644
--- a/ZedGraph/PointPairBase.cs
+++ b/ZedGraph/PointPairBase.cs
@@ -218,7 +218,7 @@ namespace ZedGraph
/// </summary>
/// <param name="obj">The <see cref="PointPairBase"/> object to be compared with.</param>
/// <returns>true if the <see cref="PointPairBase"/> objects are equal, false otherwise</returns>
- public override bool Equals( object? obj )
+ public override bool Equals( object obj )
{
PointPairBase rhs = obj as PointPairBase;
return this.X == rhs.X && this.Y == rhs.Y;
diff --git a/ZedGraph6Key.snk b/ZedGraphKey.snk
similarity index 100%
rename from ZedGraph6Key.snk
rename to ZedGraphKey.snk