打开文件并设置保存状态

HOZProject/FormHOZMain.Designer.cs

@@ -46,17 +46,17 @@
             this.plLeftContent = new System.Windows.Forms.Panel();
             this.plTop = new System.Windows.Forms.Panel();
             this.pbStop = new System.Windows.Forms.PictureBox();
-            this.pbPause = new System.Windows.Forms.PictureBox();
             this.pbStart = new System.Windows.Forms.PictureBox();
             this.pbMax = new System.Windows.Forms.PictureBox();
             this.pbMin = new System.Windows.Forms.PictureBox();
-            this.pbClose = new System.Windows.Forms.PictureBox();
             this.pbImportTemplateFile = new System.Windows.Forms.PictureBox();
             this.pbLog = new System.Windows.Forms.PictureBox();
             this.pbInit = new System.Windows.Forms.PictureBox();
             this.pbSave = new System.Windows.Forms.PictureBox();
             this.pbOpen = new System.Windows.Forms.PictureBox();
             this.pbNew = new System.Windows.Forms.PictureBox();
+            this.pbClose = new System.Windows.Forms.PictureBox();
+            this.pbPause = new System.Windows.Forms.PictureBox();
             this.plMain.SuspendLayout();
             this.plFill.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -65,17 +65,17 @@
             this.plLeft.SuspendLayout();
             this.plTop.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pbStop)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pbPause)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbStart)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbMax)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbMin)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pbClose)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbImportTemplateFile)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbLog)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbInit)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbSave)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbOpen)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbNew)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbClose)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbPause)).BeginInit();
             this.SuspendLayout();
             // 
             // plMain
@@ -89,7 +89,7 @@
             this.plMain.Controls.Add(this.plTop);
             this.plMain.Location = new System.Drawing.Point(12, 12);
             this.plMain.Name = "plMain";
-            this.plMain.Size = new System.Drawing.Size(1000, 744);
+            this.plMain.Size = new System.Drawing.Size(1000, 716);
             this.plMain.TabIndex = 1;
             // 
             // plFill
@@ -105,7 +105,7 @@
             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.Size = new System.Drawing.Size(894, 630);
             this.plFill.TabIndex = 5;
             // 
             // groupBox1
@@ -177,7 +177,7 @@
             this.listmsg.FormattingEnabled = true;
             this.listmsg.ItemHeight = 12;
             this.listmsg.Location = new System.Drawing.Point(417, 2);
-            this.listmsg.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.listmsg.Margin = new System.Windows.Forms.Padding(2);
             this.listmsg.Name = "listmsg";
             this.listmsg.Size = new System.Drawing.Size(477, 196);
             this.listmsg.TabIndex = 18;
@@ -188,7 +188,7 @@
             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, 602);
+            this.pbImage.Size = new System.Drawing.Size(894, 574);
             this.pbImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
             this.pbImage.TabIndex = 20;
             this.pbImage.TabStop = false;
@@ -199,7 +199,7 @@
             this.plSEM.Controls.Add(this.lblStateMessage);
             this.plSEM.Controls.Add(this.lblFlowContent);
             this.plSEM.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.plSEM.Location = new System.Drawing.Point(0, 602);
+            this.plSEM.Location = new System.Drawing.Point(0, 574);
             this.plSEM.Name = "plSEM";
             this.plSEM.Size = new System.Drawing.Size(894, 56);
             this.plSEM.TabIndex = 19;
@@ -234,7 +234,7 @@
             this.plLeft.Dock = System.Windows.Forms.DockStyle.Left;
             this.plLeft.Location = new System.Drawing.Point(0, 80);
             this.plLeft.Name = "plLeft";
-            this.plLeft.Size = new System.Drawing.Size(100, 664);
+            this.plLeft.Size = new System.Drawing.Size(100, 636);
             this.plLeft.TabIndex = 4;
             // 
             // label1
@@ -257,7 +257,7 @@
             this.plLeftContent.AutoScroll = true;
             this.plLeftContent.Location = new System.Drawing.Point(5, 19);
             this.plLeftContent.Name = "plLeftContent";
-            this.plLeftContent.Size = new System.Drawing.Size(90, 645);
+            this.plLeftContent.Size = new System.Drawing.Size(90, 617);
             this.plLeftContent.TabIndex = 0;
             // 
             // plTop
@@ -296,18 +296,6 @@
             this.pbStop.MouseEnter += new System.EventHandler(this.pbStop_MouseEnter);
             this.pbStop.MouseLeave += new System.EventHandler(this.pbStop_MouseLeave);
             // 
