From 19a9489aef9b3353171eca5e6b583aadb2828593 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期日, 28 六月 2020 09:33:01 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Model/CustomizedPoint.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/Bro.Common.Model/Model/CustomizedPoint.cs b/src/Bro.Common.Model/Model/CustomizedPoint.cs
index e0a0556..148f60f 100644
--- a/src/Bro.Common.Model/Model/CustomizedPoint.cs
+++ b/src/Bro.Common.Model/Model/CustomizedPoint.cs
@@ -15,10 +15,10 @@
/// </summary>
public class CustomizedPoint : IComplexDisplay, ICSVOutput, INotifyPropertyChanged
{
- private float x = 0;
+ private double x = 0;
[Category("鍧愭爣璁剧疆")]
[Description("X鍧愭爣")]
- public float X
+ public double X
{
get => x;
set
@@ -31,10 +31,10 @@
}
}
- private float y = 0;
+ private double y = 0;
[Category("鍧愭爣璁剧疆")]
[Description("Y鍧愭爣")]
- public float Y
+ public double Y
{
get => y;
set
@@ -49,7 +49,7 @@
public CustomizedPoint() { }
- public CustomizedPoint(float x, float y)
+ public CustomizedPoint(double x, double y)
{
X = x;
Y = y;
@@ -95,7 +95,7 @@
List<CustomizedPoint> points = new List<CustomizedPoint>();
for (int i = 0; i < Xs.Count && i < Ys.Count; i++)
{
- points.Add(new CustomizedPoint((float)Xs[i], (float)Ys[i]));
+ points.Add(new CustomizedPoint(Xs[i], Ys[i]));
}
return points;
@@ -333,19 +333,19 @@
{
[Category("鏍囧畾鍧愭爣")]
[Description("骞冲彴鍧愭爣-X")]
- public float X { get; set; }
+ public double X { get; set; }
[Category("鏍囧畾鍧愭爣")]
[Description("骞冲彴鍧愭爣-X")]
- public float Y { get; set; }
+ public double Y { get; set; }
[Category("鍍忕礌鍧愭爣")]
[Description("鍍忕礌鍧愭爣-U")]
- public float U { get; set; }
+ public double U { get; set; }
[Category("鍍忕礌鍧愭爣")]
[Description("鍍忕礌鍧愭爣-V")]
- public float V { get; set; }
+ public double V { get; set; }
private bool isBasePoint = false;
[Category("蹇嵎璁剧疆")]
@@ -419,7 +419,7 @@
// }
//}
- public float MainAxisValue
+ public double MainAxisValue
{
get => ((Direction ?? PriorityDirection.X) == PriorityDirection.X) ? X : Y;
set
@@ -435,7 +435,7 @@
}
}
- public float MinorAxisValue
+ public double MinorAxisValue
{
get => ((Direction ?? PriorityDirection.X) == PriorityDirection.X) ? Y : X;
set
--
Gitblit v1.8.0