1

DL.StandardRobots/TCP/ModbusTCPMaster.cs

@@ -328,11 +328,11 @@ namespace DL.Com.TCP
         /// <param name="request"></param>
         /// <param name="request"></param>
         void EnRequestQueue(RequestInfo request)
         void EnRequestQueue(RequestInfo request)
         {
         {
-            if(requestInfos.Count>0)
-            {
-                LogUtil.Info($"The count of request queue is {requestInfos.Count},clear the queue:{JsonHelper.SerializeObject(requestInfos)}");
-                requestInfos = new ConcurrentQueue<RequestInfo>();
-            }
+            //if(requestInfos.Count>0)
+            //{
+            //    LogUtil.Info($"The count of request queue is {requestInfos.Count},clear the queue:{JsonHelper.SerializeObject(requestInfos)}");
+            //    requestInfos = new ConcurrentQueue<RequestInfo>();
+            //}
             requestInfos.Enqueue(request);
             requestInfos.Enqueue(request);
             if (!GetFunction(request.FunCode).Equals(RegisterFunction.Read))
             if (!GetFunction(request.FunCode).Equals(RegisterFunction.Read))
                 LogUtil.Info($"Enqueue Request {request}");
                 LogUtil.Info($"Enqueue Request {request}");

DeviceLibrary/AutoScanAndLabel/Common.cs

@@ -127,7 +127,7 @@ namespace DeviceLibrary
             srcbitmap.Dispose();
             srcbitmap.Dispose();
 
 
             //bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);//格力
             //bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);//格力
-            bitmap.RotateFlip(RotateFlipType.Rotate180FlipNone);
+            //bitmap.RotateFlip(RotateFlipType.Rotate180FlipNone);
 
 
             Size pointsize = new Size(30, 30);
             Size pointsize = new Size(30, 30);
             int widthOffset = 0;
             int widthOffset = 0;
@@ -136,45 +136,36 @@ namespace DeviceLibrary
             g.FillEllipse(blue, new Rectangle(Right_Batch_Point, pointsize));
             g.FillEllipse(blue, new Rectangle(Right_Batch_Point, pointsize));
             List<int> angles = new List<int>();
             List<int> angles = new List<int>();
             labelParam.codeInfos.ForEach((c) => {
             labelParam.codeInfos.ForEach((c) => {
-                //Point op = Common.PointRotate(Right_Batch_Point, new Point(c.X, c.Y), 83d / 180 * Math.PI);
-                //c.X = op.X;
-                //c.Y = op.Y;
-                var x = c.Y;
-                var y = srcbitmap_Width - c.X;
-                c.X = x;
-                c.Y = y;
 
 
+                //var x = c.Y;
+                //var y = srcbitmap_Width - c.X;
+                //c.X = x;
+                //c.Y = y;
+                if (c.CodeStr.Contains(labelParam.PN))
+                {
                     Point op = new Point(c.X, c.Y);
                     Point op = new Point(c.X, c.Y);
                     g.FillEllipse(blue, new Rectangle(op, pointsize));
                     g.FillEllipse(blue, new Rectangle(op, pointsize));
                     var a = (int)getAngle(Right_Batch_Point, op);
                     var a = (int)getAngle(Right_Batch_Point, op);
-                //a += ConfigHelper.Config.Get<int>("AngleChange");
                     a = a < 0 ? 360 + a : a;
                     a = a < 0 ? 360 + a : a;
-
                     //g.FillEllipse(red, new Rectangle(PointRotate(org, op, a), pointsize));
                     //g.FillEllipse(red, new Rectangle(PointRotate(org, op, a), pointsize));
-                if (c.CodeStr.Contains(labelParam.PN))
                     angles.Add(a);
                     angles.Add(a);
                     widthOffset = (int)Common.distance(org, op);
                     widthOffset = (int)Common.distance(org, op);
-            });
-            angles.Sort();
-            //if (angles.Count > 1) {
-                angles.Add(360 + angles[0]);
-            //}
-            int biglen = 0;
-            int bigangles = 0;
-            for (int i = 0; i < angles.Count; i++) {
-                if (angles.Count() - i < 2)
-                    break;
+                    LogUtil.info($"angles:{a}, widthOffset:{widthOffset}");
+                }
                 
                 
-                var x = angles[i+1] - angles[i];
-                if (x > biglen)
+            });
+            if (angles.Count == 0)
             {
             {
-                    biglen = x;
-                    bigangles = angles[i];
+                labelAngle = 0;
+                return Point.Empty;
             }
             }
-            }
-            if (labelParam.PlateW > 7)
-            {// && angles.Count==2) {
+
+            if (labelParam.PlateW == 15)
+            {
                 labelAngle = angles[0] + 120;
                 labelAngle = angles[0] + 120;
+            }else if (labelParam.PlateW == 13)
+            {
+                labelAngle = angles[0] + 180;
             }
             }
             else
             else
             {
             {
@@ -186,19 +177,19 @@ namespace DeviceLibrary
 
 
             labelAngle = labelAngle > 360 ? labelAngle- 360 : labelAngle;
             labelAngle = labelAngle > 360 ? labelAngle- 360 : labelAngle;
             labelAngle = labelAngle > 360 ? labelAngle- 360 : labelAngle;
             labelAngle = labelAngle > 360 ? labelAngle- 360 : labelAngle;
-
+            LogUtil.info($"labelAngle1:{labelAngle}");
+            labelAngle = labelAngle + 83;
+            LogUtil.info($"labelAngle2:{labelAngle}");
             //g.FillEllipse(red, new Rectangle(PointRotate(org, op, labelAngle), pointsize));
             //g.FillEllipse(red, new Rectangle(PointRotate(org, op, labelAngle), pointsize));
 
 
             //贴标坐标
             //贴标坐标
             var p2 = PointWithAngle(org, labelAngle, widthOffset);
             var p2 = PointWithAngle(org, labelAngle, widthOffset);
 
 
             //贴标偏移
             //贴标偏移
-            var p3 = PointWithAngle(p2, labelAngle+180, Label_R_Offset);
-            //贴标角度,右侧为0度,+180转换到左侧为0度
-            labelAngle += 180;
-            labelAngle = labelAngle > 360 ? labelAngle - 360 : labelAngle;
+            var p3 = PointWithAngle(p2, labelAngle, Label_R_Offset);
 
 
-            g.FillEllipse(yeelow, new Rectangle(p2, pointsize));
+            labelAngle = labelAngle > 360 ? labelAngle - 360 : labelAngle;
+            LogUtil.info($"labelAngle3:{labelAngle}");
             g.FillEllipse(red, new Rectangle(p3, pointsize));
             g.FillEllipse(red, new Rectangle(p3, pointsize));
             g.Save();
             g.Save();
             g.Dispose();
             g.Dispose();