-            // pbPause
-            // 
-            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(521, 4);
-            this.pbPause.Name = "pbPause";
-            this.pbPause.Size = new System.Drawing.Size(68, 71);
-            this.pbPause.TabIndex = 8;
-            this.pbPause.TabStop = false;
-            this.pbPause.Visible = false;
-            // 
             // pbStart
             // 
             this.pbStart.BackgroundImage = global::HOZProject.Properties.Resources.Start;
@@ -352,21 +340,6 @@
             this.pbMin.MouseEnter += new System.EventHandler(this.pbMin_MouseEnter);
             this.pbMin.MouseLeave += new System.EventHandler(this.pbMin_MouseLeave);
             // 
-            // pbClose
-            // 
-            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);
-            this.pbClose.TabIndex = 7;
-            this.pbClose.TabStop = false;
-            this.pbClose.Click += new System.EventHandler(this.pbClose_Click);
-            this.pbClose.MouseEnter += new System.EventHandler(this.pbClose_MouseEnter);
-            this.pbClose.MouseLeave += new System.EventHandler(this.pbClose_MouseLeave);
-            // 
             // pbImportTemplateFile
             // 
             this.pbImportTemplateFile.BackgroundImage = global::HOZProject.Properties.Resources.ImportConfigFile;
@@ -440,12 +413,39 @@
             this.pbNew.Visible = false;
             this.pbNew.Click += new System.EventHandler(this.pbNew_Click);
             // 
+            // pbClose
+            // 
+            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);
+            this.pbClose.TabIndex = 7;
+            this.pbClose.TabStop = false;
+            this.pbClose.Click += new System.EventHandler(this.pbClose_Click);
+            this.pbClose.MouseEnter += new System.EventHandler(this.pbClose_MouseEnter);
+            this.pbClose.MouseLeave += new System.EventHandler(this.pbClose_MouseLeave);
+            // 
+            // pbPause
+            // 
+            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(521, 4);
+            this.pbPause.Name = "pbPause";
+            this.pbPause.Size = new System.Drawing.Size(68, 71);
+            this.pbPause.TabIndex = 8;
+            this.pbPause.TabStop = false;
+            this.pbPause.Visible = false;
+            // 
             // FormHOZMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.WindowFrame;
-            this.ClientSize = new System.Drawing.Size(1024, 768);
+            this.ClientSize = new System.Drawing.Size(1024, 740);
             this.ControlBox = false;
             this.Controls.Add(this.plMain);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
@@ -465,17 +465,17 @@
             this.plLeft.PerformLayout();
             this.plTop.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pbStop)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pbPause)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbStart)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbMax)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbMin)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pbClose)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbImportTemplateFile)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbLog)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbInit)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbSave)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbOpen)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbNew)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbClose)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbPause)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -493,12 +493,10 @@
         private System.Windows.Forms.PictureBox pbInit;
         private System.Windows.Forms.PictureBox pbSave;
         private System.Windows.Forms.PictureBox pbMin;
-        private System.Windows.Forms.PictureBox pbClose;
         private System.Windows.Forms.PictureBox pbMax;
         private System.Windows.Forms.PictureBox pbNew;
         private System.Windows.Forms.PictureBox pbStart;
         private System.Windows.Forms.PictureBox pbStop;
-        private System.Windows.Forms.PictureBox pbPause;
         private System.Windows.Forms.ListBox listmsg;
         private System.Windows.Forms.Panel plSEM;
         private System.Windows.Forms.PictureBox pbImportTemplateFile;
@@ -510,5 +508,7 @@
         public System.Windows.Forms.PictureBox pbImage;
         public System.Windows.Forms.Label lblFlowContent;
         public System.Windows.Forms.Label lblStateMessage;
+        private System.Windows.Forms.PictureBox pbPause;
+        private System.Windows.Forms.PictureBox pbClose;
     }
 }

HOZProject/FormHOZMain.cs

