Merge branch 'EDS' of http://192.168.1.123:10080/SDD1/HOZ into EDS

HOZProject/FormHOZMain.Designer.cs

@@ -38,7 +38,6 @@
             this.textBox2 = new System.Windows.Forms.TextBox();
             this.plPrarInfo = new System.Windows.Forms.Panel();
             this.listmsg = new System.Windows.Forms.ListBox();
-            this.pbImage = new System.Windows.Forms.PictureBox();
             this.plSEM = new System.Windows.Forms.Panel();
             this.lblStateMessage = new System.Windows.Forms.Label();
             this.lblFlowContent = new System.Windows.Forms.Label();
@@ -46,6 +45,7 @@
             this.label1 = new System.Windows.Forms.Label();
             this.plLeftContent = new System.Windows.Forms.Panel();
             this.plTop = new System.Windows.Forms.Panel();
+            this.pbImage = 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();
@@ -61,10 +61,10 @@
             this.plMain.SuspendLayout();
             this.plFill.SuspendLayout();
             this.groupBox1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pbImage)).BeginInit();
             this.plSEM.SuspendLayout();
             this.plLeft.SuspendLayout();
             this.plTop.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pbImage)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbPause)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbStart)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbMax)).BeginInit();
@@ -186,18 +186,7 @@
             this.listmsg.TabIndex = 18;
             this.listmsg.Visible = false;
             // 
-            // pbImage
-            // 
-            this.pbImage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
-            this.pbImage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            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, 573);
-            this.pbImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
-            this.pbImage.TabIndex = 20;
-            this.pbImage.TabStop = false;
-            // 
+        
             // plSEM
             // 
             this.plSEM.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
@@ -292,17 +281,30 @@
             this.plTop.Size = new System.Drawing.Size(1051, 80);
             this.plTop.TabIndex = 3;
             // 
+            // pbImage
+            // 
+            this.pbImage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240)))));
+            this.pbImage.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            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, 573);
+            this.pbImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.CenterImage;
+            this.pbImage.TabIndex = 20;
+            this.pbImage.TabStop = false;
+            // 
             // pbPause
             // 
-            this.pbPause.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pbPause.BackgroundImage")));
+            this.pbPause.BackgroundImage = global::HOZProject.Properties.Resources.Report;
             this.pbPause.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbPause.Cursor = System.Windows.Forms.Cursors.Hand;
             this.pbPause.Location = new System.Drawing.Point(475, 5);
+            this.pbPause.Location = new System.Drawing.Point(445, 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;
+            this.pbPause.Click += new System.EventHandler(this.pbPause_Click);
             // 
             // pbStart
             // 
@@ -413,6 +415,7 @@
             this.pbOpen.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
             this.pbOpen.Cursor = System.Windows.Forms.Cursors.Hand;
             this.pbOpen.Location = new System.Drawing.Point(5, 2);
+            this.pbOpen.Location = new System.Drawing.Point(5, 4);
             this.pbOpen.Name = "pbOpen";
             this.pbOpen.Size = new System.Drawing.Size(68, 71);
             this.pbOpen.TabIndex = 3;
@@ -484,12 +487,12 @@
             this.plFill.ResumeLayout(false);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pbImage)).EndInit();
             this.plSEM.ResumeLayout(false);
             this.plSEM.PerformLayout();
             this.plLeft.ResumeLayout(false);
             this.plLeft.PerformLayout();
             this.plTop.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pbImage)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbPause)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbStart)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbMax)).EndInit();

HOZProject/FormHOZMain.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Configuration;
 using System.Data;
