Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c99d0bec9a | |||
| a021342910 | |||
| 0b61e83da6 |
@ -244,7 +244,11 @@ namespace AssistClient
|
||||
case "qs":
|
||||
return "缺失";
|
||||
case "dc":
|
||||
return "多出";
|
||||
return "多出";
|
||||
case "gsdl":
|
||||
return "钢丝断裂";
|
||||
case "gs":
|
||||
return "格栅";
|
||||
default:
|
||||
return "未知";
|
||||
|
||||
|
||||
@ -161,7 +161,7 @@
|
||||
this.Name = "FrmLogin";
|
||||
this.ShowIcon = false;
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
this.Text = "修复控制台 - v1.2.2";
|
||||
this.Text = "修复控制台 - v1.2.2A";
|
||||
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmLogin_FormClosed);
|
||||
this.Load += new System.EventHandler(this.FrmLogin_Load);
|
||||
this.Shown += new System.EventHandler(this.FrmLogin_Shown);
|
||||
|
||||
@ -421,7 +421,7 @@
|
||||
this.gpbDefectList.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.gpbDefectList.Name = "gpbDefectList";
|
||||
this.gpbDefectList.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.gpbDefectList.Size = new System.Drawing.Size(437, 377);
|
||||
this.gpbDefectList.Size = new System.Drawing.Size(440, 377);
|
||||
this.gpbDefectList.TabIndex = 4;
|
||||
this.gpbDefectList.TabStop = false;
|
||||
this.gpbDefectList.Text = "缺陷明细";
|
||||
@ -469,7 +469,7 @@
|
||||
this.dgvProcess.RowsDefaultCellStyle = dataGridViewCellStyle5;
|
||||
this.dgvProcess.RowTemplate.Height = 30;
|
||||
this.dgvProcess.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
|
||||
this.dgvProcess.Size = new System.Drawing.Size(433, 359);
|
||||
this.dgvProcess.Size = new System.Drawing.Size(436, 359);
|
||||
this.dgvProcess.TabIndex = 3;
|
||||
this.dgvProcess.CellDoubleClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProcess_CellDoubleClick);
|
||||
//
|
||||
@ -975,7 +975,7 @@
|
||||
this.Name = "FrmMain";
|
||||
this.ShowIcon = false;
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
this.Text = "修复控制台 - v1.2.2";
|
||||
this.Text = "修复控制台 - v1.2.2A";
|
||||
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
|
||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMain_FormClosing);
|
||||
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmMain_FormClosed);
|
||||
|
||||
@ -458,31 +458,31 @@
|
||||
<data name="tsbtnPause1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
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
|
||||
AElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
|
||||
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
|
||||
//通过使用 "*"，如下所示:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.2.2.0")]
|
||||
[assembly: AssemblyFileVersion("1.2.2.0")]
|
||||
[assembly: AssemblyVersion("1.2.2.1")]
|
||||
[assembly: AssemblyFileVersion("1.2.2.1")]
|
||||
|
||||
@ -61,8 +61,9 @@ namespace ProductionControl
|
||||
//缺陷配置
|
||||
public static Size Defect_CutSize, Defect_ReSize;
|
||||
public static float Defect_Thresholds;
|
||||
public static string Defect_SavePath, Defect_Compress_SavePath, Defect_Small_SavePath;
|
||||
public static double Defect_SavePath_AutoClear =-1,Defect_Compress_SavePath_AutoClear=-1,Defect_Small_SavePath_AutoClear=-1;
|
||||
public static string Defect_SavePath, Defect_Compress_SavePath, Defect_Small_SavePath, Defect_SrcSmall_SavePath;
|
||||
public static double Defect_SavePath_AutoClear =-1,Defect_Compress_SavePath_AutoClear=-1,Defect_Small_SavePath_AutoClear=-1, Defect_SrcSmall_SavePath_AutoClear = -1;
|
||||
public static double Defect_SrcSmall_Thres;
|
||||
public static bool SaveAllDefectImg, MakeTag;
|
||||
|
||||
public static double PT_Offset = 0;//PT偏移值
|
||||
@ -120,6 +121,9 @@ namespace ProductionControl
|
||||
if (Defect_Small_SavePath_AutoClear >= 0)
|
||||
DeleteFiles(Config.Defect_Small_SavePath, Defect_Small_SavePath_AutoClear, true);
|
||||
|
||||
if (Defect_SrcSmall_SavePath_AutoClear >= 0)
|
||||
DeleteFiles(Config.Defect_SrcSmall_SavePath, Defect_SrcSmall_SavePath_AutoClear, true);
|
||||
|
||||
//
|
||||
if (SizeBmp_SavePath_AutoClear >= 0)
|
||||
DeleteFiles(Config.SizeBmp_SavePath, SizeBmp_SavePath_AutoClear, true);
|
||||
@ -151,6 +155,9 @@ namespace ProductionControl
|
||||
if (Defect_Small_SavePath_AutoClear>=0)
|
||||
DeleteFiles(Config.Defect_Small_SavePath, Defect_Small_SavePath_AutoClear, true);
|
||||
|
||||
if (Defect_SrcSmall_SavePath_AutoClear >= 0)
|
||||
DeleteFiles(Config.Defect_SrcSmall_SavePath, Defect_SrcSmall_SavePath_AutoClear, true);
|
||||
|
||||
//
|
||||
if (SizeBmp_SavePath_AutoClear >= 0)
|
||||
DeleteFiles(Config.SizeBmp_SavePath, SizeBmp_SavePath_AutoClear, true);
|
||||
@ -282,7 +289,15 @@ namespace ProductionControl
|
||||
SaveAllDefectImg = (lsTmp == "1");
|
||||
MakeTag = Util.ReadIniValue(configPath, "DEV", "MakeTag") == "1";
|
||||
SizeEnginePath = Util.ReadIniValue(configPath, "DEV", "SizeEnginePath");
|
||||
|
||||
//////////////////////////////////////////////////////////////
|
||||
///原始缺陷小图
|
||||
Defect_SrcSmall_SavePath = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath");
|
||||
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath_AutoClear");
|
||||
if (Util.IsDecimal(lsTmp)) Defect_SrcSmall_SavePath_AutoClear = Convert.ToDouble(lsTmp);
|
||||
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_Thres");
|
||||
if (Util.IsDecimal(lsTmp)) Defect_SrcSmall_Thres = Convert.ToDouble(lsTmp);
|
||||
|
||||
//////////////////////////////////////////////////////////////
|
||||
SizeBmp_SavePath = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath");
|
||||
lsTmp = Util.ReadIniValue(configPath, "DEV", "SizeBmp_SavePath_AutoClear");
|
||||
if (Util.IsDecimal(lsTmp)) SizeBmp_SavePath_AutoClear = Convert.ToDouble(lsTmp);
|
||||
|
||||
@ -257,7 +257,10 @@ namespace ProductionControl.Device
|
||||
stopwatch.Start();
|
||||
IDisposableReadOnlyCollection<DisposableNamedOnnxValue>[] results = yolo1.RunModlel(_onnxSession, task.tensors);
|
||||
liStep = 1;
|
||||
task.informationList = yolo1.ScreeningResults_YD(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
|
||||
if(task.ModelType == "pt")
|
||||
task.informationList = yolo1.ScreeningResults_YD(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
|
||||
else
|
||||
task.informationList = yolo1.ScreeningResults_YD_RJ(results, task.bmps_resize, task.thresholds, task.thresholdsClass, task.recAreaThreshold);
|
||||
liStep = 2;
|
||||
|
||||
//当前大图上缺陷个数
|
||||
@ -421,6 +424,8 @@ namespace ProductionControl.Device
|
||||
public bool isSucceed;//转换是否成功
|
||||
public string resultInfo = "";//成功或失败信息
|
||||
public long[] stopwatch = new long[5];
|
||||
|
||||
public string ModelType = "";
|
||||
}
|
||||
|
||||
public void add(DefectTask task)
|
||||
|
||||
@ -205,8 +205,10 @@ namespace ProductionControl
|
||||
hs,//划伤
|
||||
yx,//压线
|
||||
xb,//斜边
|
||||
sx,//栅线
|
||||
gsdl,//栅线 改为钢丝断裂
|
||||
ds,//断栅
|
||||
sx,
|
||||
gs,//格栅
|
||||
}
|
||||
public enum DefectNameEnum
|
||||
{
|
||||
@ -220,8 +222,10 @@ namespace ProductionControl
|
||||
划伤,
|
||||
压线,
|
||||
斜边,
|
||||
钢丝断裂, //栅线,
|
||||
断栅,
|
||||
栅线,
|
||||
断栅
|
||||
格栅
|
||||
}
|
||||
public enum ValType
|
||||
{
|
||||
|
||||
2
halftoneproject-master/Code/FrmLogin.Designer.cs
generated
2
halftoneproject-master/Code/FrmLogin.Designer.cs
generated
@ -159,7 +159,7 @@
|
||||
this.Name = "FrmLogin";
|
||||
this.ShowIcon = false;
|
||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
|
||||
this.Text = "自动化视觉检测系统 - v1.2.4";
|
||||
this.Text = "自动化视觉检测系统 - v1.2.5";
|
||||
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmLogin_FormClosed);
|
||||
this.Load += new System.EventHandler(this.FrmLogin_Load);
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
|
||||
|
||||
17
halftoneproject-master/Code/FrmMain.Designer.cs
generated
17
halftoneproject-master/Code/FrmMain.Designer.cs
generated
@ -548,7 +548,6 @@
|
||||
//
|
||||
// tsbtnStart
|
||||
//
|
||||
this.tsbtnStart.Enabled = false;
|
||||
this.tsbtnStart.Image = ((System.Drawing.Image)(resources.GetObject("tsbtnStart.Image")));
|
||||
this.tsbtnStart.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
|
||||
this.tsbtnStart.ImageTransparentColor = System.Drawing.Color.Magenta;
|
||||
@ -1552,7 +1551,7 @@
|
||||
this.splitContainer2.Panel2.Controls.Add(this.gboxDefectList);
|
||||
this.splitContainer2.Panel2MinSize = 400;
|
||||
this.splitContainer2.Size = new System.Drawing.Size(463, 523);
|
||||
this.splitContainer2.SplitterDistance = 31;
|
||||
this.splitContainer2.SplitterDistance = 33;
|
||||
this.splitContainer2.SplitterWidth = 3;
|
||||
this.splitContainer2.TabIndex = 10;
|
||||
//
|
||||
@ -1572,7 +1571,7 @@
|
||||
// splitContainer3.Panel2
|
||||
//
|
||||
this.splitContainer3.Panel2.Controls.Add(this.picScanner2);
|
||||
this.splitContainer3.Size = new System.Drawing.Size(31, 523);
|
||||
this.splitContainer3.Size = new System.Drawing.Size(33, 523);
|
||||
this.splitContainer3.SplitterDistance = 226;
|
||||
this.splitContainer3.SplitterWidth = 3;
|
||||
this.splitContainer3.TabIndex = 11;
|
||||
@ -1586,7 +1585,7 @@
|
||||
this.picScanner1.Location = new System.Drawing.Point(0, 0);
|
||||
this.picScanner1.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.picScanner1.Name = "picScanner1";
|
||||
this.picScanner1.Size = new System.Drawing.Size(31, 226);
|
||||
this.picScanner1.Size = new System.Drawing.Size(33, 226);
|
||||
this.picScanner1.TabIndex = 7;
|
||||
this.picScanner1.TabStop = false;
|
||||
//
|
||||
@ -1598,7 +1597,7 @@
|
||||
this.picScanner2.Location = new System.Drawing.Point(0, 0);
|
||||
this.picScanner2.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.picScanner2.Name = "picScanner2";
|
||||
this.picScanner2.Size = new System.Drawing.Size(31, 294);
|
||||
this.picScanner2.Size = new System.Drawing.Size(33, 294);
|
||||
this.picScanner2.TabIndex = 9;
|
||||
this.picScanner2.TabStop = false;
|
||||
//
|
||||
@ -1612,7 +1611,7 @@
|
||||
this.gboxDefectList.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.gboxDefectList.Name = "gboxDefectList";
|
||||
this.gboxDefectList.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.gboxDefectList.Size = new System.Drawing.Size(429, 523);
|
||||
this.gboxDefectList.Size = new System.Drawing.Size(427, 523);
|
||||
this.gboxDefectList.TabIndex = 3;
|
||||
this.gboxDefectList.TabStop = false;
|
||||
this.gboxDefectList.Tag = "0";
|
||||
@ -1624,7 +1623,7 @@
|
||||
this.lblDefectAddTag.AutoSize = true;
|
||||
this.lblDefectAddTag.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.lblDefectAddTag.ForeColor = System.Drawing.Color.Blue;
|
||||
this.lblDefectAddTag.Location = new System.Drawing.Point(278, 2);
|
||||
this.lblDefectAddTag.Location = new System.Drawing.Point(276, 2);
|
||||
this.lblDefectAddTag.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
||||
this.lblDefectAddTag.Name = "lblDefectAddTag";
|
||||
this.lblDefectAddTag.Size = new System.Drawing.Size(0, 12);
|
||||
@ -1639,7 +1638,7 @@
|
||||
this.pnlBmpList.Location = new System.Drawing.Point(2, 16);
|
||||
this.pnlBmpList.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.pnlBmpList.Name = "pnlBmpList";
|
||||
this.pnlBmpList.Size = new System.Drawing.Size(425, 505);
|
||||
this.pnlBmpList.Size = new System.Drawing.Size(423, 505);
|
||||
this.pnlBmpList.TabIndex = 0;
|
||||
//
|
||||
// chkBuzzer
|
||||
@ -1727,7 +1726,7 @@
|
||||
this.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.Name = "FrmMain";
|
||||
this.ShowIcon = false;
|
||||
this.Text = "自动化视觉检测系统 - v1.2.4";
|
||||
this.Text = "自动化视觉检测系统 - v1.2.5";
|
||||
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
|
||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmMian_FormClosing);
|
||||
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmMian_FormClosed);
|
||||
|
||||
@ -23,6 +23,7 @@ using System.Security.Cryptography;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web.Routing;
|
||||
using System.Windows.Forms;
|
||||
using static ProductionControl.Device.AxisDev;
|
||||
using static ProductionControl.Device.DefectLib;
|
||||
@ -38,6 +39,7 @@ namespace ProductionControl
|
||||
private DevContainer devContainer = new DevContainer();
|
||||
private Service.ProductService svcProduct = new Service.ProductService();
|
||||
private Service.OrderService svcOrder = new Service.OrderService();
|
||||
Service.ClassesService svcClasses = new Service.ClassesService();
|
||||
private bool bExitApp = false;
|
||||
//禁用蜂鸣器，门磁
|
||||
private bool disableBuzzer, disableDoorSensor;
|
||||
@ -155,6 +157,9 @@ namespace ProductionControl
|
||||
|
||||
//读取硬盘剩余空间
|
||||
Config.CheckDisk();
|
||||
|
||||
//测试
|
||||
|
||||
}
|
||||
private void loadProductCodeList()
|
||||
{
|
||||
@ -372,6 +377,8 @@ namespace ProductionControl
|
||||
order.StepId = (int)currProductModel.StepId;
|
||||
order.SN = sn;
|
||||
order.BatchId = currProductModel.BatchId;
|
||||
//order.ProductInfo = model;
|
||||
|
||||
errStep = 9;
|
||||
int nextStepId = 0;
|
||||
do
|
||||
@ -1365,6 +1372,8 @@ namespace ProductionControl
|
||||
AddTextEvent($"{stepIndex + 1}-{processName}", $"开始缺陷检测，源图索引:{defectBmpNum},图像队列数量: {scannerGBmpQueue.Count}...");
|
||||
string[] aarCut_size = processParam.Value<string>("CutSize").Split(',');
|
||||
string[] aarResize = processParam.Value<string>("Resize").Split(',');
|
||||
|
||||
//string[] arrThresClass = processParam.Value<string>("ThresholdsClass").Split(',');
|
||||
//图纸
|
||||
attachmentFile = model.AttachmentList.FirstOrDefault(x => x.Type == 0);
|
||||
if (attachmentFile != null)
|
||||
@ -1373,9 +1382,29 @@ namespace ProductionControl
|
||||
if (!File.Exists(gbxBmpPath + attachmentFile.ExtendName)) gbxBmpPath = "";
|
||||
}
|
||||
AddTextEvent($"{stepIndex + 1}-{processName}", $"图纸路径:{gbxBmpPath}");
|
||||
|
||||
string modeltp = "pt";
|
||||
Classes tClasses = svcClasses.GetById(model.ClassesId);
|
||||
if (tClasses != null)
|
||||
{
|
||||
if (tClasses.Name == "乳剂")
|
||||
modeltp = "rj";
|
||||
else
|
||||
modeltp = "pt";
|
||||
}
|
||||
|
||||
string thr = "";
|
||||
if (tClasses.Name == "乳剂")
|
||||
thr = processParam.Value<string>("ThresholdsClass").Split(',').Length == 11 ?
|
||||
processParam.Value<string>("ThresholdsClass") + ",0.3" : processParam.Value<string>("ThresholdsClass");
|
||||
else
|
||||
thr = processParam.Value<string>("ThresholdsClass").Split(',').Length == 11 ?
|
||||
processParam.Value<string>("ThresholdsClass") + ",0.3,0.3" : processParam.Value<string>("ThresholdsClass").Split(',').Length == 12 ?
|
||||
processParam.Value<string>("ThresholdsClass") + ",0.3" : processParam.Value<string>("ThresholdsClass");
|
||||
devContainer.libDefect.add(new DefectTask()
|
||||
{
|
||||
stepIndex= stepIndex,
|
||||
ModelType = modeltp,
|
||||
stepIndex = stepIndex,
|
||||
processName= processName,
|
||||
drawingPagePath= gbxBmpPath,
|
||||
index = defectBmpNum++,
|
||||
@ -1385,7 +1414,7 @@ namespace ProductionControl
|
||||
cut_size = new System.Drawing.Size(Convert.ToInt32(aarCut_size[0]), Convert.ToInt32(aarCut_size[1])),
|
||||
resize = new System.Drawing.Size(Convert.ToInt32(aarResize[0]), Convert.ToInt32(aarResize[1])),
|
||||
thresholds = processParam.Value<float>("Thresholds"),
|
||||
thresholdsClass = processParam.Value<string>("ThresholdsClass"),
|
||||
thresholdsClass = thr,
|
||||
recAreaThreshold= getProductAreaThreshol(model), //qxName,面积; qxName,面积; qxName,面积;
|
||||
finishEvent = (res) =>
|
||||
{
|
||||
@ -1393,7 +1422,7 @@ namespace ProductionControl
|
||||
{
|
||||
setDgvContentCol(liStatocStepIndex, $"源图索引:{res.index}，缺陷数:{res.defectCount}，处理时间(ms):{string.Join("->", res.stopwatch.Select(i => i.ToString()).ToArray())}");
|
||||
AddTextEvent($"{res.stepIndex + 1}-{res.processName}", $"缺陷检测完成(源图索引:{res.index})，缺陷数:{res.defectCount}，处理时间(ms):{string.Join("->", res.stopwatch.Select(i => i.ToString()).ToArray())}");
|
||||
string path;
|
||||
string path = "";
|
||||
if (res.defectCount > 0)
|
||||
{
|
||||
//UI显示小图 (含统计缺陷类型数量)
|
||||
@ -1435,6 +1464,39 @@ namespace ProductionControl
|
||||
res.bmps_tag[i].Save(path + $"_i{i}.bmp", ImageFormat.Bmp);
|
||||
}
|
||||
|
||||
//保存原始小图
|
||||
if (Config.Defect_SrcSmall_SavePath != "" && Directory.Exists(Config.Defect_SrcSmall_SavePath))
|
||||
{
|
||||
string sinfo = "";
|
||||
int sterr = 0;
|
||||
try
|
||||
{
|
||||
for (int i = 0; i < res.defectInfor2RestorationDesk.Count(); i++)
|
||||
{
|
||||
sterr = 1;
|
||||
sinfo = JsonConvert.SerializeObject(res.defectInfor2RestorationDesk[i]);
|
||||
int indext = int.Parse(res.defectInfor2RestorationDesk[i][0]);
|
||||
double thres = double.Parse(res.defectInfor2RestorationDesk[i][4]);
|
||||
if (thres >= Config.Defect_SrcSmall_Thres)
|
||||
{
|
||||
path = Util.createSubDir(Config.Defect_SrcSmall_SavePath,
|
||||
new List<string> { order.CreateTime.ToString("yyyyMMdd"),
|
||||
order.SN,
|
||||
model.MainGrid == 1?"主栅":model.ClassesId == 7?"rj":"pi",
|
||||
res.defectInfor2RestorationDesk[i][3]});
|
||||
sterr = 2;
|
||||
path += $"Defect_SN{order.SN}_I{res.index}_X{res.Xmm}_Y{res.Ymm}_{model.StepInfo.Name}";
|
||||
res.bmps_cut[indext].ImWrite(path + $"_i{i}.bmp");
|
||||
sterr = 3;
|
||||
}
|
||||
}
|
||||
}catch (Exception ex)
|
||||
{
|
||||
AddTextEvent($"{res.stepIndex + 1}-{res.processName}", $"原始小图保存出错{sterr}-{sinfo}-{path}:{ex.Message}");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
//保存压缩大图 -- 用于修复台调用
|
||||
if (Config.Defect_Compress_SavePath != "" && Directory.Exists(Config.Defect_Compress_SavePath))
|
||||
{
|
||||
@ -1617,12 +1679,18 @@ namespace ProductionControl
|
||||
int itemDefectCount;
|
||||
foreach (var item in model.QualifiedCriterionList)
|
||||
{
|
||||
defectCode = EnumUtil.Convert2Enum<DefectCodeEnum>(item.DefectCode);
|
||||
itemDefectCount = getDefectCountFromCode(order, defectCode);
|
||||
if (item.MaxDefectCount>-1 && itemDefectCount > item.MaxDefectCount)
|
||||
try
|
||||
{
|
||||
order.Qualified = false;
|
||||
defectNames += $"{((DefectNameEnum)(int)defectCode).ToString()}({itemDefectCount}),";
|
||||
defectCode = EnumUtil.Convert2Enum<DefectCodeEnum>(item.DefectCode);
|
||||
itemDefectCount = getDefectCountFromCode(order, defectCode);
|
||||
if (item.MaxDefectCount > -1 && itemDefectCount > item.MaxDefectCount)
|
||||
{
|
||||
order.Qualified = false;
|
||||
defectNames += $"{((DefectNameEnum)(int)defectCode).ToString()}({itemDefectCount}),";
|
||||
}
|
||||
}catch (Exception ex)
|
||||
{
|
||||
;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2208,9 +2276,11 @@ namespace ProductionControl
|
||||
case "xb":
|
||||
order.XBCount++;
|
||||
break;
|
||||
case "sx":
|
||||
case "gsdl"://sx =>gsdl
|
||||
order.SXCount++;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -2238,7 +2308,7 @@ namespace ProductionControl
|
||||
return order.YXCount;
|
||||
case DefectCodeEnum.xb:
|
||||
return order.XBCount;
|
||||
case DefectCodeEnum.sx:
|
||||
case DefectCodeEnum.gsdl:
|
||||
return order.SXCount;
|
||||
default:
|
||||
return 0;
|
||||
|
||||
@ -643,20 +643,20 @@
|
||||
<value>
|
||||
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
|
||||
</value>
|
||||
</data>
|
||||
<data name="tsbtnDefectImage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
@ -665,11 +665,11 @@
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG9SURBVFhHYxgS4F+GuvqvFGVjKJf24KW9KM+nEJnk3+kq
|
||||
x/7nqf//l632H+iA/1+i5f6/DpC89MJVpOiRhQwnVDl1wbH6wmUPAjT/fwyV+Q90wH90B7wLkPr/wlX0
|
||||
/0MbgRv3THjVodqoBx6Y8f1/7iRC0AFPbAT/3zfl+nzflCcQqhUveOkm2gtl4gekOOChOf9/kPpHFgIz
|
||||
gdEmATUCBfzLUlb5Fiu/EeiA/1Ah/IAsB1gK/L/vwPX5pbvo3vfBUu1f4xXSfqcpN/7NUVv3PFftz7dY
|
||||
gdEmATUCBfzLUlb5Fiu/EeiA/1Ah/IAsB1gK/L/vwPX5pbvo3vfBUu1f4xXSfqcpN/7NUVv3NFftz7dY
|
||||
hf80d8AzB+H/rz3F/38Ilv7/LU4BrPdfrhoYjzpg1AGjDhh1wNB3wM9s1ee/UhSv0s0BT92k/l8uDfkP
|
||||
LM89/tdrsUGlGP6HarG9CZAxA7YHJgMd8JMmDrgU7/Z/44o1/+es34NXwxMrfoOH5tz3qO6A9QdO/1+x
|
||||
8yhBB4DAXWNB/vumvDMJOeBLrDyopoyFasMPSHEADDyyEPR4Ziv8BN0BH5LVvv3NUZ32PUZOEaqUMCDH
|
||||
ATDwzkdS7l2glB/QwuRfmcrG/wrJaDdS4gCqgFEHjDpg3YFT9WAHrNtTDxUaBcMZMDAAAEpq3zdLEAiX
|
||||
ATDwzkdS7l2glB/QwuRfmcrG/wrJaDdS4gCqgFEHjDpg3YFT9WAHrNtTDxUaBcMZMDAAADD43zUflyTt
|
||||
AAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
@ -695,15 +695,15 @@
|
||||
<data name="tsbtnSizeImage.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHLSURBVFhH7dY9SAJhGMDxm4IgaG0KgqA1sg91abChIsMG
|
||||
GwJz0EKDChsiatBampqCIGiOGlKiQDLNoDw5+7rkSjMuy7yMSj0xA+HqyeJtqOBE06C4/3T33vu8/IaD
|
||||
O+xPFB5O1FzpWRG6LX5UM1Xm72E0tPYOZwaSEBlMwbUuAee9t3CoCHh3ZeQILsZL0fbCtmYkFvFuCjIA
|
||||
CGqj8BVAKmhwyY7B1uT2W+t3a9BY4bI14uBpO80KcEgIWG/Ak3Yx0YVGeduXB2bQJX+5AN72bkk9gLeQ
|
||||
85QyWIGO+FTIwFYHNdHVA3kA0BJ/+QG8QLTTyTMV4wjp49PRca4/YXqevBtNm31DN1ywLwZFB5BdNJyp
|
||||
IhDSsxCb4CBhArgfTQMz9AgCQAAIAAHw9wHhwVTkWhc/+TUAIT+BnTEfZD4irZQSStAjjFJSJUcKutEl
|
||||
I2cdEme6KACr2g0ry25YsNh5B5xSotZW57ooOMCyvQdLG66sgLc2RfvldikxnxWgjiUPOs5VaIy/XAAf
|
||||
4TKyNfNuhL8D2KcMYO5SG69CW7OXD+AjWsVUXulinQ8TnIadAlHI8JL7f+NPAAVJAAgA87bH+A4w241o
|
||||
Seg/h2GvTpv1N1uFB9AAAAAASUVORK5CYII=
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHKSURBVFhH7dY/SAJRHMBxJyEIWpuCIHCNLEuXBhsqMmyw
|
||||
ITAHLTTQsCEiB6ulqSkIguaoISMKItMU0pMzrUvO/hiXaR5GpZ5YgWD90ngNFZxYGhT3ne7evd/jMxzc
|
||||
8f5EsdG0IKJjhOi28pHtZPXZAK2mNLcYPZKBuP4RrrVpuBi8gUN5KOCSEmNYG1aFtpe3TTO+jPWTkAdA
|
||||
WJOAzwBCToFbegzWVs/ZdrNLgMbKl1WEgbfrpCjALsZhqwXL2NrwPjTKmk8WmkOX7JUCKOzdk3gB6yAW
|
||||
SUW4Fh3xoaiRaQirExt+WQjQEnvfAwQA76Yy50raHtWlZhOTueH01PP07XjWEjTEcuGhJFQcQPRRcK6M
|
||||
Q1THQNKUg/QUwN14FmjDA3AADsABOMDfB8T0j/FrbSr4awBcFoT9iVPIf0Q6SQXw0SMeqSD5R3JK5JYS
|
||||
83axI1sRwLbKA2urHlhat7EOOCR4o7XJfVl2wLrzAFZ23EUBhXaFvhqbBF8sClAlM/6eCyUaY68UwHuY
|
||||
lOjMvxuxrwDmKQ9YuNKk6tHW4n0H8B6lpOsi2mTvvSmnZmZAGDW+lP7f+BNAWeIAHMDi9JrfABabGS1x
|
||||
/ed4vFcbu/UzQvv+oQAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="tsbtnLight.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
@ -730,8 +730,8 @@
|
||||
hSD+56M51fL5Z2xlyAfodJyTcaLd9RzkewtHdhEF7GHlB3rBESBlTn9ZbqhuHUoy5yd1CGFB5X0INOsc
|
||||
4L/h+gBwY9z1HK5xfc9l/kNXwuEnFR5xPg+SPeSbaEdA2jGE5tYhtvQscppHcOj0ZaTXdCOysBEhtkr4
|
||||
J9vxRUwe4CP3GVPPISY+MccdAdbY5FRj4lloBNJO9KCi8wouTs5iYoZNcO0mGvrGkXOyG1FFzdhxuP7v
|
||||
CBgTz8I3wW51JwKbo/OsxsSzuBMBhQpYLAIqwBy9PQhILbNaLGHORSJw+26/EHt+arMuFBBR0PD/OL4D
|
||||
z0PkL0wqc7U3HF6aAAAAAElFTkSuQmCC
|
||||
CBgTz8I3wW51JwKbo/OsxsSzuBMBhQpYLAIqwBy9PQhILbNaLFbnIhG4fbdfiD0/tVkXCogoaPh/HN+B
|
||||
5yHyF0eGc7OhWfXwAAAAAElFTkSuQmCC
|
||||
</value>
|
||||
</data>
|
||||
<data name="tsbtnLog.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
|
||||
@ -105,6 +105,7 @@
|
||||
this.tabPage3 = new System.Windows.Forms.TabPage();
|
||||
this.groupBox7 = new System.Windows.Forms.GroupBox();
|
||||
this.panel6 = new System.Windows.Forms.Panel();
|
||||
this.cbHavePad = new System.Windows.Forms.CheckBox();
|
||||
this.label24 = new System.Windows.Forms.Label();
|
||||
this.cbMainGrid = new System.Windows.Forms.CheckBox();
|
||||
this.cbMarkDisturb = new System.Windows.Forms.CheckBox();
|
||||
@ -121,7 +122,6 @@
|
||||
this.tabPage2 = new System.Windows.Forms.TabPage();
|
||||
this.tabPage4 = new System.Windows.Forms.TabPage();
|
||||
this.flpQualifiedPannel = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.cbHavePad = new System.Windows.Forms.CheckBox();
|
||||
this.groupBox10.SuspendLayout();
|
||||
this.panel10.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numTensionDownFloatValue)).BeginInit();
|
||||
@ -721,7 +721,7 @@
|
||||
this.tabControl1.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.tabControl1.Name = "tabControl1";
|
||||
this.tabControl1.SelectedIndex = 0;
|
||||
this.tabControl1.Size = new System.Drawing.Size(424, 352);
|
||||
this.tabControl1.Size = new System.Drawing.Size(424, 417);
|
||||
this.tabControl1.TabIndex = 36;
|
||||
//
|
||||
// tabPage1
|
||||
@ -732,7 +732,7 @@
|
||||
this.tabPage1.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.tabPage1.Name = "tabPage1";
|
||||
this.tabPage1.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.tabPage1.Size = new System.Drawing.Size(416, 326);
|
||||
this.tabPage1.Size = new System.Drawing.Size(416, 391);
|
||||
this.tabPage1.TabIndex = 0;
|
||||
this.tabPage1.Text = "基础信息";
|
||||
//
|
||||
@ -760,7 +760,7 @@
|
||||
this.panel8.Location = new System.Drawing.Point(2, 2);
|
||||
this.panel8.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.panel8.Name = "panel8";
|
||||
this.panel8.Size = new System.Drawing.Size(412, 322);
|
||||
this.panel8.Size = new System.Drawing.Size(412, 387);
|
||||
this.panel8.TabIndex = 1;
|
||||
//
|
||||
// cmbDefectModelFile
|
||||
@ -837,7 +837,7 @@
|
||||
this.groupBox4.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox4.Name = "groupBox4";
|
||||
this.groupBox4.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox4.Size = new System.Drawing.Size(409, 221);
|
||||
this.groupBox4.Size = new System.Drawing.Size(409, 278);
|
||||
this.groupBox4.TabIndex = 32;
|
||||
this.groupBox4.TabStop = false;
|
||||
this.groupBox4.Text = "历史批次";
|
||||
@ -888,7 +888,7 @@
|
||||
this.dgvBatchList.RowsDefaultCellStyle = dataGridViewCellStyle4;
|
||||
this.dgvBatchList.RowTemplate.Height = 30;
|
||||
this.dgvBatchList.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
|
||||
this.dgvBatchList.Size = new System.Drawing.Size(405, 203);
|
||||
this.dgvBatchList.Size = new System.Drawing.Size(405, 260);
|
||||
this.dgvBatchList.TabIndex = 6;
|
||||
//
|
||||
// colBatchId
|
||||
@ -1018,7 +1018,7 @@
|
||||
this.tabPage3.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.tabPage3.Name = "tabPage3";
|
||||
this.tabPage3.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.tabPage3.Size = new System.Drawing.Size(416, 326);
|
||||
this.tabPage3.Size = new System.Drawing.Size(416, 391);
|
||||
this.tabPage3.TabIndex = 2;
|
||||
this.tabPage3.Text = "图纸资料";
|
||||
this.tabPage3.UseVisualStyleBackColor = true;
|
||||
@ -1032,7 +1032,7 @@
|
||||
this.groupBox7.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox7.Name = "groupBox7";
|
||||
this.groupBox7.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox7.Size = new System.Drawing.Size(409, 102);
|
||||
this.groupBox7.Size = new System.Drawing.Size(409, 139);
|
||||
this.groupBox7.TabIndex = 34;
|
||||
this.groupBox7.TabStop = false;
|
||||
this.groupBox7.Text = "参数设置";
|
||||
@ -1048,9 +1048,19 @@
|
||||
this.panel6.Location = new System.Drawing.Point(2, 16);
|
||||
this.panel6.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.panel6.Name = "panel6";
|
||||
this.panel6.Size = new System.Drawing.Size(405, 84);
|
||||
this.panel6.Size = new System.Drawing.Size(405, 121);
|
||||
this.panel6.TabIndex = 0;
|
||||
//
|
||||
// cbHavePad
|
||||
//
|
||||
this.cbHavePad.AutoSize = true;
|
||||
this.cbHavePad.Location = new System.Drawing.Point(236, 47);
|
||||
this.cbHavePad.Name = "cbHavePad";
|
||||
this.cbHavePad.Size = new System.Drawing.Size(102, 16);
|
||||
this.cbHavePad.TabIndex = 6;
|
||||
this.cbHavePad.Text = "是否存在Pad点";
|
||||
this.cbHavePad.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// label24
|
||||
//
|
||||
this.label24.AutoSize = true;
|
||||
@ -1212,7 +1222,7 @@
|
||||
this.tabPage2.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.tabPage2.Name = "tabPage2";
|
||||
this.tabPage2.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.tabPage2.Size = new System.Drawing.Size(416, 326);
|
||||
this.tabPage2.Size = new System.Drawing.Size(416, 391);
|
||||
this.tabPage2.TabIndex = 1;
|
||||
this.tabPage2.Text = "测量合格标准";
|
||||
//
|
||||
@ -1222,7 +1232,7 @@
|
||||
this.tabPage4.Location = new System.Drawing.Point(4, 22);
|
||||
this.tabPage4.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.tabPage4.Name = "tabPage4";
|
||||
this.tabPage4.Size = new System.Drawing.Size(416, 326);
|
||||
this.tabPage4.Size = new System.Drawing.Size(416, 391);
|
||||
this.tabPage4.TabIndex = 3;
|
||||
this.tabPage4.Text = "外观合格标准";
|
||||
this.tabPage4.UseVisualStyleBackColor = true;
|
||||
@ -1234,25 +1244,15 @@
|
||||
this.flpQualifiedPannel.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.flpQualifiedPannel.Name = "flpQualifiedPannel";
|
||||
this.flpQualifiedPannel.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.flpQualifiedPannel.Size = new System.Drawing.Size(416, 326);
|
||||
this.flpQualifiedPannel.Size = new System.Drawing.Size(416, 391);
|
||||
this.flpQualifiedPannel.TabIndex = 0;
|
||||
//
|
||||
// cbHavePad
|
||||
//
|
||||
this.cbHavePad.AutoSize = true;
|
||||
this.cbHavePad.Location = new System.Drawing.Point(236, 47);
|
||||
this.cbHavePad.Name = "cbHavePad";
|
||||
this.cbHavePad.Size = new System.Drawing.Size(102, 16);
|
||||
this.cbHavePad.TabIndex = 6;
|
||||
this.cbHavePad.Text = "是否存在Pad点";
|
||||
this.cbHavePad.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// FrmProductInfo
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.BackColor = System.Drawing.SystemColors.ActiveCaption;
|
||||
this.ClientSize = new System.Drawing.Size(427, 412);
|
||||
this.ClientSize = new System.Drawing.Size(427, 476);
|
||||
this.Controls.Add(this.tabControl1);
|
||||
this.Controls.Add(this.toolStrip1);
|
||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
||||
|
||||
@ -127,16 +127,16 @@
|
||||
<data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIdSURBVFhH7ZdBS9xAFMefFMRCRegXkLbUi+CtFqXVS1v1
|
||||
A+xBRKOZmWReqgfxG3iT9tLSD9BWUUHwC3gTe6wt9ODRm3hWRKVUfTPMZjPu7G4mGwqCf/iR3Zl5//x3
|
||||
8pLdhXs51AFRMkKMF4bLMeBJv/HzUKXSCSzeAYHXpcBx2TjnlMAXdSbt88a45xCXr9NChof0Cb6DiFf9
|
||||
kd8gxAPtM4tHEEU95gwtFCWv0gAcv5rRYuJyJfUScsuMtlA2gJDrZrSYhPxc89J+gZlpomwAhhtmNL8Y
|
||||
ztHORfo1x09WgEk8gzDp1XMN1U6AxcWHVHela5U4fky9qoTxD5rp0PNOtRMgDLup7oQ41++5/JB6Wcgl
|
||||
Pe+U1QO4ZkbzKUkewduJf7pWyWpCi20975QdoMnCBtK3rWlegV8yXjWa7qwdQG3nsJnxE8MBqj3OeNXw
|
||||
CKBQTfWH2KcHzK/W0DqOvyEI/pr6ejwDlM/dDBAEp4Wo3hVZvAIoEyEngLHHhYjj5+SzZ3n67QA1VrsS
|
||||
mFienpfgkrp6AUTy0hsWD5LfePq1XOVuNmGZeAY4p0swA/x9n24odcyLWh9FQ8DkT8vz/zehRMvTeweE
|
||||
nAYhnsEcPtXH26hxF3z+CdXTj1z9iM4ZIPuj1EZ9J/jheghp5KY5m0Pq1nEWlUmzAEHQRYt264tKYmrq
|
||||
gnZ5zJytgSqVB7R4lPrB/berKALf6b64lyWAG3A0ZYu/HkZSAAAAAElFTkSuQmCC
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIfSURBVFhH7ZdPSxtBGMbfUJAWKoJfoLSlXgRvKpb+ObQ0
|
||||
+gFyKKKrOzO7827bg/Qb9FbaS0s/QG1FhYJfwJvYY1Xw4NGbeFYkiqh9Z5hsdppJsrNZCoIP/NhkZt5n
|
||||
n8y+u0ngRg5VIEqeEZOF4bIKPBk2fh6q1fqAxesg8KoUOH4wzjklcLTFpHdeGvcc4vJpWshwnz7BDxDx
|
||||
T3/kIoS4p33m8ACiaMCcoYui5EkagON3M1pMXH5MvYT8ZUa7KBtAyGUzWkxCfm16ab/AzHRQNgDDFTOa
|
||||
Xwznaeci/ZrjFyvAazyBMLmn59qqlwALC3eo7lLXKnH8nHo1COPfNFPR8071EiAM+6nuiKjr91x+Sr0s
|
||||
5Hs975TVA7hkRvMpSe7Ci+qFrlWymtBiTc87ZQfosLCN9G1rmlfgt4xXk447awdQ2/nYzPiJ4QjVHma8
|
||||
mngEUKim2iW26AGz3R1ax3EHguDc1LfiGaB8rmeAIDguROOuyOIVQJkIOQWMDRYijh+Rz6bl6bcD1Fi9
|
||||
SmBieXpegjPq6ncgknFvWDxGfpPp13KD69mEZeIZoE6XYBb4myHdUOqYF7U+iiaAyT+W5/9vQomWp/cO
|
||||
CDkDQjyEeXygj/+ixl3wt/epnn7k6kd0zgDZH6U26jvBD9dDSCNXzdkcUreOs6hMOgUIgtu0aKO1qCSm
|
||||
p09pl6vmbG1Uq92ixc+pH9x/u4oi8JXuixtZAvgLH6plf9csHs0AAAAASUVORK5CYII=
|
||||
</value>
|
||||
</data>
|
||||
<data name="tsbtnAddFile.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
|
||||
357
halftoneproject-master/Code/FrmSysSetting.Designer.cs
generated
357
halftoneproject-master/Code/FrmSysSetting.Designer.cs
generated
@ -189,6 +189,12 @@
|
||||
this.chkDefect_Small_Path_AutoClear = new System.Windows.Forms.CheckBox();
|
||||
this.chkMakeTag = new System.Windows.Forms.CheckBox();
|
||||
this.tabPage6 = new System.Windows.Forms.TabPage();
|
||||
this.groupBox24 = new System.Windows.Forms.GroupBox();
|
||||
this.panel24 = new System.Windows.Forms.Panel();
|
||||
this.label62 = new System.Windows.Forms.Label();
|
||||
this.numLineWidthoffset = new System.Windows.Forms.NumericUpDown();
|
||||
this.label60 = new System.Windows.Forms.Label();
|
||||
this.numPToffset = new System.Windows.Forms.NumericUpDown();
|
||||
this.groupBox21 = new System.Windows.Forms.GroupBox();
|
||||
this.panel21 = new System.Windows.Forms.Panel();
|
||||
this.btnSizeBmp_Zoom_Image_SavePath = new System.Windows.Forms.PictureBox();
|
||||
@ -239,12 +245,16 @@
|
||||
this.numHttpPort = new System.Windows.Forms.NumericUpDown();
|
||||
this.label49 = new System.Windows.Forms.Label();
|
||||
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
|
||||
this.groupBox24 = new System.Windows.Forms.GroupBox();
|
||||
this.panel24 = new System.Windows.Forms.Panel();
|
||||
this.label60 = new System.Windows.Forms.Label();
|
||||
this.numPToffset = new System.Windows.Forms.NumericUpDown();
|
||||
this.label62 = new System.Windows.Forms.Label();
|
||||
this.numLineWidthoffset = new System.Windows.Forms.NumericUpDown();
|
||||
this.groupBox25 = new System.Windows.Forms.GroupBox();
|
||||
this.panel25 = new System.Windows.Forms.Panel();
|
||||
this.pictureBox1 = new System.Windows.Forms.PictureBox();
|
||||
this.label63 = new System.Windows.Forms.Label();
|
||||
this.txtDefect_SrcSmall_SavePath = new System.Windows.Forms.TextBox();
|
||||
this.numDefect_SrcSmall_Path_AutoClear = new System.Windows.Forms.NumericUpDown();
|
||||
this.label64 = new System.Windows.Forms.Label();
|
||||
this.chkDefect_SrcSmall_Path_AutoClear = new System.Windows.Forms.CheckBox();
|
||||
this.Defect_SrcSmall_Thres = new System.Windows.Forms.NumericUpDown();
|
||||
this.label65 = new System.Windows.Forms.Label();
|
||||
this.toolStrip1.SuspendLayout();
|
||||
this.groupBox1.SuspendLayout();
|
||||
this.panel1.SuspendLayout();
|
||||
@ -320,6 +330,10 @@
|
||||
((System.ComponentModel.ISupportInitialize)(this.btnClearDefect_Small_Path)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numDefect_Small_Path_AutoClear)).BeginInit();
|
||||
this.tabPage6.SuspendLayout();
|
||||
this.groupBox24.SuspendLayout();
|
||||
this.panel24.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numLineWidthoffset)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numPToffset)).BeginInit();
|
||||
this.groupBox21.SuspendLayout();
|
||||
this.panel21.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.btnSizeBmp_Zoom_Image_SavePath)).BeginInit();
|
||||
@ -339,10 +353,11 @@
|
||||
this.groupBox18.SuspendLayout();
|
||||
this.panel18.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numHttpPort)).BeginInit();
|
||||
this.groupBox24.SuspendLayout();
|
||||
this.panel24.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numPToffset)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numLineWidthoffset)).BeginInit();
|
||||
this.groupBox25.SuspendLayout();
|
||||
this.panel25.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numDefect_SrcSmall_Path_AutoClear)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.Defect_SrcSmall_Thres)).BeginInit();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// toolStrip1
|
||||
@ -2136,6 +2151,7 @@
|
||||
//
|
||||
// tabPage5
|
||||
//
|
||||
this.tabPage5.Controls.Add(this.groupBox25);
|
||||
this.tabPage5.Controls.Add(this.groupBox19);
|
||||
this.tabPage5.Controls.Add(this.groupBox17);
|
||||
this.tabPage5.Controls.Add(this.chkMakeTag);
|
||||
@ -2380,6 +2396,104 @@
|
||||
this.tabPage6.Text = "尺寸图像";
|
||||
this.tabPage6.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// groupBox24
|
||||
//
|
||||
this.groupBox24.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.groupBox24.BackColor = System.Drawing.SystemColors.ActiveCaption;
|
||||
this.groupBox24.Controls.Add(this.panel24);
|
||||
this.groupBox24.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.groupBox24.Location = new System.Drawing.Point(2, 290);
|
||||
this.groupBox24.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox24.Name = "groupBox24";
|
||||
this.groupBox24.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox24.Size = new System.Drawing.Size(476, 73);
|
||||
this.groupBox24.TabIndex = 34;
|
||||
this.groupBox24.TabStop = false;
|
||||
this.groupBox24.Text = "尺寸补偿";
|
||||
//
|
||||
// panel24
|
||||
//
|
||||
this.panel24.BackColor = System.Drawing.Color.White;
|
||||
this.panel24.Controls.Add(this.label62);
|
||||
this.panel24.Controls.Add(this.numLineWidthoffset);
|
||||
this.panel24.Controls.Add(this.label60);
|
||||
this.panel24.Controls.Add(this.numPToffset);
|
||||
this.panel24.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.panel24.Location = new System.Drawing.Point(2, 16);
|
||||
this.panel24.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.panel24.Name = "panel24";
|
||||
this.panel24.Size = new System.Drawing.Size(472, 55);
|
||||
this.panel24.TabIndex = 0;
|
||||
//
|
||||
// label62
|
||||
//
|
||||
this.label62.AutoSize = true;
|
||||
this.label62.Location = new System.Drawing.Point(231, 20);
|
||||
this.label62.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
||||
this.label62.Name = "label62";
|
||||
this.label62.Size = new System.Drawing.Size(77, 12);
|
||||
this.label62.TabIndex = 16;
|
||||
this.label62.Text = "线宽补偿(um)";
|
||||
//
|
||||
// numLineWidthoffset
|
||||
//
|
||||
this.numLineWidthoffset.DecimalPlaces = 2;
|
||||
this.numLineWidthoffset.Increment = new decimal(new int[] {
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
65536});
|
||||
this.numLineWidthoffset.Location = new System.Drawing.Point(312, 18);
|
||||
this.numLineWidthoffset.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.numLineWidthoffset.Maximum = new decimal(new int[] {
|
||||
1000000000,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
this.numLineWidthoffset.Minimum = new decimal(new int[] {
|
||||
100000000,
|
||||
0,
|
||||
0,
|
||||
-2147483648});
|
||||
this.numLineWidthoffset.Name = "numLineWidthoffset";
|
||||
this.numLineWidthoffset.Size = new System.Drawing.Size(117, 21);
|
||||
this.numLineWidthoffset.TabIndex = 15;
|
||||
//
|
||||
// label60
|
||||
//
|
||||
this.label60.AutoSize = true;
|
||||
this.label60.Location = new System.Drawing.Point(10, 20);
|
||||
this.label60.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
||||
this.label60.Name = "label60";
|
||||
this.label60.Size = new System.Drawing.Size(65, 12);
|
||||
this.label60.TabIndex = 14;
|
||||
this.label60.Text = "PT补偿(mm)";
|
||||
//
|
||||
// numPToffset
|
||||
//
|
||||
this.numPToffset.DecimalPlaces = 4;
|
||||
this.numPToffset.Increment = new decimal(new int[] {
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
65536});
|
||||
this.numPToffset.Location = new System.Drawing.Point(79, 18);
|
||||
this.numPToffset.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.numPToffset.Maximum = new decimal(new int[] {
|
||||
1000000000,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
this.numPToffset.Minimum = new decimal(new int[] {
|
||||
100000000,
|
||||
0,
|
||||
0,
|
||||
-2147483648});
|
||||
this.numPToffset.Name = "numPToffset";
|
||||
this.numPToffset.Size = new System.Drawing.Size(117, 21);
|
||||
this.numPToffset.TabIndex = 13;
|
||||
//
|
||||
// groupBox21
|
||||
//
|
||||
this.groupBox21.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
@ -2999,103 +3113,142 @@
|
||||
this.label49.TabIndex = 4;
|
||||
this.label49.Text = "本机IP：";
|
||||
//
|
||||
// groupBox24
|
||||
// groupBox25
|
||||
//
|
||||
this.groupBox24.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
this.groupBox25.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.groupBox24.BackColor = System.Drawing.SystemColors.ActiveCaption;
|
||||
this.groupBox24.Controls.Add(this.panel24);
|
||||
this.groupBox24.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.groupBox24.Location = new System.Drawing.Point(2, 290);
|
||||
this.groupBox24.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox24.Name = "groupBox24";
|
||||
this.groupBox24.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox24.Size = new System.Drawing.Size(476, 73);
|
||||
this.groupBox24.TabIndex = 34;
|
||||
this.groupBox24.TabStop = false;
|
||||
this.groupBox24.Text = "尺寸补偿";
|
||||
this.groupBox25.BackColor = System.Drawing.SystemColors.ActiveCaption;
|
||||
this.groupBox25.Controls.Add(this.panel25);
|
||||
this.groupBox25.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.groupBox25.Location = new System.Drawing.Point(4, 275);
|
||||
this.groupBox25.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox25.Name = "groupBox25";
|
||||
this.groupBox25.Padding = new System.Windows.Forms.Padding(2);
|
||||
this.groupBox25.Size = new System.Drawing.Size(451, 117);
|
||||
this.groupBox25.TabIndex = 31;
|
||||
this.groupBox25.TabStop = false;
|
||||
this.groupBox25.Text = "原始缺陷小图";
|
||||
//
|
||||
// panel24
|
||||
// panel25
|
||||
//
|
||||
this.panel24.BackColor = System.Drawing.Color.White;
|
||||
this.panel24.Controls.Add(this.label62);
|
||||
this.panel24.Controls.Add(this.numLineWidthoffset);
|
||||
this.panel24.Controls.Add(this.label60);
|
||||
this.panel24.Controls.Add(this.numPToffset);
|
||||
this.panel24.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.panel24.Location = new System.Drawing.Point(2, 16);
|
||||
this.panel24.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.panel24.Name = "panel24";
|
||||
this.panel24.Size = new System.Drawing.Size(472, 55);
|
||||
this.panel24.TabIndex = 0;
|
||||
this.panel25.BackColor = System.Drawing.Color.White;
|
||||
this.panel25.Controls.Add(this.label65);
|
||||
this.panel25.Controls.Add(this.Defect_SrcSmall_Thres);
|
||||
this.panel25.Controls.Add(this.pictureBox1);
|
||||
this.panel25.Controls.Add(this.label63);
|
||||
this.panel25.Controls.Add(this.txtDefect_SrcSmall_SavePath);
|
||||
this.panel25.Controls.Add(this.numDefect_SrcSmall_Path_AutoClear);
|
||||
this.panel25.Controls.Add(this.label64);
|
||||
this.panel25.Controls.Add(this.chkDefect_SrcSmall_Path_AutoClear);
|
||||
this.panel25.Dock = System.Windows.Forms.DockStyle.Fill;
|
||||
this.panel25.Location = new System.Drawing.Point(2, 16);
|
||||
this.panel25.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.panel25.Name = "panel25";
|
||||
this.panel25.Size = new System.Drawing.Size(447, 99);
|
||||
this.panel25.TabIndex = 0;
|
||||
//
|
||||
// label60
|
||||
// pictureBox1
|
||||
//
|
||||
this.label60.AutoSize = true;
|
||||
this.label60.Location = new System.Drawing.Point(10, 20);
|
||||
this.label60.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
||||
this.label60.Name = "label60";
|
||||
this.label60.Size = new System.Drawing.Size(65, 12);
|
||||
this.label60.TabIndex = 14;
|
||||
this.label60.Text = "PT补偿(mm)";
|
||||
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
|
||||
this.pictureBox1.Location = new System.Drawing.Point(413, 9);
|
||||
this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.pictureBox1.Name = "pictureBox1";
|
||||
this.pictureBox1.Size = new System.Drawing.Size(21, 19);
|
||||
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
|
||||
this.pictureBox1.TabIndex = 6;
|
||||
this.pictureBox1.TabStop = false;
|
||||
this.pictureBox1.Click += new System.EventHandler(this.btnClearDefect_SrcSmall_Path_Click);
|
||||
//
|
||||
// numPToffset
|
||||
// label63
|
||||
//
|
||||
this.numPToffset.DecimalPlaces = 4;
|
||||
this.numPToffset.Increment = new decimal(new int[] {
|
||||
this.label63.AutoSize = true;
|
||||
this.label63.Location = new System.Drawing.Point(212, 39);
|
||||
this.label63.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
||||
this.label63.Name = "label63";
|
||||
this.label63.Size = new System.Drawing.Size(17, 12);
|
||||
this.label63.TabIndex = 14;
|
||||
this.label63.Text = "天";
|
||||
//
|
||||
// txtDefect_SrcSmall_SavePath
|
||||
//
|
||||
this.txtDefect_SrcSmall_SavePath.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
|
||||
| System.Windows.Forms.AnchorStyles.Right)));
|
||||
this.txtDefect_SrcSmall_SavePath.Location = new System.Drawing.Point(74, 9);
|
||||
this.txtDefect_SrcSmall_SavePath.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.txtDefect_SrcSmall_SavePath.Name = "txtDefect_SrcSmall_SavePath";
|
||||
this.txtDefect_SrcSmall_SavePath.ReadOnly = true;
|
||||
this.txtDefect_SrcSmall_SavePath.Size = new System.Drawing.Size(341, 21);
|
||||
this.txtDefect_SrcSmall_SavePath.TabIndex = 5;
|
||||
this.txtDefect_SrcSmall_SavePath.Text = "D:\\phtons\\";
|
||||
this.txtDefect_SrcSmall_SavePath.Click += new System.EventHandler(this.txtDefect_SrcSmall_SavePath_Click);
|
||||
//
|
||||
// numDefect_SrcSmall_Path_AutoClear
|
||||
//
|
||||
this.numDefect_SrcSmall_Path_AutoClear.DecimalPlaces = 1;
|
||||
this.numDefect_SrcSmall_Path_AutoClear.Location = new System.Drawing.Point(165, 35);
|
||||
this.numDefect_SrcSmall_Path_AutoClear.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.numDefect_SrcSmall_Path_AutoClear.Name = "numDefect_SrcSmall_Path_AutoClear";
|
||||
this.numDefect_SrcSmall_Path_AutoClear.Size = new System.Drawing.Size(43, 21);
|
||||
this.numDefect_SrcSmall_Path_AutoClear.TabIndex = 13;
|
||||
this.numDefect_SrcSmall_Path_AutoClear.Value = new decimal(new int[] {
|
||||
7,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
//
|
||||
// label64
|
||||
//
|
||||
this.label64.AutoSize = true;
|
||||
this.label64.Location = new System.Drawing.Point(10, 11);
|
||||
this.label64.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
||||
this.label64.Name = "label64";
|
||||
this.label64.Size = new System.Drawing.Size(65, 12);
|
||||
this.label64.TabIndex = 4;
|
||||
this.label64.Text = "保存路径：";
|
||||
//
|
||||
// chkDefect_SrcSmall_Path_AutoClear
|
||||
//
|
||||
this.chkDefect_SrcSmall_Path_AutoClear.AutoSize = true;
|
||||
this.chkDefect_SrcSmall_Path_AutoClear.Location = new System.Drawing.Point(74, 39);
|
||||
this.chkDefect_SrcSmall_Path_AutoClear.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.chkDefect_SrcSmall_Path_AutoClear.Name = "chkDefect_SrcSmall_Path_AutoClear";
|
||||
this.chkDefect_SrcSmall_Path_AutoClear.Size = new System.Drawing.Size(96, 16);
|
||||
this.chkDefect_SrcSmall_Path_AutoClear.TabIndex = 12;
|
||||
this.chkDefect_SrcSmall_Path_AutoClear.Text = "自动清除大于";
|
||||
this.chkDefect_SrcSmall_Path_AutoClear.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// Defect_SrcSmall_Thres
|
||||
//
|
||||
this.Defect_SrcSmall_Thres.DecimalPlaces = 2;
|
||||
this.Defect_SrcSmall_Thres.Increment = new decimal(new int[] {
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
65536});
|
||||
this.numPToffset.Location = new System.Drawing.Point(79, 18);
|
||||
this.numPToffset.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.numPToffset.Maximum = new decimal(new int[] {
|
||||
1000000000,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
this.numPToffset.Minimum = new decimal(new int[] {
|
||||
100000000,
|
||||
0,
|
||||
0,
|
||||
-2147483648});
|
||||
this.numPToffset.Name = "numPToffset";
|
||||
this.numPToffset.Size = new System.Drawing.Size(117, 21);
|
||||
this.numPToffset.TabIndex = 13;
|
||||
//
|
||||
// label62
|
||||
//
|
||||
this.label62.AutoSize = true;
|
||||
this.label62.Location = new System.Drawing.Point(231, 20);
|
||||
this.label62.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
|
||||
this.label62.Name = "label62";
|
||||
this.label62.Size = new System.Drawing.Size(77, 12);
|
||||
this.label62.TabIndex = 16;
|
||||
this.label62.Text = "线宽补偿(um)";
|
||||
//
|
||||
// numLineWidthoffset
|
||||
//
|
||||
this.numLineWidthoffset.DecimalPlaces = 2;
|
||||
this.numLineWidthoffset.Increment = new decimal(new int[] {
|
||||
this.Defect_SrcSmall_Thres.Location = new System.Drawing.Point(165, 67);
|
||||
this.Defect_SrcSmall_Thres.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.Defect_SrcSmall_Thres.Maximum = new decimal(new int[] {
|
||||
1,
|
||||
0,
|
||||
0,
|
||||
65536});
|
||||
this.numLineWidthoffset.Location = new System.Drawing.Point(312, 18);
|
||||
this.numLineWidthoffset.Margin = new System.Windows.Forms.Padding(2);
|
||||
this.numLineWidthoffset.Maximum = new decimal(new int[] {
|
||||
1000000000,
|
||||
0,
|
||||
0,
|
||||
0});
|
||||
this.numLineWidthoffset.Minimum = new decimal(new int[] {
|
||||
100000000,
|
||||
this.Defect_SrcSmall_Thres.Name = "Defect_SrcSmall_Thres";
|
||||
this.Defect_SrcSmall_Thres.Size = new System.Drawing.Size(45, 21);
|
||||
this.Defect_SrcSmall_Thres.TabIndex = 15;
|
||||
this.Defect_SrcSmall_Thres.Value = new decimal(new int[] {
|
||||
7,
|
||||
0,
|
||||
0,
|
||||
-2147483648});
|
||||
this.numLineWidthoffset.Name = "numLineWidthoffset";
|
||||
this.numLineWidthoffset.Size = new System.Drawing.Size(117, 21);
|
||||
this.numLineWidthoffset.TabIndex = 15;
|
||||
65536});
|
||||
//
|
||||
// label65
|
||||
//
|
||||
this.label65.AutoSize = true;
|
||||
this.label65.Location = new System.Drawing.Point(95, 71);
|
||||
this.label65.Name = "label65";
|
||||
this.label65.Size = new System.Drawing.Size(65, 12);
|
||||
this.label65.TabIndex = 16;
|
||||
this.label65.Text = "过滤置信度";
|
||||
//
|
||||
// FrmSysSetting
|
||||
//
|
||||
@ -3210,6 +3363,11 @@
|
||||
((System.ComponentModel.ISupportInitialize)(this.btnClearDefect_Small_Path)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numDefect_Small_Path_AutoClear)).EndInit();
|
||||
this.tabPage6.ResumeLayout(false);
|
||||
this.groupBox24.ResumeLayout(false);
|
||||
this.panel24.ResumeLayout(false);
|
||||
this.panel24.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numLineWidthoffset)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numPToffset)).EndInit();
|
||||
this.groupBox21.ResumeLayout(false);
|
||||
this.panel21.ResumeLayout(false);
|
||||
this.panel21.PerformLayout();
|
||||
@ -3235,11 +3393,12 @@
|
||||
this.panel18.ResumeLayout(false);
|
||||
this.panel18.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numHttpPort)).EndInit();
|
||||
this.groupBox24.ResumeLayout(false);
|
||||
this.panel24.ResumeLayout(false);
|
||||
this.panel24.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numPToffset)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numLineWidthoffset)).EndInit();
|
||||
this.groupBox25.ResumeLayout(false);
|
||||
this.panel25.ResumeLayout(false);
|
||||
this.panel25.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.numDefect_SrcSmall_Path_AutoClear)).EndInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.Defect_SrcSmall_Thres)).EndInit();
|
||||
this.ResumeLayout(false);
|
||||
this.PerformLayout();
|
||||
|
||||
@ -3461,5 +3620,15 @@
|
||||
private System.Windows.Forms.NumericUpDown numLineWidthoffset;
|
||||
private System.Windows.Forms.Label label60;
|
||||
private System.Windows.Forms.NumericUpDown numPToffset;
|
||||
private System.Windows.Forms.GroupBox groupBox25;
|
||||
private System.Windows.Forms.Panel panel25;
|
||||
private System.Windows.Forms.PictureBox pictureBox1;
|
||||
private System.Windows.Forms.Label label63;
|
||||
private System.Windows.Forms.TextBox txtDefect_SrcSmall_SavePath;
|
||||
private System.Windows.Forms.NumericUpDown numDefect_SrcSmall_Path_AutoClear;
|
||||
private System.Windows.Forms.Label label64;
|
||||
private System.Windows.Forms.CheckBox chkDefect_SrcSmall_Path_AutoClear;
|
||||
private System.Windows.Forms.Label label65;
|
||||
private System.Windows.Forms.NumericUpDown Defect_SrcSmall_Thres;
|
||||
}
|
||||
}
|
||||
@ -149,6 +149,8 @@ namespace ProductionControl
|
||||
this.txtDefect_Small_Path.Text = Util.ReadIniValue(configPath, "DEV", "Defect_Small_SavePath");
|
||||
this.txtDefect_Compress_SavePath.Text = Util.ReadIniValue(configPath, "DEV", "Defect_Compress_SavePath");
|
||||
|
||||
this.txtDefect_SrcSmall_SavePath.Text = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath");
|
||||
|
||||
//int liTmp = -1;
|
||||
double ldTmp = -1;
|
||||
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SavePath_AutoClear");
|
||||
@ -168,6 +170,22 @@ namespace ProductionControl
|
||||
ldTmp = Convert.ToDouble(lsTmp);
|
||||
chkDefect_Small_Path_AutoClear.Checked = (ldTmp > -1);
|
||||
if (ldTmp > -1) numDefect_Small_Path_AutoClear.Value = (decimal)ldTmp;
|
||||
///////////////////////////////////////
|
||||
///
|
||||
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath_AutoClear");
|
||||
//if (Util.IsNumber(lsTmp)) liTmp = Convert.ToInt32(lsTmp);
|
||||
if (lsTmp == "")
|
||||
lsTmp = "3";
|
||||
ldTmp = Convert.ToDouble(lsTmp);
|
||||
chkDefect_SrcSmall_Path_AutoClear.Checked = (ldTmp > -1);
|
||||
if (ldTmp > -1) numDefect_SrcSmall_Path_AutoClear.Value = (decimal)ldTmp;
|
||||
|
||||
lsTmp = Util.ReadIniValue(configPath, "DEV", "Defect_SrcSmall_Thres");
|
||||
if (lsTmp == "")
|
||||
lsTmp = "0.7";
|
||||
ldTmp = Convert.ToDouble(lsTmp);
|
||||
if (ldTmp > -1) Defect_SrcSmall_Thres.Value = (decimal)ldTmp;
|
||||
///////////////////////////////////////
|
||||
|
||||
|
||||
this.chkSaveAllDefectImg.Checked= (Util.ReadIniValue(configPath, "DEV", "SaveAllDefectImg") == "1");
|
||||
@ -259,6 +277,10 @@ namespace ProductionControl
|
||||
//if (Defect_Small_SavePath == "")
|
||||
// throw new Exception("请设置缺陷小图保存路径 ！");
|
||||
|
||||
string Defect_SrcSmall_SavePath = this.txtDefect_SrcSmall_SavePath.Text.Trim();
|
||||
if (Defect_SrcSmall_SavePath == "")
|
||||
throw new Exception("请设置原始缺陷小图保存路径 ！");
|
||||
|
||||
//DB
|
||||
string DBConStr = this.txtDBCon.Text.Trim();
|
||||
if (DBConStr == "")
|
||||
@ -349,7 +371,11 @@ namespace ProductionControl
|
||||
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Compress_SavePath_AutoClear", (chkDefect_Compress_SavePath_AutoClear.Checked ? (double)numDefect_Compress_SavePath_AutoClear.Value : -1) + "");
|
||||
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Small_SavePath", Defect_Small_SavePath);
|
||||
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_Small_SavePath_AutoClear", (chkDefect_Small_Path_AutoClear.Checked ? (double)numDefect_Small_Path_AutoClear.Value : -1) + "");
|
||||
|
||||
//////////////////
|
||||
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath", Defect_SrcSmall_SavePath);
|
||||
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_SrcSmall_Thres", Defect_SrcSmall_Thres.Value.ToString());
|
||||
Utils.Util.WriteIniValue(configPath, "DEV", "Defect_SrcSmall_SavePath_AutoClear", (chkDefect_SrcSmall_Path_AutoClear.Checked ? (double)numDefect_SrcSmall_Path_AutoClear.Value : -1) + "");
|
||||
//////////////////
|
||||
Utils.Util.WriteIniValue(configPath, "DEV", "SaveAllDefectImg", this.chkSaveAllDefectImg.Checked ? "1" : "0");
|
||||
Utils.Util.WriteIniValue(configPath, "DEV", "MakeTag", this.chkMakeTag.Checked ? "1" : "0");
|
||||
Utils.Util.WriteIniValue(configPath, "DEV", "SizeEnginePath", this.txtSizeEnginePath.Text.Trim());
|
||||
@ -440,12 +466,23 @@ namespace ProductionControl
|
||||
if (!string.IsNullOrWhiteSpace(path))
|
||||
this.txtDefect_Compress_SavePath.Text = path;
|
||||
}
|
||||
|
||||
|
||||
private void txtDefect_SrcSmall_SavePath_Click(object sender, EventArgs e)
|
||||
{
|
||||
string path = FileUtil.selectFolder(Application.StartupPath);
|
||||
if (!string.IsNullOrWhiteSpace(path))
|
||||
this.txtDefect_SrcSmall_SavePath.Text = path;
|
||||
}
|
||||
|
||||
private void btnClearDefect_Small_Path_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.txtDefect_Small_Path.Text = "";
|
||||
}
|
||||
|
||||
private void btnClearDefect_SrcSmall_Path_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.txtDefect_SrcSmall_SavePath.Text = "";
|
||||
}
|
||||
private void btnClearDefect_Path_Click(object sender, EventArgs e)
|
||||
{
|
||||
this.txtDefect_Path.Text = "";
|
||||
|
||||
@ -124,16 +124,16 @@
|
||||
<data name="tsbtnSave.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIdSURBVFhH7ZdBS9xAFMefFMRCRegXkLbUi+CtFqXVS1v1
|
||||
A+xBRKOZmWReqgfxG3iT9tLSD9BWUUHwC3gTe6wt9ODRm3hWRKVUfTPMZjPu7G4mGwqCf/iR3Zl5//x3
|
||||
8pLdhXs51AFRMkKMF4bLMeBJv/HzUKXSCSzeAYHXpcBx2TjnlMAXdSbt88a45xCXr9NChof0Cb6DiFf9
|
||||
kd8gxAPtM4tHEEU95gwtFCWv0gAcv5rRYuJyJfUScsuMtlA2gJDrZrSYhPxc89J+gZlpomwAhhtmNL8Y
|
||||
ztHORfo1x09WgEk8gzDp1XMN1U6AxcWHVHela5U4fky9qoTxD5rp0PNOtRMgDLup7oQ41++5/JB6Wcgl
|
||||
Pe+U1QO4ZkbzKUkewduJf7pWyWpCi20975QdoMnCBtK3rWlegV8yXjWa7qwdQG3nsJnxE8MBqj3OeNXw
|
||||
CKBQTfWH2KcHzK/W0DqOvyEI/pr6ejwDlM/dDBAEp4Wo3hVZvAIoEyEngLHHhYjj5+SzZ3n67QA1VrsS
|
||||
mFienpfgkrp6AUTy0hsWD5LfePq1XOVuNmGZeAY4p0swA/x9n24odcyLWh9FQ8DkT8vz/zehRMvTeweE
|
||||
nAYhnsEcPtXH26hxF3z+CdXTj1z9iM4ZIPuj1EZ9J/jheghp5KY5m0Pq1nEWlUmzAEHQRYt264tKYmrq
|
||||
gnZ5zJytgSqVB7R4lPrB/berKALf6b64lyWAG3A0ZYu/HkZSAAAAAElFTkSuQmCC
|
||||
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIeSURBVFhH7ZfNShxBFIWvBIJCguALiIa4CbhTUfzZSBwf
|
||||
YBYiSceuqu66nWQhvoE7MZuEPECiooLgC2QXkqVJIAuX7iTriKiIP7eKmp6uTM1MV08TEDzw0TNVdU+f
|
||||
qb7dMwP3cqgLomSaqBSGyzngyTPj56Fq9SGw+AsIvCkFjqvGOacEjjSYdM6scc8hLqfSQoZH9Ak2QMSb
|
||||
/sjPEOKh9nmFxxBFveYMbRQlk2kAjp/MaDFxuZZ6CblnRtsoG0DIbTNaTEJ+qHtpv8DMtFA2AMMdM5pf
|
||||
DJdo5yL9muN7K8ACnkKY9Ou5puokwPJyD9Vd61olju9Srxph/J1muvS8U50ECMPHVPeXONPvuVxPvSzk
|
||||
ip53yuoB3DKj+ZQkj2C2cqVrlawmtNjX807ZAVosbCJ925rmFfgx41Wn5c7aAdR2TpgZPzEcpto/Ga86
|
||||
HgEUqql+Ez/oAfOzPbSO4y8IgktT34hngPK5mwGC4KQQtbsii1cAZSLkPDDWV4g4fko+3yxPvx2gxupU
|
||||
AhPL0/MSXFBXvwWRjHnD4lHyq6RfyzXuZhOWiWeAM7oEL4G/HtINpY55UeujaByYPLA8/38TSrQ8vXdA
|
||||
yBcgxBNYwkF9/Bc17oK/GaB6+pGrH9E5A2R/lNqo7wQ/XA8hjdw1Z3NI3TrOojJpFSAIumnR18aiklhc
|
||||
PKddnjNna6Jq9QEtnqF+cP/tKorA57ov7mUJ4BZH72WFNTVYxAAAAABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="tsbtnClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
@ -167,6 +167,23 @@
|
||||
wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6
|
||||
XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA
|
||||
AABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="pictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>
|
||||
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
|
||||
DAAACwwBP0AiyAAAAB90RVh0U29mdHdhcmUATWFjcm9tZWRpYSBGaXJld29ya3MgOLVo0ngAAAJRSURB
|
||||
VFhHxZfNTsMwEISBtyoXKM3TwIUDTa9U4h8BT8CDAiphd+J118nENlCEpU9q7dmZrZ2mzZ6Mg38mfdN1
|
||||
XUTGfpjfBfsDbx06HwVY+Fgujjbt4vR9uTgcCH8DvN+Wi9mmbc4k49h5Q4DuPtvmpVs1nfG5aq530ATC
|
||||
4ZV6v5r3gb6QT3zsBU54o+tBzAImsTp4EG/JnIuuF8q2nzORYjvxnSZcePLJPZop2rgDMyYy5HiwE2HQ
|
||||
UEcfrjXEy9BM1WpBfw1kulU2q+a2ogmEQ0s8DNtVHUnh1HkZ8qnuVBeKffB221VDag1k9PUYY4PCTsj6
|
||||
qAlXWwofXk/bBmxCF2ULSztxH0wwEK5zRGvAc1sT83w4UFEwzJ9j2zw67SPTGPAK2kFe8iYSjctbeqmw
|
||||
NQMePFwZTURqm8hRCFfoZCQ2UThfBmry4QqdTIhNrPLn7IG2HK7QyRGuiex5K9DUhSt0coRrYM1CPdDs
|
||||
sgEX/swCGdDWNUEnIz8JNyqboJPAhSd/VL4DavNN0MnqcPmqrRW2ZhSaGE1sw9vmiRkafovxmmgMeAXt
|
||||
IC95g4lgmL+3h3AbVU2Ee0MYMS+G62IwemAGhqyPttTV5o9MvdPa2IAZZG+5LNyw+Yomkp9yLba/ZFes
|
||||
wJD1qXOM2Dq0xMNAVu/TF71fnBwyoSEFtfd230T2OtJM0fcFhb/lw3Mr4pqYvJ6Gf8unHkxqflIprgl6
|
||||
XWmm6CDGEOGrF8h3F+f0k3AjNqFe3luyZB0jEcqD41wfIN8u/uDhVDzDw+m8z+v2vgCLN08Z7ifCRgAA
|
||||
AABJRU5ErkJggg==
|
||||
</value>
|
||||
</data>
|
||||
<data name="btnClearDefect_Compress_SavePath.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
|
||||
@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
|
||||
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
|
||||
//通过使用 "*"，如下所示:
|
||||
// [assembly: AssemblyVersion("1.0.*")]
|
||||
[assembly: AssemblyVersion("1.2.4.0")]
|
||||
[assembly: AssemblyFileVersion("1.2.4.0")]
|
||||
[assembly: AssemblyVersion("1.2.5.0")]
|
||||
[assembly: AssemblyFileVersion("1.2.5.0")]
|
||||
|
||||
0
新建 文本文档.txt
Normal file
0
新建 文本文档.txt
Normal file
Loading…
Reference in New Issue
Block a user