Explorar o código

添加窗体事件

wb_han %!s(int64=5) %!d(string=hai) anos
pai
achega
0cf6dcc98a

+ 1 - 1
HOZProject/App.config

@@ -5,7 +5,7 @@
     </startup>
 
     <appSettings>
-      <add key="Firm" value="厂商A,厂商B,厂商C"/>
+      <add key="Firm" value="厂商A,厂商B,厂商C,厂商D"/>
       <add key="Sample_Type" value="类型A,类型B,类型C"/>
     </appSettings>
 </configuration>

+ 49 - 5
HOZProject/FormHOZMain.Designer.cs

@@ -30,12 +30,14 @@
         {
             this.plMain = new System.Windows.Forms.Panel();
             this.plFill = new System.Windows.Forms.Panel();
+            this.plSEM = new System.Windows.Forms.Panel();
             this.plProcess = new System.Windows.Forms.Panel();
             this.listmsg = new System.Windows.Forms.ListBox();
             this.plLeft = new System.Windows.Forms.Panel();
             this.label1 = new System.Windows.Forms.Label();
             this.plLeftContent = new System.Windows.Forms.Panel();
             this.plTop = new System.Windows.Forms.Panel();
+            this.btnImportTemplateFile = new System.Windows.Forms.Button();
             this.pbStop = new System.Windows.Forms.PictureBox();
             this.pbPause = new System.Windows.Forms.PictureBox();
             this.pbStart = new System.Windows.Forms.PictureBox();
@@ -47,6 +49,7 @@
             this.pbSave = new System.Windows.Forms.PictureBox();
             this.pbNew = new System.Windows.Forms.PictureBox();
             this.pbOpen = new System.Windows.Forms.PictureBox();
+            this.pbImage = new System.Windows.Forms.PictureBox();
             this.plMain.SuspendLayout();
             this.plFill.SuspendLayout();
             this.plLeft.SuspendLayout();
@@ -62,6 +65,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.pbSave)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbNew)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbOpen)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbImage)).BeginInit();
             this.SuspendLayout();
             // 
             // plMain
@@ -86,11 +90,21 @@
             this.plFill.BackColor = System.Drawing.Color.Black;
             this.plFill.Controls.Add(this.plProcess);
             this.plFill.Controls.Add(this.listmsg);
+            this.plFill.Controls.Add(this.pbImage);
+            this.plFill.Controls.Add(this.plSEM);
             this.plFill.Location = new System.Drawing.Point(106, 86);
             this.plFill.Name = "plFill";
             this.plFill.Size = new System.Drawing.Size(894, 658);
             this.plFill.TabIndex = 5;
             // 
+            // plSEM
+            // 
+            this.plSEM.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.plSEM.Location = new System.Drawing.Point(0, 568);
+            this.plSEM.Name = "plSEM";
+            this.plSEM.Size = new System.Drawing.Size(894, 90);
+            this.plSEM.TabIndex = 19;
+            // 
             // plProcess
             // 
             this.plProcess.BackColor = System.Drawing.Color.White;
@@ -102,13 +116,15 @@
             // 
             // listmsg
             // 
+            this.listmsg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.listmsg.FormattingEnabled = true;
             this.listmsg.ItemHeight = 12;
-            this.listmsg.Location = new System.Drawing.Point(0, 1);
+            this.listmsg.Location = new System.Drawing.Point(426, 2);
             this.listmsg.Margin = new System.Windows.Forms.Padding(2);
             this.listmsg.Name = "listmsg";
-            this.listmsg.Size = new System.Drawing.Size(524, 484);
+            this.listmsg.Size = new System.Drawing.Size(466, 220);
             this.listmsg.TabIndex = 18;
+            this.listmsg.Visible = false;
             // 
             // plLeft
             // 
@@ -147,6 +163,7 @@
             // plTop
             // 
             this.plTop.BackColor = System.Drawing.Color.Black;
+            this.plTop.Controls.Add(this.btnImportTemplateFile);
             this.plTop.Controls.Add(this.pbStop);
             this.plTop.Controls.Add(this.pbPause);
             this.plTop.Controls.Add(this.pbStart);
@@ -164,12 +181,23 @@
             this.plTop.Size = new System.Drawing.Size(1000, 80);
             this.plTop.TabIndex = 3;
             // 
+            // btnImportTemplateFile
+            // 
+            this.btnImportTemplateFile.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnImportTemplateFile.Location = new System.Drawing.Point(374, 6);
+            this.btnImportTemplateFile.Name = "btnImportTemplateFile";
+            this.btnImportTemplateFile.Size = new System.Drawing.Size(68, 71);
+            this.btnImportTemplateFile.TabIndex = 10;
+            this.btnImportTemplateFile.Text = "选择模板文件";
+            this.btnImportTemplateFile.UseVisualStyleBackColor = true;
+            this.btnImportTemplateFile.Click += new System.EventHandler(this.btnImportTemplateFile_Click);
+            // 
             // pbStop
             // 
             this.pbStop.BackgroundImage = global::HOZProject.Properties.Resources.Stop;
             this.pbStop.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbStop.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbStop.Location = new System.Drawing.Point(523, 6);
+            this.pbStop.Location = new System.Drawing.Point(595, 6);
             this.pbStop.Name = "pbStop";
             this.pbStop.Size = new System.Drawing.Size(68, 71);
             this.pbStop.TabIndex = 8;
@@ -181,7 +209,7 @@
             this.pbPause.BackgroundImage = global::HOZProject.Properties.Resources.Pause;
             this.pbPause.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbPause.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbPause.Location = new System.Drawing.Point(449, 6);
+            this.pbPause.Location = new System.Drawing.Point(521, 6);
             this.pbPause.Name = "pbPause";
             this.pbPause.Size = new System.Drawing.Size(68, 71);
             this.pbPause.TabIndex = 8;
@@ -192,7 +220,7 @@
             this.pbStart.BackgroundImage = global::HOZProject.Properties.Resources.Start;
             this.pbStart.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbStart.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.pbStart.Location = new System.Drawing.Point(375, 6);
+            this.pbStart.Location = new System.Drawing.Point(447, 6);
             this.pbStart.Name = "pbStart";
             this.pbStart.Size = new System.Drawing.Size(68, 71);
             this.pbStart.TabIndex = 8;
@@ -204,6 +232,7 @@
             this.pbMax.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pbMax.BackgroundImage = global::HOZProject.Properties.Resources.Min_Gray;
             this.pbMax.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+            this.pbMax.Cursor = System.Windows.Forms.Cursors.Hand;
             this.pbMax.Location = new System.Drawing.Point(935, 0);
             this.pbMax.Name = "pbMax";
             this.pbMax.Size = new System.Drawing.Size(28, 31);
@@ -216,6 +245,7 @@
             this.pbMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pbMin.BackgroundImage = global::HOZProject.Properties.Resources.Min_Gray;
             this.pbMin.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+            this.pbMin.Cursor = System.Windows.Forms.Cursors.Hand;
             this.pbMin.Location = new System.Drawing.Point(901, 0);
             this.pbMin.Name = "pbMin";
             this.pbMin.Size = new System.Drawing.Size(28, 31);
@@ -230,6 +260,7 @@
             this.pbClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.pbClose.BackgroundImage = global::HOZProject.Properties.Resources.exit_Gray;
             this.pbClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
+            this.pbClose.Cursor = System.Windows.Forms.Cursors.Hand;
             this.pbClose.Location = new System.Drawing.Point(969, 0);
             this.pbClose.Name = "pbClose";
             this.pbClose.Size = new System.Drawing.Size(28, 31);
@@ -299,6 +330,15 @@
             this.pbOpen.TabStop = false;
             this.pbOpen.Click += new System.EventHandler(this.pbOpen_Click);
             // 
+            // pbImage
+            // 
+            this.pbImage.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.pbImage.Location = new System.Drawing.Point(0, 0);
+            this.pbImage.Name = "pbImage";
+            this.pbImage.Size = new System.Drawing.Size(894, 568);
+            this.pbImage.TabIndex = 20;
+            this.pbImage.TabStop = false;
+            // 
             // FormHOZMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -329,6 +369,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.pbSave)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbNew)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbOpen)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbImage)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -353,5 +394,8 @@
         private System.Windows.Forms.PictureBox pbStop;
         private System.Windows.Forms.PictureBox pbPause;
         private System.Windows.Forms.ListBox listmsg;
+        private System.Windows.Forms.Button btnImportTemplateFile;
+        private System.Windows.Forms.Panel plSEM;
+        private System.Windows.Forms.PictureBox pbImage;
     }
 }

+ 156 - 50
HOZProject/FormHOZMain.cs

@@ -26,12 +26,27 @@ namespace HOZProject
         /// 测量线程  
         public Measure m_Ms;
 
+        /// <summary>
+        /// 显示日志窗体
+        /// </summary>
+        Form m_FormLog = null;
+        /// <summary>
+        /// 显示实例化窗体
+        /// </summary>
+        Form m_FormInit = null;
+
+        /// <summary>
+        /// 初始化用户控件
+        /// </summary>
+        UControl_Init uControl_Init = null;
         #endregion
+
         #region 构造函数
         public FormHOZMain()
         {
             InitializeComponent();
-
+            //在线程操作过程中,可以设置控件属性
+            Control.CheckForIllegalCrossThreadCalls = false;
             m_BackgroundWorker = new BackgroundWorker(); // 实例化后台对象 
             m_BackgroundWorker.WorkerReportsProgress = true; // 设置可以通告进度 
             m_BackgroundWorker.WorkerSupportsCancellation = true; // 设置可以取消 
@@ -42,6 +57,7 @@ namespace HOZProject
             LogManager.InitManulLog();
         }
         #endregion
+
         #region 测量线程
         void DoWork(object sender, DoWorkEventArgs e)
         {
@@ -49,6 +65,8 @@ namespace HOZProject
             m_Ms.InitMeas(m_MeasureFile);
             m_Ms.SendThreadStatus += new ThreadStatusHandler(displayMessage); //注册事件
             m_Ms.SendCutHolesStatus += new CutHolesStatusHandler(displayCutHoleMessage); //注册事件
+            //设置控件操作
+            SetWinControlMeasureState(false);
             //自动测量的全过程
             m_Ms.DoMeasure();
             //定位
@@ -62,7 +80,8 @@ namespace HOZProject
             //主界面显示内容
             this.BeginInvoke((Action)delegate
             {
-                this.listmsg.Items.Add(e.Time.ToString() + e.State);
+                this.listmsg.Items.Add(e.Time.ToString() +"_"+ e.State);
+                ShowLogInfo();
             });
         }
         public void displayCutHoleMessage(object sender, CutHolesStatusEventArgs e)
@@ -80,9 +99,11 @@ namespace HOZProject
         }
         void CompletedWork(object sender, RunWorkerCompletedEventArgs e)
         {
+            //设置控件操作
+            SetWinControlMeasureState(true);
         }
         #endregion
-        
+
         private void FormHOZMain_Load(object sender, EventArgs e)
         {
             //加载控件的点击事件
@@ -102,19 +123,26 @@ namespace HOZProject
             NewCreate();
         }
 
+        #region 创建切孔列表信息
+        /// <summary>
+        /// 创建切孔列表信息
+        /// </summary>
+        /// <param name="ListCutHole"></param>
         public void CreateCutHoleList(List<CutHole> ListCutHole)
         {
             //清空左侧Panel中的切孔控件
             plLeftContent.Controls.Clear();
-            for (int i = ListCutHole.Count-1;i>=0; i--)
+            for (int i = ListCutHole.Count - 1; i >= 0; i--)
             {
                 UControl_CutHole ucCutHole = new UControl_CutHole(this);
                 ucCutHole.Dock = DockStyle.Top;
                 ucCutHole.CutHoleName = ListCutHole[i].HoleName;
                 plLeftContent.Controls.Add(ucCutHole);
             }
-        }
+        } 
+        #endregion
 
+        //隐藏处理层
         private void FormHOZMain_Click(object sender, EventArgs e)
         {
             if (plProcess.Visible)
@@ -123,6 +151,20 @@ namespace HOZProject
             }
         }
 
+        #region 设置控件在线程过程中的编辑状态
+        /// <summary>
+        /// 设置控件在线程过程中的编辑状态
+        /// </summary>
+        /// <param name="cState"></param>
+        private void SetWinControlMeasureState(bool cState)
+        {
+            pbNew.Enabled = cState;
+            pbOpen.Enabled = cState;
+            pbSave.Enabled = cState;
+            pbInit.Enabled = cState;
+            pbLog.Enabled = cState;
+        }
+        #endregion
         
         #region 窗体 最大化 最小化 关闭 按钮事件
         private void pbMin_MouseEnter(object sender, EventArgs e)
