增加及整理导出原图融合图和导出原图拼接图功能 初

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -59,7 +59,8 @@ namespace OTSIncAReportGraph.Controls
     {
         pic=0,
         Render_pic=1,
-            noBackground_pic=2
+        Combin,
+        Render_Combin
     }
 
     public partial class Control_DrawDistrbutionImageAndBSE : UserControl
@@ -2239,7 +2240,7 @@ namespace OTSIncAReportGraph.Controls
                 outpic.m_list_allDfield = m_list_allDfield;
                 outpic.resultFile = resultFile;
                 outpic.sfd = sfd;
-                outpic.type = (int)Outpic_enum.noBackground_pic;
+                outpic.type = (int)Outpic_enum.Combin;
                 outpic.m_ReportApp = m_ReportApp;
                 Thread bThread = new Thread(new ThreadStart(outpic.opencv_outpic));
 
@@ -2265,5 +2266,62 @@ namespace OTSIncAReportGraph.Controls
         {
             Particle_Segmentation();
         }
+
+        private void toolStripMenuItem_combinClass_Click(object sender, EventArgs e)
+        {
+            SaveFileDialog sfd = new SaveFileDialog();
+            //|ALL Files(*.*)|*.*
+            //BMP Files(*.bmp)| *.bmp |
+            sfd.Filter = "png Files(*.png)| *.png |BMP Files(*.bmp)| *.bmp |JPG Files(*.jpg)|*.jpg;*.jpeg";
+            if (sfd.ShowDialog() == DialogResult.OK)
+            {
+                OutPIC outpic = new OutPIC();
+                outpic.m_list_allDfield = m_list_allDfield;
+                outpic.resultFile = resultFile;
+                outpic.sfd = sfd;
+                outpic.type = (int)Outpic_enum.Render_Combin;
+                Thread bThread = new Thread(new ThreadStart(outpic.opencv_outpic));
+                bThread.IsBackground = true;
+                bThread.Start();
+            }
+        }
+
+        private void toolStripMenuItem_combin_Click(object sender, EventArgs e)
+        {
+            SaveFileDialog sfd = new SaveFileDialog();
+            //|ALL Files(*.*)|*.*
+            //BMP Files(*.bmp)| *.bmp |
+            sfd.Filter = "png Files(*.png)| *.png |BMP Files(*.bmp)| *.bmp |JPG Files(*.jpg)|*.jpg;*.jpeg";
+            if (sfd.ShowDialog() == DialogResult.OK)
+            {
+                OutPIC outpic = new OutPIC();
+                outpic.m_list_allDfield = m_list_allDfield;
+                outpic.resultFile = resultFile;
+                outpic.sfd = sfd;
+                outpic.type = (int)Outpic_enum.Combin;
+                Thread bThread = new Thread(new ThreadStart(outpic.opencv_outpic));
+                bThread.IsBackground = true;
+                bThread.Start();
+            }
+        }
+
+        private void toolStripMenuItem_combinClass_Click_1(object sender, EventArgs e)
+        {
+            SaveFileDialog sfd = new SaveFileDialog();
+            //|ALL Files(*.*)|*.*
+            //BMP Files(*.bmp)| *.bmp |
+            sfd.Filter = "png Files(*.png)| *.png |BMP Files(*.bmp)| *.bmp |JPG Files(*.jpg)|*.jpg;*.jpeg";
+            if (sfd.ShowDialog() == DialogResult.OK)
+            {
+                OutPIC outpic = new OutPIC();
+                outpic.m_list_allDfield = m_list_allDfield;
+                outpic.resultFile = resultFile;
+                outpic.sfd = sfd;
+                outpic.type = (int)Outpic_enum.Render_Combin;
+                Thread bThread = new Thread(new ThreadStart(outpic.opencv_outpic));
+                bThread.IsBackground = true;
+                bThread.Start();
+            }
+        }
     }
 }

OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.designer.cs

@@ -43,10 +43,12 @@
             this.aSTMToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.显示所有帧ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.清除ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem_combinClass = new System.Windows.Forms.ToolStripMenuItem();
             this.contextMenuStrip_Particle = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.ToolStripMenuItem_movesempoint = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem_DeleteParticles = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripMenuItem_Segmentation = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripMenuItem_combin = new System.Windows.Forms.ToolStripMenuItem();
             this.CMenuStrip.SuspendLayout();
             this.contextMenuStrip_Particle.SuspendLayout();
             this.SuspendLayout();
