Browse Source

对焦参数可以写入测量文件

@wang_qi0307 4 years ago
parent
commit
09ac7f1b11
3 changed files with 19 additions and 0 deletions
  1. 1 0
      HOZProject/FormHOZMain.cs
  2. 6 0
      HOZProject/UserControls/UControl_Init.cs
  3. 12 0
      MeasureData/FocusParam.cs

+ 1 - 0
HOZProject/FormHOZMain.cs

@@ -434,6 +434,7 @@ namespace HOZProject
                 uControl_Init = new UControl_Init(this);
                 uControl_Init = new UControl_Init(this);
                 uControl_Init.ReloadConfig();
                 uControl_Init.ReloadConfig();
             }
             }
+            
             m_MeasureFile.MParam = uControl_Init.GetMeasureParam();
             m_MeasureFile.MParam = uControl_Init.GetMeasureParam();
         }
         }
 
 

+ 6 - 0
HOZProject/UserControls/UControl_Init.cs

@@ -836,6 +836,12 @@ namespace HOZProject
 
 
             cfm.Firm = config.AppSettings.Settings["Firms"].Value;
             cfm.Firm = config.AppSettings.Settings["Firms"].Value;
 
 
+            cfm.AutoFocus.UP = Convert.ToSingle(ConfigurationManager.AppSettings["Focus_UP"].ToString());
+            cfm.AutoFocus.Down = Convert.ToSingle(ConfigurationManager.AppSettings["Focus_Down"].ToString());
+            cfm.AutoFocus.Step = Convert.ToSingle(ConfigurationManager.AppSettings["Focus_Step"].ToString());
+            cfm.AutoFocus.Range = Convert.ToSingle(ConfigurationManager.AppSettings["Focus_Range"].ToString());
+            cfm.AutoFocus.fStep = Convert.ToSingle(ConfigurationManager.AppSettings["Focus_FStep"].ToString());
+
             return cfm;
             return cfm;
         }
         }
 
 

+ 12 - 0
MeasureData/FocusParam.cs

@@ -86,6 +86,18 @@ namespace MeasureData
             xDouble dRange = new xDouble();
             xDouble dRange = new xDouble();
             xDouble dfStep = new xDouble();
             xDouble dfStep = new xDouble();
 
 
+            dUp.AssignValue(this.UP);
+            dDown.AssignValue(this.Down);
+            dStep.AssignValue(this.Step);
+            dRange.AssignValue(this.Range);
+            dfStep.AssignValue(this.fStep);
+
+            slo_fcsparam.Register("UP", dUp);
+            slo_fcsparam.Register("DOWN", dDown);
+            slo_fcsparam.Register("STEP", dStep);
+            slo_fcsparam.Register("RANGE", dRange);
+            slo_fcsparam.Register("FSTEP", dfStep);
+
             if (isStoring)
             if (isStoring)
             {
             {
                 slo_fcsparam.Serialize(true, xml, rootNode);
                 slo_fcsparam.Serialize(true, xml, rootNode);