@@ -185,7 +227,8 @@ namespace HOZProject
             }
             else
             {
-                //MessageBox.Show("新建测量文件成功。");
+                //清空切孔列表用户控件
+                plLeftContent.Controls.Clear();
             }
         }
 
@@ -208,57 +251,81 @@ namespace HOZProject
 
         private void pbInit_Click(object sender, EventArgs e)
         {
-            Form form = new Form();
-            form.StartPosition = FormStartPosition.CenterScreen;
-            UControl_Init uControl_Init = new UControl_Init(this);
-            form.FormBorderStyle = FormBorderStyle.None;
-            form.Width = uControl_Init.Width;
-            form.Height = uControl_Init.Height;
-            form.Controls.Add(uControl_Init);
-            form.ShowDialog();
+            if (uControl_Init == null)
+            {
+                uControl_Init = new UControl_Init(this);
+                uControl_Init.Reloadconfig();
+            }
+            if (m_FormInit == null)
+            {
+                m_FormInit = new Form();
+            }
+            m_FormInit.StartPosition = FormStartPosition.CenterScreen;
+            m_FormInit.FormBorderStyle = FormBorderStyle.None;
+            m_FormInit.Width = uControl_Init.Width;
+            m_FormInit.Height = uControl_Init.Height;
+            if (m_FormInit.Controls.Count == 0)
+            {
+                m_FormInit.Controls.Add(uControl_Init);
+            }
+            m_FormInit.ShowDialog();
         }
 
         private void pbLog_Click(object sender, EventArgs e)
         {
-            Form form = new Form();
-            form.StartPosition = FormStartPosition.CenterScreen;
+            m_FormLog = new Form();
+            m_FormLog.StartPosition = FormStartPosition.CenterScreen;
             UControl_Log uControl_Log = new UControl_Log();
-            form.FormBorderStyle = FormBorderStyle.None;
-            form.Width = uControl_Log.Width;
-            form.Height = uControl_Log.Height;
-            form.Controls.Add(uControl_Log);
-            form.ShowDialog();
-        } 
-        #endregion
-
-        #region 开始、结束线程事件
-        private void pbStart_Click(object sender, EventArgs e)
-        {
-            if (m_MeasureFile == null)
+            m_FormLog.FormBorderStyle = FormBorderStyle.None;
+            m_FormLog.Width = uControl_Log.Width;
+            m_FormLog.Height = uControl_Log.Height;
+            uControl_Log.Name = "UControl_Log";
+            //获取日志信息
+            if (listmsg.Items.Count>0)
             {
-                MessageBox.Show("请新建一个测量文件");
-                //listmsg.Items.Clear();
-            }
-            else
-            {
-                if (m_BackgroundWorker.IsBusy)
+                string[] strLog = new string[listmsg.Items.Count];
+                for (int i = 0; i < listmsg.Items.Count; i++)
                 {
-                    MessageBox.Show("线程已经运行");
-                    return;
+                    //赋值给数组
+                    strLog[i] = listmsg.Items[i].ToString();
                 }
-                m_BackgroundWorker.RunWorkerAsync(this);
+                uControl_Log.ShowProcessLogInfo(strLog);
             }
+            m_FormLog.Controls.Add(uControl_Log);
+            m_FormLog.ShowDialog();
         }
 
-        private void pbStop_Click(object sender, EventArgs e)
+        //显示日志
+        private void ShowLogInfo()
         {
-            if (m_BackgroundWorker.IsBusy)
+            if (m_FormLog != null)
             {
-                m_BackgroundWorker.CancelAsync();
+                foreach (Control item in m_FormLog.Controls)
+                {
+                    if (item is UserControl)
+                    {
+                        if (item.Name == "UControl_Log")
+                        {
+                            UControl_Log ucLog = (UControl_Log)item;
+                            //获取日志信息
+                            if (listmsg.Items.Count > 0)
+                            {
+                                string[] strLog = new string[listmsg.Items.Count];
+                                for (int i = 0; i < listmsg.Items.Count; i++)
+                                {
+                                    //赋值给数组
+                                    strLog[i] = listmsg.Items[i].ToString();
+                                }
+                                ucLog.ShowProcessLogInfo(strLog);
+                            }
+                        }
+                    }
+                }
             }
         }
         #endregion
-
+        
+        #region 修改切孔状态
         /// <summary>
         /// 修改切孔状态
         /// </summary>
@@ -293,15 +360,8 @@ namespace HOZProject
                     }
                 }
             }
-        }
-
-        /// <summary>
-        /// 显示切孔处理流程中信息
-        /// </summary>
-        private void ShowProcessInfo()
-        {
-
-        }
+        } 
+        #endregion
 
         #region 拖动无窗体的控件
         [DllImport("user32.dll")]//拖动无窗体的控件
@@ -321,5 +381,51 @@ namespace HOZProject
             }
         } 
         #endregion
+
+        #region 开始、结束线程事件
+        private void pbStart_Click(object sender, EventArgs e)
+        {
+            if (m_MeasureFile == null)
+            {
+                MessageBox.Show("请新建一个测量文件");
+                //listmsg.Items.Clear();
+            }
+            else
+            {
+                if (m_BackgroundWorker.IsBusy)
+                {
+                    MessageBox.Show("线程已经运行");
+                    return;
+                }
+                m_BackgroundWorker.RunWorkerAsync(this);
+            }
+        }
+
+        private void pbStop_Click(object sender, EventArgs e)
+        {
+            if (m_BackgroundWorker.IsBusy)
+            {
+                m_BackgroundWorker.CancelAsync();
+            }
+        }
+        #endregion
+
+        private void btnImportTemplateFile_Click(object sender, EventArgs e)
+        {
+            //打开默认路径
+            OpenFileDialog openFileDialog = new OpenFileDialog();
+            openFileDialog.Filter = "样品参数文件|*.cfg";
+            if (openFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                if (uControl_Init == null)
+                {
+                    uControl_Init = new UControl_Init(this);
+                }
+                //设置选择的模板文件
+                uControl_Init.ReadConfigPath = openFileDialog.FileName;
+                //获取文件
+                uControl_Init.ReadConfigInfo();
+            }
+        }
     }
 }

+ 2 - 2
HOZProject/Program.cs

@@ -17,9 +17,9 @@ namespace HOZProject
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
             //Application.Run(new FormUCMain());
-            //Application.Run(new FormHOZMain());
+            Application.Run(new FormHOZMain());
             //Application.Run(new FormMeasureTest());
-            Application.Run(new FormUnitControl());
+            //Application.Run(new FormUnitControl());
         }
     }
 }

+ 30 - 0
HOZProject/Properties/Resources.Designer.cs

@@ -150,6 +150,36 @@ namespace HOZProject.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap ImportCutHole {
+            get {
+                object obj = ResourceManager.GetObject("ImportCutHole", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap ImportCutHoleFile {
+            get {
+                object obj = ResourceManager.GetObject("ImportCutHoleFile", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap ImportTemplateFile {
+            get {
+                object obj = ResourceManager.GetObject("ImportTemplateFile", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

+ 9 - 0
HOZProject/Properties/Resources.resx

@@ -187,4 +187,13 @@
   <data name="New" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\New.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="ImportCutHoleFile" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ImportCutHoleFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ImportTemplateFile" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ImportTemplateFile.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ImportCutHole" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ImportCutHole.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

+ 9 - 0
HOZProject/UnitControl.csproj

@@ -257,5 +257,14 @@
   <ItemGroup>
     <None Include="Resources\New.png" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ImportTemplateFile.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ImportCutHoleFile.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ImportCutHole.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 5 - 3
HOZProject/UserControls/UControl_CutHole.Designer.cs

@@ -42,25 +42,26 @@
             this.tsShowParaInfo,
             this.tsShowProcess});
             this.cMenu.Name = "cMenu";
-            this.cMenu.Size = new System.Drawing.Size(181, 70);
+            this.cMenu.Size = new System.Drawing.Size(149, 48);
             // 
             // tsShowParaInfo
             // 
             this.tsShowParaInfo.Name = "tsShowParaInfo";
-            this.tsShowParaInfo.Size = new System.Drawing.Size(180, 22);
+            this.tsShowParaInfo.Size = new System.Drawing.Size(148, 22);
             this.tsShowParaInfo.Text = "查看切孔属性";
             this.tsShowParaInfo.Click += new System.EventHandler(this.tsShowParaInfo_Click);
             // 
             // tsShowProcess
             // 
             this.tsShowProcess.Name = "tsShowProcess";
-            this.tsShowProcess.Size = new System.Drawing.Size(180, 22);
+            this.tsShowProcess.Size = new System.Drawing.Size(148, 22);
             this.tsShowProcess.Text = "查看操作流程";
             this.tsShowProcess.Click += new System.EventHandler(this.tsShowProcess_Click);
             // 
             // btnCutHole
             // 
             this.btnCutHole.BackColor = System.Drawing.Color.White;
+            this.btnCutHole.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnCutHole.Dock = System.Windows.Forms.DockStyle.Fill;
             this.btnCutHole.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btnCutHole.Location = new System.Drawing.Point(0, 0);
@@ -68,6 +69,7 @@
             this.btnCutHole.Size = new System.Drawing.Size(80, 80);
             this.btnCutHole.TabIndex = 1;
             this.btnCutHole.UseVisualStyleBackColor = false;
+            this.btnCutHole.Click += new System.EventHandler(this.tsShowParaInfo_Click);
             // 
             // UControl_CutHole
             // 

+ 475 - 132
HOZProject/UserControls/UControl_Init.Designer.cs

@@ -28,33 +28,57 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UControl_Init));
             this.btnClose = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
             this.tbCutHoleFilePath = new System.Windows.Forms.TextBox();
-            this.tBFIBTemp = new System.Windows.Forms.TextBox();
+            this.txtWPTF = new System.Windows.Forms.TextBox();
             this.lblCutHoleCount = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            this.label4 = new System.Windows.Forms.Label();
-            this.tBSampleName = new System.Windows.Forms.TextBox();
-            this.cBIsPT = new System.Windows.Forms.CheckBox();
-            this.btnSave = new System.Windows.Forms.Button();
-            this.cBIsManul = new System.Windows.Forms.CheckBox();
-            this.label5 = new System.Windows.Forms.Label();
+            this.chkManul = new System.Windows.Forms.CheckBox();
             this.label6 = new System.Windows.Forms.Label();
-            this.pbTemplateFile = new System.Windows.Forms.PictureBox();
+            this.cbbWPZD = new System.Windows.Forms.ComboBox();
+            this.cbbWPZF = new System.Windows.Forms.ComboBox();
+            this.cbbWQGD = new System.Windows.Forms.ComboBox();
+            this.cbbWQGF = new System.Windows.Forms.ComboBox();
+            this.cbbWLZ = new System.Windows.Forms.ComboBox();
+            this.cbbWXZ = new System.Windows.Forms.ComboBox();
+            this.cbbWCS = new System.Windows.Forms.ComboBox();
+            this.cbbWYP = new System.Windows.Forms.ComboBox();
+            this.label58 = new System.Windows.Forms.Label();
+            this.label50 = new System.Windows.Forms.Label();
+            this.label54 = new System.Windows.Forms.Label();
+            this.label46 = new System.Windows.Forms.Label();
+            this.label42 = new System.Windows.Forms.Label();
+            this.label38 = new System.Windows.Forms.Label();
+            this.chkWIsP = new System.Windows.Forms.CheckBox();
+            this.label48 = new System.Windows.Forms.Label();
+            this.label56 = new System.Windows.Forms.Label();
+            this.label59 = new System.Windows.Forms.Label();
+            this.label61 = new System.Windows.Forms.Label();
+            this.chkWPT = new System.Windows.Forms.CheckBox();
+            this.btnCreateConfig = new System.Windows.Forms.Button();
+            this.btnReadConfig = new System.Windows.Forms.Button();
+            this.txtWFIBF = new System.Windows.Forms.TextBox();
+            this.pbCutHoleAuto = new System.Windows.Forms.PictureBox();
+            this.pbFIBTemplateFile = new System.Windows.Forms.PictureBox();
+            this.pbPTTemplateFile = new System.Windows.Forms.PictureBox();
             this.pbCutHoleFile = new System.Windows.Forms.PictureBox();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pbTemplateFile)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbCutHoleAuto)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbFIBTemplateFile)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbPTTemplateFile)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbCutHoleFile)).BeginInit();
             this.SuspendLayout();
             // 
             // btnClose
             // 
