Merge branch 'cxs_release2.31' into release2.31

OTSIncAReportApp/1-UI/Control_Grids/SpectrumExportConfirmation.Designer.cs

@@ -0,0 +1,106 @@
+
+namespace OTSIncAReportApp._1_UI.Control_Grids
+{
+    partial class SpectrumExportConfirmation
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.tBox1 = new System.Windows.Forms.TextBox();
+            this.bt_Path = new System.Windows.Forms.Button();
+            this.cB_SpectrumConfirmation = new System.Windows.Forms.CheckBox();
+            this.bt_Export = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // tBox1
+            // 
+            this.tBox1.Location = new System.Drawing.Point(12, 23);
+            this.tBox1.Name = "tBox1";
+            this.tBox1.ReadOnly = true;
+            this.tBox1.Size = new System.Drawing.Size(568, 28);
+            this.tBox1.TabIndex = 0;
+            // 
+            // bt_Path
+            // 
+            this.bt_Path.Location = new System.Drawing.Point(607, 16);
+            this.bt_Path.MaximumSize = new System.Drawing.Size(188, 38);
+            this.bt_Path.MinimumSize = new System.Drawing.Size(188, 38);
+            this.bt_Path.Name = "bt_Path";
+            this.bt_Path.Size = new System.Drawing.Size(188, 38);
+            this.bt_Path.TabIndex = 1;
+            this.bt_Path.Text = "选择导出Ececl路径";
+            this.bt_Path.UseVisualStyleBackColor = true;
+            this.bt_Path.Click += new System.EventHandler(this.bt_Path_Click);
+            // 
+            // cB_SpectrumConfirmation
+            // 
+            this.cB_SpectrumConfirmation.AutoSize = true;
+            this.cB_SpectrumConfirmation.Location = new System.Drawing.Point(368, 89);
+            this.cB_SpectrumConfirmation.Name = "cB_SpectrumConfirmation";
+            this.cB_SpectrumConfirmation.Size = new System.Drawing.Size(196, 22);
+            this.cB_SpectrumConfirmation.TabIndex = 2;
+            this.cB_SpectrumConfirmation.Text = "附带颗粒能谱谱峰图";
+            this.cB_SpectrumConfirmation.UseVisualStyleBackColor = true;
+            this.cB_SpectrumConfirmation.CheckedChanged += new System.EventHandler(this.cB_SpectrumConfirmation_CheckedChanged);
+            // 
+            // bt_Export
+            // 
+            this.bt_Export.Location = new System.Drawing.Point(607, 86);
+            this.bt_Export.Name = "bt_Export";
+            this.bt_Export.Size = new System.Drawing.Size(188, 37);
+            this.bt_Export.TabIndex = 3;
+            this.bt_Export.Text = "导出Ececl";
+            this.bt_Export.UseVisualStyleBackColor = true;
+            this.bt_Export.Click += new System.EventHandler(this.bt_Export_Click);
+            // 
+            // SpectrumExportConfirmation
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(807, 140);
+            this.Controls.Add(this.bt_Export);
+            this.Controls.Add(this.cB_SpectrumConfirmation);
+            this.Controls.Add(this.bt_Path);
+            this.Controls.Add(this.tBox1);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "SpectrumExportConfirmation";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "SpectrumExportConfirmation";
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox tBox1;
+        private System.Windows.Forms.Button bt_Path;
+        private System.Windows.Forms.CheckBox cB_SpectrumConfirmation;
+        private System.Windows.Forms.Button bt_Export;
+    }
+}

OTSIncAReportApp/1-UI/Control_Grids/SpectrumExportConfirmation.cs

@@ -0,0 +1,89 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace OTSIncAReportApp._1_UI.Control_Grids
+{
+    public partial class SpectrumExportConfirmation : Form
+    {
+        bool m_SpectrumConfirmation = false;
+        string m_savepath = "";
+        public bool SpectrumConfirmation
+        {
+            get
+            {
+                return m_SpectrumConfirmation;
+            }
+            set
+            {
+                m_SpectrumConfirmation = value;
+            }
+        }
+
+        public string FileName
+        {
+            get
+            {
+                return m_savepath;
+            }
+            set
+            {
+                m_savepath = value;
+            }
+        }
+
+        public SpectrumExportConfirmation()
+        {
+            InitializeComponent();
+        }
+
+        private void bt_Path_Click(object sender, EventArgs e)
+        {
+            //将所有的数据导出到EXCEL中
+            SaveFileDialog sfd = new SaveFileDialog();
+            sfd.Filter = "Excel File（*.xlsx）|*.xlsx";
+            //设置默认文件类型显示顺序
+            sfd.FilterIndex = 1;
+
+            //保存对话框是否记忆上次打开的目录
+            sfd.RestoreDirectory = true;
+            if (sfd.ShowDialog() == DialogResult.OK)
+            {
+                tBox1.Text = sfd.FileName;
+            }
+        }
+
+        private void cB_SpectrumConfirmation_CheckedChanged(object sender, EventArgs e)
+        {
+            if(cB_SpectrumConfirmation.Checked)
+            {
+                m_SpectrumConfirmation = true;
+            }
+            else
+            {
+                m_SpectrumConfirmation = false;
+            }
+        }
+
+        private void bt_Export_Click(object sender, EventArgs e)
+        {
+            if(tBox1.Text == "")
+            {
+                MessageBox.Show("save path can not be null!");
+            }
+            else
+            {
+                m_savepath = tBox1.Text;
+                this.DialogResult = DialogResult.OK;
+                this.Close();
+            }
+            
+        }
+    }
+}

OTSIncAReportApp/1-UI/Control_Grids/SpectrumExportConfirmation.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>