gebo/TetraParkOCR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add m_height variable

Browse Source
This commit is contained in:
gebo
2025-11-05 14:08:14 +08:00
parent 649d44f001
commit e610ceeeb3
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
TetraParkOCR/Form1.cs
View File

@@ -84,12 +84,12 @@ namespace TetraPackOCR
/// <summary>
/// 共印依据 QSV Design, Layers, Colours,产品规格
/// </summary>
string ProductStandard;
string m_ProductStandard;
/// <summary>
/// 幅数 包材宽 梯度 X距离 Y距离
/// </summary>
int NumberOfLanes;
double width, Gradient, DistX, DistY;
double m_width, m_Gradient, m_DistX, m_DistY, m_height;
/// <summary>
/// 定位Vpp文件
/// </summary>
@@ -736,19 +736,19 @@ namespace TetraPackOCR
qsv = sheet2.Cells[j, 1].Value.ToString();
if (qsv == currentQSV)
{
ProductStandard = sheet2.Cells[j, 2].Value.ToString();
lbl_ProductStandardShow.Text = ProductStandard;
log.Info("当前订单产品编号:" + ProductStandard);
width = Convert.ToDouble(sheet2.Cells[j, 3].Value.ToString());
m_ProductStandard = sheet2.Cells[j, 2].Value.ToString();
lbl_ProductStandardShow.Text = m_ProductStandard;
log.Info("当前订单产品编号:" + m_ProductStandard);
m_width = Convert.ToDouble(sheet2.Cells[j, 3].Value.ToString());
lbl_widthShow.Text = sheet2.Cells[j, 3].Value.ToString();
log.Info("当前订单幅宽:" + width);
Gradient = Convert.ToDouble(sheet2.Cells[j, 4].Value.ToString());
log.Info("当前订单幅宽:" + m_width);
m_Gradient = Convert.ToDouble(sheet2.Cells[j, 4].Value.ToString());
lbl_GradientShow.Text = sheet2.Cells[j, 4].Value.ToString();
log.Info("当前订单梯度:" + Gradient);
log.Info("当前订单梯度:" + m_Gradient);
break;
}
}
if (string.IsNullOrEmpty(ProductStandard))
if (string.IsNullOrEmpty(m_ProductStandard))
{
log.Debug("ProductStandard未找到，请检查订单号是否正确");
btn_OrderNum.Enabled = true;
@@ -760,23 +760,23 @@ namespace TetraPackOCR
{
if (sheet3.GetValue(n, 1) != null)
{
if (sheet3.Cells[n, 1].Value.ToString() == ProductStandard)
if (sheet3.Cells[n, 1].Value.ToString() == m_ProductStandard)
{
string str = sheet3.Cells[n + ocrTextRequest[1].Count - 1, 4].Value.ToString();
string[] x_y = str.Split(',');
string[] X = x_y[0].Split(':');
string[] Y = x_y[1].Split(':');
DistX = Convert.ToDouble(X[1].Replace("mm", ""));
m_DistX = Convert.ToDouble(X[1].Replace("mm", ""));
lbl_DistXShow.Text = X[1].Replace("mm", "");
log.Info("当前订单X偏移:" + DistX);
DistY = Convert.ToDouble(Y[1].Replace("mm", ""));
log.Info("当前订单X偏移:" + m_DistX);
m_DistY = Convert.ToDouble(Y[1].Replace("mm", ""));
lbl_DistYShow.Text = Y[1].Replace("mm", "");
log.Info("当前订单Y偏移:" + DistY);
log.Info("当前订单Y偏移:" + m_DistY);
break;
}
}
}
if (DistX == 0 || DistY == 0)
if (m_DistX == 0 || m_DistY == 0)
{
log.Debug("DistX，DistY未找到，请检查订单号是否正确");
btn_OrderNum.Enabled = true;
@@ -1024,8 +1024,9 @@ namespace TetraPackOCR
/// </summary>
void ClearData()
{
ProductStandard = null;
NumberOfLanes = 0; width = 0; Gradient = 0; DistX = 0; DistY = 0;
m_ProductStandard = null;
NumberOfLanes = 0; m_width = 0; m_Gradient = 0; m_DistX = 0; m_DistY = 0;
m_height = 0;
}
/// <summary>
/// 清空上次订单显示区
@@ -1899,7 +1900,7 @@ namespace TetraPackOCR
List<float> ocrxx = new List<float>();
List<float> ocryy = new List<float>();
switch (ProductStandard)
switch (m_ProductStandard)
{
case "TBA1000Slim":
switch (ocrTextRequest[1].Count)
@@ -2027,18 +2028,18 @@ namespace TetraPackOCR
{
if (item == 0)
{
ocrx = xx - ((float)DistX) * ((float)Math.Cos((rr * Math.PI) / 180)) - ((float)DistY) * ((float)Math.Sin((rr * Math.PI) / 180));
ocrx = xx - ((float)m_DistX) * ((float)Math.Cos((rr * Math.PI) / 180)) - ((float)m_DistY) * ((float)Math.Sin((rr * Math.PI) / 180));
l.Add(ocrx);
ocry = yy + ((float)DistY) * ((float)Math.Cos((rr * Math.PI) / 180)) - ((float)DistX) * ((float)Math.Sin((rr * Math.PI) / 180));
ocry = yy + ((float)m_DistY) * ((float)Math.Cos((rr * Math.PI) / 180)) - ((float)m_DistX) * ((float)Math.Sin((rr * Math.PI) / 180));
l.Add(ocry);
ocrxx.Add(ocrx);
ocryy.Add(ocry);
}
else
{
ocrx = ocrx + ((float)width * ((float)Math.Cos((rr * Math.PI) / 180))) + ((float)Gradient * ((float)Math.Sin((rr * Math.PI) / 180)));
ocrx = ocrx + ((float)m_width * ((float)Math.Cos((rr * Math.PI) / 180))) + ((float)m_Gradient * ((float)Math.Sin((rr * Math.PI) / 180)));
l.Add(ocrx);
ocry = ocry - ((float)Gradient * ((float)Math.Cos((rr * Math.PI) / 180))) + ((float)width * ((float)Math.Sin((rr * Math.PI) / 180)));
ocry = ocry - ((float)m_Gradient * ((float)Math.Cos((rr * Math.PI) / 180))) + ((float)m_width * ((float)Math.Sin((rr * Math.PI) / 180)));
l.Add(ocry);
ocrxx.Add(ocrx);
ocryy.Add(ocry);
@@ -2081,7 +2082,6 @@ namespace TetraPackOCR
}
}
byte[] datax = DataConverter.FloatToByte(d, true);
cc24?.NotifyCamInspectionComplete(0, datax);
cc24?.NotifyCamAcqComplete(0);
log.Info("坐标已发送完成。");