+            this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnClose.Dock = System.Windows.Forms.DockStyle.Right;
-            this.btnClose.Location = new System.Drawing.Point(357, 0);
+            this.btnClose.ForeColor = System.Drawing.Color.Black;
+            this.btnClose.Location = new System.Drawing.Point(541, 0);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Size = new System.Drawing.Size(30, 30);
+            this.btnClose.Size = new System.Drawing.Size(35, 33);
             this.btnClose.TabIndex = 3;
             this.btnClose.Text = "X";
             this.btnClose.UseVisualStyleBackColor = true;
@@ -65,7 +89,7 @@
             this.label1.AutoSize = true;
             this.label1.Font = new System.Drawing.Font("宋体", 10F);
             this.label1.ForeColor = System.Drawing.Color.Black;
-            this.label1.Location = new System.Drawing.Point(13, 8);
+            this.label1.Location = new System.Drawing.Point(15, 9);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(77, 14);
             this.label1.TabIndex = 0;
@@ -79,172 +103,470 @@
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(387, 30);
+            this.panel1.Size = new System.Drawing.Size(576, 33);
             this.panel1.TabIndex = 3;
             // 
             // tbCutHoleFilePath
             // 
             this.tbCutHoleFilePath.Font = new System.Drawing.Font("宋体", 10F);
-            this.tbCutHoleFilePath.Location = new System.Drawing.Point(78, 45);
+            this.tbCutHoleFilePath.Location = new System.Drawing.Point(104, 49);
             this.tbCutHoleFilePath.Name = "tbCutHoleFilePath";
             this.tbCutHoleFilePath.ReadOnly = true;
-            this.tbCutHoleFilePath.Size = new System.Drawing.Size(215, 23);
+            this.tbCutHoleFilePath.Size = new System.Drawing.Size(347, 23);
             this.tbCutHoleFilePath.TabIndex = 5;
             // 
-            // tBFIBTemp
+            // txtWPTF
             // 
-            this.tBFIBTemp.Font = new System.Drawing.Font("宋体", 10F);
-            this.tBFIBTemp.Location = new System.Drawing.Point(78, 92);
-            this.tBFIBTemp.Name = "tBFIBTemp";
-            this.tBFIBTemp.ReadOnly = true;
-            this.tBFIBTemp.Size = new System.Drawing.Size(214, 23);
-            this.tBFIBTemp.TabIndex = 7;
+            this.txtWPTF.Font = new System.Drawing.Font("宋体", 10F);
+            this.txtWPTF.Location = new System.Drawing.Point(104, 100);
+            this.txtWPTF.Name = "txtWPTF";
+            this.txtWPTF.ReadOnly = true;
+            this.txtWPTF.Size = new System.Drawing.Size(346, 23);
+            this.txtWPTF.TabIndex = 7;
             // 
             // lblCutHoleCount
             // 
             this.lblCutHoleCount.AutoSize = true;
             this.lblCutHoleCount.Font = new System.Drawing.Font("宋体", 10F);
             this.lblCutHoleCount.ForeColor = System.Drawing.Color.LightGray;
-            this.lblCutHoleCount.Location = new System.Drawing.Point(77, 73);
+            this.lblCutHoleCount.Location = new System.Drawing.Point(103, 79);
             this.lblCutHoleCount.Name = "lblCutHoleCount";
             this.lblCutHoleCount.Size = new System.Drawing.Size(112, 14);
             this.lblCutHoleCount.TabIndex = 8;
             this.lblCutHoleCount.Text = "成功导入0个切孔";
             // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Font = new System.Drawing.Font("宋体", 10F);
-            this.label3.ForeColor = System.Drawing.Color.LightGray;
-            this.label3.Location = new System.Drawing.Point(77, 120);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(105, 14);
-            this.label3.TabIndex = 9;
-            this.label3.Text = "当前模板:XXXXX";
-            // 
-            // label4
-            // 
-            this.label4.AutoSize = true;
-            this.label4.Font = new System.Drawing.Font("宋体", 10F);
-            this.label4.ForeColor = System.Drawing.Color.LightGray;
-            this.label4.Location = new System.Drawing.Point(24, 143);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(49, 14);
-            this.label4.TabIndex = 10;
-            this.label4.Text = "样品名";
-            // 
-            // tBSampleName
-            // 
-            this.tBSampleName.Font = new System.Drawing.Font("宋体", 10F);
-            this.tBSampleName.Location = new System.Drawing.Point(80, 139);
-            this.tBSampleName.Name = "tBSampleName";
-            this.tBSampleName.Size = new System.Drawing.Size(213, 23);
-            this.tBSampleName.TabIndex = 11;
-            // 
-            // cBIsPT
-            // 
-            this.cBIsPT.AutoSize = true;
-            this.cBIsPT.Font = new System.Drawing.Font("宋体", 10F);
-            this.cBIsPT.ForeColor = System.Drawing.Color.LightGray;
-            this.cBIsPT.Location = new System.Drawing.Point(80, 167);
-            this.cBIsPT.Name = "cBIsPT";
-            this.cBIsPT.Size = new System.Drawing.Size(96, 18);
-            this.cBIsPT.TabIndex = 12;
-            this.cBIsPT.Text = "是否使用PT";
-            this.cBIsPT.UseVisualStyleBackColor = true;
-            // 
-            // btnSave
-            // 
-            this.btnSave.Location = new System.Drawing.Point(297, 187);
-            this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(75, 23);
-            this.btnSave.TabIndex = 14;
-            this.btnSave.Text = "保存";
-            this.btnSave.UseVisualStyleBackColor = true;
-            this.btnSave.Click += new System.EventHandler(this.button1_Click);
-            // 
-            // cBIsManul
-            // 
-            this.cBIsManul.AutoSize = true;
-            this.cBIsManul.Font = new System.Drawing.Font("宋体", 10F);
-            this.cBIsManul.ForeColor = System.Drawing.Color.LightGray;
-            this.cBIsManul.Location = new System.Drawing.Point(181, 167);
-            this.cBIsManul.Margin = new System.Windows.Forms.Padding(2);
-            this.cBIsManul.Name = "cBIsManul";
-            this.cBIsManul.Size = new System.Drawing.Size(82, 18);
-            this.cBIsManul.TabIndex = 15;
-            this.cBIsManul.Text = "手动对焦";
-            this.cBIsManul.UseVisualStyleBackColor = true;
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("宋体", 10F);
-            this.label5.ForeColor = System.Drawing.Color.LightGray;
-            this.label5.Location = new System.Drawing.Point(17, 96);
-            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(56, 14);
-            this.label5.TabIndex = 16;
-            this.label5.Text = "FIB模板";
+            // chkManul
+            // 
+            this.chkManul.AutoSize = true;
+            this.chkManul.Font = new System.Drawing.Font("宋体", 10F);
+            this.chkManul.ForeColor = System.Drawing.Color.LightGray;
+            this.chkManul.Location = new System.Drawing.Point(106, 181);
+            this.chkManul.Margin = new System.Windows.Forms.Padding(2);
+            this.chkManul.Name = "chkManul";
+            this.chkManul.Size = new System.Drawing.Size(82, 18);
+            this.chkManul.TabIndex = 15;
+            this.chkManul.Text = "手动对焦";
+            this.chkManul.UseVisualStyleBackColor = true;
             // 
             // label6
             // 
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("宋体", 10F);
             this.label6.ForeColor = System.Drawing.Color.LightGray;
-            this.label6.Location = new System.Drawing.Point(10, 49);
+            this.label6.Location = new System.Drawing.Point(41, 53);
             this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(63, 14);
             this.label6.TabIndex = 17;
             this.label6.Text = "导入切孔";
             // 
