Ver Fonte

更新韩工删除process类程序,将郝工写的自动对焦程序禁用(因为增加了一个参数)。

@wang_qi0307 há 5 anos atrás
pai
commit
c0af0a73f0

+ 0 - 9
HOZProject/UnitControl.csproj

@@ -103,12 +103,6 @@
     <Compile Include="UserControls\UControl_ParaInfo.Designer.cs">
       <DependentUpon>UControl_ParaInfo.cs</DependentUpon>
     </Compile>
-    <Compile Include="UserControls\UControl_Process.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="UserControls\UControl_Process.Designer.cs">
-      <DependentUpon>UControl_Process.cs</DependentUpon>
-    </Compile>
     <Compile Include="UserControls\UCTimeLine.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -149,9 +143,6 @@
     <EmbeddedResource Include="UserControls\UControl_ParaInfo.resx">
       <DependentUpon>UControl_ParaInfo.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="UserControls\UControl_Process.resx">
-      <DependentUpon>UControl_Process.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="UserControls\UCTimeLine.resx">
       <DependentUpon>UCTimeLine.cs</DependentUpon>
     </EmbeddedResource>

+ 7 - 7
HOZProject/UserControls/UControl_CutHole.cs

@@ -42,13 +42,13 @@ namespace HOZProject
         {
             //ClearProcessControls();
             //显示检测过程信息
-            UControl_Process uControl_Process = new UControl_Process(FormHOZMainObject);
-            FormHOZMainObject.plPrarInfo.Width = uControl_Process.Width;
-            FormHOZMainObject.plPrarInfo.Height = uControl_Process.Height;
-            uControl_Process.Dock = DockStyle.Fill;
-            FormHOZMainObject.plPrarInfo.Location = uControl_Process.Location;
-            FormHOZMainObject.plPrarInfo.Controls.Add(uControl_Process);
-            FormHOZMainObject.plPrarInfo.Visible = true;
+            //UControl_Process uControl_Process = new UControl_Process(FormHOZMainObject);
+            //FormHOZMainObject.plPrarInfo.Width = uControl_Process.Width;
+            //FormHOZMainObject.plPrarInfo.Height = uControl_Process.Height;
+            //uControl_Process.Dock = DockStyle.Fill;
+            //FormHOZMainObject.plPrarInfo.Location = uControl_Process.Location;
+            //FormHOZMainObject.plPrarInfo.Controls.Add(uControl_Process);
+            //FormHOZMainObject.plPrarInfo.Visible = true;
         }
 
         private void tsShowParaInfo_Click(object sender, EventArgs e)

+ 4 - 4
ManulDo/MainForm.cs

@@ -66,10 +66,10 @@ namespace WindowsFormsApp1
             if (m_work == WorkType.AutoFocus)
             {
                 //自动对焦
-                int nWd;
-                m_Ms.AutoFocus(m_focusParam, out nWd);
-                double wd = (double)nWd / 100.0;
-                tB_WD.Text = wd.ToString();
+                //int nWd;
+                //m_Ms.AutoFocus(m_focusParam, out nWd);
+                //double wd = (double)nWd / 100.0;
+                //tB_WD.Text = wd.ToString();
             }
             else
             {