Skip to content

Commit ea47e6b

Browse files
objorkeobjorke
authored
Merge branch 'develop' into transposablexyseries
2 parents 5744f7f + 4e866ed commit ea47e6b

87 files changed

Lines changed: 1192 additions & 3486 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CONTRIBUTING.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ Note that your contributions must be your own work and licensed under the same t
1616
## Reporting bugs
1717

1818
First, search the issue tracker to see if the bug is already there.
19-
Please use the [discussion forums](http://discussion.oxyplot.org/) if you are unsure whether it is a bug in the library or a problem in your code.
19+
Please use the [discussion forums](https://oxyplot.userecho.com/) if you are unsure whether it is a bug in the library or a problem in your code.
2020
When you are sure, please add defects in the issue tracker.
2121

2222
It is very helpful to get the generated code (use `CTRL+ALT+C` in the plot control) and report (`CTRL+ALT+R`) of the bug plot. You can also take a screen shot and paste it into the description.
2323

2424
Please use markdown to format your code blocks with [syntax highlighting](https://help.github.com/articles/github-flavored-markdown/#syntax-highlighting) to make it easier for everyone to read.
2525

26-
You could also use services like http://snipt.org or https://gist.github.com to share code snippets.
26+
You could also use services like https://snipt.org or https://gist.github.com to share code snippets.
2727

2828
A bug report should include:
2929

@@ -36,7 +36,7 @@ A bug report should include:
3636

3737
## Suggesting new features
3838

39-
Please use the [discussion forums](http://discussion.oxyplot.org/) or add it directly in the issue tracker in the same way as bug reports.
39+
Please use the [discussion forums](https://oxyplot.userecho.com/) or add it directly in the issue tracker in the same way as bug reports.
4040

4141

4242
## Create your own fork
@@ -54,7 +54,7 @@ The repository contains two branches:
5454

5555
You should base your work on the `develop` branch.
5656

57-
See [A successful git branching model](http://nvie.com/posts/a-successful-git-branching-model/) for more information about the branching model in use.
57+
See [A successful git branching model](https://nvie.com/posts/a-successful-git-branching-model/) for more information about the branching model in use.
5858

5959
Create a branch for the bugfix/feature you want to work on: `git branch bugfix-some-error`
6060

@@ -86,7 +86,7 @@ More info about rebasing
8686

8787
- https://git-scm.com/book/en/v2/Git-Branching-Rebasing
8888
- https://blog.sourcetreeapp.com/2012/08/21/merge-or-rebase/
89-
- http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
89+
- https://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
9090
- https://ariejan.net/2011/07/05/git-squash-your-latests-commits-into-one/
9191
- https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History
9292
- https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase-i
@@ -130,10 +130,10 @@ Please contribute by creating pull requests!
130130

131131
## Contributing to the website
132132

133-
The source of the [oxyplot.github.io](https://oxyplot.github.io/) web site can be found in the [oxyplot.github.io](http://github.com/oxyplot/oxyplot.github.io) repository.
133+
The source of the [oxyplot.github.io](https://oxyplot.github.io/) web site can be found in the [oxyplot.github.io](https://github.com/oxyplot/oxyplot.github.io) repository.
134134
Please contribute by creating pull requests!
135135

136-
The web-site is built by [GitHub](http://github.com/) with [Jekyll](http://jekyllrb.com/).
136+
The web-site is built by [GitHub](https://github.com/) with [Jekyll](https://jekyllrb.com/).
137137

138138

139139
## Common rules

‎CHANGELOG.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ All notable changes to this project will be documented in this file.
33

44
## [Unreleased]
55
### Added
6-
- added .NET Core port of PngExporter
7-
8-
### Added
6+
- WindowsForms and Wpf support .NET Core 3.0 (#1331)
7+
- Added .NET Core port of PngExporter
98
- New PolarPlot filling the full plot area (#1056)
10-
11-
### Added
129
- Command to copy plot to the clipboard in Windows Forms (Ctrl-C) (#1297)
1310
- Added Avalonia based renderer and control library (based off OxyPlot.Wpf).
1411
- New `InterpolationAlgorithm` property in LineSeries and PolylineAnnotation (#494)
@@ -31,6 +28,8 @@ All notable changes to this project will be documented in this file.
3128
- Use PackageReference instead of packages.config
3229
- Migrated NUnit v2 to v3 and added test adapter
3330
- TrackerControl reuses existing ContentControl when a new hit tracker result uses the same template as the currently shown tracker (#1281)
31+
- Add Count to HistogramSeries (#1347)
32+
- Overhaul HistogramHelpers (#1345)
3433

3534
### Deprecated
3635
- OxyPlot.WP8 package. Use OxyPlot.Windows instead (#996)
@@ -68,6 +67,7 @@ All notable changes to this project will be documented in this file.
6867
- Fix: LineSeries line legend placement with reversed X axis (related to #1334)
6968
- Fix: HistogramSeries label placement inconsistent (related to #1334)
7069
- Fix: TwoColorLineSeries and ThreeColorLineSeries don't work with reversed Y axis (related to #1334)
70+
- Fixed issue with svg always containing the xml headers (#1212)
7171

7272
## [1.0.0] - 2016-09-11
7373
### Added

‎CODE_OF_CONDUCT.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
3434

3535
## Enforcement
3636

37-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at mail@oxyplot.org. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
37+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
3838

3939
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
4040

‎CONTRIBUTORS‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ Ilya Skriblovsky <IlyaSkriblovsky@gmail.com>
5353
Iurii Gazin <archeg@gmail.com>
5454
jaykul
5555
Jeremy Koritzinsky
56+
Jeremie Magnette
5657
jezza323
5758
Johan
5859
Johan20D
@@ -120,4 +121,4 @@ zur003 <Eric.Zurcher@csiro.au>
120121
Markus Ebner
121122
Duncan Robertson <duncanjacobrobertson@gmail.com>
122123
LauXjpn <laucomm@gmail.com>
123-
R. Usamentiaga
124+
R. Usamentiaga

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ The stable release packages will be pushed to [nuget.org](https://www.nuget.org/
3333
|-------------------------|------------------------------------|--------------|
3434
| OxyPlot.Core | .NET Standard 1.0 | |
3535
| OxyPlot.Core.Drawing | .NET Standard 2.0 | |
36-
| OxyPlot.Wpf | .NET 4.5.2 | |
37-
| OxyPlot.WindowsForms | .NET 4.5.2 | |
36+
| OxyPlot.Wpf | .NET Core 3.0, .NET 4.5 | |
37+
| OxyPlot.WindowsForms | .NET Core 3.0, .NET 4.5 | |
3838
| OxyPlot.Windows | Universal Windows 10.0 | |
3939
| OxyPlot.GtkSharp | .NET 4.5.2 | GTK\# 2 |
4040
| OxyPlot.GtkSharp3 | .NET 4.5.2 | GTK\# 3 |

‎Source/AssemblyInfo.cs‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎Source/Examples/ExampleLibrary/ExampleLibrary.csproj‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,28 @@
55
<PackageId>OxyPlot.ExampleLibrary</PackageId>
66
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
77
<Description>Example models for OxyPlot.</Description>
8-
<PackageLicenseUrl>https://raw.githubusercontent.com/oxyplot/oxyplot/master/LICENSE</PackageLicenseUrl>
8+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
99
<Copyright>OxyPlot contributors</Copyright>
10-
<PackageProjectUrl>http://oxyplot.org/</PackageProjectUrl>
11-
<PackageIconUrl>https://raw.githubusercontent.com/oxyplot/oxyplot/develop/Icons/OxyPlot_128.png</PackageIconUrl>
10+
<PackageProjectUrl>https://oxyplot.github.io/</PackageProjectUrl>
11+
<PackageIcon>OxyPlot_128.png</PackageIcon>
1212
<PackageTags>plotting plot charting chart</PackageTags>
1313
<RepositoryType>git</RepositoryType>
1414
<RepositoryUrl>https://github.com/oxyplot/oxyplot.git</RepositoryUrl>
1515
</PropertyGroup>
16-
1716
<ItemGroup>
18-
<None Remove="Resources\Bergensbanen.csv" />
19-
<None Remove="Resources\OxyPlot.png" />
20-
<None Remove="Resources\west0479.mtx" />
21-
<None Remove="Resources\WorldPopulation.xml" />
17+
<None Include="..\..\..\Icons\OxyPlot_128.png" Pack="true" PackagePath="\"/>
2218
</ItemGroup>
23-
2419
<ItemGroup>
2520
<EmbeddedResource Include="Resources\Bergensbanen.csv" />
2621
<EmbeddedResource Include="Resources\OxyPlot.png" />
2722
<EmbeddedResource Include="Resources\west0479.mtx" />
2823
<EmbeddedResource Include="Resources\WorldPopulation.xml" />
2924
</ItemGroup>
30-
3125
<ItemGroup>
3226
<PackageReference Include="System.Net.Requests" Version="4.3.0" />
3327
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
3428
</ItemGroup>
35-
3629
<ItemGroup>
3730
<ProjectReference Include="..\..\OxyPlot\OxyPlot.csproj" />
3831
</ItemGroup>
39-
4032
</Project>

‎Source/Examples/ExampleLibrary/Series/HistogramSeriesExamples.cs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ public static PlotModel CreateExponentialDistribution(double mean = 1, int n = 1
9999
Random rnd = new Random(1);
100100

101101
HistogramSeries chs = new HistogramSeries();
102-
chs.Items.AddRange(HistogramHelpers.Collect(SampleExps(rnd, 1.0, n), 0, 5, 15, true));
102+
103+
var binningOptions = new BinningOptions(BinningOutlierMode.CountOutliers, BinningIntervalType.InclusiveLowerBound, BinningExtremeValueMode.ExcludeExtremeValues);
104+
var binBreaks = HistogramHelpers.CreateUniformBins(0, 5, 15);
105+
chs.Items.AddRange(HistogramHelpers.Collect(SampleExps(rnd, 1.0, n), binBreaks, binningOptions));
103106
chs.StrokeThickness = 1;
104107
model.Series.Add(chs);
105108

@@ -116,7 +119,8 @@ public static PlotModel CreateExponentialDistributionCustomBins(double mean = 1,
116119

117120
HistogramSeries chs = new HistogramSeries();
118121

119-
chs.Items.AddRange(HistogramHelpers.Collect(SampleExps(rnd, 1.0, n), new double[] { 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.75, 1.0, 2.0, 3.0, 4.0, 5.0 }, true));
122+
var binningOptions = new BinningOptions(BinningOutlierMode.CountOutliers, BinningIntervalType.InclusiveLowerBound, BinningExtremeValueMode.ExcludeExtremeValues);
123+
chs.Items.AddRange(HistogramHelpers.Collect(SampleExps(rnd, 1.0, n), new double[] { 0, 0.1, 0.2, 0.3, 0.4, 0.5, 0.75, 1.0, 2.0, 3.0, 4.0, 5.0 }, binningOptions));
120124
chs.StrokeThickness = 1;
121125
chs.FillColor = OxyColors.Purple;
122126
model.Series.Add(chs);
@@ -131,7 +135,7 @@ public static PlotModel CreateDisconnectedBins()
131135
model.Axes.Add(new LinearAxis { Position = AxisPosition.Bottom, Title = "x" });
132136

133137
HistogramSeries chs = new HistogramSeries();
134-
chs.Items.AddRange(new[] { new HistogramItem(0, 0.5, 10), new HistogramItem(0.75, 1.0, 10) });
138+
chs.Items.AddRange(new[] { new HistogramItem(0, 0.5, 10, 7), new HistogramItem(0.75, 1.0, 10, 7) });
135139
chs.LabelFormatString = "{0:0.00}";
136140
chs.LabelPlacement = LabelPlacement.Middle;
137141
model.Series.Add(chs);

‎Source/Examples/PerformanceTest/PerformanceTest.csproj‎

Lines changed: 10 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{EDD52464-AD60-4EA1-B774-87AAFD930B6B}</ProjectGuid>
8-
<OutputType>Exe</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>PerformanceTest</RootNamespace>
11-
<AssemblyName>PerformanceTest</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<PlatformTarget>AnyCPU</PlatformTarget>
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<PlatformTarget>AnyCPU</PlatformTarget>
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
</PropertyGroup>
34-
<ItemGroup>
35-
<Reference Include="System" />
36-
<Reference Include="System.Core" />
37-
</ItemGroup>
38-
<ItemGroup>
39-
<Compile Include="..\..\AssemblyInfo.cs">
40-
<Link>Properties\AssemblyInfo.cs</Link>
41-
</Compile>
42-
<Compile Include="EmptyRenderContext.cs" />
43-
<Compile Include="Program.cs" />
44-
<Compile Include="Properties\AssemblyDescription.cs" />
45-
</ItemGroup>
46-
<ItemGroup>
47-
<None Include="App.config" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<ProjectReference Include="..\..\OxyPlot\OxyPlot.csproj">
51-
<Project>{7A0B35C0-DD17-4964-8E9A-44D6CECDC692}</Project>
52-
<Name>OxyPlot</Name>
53-
</ProjectReference>
54-
</ItemGroup>
55-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
56-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
57-
Other similar extension points exist, see Microsoft.Common.targets.
58-
<Target Name="BeforeBuild">
59-
</Target>
60-
<Target Name="AfterBuild">
61-
</Target>
62-
-->
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net452</TargetFramework>
4+
<OutputType>Exe</OutputType>
5+
<ApplicationIcon />
6+
<StartupObject />
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<ProjectReference Include="..\..\OxyPlot\OxyPlot.csproj" />
10+
</ItemGroup>
6311
</Project>
64-

‎Source/Examples/PerformanceTest/Properties/AssemblyDescription.cs‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)