-            // pbTemplateFile
-            // 
-            this.pbTemplateFile.BackColor = System.Drawing.Color.LightGray;
-            this.pbTemplateFile.Location = new System.Drawing.Point(297, 92);
-            this.pbTemplateFile.Name = "pbTemplateFile";
-            this.pbTemplateFile.Size = new System.Drawing.Size(77, 23);
-            this.pbTemplateFile.TabIndex = 6;
-            this.pbTemplateFile.TabStop = false;
-            this.pbTemplateFile.Click += new System.EventHandler(this.pbTemplateFile_Click);
+            // cbbWPZD
+            // 
+            this.cbbWPZD.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbbWPZD.Font = new System.Drawing.Font("宋体", 10F);
+            this.cbbWPZD.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.cbbWPZD.FormattingEnabled = true;
+            this.cbbWPZD.Items.AddRange(new object[] {
+            "1000",
+            "1500",
+            "2000",
+            "2500",
+            "3000"});
+            this.cbbWPZD.Location = new System.Drawing.Point(106, 258);
+            this.cbbWPZD.Margin = new System.Windows.Forms.Padding(2);
+            this.cbbWPZD.Name = "cbbWPZD";
+            this.cbbWPZD.Size = new System.Drawing.Size(132, 21);
+            this.cbbWPZD.TabIndex = 99;
+            // 
+            // cbbWPZF
+            // 
+            this.cbbWPZF.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbbWPZF.Font = new System.Drawing.Font("宋体", 10F);
+            this.cbbWPZF.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.cbbWPZF.FormattingEnabled = true;
+            this.cbbWPZF.Items.AddRange(new object[] {
+            "600",
+            "1000",
+            "2000",
+            "10000"});
+            this.cbbWPZF.Location = new System.Drawing.Point(434, 258);
+            this.cbbWPZF.Margin = new System.Windows.Forms.Padding(2);
+            this.cbbWPZF.Name = "cbbWPZF";
+            this.cbbWPZF.Size = new System.Drawing.Size(132, 21);
+            this.cbbWPZF.TabIndex = 98;
+            // 
+            // cbbWQGD
+            // 
+            this.cbbWQGD.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbbWQGD.Font = new System.Drawing.Font("宋体", 10F);
+            this.cbbWQGD.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.cbbWQGD.FormattingEnabled = true;
+            this.cbbWQGD.Items.AddRange(new object[] {
+            "1000",
+            "1500",
+            "2000",
+            "2500",
+            "3000"});
+            this.cbbWQGD.Location = new System.Drawing.Point(106, 344);
+            this.cbbWQGD.Margin = new System.Windows.Forms.Padding(2);
+            this.cbbWQGD.Name = "cbbWQGD";
+            this.cbbWQGD.Size = new System.Drawing.Size(132, 21);
+            this.cbbWQGD.TabIndex = 97;
+            // 
+            // cbbWQGF
+            // 
+            this.cbbWQGF.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbbWQGF.Font = new System.Drawing.Font("宋体", 10F);
+            this.cbbWQGF.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.cbbWQGF.FormattingEnabled = true;
+            this.cbbWQGF.Items.AddRange(new object[] {
+            "600",
+            "1000",
+            "2000",
+            "10000"});
+            this.cbbWQGF.Location = new System.Drawing.Point(434, 344);
+            this.cbbWQGF.Margin = new System.Windows.Forms.Padding(2);
+            this.cbbWQGF.Name = "cbbWQGF";
+            this.cbbWQGF.Size = new System.Drawing.Size(132, 21);
+            this.cbbWQGF.TabIndex = 96;
+            // 
+            // cbbWLZ
+            // 
+            this.cbbWLZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbbWLZ.Font = new System.Drawing.Font("宋体", 10F);
+            this.cbbWLZ.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.cbbWLZ.FormattingEnabled = true;
+            this.cbbWLZ.Items.AddRange(new object[] {
+            "600",
+            "1000",
+            "2000",
+            "10000"});
+            this.cbbWLZ.Location = new System.Drawing.Point(434, 301);
+            this.cbbWLZ.Margin = new System.Windows.Forms.Padding(2);
+            this.cbbWLZ.Name = "cbbWLZ";
+            this.cbbWLZ.Size = new System.Drawing.Size(132, 21);
+            this.cbbWLZ.TabIndex = 95;
+            // 
+            // cbbWXZ
+            // 
+            this.cbbWXZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cbbWXZ.Font = new System.Drawing.Font("宋体", 10F);
+            this.cbbWXZ.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.cbbWXZ.FormattingEnabled = true;
+            this.cbbWXZ.Items.AddRange(new object[] {
+            "截面观测",
+            "表面观测"});
+            this.cbbWXZ.Location = new System.Drawing.Point(106, 301);
+            this.cbbWXZ.Margin = new System.Windows.Forms.Padding(2);
+            this.cbbWXZ.Name = "cbbWXZ";
+            this.cbbWXZ.Size = new System.Drawing.Size(132, 21);
+            this.cbbWXZ.TabIndex = 94;
+            // 
+            // cbbWCS
+            // 
+            this.cbbWCS.Font = new System.Drawing.Font("宋体", 10F);
+            this.cbbWCS.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.cbbWCS.FormattingEnabled = true;
+            this.cbbWCS.Location = new System.Drawing.Point(433, 215);
+            this.cbbWCS.Margin = new System.Windows.Forms.Padding(2);
+            this.cbbWCS.Name = "cbbWCS";
+            this.cbbWCS.Size = new System.Drawing.Size(132, 21);
+            this.cbbWCS.TabIndex = 93;
+            // 
+            // cbbWYP
+            // 
+            this.cbbWYP.Font = new System.Drawing.Font("宋体", 10F);
+            this.cbbWYP.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.cbbWYP.FormattingEnabled = true;
+            this.cbbWYP.Location = new System.Drawing.Point(106, 215);
+            this.cbbWYP.Margin = new System.Windows.Forms.Padding(2);
+            this.cbbWYP.Name = "cbbWYP";
+            this.cbbWYP.Size = new System.Drawing.Size(132, 21);
+            this.cbbWYP.TabIndex = 92;
+            // 
+            // label58
+            // 
+            this.label58.AutoSize = true;
+            this.label58.Font = new System.Drawing.Font("宋体", 10F);
+            this.label58.ForeColor = System.Drawing.Color.LightGray;
+            this.label58.Location = new System.Drawing.Point(42, 304);
+            this.label58.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label58.Name = "label58";
+            this.label58.Size = new System.Drawing.Size(63, 14);
+            this.label58.TabIndex = 91;
+            this.label58.Text = "校正角度";
+            // 
+            // label50
+            // 
+            this.label50.AutoSize = true;
+            this.label50.Font = new System.Drawing.Font("宋体", 10F);
+            this.label50.ForeColor = System.Drawing.Color.LightGray;
+            this.label50.Location = new System.Drawing.Point(42, 261);
+            this.label50.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label50.Name = "label50";
+            this.label50.Size = new System.Drawing.Size(63, 14);
+            this.label50.TabIndex = 90;
+            this.label50.Text = "拍照电压";
+            // 
+            // label54
+            // 
+            this.label54.AutoSize = true;
+            this.label54.Font = new System.Drawing.Font("宋体", 10F);
+            this.label54.ForeColor = System.Drawing.Color.LightGray;
+            this.label54.Location = new System.Drawing.Point(339, 261);
+            this.label54.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label54.Name = "label54";
+            this.label54.Size = new System.Drawing.Size(91, 14);
+            this.label54.TabIndex = 89;
+            this.label54.Text = "拍照放大位数";
+            // 
+            // label46
+            // 
+            this.label46.AutoSize = true;
+            this.label46.Font = new System.Drawing.Font("宋体", 10F);
+            this.label46.ForeColor = System.Drawing.Color.LightGray;
+            this.label46.Location = new System.Drawing.Point(14, 347);
+            this.label46.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label46.Name = "label46";
+            this.label46.Size = new System.Drawing.Size(91, 14);
+            this.label46.TabIndex = 88;
+            this.label46.Text = "定位切割电压";
+            // 
+            // label42
+            // 
+            this.label42.AutoSize = true;
+            this.label42.Font = new System.Drawing.Font("宋体", 10F);
+            this.label42.ForeColor = System.Drawing.Color.LightGray;
+            this.label42.Location = new System.Drawing.Point(311, 347);
+            this.label42.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label42.Name = "label42";
+            this.label42.Size = new System.Drawing.Size(119, 14);
+            this.label42.TabIndex = 87;
+            this.label42.Text = "定位切割放大位数";
+            // 
+            // label38
+            // 
+            this.label38.AutoSize = true;
+            this.label38.Font = new System.Drawing.Font("宋体", 10F);
+            this.label38.ForeColor = System.Drawing.Color.LightGray;
+            this.label38.Location = new System.Drawing.Point(311, 304);
+            this.label38.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label38.Name = "label38";
+            this.label38.Size = new System.Drawing.Size(119, 14);
+            this.label38.TabIndex = 86;
+            this.label38.Text = "拉直操作放大位数";
+            // 
+            // chkWIsP
+            // 
+            this.chkWIsP.AutoSize = true;
+            this.chkWIsP.Font = new System.Drawing.Font("宋体", 10F);
+            this.chkWIsP.ForeColor = System.Drawing.Color.LightGray;
+            this.chkWIsP.Location = new System.Drawing.Point(304, 181);
+            this.chkWIsP.Margin = new System.Windows.Forms.Padding(2);
+            this.chkWIsP.Name = "chkWIsP";
+            this.chkWIsP.Size = new System.Drawing.Size(96, 18);
+            this.chkWIsP.TabIndex = 85;
+            this.chkWIsP.Text = "是否仅拍照";
+            this.chkWIsP.UseVisualStyleBackColor = true;
+            // 
+            // label48
+            // 
+            this.label48.AutoSize = true;
+            this.label48.Font = new System.Drawing.Font("宋体", 10F);
+            this.label48.ForeColor = System.Drawing.Color.LightGray;
+            this.label48.Location = new System.Drawing.Point(41, 218);
+            this.label48.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label48.Name = "label48";
+            this.label48.Size = new System.Drawing.Size(63, 14);
+            this.label48.TabIndex = 81;
+            this.label48.Text = "样品类型";
+            // 
+            // label56
+            // 
+            this.label56.AutoSize = true;
+            this.label56.Font = new System.Drawing.Font("宋体", 10F);
+            this.label56.ForeColor = System.Drawing.Color.LightGray;
+            this.label56.Location = new System.Drawing.Point(394, 218);
+            this.label56.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label56.Name = "label56";
+            this.label56.Size = new System.Drawing.Size(35, 14);
+            this.label56.TabIndex = 80;
+            this.label56.Text = "厂商";
+            // 
+            // label59
+            // 
+            this.label59.AutoSize = true;
+            this.label59.Font = new System.Drawing.Font("宋体", 10F);
+            this.label59.ForeColor = System.Drawing.Color.LightGray;
+            this.label59.Location = new System.Drawing.Point(20, 146);
+            this.label59.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label59.Name = "label59";
+            this.label59.Size = new System.Drawing.Size(84, 14);
+            this.label59.TabIndex = 79;
+            this.label59.Text = "FIB文件名称";
+            // 
+            // label61
+            // 
+            this.label61.AutoSize = true;
+            this.label61.Font = new System.Drawing.Font("宋体", 10F);
+            this.label61.ForeColor = System.Drawing.Color.LightGray;
+            this.label61.Location = new System.Drawing.Point(27, 104);
+            this.label61.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label61.Name = "label61";
+            this.label61.Size = new System.Drawing.Size(77, 14);
+            this.label61.TabIndex = 78;
+            this.label61.Text = "PT文件名称";
+            // 
+            // chkWPT
+            // 
+            this.chkWPT.AutoSize = true;
+            this.chkWPT.Font = new System.Drawing.Font("宋体", 10F);
+            this.chkWPT.ForeColor = System.Drawing.Color.LightGray;
+            this.chkWPT.Location = new System.Drawing.Point(198, 181);
+            this.chkWPT.Margin = new System.Windows.Forms.Padding(2);
+            this.chkWPT.Name = "chkWPT";
+            this.chkWPT.Size = new System.Drawing.Size(96, 18);
+            this.chkWPT.TabIndex = 77;
+            this.chkWPT.Text = "是否使用PT";
+            this.chkWPT.UseVisualStyleBackColor = true;
+            // 
+            // btnCreateConfig
+            // 
+            this.btnCreateConfig.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnCreateConfig.ForeColor = System.Drawing.Color.Black;
+            this.btnCreateConfig.Location = new System.Drawing.Point(433, 381);
+            this.btnCreateConfig.Margin = new System.Windows.Forms.Padding(2);
+            this.btnCreateConfig.Name = "btnCreateConfig";
+            this.btnCreateConfig.Size = new System.Drawing.Size(135, 41);
+            this.btnCreateConfig.TabIndex = 100;
+            this.btnCreateConfig.Text = "创建配置文件";
+            this.btnCreateConfig.UseVisualStyleBackColor = true;
+            this.btnCreateConfig.Click += new System.EventHandler(this.btnCreateConfig_Click);
+            // 
+            // btnReadConfig
+            // 
+            this.btnReadConfig.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnReadConfig.ForeColor = System.Drawing.Color.Black;
+            this.btnReadConfig.Location = new System.Drawing.Point(12, 381);
+            this.btnReadConfig.Margin = new System.Windows.Forms.Padding(2);
+            this.btnReadConfig.Name = "btnReadConfig";
+            this.btnReadConfig.Size = new System.Drawing.Size(135, 41);
+            this.btnReadConfig.TabIndex = 101;
+            this.btnReadConfig.Text = "读取配置文件";
+            this.btnReadConfig.UseVisualStyleBackColor = true;
+            this.btnReadConfig.Visible = false;
+            this.btnReadConfig.Click += new System.EventHandler(this.btnReadConfig_Click);
+            // 
+            // txtWFIBF
+            // 
+            this.txtWFIBF.Font = new System.Drawing.Font("宋体", 10F);
+            this.txtWFIBF.Location = new System.Drawing.Point(104, 142);
+            this.txtWFIBF.Name = "txtWFIBF";
+            this.txtWFIBF.ReadOnly = true;
+            this.txtWFIBF.Size = new System.Drawing.Size(346, 23);
+            this.txtWFIBF.TabIndex = 103;
+            // 
+            // pbCutHoleAuto
+            // 
+            this.pbCutHoleAuto.BackColor = System.Drawing.Color.LightGray;
+            this.pbCutHoleAuto.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pbCutHoleAuto.BackgroundImage")));
+            this.pbCutHoleAuto.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.pbCutHoleAuto.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.pbCutHoleAuto.Location = new System.Drawing.Point(512, 49);
+            this.pbCutHoleAuto.Name = "pbCutHoleAuto";
+            this.pbCutHoleAuto.Size = new System.Drawing.Size(53, 25);
+            this.pbCutHoleAuto.TabIndex = 104;
+            this.pbCutHoleAuto.TabStop = false;
+            this.pbCutHoleAuto.Click += new System.EventHandler(this.pbCutHoleAuto_Click);
+            // 
+            // pbFIBTemplateFile
+            // 
+            this.pbFIBTemplateFile.BackColor = System.Drawing.Color.LightGray;
+            this.pbFIBTemplateFile.BackgroundImage = global::HOZProject.Properties.Resources.ImportTemplateFile;
+            this.pbFIBTemplateFile.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.pbFIBTemplateFile.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.pbFIBTemplateFile.Location = new System.Drawing.Point(456, 142);
+            this.pbFIBTemplateFile.Name = "pbFIBTemplateFile";
+            this.pbFIBTemplateFile.Size = new System.Drawing.Size(109, 25);
+            this.pbFIBTemplateFile.TabIndex = 102;
+            this.pbFIBTemplateFile.TabStop = false;
+            this.pbFIBTemplateFile.Click += new System.EventHandler(this.pbFIBTemplateFile_Click);
+            // 
+            // pbPTTemplateFile
+            // 
+            this.pbPTTemplateFile.BackColor = System.Drawing.Color.LightGray;
+            this.pbPTTemplateFile.BackgroundImage = global::HOZProject.Properties.Resources.ImportTemplateFile;
+            this.pbPTTemplateFile.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.pbPTTemplateFile.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.pbPTTemplateFile.Location = new System.Drawing.Point(456, 100);
+            this.pbPTTemplateFile.Name = "pbPTTemplateFile";
+            this.pbPTTemplateFile.Size = new System.Drawing.Size(109, 25);
+            this.pbPTTemplateFile.TabIndex = 6;
+            this.pbPTTemplateFile.TabStop = false;
+            this.pbPTTemplateFile.Click += new System.EventHandler(this.pbTemplateFile_Click);
             // 
             // pbCutHoleFile
             // 
             this.pbCutHoleFile.BackColor = System.Drawing.Color.LightGray;
-            this.pbCutHoleFile.Location = new System.Drawing.Point(298, 45);
+            this.pbCutHoleFile.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pbCutHoleFile.BackgroundImage")));
+            this.pbCutHoleFile.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.pbCutHoleFile.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.pbCutHoleFile.Location = new System.Drawing.Point(457, 49);
             this.pbCutHoleFile.Name = "pbCutHoleFile";