@@ -58,9 +60,11 @@
             this.ToolStripMenuItem_ParticleSplicing,
             this.toolStripMenuItem_copyimage,
             this.ExportoriginalspliceToolStripMenuItem,
-            this.显示国标信息ToolStripMenuItem});
+            this.显示国标信息ToolStripMenuItem,
+            this.toolStripMenuItem_combin,
+            this.toolStripMenuItem_combinClass});
             this.CMenuStrip.Name = "contextMenuStrip1";
-            this.CMenuStrip.Size = new System.Drawing.Size(185, 114);
+            this.CMenuStrip.Size = new System.Drawing.Size(185, 158);
             // 
             // ToolStripMenuItem_ParticleSplicing
             // 
@@ -100,7 +104,7 @@
             this.toolStripMenuItem1,
             this.查询DS类颗粒ToolStripMenuItem});
             this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-            this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 22);
+            this.toolStripMenuItem2.Size = new System.Drawing.Size(112, 22);
             this.toolStripMenuItem2.Text = "方法一";
             // 
             // toolStripMenuItem1
@@ -125,7 +129,7 @@
             this.toolStripMenuItem4,
             this.toolStripMenuItem10});
             this.toolStripMenuItem3.Name = "toolStripMenuItem3";
-            this.toolStripMenuItem3.Size = new System.Drawing.Size(180, 22);
+            this.toolStripMenuItem3.Size = new System.Drawing.Size(112, 22);
             this.toolStripMenuItem3.Text = "方法二";
             // 
             // toolStripMenuItem4
@@ -149,7 +153,7 @@
             this.aSTMToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.显示所有帧ToolStripMenuItem});
             this.aSTMToolStripMenuItem.Name = "aSTMToolStripMenuItem";
-            this.aSTMToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.aSTMToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
             this.aSTMToolStripMenuItem.Tag = "";
             this.aSTMToolStripMenuItem.Text = "ASTM";
             // 
@@ -164,10 +168,17 @@
             // 清除ToolStripMenuItem
             // 
             this.清除ToolStripMenuItem.Name = "清除ToolStripMenuItem";
-            this.清除ToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
+            this.清除ToolStripMenuItem.Size = new System.Drawing.Size(112, 22);
             this.清除ToolStripMenuItem.Text = "清除";
             this.清除ToolStripMenuItem.Click += new System.EventHandler(this.清除ToolStripMenuItem_Click);
             // 
+            // toolStripMenuItem_combinClass
+            // 
+            this.toolStripMenuItem_combinClass.Name = "toolStripMenuItem_combinClass";
+            this.toolStripMenuItem_combinClass.Size = new System.Drawing.Size(184, 22);
+            this.toolStripMenuItem_combinClass.Text = "导出原图融合分类图";
+            this.toolStripMenuItem_combinClass.Click += new System.EventHandler(this.toolStripMenuItem_combinClass_Click_1);
+            // 
             // contextMenuStrip_Particle
             // 
             this.contextMenuStrip_Particle.ImageScalingSize = new System.Drawing.Size(24, 24);
@@ -199,6 +210,13 @@
             this.toolStripMenuItem_Segmentation.Text = "分割颗粒";
             this.toolStripMenuItem_Segmentation.Click += new System.EventHandler(this.toolStripMenuItem_Segmentation_Click);
             // 
+            // toolStripMenuItem_combin
+            // 
+            this.toolStripMenuItem_combin.Name = "toolStripMenuItem_combin";
+            this.toolStripMenuItem_combin.Size = new System.Drawing.Size(184, 22);
+            this.toolStripMenuItem_combin.Text = "导出原图融合图";
+            this.toolStripMenuItem_combin.Click += new System.EventHandler(this.toolStripMenuItem_combin_Click);
+            // 
             // Control_DrawDistrbutionImageAndBSE
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -234,5 +252,7 @@
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_DeleteParticles;
         private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_Segmentation;
         protected System.Windows.Forms.ContextMenuStrip CMenuStrip;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_combinClass;
+        private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem_combin;
     }
 }