Merge branch 'master' of http://106.15.194.121:8083/liutao/1069_MIMO_PlUS

DeviceLibrary/theMachine/MainMachine_String.cs

@@ -153,8 +153,8 @@ namespace DeviceLibrary
                     {
                         StringMoveInfo.NextMoveStep(MoveStep.StringLoad_02a);
                         StringMoveInfo.log($"顶起料串固定顶升");
-                        //if (!ConfigHelper.Config.Get("Device_Disable_StringDoor", false))
-                        //    StringDoorClose(StringMoveInfo);
+                        if (!UseAgv())
+                            StringDoorClose(StringMoveInfo);
                         CylinderMove(StringMoveInfo, IO_Type.StringFix_Bottom, IO_Type.StringFix_Top, IO_VALUE.HIGH);
                         CylinderMove(StringMoveInfo, IO_Type.StringPosChecker_Home, IO_Type.StringPosChecker_Work, IO_VALUE.HIGH);
                         Line.LineStop("n");

ImgCheckReel/Form1.Designer.cs

@@ -197,6 +197,7 @@
             // 
             // txtHL
             // 
+            this.txtHL.LargeChange = 1;
             this.txtHL.Location = new System.Drawing.Point(16, 42);
             this.txtHL.Maximum = 360;
             this.txtHL.Name = "txtHL";
@@ -206,6 +207,7 @@
             // 
             // txtSH
             // 
+            this.txtSH.LargeChange = 1;
             this.txtSH.Location = new System.Drawing.Point(386, 249);
             this.txtSH.Maximum = 255;
             this.txtSH.Name = "txtSH";
@@ -215,6 +217,7 @@
             // 
             // txtSL
             // 
+            this.txtSL.LargeChange = 1;
             this.txtSL.Location = new System.Drawing.Point(26, 249);
             this.txtSL.Maximum = 255;
             this.txtSL.Name = "txtSL";
@@ -224,6 +227,7 @@
             // 
             // txtLH
             // 
+            this.txtLH.LargeChange = 1;
             this.txtLH.Location = new System.Drawing.Point(386, 140);
             this.txtLH.Maximum = 255;
             this.txtLH.Name = "txtLH";
@@ -233,6 +237,7 @@
             // 
             // txtLL
             // 
+            this.txtLL.LargeChange = 1;
             this.txtLL.Location = new System.Drawing.Point(16, 140);
             this.txtLL.Maximum = 255;
             this.txtLL.Name = "txtLL";
@@ -242,6 +247,7 @@
             // 
             // txtHH
             // 
+            this.txtHH.LargeChange = 1;
             this.txtHH.Location = new System.Drawing.Point(386, 42);
             this.txtHH.Maximum = 360;
             this.txtHH.Name = "txtHH";

ImgCheckReel/Form1.cs

@@ -22,14 +22,14 @@ namespace ImgCheckReel
         public Form1()
         {
             InitializeComponent();
-            ConfigHelper.Config.PropertyBind("txtTotalCover", txtTotalCover, "Text", "TextChanged", "100");
-            ConfigHelper.Config.PropertyBind("txtthreshold", txtthreshold, "Text", "TextChanged", "0.6");
-            ConfigHelper.Config.PropertyBind("txtHL", txtHL, "Value", "Scroll", "40");
-            ConfigHelper.Config.PropertyBind("txtHH", txtHH, "Value", "Scroll", "70");
-            ConfigHelper.Config.PropertyBind("txtLL", txtLL, "Value", "Scroll", "15");
-            ConfigHelper.Config.PropertyBind("txtLH", txtLH, "Value", "Scroll", "100");
-            ConfigHelper.Config.PropertyBind("txtSL", txtSL, "Value", "Scroll", "20");
-            ConfigHelper.Config.PropertyBind("txtSH", txtSH, "Value", "Scroll", "100");
+            ConfigHelper.Config.PropertyBind("CamTestReel_totalcover", txtTotalCover, "Text", "TextChanged", "100");
+            ConfigHelper.Config.PropertyBind("CamTestReel_threshold", txtthreshold, "Text", "TextChanged", "0.6");
+            ConfigHelper.Config.PropertyBind("CamTestReel_HL", txtHL, "Value", "Scroll", "40");
+            ConfigHelper.Config.PropertyBind("CamTestReel_HH", txtHH, "Value", "Scroll", "70");
+            ConfigHelper.Config.PropertyBind("CamTestReel_LL", txtLL, "Value", "Scroll", "15");
+            ConfigHelper.Config.PropertyBind("CamTestReel_LH", txtLH, "Value", "Scroll", "100");
+            ConfigHelper.Config.PropertyBind("CamTestReel_SL", txtSL, "Value", "Scroll", "20");
+            ConfigHelper.Config.PropertyBind("CamTestReel_SH", txtSH, "Value", "Scroll", "100");
             UpdateValue();
         }
         [HandleProcessCorruptedStateExceptions]
@@ -76,7 +76,7 @@ namespace ImgCheckReel
 
                     for (int i = 0; i < rois.Count; i++)
                     {
-                        rois[i].CoverCount = totalcover;
+                        //  rois[i].CoverCount = totalcover;
                         double maskcout = 0;
                         var roi = rois[i];
                         var rp = roi.RoiPath.Select(r => new Point(r.X / 2, r.Y / 2)).ToList();
@@ -116,7 +116,7 @@ namespace ImgCheckReel
                         if (calc <= threshold)
                         {
                             hasReel = true;
-                            break;
+                            //break;
                         }
                     }
                     b.UnlockBits(bd);

TheMachine/TheMachine.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{61FDFF14-8BB7-439A-85A0-592E3011F4C4}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <RootNamespace>TheMachine</RootNamespace>
-    <AssemblyName>MIMO_G3_Client</AssemblyName>
+    <AssemblyName>MIMO_G2_Client</AssemblyName>
     <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -50,7 +50,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>mimo.ico</ApplicationIcon>
+    <ApplicationIcon>icon.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>