Skip to content

张东亮 / NS100

转到一个项目
切换导航栏
切换导航栏固定状态
Commit aeedd0c5 由 刘韬
选项

修正1024x768下界面显示

1 个父辈 0405e96a
内嵌 并排
正在显示 5 个修改的文件 包含 139 行增加 和 156 行删除
BLL/PaddleOCRHelper.cs
...@@ -29,41 +29,37 @@ namespace BLL ...@@ -29,41 +29,37 @@ namespace BLL
public static string StartTest(string imgPath) public static string StartTest(string imgPath)
{ {
string ocr = ""; string ocr = "";
for (int i = 0; i < 2; i++)
{
if (!AppIsRun()) if (!AppIsRun())
{ {
LogNet.log.Info("ocr程序未允许,启动");
try try
{ {
var paddle = "paddleOCR.exe"; var paddle = "paddleOCR.exe";
Process process = new Process(); Process process = new Process();
process.StartInfo = new ProcessStartInfo(); process.StartInfo = new ProcessStartInfo();
process.StartInfo.FileName = paddle; process.StartInfo.FileName = paddle;
process.StartInfo.WorkingDirectory =Application.StartupPath+"\\paddle"; process.StartInfo.WorkingDirectory = Application.StartupPath + "\\paddle";
process.Start(); process.Start();
} }
catch (Exception ex) catch (Exception ex)
{ {
LogNet.log.Error("打开paddleOCR失败", ex); LogNet.log.Error("打开paddleOCR失败", ex);
} }
Thread.Sleep(3000); Thread.Sleep(5000);
}
if(AppIsRun())
{
ocr = StartCplusOcr(imgPath);
} }
if (!AppIsRun()) if (AppIsRun())
{ {
try try
{ {
var paddle = "paddleOCR.exe"; ocr = StartCplusOcr(imgPath);
Process process = new Process(); break;
process.StartInfo = new ProcessStartInfo(); }
process.StartInfo.FileName = paddle; catch (Exception ex) {
process.StartInfo.WorkingDirectory = Application.StartupPath + "\\paddle"; LogNet.log.Error("OCR失败", ex);
process.Start(); AppKill();
} }
catch (Exception ex)
{
LogNet.log.Error("打开paddleOCR失败", ex);
} }
} }
return ocr; return ocr;
...@@ -100,6 +96,15 @@ namespace BLL ...@@ -100,6 +96,15 @@ namespace BLL
LogNet.log.Info("paddleOCR 未在运行，启动程序"); LogNet.log.Info("paddleOCR 未在运行，启动程序");
return false; return false;
} }
static void AppKill()
{
Process[] processes = Process.GetProcessesByName("paddleOCR");
foreach(var p in processes)
{
p.Kill();
}
LogNet.log.Info("paddleOCR AppKill");
}
public class Result public class Result
{ {
/// <summary> /// <summary>
......
SmartScan/Form/FrmCodeExtract.Designer.cs
...@@ -71,7 +71,7 @@ namespace SmartScan ...@@ -71,7 +71,7 @@ namespace SmartScan
this.BtnOK.BorderWidth = 2; this.BtnOK.BorderWidth = 2;
this.BtnOK.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnOK.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnOK.HoldPress = false; this.BtnOK.HoldPress = false;
this.BtnOK.Location = new System.Drawing.Point(1184, 689); this.BtnOK.Location = new System.Drawing.Point(767, 689);
this.BtnOK.Name = "BtnOK"; this.BtnOK.Name = "BtnOK";
this.BtnOK.Padding = new System.Windows.Forms.Padding(3); this.BtnOK.Padding = new System.Windows.Forms.Padding(3);
this.BtnOK.Size = new System.Drawing.Size(120, 40); this.BtnOK.Size = new System.Drawing.Size(120, 40);
...@@ -87,7 +87,7 @@ namespace SmartScan ...@@ -87,7 +87,7 @@ namespace SmartScan
this.BtnCancel.BorderWidth = 2; this.BtnCancel.BorderWidth = 2;
this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.BtnCancel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.BtnCancel.HoldPress = false; this.BtnCancel.HoldPress = false;
this.BtnCancel.Location = new System.Drawing.Point(1310, 689); this.BtnCancel.Location = new System.Drawing.Point(893, 689);
this.BtnCancel.Name = "BtnCancel"; this.BtnCancel.Name = "BtnCancel";
this.BtnCancel.Padding = new System.Windows.Forms.Padding(3); this.BtnCancel.Padding = new System.Windows.Forms.Padding(3);
this.BtnCancel.Size = new System.Drawing.Size(120, 40); this.BtnCancel.Size = new System.Drawing.Size(120, 40);
...@@ -106,7 +106,7 @@ namespace SmartScan ...@@ -106,7 +106,7 @@ namespace SmartScan
this.PnlTemp.Name = "PnlTemp"; this.PnlTemp.Name = "PnlTemp";
this.PnlTemp.Padding = new System.Windows.Forms.Padding(3); this.PnlTemp.Padding = new System.Windows.Forms.Padding(3);
this.PnlTemp.ShowText = false; this.PnlTemp.ShowText = false;
this.PnlTemp.Size = new System.Drawing.Size(698, 427); this.PnlTemp.Size = new System.Drawing.Size(489, 427);
this.PnlTemp.TabIndex = 28; this.PnlTemp.TabIndex = 28;
this.PnlTemp.Text = "facePanel1"; this.PnlTemp.Text = "facePanel1";
this.PnlTemp.TitleFont = new System.Drawing.Font("宋体", 12F); this.PnlTemp.TitleFont = new System.Drawing.Font("宋体", 12F);
...@@ -115,9 +115,9 @@ namespace SmartScan ...@@ -115,9 +115,9 @@ namespace SmartScan
// flowLayoutPanel1 // flowLayoutPanel1
// //
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom; this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 6); this.flowLayoutPanel1.Location = new System.Drawing.Point(3, 29);
this.flowLayoutPanel1.Name = "flowLayoutPanel1"; this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(692, 170); this.flowLayoutPanel1.Size = new System.Drawing.Size(483, 147);
this.flowLayoutPanel1.TabIndex = 29; this.flowLayoutPanel1.TabIndex = 29;
// //
// pnlMatch // pnlMatch
...@@ -131,7 +131,7 @@ namespace SmartScan ...@@ -131,7 +131,7 @@ namespace SmartScan
this.pnlMatch.Location = new System.Drawing.Point(3, 344); this.pnlMatch.Location = new System.Drawing.Point(3, 344);
this.pnlMatch.Name = "pnlMatch"; this.pnlMatch.Name = "pnlMatch";
this.pnlMatch.Padding = new System.Windows.Forms.Padding(3); this.pnlMatch.Padding = new System.Windows.Forms.Padding(3);
this.pnlMatch.Size = new System.Drawing.Size(697, 271); this.pnlMatch.Size = new System.Drawing.Size(489, 271);
this.pnlMatch.TabIndex = 30; this.pnlMatch.TabIndex = 30;
this.pnlMatch.Text = "匹配"; this.pnlMatch.Text = "匹配";
this.pnlMatch.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage; this.pnlMatch.TextImageRelation = System.Windows.Forms.TextImageRelation.TextAboveImage;
...@@ -167,7 +167,7 @@ namespace SmartScan ...@@ -167,7 +167,7 @@ namespace SmartScan
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 56F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 56F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 56F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 56F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 56F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 56F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(691, 232); this.tableLayoutPanel1.Size = new System.Drawing.Size(483, 232);
this.tableLayoutPanel1.TabIndex = 0; this.tableLayoutPanel1.TabIndex = 0;
// //
// NudMiddleTextCount // NudMiddleTextCount
...@@ -185,7 +185,7 @@ namespace SmartScan ...@@ -185,7 +185,7 @@ namespace SmartScan
this.NudMiddleTextCount.Minimum = 1F; this.NudMiddleTextCount.Minimum = 1F;
this.NudMiddleTextCount.Name = "NudMiddleTextCount"; this.NudMiddleTextCount.Name = "NudMiddleTextCount";
this.NudMiddleTextCount.Padding = new System.Windows.Forms.Padding(4); this.NudMiddleTextCount.Padding = new System.Windows.Forms.Padding(4);
this.NudMiddleTextCount.Size = new System.Drawing.Size(164, 56); this.NudMiddleTextCount.Size = new System.Drawing.Size(112, 56);
this.NudMiddleTextCount.TabIndex = 62; this.NudMiddleTextCount.TabIndex = 62;
this.NudMiddleTextCount.Text = "1"; this.NudMiddleTextCount.Text = "1";
this.NudMiddleTextCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.NudMiddleTextCount.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
...@@ -203,7 +203,7 @@ namespace SmartScan ...@@ -203,7 +203,7 @@ namespace SmartScan
this.ChkCheckCodeType.Margin = new System.Windows.Forms.Padding(4); this.ChkCheckCodeType.Margin = new System.Windows.Forms.Padding(4);
this.ChkCheckCodeType.Name = "ChkCheckCodeType"; this.ChkCheckCodeType.Name = "ChkCheckCodeType";
this.ChkCheckCodeType.Padding = new System.Windows.Forms.Padding(4); this.ChkCheckCodeType.Padding = new System.Windows.Forms.Padding(4);
this.ChkCheckCodeType.Size = new System.Drawing.Size(164, 48); this.ChkCheckCodeType.Size = new System.Drawing.Size(112, 48);
this.ChkCheckCodeType.TabIndex = 52; this.ChkCheckCodeType.TabIndex = 52;
this.ChkCheckCodeType.Text = "CheckCodeType"; this.ChkCheckCodeType.Text = "CheckCodeType";
this.ChkCheckCodeType.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkCheckCodeType.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -217,11 +217,11 @@ namespace SmartScan ...@@ -217,11 +217,11 @@ namespace SmartScan
this.tableLayoutPanel1.SetColumnSpan(this.LblCodeType, 2); this.tableLayoutPanel1.SetColumnSpan(this.LblCodeType, 2);
this.LblCodeType.Dock = System.Windows.Forms.DockStyle.Fill; this.LblCodeType.Dock = System.Windows.Forms.DockStyle.Fill;
this.LblCodeType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblCodeType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblCodeType.Location = new System.Drawing.Point(176, 4); this.LblCodeType.Location = new System.Drawing.Point(124, 4);
this.LblCodeType.Margin = new System.Windows.Forms.Padding(4); this.LblCodeType.Margin = new System.Windows.Forms.Padding(4);
this.LblCodeType.Name = "LblCodeType"; this.LblCodeType.Name = "LblCodeType";
this.LblCodeType.Padding = new System.Windows.Forms.Padding(4); this.LblCodeType.Padding = new System.Windows.Forms.Padding(4);
this.LblCodeType.Size = new System.Drawing.Size(336, 48); this.LblCodeType.Size = new System.Drawing.Size(232, 48);
this.LblCodeType.TabIndex = 53; this.LblCodeType.TabIndex = 53;
this.LblCodeType.Text = "-"; this.LblCodeType.Text = "-";
this.LblCodeType.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.LblCodeType.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -237,7 +237,7 @@ namespace SmartScan ...@@ -237,7 +237,7 @@ namespace SmartScan
this.ChkMatchingStart.Margin = new System.Windows.Forms.Padding(4); this.ChkMatchingStart.Margin = new System.Windows.Forms.Padding(4);
this.ChkMatchingStart.Name = "ChkMatchingStart"; this.ChkMatchingStart.Name = "ChkMatchingStart";
this.ChkMatchingStart.Padding = new System.Windows.Forms.Padding(4); this.ChkMatchingStart.Padding = new System.Windows.Forms.Padding(4);
this.ChkMatchingStart.Size = new System.Drawing.Size(164, 48); this.ChkMatchingStart.Size = new System.Drawing.Size(112, 48);
this.ChkMatchingStart.TabIndex = 54; this.ChkMatchingStart.TabIndex = 54;
this.ChkMatchingStart.Text = "Start"; this.ChkMatchingStart.Text = "Start";
this.ChkMatchingStart.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkMatchingStart.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -249,7 +249,7 @@ namespace SmartScan ...@@ -249,7 +249,7 @@ namespace SmartScan
this.TxtMatchingStartText.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.TxtMatchingStartText.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.TxtMatchingStartText.BorderWidth = 2; this.TxtMatchingStartText.BorderWidth = 2;
this.TxtMatchingStartText.Dock = System.Windows.Forms.DockStyle.Fill; this.TxtMatchingStartText.Dock = System.Windows.Forms.DockStyle.Fill;
this.TxtMatchingStartText.Location = new System.Drawing.Point(176, 60); this.TxtMatchingStartText.Location = new System.Drawing.Point(124, 60);
this.TxtMatchingStartText.Margin = new System.Windows.Forms.Padding(4); this.TxtMatchingStartText.Margin = new System.Windows.Forms.Padding(4);
this.TxtMatchingStartText.MaxLength = 32767; this.TxtMatchingStartText.MaxLength = 32767;
this.TxtMatchingStartText.Name = "TxtMatchingStartText"; this.TxtMatchingStartText.Name = "TxtMatchingStartText";
...@@ -259,7 +259,7 @@ namespace SmartScan ...@@ -259,7 +259,7 @@ namespace SmartScan
this.TxtMatchingStartText.SelectionStart = 0; this.TxtMatchingStartText.SelectionStart = 0;
this.TxtMatchingStartText.ShowDel = true; this.TxtMatchingStartText.ShowDel = true;
this.TxtMatchingStartText.ShowQuery = false; this.TxtMatchingStartText.ShowQuery = false;
this.TxtMatchingStartText.Size = new System.Drawing.Size(164, 48); this.TxtMatchingStartText.Size = new System.Drawing.Size(112, 48);
this.TxtMatchingStartText.TabIndex = 55; this.TxtMatchingStartText.TabIndex = 55;
this.TxtMatchingStartText.Text = "faceTextBox1"; this.TxtMatchingStartText.Text = "faceTextBox1";
this.TxtMatchingStartText.TextChanged += new System.EventHandler(this.matchChanged); this.TxtMatchingStartText.TextChanged += new System.EventHandler(this.matchChanged);
...@@ -271,11 +271,11 @@ namespace SmartScan ...@@ -271,11 +271,11 @@ namespace SmartScan
this.ChkMatchingEnd.BorderWidth = 0; this.ChkMatchingEnd.BorderWidth = 0;
this.ChkMatchingEnd.Dock = System.Windows.Forms.DockStyle.Fill; this.ChkMatchingEnd.Dock = System.Windows.Forms.DockStyle.Fill;
this.ChkMatchingEnd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.ChkMatchingEnd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkMatchingEnd.Location = new System.Drawing.Point(348, 60); this.ChkMatchingEnd.Location = new System.Drawing.Point(244, 60);
this.ChkMatchingEnd.Margin = new System.Windows.Forms.Padding(4); this.ChkMatchingEnd.Margin = new System.Windows.Forms.Padding(4);
this.ChkMatchingEnd.Name = "ChkMatchingEnd"; this.ChkMatchingEnd.Name = "ChkMatchingEnd";
this.ChkMatchingEnd.Padding = new System.Windows.Forms.Padding(4); this.ChkMatchingEnd.Padding = new System.Windows.Forms.Padding(4);
this.ChkMatchingEnd.Size = new System.Drawing.Size(164, 48); this.ChkMatchingEnd.Size = new System.Drawing.Size(112, 48);
this.ChkMatchingEnd.TabIndex = 56; this.ChkMatchingEnd.TabIndex = 56;
this.ChkMatchingEnd.Text = "End"; this.ChkMatchingEnd.Text = "End";
this.ChkMatchingEnd.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkMatchingEnd.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -287,7 +287,7 @@ namespace SmartScan ...@@ -287,7 +287,7 @@ namespace SmartScan
this.TxtMatchingEndText.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.TxtMatchingEndText.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.TxtMatchingEndText.BorderWidth = 2; this.TxtMatchingEndText.BorderWidth = 2;
this.TxtMatchingEndText.Dock = System.Windows.Forms.DockStyle.Fill; this.TxtMatchingEndText.Dock = System.Windows.Forms.DockStyle.Fill;
this.TxtMatchingEndText.Location = new System.Drawing.Point(520, 60); this.TxtMatchingEndText.Location = new System.Drawing.Point(364, 60);
this.TxtMatchingEndText.Margin = new System.Windows.Forms.Padding(4); this.TxtMatchingEndText.Margin = new System.Windows.Forms.Padding(4);
this.TxtMatchingEndText.MaxLength = 32767; this.TxtMatchingEndText.MaxLength = 32767;
this.TxtMatchingEndText.Name = "TxtMatchingEndText"; this.TxtMatchingEndText.Name = "TxtMatchingEndText";
...@@ -297,7 +297,7 @@ namespace SmartScan ...@@ -297,7 +297,7 @@ namespace SmartScan
this.TxtMatchingEndText.SelectionStart = 0; this.TxtMatchingEndText.SelectionStart = 0;
this.TxtMatchingEndText.ShowDel = true; this.TxtMatchingEndText.ShowDel = true;
this.TxtMatchingEndText.ShowQuery = false; this.TxtMatchingEndText.ShowQuery = false;
this.TxtMatchingEndText.Size = new System.Drawing.Size(167, 48); this.TxtMatchingEndText.Size = new System.Drawing.Size(115, 48);
this.TxtMatchingEndText.TabIndex = 57; this.TxtMatchingEndText.TabIndex = 57;
this.TxtMatchingEndText.Text = "faceTextBox2"; this.TxtMatchingEndText.Text = "faceTextBox2";
this.TxtMatchingEndText.TextChanged += new System.EventHandler(this.matchChanged); this.TxtMatchingEndText.TextChanged += new System.EventHandler(this.matchChanged);
...@@ -313,7 +313,7 @@ namespace SmartScan ...@@ -313,7 +313,7 @@ namespace SmartScan
this.ChkMatchingMiddle.Margin = new System.Windows.Forms.Padding(4); this.ChkMatchingMiddle.Margin = new System.Windows.Forms.Padding(4);
this.ChkMatchingMiddle.Name = "ChkMatchingMiddle"; this.ChkMatchingMiddle.Name = "ChkMatchingMiddle";
this.ChkMatchingMiddle.Padding = new System.Windows.Forms.Padding(4); this.ChkMatchingMiddle.Padding = new System.Windows.Forms.Padding(4);
this.ChkMatchingMiddle.Size = new System.Drawing.Size(164, 48); this.ChkMatchingMiddle.Size = new System.Drawing.Size(112, 48);
this.ChkMatchingMiddle.TabIndex = 58; this.ChkMatchingMiddle.TabIndex = 58;
this.ChkMatchingMiddle.Text = "Middle"; this.ChkMatchingMiddle.Text = "Middle";
this.ChkMatchingMiddle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkMatchingMiddle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -325,7 +325,7 @@ namespace SmartScan ...@@ -325,7 +325,7 @@ namespace SmartScan
this.TxtMatchingMiddleText.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.TxtMatchingMiddleText.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.TxtMatchingMiddleText.BorderWidth = 2; this.TxtMatchingMiddleText.BorderWidth = 2;
this.TxtMatchingMiddleText.Dock = System.Windows.Forms.DockStyle.Fill; this.TxtMatchingMiddleText.Dock = System.Windows.Forms.DockStyle.Fill;
this.TxtMatchingMiddleText.Location = new System.Drawing.Point(176, 116); this.TxtMatchingMiddleText.Location = new System.Drawing.Point(124, 116);
this.TxtMatchingMiddleText.Margin = new System.Windows.Forms.Padding(4); this.TxtMatchingMiddleText.Margin = new System.Windows.Forms.Padding(4);
this.TxtMatchingMiddleText.MaxLength = 32767; this.TxtMatchingMiddleText.MaxLength = 32767;
this.TxtMatchingMiddleText.Name = "TxtMatchingMiddleText"; this.TxtMatchingMiddleText.Name = "TxtMatchingMiddleText";
...@@ -335,7 +335,7 @@ namespace SmartScan ...@@ -335,7 +335,7 @@ namespace SmartScan
this.TxtMatchingMiddleText.SelectionStart = 0; this.TxtMatchingMiddleText.SelectionStart = 0;
this.TxtMatchingMiddleText.ShowDel = true; this.TxtMatchingMiddleText.ShowDel = true;
this.TxtMatchingMiddleText.ShowQuery = false; this.TxtMatchingMiddleText.ShowQuery = false;
this.TxtMatchingMiddleText.Size = new System.Drawing.Size(164, 48); this.TxtMatchingMiddleText.Size = new System.Drawing.Size(112, 48);
this.TxtMatchingMiddleText.TabIndex = 59; this.TxtMatchingMiddleText.TabIndex = 59;
this.TxtMatchingMiddleText.Text = "faceTextBox3"; this.TxtMatchingMiddleText.Text = "faceTextBox3";
this.TxtMatchingMiddleText.TextChanged += new System.EventHandler(this.matchChanged); this.TxtMatchingMiddleText.TextChanged += new System.EventHandler(this.matchChanged);
...@@ -347,11 +347,11 @@ namespace SmartScan ...@@ -347,11 +347,11 @@ namespace SmartScan
this.ChkCaseSensitivity.BorderWidth = 0; this.ChkCaseSensitivity.BorderWidth = 0;
this.ChkCaseSensitivity.Dock = System.Windows.Forms.DockStyle.Fill; this.ChkCaseSensitivity.Dock = System.Windows.Forms.DockStyle.Fill;
this.ChkCaseSensitivity.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.ChkCaseSensitivity.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkCaseSensitivity.Location = new System.Drawing.Point(348, 116); this.ChkCaseSensitivity.Location = new System.Drawing.Point(244, 116);
this.ChkCaseSensitivity.Margin = new System.Windows.Forms.Padding(4); this.ChkCaseSensitivity.Margin = new System.Windows.Forms.Padding(4);
this.ChkCaseSensitivity.Name = "ChkCaseSensitivity"; this.ChkCaseSensitivity.Name = "ChkCaseSensitivity";
this.ChkCaseSensitivity.Padding = new System.Windows.Forms.Padding(4); this.ChkCaseSensitivity.Padding = new System.Windows.Forms.Padding(4);
this.ChkCaseSensitivity.Size = new System.Drawing.Size(164, 48); this.ChkCaseSensitivity.Size = new System.Drawing.Size(112, 48);
this.ChkCaseSensitivity.TabIndex = 60; this.ChkCaseSensitivity.TabIndex = 60;
this.ChkCaseSensitivity.Text = "Sensitivity"; this.ChkCaseSensitivity.Text = "Sensitivity";
this.ChkCaseSensitivity.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkCaseSensitivity.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -364,13 +364,13 @@ namespace SmartScan ...@@ -364,13 +364,13 @@ namespace SmartScan
this.ChoMatchMiddleType.BorderWidth = 2; this.ChoMatchMiddleType.BorderWidth = 2;
this.ChoMatchMiddleType.Dock = System.Windows.Forms.DockStyle.Fill; this.ChoMatchMiddleType.Dock = System.Windows.Forms.DockStyle.Fill;
this.ChoMatchMiddleType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.ChoMatchMiddleType.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChoMatchMiddleType.Location = new System.Drawing.Point(176, 172); this.ChoMatchMiddleType.Location = new System.Drawing.Point(124, 172);
this.ChoMatchMiddleType.Margin = new System.Windows.Forms.Padding(4); this.ChoMatchMiddleType.Margin = new System.Windows.Forms.Padding(4);
this.ChoMatchMiddleType.Name = "ChoMatchMiddleType"; this.ChoMatchMiddleType.Name = "ChoMatchMiddleType";
this.ChoMatchMiddleType.Padding = new System.Windows.Forms.Padding(4); this.ChoMatchMiddleType.Padding = new System.Windows.Forms.Padding(4);
this.ChoMatchMiddleType.SelectedIndex = -1; this.ChoMatchMiddleType.SelectedIndex = -1;
this.ChoMatchMiddleType.SelectedText = ""; this.ChoMatchMiddleType.SelectedText = "";
this.ChoMatchMiddleType.Size = new System.Drawing.Size(164, 56); this.ChoMatchMiddleType.Size = new System.Drawing.Size(112, 56);
this.ChoMatchMiddleType.TabIndex = 61; this.ChoMatchMiddleType.TabIndex = 61;
this.ChoMatchMiddleType.Text = "faceComboBox1"; this.ChoMatchMiddleType.Text = "faceComboBox1";
this.ChoMatchMiddleType.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.ChoMatchMiddleType.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
...@@ -384,11 +384,11 @@ namespace SmartScan ...@@ -384,11 +384,11 @@ namespace SmartScan
this.lblMatchRes.Dock = System.Windows.Forms.DockStyle.Fill; this.lblMatchRes.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblMatchRes.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMatchRes.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMatchRes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.lblMatchRes.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.lblMatchRes.Location = new System.Drawing.Point(520, 172); this.lblMatchRes.Location = new System.Drawing.Point(364, 172);
this.lblMatchRes.Margin = new System.Windows.Forms.Padding(4); this.lblMatchRes.Margin = new System.Windows.Forms.Padding(4);
this.lblMatchRes.Name = "lblMatchRes"; this.lblMatchRes.Name = "lblMatchRes";
this.lblMatchRes.Padding = new System.Windows.Forms.Padding(4); this.lblMatchRes.Padding = new System.Windows.Forms.Padding(4);
this.lblMatchRes.Size = new System.Drawing.Size(167, 56); this.lblMatchRes.Size = new System.Drawing.Size(115, 56);
this.lblMatchRes.TabIndex = 63; this.lblMatchRes.TabIndex = 63;
// //
// Characteristicbarcode // Characteristicbarcode
...@@ -398,11 +398,11 @@ namespace SmartScan ...@@ -398,11 +398,11 @@ namespace SmartScan
this.Characteristicbarcode.BorderWidth = 0; this.Characteristicbarcode.BorderWidth = 0;
this.Characteristicbarcode.Dock = System.Windows.Forms.DockStyle.Fill; this.Characteristicbarcode.Dock = System.Windows.Forms.DockStyle.Fill;
this.Characteristicbarcode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.Characteristicbarcode.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.Characteristicbarcode.Location = new System.Drawing.Point(520, 116); this.Characteristicbarcode.Location = new System.Drawing.Point(364, 116);
this.Characteristicbarcode.Margin = new System.Windows.Forms.Padding(4); this.Characteristicbarcode.Margin = new System.Windows.Forms.Padding(4);
this.Characteristicbarcode.Name = "Characteristicbarcode"; this.Characteristicbarcode.Name = "Characteristicbarcode";
this.Characteristicbarcode.Padding = new System.Windows.Forms.Padding(4); this.Characteristicbarcode.Padding = new System.Windows.Forms.Padding(4);
this.Characteristicbarcode.Size = new System.Drawing.Size(167, 48); this.Characteristicbarcode.Size = new System.Drawing.Size(115, 48);
this.Characteristicbarcode.TabIndex = 64; this.Characteristicbarcode.TabIndex = 64;
this.Characteristicbarcode.Text = "特征码"; this.Characteristicbarcode.Text = "特征码";
this.Characteristicbarcode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.Characteristicbarcode.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -419,7 +419,7 @@ namespace SmartScan ...@@ -419,7 +419,7 @@ namespace SmartScan
this.pnlRawCode.Location = new System.Drawing.Point(3, 3); this.pnlRawCode.Location = new System.Drawing.Point(3, 3);
this.pnlRawCode.Name = "pnlRawCode"; this.pnlRawCode.Name = "pnlRawCode";
this.pnlRawCode.Padding = new System.Windows.Forms.Padding(3); this.pnlRawCode.Padding = new System.Windows.Forms.Padding(3);
this.pnlRawCode.Size = new System.Drawing.Size(697, 335); this.pnlRawCode.Size = new System.Drawing.Size(489, 335);
this.pnlRawCode.TabIndex = 31; this.pnlRawCode.TabIndex = 31;
this.pnlRawCode.Text = "原始条码信息"; this.pnlRawCode.Text = "原始条码信息";
this.pnlRawCode.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.pnlRawCode.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
...@@ -433,7 +433,7 @@ namespace SmartScan ...@@ -433,7 +433,7 @@ namespace SmartScan
this.richTextBox1.ForeColor = System.Drawing.SystemColors.Menu; this.richTextBox1.ForeColor = System.Drawing.SystemColors.Menu;
this.richTextBox1.Location = new System.Drawing.Point(3, 3); this.richTextBox1.Location = new System.Drawing.Point(3, 3);
this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(691, 329); this.richTextBox1.Size = new System.Drawing.Size(483, 329);
this.richTextBox1.TabIndex = 7; this.richTextBox1.TabIndex = 7;
this.richTextBox1.Text = "weqw"; this.richTextBox1.Text = "weqw";
// //
...@@ -448,7 +448,7 @@ namespace SmartScan ...@@ -448,7 +448,7 @@ namespace SmartScan
this.pnlKeywords.Location = new System.Drawing.Point(3, 3); this.pnlKeywords.Location = new System.Drawing.Point(3, 3);
this.pnlKeywords.Name = "pnlKeywords"; this.pnlKeywords.Name = "pnlKeywords";
this.pnlKeywords.Padding = new System.Windows.Forms.Padding(3); this.pnlKeywords.Padding = new System.Windows.Forms.Padding(3);
this.pnlKeywords.Size = new System.Drawing.Size(698, 179); this.pnlKeywords.Size = new System.Drawing.Size(489, 179);
this.pnlKeywords.TabIndex = 32; this.pnlKeywords.TabIndex = 32;
this.pnlKeywords.Text = "关键字"; this.pnlKeywords.Text = "关键字";
this.pnlKeywords.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText; this.pnlKeywords.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
...@@ -468,7 +468,7 @@ namespace SmartScan ...@@ -468,7 +468,7 @@ namespace SmartScan
this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 1; this.tableLayoutPanel2.RowCount = 1;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(1419, 624); this.tableLayoutPanel2.Size = new System.Drawing.Size(1002, 624);
this.tableLayoutPanel2.TabIndex = 33; this.tableLayoutPanel2.TabIndex = 33;
// //
// tableLayoutPanel3 // tableLayoutPanel3
...@@ -478,12 +478,12 @@ namespace SmartScan ...@@ -478,12 +478,12 @@ namespace SmartScan
this.tableLayoutPanel3.Controls.Add(this.pnlKeywords, 0, 0); this.tableLayoutPanel3.Controls.Add(this.pnlKeywords, 0, 0);
this.tableLayoutPanel3.Controls.Add(this.PnlTemp, 0, 1); this.tableLayoutPanel3.Controls.Add(this.PnlTemp, 0, 1);
this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel3.Location = new System.Drawing.Point(712, 3); this.tableLayoutPanel3.Location = new System.Drawing.Point(504, 3);
this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.Name = "tableLayoutPanel3";
this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowCount = 2;
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 70F)); this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 70F));
this.tableLayoutPanel3.Size = new System.Drawing.Size(704, 618); this.tableLayoutPanel3.Size = new System.Drawing.Size(495, 618);
this.tableLayoutPanel3.TabIndex = 32; this.tableLayoutPanel3.TabIndex = 32;
// //
// tableLayoutPanel4 // tableLayoutPanel4
...@@ -498,13 +498,13 @@ namespace SmartScan ...@@ -498,13 +498,13 @@ namespace SmartScan
this.tableLayoutPanel4.RowCount = 2; this.tableLayoutPanel4.RowCount = 2;
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 277F)); this.tableLayoutPanel4.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 277F));
this.tableLayoutPanel4.Size = new System.Drawing.Size(703, 618); this.tableLayoutPanel4.Size = new System.Drawing.Size(495, 618);
this.tableLayoutPanel4.TabIndex = 33; this.tableLayoutPanel4.TabIndex = 33;
// //
// FrmCodeExtract // FrmCodeExtract
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1441, 740); this.ClientSize = new System.Drawing.Size(1024, 740);
this.Controls.Add(this.tableLayoutPanel2); this.Controls.Add(this.tableLayoutPanel2);
this.Controls.Add(this.BtnCancel); this.Controls.Add(this.BtnCancel);
this.Controls.Add(this.BtnOK); this.Controls.Add(this.BtnOK);
......
SmartScan/Form/FrmCodeExtract.cs
...@@ -101,7 +101,7 @@ namespace SmartScan ...@@ -101,7 +101,7 @@ namespace SmartScan
pnl.Visible = false; pnl.Visible = false;
//Controls.Add(pnl); //Controls.Add(pnl);
this.tableLayoutPanel3.Controls.Add(pnl, 0, 1); this.tableLayoutPanel3.Controls.Add(pnl, 0, 1);
Maximize(); //Maximize();
clacWindowHeight(); clacWindowHeight();
} }
......
SmartScan/SetControl/UsrCodeExtractList.Designer.cs
...@@ -68,11 +68,10 @@ namespace SmartScan ...@@ -68,11 +68,10 @@ namespace SmartScan
this.facePanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.facePanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.facePanel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.facePanel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.facePanel1.Location = new System.Drawing.Point(0, 0); this.facePanel1.Location = new System.Drawing.Point(0, 0);
this.facePanel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.facePanel1.Name = "facePanel1"; this.facePanel1.Name = "facePanel1";
this.facePanel1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.facePanel1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.facePanel1.ShowText = false; this.facePanel1.ShowText = false;
this.facePanel1.Size = new System.Drawing.Size(784, 648); this.facePanel1.Size = new System.Drawing.Size(523, 432);
this.facePanel1.TabIndex = 0; this.facePanel1.TabIndex = 0;
this.facePanel1.Text = "facePanel1"; this.facePanel1.Text = "facePanel1";
this.facePanel1.TitleFont = new System.Drawing.Font("宋体", 12F); this.facePanel1.TitleFont = new System.Drawing.Font("宋体", 12F);
...@@ -85,11 +84,10 @@ namespace SmartScan ...@@ -85,11 +84,10 @@ namespace SmartScan
this.pnlExtractRule.Controls.Add(this.tableLayoutPanel1); this.pnlExtractRule.Controls.Add(this.tableLayoutPanel1);
this.pnlExtractRule.Dock = System.Windows.Forms.DockStyle.Fill; this.pnlExtractRule.Dock = System.Windows.Forms.DockStyle.Fill;
this.pnlExtractRule.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.pnlExtractRule.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.pnlExtractRule.Location = new System.Drawing.Point(4, 166); this.pnlExtractRule.Location = new System.Drawing.Point(3, 84);
this.pnlExtractRule.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.pnlExtractRule.Name = "pnlExtractRule"; this.pnlExtractRule.Name = "pnlExtractRule";
this.pnlExtractRule.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.pnlExtractRule.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.pnlExtractRule.Size = new System.Drawing.Size(776, 477); this.pnlExtractRule.Size = new System.Drawing.Size(517, 345);
this.pnlExtractRule.TabIndex = 46; this.pnlExtractRule.TabIndex = 46;
this.pnlExtractRule.Text = "提取"; this.pnlExtractRule.Text = "提取";
this.pnlExtractRule.TitleFont = new System.Drawing.Font("宋体", 12F); this.pnlExtractRule.TitleFont = new System.Drawing.Font("宋体", 12F);
...@@ -122,17 +120,17 @@ namespace SmartScan ...@@ -122,17 +120,17 @@ namespace SmartScan
this.tableLayoutPanel1.Controls.Add(this.ChkLengthEnd, 2, 3); this.tableLayoutPanel1.Controls.Add(this.ChkLengthEnd, 2, 3);
this.tableLayoutPanel1.Controls.Add(this.BtnDel, 3, 5); this.tableLayoutPanel1.Controls.Add(this.BtnDel, 3, 5);
this.tableLayoutPanel1.Controls.Add(this.ChkMatchisnumber, 0, 3); this.tableLayoutPanel1.Controls.Add(this.ChkMatchisnumber, 0, 3);
this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 50); this.tableLayoutPanel1.Location = new System.Drawing.Point(2, 33);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 6; this.tableLayoutPanel1.RowCount = 6;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 67F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 67F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 67F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 67F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 67F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 67F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 45F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(767, 409); this.tableLayoutPanel1.Size = new System.Drawing.Size(511, 300);
this.tableLayoutPanel1.TabIndex = 44; this.tableLayoutPanel1.TabIndex = 44;
// //
// CboKeyword // CboKeyword
...@@ -142,13 +140,12 @@ namespace SmartScan ...@@ -142,13 +140,12 @@ namespace SmartScan
this.CboKeyword.BorderWidth = 2; this.CboKeyword.BorderWidth = 2;
this.CboKeyword.Dock = System.Windows.Forms.DockStyle.Fill; this.CboKeyword.Dock = System.Windows.Forms.DockStyle.Fill;
this.CboKeyword.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.CboKeyword.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.CboKeyword.Location = new System.Drawing.Point(577, 5); this.CboKeyword.Location = new System.Drawing.Point(384, 3);
this.CboKeyword.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.CboKeyword.Name = "CboKeyword"; this.CboKeyword.Name = "CboKeyword";
this.CboKeyword.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.CboKeyword.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.CboKeyword.SelectedIndex = -1; this.CboKeyword.SelectedIndex = -1;
this.CboKeyword.SelectedText = ""; this.CboKeyword.SelectedText = "";
this.CboKeyword.Size = new System.Drawing.Size(186, 57); this.CboKeyword.Size = new System.Drawing.Size(124, 39);
this.CboKeyword.TabIndex = 39; this.CboKeyword.TabIndex = 39;
this.CboKeyword.Text = "faceComboBox1"; this.CboKeyword.Text = "faceComboBox1";
this.CboKeyword.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.CboKeyword.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
...@@ -161,11 +158,10 @@ namespace SmartScan ...@@ -161,11 +158,10 @@ namespace SmartScan
this.ChkMatchingSplit.BorderWidth = 0; this.ChkMatchingSplit.BorderWidth = 0;
this.ChkMatchingSplit.Dock = System.Windows.Forms.DockStyle.Fill; this.ChkMatchingSplit.Dock = System.Windows.Forms.DockStyle.Fill;
this.ChkMatchingSplit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.ChkMatchingSplit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkMatchingSplit.Location = new System.Drawing.Point(4, 72); this.ChkMatchingSplit.Location = new System.Drawing.Point(3, 48);
this.ChkMatchingSplit.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkMatchingSplit.Name = "ChkMatchingSplit"; this.ChkMatchingSplit.Name = "ChkMatchingSplit";
this.ChkMatchingSplit.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkMatchingSplit.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.ChkMatchingSplit.Size = new System.Drawing.Size(183, 57); this.ChkMatchingSplit.Size = new System.Drawing.Size(121, 39);
this.ChkMatchingSplit.TabIndex = 44; this.ChkMatchingSplit.TabIndex = 44;
this.ChkMatchingSplit.Text = "Split"; this.ChkMatchingSplit.Text = "Split";
this.ChkMatchingSplit.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkMatchingSplit.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -179,11 +175,10 @@ namespace SmartScan ...@@ -179,11 +175,10 @@ namespace SmartScan
this.BtnAdd.Dock = System.Windows.Forms.DockStyle.Fill; this.BtnAdd.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnAdd.ForeColor = System.Drawing.Color.DeepSkyBlue; this.BtnAdd.ForeColor = System.Drawing.Color.DeepSkyBlue;
this.BtnAdd.HoldPress = false; this.BtnAdd.HoldPress = false;
this.BtnAdd.Location = new System.Drawing.Point(4, 340); this.BtnAdd.Location = new System.Drawing.Point(3, 228);
this.BtnAdd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.BtnAdd.Name = "BtnAdd"; this.BtnAdd.Name = "BtnAdd";
this.BtnAdd.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.BtnAdd.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.BtnAdd.Size = new System.Drawing.Size(183, 64); this.BtnAdd.Size = new System.Drawing.Size(121, 69);
this.BtnAdd.TabIndex = 54; this.BtnAdd.TabIndex = 54;
this.BtnAdd.Text = "Add"; this.BtnAdd.Text = "Add";
this.BtnAdd.Click += new System.EventHandler(this.BtnAdd_Click); this.BtnAdd.Click += new System.EventHandler(this.BtnAdd_Click);
...@@ -197,13 +192,12 @@ namespace SmartScan ...@@ -197,13 +192,12 @@ namespace SmartScan
this.NudMaxLength.Dock = System.Windows.Forms.DockStyle.Fill; this.NudMaxLength.Dock = System.Windows.Forms.DockStyle.Fill;
this.NudMaxLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.NudMaxLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.NudMaxLength.Increment = 1F; this.NudMaxLength.Increment = 1F;
this.NudMaxLength.Location = new System.Drawing.Point(577, 273); this.NudMaxLength.Location = new System.Drawing.Point(384, 183);
this.NudMaxLength.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.NudMaxLength.Maximum = 9999F; this.NudMaxLength.Maximum = 9999F;
this.NudMaxLength.Minimum = 0F; this.NudMaxLength.Minimum = 0F;
this.NudMaxLength.Name = "NudMaxLength"; this.NudMaxLength.Name = "NudMaxLength";
this.NudMaxLength.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.NudMaxLength.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.NudMaxLength.Size = new System.Drawing.Size(186, 57); this.NudMaxLength.Size = new System.Drawing.Size(124, 39);
this.NudMaxLength.TabIndex = 35; this.NudMaxLength.TabIndex = 35;
this.NudMaxLength.Text = "0"; this.NudMaxLength.Text = "0";
this.NudMaxLength.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.NudMaxLength.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
...@@ -217,11 +211,10 @@ namespace SmartScan ...@@ -217,11 +211,10 @@ namespace SmartScan
this.ChkMaxLength.BorderWidth = 0; this.ChkMaxLength.BorderWidth = 0;
this.ChkMaxLength.Dock = System.Windows.Forms.DockStyle.Fill; this.ChkMaxLength.Dock = System.Windows.Forms.DockStyle.Fill;
this.ChkMaxLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.ChkMaxLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkMaxLength.Location = new System.Drawing.Point(386, 273); this.ChkMaxLength.Location = new System.Drawing.Point(257, 183);
this.ChkMaxLength.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkMaxLength.Name = "ChkMaxLength"; this.ChkMaxLength.Name = "ChkMaxLength";
this.ChkMaxLength.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkMaxLength.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.ChkMaxLength.Size = new System.Drawing.Size(183, 57); this.ChkMaxLength.Size = new System.Drawing.Size(121, 39);
this.ChkMaxLength.TabIndex = 30; this.ChkMaxLength.TabIndex = 30;
this.ChkMaxLength.Text = "Max"; this.ChkMaxLength.Text = "Max";
this.ChkMaxLength.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.ChkMaxLength.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -236,13 +229,12 @@ namespace SmartScan ...@@ -236,13 +229,12 @@ namespace SmartScan
this.NudMinLength.Dock = System.Windows.Forms.DockStyle.Fill; this.NudMinLength.Dock = System.Windows.Forms.DockStyle.Fill;
this.NudMinLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.NudMinLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.NudMinLength.Increment = 1F; this.NudMinLength.Increment = 1F;
this.NudMinLength.Location = new System.Drawing.Point(195, 273); this.NudMinLength.Location = new System.Drawing.Point(130, 183);
this.NudMinLength.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.NudMinLength.Maximum = 9999F; this.NudMinLength.Maximum = 9999F;
this.NudMinLength.Minimum = 0F; this.NudMinLength.Minimum = 0F;
this.NudMinLength.Name = "NudMinLength"; this.NudMinLength.Name = "NudMinLength";
this.NudMinLength.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.NudMinLength.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.NudMinLength.Size = new System.Drawing.Size(183, 57); this.NudMinLength.Size = new System.Drawing.Size(121, 39);
this.NudMinLength.TabIndex = 34; this.NudMinLength.TabIndex = 34;
this.NudMinLength.Text = "0"; this.NudMinLength.Text = "0";
this.NudMinLength.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.NudMinLength.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
...@@ -256,11 +248,10 @@ namespace SmartScan ...@@ -256,11 +248,10 @@ namespace SmartScan
this.ChkMinLength.BorderWidth = 0; this.ChkMinLength.BorderWidth = 0;
this.ChkMinLength.Dock = System.Windows.Forms.DockStyle.Fill; this.ChkMinLength.Dock = System.Windows.Forms.DockStyle.Fill;
this.ChkMinLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.ChkMinLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkMinLength.Location = new System.Drawing.Point(4, 273); this.ChkMinLength.Location = new System.Drawing.Point(3, 183);
this.ChkMinLength.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkMinLength.Name = "ChkMinLength"; this.ChkMinLength.Name = "ChkMinLength";
this.ChkMinLength.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkMinLength.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.ChkMinLength.Size = new System.Drawing.Size(183, 57); this.ChkMinLength.Size = new System.Drawing.Size(121, 39);
this.ChkMinLength.TabIndex = 29; this.ChkMinLength.TabIndex = 29;
this.ChkMinLength.Text = "Min"; this.ChkMinLength.Text = "Min";
this.ChkMinLength.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.ChkMinLength.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -275,13 +266,12 @@ namespace SmartScan ...@@ -275,13 +266,12 @@ namespace SmartScan
this.NudSplitPart.Dock = System.Windows.Forms.DockStyle.Fill; this.NudSplitPart.Dock = System.Windows.Forms.DockStyle.Fill;
this.NudSplitPart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.NudSplitPart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.NudSplitPart.Increment = 1F; this.NudSplitPart.Increment = 1F;
this.NudSplitPart.Location = new System.Drawing.Point(577, 72); this.NudSplitPart.Location = new System.Drawing.Point(384, 48);
this.NudSplitPart.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.NudSplitPart.Maximum = 9999F; this.NudSplitPart.Maximum = 9999F;
this.NudSplitPart.Minimum = 1F; this.NudSplitPart.Minimum = 1F;
this.NudSplitPart.Name = "NudSplitPart"; this.NudSplitPart.Name = "NudSplitPart";
this.NudSplitPart.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.NudSplitPart.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.NudSplitPart.Size = new System.Drawing.Size(186, 57); this.NudSplitPart.Size = new System.Drawing.Size(124, 39);
this.NudSplitPart.TabIndex = 47; this.NudSplitPart.TabIndex = 47;
this.NudSplitPart.Text = "1"; this.NudSplitPart.Text = "1";
this.NudSplitPart.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.NudSplitPart.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
...@@ -297,13 +287,12 @@ namespace SmartScan ...@@ -297,13 +287,12 @@ namespace SmartScan
this.NudLength.Dock = System.Windows.Forms.DockStyle.Fill; this.NudLength.Dock = System.Windows.Forms.DockStyle.Fill;
this.NudLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.NudLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.NudLength.Increment = 1F; this.NudLength.Increment = 1F;
this.NudLength.Location = new System.Drawing.Point(577, 139); this.NudLength.Location = new System.Drawing.Point(384, 93);
this.NudLength.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.NudLength.Maximum = 9999F; this.NudLength.Maximum = 9999F;
this.NudLength.Minimum = 1F; this.NudLength.Minimum = 1F;
this.NudLength.Name = "NudLength"; this.NudLength.Name = "NudLength";
this.NudLength.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.NudLength.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.NudLength.Size = new System.Drawing.Size(186, 57); this.NudLength.Size = new System.Drawing.Size(124, 39);
this.NudLength.TabIndex = 41; this.NudLength.TabIndex = 41;
this.NudLength.Text = "1"; this.NudLength.Text = "1";
this.NudLength.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.NudLength.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
...@@ -317,11 +306,10 @@ namespace SmartScan ...@@ -317,11 +306,10 @@ namespace SmartScan
this.LblStart.BorderWidth = 0; this.LblStart.BorderWidth = 0;
this.LblStart.Dock = System.Windows.Forms.DockStyle.Fill; this.LblStart.Dock = System.Windows.Forms.DockStyle.Fill;
this.LblStart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblStart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblStart.Location = new System.Drawing.Point(4, 139); this.LblStart.Location = new System.Drawing.Point(3, 93);
this.LblStart.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblStart.Name = "LblStart"; this.LblStart.Name = "LblStart";
this.LblStart.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.LblStart.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LblStart.Size = new System.Drawing.Size(183, 57); this.LblStart.Size = new System.Drawing.Size(121, 39);
this.LblStart.TabIndex = 37; this.LblStart.TabIndex = 37;
this.LblStart.Text = "起始"; this.LblStart.Text = "起始";
this.LblStart.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.LblStart.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -333,11 +321,10 @@ namespace SmartScan ...@@ -333,11 +321,10 @@ namespace SmartScan
this.LblLength.BorderWidth = 0; this.LblLength.BorderWidth = 0;
this.LblLength.Dock = System.Windows.Forms.DockStyle.Fill; this.LblLength.Dock = System.Windows.Forms.DockStyle.Fill;
this.LblLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblLength.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblLength.Location = new System.Drawing.Point(386, 139); this.LblLength.Location = new System.Drawing.Point(257, 93);
this.LblLength.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblLength.Name = "LblLength"; this.LblLength.Name = "LblLength";
this.LblLength.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.LblLength.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LblLength.Size = new System.Drawing.Size(183, 57); this.LblLength.Size = new System.Drawing.Size(121, 39);
this.LblLength.TabIndex = 38; this.LblLength.TabIndex = 38;
this.LblLength.Text = "长度"; this.LblLength.Text = "长度";
this.LblLength.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.LblLength.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -351,13 +338,12 @@ namespace SmartScan ...@@ -351,13 +338,12 @@ namespace SmartScan
this.NudStart.Dock = System.Windows.Forms.DockStyle.Fill; this.NudStart.Dock = System.Windows.Forms.DockStyle.Fill;
this.NudStart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.NudStart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.NudStart.Increment = 1F; this.NudStart.Increment = 1F;
this.NudStart.Location = new System.Drawing.Point(195, 139); this.NudStart.Location = new System.Drawing.Point(130, 93);
this.NudStart.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.NudStart.Maximum = 9999F; this.NudStart.Maximum = 9999F;
this.NudStart.Minimum = 0F; this.NudStart.Minimum = 0F;
this.NudStart.Name = "NudStart"; this.NudStart.Name = "NudStart";
this.NudStart.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.NudStart.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.NudStart.Size = new System.Drawing.Size(183, 57); this.NudStart.Size = new System.Drawing.Size(121, 39);
this.NudStart.TabIndex = 40; this.NudStart.TabIndex = 40;
this.NudStart.Text = "0"; this.NudStart.Text = "0";
this.NudStart.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.NudStart.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
...@@ -371,11 +357,10 @@ namespace SmartScan ...@@ -371,11 +357,10 @@ namespace SmartScan
this.LblKeyword.BorderWidth = 0; this.LblKeyword.BorderWidth = 0;
this.LblKeyword.Dock = System.Windows.Forms.DockStyle.Fill; this.LblKeyword.Dock = System.Windows.Forms.DockStyle.Fill;
this.LblKeyword.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblKeyword.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblKeyword.Location = new System.Drawing.Point(386, 5); this.LblKeyword.Location = new System.Drawing.Point(257, 3);
this.LblKeyword.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblKeyword.Name = "LblKeyword"; this.LblKeyword.Name = "LblKeyword";
this.LblKeyword.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.LblKeyword.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LblKeyword.Size = new System.Drawing.Size(183, 57); this.LblKeyword.Size = new System.Drawing.Size(121, 39);
this.LblKeyword.TabIndex = 36; this.LblKeyword.TabIndex = 36;
this.LblKeyword.Text = "key"; this.LblKeyword.Text = "key";
this.LblKeyword.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.LblKeyword.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -387,11 +372,10 @@ namespace SmartScan ...@@ -387,11 +372,10 @@ namespace SmartScan
this.LblSplitPart.BorderWidth = 0; this.LblSplitPart.BorderWidth = 0;
this.LblSplitPart.Dock = System.Windows.Forms.DockStyle.Fill; this.LblSplitPart.Dock = System.Windows.Forms.DockStyle.Fill;
this.LblSplitPart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.LblSplitPart.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblSplitPart.Location = new System.Drawing.Point(386, 72); this.LblSplitPart.Location = new System.Drawing.Point(257, 48);
this.LblSplitPart.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.LblSplitPart.Name = "LblSplitPart"; this.LblSplitPart.Name = "LblSplitPart";
this.LblSplitPart.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.LblSplitPart.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.LblSplitPart.Size = new System.Drawing.Size(183, 57); this.LblSplitPart.Size = new System.Drawing.Size(121, 39);
this.LblSplitPart.TabIndex = 46; this.LblSplitPart.TabIndex = 46;
this.LblSplitPart.Text = "Field"; this.LblSplitPart.Text = "Field";
this.LblSplitPart.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.LblSplitPart.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -403,13 +387,12 @@ namespace SmartScan ...@@ -403,13 +387,12 @@ namespace SmartScan
this.CboMatchingSplit.BorderWidth = 2; this.CboMatchingSplit.BorderWidth = 2;
this.CboMatchingSplit.Dock = System.Windows.Forms.DockStyle.Fill; this.CboMatchingSplit.Dock = System.Windows.Forms.DockStyle.Fill;
this.CboMatchingSplit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.CboMatchingSplit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.CboMatchingSplit.Location = new System.Drawing.Point(195, 72); this.CboMatchingSplit.Location = new System.Drawing.Point(130, 48);
this.CboMatchingSplit.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.CboMatchingSplit.Name = "CboMatchingSplit"; this.CboMatchingSplit.Name = "CboMatchingSplit";
this.CboMatchingSplit.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.CboMatchingSplit.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.CboMatchingSplit.SelectedIndex = -1; this.CboMatchingSplit.SelectedIndex = -1;
this.CboMatchingSplit.SelectedText = ""; this.CboMatchingSplit.SelectedText = "";
this.CboMatchingSplit.Size = new System.Drawing.Size(183, 57); this.CboMatchingSplit.Size = new System.Drawing.Size(121, 39);
this.CboMatchingSplit.TabIndex = 45; this.CboMatchingSplit.TabIndex = 45;
this.CboMatchingSplit.Text = "faceComboBox1"; this.CboMatchingSplit.Text = "faceComboBox1";
this.CboMatchingSplit.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.CboMatchingSplit.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
...@@ -424,11 +407,10 @@ namespace SmartScan ...@@ -424,11 +407,10 @@ namespace SmartScan
this.ChkLengthEnd.BorderWidth = 0; this.ChkLengthEnd.BorderWidth = 0;
this.ChkLengthEnd.Dock = System.Windows.Forms.DockStyle.Fill; this.ChkLengthEnd.Dock = System.Windows.Forms.DockStyle.Fill;
this.ChkLengthEnd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.ChkLengthEnd.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkLengthEnd.Location = new System.Drawing.Point(386, 206); this.ChkLengthEnd.Location = new System.Drawing.Point(257, 138);
this.ChkLengthEnd.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkLengthEnd.Name = "ChkLengthEnd"; this.ChkLengthEnd.Name = "ChkLengthEnd";
this.ChkLengthEnd.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkLengthEnd.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.ChkLengthEnd.Size = new System.Drawing.Size(183, 57); this.ChkLengthEnd.Size = new System.Drawing.Size(121, 39);
this.ChkLengthEnd.TabIndex = 42; this.ChkLengthEnd.TabIndex = 42;
this.ChkLengthEnd.Text = "faceCheckBox7"; this.ChkLengthEnd.Text = "faceCheckBox7";
this.ChkLengthEnd.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.ChkLengthEnd.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -442,11 +424,10 @@ namespace SmartScan ...@@ -442,11 +424,10 @@ namespace SmartScan
this.BtnDel.Dock = System.Windows.Forms.DockStyle.Fill; this.BtnDel.Dock = System.Windows.Forms.DockStyle.Fill;
this.BtnDel.ForeColor = System.Drawing.Color.Red; this.BtnDel.ForeColor = System.Drawing.Color.Red;
this.BtnDel.HoldPress = false; this.BtnDel.HoldPress = false;
this.BtnDel.Location = new System.Drawing.Point(577, 340); this.BtnDel.Location = new System.Drawing.Point(384, 228);
this.BtnDel.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.BtnDel.Name = "BtnDel"; this.BtnDel.Name = "BtnDel";
this.BtnDel.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.BtnDel.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.BtnDel.Size = new System.Drawing.Size(186, 64); this.BtnDel.Size = new System.Drawing.Size(124, 69);
this.BtnDel.TabIndex = 43; this.BtnDel.TabIndex = 43;
this.BtnDel.Text = "Del"; this.BtnDel.Text = "Del";
this.BtnDel.Click += new System.EventHandler(this.BtnDel_Click); this.BtnDel.Click += new System.EventHandler(this.BtnDel_Click);
...@@ -458,11 +439,10 @@ namespace SmartScan ...@@ -458,11 +439,10 @@ namespace SmartScan
this.ChkMatchisnumber.BorderWidth = 0; this.ChkMatchisnumber.BorderWidth = 0;
this.ChkMatchisnumber.Dock = System.Windows.Forms.DockStyle.Fill; this.ChkMatchisnumber.Dock = System.Windows.Forms.DockStyle.Fill;
this.ChkMatchisnumber.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.ChkMatchisnumber.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkMatchisnumber.Location = new System.Drawing.Point(4, 206); this.ChkMatchisnumber.Location = new System.Drawing.Point(3, 138);
this.ChkMatchisnumber.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.ChkMatchisnumber.Name = "ChkMatchisnumber"; this.ChkMatchisnumber.Name = "ChkMatchisnumber";
this.ChkMatchisnumber.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.ChkMatchisnumber.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.ChkMatchisnumber.Size = new System.Drawing.Size(183, 57); this.ChkMatchisnumber.Size = new System.Drawing.Size(121, 39);
this.ChkMatchisnumber.TabIndex = 53; this.ChkMatchisnumber.TabIndex = 53;
this.ChkMatchisnumber.Text = "AsNumber"; this.ChkMatchisnumber.Text = "AsNumber";
this.ChkMatchisnumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.ChkMatchisnumber.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -475,11 +455,10 @@ namespace SmartScan ...@@ -475,11 +455,10 @@ namespace SmartScan
this.pnlParseResult.Controls.Add(this.faceTextBox1); this.pnlParseResult.Controls.Add(this.faceTextBox1);
this.pnlParseResult.Dock = System.Windows.Forms.DockStyle.Top; this.pnlParseResult.Dock = System.Windows.Forms.DockStyle.Top;
this.pnlParseResult.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.pnlParseResult.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.pnlParseResult.Location = new System.Drawing.Point(4, 5); this.pnlParseResult.Location = new System.Drawing.Point(3, 3);
this.pnlParseResult.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.pnlParseResult.Name = "pnlParseResult"; this.pnlParseResult.Name = "pnlParseResult";
this.pnlParseResult.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.pnlParseResult.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.pnlParseResult.Size = new System.Drawing.Size(776, 161); this.pnlParseResult.Size = new System.Drawing.Size(517, 81);
this.pnlParseResult.TabIndex = 44; this.pnlParseResult.TabIndex = 44;
this.pnlParseResult.Text = "解析结果"; this.pnlParseResult.Text = "解析结果";
this.pnlParseResult.TitleFont = new System.Drawing.Font("宋体", 12F); this.pnlParseResult.TitleFont = new System.Drawing.Font("宋体", 12F);
...@@ -493,30 +472,28 @@ namespace SmartScan ...@@ -493,30 +472,28 @@ namespace SmartScan
this.faceTextBox1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle; this.faceTextBox1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.faceTextBox1.BorderWidth = 2; this.faceTextBox1.BorderWidth = 2;
this.faceTextBox1.Font = new System.Drawing.Font("宋体", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.faceTextBox1.Font = new System.Drawing.Font("宋体", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.faceTextBox1.Location = new System.Drawing.Point(4, 41); this.faceTextBox1.Location = new System.Drawing.Point(3, 27);
this.faceTextBox1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.faceTextBox1.MaxLength = 32767; this.faceTextBox1.MaxLength = 32767;
this.faceTextBox1.Multiline = true; this.faceTextBox1.Multiline = true;
this.faceTextBox1.Name = "faceTextBox1"; this.faceTextBox1.Name = "faceTextBox1";
this.faceTextBox1.Padding = new System.Windows.Forms.Padding(4, 5, 4, 5); this.faceTextBox1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
this.faceTextBox1.ReadOnly = true; this.faceTextBox1.ReadOnly = true;
this.faceTextBox1.SelectedText = ""; this.faceTextBox1.SelectedText = "";
this.faceTextBox1.SelectionLength = 0; this.faceTextBox1.SelectionLength = 0;
this.faceTextBox1.SelectionStart = 0; this.faceTextBox1.SelectionStart = 0;
this.faceTextBox1.ShowDel = false; this.faceTextBox1.ShowDel = false;
this.faceTextBox1.ShowQuery = false; this.faceTextBox1.ShowQuery = false;
this.faceTextBox1.Size = new System.Drawing.Size(767, 110); this.faceTextBox1.Size = new System.Drawing.Size(511, 48);
this.faceTextBox1.TabIndex = 48; this.faceTextBox1.TabIndex = 48;
this.faceTextBox1.Text = "faceTextBox1"; this.faceTextBox1.Text = "faceTextBox1";
// //
// UsrCodeExtractList // UsrCodeExtractList
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.facePanel1); this.Controls.Add(this.facePanel1);
this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Name = "UsrCodeExtractList"; this.Name = "UsrCodeExtractList";
this.Size = new System.Drawing.Size(784, 648); this.Size = new System.Drawing.Size(523, 432);
this.facePanel1.ResumeLayout(false); this.facePanel1.ResumeLayout(false);
this.pnlExtractRule.ResumeLayout(false); this.pnlExtractRule.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.ResumeLayout(false);
......
SmartScan/WebCallWork.cs
...@@ -167,6 +167,7 @@ namespace SmartScan ...@@ -167,6 +167,7 @@ namespace SmartScan
{ {
BLLCommon.mateEdit.CurrntBitmap?.Dispose(); BLLCommon.mateEdit.CurrntBitmap?.Dispose();
Bitmap bitmap = null; Bitmap bitmap = null;
MemoryStream stream = null;
try try
{ {
if (bitmapData == null) if (bitmapData == null)
...@@ -180,10 +181,9 @@ namespace SmartScan ...@@ -180,10 +181,9 @@ namespace SmartScan
byte[] imageData = Convert.FromBase64String(bitmapData.ImageData); byte[] imageData = Convert.FromBase64String(bitmapData.ImageData);
using (MemoryStream stream = new MemoryStream(imageData)) stream = new MemoryStream(imageData);
{
bitmap = new Bitmap(stream); bitmap = new Bitmap(stream);
}
if (bitmap == null) if (bitmap == null)
{ {
return new WebResultCode() { ErrorCode = -1, Msg = "图片解析完成为空；" }; return new WebResultCode() { ErrorCode = -1, Msg = "图片解析完成为空；" };
...@@ -263,6 +263,7 @@ namespace SmartScan ...@@ -263,6 +263,7 @@ namespace SmartScan
} }
finally { finally {
bitmap?.Dispose(); bitmap?.Dispose();
stream?.Dispose();
} }
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!