-            this.pbCutHoleFile.Size = new System.Drawing.Size(77, 23);
+            this.pbCutHoleFile.Size = new System.Drawing.Size(53, 25);
             this.pbCutHoleFile.TabIndex = 4;
             this.pbCutHoleFile.TabStop = false;
             this.pbCutHoleFile.Click += new System.EventHandler(this.pbCutHoleFile_Click);
             // 
             // UControl_Init
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.Controls.Add(this.pbCutHoleAuto);
+            this.Controls.Add(this.txtWFIBF);
+            this.Controls.Add(this.pbFIBTemplateFile);
+            this.Controls.Add(this.btnReadConfig);
+            this.Controls.Add(this.btnCreateConfig);
+            this.Controls.Add(this.cbbWPZD);
+            this.Controls.Add(this.cbbWPZF);
+            this.Controls.Add(this.cbbWQGD);
+            this.Controls.Add(this.cbbWQGF);
+            this.Controls.Add(this.cbbWLZ);
+            this.Controls.Add(this.cbbWXZ);
+            this.Controls.Add(this.cbbWCS);
+            this.Controls.Add(this.cbbWYP);
+            this.Controls.Add(this.label58);
+            this.Controls.Add(this.label50);
+            this.Controls.Add(this.label54);
+            this.Controls.Add(this.label46);
+            this.Controls.Add(this.label42);
+            this.Controls.Add(this.label38);
+            this.Controls.Add(this.chkWIsP);
+            this.Controls.Add(this.label48);
+            this.Controls.Add(this.label56);
+            this.Controls.Add(this.label59);
+            this.Controls.Add(this.label61);
+            this.Controls.Add(this.chkWPT);
             this.Controls.Add(this.label6);
-            this.Controls.Add(this.label5);
-            this.Controls.Add(this.cBIsManul);
-            this.Controls.Add(this.btnSave);
-            this.Controls.Add(this.cBIsPT);
-            this.Controls.Add(this.tBSampleName);
-            this.Controls.Add(this.label4);
-            this.Controls.Add(this.label3);
+            this.Controls.Add(this.chkManul);
             this.Controls.Add(this.lblCutHoleCount);
-            this.Controls.Add(this.tBFIBTemp);
-            this.Controls.Add(this.pbTemplateFile);
+            this.Controls.Add(this.txtWPTF);
+            this.Controls.Add(this.pbPTTemplateFile);
             this.Controls.Add(this.tbCutHoleFilePath);
             this.Controls.Add(this.pbCutHoleFile);
             this.Controls.Add(this.panel1);
+            this.Font = new System.Drawing.Font("宋体", 10F);
+            this.ForeColor = System.Drawing.SystemColors.WindowText;
             this.Name = "UControl_Init";
-            this.Size = new System.Drawing.Size(387, 222);
+            this.Size = new System.Drawing.Size(576, 436);
+            this.Load += new System.EventHandler(this.UControl_Init_Load);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pbTemplateFile)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbCutHoleAuto)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbFIBTemplateFile)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbPTTemplateFile)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbCutHoleFile)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
@@ -258,16 +580,37 @@
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.PictureBox pbCutHoleFile;
         private System.Windows.Forms.TextBox tbCutHoleFilePath;
-        private System.Windows.Forms.TextBox tBFIBTemp;
-        private System.Windows.Forms.PictureBox pbTemplateFile;
+        private System.Windows.Forms.PictureBox pbPTTemplateFile;
         private System.Windows.Forms.Label lblCutHoleCount;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox tBSampleName;
-        private System.Windows.Forms.CheckBox cBIsPT;
-        private System.Windows.Forms.Button btnSave;
-        private System.Windows.Forms.CheckBox cBIsManul;
+        private System.Windows.Forms.CheckBox chkManul;
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.ComboBox cbbWPZD;
+        private System.Windows.Forms.ComboBox cbbWPZF;
+        private System.Windows.Forms.ComboBox cbbWQGD;
+        private System.Windows.Forms.ComboBox cbbWQGF;
+        private System.Windows.Forms.ComboBox cbbWLZ;
+        private System.Windows.Forms.ComboBox cbbWXZ;
+        private System.Windows.Forms.ComboBox cbbWCS;
+        private System.Windows.Forms.ComboBox cbbWYP;
+        private System.Windows.Forms.Label label58;
+        private System.Windows.Forms.Label label50;
+        private System.Windows.Forms.Label label54;
+        private System.Windows.Forms.Label label46;
+        private System.Windows.Forms.Label label42;
+        private System.Windows.Forms.Label label38;
+        private System.Windows.Forms.CheckBox chkWIsP;
+        private System.Windows.Forms.TextBox txtWPTF;
+        private System.Windows.Forms.Label label48;
+        private System.Windows.Forms.Label label56;
+        private System.Windows.Forms.Label label59;
+        private System.Windows.Forms.Label label61;
+        private System.Windows.Forms.CheckBox chkWPT;
+        private System.Windows.Forms.Button btnCreateConfig;
+        private System.Windows.Forms.Button btnReadConfig;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TextBox txtWFIBF;
+        private System.Windows.Forms.PictureBox pbFIBTemplateFile;
+        private System.Windows.Forms.PictureBox pbCutHoleAuto;
     }
 }

+ 174 - 31
HOZProject/UserControls/UControl_Init.cs

@@ -8,18 +8,32 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using MeasureData;
+using System.Configuration;
 
 namespace HOZProject
 {
     public partial class UControl_Init : UserControl
     {
+        #region 全局变量
+        String[] sT;
+        String[] firms;
+        Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
         private FormHOZMain formHOZMain;
         public FormHOZMain FormHOZMainObject { get => formHOZMain; set => formHOZMain = value; }
+        //模板路径
+        private string readConfigPath;
+        public string ReadConfigPath { get => readConfigPath; set => readConfigPath = value; }
+        #endregion
+
         public UControl_Init(FormHOZMain formHOZ)
         {
             InitializeComponent();
             FormHOZMainObject = formHOZ;
         }
+        private void UControl_Init_Load(object sender, EventArgs e)
+        {
+            
+        }
 
         private void btnClose_Click(object sender, EventArgs e)
         {
@@ -42,45 +56,25 @@ namespace HOZProject
                 else
                 {
                     List<CutHole> ListCutHole = FormHOZMainObject.m_MeasureFile.ListCutHole;
+                    //文件路径
+                    string filePath = FormHOZMainObject.m_MeasureFile.FilePath;
+                    string fileName = FormHOZMainObject.m_MeasureFile.FileName;
                     FormHOZMainObject.CreateCutHoleList(ListCutHole);
                     //显示导入的切孔数量
                     lblCutHoleCount.Text = string.Format("成功导入{0}个切孔",ListCutHole.Count);
+                    tbCutHoleFilePath.Text = filePath + fileName;
                 }
-                //this.CutHoleGridView.Rows.Clear();
-                //List<CutHole> listHoles = m_MeasureFile.ListCutHole;
-                //foreach (CutHole hole in listHoles)
-                //{
-                //    //在CutHoleGridView中,添加切孔信息
-                //    int index = this.CutHoleGridView.Rows.Add();
-                //    this.CutHoleGridView.Rows[index].Cells[0].Value = hole.HoleName;
-
-                //    SemPosition pos = hole.Position;
-                //    this.CutHoleGridView.Rows[index].Cells[1].Value = pos.X;
-                //    this.CutHoleGridView.Rows[index].Cells[2].Value = pos.Y;
-                //    this.CutHoleGridView.Rows[index].Cells[3].Value = pos.Z;
-                //    this.CutHoleGridView.Rows[index].Cells[4].Value = pos.M;
-                //    this.CutHoleGridView.Rows[index].Cells[5].Value = pos.R;
-                //    this.CutHoleGridView.Rows[index].Cells[6].Value = pos.T;
-                //}
             }
         }
 
-        private void button1_Click(object sender, EventArgs e)
+        /// <summary>
+        /// 根据一个切孔,自动计算其他切孔信息
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void pbCutHoleAuto_Click(object sender, EventArgs e)
         {
-            if (FormHOZMainObject.m_MeasureFile == null)
-            {
-                MessageBox.Show("请新建一个测量文件");
-                //this.listmsg.Items.Add("请新建一个测量文件");
-            }
-            else
-            {
-                FormHOZMainObject.m_MeasureFile.MParam.PT = this.cBIsPT.Checked;
-                FormHOZMainObject.m_MeasureFile.MParam.SampleName = this.tBSampleName.Text;
-                FormHOZMainObject.m_MeasureFile.MParam.FIBTemp = this.tBFIBTemp.Text;
-                FormHOZMainObject.m_MeasureFile.MParam.FocusMode = this.cBIsManul.Checked;
 
-                MessageBox.Show("参数设置成功");
-            }
         }
 
         private void pbTemplateFile_Click(object sender, EventArgs e)
@@ -100,8 +94,157 @@ namespace HOZProject
             {
                 FilePathName = System.IO.Path.GetFullPath(pOpenFileDialog.FileName);  //绝对路径
                 fileNameWithoutExtension = System.IO.Path.GetFileNameWithoutExtension(FilePathName);
-                this.tBFIBTemp.Text = fileNameWithoutExtension;
+                this.txtWPTF.Text = fileNameWithoutExtension;
             }
         }
+
+        private void pbFIBTemplateFile_Click(object sender, EventArgs e)
+        {
+            string FilePathName;
+            string fileNameWithoutExtension;
+            //新建一个文件对话框
+            OpenFileDialog pOpenFileDialog = new OpenFileDialog();
+            //设置对话框标题
+            pOpenFileDialog.Title = "选择模板文件";
+            //设置打开文件类型
+            pOpenFileDialog.Filter = "ely文件(*.ely)|*.ely";
+            //监测文件是否存在
+            pOpenFileDialog.CheckFileExists = true;
+            //文件打开后执行以下程序
+            if (pOpenFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                FilePathName = System.IO.Path.GetFullPath(pOpenFileDialog.FileName);  //绝对路径
+                fileNameWithoutExtension = System.IO.Path.GetFileNameWithoutExtension(FilePathName);
+                this.txtWFIBF.Text = fileNameWithoutExtension;
+            }
+        }
+
+        #region 创建与读取样品参数文件
+        private void btnCreateConfig_Click(object sender, EventArgs e)
+        {
+            ConfigFile cfm = new ConfigFile();
+            cfm.Is_Photograph = chkWIsP.Checked;
+            cfm.PT_Depostion = chkWPT.Checked;
+            cfm.PT_ELYFile = txtWPTF.Text;
+            cfm.FIB_ELYFile = txtWFIBF.Text;
+            cfm.Stretch_Magnification = Convert.ToDouble(cbbWLZ.Text);
+            cfm.Location_Magnification = Convert.ToDouble(cbbWQGF.Text);
+            cfm.Location_Voltage = Convert.ToDouble(cbbWQGD.Text);
+            cfm.Photograph_Magnification = Convert.ToDouble(cbbWPZF.Text);
+            cfm.Photograph_Voltage = Convert.ToDouble(cbbWPZD.Text);
+            if (cbbWXZ.SelectedIndex == 0)
+            {
+                cfm.Correction_Angle = 36.0;
+            }
+            else
+            {
+                cfm.Correction_Angle = 54.0;
+            }
+
+            cfm.Sample_Type = cbbWYP.Text;
+            cfm.Firm = cbbWCS.Text;
+
+            SaveFileDialog saveFileDialog = new SaveFileDialog();
+            saveFileDialog.Filter = "样品参数文件|*.cfg";
+            if (saveFileDialog.ShowDialog() == DialogResult.OK)
+            {
+                cfm.Save(saveFileDialog.FileName);
+            }
+            else
+            {
+                return;
+            }
+            List<String> _sT = sT.ToList();
+            if (_sT.IndexOf(cbbWYP.Text) < 0)
+            {
+                _sT.Add(cbbWYP.Text);
+                sT = _sT.ToArray();
+                string wsT = "";
+                for (int i = 0; i < sT.Length; i++)
+                {
+                    wsT += sT[i] + ",";
+                }
+                wsT = wsT.Substring(0, wsT.Length - 1);
+                config.AppSettings.Settings["Sample_Type"].Value = wsT;
+            }
+            List<String> _firms = firms.ToList();
+            if (_firms.IndexOf(cbbWCS.Text) < 0)
+            {
+                _firms.Add(cbbWCS.Text);
+                firms = _firms.ToArray();
+                string wFirms = "";
+                for (int i = 0; i < firms.Length; i++)
+                {
+                    wFirms += firms[i] + ",";
+                }
+                wFirms = wFirms.Substring(0, wFirms.Length - 1);
+                config.AppSettings.Settings["Firm"].Value = wFirms;
+            }
+            config.Save(ConfigurationSaveMode.Modified);
+            ConfigurationManager.RefreshSection("appSettings");//重新加载新的配置文件
+        }
+        public void Reloadconfig()
+        {
+            String sample_Type = ConfigurationManager.AppSettings["Sample_Type"];
+            String firm = ConfigurationManager.AppSettings["Firm"];
+            sT = sample_Type.Split(',');
+            cbbWYP.Items.Clear();
+            for (int i = 0; i < sT.Length; i++)
+            {
+                cbbWYP.Items.Add(sT[i]);
+            }
+            firms = firm.Split(',');
+            cbbWCS.Items.Clear();
+            for (int i = 0; i < firms.Length; i++)
+            {
+                cbbWCS.Items.Add(firms[i]);
+            }
+
+            cbbWYP.SelectedIndex = 0;
+            cbbWCS.SelectedIndex = 0;
+            cbbWXZ.SelectedIndex = 0;
+            cbbWPZD.SelectedIndex = 0;
+            cbbWPZF.SelectedIndex = 0;
+            cbbWLZ.SelectedIndex = 0;
+            cbbWQGD.SelectedIndex = 0;
+            cbbWQGF.SelectedIndex = 0;
+        }
+
+        public void ReadConfigInfo()
+        {
+            if (!ReadConfigPath.Equals(""))
+            {
+                Reloadconfig();
+                ConfigFile cfm = new ConfigFile();
+                cfm.Read(ReadConfigPath);
+                chkWIsP.Checked = cfm.Is_Photograph;
+                chkWPT.Checked = cfm.PT_Depostion;
+                txtWPTF.Text = cfm.PT_ELYFile;
+                txtWFIBF.Text = cfm.FIB_ELYFile;
+                cbbWLZ.Text = cfm.Stretch_Magnification.ToString();
+                cbbWQGF.Text = cfm.Location_Magnification.ToString();
+                cbbWQGD.Text = cfm.Location_Voltage.ToString();
+                cbbWPZF.Text = cfm.Photograph_Magnification.ToString();
+                cbbWPZD.Text = cfm.Photograph_Voltage.ToString();
+                cbbWXZ.Text = cfm.Correction_Angle.ToString();
+                cbbWYP.Text = cfm.Sample_Type;
+                cbbWCS.Text = cfm.Firm;
+            }
+        }
+        private void btnReadConfig_Click(object sender, EventArgs e)
+        {
+            //OpenFileDialog openFileDialog = new OpenFileDialog();
+            //openFileDialog.Filter = "样品参数文件|*.cfg";
+            //if (openFileDialog.ShowDialog() == DialogResult.OK)
+            //{
+            //    ConfigFile cfm = new ConfigFile();
+            //    cfm.Read(openFileDialog.FileName);
+            //}
+            ReadConfigInfo();
+        }
+
+        #endregion
+
+        
     }
 }

+ 137 - 0
HOZProject/UserControls/UControl_Init.resx

@@ -117,4 +117,141 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="pbCutHoleAuto.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        oOBvbhmTAJFChR8AAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="pbCutHoleFile.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+        oOBvbhmTAJFChR8AAAAASUVORK5CYII=
+</value>
+  </data>
 </root>

+ 120 - 29
HOZProject/UserControls/UControl_Log.Designer.cs

@@ -28,20 +28,29 @@
         /// </summary>
         private void InitializeComponent()
         {
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
             this.btnClose = new System.Windows.Forms.Button();
             this.label1 = new System.Windows.Forms.Label();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.dataGridView1 = new System.Windows.Forms.DataGridView();
+            this.dgvLog = new System.Windows.Forms.DataGridView();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.lblLogCount = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
             this.ColCutHoleName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ColStep = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ColTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ColState = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvLog)).BeginInit();
+            this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnClose
             // 
+            this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnClose.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnClose.Location = new System.Drawing.Point(690, 0);
             this.btnClose.Name = "btnClose";
@@ -73,60 +82,136 @@
             this.panel1.Size = new System.Drawing.Size(718, 30);
             this.panel1.TabIndex = 3;
             // 
-            // dataGridView1
-            // 
-            this.dataGridView1.AllowUserToAddRows = false;
-            this.dataGridView1.AllowUserToDeleteRows = false;
-            this.dataGridView1.AllowUserToResizeColumns = false;
-            this.dataGridView1.AllowUserToResizeRows = false;
-            this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            // dgvLog
+            // 
+            this.dgvLog.AllowUserToAddRows = false;
+            this.dgvLog.AllowUserToDeleteRows = false;
+            this.dgvLog.AllowUserToResizeColumns = false;
+            this.dgvLog.AllowUserToResizeRows = false;
+            dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle9.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvLog.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+            this.dgvLog.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
+            this.dgvLog.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.ColCutHoleName,
             this.ColStep,
             this.ColTime,
             this.ColState});
-            this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.dataGridView1.Location = new System.Drawing.Point(0, 30);
-            this.dataGridView1.MultiSelect = false;
-            this.dataGridView1.Name = "dataGridView1";
-            this.dataGridView1.ReadOnly = true;
-            this.dataGridView1.RowHeadersVisible = false;
-            this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
-            this.dataGridView1.RowTemplate.Height = 23;
-            this.dataGridView1.ShowCellErrors = false;
-            this.dataGridView1.ShowCellToolTips = false;
-            this.dataGridView1.ShowEditingIcon = false;
-            this.dataGridView1.ShowRowErrors = false;
-            this.dataGridView1.Size = new System.Drawing.Size(718, 368);
-            this.dataGridView1.TabIndex = 4;
+            dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvLog.DefaultCellStyle = dataGridViewCellStyle10;
+            this.dgvLog.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvLog.EnableHeadersVisualStyles = false;
+            this.dgvLog.Location = new System.Drawing.Point(0, 30);
+            this.dgvLog.MultiSelect = false;
+            this.dgvLog.Name = "dgvLog";
+            this.dgvLog.ReadOnly = true;
+            dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle11.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dgvLog.RowHeadersDefaultCellStyle = dataGridViewCellStyle11;
+            this.dgvLog.RowHeadersVisible = false;
+            this.dgvLog.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
+            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.dgvLog.RowsDefaultCellStyle = dataGridViewCellStyle12;
+            this.dgvLog.RowTemplate.DefaultCellStyle.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.dgvLog.RowTemplate.Height = 23;
+            this.dgvLog.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.dgvLog.ShowCellErrors = false;
+            this.dgvLog.ShowCellToolTips = false;
+            this.dgvLog.ShowEditingIcon = false;
+            this.dgvLog.ShowRowErrors = false;
+            this.dgvLog.Size = new System.Drawing.Size(718, 368);
+            this.dgvLog.TabIndex = 4;
+            this.dgvLog.TabStop = false;
+            this.dgvLog.SelectionChanged += new System.EventHandler(this.dgvLog_SelectionChanged);
+            // 
+            // panel2
+            // 
+            this.panel2.BackColor = System.Drawing.Color.White;
+            this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel2.Controls.Add(this.label2);
+            this.panel2.Controls.Add(this.lblLogCount);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel2.Location = new System.Drawing.Point(0, 375);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(718, 23);
+            this.panel2.TabIndex = 5;
+            // 
+            // lblLogCount
+            // 
+            this.lblLogCount.AutoSize = true;
+            this.lblLogCount.Font = new System.Drawing.Font("宋体", 10F);
+            this.lblLogCount.ForeColor = System.Drawing.Color.Black;
+            this.lblLogCount.Location = new System.Drawing.Point(52, 4);
+            this.lblLogCount.Name = "lblLogCount";
+            this.lblLogCount.Size = new System.Drawing.Size(0, 14);
+            this.lblLogCount.TabIndex = 0;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Font = new System.Drawing.Font("宋体", 10F);
+            this.label2.ForeColor = System.Drawing.Color.Black;
+            this.label2.Location = new System.Drawing.Point(8, 4);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(49, 14);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "共计:";
             // 
             // ColCutHoleName
             // 
+            this.ColCutHoleName.DataPropertyName = "CutHoleName";
             this.ColCutHoleName.HeaderText = "切孔名称";
             this.ColCutHoleName.Name = "ColCutHoleName";
             this.ColCutHoleName.ReadOnly = true;
+            this.ColCutHoleName.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ColCutHoleName.Visible = false;
             this.ColCutHoleName.Width = 180;
             // 
             // ColStep
             // 
+            this.ColStep.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColStep.DataPropertyName = "Name";
             this.ColStep.HeaderText = "步骤名称";
             this.ColStep.Name = "ColStep";
             this.ColStep.ReadOnly = true;
-            this.ColStep.Width = 180;
+            this.ColStep.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.ColStep.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             // 
             // ColTime
             // 
+            this.ColTime.DataPropertyName = "Time";
             this.ColTime.HeaderText = "完成时间";
             this.ColTime.Name = "ColTime";
             this.ColTime.ReadOnly = true;
+            this.ColTime.Resizable = System.Windows.Forms.DataGridViewTriState.False;
+            this.ColTime.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.ColTime.Width = 180;
             // 
             // ColState
             // 
-            this.ColState.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
+            this.ColState.DataPropertyName = "state";
             this.ColState.HeaderText = "状态";
             this.ColState.Name = "ColState";
             this.ColState.ReadOnly = true;
+            this.ColState.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.ColState.Visible = false;
+            this.ColState.Width = 180;
             // 
             // UControl_Log
             // 
@@ -134,13 +219,16 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.Controls.Add(this.dataGridView1);
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.dgvLog);
             this.Controls.Add(this.panel1);
             this.Name = "UControl_Log";
             this.Size = new System.Drawing.Size(718, 398);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvLog)).EndInit();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -150,7 +238,10 @@
         private System.Windows.Forms.Button btnClose;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.DataGridView dataGridView1;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Label lblLogCount;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.DataGridView dgvLog;
         private System.Windows.Forms.DataGridViewTextBoxColumn ColCutHoleName;
         private System.Windows.Forms.DataGridViewTextBoxColumn ColStep;
         private System.Windows.Forms.DataGridViewTextBoxColumn ColTime;

+ 23 - 0
HOZProject/UserControls/UControl_Log.cs

@@ -22,5 +22,28 @@ namespace HOZProject
             Form fParent = this.ParentForm;
             fParent.Close();
         }
+        public void ShowProcessLogInfo(string[] strLog)
+        {
+            DataTable dt = new DataTable();
+            dt.Columns.Add("Time");
+            dt.Columns.Add("Name");
+            dt.Columns.Add("State");
+            foreach (string strItem in strLog)
+            {
+                string[] Nt = strItem.Split('_');
+                DataRow dr = dt.NewRow();
+                dr[0] = Nt[0];
+                dr[1] = Nt[1];
+                dr[2] = "1";
+                dt.Rows.Add(dr);
+            }
+            dgvLog.DataSource = dt;
+            lblLogCount.Text = dt.Rows.Count.ToString()+"条";
+        }
+
+        private void dgvLog_SelectionChanged(object sender, EventArgs e)
+        {
+            dgvLog.ClearSelection();
+        }
     }
 }

+ 0 - 3
HOZProject/UserControls/UControl_Log.resx

@@ -126,9 +126,6 @@
   <metadata name="panel1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="dataGridView1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
   <metadata name="ColCutHoleName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

+ 167 - 9
HOZProject/UserControls/UControl_ParaInfo.Designer.cs

@@ -28,6 +28,20 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem(new string[] {
+            "aaa",
+            "aaa",
+            "Time"}, 0, System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))));
+            System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem(new string[] {
+            "bbb"}, 1, System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))));
+            System.Windows.Forms.ListViewItem listViewItem3 = new System.Windows.Forms.ListViewItem(new string[] {
+            "ccc"}, 2, System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))));
+            System.Windows.Forms.ListViewItem listViewItem4 = new System.Windows.Forms.ListViewItem(new string[] {
+            "ddd"}, 3, System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))));
+            System.Windows.Forms.ListViewItem listViewItem5 = new System.Windows.Forms.ListViewItem(new string[] {
+            "eee"}, 4, System.Drawing.Color.Empty, System.Drawing.Color.Empty, new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))));
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(UControl_ParaInfo));
             this.lblLocation = new System.Windows.Forms.Label();
             this.lblStartTime = new System.Windows.Forms.Label();
             this.lblEndTime = new System.Windows.Forms.Label();
@@ -51,7 +65,21 @@
             this.label5 = new System.Windows.Forms.Label();
             this.label6 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.listView1 = new System.Windows.Forms.ListView();
