From c44414d187c08d6ab9f1f86588c237432eaa0ee4 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期三, 17 三月 2021 11:37:46 +0800
Subject: [PATCH] 1.修改背板尺寸，合并后输出最大尺寸。
---
P066.Data/Form1.cs | 402 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 355 insertions(+), 47 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 307a429..2e19fc1 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -8,6 +8,9 @@
using System.Threading.Tasks;
using System.Windows.Forms;
using System.IO;
+using Bro.Common;
+using Bro.Common.Util;
+using System.Configuration;
namespace P066.Data
{
@@ -15,11 +18,16 @@
{
DirectoryInfo directoryInfo1;
DirectoryInfo directoryInfo2;
+ private P066RunParam runparam = new P066RunParam();
+
public Form1()
{
InitializeComponent();
- }
+ //ConfigHelper.Save(@"D:\P066-Data\P066XML\1.xml", runparam);
+ var configuraPath = Environment.CurrentDirectory+ "\\Config\\Jin_Mid.xml";
+ runparam = ConfigHelper.Load<P066RunParam>(configuraPath);
+ }
private void btnLoadData1_Click(object sender, EventArgs e)
{
@@ -42,6 +50,7 @@
{
var fileinfos1 = directoryInfo1.GetFiles();
+
var fileinfos2 = directoryInfo2.GetFiles();
var listSum = new List<ResultData>();
var JudgeListSum = new List<ResultData>();
@@ -91,9 +100,7 @@
JudgeListSum.AddRange(judgeList);
}
- judgeList = GetLocation(judgeList);
- //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
- list = GetLocation(list);
+
string currPath = "";
#region//鍒ゆ柇鏄垵妫�鏂囦欢澶硅繕鏄妫�鏂囦欢澶�
if (fileinfos1[i].Name.Contains("鍒濇涓"))
@@ -101,30 +108,45 @@
ChuNum++;
filenameDir = "鍒濇涓鐧界偣";
filename = "鍒濇涓鐧界偣" + ChuNum;
+ judgeList = GetMidLocation(judgeList);
+ //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
+ list = GetMidLocation(list);
}
else if (fileinfos1[i].Name.Contains("澶嶆涓")&& fileinfos1[i].Name.Contains("鐧界偣"))
{
FuNum=FuNum+1;
filenameDir = "澶嶆涓鐧界偣";
filename = "澶嶆涓鐧界偣" + FuNum;
+ judgeList = GetMidLocation(judgeList);
+ //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
+ list = GetMidLocation(list);
}
else if ( fileinfos1[i].Name.Contains("澶嶆涓") &&fileinfos1[i].Name.Contains("鍒櫧"))
{
GuaNum=GuaNum+1;
filenameDir = "澶嶆涓鍒櫧";
filename = "澶嶆涓鍒櫧" + GuaNum;
- }
+ judgeList = GetWhiteLocation(judgeList);
+ //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
+ list = GetBkLocation(list);
+ }
else if (fileinfos1[i].Name.Contains("鍒濇鑳屾澘"))
{
ChuNum++;
filenameDir = "鍒濇鑳屾澘鐧界偣";
filename = "鍒濇鑳屾澘鐧界偣" + ChuNum;
+ judgeList = GetBkLocation(judgeList);
+ //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
+ list = GetBkLocation(list);
}
else if (fileinfos1[i].Name.Contains("澶嶆鑳屾澘") && fileinfos1[i].Name.Contains("鐧界偣"))
{
FuNum = FuNum + 1;
filenameDir = "澶嶆鑳屾澘鐧界偣";
filename = "澶嶆鑳屾澘鐧界偣" + FuNum;
+ judgeList = GetBkLocation(judgeList);
+ //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
+ list = GetBkLocation(list);
}
currPath = directoryInfo1.Parent.Parent.FullName;
@@ -274,8 +296,8 @@
{
list2[ii].ex = list2[ii].Height * 0.0042;
}
- var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
- list2[ii].R = distance;
+ //var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
+ //list2[ii].R = distance;
}
#endregion
for (int i = 0; i < list1.Count; i++)
@@ -289,28 +311,52 @@
{
list1[i].ex = list1[i].Height * 0.0042;
}
- var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
- list1[i].R = distance1;
+ //var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
+ //list1[i].R = distance1;
#endregion
for (int j = 0; j < list2.Count; j++)
{
+ if (list1[i].JudgmentResult != list2[j].JudgmentResult)
+ {
+ list1[i].JudgmentResult = "NG";
+ list2[j].JudgmentResult = "NG";
+
+ }
+ if (list1[i].PostTreatmentResults.Length<list2[j].PostTreatmentResults.Length)
+ {
+ list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
+ }
+ else
+ {
+ list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
+ }
var distance = GetDistance(list1[i].X, list1[i].Y, list2[j].X, list2[j].Y);
if (distance < 20)
{
- itemToRemove.Add(list2[j]);
+
+ if (list1[i].ex>list2[j].ex)
+ {
+ itemToRemove.Add(list2[j]);
+ }
+ else
+ {
+ itemToRemove.Add(list1[i]);
+ }
+
+
+
}
}
}
- for (int i = 0; i < itemToRemove.Count; i++)
- {
- list2.Remove(itemToRemove[i]);
- }
-
dataList.AddRange(list1);
dataList.AddRange(list2);
+ for (int i = 0; i < itemToRemove.Count; i++)
+ {
+ dataList.Remove(itemToRemove[i]);
+ }
}
@@ -346,6 +392,7 @@
var list1 = dataList1.FindAll(a => a.TimeTip == item && !a.Result);
var list2 = dataList2.FindAll(a => a.TimeTip == item && !a.Result);
var itemToRemove1 = new List<ResultData>();
+ var itemToRemove2 = new List<ResultData>();
#region//璁＄畻琛ㄦ牸2鏈�澶у昂瀵�
for (int ii = 0; ii < list2.Count; ii++)
{
@@ -357,8 +404,8 @@
{
list2[ii].ex = list2[ii].Height * 0.0042;
}
- var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
- list2[ii].R = distance;
+ //var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
+ //list2[ii].R = distance;
}
#endregion
for (int i = 0; i < list1.Count; i++)
@@ -372,32 +419,67 @@
{
list1[i].ex = list1[i].Height * 0.0042;
}
- var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
- list1[i].R = distance1;
+ //var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
+ //list1[i].R = distance1;
#endregion
for (int j = 0; j < list2.Count; j++)
{
+ if (list1[i].JudgmentResult != list2[j].JudgmentResult)
+ {
+ list1[i].JudgmentResult = "NG";
+ list2[j].JudgmentResult = "NG";
+
+ }
+ if (list1[i].PostTreatmentResults.Length < list2[j].PostTreatmentResults.Length)
+ {
+ list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
+ }
+ else
+ {
+ list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
+ }
+
var distance = GetDistance(list1[i].X, list1[i].Y, list2[j].X, list2[j].Y);
if (distance < 20)
{
- itemToRemove1.Add(list2[j]);
- if (list1[i].JudgmentResult!=list2[j].JudgmentResult)
+
+
+ if (list1[i].ex > list2[j].ex)
{
- list1[i].JudgmentResult = "NG";
- list2[j].JudgmentResult = "NG";
+ itemToRemove2.Add(list2[j]);
}
+ else
+ {
+ itemToRemove1.Add(list1[i]);
+ }
+ //if (list1[i].JudgmentResult!=list2[j].JudgmentResult)
+ //{
+ // list1[i].JudgmentResult = "NG";
+ // list2[j].JudgmentResult = "NG";
+ //}
+ //if (list1[i].PostTreatmentResults == "")
+ //{
+ // list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
+ //}
+ //else
+ //{
+ // list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
+ //}
}
}
}
+ for (int i = 0; i < itemToRemove2.Count; i++)
+ {
+ list2.Remove(itemToRemove2[i]);
+ }
for (int i = 0; i < itemToRemove1.Count; i++)
{
- list2.Remove(itemToRemove1[i]);
+ list1.Remove(itemToRemove1[i]);
}
-
dataList11.AddRange(list1);
dataList22.AddRange(list2);
}
@@ -429,7 +511,6 @@
//}
string defectType = "";
- string judgmentresult = "";
for (int i = 1; i < allLines.Length; i++)
{
@@ -456,15 +537,11 @@
if (data[3]== "鍒櫧")
{
defectType = "鍒櫧";
- judgmentresult = "NG";
Ptr = "鍒櫧";
}
else
{
defectType = "鐧界偣";
- judgmentresult = data[1];
-
-
}
if (data[6] == "-")
@@ -519,7 +596,7 @@
{
TimeTip = data[0].Split('-')[0],
ImageFileName = data[0],
- JudgmentResult = judgmentresult,
+ JudgmentResult = data[1],
Result = data[3] == "OK",
Probability = Convert.ToDouble(data[4]),
Uncertainty = Convert.ToDouble(data[5]),
@@ -543,8 +620,8 @@
return dataList;
}
-
- private List<ResultData> GetLocation(List<ResultData> list)
+ //鑾峰彇涓瑙掑害鍜屼綅缃�
+ private List<ResultData> GetMidLocation(List<ResultData> list)
{
var group = list.GroupBy(a => a.TimeTip);
foreach (var item in group)
@@ -553,7 +630,7 @@
var listLensnumber1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
for (int k = 0; k < listLensnumber1.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y);
+ var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1050);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
@@ -561,11 +638,12 @@
listLensnumber1[k].angle = lenAngle;
var distance = GetDistance(1050, 1050, listLensnumber1[k].X, listLensnumber1[k].Y);
- if (distance <= 298.022)
+ listLensnumber1[k].R = distance;
+ if (distance <= runparam.MidLens1R1)
{
listLensnumber1[k].location = "闀滃ご";
}
- else if (298.022 < distance && distance <= 521.171)
+ else if (runparam.MidLens1R1 < distance && distance <= runparam.MidLens1R2)
{
listLensnumber1[k].location = "鏂滈潰";
}
@@ -579,18 +657,19 @@
var listLensnumber2 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 2);
for (int k = 0; k < listLensnumber2.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y);
+ var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y,1050);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
listLensnumber2[k].angle = lenAngle;
var distance = GetDistance(1050, 1050, listLensnumber2[k].X, listLensnumber2[k].Y);
- if (distance <= 367.696)
+ listLensnumber2[k].R = distance;
+ if (distance <= runparam.MidLens2R1)
{
listLensnumber2[k].location = "闀滃ご";
}
- else if (367.696 < distance && distance <= 653.911)
+ else if (runparam.MidLens2R1 < distance && distance <= runparam.MidLens2R2)
{
listLensnumber2[k].location = "鏂滈潰";
}
@@ -603,18 +682,19 @@
var listLensnumber3 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 3);
for (int k = 0; k < listLensnumber3.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y);
+ var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y,1050);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
listLensnumber3[k].angle = lenAngle;
var distance = GetDistance(1050, 1050, listLensnumber3[k].X, listLensnumber3[k].Y);
- if (distance <= 339.246)
+ listLensnumber3[k].R = distance;
+ if (distance <= runparam.MidLens3R1)
{
listLensnumber3[k].location = "闀滃ご";
}
- else if (distance < 339.246 && distance <= 520.584)
+ else if ( runparam.MidLens3R1< distance && distance <= runparam.MidLens3R2)
{
listLensnumber3[k].location = "鏂滈潰";
}
@@ -627,18 +707,19 @@
var listLensnumber4 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 4);
for (int k = 0; k < listLensnumber4.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y);
+ var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y,1050);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
listLensnumber4[k].angle = lenAngle;
var distance = GetDistance(1050, 1050, listLensnumber4[k].X, listLensnumber4[k].Y);
- if (distance <= 104.895)
+ listLensnumber4[k].R = distance;
+ if (distance <= runparam.MidLens4R1)
{
listLensnumber4[k].location = "闀滃ご";
}
- else if (104.895 < distance && distance <= 239.48)
+ else if (runparam.MidLens4R1 < distance && distance <= runparam.MidLens4R2)
{
listLensnumber4[k].location = "鏂滈潰";
}
@@ -652,7 +733,234 @@
}
return list;
}
+ //鑾峰彇涓瑙掑害鍜屼綅缃�
+ private List<ResultData> GetWhiteLocation(List<ResultData> list)
+ {
+ var group = list.GroupBy(a => a.TimeTip);
+ foreach (var item in group)
+ {
+ //璁＄畻闀滃ご1缂洪櫡浣嶇疆鍙婅搴�
+ var listLensnumber1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
+ for (int k = 0; k < listLensnumber1.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1050);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber1[k].angle = lenAngle;
+ var distance = GetDistance(1050, 1050, listLensnumber1[k].X, listLensnumber1[k].Y);
+ listLensnumber1[k].R = distance;
+ if (distance <= runparam.MidLens1R1)
+ {
+ listLensnumber1[k].location = "闀滃ご";
+ }
+ else if (runparam.MidLens1R1 < distance && distance <= runparam.MidLens1R2)
+ {
+ listLensnumber1[k].location = "鏂滈潰";
+ }
+ else if(runparam.MidLens1R2 < distance && distance <= runparam.BkLens1R1)
+ {
+ listLensnumber1[k].location = "骞抽潰鍙鍖�";
+ }
+ else
+ {
+ listLensnumber1[k].location = "骞抽潰闈炲彲瑙嗗尯";
+ }
+
+ }
+ //璁＄畻闀滃ご2浣嶇疆鍙婅搴�
+ var listLensnumber2 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 2);
+ for (int k = 0; k < listLensnumber2.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y,1050);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber2[k].angle = lenAngle;
+ var distance = GetDistance(1050, 1050, listLensnumber2[k].X, listLensnumber2[k].Y);
+ listLensnumber2[k].R = distance;
+ if (distance <= runparam.MidLens2R1)
+ {
+ listLensnumber2[k].location = "闀滃ご";
+ }
+ else if (runparam.MidLens2R1 < distance && distance <= runparam.MidLens2R2)
+ {
+ listLensnumber2[k].location = "鏂滈潰";
+ }
+ else if (runparam.MidLens2R2 < distance && distance <= runparam.BkLens2R1)
+ {
+ listLensnumber2[k].location = "骞抽潰鍙鍖�";
+ }
+ else
+ {
+ listLensnumber2[k].location = "骞抽潰闈炲彲瑙嗗尯";
+ }
+ }
+ //璁＄畻闀滃ご3浣嶇疆鍙婅搴�
+ var listLensnumber3 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 3);
+ for (int k = 0; k < listLensnumber3.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y,1050);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber3[k].angle = lenAngle;
+ var distance = GetDistance(1050, 1050, listLensnumber3[k].X, listLensnumber3[k].Y);
+ listLensnumber3[k].R = distance;
+ if (distance <= runparam.MidLens3R1)
+ {
+ listLensnumber3[k].location = "闀滃ご";
+ }
+ else if (runparam.MidLens3R1 < distance && distance <= runparam.MidLens3R2)
+ {
+ listLensnumber3[k].location = "鏂滈潰";
+ }
+ else if (runparam.MidLens3R2 < distance && distance <= runparam.BkLens3R1)
+ {
+ listLensnumber3[k].location = "骞抽潰鍙鍖�";
+ }
+ else
+ {
+ listLensnumber3[k].location = "骞抽潰闈炲彲瑙嗗尯";
+ }
+ }
+ //璁＄畻闀滃ご4浣嶇疆鍙婅搴�
+ var listLensnumber4 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 4);
+ for (int k = 0; k < listLensnumber4.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y,1050);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber4[k].angle = lenAngle;
+ var distance = GetDistance(1050, 1050, listLensnumber4[k].X, listLensnumber4[k].Y);
+ listLensnumber4[k].R = distance;
+ if (distance <= runparam.MidLens4R1)
+ {
+ listLensnumber4[k].location = "闀滃ご";
+ }
+ else if (runparam.MidLens4R1 < distance && distance <= runparam.MidLens4R2)
+ {
+ listLensnumber4[k].location = "鏂滈潰";
+ }
+ else if (runparam.MidLens4R2 < distance && distance <= runparam.BkLens4R1)
+ {
+ listLensnumber4[k].location = "骞抽潰鍙鍖�";
+
+ }
+ else
+ {
+ listLensnumber4[k].location = "骞抽潰闈炲彲瑙嗗尯";
+ }
+ }
+
+ }
+ return list;
+ }
+ //鑾峰彇鑳屾澘瑙掑害鍜屼綅缃�
+ private List<ResultData> GetBkLocation(List<ResultData> list)
+ {
+ var group = list.GroupBy(a => a.TimeTip);
+ foreach (var item in group)
+ {
+ //璁＄畻闀滃ご1缂洪櫡浣嶇疆鍙婅搴�
+ var listLensnumber1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
+ for (int k = 0; k < listLensnumber1.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1350);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber1[k].angle = lenAngle;
+
+ var distance = GetDistance(1350, 1350, listLensnumber1[k].X, listLensnumber1[k].Y);
+ listLensnumber1[k].R = distance;
+ if (distance <= runparam.BkLens1R1)
+ {
+ listLensnumber1[k].location = "鍙鍖�";
+ }
+
+ else
+ {
+ listLensnumber1[k].location = "闈炲彲瑙嗗尯";
+ }
+
+ }
+ //璁＄畻闀滃ご2浣嶇疆鍙婅搴�
+ var listLensnumber2 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 2);
+ for (int k = 0; k < listLensnumber2.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y,1350);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber2[k].angle = lenAngle;
+ var distance = GetDistance(1350, 1350, listLensnumber2[k].X, listLensnumber2[k].Y);
+ listLensnumber2[k].R = distance;
+ if (distance <= runparam.BkLens2R1)
+ {
+ listLensnumber2[k].location = "鍙鍖�";
+ }
+ else
+ {
+ listLensnumber2[k].location = "闈炲彲瑙嗗尯";
+ }
+ }
+ //璁＄畻闀滃ご3浣嶇疆鍙婅搴�
+ var listLensnumber3 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 3);
+ for (int k = 0; k < listLensnumber3.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y,1350);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber3[k].angle = lenAngle;
+ var distance = GetDistance(1350, 1350, listLensnumber3[k].X, listLensnumber3[k].Y);
+ listLensnumber3[k].R = distance;
+ if (distance <= runparam.BkLens3R1)
+ {
+ listLensnumber3[k].location = "鍙鍖�";
+ }
+
+ else
+ {
+ listLensnumber3[k].location = "闈炲彲瑙嗗尯";
+ }
+ }
+ //璁＄畻闀滃ご4浣嶇疆鍙婅搴�
+ var listLensnumber4 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 4);
+ for (int k = 0; k < listLensnumber4.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y,1350);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber4[k].angle = lenAngle;
+ var distance = GetDistance(1350, 1350, listLensnumber4[k].X, listLensnumber4[k].Y);
+ listLensnumber4[k].R = distance;
+ if (distance <= runparam.BkLens4R1)
+ {
+ listLensnumber4[k].location = "鍙鍖�";
+ }
+ else
+ {
+ listLensnumber4[k].location = "闈炲彲瑙嗗尯";
+
+ }
+ }
+
+ }
+ return list;
+ }
private void WriteJR(List<ResultData> Lens,string item,int LensNumb, string file12)
{
@@ -709,9 +1017,9 @@
{
return Math.Sqrt(Math.Pow((x2 - x1), 2) + Math.Pow((y2 - y1), 2));
}
- private double GetAngle(double x1, double y1)
+ private double GetAngle(double x1, double y1,double size)
{
- return Math.Atan2((y1 - 1050), (x1 - 1050)) * (180 / Math.PI);
+ return Math.Atan2((y1 - size), (x1 - size)) * (180 / Math.PI);
}
}
--
Gitblit v1.8.0