Explorar el Código

增加倾斜样品台参数

HaoShuang hace 4 años
padre
commit
dbbfe62feb
Se han modificado 3 ficheros con 55 adiciones y 0 borrados
  1. 4 0
      HOZProject/App.config
  2. 23 0
      HOZProject/UserControls/UControl_Init.cs
  3. 28 0
      MeasureData/MeasureParam.cs

+ 4 - 0
HOZProject/App.config

@@ -42,12 +42,16 @@
       <add key="SampleName" value=""/>
       <!--厂商-->
       <add key="Firms" value=""/>
+      <!--是否倾斜样品台-->
+      <add key="Is_Title" value="False"/>
       <!--是否仅拍照-->
       <add key="Is_Photograph" value="True"/>
       <!--是否PT沉积-->
       <add key="PT_Depostion" value="False"/>
       <!--FIB的放大倍数-->
       <add key="FIB_Magnification" value="1500"/>
+      <!--Z轴移动距离-->
+      <add key="ZDistance" value="0"/>
       <!--层高分析的放大倍数-->
       <add key="FH_Magnification" value="1500"/>
       <!--层高分析的电压-->

+ 23 - 0
HOZProject/UserControls/UControl_Init.cs

@@ -11,6 +11,7 @@ using MeasureData;
 using System.Configuration;
 using FileManager;
 using System.IO;
+using System.Runtime.InteropServices;
 
 namespace HOZProject
 {
@@ -864,6 +865,11 @@ namespace HOZProject
             cfm.AutoStigY.Range = Convert.ToSingle(ConfigurationManager.AppSettings["Focus_Range"].ToString());
             cfm.AutoStigY.fStep = Convert.ToSingle(ConfigurationManager.AppSettings["Focus_FStep"].ToString());
 
+            bool.TryParse(config.AppSettings.Settings["Is_Title"].Value, out bResult);
+            cfm.Title = bResult;
+
+            float.TryParse(config.AppSettings.Settings["ZDistance"].Value, out fResult);
+            cfm.ZDistance = fResult;
 
             return cfm;
         }
@@ -987,5 +993,22 @@ namespace HOZProject
             ComboBox_KeyPress(cbbWFIB.Text, sender, e);
         }
         #endregion
+
+        #region 拖动控件
+        [DllImportAttribute("user32.dll")]
+        private extern static bool ReleaseCapture();
+        [DllImportAttribute("user32.dll")]
+        private extern static int SendMessage(IntPtr handle, int m, int p, int h);
+        private void panelEx4_MouseDown(object sender, MouseEventArgs e)
+        {
+            //DevComponents.DotNetBar.PanelEx p = (DevComponents.DotNetBar.PanelEx)sender;
+            //if (e.Button == MouseButtons.Left)
+            //{
+            //    this.Cursor = Cursors.SizeAll;
+            //    ReleaseCapture();
+            //    SendMessage(p.Handle, 0xA1, 0x2, 0); this.Cursor = Cursors.Default;
+            //}
+        }
+        #endregion
     }
 }

+ 28 - 0
MeasureData/MeasureParam.cs

@@ -43,6 +43,22 @@ namespace MeasureData
             set { this.m_pt = value; }
         }
 
+        //倾斜样品台
+        private Boolean m_Title;
+        public Boolean Title
+        {
+            get { return this.m_Title; }
+            set { this.m_Title = value; }
+        }
+
+        //Z轴移动的范围
+        private float m_dZ;
+        public float ZDistance
+        {
+            get { return this.m_dZ; }
+            set { this.m_dZ = value; }
+        }
+
         //FIB使用的ELY文件
         private string m_fibTemp;
         public string FIBTemp
@@ -163,6 +179,7 @@ namespace MeasureData
             set { this.StigY = value; }
         }
 
+
         //能谱参数
 
         #endregion
@@ -188,6 +205,8 @@ namespace MeasureData
             this.AutoStigY.TYPE = 3;
             this.FIBFocus = new FocusParam();
             this.FIBFocus.TYPE = 4;
+            this.Title = false;
+            this.ZDistance = 0;
 
         }
 
@@ -199,8 +218,11 @@ namespace MeasureData
             //是否拍照和PT
             xBool isPhotograph = new xBool();
             xBool ptDepostion = new xBool();
+            xBool isTilt = new xBool();
+            isTilt.AssignValue(this.Title);
             isPhotograph.AssignValue(this.is_Photograph);
             ptDepostion.AssignValue(this.m_pt);
+            sFile.Register("Is_Title", isTilt);
             sFile.Register("Is_Photograph", isPhotograph);
             sFile.Register("PT_Depostion", ptDepostion);
 
@@ -224,6 +246,9 @@ namespace MeasureData
             xDouble photographMagnification = new xDouble();
             xDouble photographVoltage = new xDouble();
             xDouble fibMagnification = new xDouble();
+            xDouble ZDistance = new xDouble();
+
+            ZDistance.AssignValue(this.ZDistance);
             stretchMagnification.AssignValue(this.stretch_Magnification);
             locationMagnification.AssignValue(this.location_Magnification);
             locationVoltage.AssignValue(this.location_Voltage);
@@ -236,6 +261,7 @@ namespace MeasureData
             sFile.Register("Photograph_Magnification", photographMagnification);
             sFile.Register("Photograph_Voltage", photographVoltage);
             sFile.Register("FIB_Magnification", fibMagnification);
+            sFile.Register("ZDistance", ZDistance);
 
             //校正角度
             xDouble correctionAngle = new xDouble();
@@ -266,6 +292,7 @@ namespace MeasureData
 
                 this.is_Photograph = isPhotograph.value();
                 this.m_pt = ptDepostion.value();
+                this.Title = isTilt.value();
 
                 this.m_ptTemp = ptELYFile.value();
                 this.m_fibTemp = fibELYFile.value();
@@ -282,6 +309,7 @@ namespace MeasureData
 
                 this.m_SampleName = sampleType.value();
                 this.firm = _firm.value();
+                this.ZDistance = Convert.ToSingle(ZDistance.value());
             }
         }