增加一维码扫码

source/ACSingleStore/FrmAxisDebug.Designer.cs

@@ -64,7 +64,7 @@
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(39, 77);
+            this.label1.Location = new System.Drawing.Point(27, 77);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(92, 17);
             this.label1.TabIndex = 0;
@@ -73,7 +73,7 @@
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(39, 131);
+            this.label2.Location = new System.Drawing.Point(27, 131);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(92, 17);
             this.label2.TabIndex = 1;
@@ -82,7 +82,7 @@
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(39, 184);
+            this.label3.Location = new System.Drawing.Point(27, 184);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(92, 17);
             this.label3.TabIndex = 2;
@@ -102,21 +102,21 @@
             // 
             // txtMiddleSpeed
             // 
-            this.txtMiddleSpeed.Location = new System.Drawing.Point(150, 75);
+            this.txtMiddleSpeed.Location = new System.Drawing.Point(143, 75);
             this.txtMiddleSpeed.Name = "txtMiddleSpeed";
             this.txtMiddleSpeed.Size = new System.Drawing.Size(108, 23);
             this.txtMiddleSpeed.TabIndex = 5;
             // 
             // txtUpDownSpeed
             // 
-            this.txtUpDownSpeed.Location = new System.Drawing.Point(150, 129);
+            this.txtUpDownSpeed.Location = new System.Drawing.Point(143, 129);
             this.txtUpDownSpeed.Name = "txtUpDownSpeed";
             this.txtUpDownSpeed.Size = new System.Drawing.Size(108, 23);
             this.txtUpDownSpeed.TabIndex = 6;
             // 
             // txtInOutSpeed
             // 
-            this.txtInOutSpeed.Location = new System.Drawing.Point(150, 182);
+            this.txtInOutSpeed.Location = new System.Drawing.Point(143, 182);
             this.txtInOutSpeed.Name = "txtInOutSpeed";
             this.txtInOutSpeed.Size = new System.Drawing.Size(108, 23);
             this.txtInOutSpeed.TabIndex = 7;
@@ -268,7 +268,7 @@
             // 
             // txtComSpeed
             // 
-            this.txtComSpeed.Location = new System.Drawing.Point(150, 290);
+            this.txtComSpeed.Location = new System.Drawing.Point(143, 290);
             this.txtComSpeed.Name = "txtComSpeed";
             this.txtComSpeed.Size = new System.Drawing.Size(108, 23);
             this.txtComSpeed.TabIndex = 23;
@@ -276,7 +276,7 @@
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(39, 292);
+            this.label4.Location = new System.Drawing.Point(27, 292);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(92, 17);
             this.label4.TabIndex = 22;
@@ -315,7 +315,7 @@
             // 
             // txtAutoSpeed
             // 
-            this.txtAutoSpeed.Location = new System.Drawing.Point(150, 235);
+            this.txtAutoSpeed.Location = new System.Drawing.Point(143, 235);
             this.txtAutoSpeed.Name = "txtAutoSpeed";
             this.txtAutoSpeed.Size = new System.Drawing.Size(108, 23);
             this.txtAutoSpeed.TabIndex = 28;

source/DeviceLibrary/halcon/CodeManager.cs

@@ -110,8 +110,16 @@ namespace OnlineStore.DeviceLibrary
                         List<CodeInfo> cc = new List<CodeInfo>();
                         foreach (string codeType in codeTypeList)
                         {
+                            //判断是否是一维码
+                            if (codeType.ToLower().Equals("barcode"))
+                            {
+                                cc = HDCodeHelper.DecodeBarCode(ho_Image);
+                            }
+                            else
+                            {
                                 cc = HDCodeHelper.DecodeCode(ho_Image, 1, GetCodeParamFilePath(codeType), codeType);
                             }
+                        }
                         allCodeList.AddRange(cc);
                     }
             }