Skip to content

张东亮 / NS100

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

新ui

1 个父辈 8d2fe4df
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 19 行增加 和 15 行删除
BLL/Config.cs
...@@ -325,9 +325,9 @@ namespace BLL ...@@ -325,9 +325,9 @@ namespace BLL
[MyConfigComment("遍历数据源目录")] [MyConfigComment("遍历数据源目录")]
public static MyConfig<bool> DataSource_Recursive; public static MyConfig<bool> DataSource_Recursive;
[MyConfigComment("是否启用OCR")] [MyConfigComment("是否启用OCR")]
public static MyConfig<bool> Func_EnabledOCR=true; public static MyConfig<bool> Func_EnabledOCR;
//[MyConfigComment("是否启用飞浆OCR识别")] [MyConfigComment("允许修改打内容")]
//public static MyConfig<bool> UsePaddleOCR = true; public static MyConfig<bool> AllowModifyPrintInfo;
public void Save() public void Save()
{ {
......
BLL/Extension.cs
...@@ -137,7 +137,8 @@ namespace BLL ...@@ -137,7 +137,8 @@ namespace BLL
{ "Height",40}, { "Height",40},
{ "ShowDel","False"}, { "ShowDel","False"},
{ "ShowQuery","False"}, { "ShowQuery","False"},
{ "Text",""} { "Text",""},
{"Enabled",Config.AllowModifyPrintInfo }
} }
} }
}; };
......
Model/LanguageDialogKey.cs
...@@ -18,5 +18,9 @@ namespace Model ...@@ -18,5 +18,9 @@ namespace Model
public const string SAVE_SUCCEED = "SaveSucceed"; public const string SAVE_SUCCEED = "SaveSucceed";
public const string REMIND_CLEARTEMPLATE = "RemindClearTemplate"; public const string REMIND_CLEARTEMPLATE = "RemindClearTemplate";
public const string REMIND_SELECTCODE = "RemindSelectCode"; 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 ...@@ -187,15 +187,15 @@ namespace SmartScan
else else
keyTemp.Add(key, 1); keyTemp.Add(key, 1);
} }
if (matchButton.Keys.Count == 0) { //if (matchButton.Keys.Count == 0) {
var mateCopy = BLLCommon.mateEdit.ToCopy(); // var mateCopy = BLLCommon.mateEdit.ToCopy();
var findocrm = mateCopy.Find(m => m.Ocr.Find(o => o.CodeID == this.codeID) != null); // var findocrm = mateCopy.Find(m => m.Ocr.Find(o => o.CodeID == this.codeID) != null);
if (findocrm != null) { // if (findocrm != null) {
string text = Language.Dialog("ThisMatchHasOcrCantdelete"); // string text = Language.Dialog("ThisMatchHasOcrCantdelete");
new FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog(); // new FaceMessageBox("", text, MessageBoxButtons.OK).ShowDialog();
return; // return;
} // }
} //}
foreach (string key in keyTemp.Keys) foreach (string key in keyTemp.Keys)
{ {
......
SmartScan/SetControl/UsrMaterialTemplate.Designer.cs
...@@ -143,7 +143,6 @@ namespace SmartScan ...@@ -143,7 +143,6 @@ namespace SmartScan
this.BtnTemplateValite.Size = new System.Drawing.Size(227, 56); this.BtnTemplateValite.Size = new System.Drawing.Size(227, 56);
this.BtnTemplateValite.TabIndex = 15; this.BtnTemplateValite.TabIndex = 15;
this.BtnTemplateValite.Text = "模板验证"; this.BtnTemplateValite.Text = "模板验证";
this.BtnTemplateValite.Visible = false;
this.BtnTemplateValite.Click += new System.EventHandler(this.BtnTemplateValite_Click); this.BtnTemplateValite.Click += new System.EventHandler(this.BtnTemplateValite_Click);
// //
// ImgShow // ImgShow
......
SmartScan/SetControl/UsrWorkMode.cs
...@@ -33,7 +33,7 @@ namespace SmartScan ...@@ -33,7 +33,7 @@ namespace SmartScan
ChkTriggerOpenLight.Checked = BLLCommon.config.TriggerOpenLight; ChkTriggerOpenLight.Checked = BLLCommon.config.TriggerOpenLight;
ChkPromptAfterPrinting.Checked = BLLCommon.config.PromptAfterPrinting; ChkPromptAfterPrinting.Checked = BLLCommon.config.PromptAfterPrinting;
ChkAutoPrint.Checked = BLLCommon.config.AutoPrint; ChkAutoPrint.Checked = BLLCommon.config.AutoPrint;
ChkAllowModifyPrint.Checked = Config.AllowModifyPrintInfo;
//默认标签 //默认标签
LstLabel.Items.AddRange(BLLCommon.labelEdit.Name); LstLabel.Items.AddRange(BLLCommon.labelEdit.Name);
LstLabel.Text = BLLCommon.config.DefaultPrintLabel; LstLabel.Text = BLLCommon.config.DefaultPrintLabel;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!