+            this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
+            this.imageList1 = new System.Windows.Forms.ImageList(this.components);
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.progressBar1 = new System.Windows.Forms.ProgressBar();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.label8 = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.panel3.SuspendLayout();
+            this.panel4.SuspendLayout();
             this.SuspendLayout();
             // 
             // lblLocation
@@ -132,6 +160,7 @@
             // 
             // btnClose
             // 
+            this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnClose.Dock = System.Windows.Forms.DockStyle.Right;
             this.btnClose.Location = new System.Drawing.Point(284, 0);
             this.btnClose.Name = "btnClose";
@@ -189,7 +218,7 @@
             this.lblY.AutoSize = true;
             this.lblY.Font = new System.Drawing.Font("宋体", 10F);
             this.lblY.ForeColor = System.Drawing.Color.LightGray;
-            this.lblY.Location = new System.Drawing.Point(172, 43);
+            this.lblY.Location = new System.Drawing.Point(184, 43);
             this.lblY.Name = "lblY";
             this.lblY.Size = new System.Drawing.Size(0, 14);
             this.lblY.TabIndex = 4;
@@ -199,7 +228,7 @@
             this.lblZ.AutoSize = true;
             this.lblZ.Font = new System.Drawing.Font("宋体", 10F);
             this.lblZ.ForeColor = System.Drawing.Color.LightGray;
-            this.lblZ.Location = new System.Drawing.Point(246, 43);
+            this.lblZ.Location = new System.Drawing.Point(265, 43);
             this.lblZ.Name = "lblZ";
             this.lblZ.Size = new System.Drawing.Size(0, 14);
             this.lblZ.TabIndex = 5;
@@ -209,7 +238,7 @@
             this.lblM.AutoSize = true;
             this.lblM.Font = new System.Drawing.Font("宋体", 10F);
             this.lblM.ForeColor = System.Drawing.Color.LightGray;
-            this.lblM.Location = new System.Drawing.Point(246, 66);
+            this.lblM.Location = new System.Drawing.Point(265, 66);
             this.lblM.Name = "lblM";
             this.lblM.Size = new System.Drawing.Size(0, 14);
             this.lblM.TabIndex = 8;
@@ -219,7 +248,7 @@
             this.lblT.AutoSize = true;
             this.lblT.Font = new System.Drawing.Font("宋体", 10F);
             this.lblT.ForeColor = System.Drawing.Color.LightGray;
-            this.lblT.Location = new System.Drawing.Point(172, 66);
+            this.lblT.Location = new System.Drawing.Point(184, 66);
             this.lblT.Name = "lblT";
             this.lblT.Size = new System.Drawing.Size(0, 14);
             this.lblT.TabIndex = 7;
@@ -239,7 +268,7 @@
             this.label2.AutoSize = true;
             this.label2.Font = new System.Drawing.Font("宋体", 10F);
             this.label2.ForeColor = System.Drawing.Color.LightGray;
-            this.label2.Location = new System.Drawing.Point(220, 66);
+            this.label2.Location = new System.Drawing.Point(239, 66);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(21, 14);
             this.label2.TabIndex = 14;
@@ -250,7 +279,7 @@
             this.label3.AutoSize = true;
             this.label3.Font = new System.Drawing.Font("宋体", 10F);
             this.label3.ForeColor = System.Drawing.Color.LightGray;
-            this.label3.Location = new System.Drawing.Point(146, 66);
+            this.label3.Location = new System.Drawing.Point(158, 66);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(21, 14);
             this.label3.TabIndex = 13;
@@ -272,7 +301,7 @@
             this.label5.AutoSize = true;
             this.label5.Font = new System.Drawing.Font("宋体", 10F);
             this.label5.ForeColor = System.Drawing.Color.LightGray;
-            this.label5.Location = new System.Drawing.Point(220, 43);
+            this.label5.Location = new System.Drawing.Point(239, 43);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(21, 14);
             this.label5.TabIndex = 11;
@@ -283,7 +312,7 @@
             this.label6.AutoSize = true;
             this.label6.Font = new System.Drawing.Font("宋体", 10F);
             this.label6.ForeColor = System.Drawing.Color.LightGray;
-            this.label6.Location = new System.Drawing.Point(146, 43);
+            this.label6.Location = new System.Drawing.Point(158, 43);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(21, 14);
             this.label6.TabIndex = 10;
@@ -300,12 +329,125 @@
             this.label7.TabIndex = 9;
             this.label7.Text = "X:";
             // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.listView1);
+            this.panel2.Controls.Add(this.panel3);
+            this.panel2.Controls.Add(this.panel4);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel2.Location = new System.Drawing.Point(0, 183);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(312, 459);
+            this.panel2.TabIndex = 15;
+            // 
+            // listView1
+            // 
+            this.listView1.Activation = System.Windows.Forms.ItemActivation.OneClick;
+            this.listView1.AllowColumnReorder = true;
+            this.listView1.AllowDrop = true;
+            this.listView1.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.listView1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.listView1.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
+            this.columnHeader1,
+            this.columnHeader2,
+            this.columnHeader3});
+            this.listView1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.listView1.ForeColor = System.Drawing.Color.LightGray;
+            this.listView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
+            this.listView1.HotTracking = true;
+            this.listView1.HoverSelection = true;
+            listViewItem1.StateImageIndex = 0;
+            listViewItem2.StateImageIndex = 0;
+            listViewItem3.StateImageIndex = 0;
+            listViewItem4.StateImageIndex = 0;
+            listViewItem5.StateImageIndex = 0;
+            this.listView1.Items.AddRange(new System.Windows.Forms.ListViewItem[] {
+            listViewItem1,
+            listViewItem2,
+            listViewItem3,
+            listViewItem4,
+            listViewItem5});
+            this.listView1.LabelWrap = false;
+            this.listView1.Location = new System.Drawing.Point(0, 30);
+            this.listView1.MultiSelect = false;
+            this.listView1.Name = "listView1";
+            this.listView1.ShowGroups = false;
+            this.listView1.Size = new System.Drawing.Size(312, 383);
+            this.listView1.SmallImageList = this.imageList1;
+            this.listView1.TabIndex = 7;
+            this.listView1.TabStop = false;
+            this.listView1.UseCompatibleStateImageBehavior = false;
+            this.listView1.View = System.Windows.Forms.View.List;
+            // 
+            // imageList1
+            // 
+            this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+            this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+            this.imageList1.Images.SetKeyName(0, "Reset32.png");
+            this.imageList1.Images.SetKeyName(1, "Ruler32.png");
+            this.imageList1.Images.SetKeyName(2, "set32.png");
+            this.imageList1.Images.SetKeyName(3, "start32.png");
+            this.imageList1.Images.SetKeyName(4, "stop32.png");
+            // 
+            // panel3
+            // 
+            this.panel3.BackColor = System.Drawing.SystemColors.ActiveCaptionText;
+            this.panel3.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel3.Controls.Add(this.label1);
+            this.panel3.Controls.Add(this.progressBar1);
+            this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel3.Location = new System.Drawing.Point(0, 413);
+            this.panel3.Name = "panel3";
+            this.panel3.Size = new System.Drawing.Size(312, 46);
+            this.panel3.TabIndex = 5;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Font = new System.Drawing.Font("宋体", 10F);
+            this.label1.ForeColor = System.Drawing.Color.LightGray;
+            this.label1.Location = new System.Drawing.Point(5, 16);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(77, 14);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "检测总进度";
+            // 
+            // progressBar1
+            // 
+            this.progressBar1.Location = new System.Drawing.Point(88, 16);
+            this.progressBar1.Name = "progressBar1";
+            this.progressBar1.Size = new System.Drawing.Size(183, 14);
+            this.progressBar1.TabIndex = 0;
+            // 
+            // panel4
+            // 
+            this.panel4.BackColor = System.Drawing.Color.White;
+            this.panel4.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel4.Controls.Add(this.label8);
+            this.panel4.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panel4.Location = new System.Drawing.Point(0, 0);
+            this.panel4.Name = "panel4";
+            this.panel4.Size = new System.Drawing.Size(312, 30);
+            this.panel4.TabIndex = 6;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Font = new System.Drawing.Font("宋体", 10F);
+            this.label8.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.label8.Location = new System.Drawing.Point(5, 7);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(35, 14);
+            this.label8.TabIndex = 3;
+            this.label8.Text = "XXXX";
+            // 
             // UControl_ParaInfo
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
             this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.Controls.Add(this.panel2);
             this.Controls.Add(this.label2);
             this.Controls.Add(this.label3);
             this.Controls.Add(this.label4);
@@ -327,9 +469,14 @@
             this.Controls.Add(this.lblStartTime);
             this.Controls.Add(this.lblLocation);
             this.Name = "UControl_ParaInfo";
-            this.Size = new System.Drawing.Size(312, 178);
+            this.Size = new System.Drawing.Size(312, 642);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel3.ResumeLayout(false);
+            this.panel3.PerformLayout();
+            this.panel4.ResumeLayout(false);
+            this.panel4.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -359,5 +506,16 @@
         private System.Windows.Forms.Label label5;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.ListView listView1;
+        private System.Windows.Forms.ColumnHeader columnHeader1;
+        private System.Windows.Forms.ColumnHeader columnHeader2;
+        private System.Windows.Forms.ColumnHeader columnHeader3;
+        private System.Windows.Forms.ImageList imageList1;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ProgressBar progressBar1;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.Label label8;
     }
 }

+ 113 - 0
HOZProject/UserControls/UControl_ParaInfo.resx

@@ -117,4 +117,117 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS
+        GAAAAk1TRnQBSQFMAgEBBQEAATABAAEwAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        AwABgAMAAUADAAEBAQABCAYAASAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
+        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
+        AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
+        AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
+        AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
+        ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
+        AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
+        AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
+        AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
+        AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
+        AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
+        AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
+        AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
+        AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
+        ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
+        Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
+        AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
+        AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
+        AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
+        ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
+        Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
+        AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
+        AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
+        AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
+        AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
+        AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
+        AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD//8AjQAB/wH0AfMBGgG9
+        AhoBGwHzAfQB/3MAAf8B8wG8AewBbgREAeoBbQHtAbwB8wH/cAAB9AEaAW4CRQFGAmkCRgHpAiMB6gHt
+        AfEB9G4AAfQBBwJEAmgBRQTpA0UBRAERAW0B8AH0bAAB9AEHAUUCRgFAAkUBRgFFAUYERQFGAUUBPwFo
+        AQcB9GoAAf8BvAFEAW8BRgJAAUYHRQEkAQECRgE+AW4B8gH/aQAB8wFFAW8BRQFAAUYBFwFGAXQBvQEb
+        ARoBvAEcARICRQHpAkYBRQHsAfNoAAH/AZMBbgFFAukCQAFGAZMBvQH2AfQC9gEHAW4BRQFGAekBRgFF
+        ARMB8AH/ZwAB9AFuAW8BRQFGAUwCRQFGAUwBlAG9AfQB3gH0Af8BvAFuAkUB6QFGAUQB7QH0ZwAB8AJv
+        AUUDRgIkAUYBbwGTAd4B/wH0Af8B9gEaAUUBRgHpAUYBRAFtAfNnAAGTA28BbgGUAY4BaAFFAekBRgFp
+        AZQC8wH2AvMBcwFuAekBRgJFAfFnAAFvAZMBdAGTAW4CvQGTAUYBJAHpAUYBaQGTAvQC8wEaAUUBRgFA
+        AW8BRAHwZwABRQGUAW8BkwFuAb0B9AHzAZMCRQHpAUYBbwEWAb0C9gG9AUUBaQFFAWkBRAG8ZwABbgGU
+        AXQBkwFuAfQB8wH/Ab0BlAFGA0UBaQGTARsB9AG9AUQBaQHpAW8BRAHwZwABkgOTAXQB9AEbAv8B8wGT
+        A0UBRgFpAZQCvQFFAUYBRQFvAUQB8WcAAbwDkwF0AbwB9AH2Af8B9AG9AZMCRgHpAUYBbwGUAZMBaAFG
+        AkUBSwHzZwAB8wFzAZQBkwGOAZMB9gP/AfQB9gGTAW4BbwFGAWkBbwFpAW8BRQFvAUQBcwH0ZwAB/wGT
+        AZQDkwEHBP8B9AEaAZMEbwIWAWkBbwFEAbwB/2gAAfECkwGUAZMB7QG8AvQD9gG9AZMDbwHjAUYBFgJu
+        AfNpAAH/AQcBvQGTAbcBkwHsAZMBGgHzARsC8wGUAW8BFgJvARYBbgFFARsB/2oAAfQBtgG3ApMBBwKO
+        AZMDjgJvAXQCbwGTAW4B7wH0bAAB8wGTAbcCkwKUBpMBbwEWAXQBSwGTAfRuAAH0AQcBkwG8AbcDkwGU
+        BJMB7AFuAbwB9HAAAf8B8QHvApMBvQG2ApQBkwFzAW4BBwHzAf9zAAH/AfMBvAHtAesCbgHvAbwB9AH/
+        /wD/AP8A/wB7AAL/AfQD/xYAAfcBEwsAAewBbTMAAf8B9AHxAQcBtQGuAfcBBwHxAfQB/xQAAf8B8gEH
+        AVABTwJJAXIB7QG8AfQTAAG8AQ4BEQHqARID6gFtARIBEwFtARIBEwEUAQ8B7BUAAfEB8AMHFgAB/wHy
+        AbUBzwKtAbQCrQKLAa4BBwHzAf8RAAH/AQcBEgFtAVAEcgFJARMB9wHxAgAB8gHzDQAB6wHxAW0B7ALy
+        AfMB8gHzAfAD8wHyAfEBBwFDAbwB7AG8DgAB8AMHAfABBwHtAewC6wGSAQcB8BIAAfQBBwGRAbQB1ga0
+        Ac8BrgGLAa4B8AH0DwAB8wFQAU8BcgFQAVUCTwNVAU8CSQGYAQcBSQHtDAAB7wERAf8B8wHrC/8B7QG8
+        Af8B6wHtAe8MAAGSAuwB6wHsAu8C6wHsAW0B7ALvAQcBvA8AAfQBtQG0AtUBtALVAbMC1AGtAtUBzwGt
+        AYsBuwH0DQAB8wFzAnIBUAFPAy4BTwEuAU8BlwFPAkkB6gESAewB/wsAAe8BkgEHAewPrgLtAe8MAAPs
+        Am0B7AHrAW0B7AHrARIB7ALvAvcBBwHxDAAB9AH3BLQC1QKzAdQC1QHOAc8CtAKLAQcB9AsAAf8B7wFy
+        AZgBlwZPAy4CVQFPAZcBSQFyAf8JAAH3ARMB8AHzAhIBzwG1AbQHtQK7AgkB7QH3DgAD7AJtAuoBbQHs
+        AusBbQPsAesB7AHvAfEKAAH/AQkBtALVAbMB1QGzAbQBswK0AbMD1ALOAdUBrQGLARkB/woAAf8B6gSY
+        AXgClwJVAk8BLgEtAVUBTwGXAU8B6gH/CAABBwETARAB6gHvAWYBhgfWBAkD3QHtAZIKAAHwAe8BkgH3
+        AW0B7ALrAm0BEgFtAuwEbQTsAQcKAAHyAbQD1QGzArQB3AHVArMB1QHUAs4B1AGtAbMBtAGLAbQB9AoA
+        AfAB7AEIAZgB7QFyAZIC7AH3AnIHTwFyAf8IAAHvAfABFAEHAe8BZgGGAdYBtAHVAdYBtQTWBQkBtQH3
+        CgAB9wHtBuwB6gISAewBvAEHAe8B7AJtAesD7AHvCQAB/wG1BdUBtAGzARkBCQG7A7QE1AHOAdQBrQGL
+        AfEB/wkAAfcBCAGSAfAB8wH0Af8CAAH2AfABUAFJBk8BcgsAARIB/wHwAWYBpwHVAeYD1QXWBAkBtQH3
+        CQAB8AHsApIB7AHtA+8B7AFtAesBBwHxAfIBvARtAesC7AHvCQAB9AG0AtUC1AHVAbQBrQMZAQkBtAGz
+        AtQBzgHUAc4BswG0AYsBtQH0CQAB6wHyAfMB/wcAAQcBcgGXAnIBTwJyAW0B/woAARQB/wHxAWYBhgHm
+        Ac8C5gHPAtUE1gG1AdYBCQGuAfcJAAG8ApIB7QLsAQcBvAEHAe8BkgHvAfIC8QG8AesBbQHrBOwB7wkA
+        AfABtAHVA9QDtAEZA/QBCQG0Aa0CswGtAc4BrQGzAYsBtAH0CQAB9wH0CAAB8QG8A5gBlwF4AZgBSQGS
+        Af8KAAESAf8B8AFlAaYDpwOtAuYB1QTWAQkBzwG1CQABvAGSBOwB7wEHAbwC8QHyAfMB8gHzAfIBvAGS
+        Ae8CBwGSAewBBwkAAbsCtAHUAtUDtAEZA/8B9AEZAbUBtAHVAdQCrQGzAbQBrgHzCQAB9AH/AfQD/wH0
+        Av8B9AFJAnIBUARyAUkB8wsAARMB/wHwAWUBpgKnAccBpwLHAqcBrQHmAbQBtQHWAbUBtAG1CQABvAHs
+        Ae0DkgHvAbwE8QHzAfQB/wHyAfAC8QHwAQcB7QHsAbwJAAGRA7QB1QHbAdUCtAEZAv8C9AH/ARkBuwG0
+        AdUDrQG0AYsBGQkAAfQB7AFyAewEcgHsAe8B8ALzAvQC8wL0Af8LAAETAf8B8AFlAaYCpwHHAacBxwGn
+        AscCpwGtA9UBzwG1CQABvAHvAgcB7wEHAfACvAHwAewBbQHsAe8C9AHzAfIBvAHvAewB6wHsAfAJAAGu
+        AboE2wHVArQBGQH0Bf8BGQHcA9UBrQG0AYsBGQkAARIESQIoAUkBEAHsCAAC9AsAARMB/wHxAWUBpgKn
+        BMcFpwGtAc8B1QHPAbUKAAL3AQcB8QHwAbwC8QHsARQBFQETARIB7wH0AbwB8AG8AfcCbQHsAfAJAAGR
+        AbsC3ALbAdUBtQG0ARkB9AP/AfQBGQEJAbQB1QG0AdsCtAGuAfMJAAFJAZgBlwFyAZcBUAGXAXIB7AH0
+        BwAB9ALvAf8KAAESAf8B8AFlAaYCpwnHAqcBzgHPAbUKAAG8AfcB7QHvAvEB8AHxAe0BFAEVAuoB9wH0
+        AfEB8AG8Ae8BkgHtAewBBwkAAQcBuwLcAtsB1QG1AbQBGQL0Av8BGQG7A7QC2wO0AfMJAAFyAZgFTwFJ
+        AXIB9AP/AQAC/wHwAe0BSQHvCwABEgH/AbwBZQGmAacFxwFCAscByASnAYYBtQoAAbwCkgHvAfMC8gH0
+        AbwBkgFtAesBkgEHAfECvAIHAe8BBwGSCgAB8QG0AdwB2wLcAbsBtQG0ARkC9AIZAbsCtALVAtsB1QGR
+        AbUB9AgAAf8BcgGYAXgBUAJPAS4BJwFJAnIBmAHzAfABBwFyAUkBcgFJAfAB/woAARMB/wHwAWYBpgOn
+        A8cDyAWnAYYBtQoAAQcB7wHxAvMB8QHyAfMB8gHzAbwBBwHwAfECBwHvAe0CkgH3Ae8KAAH0AbQF3AEJ
+        AbQDGQEJA7UB3AHbAdUC2wHcAYsBCQH0CQAB6gEIAZgBlwJPAVABcgFPAUkCJwFJA08CcgFJAfILAAET
+        Af8BvAFmAaYEpwTHAacBxwSnAYYBtQsAAQcBvAHwAQcCvALzAfEB8wHxAbwB8AIHAe0B6wEHAQAB8QsA
+        Af8BuwG1A9wBuwHcAbQCGQHcAQkBtQTVAtsB3AG0AZEB8wH/CQABSQHCApgClwNPBJcCUAFPAZcBTwFy
+        Af8JAAG8AfEBEgHxAbwBZgEEDacBpgGGAbULAAHxAwcB8AHvAvMB8AG8Au8BvAIHAe8BbQHvDgAB8wG0
+        BNwBCQG0AQkB3AG7AbUBuwLcAtUB3AHbAdUBrgEJAfQKAAHsAQgBeAOYApcBcgZPAVABcgFJAbwKAAHt
+        ARIBEQESAe8BZgGmDqcBhgG1EAAB7wG8AvAFBwG8AQcB7AG8DgAB/wG8AbUBCQPcAdYK3AK0AbUB8wH/
+        CgABEgJyAVAEmASXAVABTwGXAVABTwEIAf8LAAHsAQ8BBwHwAWYPZQERAZIQAAEHAbwBBwLvAgAB8AEH
+        Au8BBxAAAfQBCQG0AbUM3AHVArQBGQH0CwABEwEHAfQB8wHvAe0BCAeYAnIB8QH/EAAQhgHsEgAB8AEH
+        AfAFAAHwEwAB9AEJArUCCQTcAwkBuwG1AZEBuwHzAfQMAAHzAf8CAAH0AfAB7AEIBJgCcgGYAfQB/1EA
+        AfQB3QK1BtwBuwO1AQkB8wH0FAAB8gEHAZIB7wHwAfMB/1UAAf8B9AG8AfcBtAK1ArQBtQHvAQcB8QH0
+        Af8ZAAH/WQAB/wL0ARkB3QEJARkB8wL0Af//AIsAAUIBTQE+BwABPgMAASgDAAGAAwABQAMAAQEBAAEB
+        BgABBBYAA/8BAAT/DAAE/wwABP8MAAH/AeABAwH/DAAB/wGAAQAB/wwAAf8CAAF/DAAB/gIAAT8MAAH8
+        AgABHwwAAfgCAAEPDAAB+AIAAQ8MAAHwAgABBwwAAfACAAEHDAAB8AIAAQcMAAHwAgABBwwAAfACAAEH
+        DAAB8AIAAQcMAAHwAgABBwwAAfACAAEHDAAB8AIAAQcMAAHwAgABBwwAAfACAAEHDAAB+AIAAQ8MAAH4
+        AgABDwwAAfwCAAEfDAAB/gIAAT8MAAH/AgABfwwAAf8BgAEAAf8MAAH/AeABAwH/DAAE/wwABP8MAAT/
+        DAAE/wwAQf8B+AEfAv8BnwH8Bv8B4AEDAv8BwAEHAv8CAAF/Af8B/AEfAv8BgAEAAv8BgAEDAT8B/gIA
+        AR8B/wGAAQMC/wIAAX8B/wIAAT8B/AIAAQ8B/wIAAf8B/gIAAT8B/gIAAR8B/AIAAQ8B/wIAAT8B/AIA
+        AR8B/AIAAR8B8AIAAT8B/wIAAR8B+AIAAQ8B/AIAAR8B4AIAAT8B8AIAAR8B+AIAAQ8B/AIAAR8B4AIA
+        AT8B8AIAAR8B8AIAAQcB/AEGAQABPwH4AgABPwHgAgABHwHwAgABBwH8AT8BgAEfAfgCAAE/AeACAAEf
+        AfACAAEHAfwB/wEAAR8B+AIAAT8B4AIAAR8B8AIAAQcB/AIAAT8B+AIAAT8B4AIAAR8B8AIAAQcB/AIA
+        AT8B+AIAAT8B4AIAAR8B8AIAAQcB/AEAAf8BPwH4AgABPwHwAgABHwHwAgABBwH8AQAB/gEfAfgCAAE/
+        AfACAAEfAfACAAEHAfwBAAEQAT8B+AIAAT8B8AIAAT8B8AIAAQcB+AIAAR8B+AIAAT8B8AIAAT8B8AIA
+        AQcB/AIAAT8B+AIAAT8B+AEAAQEBfwHwAgABBwH8AgABPwHgAgABPwH4AQABAQH/AfgCAAEPAfwCAAF/
+        AeACAAE/Af8BwAEBAf8B+AIAAQ8B/AIAAX8B8AIAAT8B/wHBAYMB/wH8AgABHwH8AgAC/wIAAX8B/wHj
+        Ae8B/wH+AgABPwH8AcABAQr/AgABfwH/AfgBDwr/AYABAAP/Ab8K/wHgAQMx/ws=
+</value>
+  </data>
 </root>

+ 3 - 0
MeasureData/MeasureFile.cs

@@ -255,6 +255,9 @@ namespace MeasureData
                     if (pOpenFileDialog.ShowDialog() == DialogResult.OK)
                     {
                         a_FilePathName = System.IO.Path.GetFullPath(pOpenFileDialog.FileName);                             //绝对路径
+                        FilePath = a_FilePathName.Substring(0, a_FilePathName.LastIndexOf('\\')+1);
+                        FileName = pOpenFileDialog.SafeFileName;
+
                     }
                 }