@@ -308,24 +308,32 @@ namespace HOZProject
 
         private void pbClose_Click(object sender, EventArgs e)
         {
-            if (m_Ms != null)
+            try
             {
-                if (!m_Ms.key_stop)
+                if (m_Ms != null)
                 {
-                    if (MessageBox.Show("当前测量正在运行,是否关闭此窗体?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                    if (!m_Ms.key_stop)
                     {
-                        //线程停止变量
-                        m_Ms.key_stop = true;
-                        IsClose = true;
-                        lblStateMessage.Text = "正在关闭窗体...请等待";
-                        pbClose.Enabled = false;
+                        if (MessageBox.Show("当前测量正在运行,是否关闭此窗体?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                        {
+                            //线程停止变量
+                            m_Ms.key_stop = true;
+                            IsClose = true;
+                            lblStateMessage.Text = "正在关闭窗体...请等待";
+                            pbClose.Enabled = false;
+                        }
+                        return;
                     }
-                    return;
+                }
+                if (MessageBox.Show("是否关闭此窗体?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+                {
+                    m_MeasureFile.Save();
+                    this.Close();
                 }
             }
-            if (MessageBox.Show("是否关闭此窗体?", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
+            catch (Exception ex)
             {
-                this.Close();
+                LogManager.LogError(ex.Message);
             }
         }
 
@@ -419,10 +427,9 @@ namespace HOZProject
                     string CutHoleFilePath = m_MeasureFile.CutHoleFilePath;
                     CreateCutHoleList(ListCutHole);
                     //保存测量文件
-                    if (IsSave)
-                    {
-                        m_MeasureFile.Save();
-                    }
+                    m_MeasureFile.Save();
+                    //设置已保存状态
+                    IsSave = true;
                 }
             }
             catch (Exception ex)
@@ -728,6 +735,37 @@ namespace HOZProject
             plLeftContent.Controls.Clear();
             plPrarInfo.Controls.Clear();
         }
+
+        /// <summary>
+        /// 清空日志控件内容
+        /// </summary>
+        private void ClearContrlsContent()
+        {
+            try
+            {
+                if (ucLog != null)
+                {
+                    if (ucLog.dgvLog != null)
+                    {
+                        if (ucLog.dgvLog.Rows.Count > 0)
+                        {
+                            ucLog.dgvLog.Rows.Clear();
+                        }
+                    }
+                }
+                if (listmsg != null)
+                {
+                    if (listmsg.Items.Count > 0)
+                    {
+                        listmsg.Items.Clear();
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                LogManager.LogError(ex.Message);
+            }
+        }
         #endregion
 
         #region 测试修改切孔中流程状态

HOZProject/UnitControl.csproj

@@ -283,10 +283,10 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </Content>
-    <None Include="Resources\CutHole_Yellow.png" />
     <None Include="Resources\CutHole_Red.png" />
     <None Include="Resources\CutHole_Green.png" />
     <None Include="Resources\CutHole_Gray.png" />
+    <None Include="Resources\CutHole_Yellow.png" />
     <None Include="Resources\Start_Green.png" />
     <None Include="Resources\Stop_Red.png" />
   </ItemGroup>

HOZProject/UserControls/UControl_Log.Designer.cs

@@ -36,13 +36,13 @@
             this.panel1 = new System.Windows.Forms.Panel();
             this.pbClose = new System.Windows.Forms.PictureBox();
             this.dgvLog = new System.Windows.Forms.DataGridView();
-            this.panel2 = new System.Windows.Forms.Panel();
-            this.label2 = new System.Windows.Forms.Label();
-            this.lblLogCount = new System.Windows.Forms.Label();
             this.ColCutHoleName = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ColTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ColStep = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ColState = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.label2 = new System.Windows.Forms.Label();
+            this.lblLogCount = new System.Windows.Forms.Label();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pbClose)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvLog)).BeginInit();
@@ -54,10 +54,9 @@
             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(17, 10);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(13, 8);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(76, 17);
+            this.label1.Size = new System.Drawing.Size(63, 14);
             this.label1.TabIndex = 0;
             this.label1.Text = "查看日志";
             // 
@@ -68,9 +67,8 @@
             this.panel1.Controls.Add(this.label1);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(957, 38);
+            this.panel1.Size = new System.Drawing.Size(718, 30);
             this.panel1.TabIndex = 3;
             // 
             // pbClose
@@ -80,10 +78,9 @@
             this.pbClose.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbClose.Cursor = System.Windows.Forms.Cursors.Hand;
             this.pbClose.Dock = System.Windows.Forms.DockStyle.Right;
-            this.pbClose.Location = new System.Drawing.Point(914, 0);
-            this.pbClose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.pbClose.Location = new System.Drawing.Point(686, 0);
             this.pbClose.Name = "pbClose";
-            this.pbClose.Size = new System.Drawing.Size(43, 38);
+            this.pbClose.Size = new System.Drawing.Size(32, 30);
             this.pbClose.TabIndex = 107;
             this.pbClose.TabStop = false;
             this.pbClose.Click += new System.EventHandler(this.btnClose_Click);
@@ -120,8 +117,7 @@
             this.dgvLog.DefaultCellStyle = dataGridViewCellStyle2;
             this.dgvLog.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dgvLog.EnableHeadersVisualStyles = false;
-            this.dgvLog.Location = new System.Drawing.Point(0, 38);
-            this.dgvLog.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.dgvLog.Location = new System.Drawing.Point(0, 30);
             this.dgvLog.MultiSelect = false;
             this.dgvLog.Name = "dgvLog";
             this.dgvLog.ReadOnly = true;
@@ -144,48 +140,11 @@
             this.dgvLog.ShowCellToolTips = false;
             this.dgvLog.ShowEditingIcon = false;
             this.dgvLog.ShowRowErrors = false;
-            this.dgvLog.Size = new System.Drawing.Size(957, 460);
+            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, 470);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(957, 28);
-            this.panel2.TabIndex = 5;
-            // 
-            // 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(11, 5);
-            this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(59, 17);
-            this.label2.TabIndex = 1;
-            this.label2.Text = "共计：";
-            // 
-            // 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(76, 5);
-            this.lblLogCount.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
-            this.lblLogCount.Name = "lblLogCount";
-            this.lblLogCount.Size = new System.Drawing.Size(34, 17);
-            this.lblLogCount.TabIndex = 0;
-            this.lblLogCount.Text = "0条";
-            // 
             // ColCutHoleName
             // 
             this.ColCutHoleName.DataPropertyName = "HoleName";
@@ -224,18 +183,51 @@
             this.ColState.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
             this.ColState.Width = 180;
             // 
+            // 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;
+            // 
+            // 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 = "共计：";
+            // 
+            // 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(57, 4);
+            this.lblLogCount.Name = "lblLogCount";
+            this.lblLogCount.Size = new System.Drawing.Size(28, 14);
+            this.lblLogCount.TabIndex = 0;
+            this.lblLogCount.Text = "0条";
+            // 
             // UControl_Log
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+            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.dgvLog);
             this.Controls.Add(this.panel1);
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "UControl_Log";
-            this.Size = new System.Drawing.Size(957, 498);
+            this.Size = new System.Drawing.Size(718, 398);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pbClose)).EndInit();
@@ -252,11 +244,11 @@
         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.PictureBox pbClose;
         private System.Windows.Forms.DataGridViewTextBoxColumn ColCutHoleName;
         private System.Windows.Forms.DataGridViewTextBoxColumn ColTime;
         private System.Windows.Forms.DataGridViewTextBoxColumn ColStep;
         private System.Windows.Forms.DataGridViewTextBoxColumn ColState;
