Skip to content

L
livecharts
Commit 46f822fe authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

修复 AxisSection 有时候无法在前端显示问题

parent 3fb68fa0
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 43 deletions
Core40/AxisCore.cs
View file @ 46f822fe
...@@ -337,6 +337,14 @@ namespace LiveCharts ...@@ -337,6 +337,14 @@ namespace LiveCharts
DrawSeparator(i, tolerance, currentMargin, f, source); DrawSeparator(i, tolerance, currentMargin, f, source);
} }
} }
//TODO
//还要计算Sections 的 label
//foreach (var section in Sections)
//{
// if (section.View.DataLabel && !double.IsNaN(section.View.Value)) {
// DrawSeparator(section.View.Value, tolerance, currentMargin, f, source);
// }
//}
return currentMargin; return currentMargin;
} }
...@@ -536,6 +544,7 @@ namespace LiveCharts ...@@ -536,6 +544,7 @@ namespace LiveCharts
asc.State = SeparationState.Keep; asc.State = SeparationState.Keep;
} }
private string Formatter(double x) private string Formatter(double x)
{ {
if (Labels == null) if (Labels == null)
......
Examples/Wpf/App.config
View file @ 46f822fe
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup> </startup>
</configuration> </configuration>
Examples/Wpf/Properties/Resources.Designer.cs
View file @ 46f822fe
...@@ -19,7 +19,7 @@ namespace Wpf.Properties { ...@@ -19,7 +19,7 @@ namespace Wpf.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
......
Examples/Wpf/Properties/Settings.Designer.cs
View file @ 46f822fe
...@@ -12,7 +12,7 @@ namespace Wpf.Properties { ...@@ -12,7 +12,7 @@ namespace Wpf.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
Examples/Wpf/Wpf.csproj
View file @ 46f822fe
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Wpf</RootNamespace> <RootNamespace>Wpf</RootNamespace>
<AssemblyName>Wpf</AssemblyName> <AssemblyName>Wpf</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
......
Feng/Examples/Wpf/App.config
View file @ 46f822fe
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup> </startup>
<runtime> <runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1"> <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
......
Feng/Examples/Wpf/Feng.Wpf.csproj
View file @ 46f822fe
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Wpf</RootNamespace> <RootNamespace>Wpf</RootNamespace>
<AssemblyName>Feng.Wpf</AssemblyName> <AssemblyName>Feng.Wpf</AssemblyName>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
......
Feng/Examples/Wpf/Properties/Resources.Designer.cs
View file @ 46f822fe
...@@ -19,7 +19,7 @@ namespace Wpf.Properties { ...@@ -19,7 +19,7 @@ namespace Wpf.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
......
Feng/Examples/Wpf/Properties/Settings.Designer.cs
View file @ 46f822fe
...@@ -12,7 +12,7 @@ namespace Wpf.Properties { ...@@ -12,7 +12,7 @@ namespace Wpf.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.5.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
LiveCharts.sln
View file @ 46f822fe
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15 # Visual Studio Version 16
VisualStudioVersion = 15.0.26228.12 VisualStudioVersion = 16.0.29911.84
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfView", "WpfView\WpfView.csproj", "{4D253423-AE05-47F6-A59D-9162EC0BB1F2}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WpfView", "WpfView\WpfView.csproj", "{4D253423-AE05-47F6-A59D-9162EC0BB1F2}"
EndProject EndProject
...@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf", "Examples\Wpf\Wpf.csp ...@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf", "Examples\Wpf\Wpf.csp
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{609963C9-8E55-4B42-8B84-721B625BA1E9}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{609963C9-8E55-4B42-8B84-721B625BA1E9}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{658F1D11-ED2B-418C-B20D-30AF74C3CB81}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core40", "Core40\Core40.csproj", "{F261C3D7-6194-4625-9516-044081B06028}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core40", "Core40\Core40.csproj", "{F261C3D7-6194-4625-9516-044081B06028}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Feng", "Feng", "{01F3C0BD-11E0-41AB-BD34-A173A617B664}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Feng", "Feng", "{01F3C0BD-11E0-41AB-BD34-A173A617B664}"
...@@ -109,37 +107,6 @@ Global ...@@ -109,37 +107,6 @@ Global
{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.Release|x64.Build.0 = Release|Any CPU {537FF5D4-19FB-415E-B3D2-B83CB93E968B}.Release|x64.Build.0 = Release|Any CPU
{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.Release|x86.ActiveCfg = Release|Any CPU {537FF5D4-19FB-415E-B3D2-B83CB93E968B}.Release|x86.ActiveCfg = Release|Any CPU
{537FF5D4-19FB-415E-B3D2-B83CB93E968B}.Release|x86.Build.0 = Release|Any CPU {537FF5D4-19FB-415E-B3D2-B83CB93E968B}.Release|x86.Build.0 = Release|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Debug|ARM.ActiveCfg = Debug|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Debug|ARM.Build.0 = Debug|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Debug|x64.ActiveCfg = Debug|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Debug|x64.Build.0 = Debug|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Debug|x86.ActiveCfg = Debug|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Debug|x86.Build.0 = Debug|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net40|Any CPU.ActiveCfg = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net40|Any CPU.Build.0 = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net40|ARM.ActiveCfg = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net40|ARM.Build.0 = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net40|x64.ActiveCfg = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net40|x64.Build.0 = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net40|x86.ActiveCfg = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net40|x86.Build.0 = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net45|Any CPU.ActiveCfg = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net45|Any CPU.Build.0 = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net45|ARM.ActiveCfg = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net45|ARM.Build.0 = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net45|x64.ActiveCfg = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net45|x64.Build.0 = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net45|x86.ActiveCfg = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.net45|x86.Build.0 = arm|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Release|Any CPU.ActiveCfg = Release|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Release|Any CPU.Build.0 = Release|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Release|ARM.ActiveCfg = Release|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Release|ARM.Build.0 = Release|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Release|x64.ActiveCfg = Release|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Release|x64.Build.0 = Release|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Release|x86.ActiveCfg = Release|Any CPU
{658F1D11-ED2B-418C-B20D-30AF74C3CB81}.Release|x86.Build.0 = Release|Any CPU
{F261C3D7-6194-4625-9516-044081B06028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F261C3D7-6194-4625-9516-044081B06028}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F261C3D7-6194-4625-9516-044081B06028}.Debug|Any CPU.Build.0 = Debug|Any CPU {F261C3D7-6194-4625-9516-044081B06028}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F261C3D7-6194-4625-9516-044081B06028}.Debug|ARM.ActiveCfg = Debug|Any CPU {F261C3D7-6194-4625-9516-044081B06028}.Debug|ARM.ActiveCfg = Debug|Any CPU
......
WpfView/AxisSection.cs
View file @ 46f822fe
...@@ -297,6 +297,7 @@ namespace LiveCharts.Wpf ...@@ -297,6 +297,7 @@ namespace LiveCharts.Wpf
_rectangle.StrokeDashArray = StrokeDashArray; _rectangle.StrokeDashArray = StrokeDashArray;
_rectangle.StrokeThickness = StrokeThickness; _rectangle.StrokeThickness = StrokeThickness;
Panel.SetZIndex(_rectangle, Panel.GetZIndex(this)); Panel.SetZIndex(_rectangle, Panel.GetZIndex(this));
BindingOperations.SetBinding(_rectangle, VisibilityProperty, BindingOperations.SetBinding(_rectangle, VisibilityProperty,
new Binding {Path = new PropertyPath(VisibilityProperty), Source = this}); new Binding {Path = new PropertyPath(VisibilityProperty), Source = this});
...@@ -318,6 +319,7 @@ namespace LiveCharts.Wpf ...@@ -318,6 +319,7 @@ namespace LiveCharts.Wpf
Canvas.SetTop(_label, Model.Chart.DrawMargin.Height); Canvas.SetTop(_label, Model.Chart.DrawMargin.Height);
Canvas.SetLeft(_label, 0d); Canvas.SetLeft(_label, 0d);
#endregion #endregion
Canvas.SetZIndex(_label, Panel.GetZIndex(this));
} }
#pragma warning disable 618 #pragma warning disable 618
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment