Skip to content

张东亮 / NS100

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 9fc90979 由 张东亮
选项

新ui

1 个父辈 8d2fe4df
内嵌 并排
正在显示 8 个修改的文件 包含 429 行增加 和 88 行删除
BLL/Config.cs
......@@ -325,9 +325,9 @@ namespace BLL
[MyConfigComment("遍历数据源目录")]
public static MyConfig<bool> DataSource_Recursive;
[MyConfigComment("是否启用OCR")]
public static MyConfig<bool> Func_EnabledOCR=true;
//[MyConfigComment("是否启用飞浆OCR识别")]
//public static MyConfig<bool> UsePaddleOCR = true;
public static MyConfig<bool> Func_EnabledOCR;
[MyConfigComment("允许修改打内容")]
public static MyConfig<bool> AllowModifyPrintInfo;
public void Save()
{
......
BLL/Extension.cs
......@@ -137,7 +137,8 @@ namespace BLL
{ "Height",40},
{ "ShowDel","False"},
{ "ShowQuery","False"},
{ "Text",""}
{ "Text",""},
{"Enabled",Config.AllowModifyPrintInfo }
}
}
};
......
Model/LanguageDialogKey.cs
......@@ -18,5 +18,9 @@ namespace Model
public const string SAVE_SUCCEED = "SaveSucceed";
public const string REMIND_CLEARTEMPLATE = "RemindClearTemplate";
public const string REMIND_SELECTCODE = "RemindSelectCode";
public const string TEMPLATE_MATCHING_CONFLICT = "TemplateMatchingConflict";
public const string TEMPLATE_UN_SET_MATCHING = "TemplateUnSetMatching";
public const string TEMPLATE_KEY_UN_MATCHING = "TemplateKeyUnMatching";
public const string TEMPLATE_KEY_MATCHING_DUL = "TemplateKeyMatchingDul";
}
}
SmartScan/Form/FrmCodeExtract.cs
......@@ -187,15 +187,15 @@ namespace SmartScan
else
keyTemp.Add(key, 1);
}
if (matchButton.Keys.Count == 0) {
var mateCopy = BLLCommon.mateEdit.ToCopy();
var findocrm = mateCopy.Find(m => m.Ocr.Find(o => o.CodeID == this.codeID) != null);
if (findocrm != null) {
string text = Language.Dialog("ThisMatchHasOcrCantdelete");
new FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog();
return;
}
}
//if (matchButton.Keys.Count == 0) {
// var mateCopy = BLLCommon.mateEdit.ToCopy();
// var findocrm = mateCopy.Find(m => m.Ocr.Find(o => o.CodeID == this.codeID) != null);
// if (findocrm != null) {
// string text = Language.Dialog("ThisMatchHasOcrCantdelete");
// new FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog();
// return;
// }
//}
foreach (string key in keyTemp.Keys)
{
......
SmartScan/SetControl/UsrMaterialTemplate.Designer.cs
......@@ -143,7 +143,6 @@ namespace SmartScan
this.BtnTemplateValite.Size = new System.Drawing.Size(227, 56);
this.BtnTemplateValite.TabIndex = 15;
this.BtnTemplateValite.Text = "模板验证";
this.BtnTemplateValite.Visible = false;
this.BtnTemplateValite.Click += new System.EventHandler(this.BtnTemplateValite_Click);
//
// ImgShow
......
SmartScan/SetControl/UsrMaterialTemplate.cs
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using Asa.FaceControl;
using BLL;
using CameraVisionLib.Model;
using DocumentFormat.OpenXml.EMMA;
using Model;
namespace SmartScan
......@@ -20,11 +24,9 @@ namespace SmartScan
InitializeComponent();
BtnOcrCode.Visible = Config.Func_EnabledOCR;
if (!Config.Func_EnabledOCR)
BtnScanCode.Width = 461;
if(!BtnTemplateValite.Visible)
{
BtnExtractCode.Width = 461;
}
BtnScanCode.Width = LstCode.Width;
if (!BtnTemplateValite.Visible)
BtnExtractCode.Width = LstCode.Width;
LstMate.Items.AddRange(BLLCommon.mateEdit.Name);
mateCopy = BLLCommon.mateEdit.ToCopy();
Language.SetLanguage(this);
......@@ -428,12 +430,6 @@ namespace SmartScan
string text = Asa.FaceControl.Language.Dialog(LanguageDialogKey.SAVE_SUCCEED);
new Asa.FaceControl.FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog();
}
private void BtnTemplateValite_Click(object sender, EventArgs e)
{
}
private void BtnOcrCode_Click_1(object sender, EventArgs e)
{
if (bmp == null) return;
......@@ -457,5 +453,346 @@ namespace SmartScan
LstCode.Items.AddRange(FormatCode());
LstCode.SelectedIndex = codeIndex = -1;
}
#region 模板验证
private void BtnTemplateValite_Click(object sender, EventArgs e)
{
LogNet.log.Info($"开始模板验证");
if (ValidateCurTemplate())
{
ValidateAllTemplates();
}
LogNet.log.Info($"结束模板验证");
}
private bool ValidateCurTemplate()
{
bool ismatch = false;
try
{
if (mateIndex == -1) return false;
var curMatch = mateCopy[mateIndex];
List<BarcodeInfo> code = new List<BarcodeInfo>();
curMatch.Code.ForEach(s => { code.Add(new BarcodeInfo() { Text = s.Text, CodeType = s.CodeType }); });
ismatch = TemplateExtract(curMatch,code, out Dictionary<string, string> keyword, out List<string> allkeys);
var codeMatch = curMatch.Match.FindAll(s => !string.IsNullOrEmpty(s.Keyword));
if (codeMatch != null)
{
if (keyword.Count != allkeys.Count)//有重复
{
StringBuilder sb = new StringBuilder();
foreach (var key in keyword.Keys)
{
var dul = allkeys.FindAll(s=>s.Equals(key));
if (dul!=null&& dul.Count>1)
{
sb.AppendLine(key);
}
}
string text = Language.Dialog(LanguageDialogKey.TEMPLATE_KEY_MATCHING_DUL, "[name] 以下关键字重复匹配");
text = text.Replace("[name]", curMatch.Name);
new FaceMessageBox("", text + ":\r\n" + sb.ToString(), MessageBoxButtons.OK).ShowDialog();
return false;
}
else if (allkeys.Count != codeMatch.Count)//没有重复，但不匹配
{
StringBuilder sb = new StringBuilder();
foreach (var key in codeMatch)
{
if (!keyword.ContainsKey(key.Keyword))
{
sb.AppendLine(key.Keyword);
}
}
string text = Language.Dialog(LanguageDialogKey.TEMPLATE_KEY_UN_MATCHING, "[name] 以下关键字匹配失败");
text = text.Replace("[name]", curMatch.Name);
new FaceMessageBox("", text + ":\r\n" + sb.ToString(), MessageBoxButtons.OK).ShowDialog();
return false;
}
}
if (!ismatch)
{
if(codeMatch.Count==0)
{
string text = Language.Dialog(LanguageDialogKey.TEMPLATE_UN_SET_MATCHING, "[name] 模板不匹配，未设置匹配规则");
text = text.Replace("[name]", curMatch.Name);
new FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog();
}
}
}
catch (Exception ex)
{
LogNet.log.Error("ValidateCurTemplate", ex);
}
return ismatch;
}
private bool ValidateAllTemplates()
{
try
{
if (mateIndex == -1) return false;
var curMatch = mateCopy[mateIndex];
List<BarcodeInfo> code = new List<BarcodeInfo>();
curMatch.Code.ForEach(s => { code.Add(new BarcodeInfo() { Text = s.Text, CodeType = s.CodeType }); });
StringBuilder sb = new StringBuilder();
for (int i = 0; i < mateCopy.Count; i++)
{
if(mateIndex == i) continue;
var othMatch = mateCopy[i];
bool ismatch = TemplateExtract(othMatch, code, out Dictionary<string, string> keyword, out List<string> allkeys);
if(ismatch)
{
sb.AppendLine(othMatch.Name);
LogNet.log.Info($"【{othMatch.Name}】模板与当前模板【{curMatch.Name}】匹配冲突");
}
}
string templates= sb.ToString();
if(templates.Length > 0)
{
string text = Language.Dialog(LanguageDialogKey.TEMPLATE_MATCHING_CONFLICT, "[name] 与以下的模板匹配冲突");
text = text.Replace("[name]", curMatch.Name);
new FaceMessageBox("", text + ":\r\n" + templates, MessageBoxButtons.OK).ShowDialog();
}
}
catch (Exception ex)
{
LogNet.log.Error("ValidateAllTemplates", ex);
}
return true;
}
private bool TemplateExtract(MaterialTemplate materialTemplate,List<BarcodeInfo> code, out Dictionary<string, string> keyword, out List<string> allKeywords)
{
keyword = new(StringComparer.OrdinalIgnoreCase);
allKeywords = new List<string>();
int matchCount = 0;
bool isMatch = false;
List<MaterialCode> ocrlist = new List<MaterialCode>();
List<BarcodeInfo> ocrcode = new List<BarcodeInfo>();
//命中规则的条码索引
List<int> MatchCodeIndex = new List<int>();
int[] id = materialTemplate.GetCodeID();
for (int i = 0; i < id.Length; i++)
{
List<MaterialCodeMatch> codeMatch = materialTemplate.Match.FindAll(match => match.CodeID == id[i] && match.Keyword != "");
if (codeMatch.Count == 0) continue;
matchCount += codeMatch.Count;
for (int j = 0; j < code.Count; j++)
{
Dictionary<string, string> matchKey = CodeMatch(code[j], codeMatch);
if (matchKey != null && matchKey.Count > 0)
{
foreach (string key in matchKey.Keys)
{
allKeywords.Add(key);
if (!keyword.ContainsKey(key))
{
MatchCodeIndex.Add(j);
keyword.Add(key, matchKey[key]);
}
LogNet.log.Info($"{materialTemplate.Name}模板验证 【{j + 1}][{code[j].Text}][{code[j].CodeType}】");
LogNet.log.Info($"{materialTemplate.Name}模板验证 匹配 【{key}={matchKey[key]}】");
}
}
}
}
if (matchCount != 0 && keyword.Count == matchCount)
{
isMatch = true;
}
if (Config.Func_EnabledOCR)
{
List<MaterialCodeMatch> codeMatch = materialTemplate.Match.FindAll(match => match.CodeType.Equals(Setting_Str.OCR));
int ocrCount = codeMatch.Count;
if (ocrCount > 0)
{
LogNet.log.Info($"{materialTemplate.Name}模板验证 开始OCR匹配 [{ocrCount}]");
// for (int i = 0; i < ocrlist.Count; i++)
{
var ocrcodes = materialTemplate.Code.FindAll(s => s.CodeType.Equals(Setting_Str.OCR));
List<string> regOcrCodes = new List<string>();
if (ocrcodes != null)
{
ocrcodes.ForEach(s => { regOcrCodes.Add(s.Text); });
}
foreach (string regCode in regOcrCodes)
{
if (string.IsNullOrEmpty(regCode)) continue;
var x = new BarcodeInfo() { Text = regCode, CodeType = Setting_Str.OCR };
Dictionary<string, string> matchKey = CodeMatch(x, codeMatch);
if (matchKey != null)
{
foreach (string key in matchKey.Keys)
{
allKeywords.Add(key);
if (!keyword.ContainsKey(key))
{
keyword.Add(key, matchKey[key]);
ocrCount--;
}
LogNet.log.Info($"{materialTemplate.Name}模板验证 OCR匹配 [{key}={matchKey[key]}]");
}
}
}
}
if (ocrCount == 0 && !isMatch)
{
isMatch = true;
LogNet.log.Info($"{materialTemplate.Name}模板验证 OCR匹配成功");
}
LogNet.log.Info($"{materialTemplate.Name}模板验证 结束OCR匹配 ");
}
}
return isMatch;
}
private Dictionary<string, string> CodeMatch(BarcodeInfo codeinfo, List<MaterialCodeMatch> codeMatch)
{
Dictionary<string, string> key = new();
string code, text;
int index, count;
for (int i = 0; i < codeMatch.Count; i++)
{
int matchCount = 0;
var codeText = codeinfo.Text;
codeText = codeText.Replace("\r", "");
codeText = codeText.Replace("\n", "");
code = codeMatch[i].CaseSensitive ? codeText : codeText.ToUpper();
bool ismatch = true;
//匹配CodeType
if (codeMatch[i].CheckCodeType && !string.IsNullOrEmpty(codeMatch[i].CodeType) && !string.IsNullOrEmpty(codeinfo.CodeType))
{
matchCount++;
if (codeinfo.CodeType != codeMatch[i].CodeType)
ismatch = false;
}
//开头
if (codeMatch[i].MatchStart)
{
matchCount++;
text = codeMatch[i].CaseSensitive ? codeMatch[i].StartText : codeMatch[i].StartText.ToUpper();
if (!code.StartsWith(text))
ismatch = false;
}
//结尾
if (codeMatch[i].MatchEnd)
{
matchCount++;
//bool ismatch = true;
text = codeMatch[i].CaseSensitive ? codeMatch[i].EndText : codeMatch[i].EndText.ToUpper();
if (!code.EndsWith(text))
ismatch = false;
}
//中间
if (codeMatch[i].MatchMiddle)
{
matchCount++;
//bool ismatch = true;
text = codeMatch[i].CaseSensitive ? codeMatch[i].MiddleText : codeMatch[i].MiddleText.ToUpper();
if (text == "") return null;
index = count = 0;
while ((index = code.IndexOf(text, index)) != -1)
{
count++;
index += text.Length;
}
if (count == 0)
ismatch = false;
if (codeMatch[i].MatchMiddleType == -1 && count > codeMatch[i].MiddleTextCount)
ismatch = false;
if (codeMatch[i].MatchMiddleType == 0 && count != codeMatch[i].MiddleTextCount)
ismatch = false;
if (codeMatch[i].MatchMiddleType == 1 && count < codeMatch[i].MiddleTextCount)
ismatch = false;
}
//分割
code = codeText;
if (codeMatch[i].MatchSplit)
{
matchCount++;
//bool ismatch = true;
string str = MaterialAsciiCode.GetAsciiCode(codeMatch[i].SplitText);
if (codeText.Contains(str))
{
string[] arr = codeText.Split(new string[] { str }, StringSplitOptions.RemoveEmptyEntries);
index = codeMatch[i].SplitPart - 1;
if (index >= arr.Length)
ismatch = false;
else
code = arr[index];
}
else
{
ismatch = false;
}
}
//截取
if (!ismatch) continue;
int startIndex = codeMatch[i].SubstringStart;
int length = codeMatch[i].SubstringLength;
if (startIndex >= code.Length)
continue;
if (length == -1)
{
length = code.Length - startIndex;
}
else
{
if (startIndex + length > code.Length)
length = code.Length - startIndex;
}
var filtercode = code.Substring(startIndex, length);
if (codeMatch[i].MatchISNumber)
{
if (!int.TryParse(filtercode, out int res))
ismatch = false;
filtercode = res.ToString();
}
//最小
if (codeMatch[i].MatchMinLength)
{
matchCount++;
//bool ismatch = true;
if (code.Length < codeMatch[i].MinLength)
ismatch = false;
}
//最大
if (codeMatch[i].MatchMaxLength)
{
matchCount++;
//bool ismatch = true;
if (code.Length > codeMatch[i].MaxLength)
ismatch = false;
}
if (!ismatch)
continue;
if (key.ContainsKey(codeMatch[i].Keyword))
key[codeMatch[i].Keyword] = filtercode.Trim();
else
key.Add(codeMatch[i].Keyword, filtercode.Trim());
}
return key;
}
#endregion
}
}
SmartScan/SetControl/UsrWorkMode.Designer.cs
......@@ -30,6 +30,7 @@ namespace SmartScan
private void InitializeComponent()
{
this.facePanel1 = new Asa.FaceControl.FacePanel();
this.ChkAllowModifyPrint = new Asa.FaceControl.FaceCheckBox();
this.ChkAutoPrint = new Asa.FaceControl.FaceCheckBox();
this.ChkPromptAfterPrinting = new Asa.FaceControl.FaceCheckBox();
this.ChkTriggerOpenLight = new Asa.FaceControl.FaceCheckBox();
......@@ -50,7 +51,6 @@ namespace SmartScan
this.RdoCondense = new Asa.FaceControl.FaceRadioBox();
this.RdoOriginal = new Asa.FaceControl.FaceRadioBox();
this.LblHistoryImage = new Asa.FaceControl.FaceLabel();
this.faceCheckBox1 = new Asa.FaceControl.FaceCheckBox();
this.facePanel1.SuspendLayout();
this.SuspendLayout();
//
......@@ -59,7 +59,7 @@ namespace SmartScan
this.facePanel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.facePanel1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.facePanel1.BorderWidth = 2;
this.facePanel1.Controls.Add(this.faceCheckBox1);
this.facePanel1.Controls.Add(this.ChkAllowModifyPrint);
this.facePanel1.Controls.Add(this.ChkAutoPrint);
this.facePanel1.Controls.Add(this.ChkPromptAfterPrinting);
this.facePanel1.Controls.Add(this.ChkTriggerOpenLight);
......@@ -82,15 +82,31 @@ namespace SmartScan
this.facePanel1.Controls.Add(this.LblHistoryImage);
this.facePanel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.facePanel1.Location = new System.Drawing.Point(4, 4);
this.facePanel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.facePanel1.Margin = new System.Windows.Forms.Padding(4);
this.facePanel1.Name = "facePanel1";
this.facePanel1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.facePanel1.Padding = new System.Windows.Forms.Padding(4);
this.facePanel1.ShowText = false;
this.facePanel1.Size = new System.Drawing.Size(1059, 824);
this.facePanel1.TabIndex = 0;
this.facePanel1.Text = "facePanel1";
this.facePanel1.TitleFont = new System.Drawing.Font("宋体", 12F);
//
// ChkAllowModifyPrint
//
this.ChkAllowModifyPrint.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.ChkAllowModifyPrint.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.ChkAllowModifyPrint.BorderWidth = 0;
this.ChkAllowModifyPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkAllowModifyPrint.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkAllowModifyPrint.Location = new System.Drawing.Point(348, 757);
this.ChkAllowModifyPrint.Margin = new System.Windows.Forms.Padding(4);
this.ChkAllowModifyPrint.Name = "ChkAllowModifyPrint";
this.ChkAllowModifyPrint.Padding = new System.Windows.Forms.Padding(4);
this.ChkAllowModifyPrint.Size = new System.Drawing.Size(604, 44);
this.ChkAllowModifyPrint.TabIndex = 19;
this.ChkAllowModifyPrint.Text = "允许修改打内容";
this.ChkAllowModifyPrint.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// ChkAutoPrint
//
this.ChkAutoPrint.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
......@@ -99,9 +115,9 @@ namespace SmartScan
this.ChkAutoPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkAutoPrint.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkAutoPrint.Location = new System.Drawing.Point(348, 708);
this.ChkAutoPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkAutoPrint.Margin = new System.Windows.Forms.Padding(4);
this.ChkAutoPrint.Name = "ChkAutoPrint";
this.ChkAutoPrint.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkAutoPrint.Padding = new System.Windows.Forms.Padding(4);
this.ChkAutoPrint.Size = new System.Drawing.Size(604, 44);
this.ChkAutoPrint.TabIndex = 18;
this.ChkAutoPrint.Text = "自动打印";
......@@ -115,9 +131,9 @@ namespace SmartScan
this.ChkPromptAfterPrinting.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkPromptAfterPrinting.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkPromptAfterPrinting.Location = new System.Drawing.Point(348, 658);
this.ChkPromptAfterPrinting.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkPromptAfterPrinting.Margin = new System.Windows.Forms.Padding(4);
this.ChkPromptAfterPrinting.Name = "ChkPromptAfterPrinting";
this.ChkPromptAfterPrinting.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkPromptAfterPrinting.Padding = new System.Windows.Forms.Padding(4);
this.ChkPromptAfterPrinting.Size = new System.Drawing.Size(604, 44);
this.ChkPromptAfterPrinting.TabIndex = 18;
this.ChkPromptAfterPrinting.Text = "打印完成后提示";
......@@ -131,9 +147,9 @@ namespace SmartScan
this.ChkTriggerOpenLight.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkTriggerOpenLight.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkTriggerOpenLight.Location = new System.Drawing.Point(348, 608);
this.ChkTriggerOpenLight.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkTriggerOpenLight.Margin = new System.Windows.Forms.Padding(4);
this.ChkTriggerOpenLight.Name = "ChkTriggerOpenLight";
this.ChkTriggerOpenLight.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkTriggerOpenLight.Padding = new System.Windows.Forms.Padding(4);
this.ChkTriggerOpenLight.Size = new System.Drawing.Size(604, 44);
this.ChkTriggerOpenLight.TabIndex = 17;
this.ChkTriggerOpenLight.Text = "触发信号亮灯";
......@@ -147,9 +163,9 @@ namespace SmartScan
this.LblDefaultMate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblDefaultMate.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblDefaultMate.Location = new System.Drawing.Point(757, 20);
this.LblDefaultMate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblDefaultMate.Margin = new System.Windows.Forms.Padding(4);
this.LblDefaultMate.Name = "LblDefaultMate";
this.LblDefaultMate.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblDefaultMate.Padding = new System.Windows.Forms.Padding(4);
this.LblDefaultMate.Size = new System.Drawing.Size(267, 44);
this.LblDefaultMate.TabIndex = 16;
this.LblDefaultMate.Text = "优先匹配模板";
......@@ -162,9 +178,9 @@ namespace SmartScan
this.LstMate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LstMate.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstMate.Location = new System.Drawing.Point(757, 71);
this.LstMate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstMate.Margin = new System.Windows.Forms.Padding(4);
this.LstMate.Name = "LstMate";
this.LstMate.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstMate.Padding = new System.Windows.Forms.Padding(4);
this.LstMate.SelectedIndex = -1;
this.LstMate.Size = new System.Drawing.Size(267, 251);
this.LstMate.TabIndex = 15;
......@@ -177,9 +193,9 @@ namespace SmartScan
this.ChkPrintCompletedClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkPrintCompletedClear.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkPrintCompletedClear.Location = new System.Drawing.Point(348, 458);
this.ChkPrintCompletedClear.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkPrintCompletedClear.Margin = new System.Windows.Forms.Padding(4);
this.ChkPrintCompletedClear.Name = "ChkPrintCompletedClear";
this.ChkPrintCompletedClear.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkPrintCompletedClear.Padding = new System.Windows.Forms.Padding(4);
this.ChkPrintCompletedClear.Size = new System.Drawing.Size(604, 44);
this.ChkPrintCompletedClear.TabIndex = 14;
this.ChkPrintCompletedClear.Text = "标签打印完成后清除数据";
......@@ -193,9 +209,9 @@ namespace SmartScan
this.ChkOpenMaximize.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkOpenMaximize.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkOpenMaximize.Location = new System.Drawing.Point(348, 558);
this.ChkOpenMaximize.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkOpenMaximize.Margin = new System.Windows.Forms.Padding(4);
this.ChkOpenMaximize.Name = "ChkOpenMaximize";
this.ChkOpenMaximize.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkOpenMaximize.Padding = new System.Windows.Forms.Padding(4);
this.ChkOpenMaximize.Size = new System.Drawing.Size(604, 44);
this.ChkOpenMaximize.TabIndex = 13;
this.ChkOpenMaximize.Text = "软件打开最大化";
......@@ -209,9 +225,9 @@ namespace SmartScan
this.LstPrinter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LstPrinter.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstPrinter.Location = new System.Drawing.Point(8, 135);
this.LstPrinter.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstPrinter.Margin = new System.Windows.Forms.Padding(4);
this.LstPrinter.Name = "LstPrinter";
this.LstPrinter.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstPrinter.Padding = new System.Windows.Forms.Padding(4);
this.LstPrinter.SelectedIndex = -1;
this.LstPrinter.Size = new System.Drawing.Size(467, 188);
this.LstPrinter.TabIndex = 8;
......@@ -224,9 +240,9 @@ namespace SmartScan
this.ChkOpenEnterWork.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkOpenEnterWork.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkOpenEnterWork.Location = new System.Drawing.Point(348, 508);
this.ChkOpenEnterWork.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkOpenEnterWork.Margin = new System.Windows.Forms.Padding(4);
this.ChkOpenEnterWork.Name = "ChkOpenEnterWork";
this.ChkOpenEnterWork.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkOpenEnterWork.Padding = new System.Windows.Forms.Padding(4);
this.ChkOpenEnterWork.Size = new System.Drawing.Size(604, 44);
this.ChkOpenEnterWork.TabIndex = 12;
this.ChkOpenEnterWork.Text = "软件打开自动进入工作";
......@@ -240,9 +256,9 @@ namespace SmartScan
this.ChkLabelEmptyCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkLabelEmptyCheck.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkLabelEmptyCheck.Location = new System.Drawing.Point(348, 408);
this.ChkLabelEmptyCheck.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkLabelEmptyCheck.Margin = new System.Windows.Forms.Padding(4);
this.ChkLabelEmptyCheck.Name = "ChkLabelEmptyCheck";
this.ChkLabelEmptyCheck.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkLabelEmptyCheck.Padding = new System.Windows.Forms.Padding(4);
this.ChkLabelEmptyCheck.Size = new System.Drawing.Size(604, 44);
this.ChkLabelEmptyCheck.TabIndex = 11;
this.ChkLabelEmptyCheck.Text = "标签空内容校验";
......@@ -256,9 +272,9 @@ namespace SmartScan
this.ChkSelectPN.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ChkSelectPN.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.ChkSelectPN.Location = new System.Drawing.Point(348, 358);
this.ChkSelectPN.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkSelectPN.Margin = new System.Windows.Forms.Padding(4);
this.ChkSelectPN.Name = "ChkSelectPN";
this.ChkSelectPN.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ChkSelectPN.Padding = new System.Windows.Forms.Padding(4);
this.ChkSelectPN.Size = new System.Drawing.Size(604, 44);
this.ChkSelectPN.TabIndex = 10;
this.ChkSelectPN.Text = "通过服务器查询PN";
......@@ -272,9 +288,9 @@ namespace SmartScan
this.LblDefaultLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblDefaultLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblDefaultLabel.Location = new System.Drawing.Point(483, 20);
this.LblDefaultLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblDefaultLabel.Margin = new System.Windows.Forms.Padding(4);
this.LblDefaultLabel.Name = "LblDefaultLabel";
this.LblDefaultLabel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblDefaultLabel.Padding = new System.Windows.Forms.Padding(4);
this.LblDefaultLabel.Size = new System.Drawing.Size(267, 44);
this.LblDefaultLabel.TabIndex = 9;
this.LblDefaultLabel.Text = "默认打印标签";
......@@ -288,9 +304,9 @@ namespace SmartScan
this.RdoVertical.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoVertical.Group = "1";
this.RdoVertical.Location = new System.Drawing.Point(245, 71);
this.RdoVertical.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.RdoVertical.Margin = new System.Windows.Forms.Padding(4);
this.RdoVertical.Name = "RdoVertical";
this.RdoVertical.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.RdoVertical.Padding = new System.Windows.Forms.Padding(4);
this.RdoVertical.Size = new System.Drawing.Size(229, 56);
this.RdoVertical.TabIndex = 7;
this.RdoVertical.Text = "纵向打印";
......@@ -304,9 +320,9 @@ namespace SmartScan
this.RdoLandscape.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoLandscape.Group = "1";
this.RdoLandscape.Location = new System.Drawing.Point(8, 71);
this.RdoLandscape.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.RdoLandscape.Margin = new System.Windows.Forms.Padding(4);
this.RdoLandscape.Name = "RdoLandscape";
this.RdoLandscape.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.RdoLandscape.Padding = new System.Windows.Forms.Padding(4);
this.RdoLandscape.Size = new System.Drawing.Size(229, 56);
this.RdoLandscape.TabIndex = 6;
this.RdoLandscape.Text = "横向打印";
......@@ -319,9 +335,9 @@ namespace SmartScan
this.LstLabel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LstLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LstLabel.Location = new System.Drawing.Point(483, 71);
this.LstLabel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstLabel.Margin = new System.Windows.Forms.Padding(4);
this.LstLabel.Name = "LstLabel";
this.LstLabel.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LstLabel.Padding = new System.Windows.Forms.Padding(4);
this.LstLabel.SelectedIndex = -1;
this.LstLabel.Size = new System.Drawing.Size(267, 251);
this.LstLabel.TabIndex = 5;
......@@ -334,9 +350,9 @@ namespace SmartScan
this.LblPrint.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblPrint.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblPrint.Location = new System.Drawing.Point(8, 20);
this.LblPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblPrint.Margin = new System.Windows.Forms.Padding(4);
this.LblPrint.Name = "LblPrint";
this.LblPrint.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblPrint.Padding = new System.Windows.Forms.Padding(4);
this.LblPrint.Size = new System.Drawing.Size(467, 44);
this.LblPrint.TabIndex = 4;
this.LblPrint.Text = "打印机";
......@@ -350,9 +366,9 @@ namespace SmartScan
this.RdoNoImage.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoNoImage.Group = "2";
this.RdoNoImage.Location = new System.Drawing.Point(27, 511);
this.RdoNoImage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.RdoNoImage.Margin = new System.Windows.Forms.Padding(4);
this.RdoNoImage.Name = "RdoNoImage";
this.RdoNoImage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.RdoNoImage.Padding = new System.Windows.Forms.Padding(4);
this.RdoNoImage.Size = new System.Drawing.Size(313, 44);
this.RdoNoImage.TabIndex = 3;
this.RdoNoImage.Text = "不保存";
......@@ -367,9 +383,9 @@ namespace SmartScan
this.RdoCondense.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoCondense.Group = "2";
this.RdoCondense.Location = new System.Drawing.Point(27, 460);
this.RdoCondense.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.RdoCondense.Margin = new System.Windows.Forms.Padding(4);
this.RdoCondense.Name = "RdoCondense";
this.RdoCondense.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.RdoCondense.Padding = new System.Windows.Forms.Padding(4);
this.RdoCondense.Size = new System.Drawing.Size(313, 44);
this.RdoCondense.TabIndex = 2;
this.RdoCondense.Text = "压缩图";
......@@ -384,9 +400,9 @@ namespace SmartScan
this.RdoOriginal.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.RdoOriginal.Group = "2";
this.RdoOriginal.Location = new System.Drawing.Point(27, 409);
this.RdoOriginal.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.RdoOriginal.Margin = new System.Windows.Forms.Padding(4);
this.RdoOriginal.Name = "RdoOriginal";
this.RdoOriginal.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.RdoOriginal.Padding = new System.Windows.Forms.Padding(4);
this.RdoOriginal.Size = new System.Drawing.Size(313, 44);
this.RdoOriginal.TabIndex = 1;
this.RdoOriginal.Text = "原始图";
......@@ -400,36 +416,20 @@ namespace SmartScan
this.LblHistoryImage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.LblHistoryImage.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.LblHistoryImage.Location = new System.Drawing.Point(27, 358);
this.LblHistoryImage.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblHistoryImage.Margin = new System.Windows.Forms.Padding(4);
this.LblHistoryImage.Name = "LblHistoryImage";
this.LblHistoryImage.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.LblHistoryImage.Padding = new System.Windows.Forms.Padding(4);
this.LblHistoryImage.Size = new System.Drawing.Size(313, 44);
this.LblHistoryImage.TabIndex = 0;
this.LblHistoryImage.Text = "追溯图像保存";
this.LblHistoryImage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// faceCheckBox1
//
this.faceCheckBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.faceCheckBox1.BorderStyle = Asa.FaceControl.ControlShape.Rectangle;
this.faceCheckBox1.BorderWidth = 0;
this.faceCheckBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.faceCheckBox1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.faceCheckBox1.Location = new System.Drawing.Point(348, 757);
this.faceCheckBox1.Margin = new System.Windows.Forms.Padding(4);
this.faceCheckBox1.Name = "faceCheckBox1";
this.faceCheckBox1.Padding = new System.Windows.Forms.Padding(4);
this.faceCheckBox1.Size = new System.Drawing.Size(604, 44);
this.faceCheckBox1.TabIndex = 19;
this.faceCheckBox1.Text = "允许修改打内容";
this.faceCheckBox1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// UsrWorkMode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.facePanel1);
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "UsrWorkMode";
this.Size = new System.Drawing.Size(1124, 832);
this.facePanel1.ResumeLayout(false);
......@@ -460,6 +460,6 @@ namespace SmartScan
private Asa.FaceControl.FaceCheckBox ChkTriggerOpenLight;
private Asa.FaceControl.FaceCheckBox ChkAutoPrint;
private Asa.FaceControl.FaceCheckBox ChkPromptAfterPrinting;
private Asa.FaceControl.FaceCheckBox faceCheckBox1;
private Asa.FaceControl.FaceCheckBox ChkAllowModifyPrint;
}
}
SmartScan/SetControl/UsrWorkMode.cs
......@@ -33,7 +33,7 @@ namespace SmartScan
ChkTriggerOpenLight.Checked = BLLCommon.config.TriggerOpenLight;
ChkPromptAfterPrinting.Checked = BLLCommon.config.PromptAfterPrinting;
ChkAutoPrint.Checked = BLLCommon.config.AutoPrint;
ChkAllowModifyPrint.Checked = Config.AllowModifyPrintInfo;
//默认标签
LstLabel.Items.AddRange(BLLCommon.labelEdit.Name);
LstLabel.Text = BLLCommon.config.DefaultPrintLabel;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!