+        public System.Windows.Forms.DataGridView dgvLog;
     }
 }

HOZProject/UserControls/UControl_ParaInfo.Designer.cs

@@ -331,9 +331,9 @@
             this.plMeasureFlow.Controls.Add(this.panel3);
             this.plMeasureFlow.Controls.Add(this.panel4);
             this.plMeasureFlow.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.plMeasureFlow.Location = new System.Drawing.Point(0, 183);
+            this.plMeasureFlow.Location = new System.Drawing.Point(0, 180);
             this.plMeasureFlow.Name = "plMeasureFlow";
-            this.plMeasureFlow.Size = new System.Drawing.Size(345, 459);
+            this.plMeasureFlow.Size = new System.Drawing.Size(345, 370);
             this.plMeasureFlow.TabIndex = 15;
             // 
             // plTimeLine
@@ -341,7 +341,7 @@
             this.plTimeLine.Dock = System.Windows.Forms.DockStyle.Fill;
             this.plTimeLine.Location = new System.Drawing.Point(0, 30);
             this.plTimeLine.Name = "plTimeLine";
-            this.plTimeLine.Size = new System.Drawing.Size(345, 383);
+            this.plTimeLine.Size = new System.Drawing.Size(345, 294);
             this.plTimeLine.TabIndex = 8;
             // 
             // lvMeasureFlow
@@ -386,7 +386,7 @@
             this.panel3.Controls.Add(this.label1);
             this.panel3.Controls.Add(this.pbMeasure);
             this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel3.Location = new System.Drawing.Point(0, 413);
+            this.panel3.Location = new System.Drawing.Point(0, 324);
             this.panel3.Name = "panel3";
             this.panel3.Size = new System.Drawing.Size(345, 46);
             this.panel3.TabIndex = 5;
@@ -470,7 +470,7 @@
             this.Controls.Add(this.lblStartTime);
             this.Controls.Add(this.lblLocation);
             this.Name = "UControl_ParaInfo";
-            this.Size = new System.Drawing.Size(345, 642);
+            this.Size = new System.Drawing.Size(345, 550);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pbClose)).EndInit();

HOZProject/UserControls/UControl_ParaInfo.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAS
-        GAAAAk1TRnQBSQFMAgEBBQEAAWABAAFgAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        GAAAAk1TRnQBSQFMAgEBBQEAAWgBAAFoAQABIAEAASABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABgAMAAUADAAEBAQABCAYAASAYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA