Commit 32b2ae2c LN

二维码学习功能先开放

1 个父辈 1085af9b
...@@ -131,7 +131,6 @@ ...@@ -131,7 +131,6 @@
this.btnLearn.TabIndex = 10; this.btnLearn.TabIndex = 10;
this.btnLearn.Text = "学习"; this.btnLearn.Text = "学习";
this.btnLearn.UseVisualStyleBackColor = true; this.btnLearn.UseVisualStyleBackColor = true;
this.btnLearn.Visible = false;
this.btnLearn.Click += new System.EventHandler(this.btnLearn_Click); this.btnLearn.Click += new System.EventHandler(this.btnLearn_Click);
// //
// btnDCode // btnDCode
...@@ -187,7 +186,6 @@ ...@@ -187,7 +186,6 @@
this.cmbCount.Name = "cmbCount"; this.cmbCount.Name = "cmbCount";
this.cmbCount.Size = new System.Drawing.Size(66, 25); this.cmbCount.Size = new System.Drawing.Size(66, 25);
this.cmbCount.TabIndex = 16; this.cmbCount.TabIndex = 16;
this.cmbCount.Visible = false;
// //
// lblCount // lblCount
// //
...@@ -198,7 +196,6 @@ ...@@ -198,7 +196,6 @@
this.lblCount.TabIndex = 15; this.lblCount.TabIndex = 15;
this.lblCount.Text = "条码数量:"; this.lblCount.Text = "条码数量:";
this.lblCount.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblCount.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblCount.Visible = false;
// //
// btnCameraImage // btnCameraImage
// //
...@@ -263,7 +260,6 @@ ...@@ -263,7 +260,6 @@
this.cmbCodeType.Name = "cmbCodeType"; this.cmbCodeType.Name = "cmbCodeType";
this.cmbCodeType.Size = new System.Drawing.Size(154, 25); this.cmbCodeType.Size = new System.Drawing.Size(154, 25);
this.cmbCodeType.TabIndex = 23; this.cmbCodeType.TabIndex = 23;
this.cmbCodeType.Visible = false;
this.cmbCodeType.SelectedIndexChanged += new System.EventHandler(this.cmbCodeType_SelectedIndexChanged); this.cmbCodeType.SelectedIndexChanged += new System.EventHandler(this.cmbCodeType_SelectedIndexChanged);
// //
// label3 // label3
...@@ -275,7 +271,6 @@ ...@@ -275,7 +271,6 @@
this.label3.TabIndex = 22; this.label3.TabIndex = 22;
this.label3.Text = "条码类型:"; this.label3.Text = "条码类型:";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Visible = false;
// //
// chbUseParam // chbUseParam
// //
...@@ -319,6 +314,7 @@ ...@@ -319,6 +314,7 @@
this.btnScanTest.TabIndex = 30; this.btnScanTest.TabIndex = 30;
this.btnScanTest.Text = "扫码测试"; this.btnScanTest.Text = "扫码测试";
this.btnScanTest.UseVisualStyleBackColor = true; this.btnScanTest.UseVisualStyleBackColor = true;
this.btnScanTest.Visible = false;
this.btnScanTest.Click += new System.EventHandler(this.btnScanTest_Click); this.btnScanTest.Click += new System.EventHandler(this.btnScanTest_Click);
// //
// chbZxing // chbZxing
......
...@@ -187,7 +187,7 @@ namespace CodeLibrary ...@@ -187,7 +187,7 @@ namespace CodeLibrary
foreach (CodeInfo code in list) foreach (CodeInfo code in list)
{ {
txtResult.Text += "\r\n" + "" + code.CodeType + " (X:" + code.X + ",Y:" + code.Y + ") " + code.CodeStr; txtResult.Text += "\r\n" + "" + code.CodeType + " (X:" + code.X + ",Y:" + code.Y + ") " + code.CodeStr;
txtResult.Text += "\r\n" + "" + code.CodeType + " (X:" + code.X + ",Y:" + code.Y + ") " + code.GetCodeStr(); //txtResult.Text += "\r\n" + "" + code.CodeType + " (X:" + code.X + ",Y:" + code.Y + ") " + code.GetCodeStr();
} }
} }
else else
......
...@@ -221,7 +221,7 @@ namespace CodeLibrary ...@@ -221,7 +221,7 @@ namespace CodeLibrary
CodeResultAdd(hv_DecodedDataStrings, codeType, "学习"); CodeResultAdd(hv_DecodedDataStrings, codeType, "学习");
} }
ShowImage(hv_ExpDefaultWinHandle, ho_Image, ho_SymbolXLDs); ShowImage(hv_ExpDefaultWinHandle, ho_Image, ho_SymbolXLDs);
ho_Image.Dispose();
} }
if (findCode.Count >= codeCount || stopWatch.ElapsedMilliseconds > timeOutMs) if (findCode.Count >= codeCount || stopWatch.ElapsedMilliseconds > timeOutMs)
{ {
...@@ -253,7 +253,6 @@ namespace CodeLibrary ...@@ -253,7 +253,6 @@ namespace CodeLibrary
{ {
CodeResultAdd(hv_DecodedDataStrings, codeType, "识别"); CodeResultAdd(hv_DecodedDataStrings, codeType, "识别");
} }
ho_Image.Dispose();
} }
if (findCode.Count >= codeCount || stopWatch.ElapsedMilliseconds > timeOutMs) if (findCode.Count >= codeCount || stopWatch.ElapsedMilliseconds > timeOutMs)
{ {
......
此文件类型无法预览
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!