+using System.Diagnostics;
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.IO;
@@ -558,33 +559,7 @@ namespace HOZProject
         private void pbSave_Click(object sender, EventArgs e)
         {
             Saveclick();
-            //if (m_MeasureFile == null)
-            //{
-            //    MessageBox.Show("请新建一个测量文件!", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
-            //}
-            //else
-            //{
-            //    //保存测量文件
-            //    if (m_MeasureFile.SaveAs())
-            //    {
-            //        //获取测量文件所在路径
-            //        string savePath = m_MeasureFile.FilePath;
-            //        //数据库名称
-            //        string dbFileName = "MeasureFile.db";
-            //        //要复制的文件路径
-            //        string pLocalFilePath = Application.StartupPath +"\\"+dbFileName;
-            //        string pSaveFilePath = savePath + "\\" + dbFileName;//指定存储的路径
-            //        if (File.Exists(pLocalFilePath))//必须判断要复制的文件是否存在
-            //        {
-            //            //三个参数分别是源文件路径，存储路径，若存储路径有相同文件是否替换
-            //            File.Copy(pLocalFilePath, pSaveFilePath, true);
-            //        }
-            //        //将初始化中的参数，配置到测量参数中
-            //        m_MeasureFile.MParam = uControl_Init.GetMeasureParamInfo();
-            //        //设置已保存状态
-            //        IsSave = true;
-            //    }
-            //}
+           
         }
         public void Saveclick()
         {
@@ -812,7 +787,7 @@ namespace HOZProject
                         switch (States)
                         {
                             //运行中
-                            case (int)ThreadState.InProcess:
+                            case (int)MeasureThread.ThreadState.InProcess:
                                 //btnCutHole.BackColor = Color.Yellow;
                                 btnCutHole.BackgroundImage = Properties.Resources.CutHole_Yellow_2_;
                                 btnCutHole.BackgroundImageLayout = ImageLayout.Center;
@@ -820,21 +795,21 @@ namespace HOZProject
                                 ControlFlicker = true;
                                 break;
                             //等待
-                            case (int)ThreadState.Waiting:
+                            case (int)MeasureThread.ThreadState.Waiting:
                                 //btnCutHole.BackColor = Color.Yellow;
                                 btnCutHole.BackgroundImage = Properties.Resources.CutHole_Yellow_2_;
                                 btnCutHole.BackgroundImageLayout = ImageLayout.Center;
                                 ChangeCutHoleMeasureState(CutHoleName, States);
                                 break;
                             //准备
-                            case (int)ThreadState.Ready:
+                            case (int)MeasureThread.ThreadState.Ready:
                                 //btnCutHole.BackColor = Color.White;
                                 btnCutHole.BackgroundImage = Properties.Resources.CutHole_Gray_2_;
                                 btnCutHole.BackgroundImageLayout = ImageLayout.Center;
                                 ChangeCutHoleMeasureState(CutHoleName, States);
                                 break;
                             //失败
-                            case (int)ThreadState.Failed:
+                            case (int)MeasureThread.ThreadState.Failed:
                                 //btnCutHole.BackColor = Color.Red;
                                 btnCutHole.BackgroundImage = Properties.Resources.CutHole_Red_2_;
                                 btnCutHole.BackgroundImageLayout = ImageLayout.Center;
@@ -842,7 +817,7 @@ namespace HOZProject
                                 ControlFlicker = false;
                                 break;
                             //完成
-                            case (int)ThreadState.Success:
+                            case (int)MeasureThread.ThreadState.Success:
                                 //btnCutHole.BackColor = Color.GreenYellow;
                                 btnCutHole.BackgroundImage = Properties.Resources.CutHole_Green_2_;
                                 btnCutHole.BackgroundImageLayout = ImageLayout.Center;
@@ -886,27 +861,27 @@ namespace HOZProject
                             switch (States)
                             {
                                 //准备
-                                case (int)ThreadState.Ready:
+                                case (int)MeasureThread.ThreadState.Ready:
                                     //修改切孔状态
                                     uControl_ParaInfo.lblShowState.Text = "准备";
                                     break;
                                 //等待
-                                case (int)ThreadState.Waiting:
+                                case (int)MeasureThread.ThreadState.Waiting:
                                     //修改切孔状态
                                     uControl_ParaInfo.lblShowState.Text = "等待";
                                     break;
                                 //进行中
-                                case (int)ThreadState.InProcess:
+                                case (int)MeasureThread.ThreadState.InProcess:
                                     //修改切孔状态
                                     uControl_ParaInfo.lblShowState.Text = "进行中";
                                     break;
                                 //完成
-                                case (int)ThreadState.Success:
+                                case (int)MeasureThread.ThreadState.Success:
                                     //修改切孔状态
                                     uControl_ParaInfo.lblShowState.Text = "完成";
                                     break;
                                 //失败
-                                case (int)ThreadState.Failed:
+                                case (int)MeasureThread.ThreadState.Failed:
                                     uControl_ParaInfo.lblShowState.Text = "失败";
                                     uControl_ParaInfo.pbMeasure.Value = 100;
                                     uControl_ParaInfo.lblCompletedAmount.Text = "100%";
@@ -1217,5 +1192,26 @@ namespace HOZProject
             }
            
         }
+
+        private void pbPause_Click(object sender, EventArgs e)
+        {
+            if (File.Exists(m_MeasureFile.m_SavePath))
+            {
+                string position = System.Environment.CurrentDirectory;
+                //Process pro = Process.Start(@"D:\HOZ\an_hoz\HOZ\bin\Debug\Report\ExportReport.exe", @"D:\HOZ\18\j.msf");//打开程序B
+                Process pro = Process.Start(position + "\\Report\\ExportReport.exe", m_MeasureFile.m_SavePath);//打开程序B
+                pro.WaitForExit();
+                int Result = pro.ExitCode;//程序B退出回传值
+                if (Result == 1)//接收到程序B退出代码"1"
+                {
+                    MessageBox.Show("退出程序B");
+                }
+            }
+            else
+            {
+                MessageBox.Show("尚未保存文件");
+            }
+
+        }
     }
 }

HOZProject/FormHOZMain.resx

@@ -118,85 +118,6 @@
     <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="pbPause.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-</value>
-  </data>
   <data name="pbStart.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAAD4AAAA+CAYAAABzwahEAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH

HOZProject/Properties/Resources.Designer.cs

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

HOZProject/Properties/Resources.resx

@@ -286,4 +286,50 @@
   <data name="StopMove" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\StopMove.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="Report" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        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
+</value>
+  </data>
 </root>

HOZProject/UnitControl.csproj

@@ -312,6 +312,7 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <SubType>Designer</SubType>
     </Content>
+    <None Include="Resources\Report.png" />
     <None Include="Resources\save_3_.png" />
     <None Include="Resources\Pause_3_.png" />
     <None Include="Resources\open_3_.png" />

MeasureData/MeasureFile.cs

@@ -19,7 +19,7 @@ namespace MeasureData
     public class MeasureFile : ISlo
     {
         public const string UNTITLED_FILE_NAME = "Untitled";
-
+        public string m_SavePath = "";
         #region 内容
         //文件名
         private string m_fileName;
@@ -258,6 +258,7 @@ namespace MeasureData
             {
 
                 this.FileName = sfd.FileName.ToString(); //获得文件路径
+                m_SavePath = Convert.ToString(this.FileName);
                 FilePath = System.IO.Path.GetDirectoryName(this.FileName);
 
                 //创建一个新的文件