Przeglądaj źródła

1.删除中英文配置文件
2.删除元素成分表
3.修改FERET数据缺失bug

CXS 3 lat temu
rodzic
commit
8b33c89708

+ 0 - 63
Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -5,18 +5,9 @@
     <Name>OTSSystemManagerForms</Name>
     <Controls>
       <Control name="tabHardwareSet" text="HardwareSet" />
-      <Control name="tabLicenseSet" text="LicenseSet" />
       <Control name="tabLanguage" text="LanguageSet" />
       <Control name="rdb_ch" text="Chinese[ZH]" />
       <Control name="rdb_en" text="English[EN]" />
-      <Control name="btnRemove" text="Remove" />
-      <Control name="btnRequest" text="Request" />
-      <Control name="btnUpdate" text="Activate" />
-      <Control name="lblExpireDate" text="ExpireDate" />
-      <Control name="lblOTSProduct" text="OTSProduct" />
-      <Control name="lblLHardwareID" text="HardwareID" />
-      <Control name="lblPassType" text="LicenseType" />
-      <Control name="lblLComupterName" text="ComupterName" />
       <Control name="btnEDSTest" text="EDSTest" />
       <Control name="btnSEMTest" text="SEMTest" />
       <Control name="lblHEDSController" text="EDSController" />
@@ -24,17 +15,6 @@
       <Control name="label1" text="BrukerVersion" />
 	  <Control name="lblLanguage" text="Language" />
 	  <Control name="str1" text="Please select the type of electron microscope you want to set up!" />
-	   <Control name="message1" text="Checking the pass is illegal," />
-	  <Control name="message2" text="No documents" />
-	  <Control name="message3" text="Invalid document" />
-	  <Control name="message4" text="Computer name blank" />
-	  <Control name="message5" text="Hardware ID mismatch" />
-	  <Control name="message6" text="Software version mismatch" />
-	  <Control name="message7" text="Expired" />
-	  <Control name="message8" text="Expire soon" />
-	  <Control name="message9" text="Please register your pass first!" />
-	  <Control name="message10" text="Tip: The current registration information has expired!" />
-	  <Control name="message11" text="Whether to delete the pass information!" />
     </Controls>
   </Form>
   <Form>
@@ -435,33 +415,6 @@
 	  <Control name="RictBox45" text="Tips" />
     </Controls>
  </Form>
-<Form>
-    <Name>OTSReport_TemplateDesigner</Name>
-    <Controls>
-      <Control name="lb_bbmc" text="ReportName" />
-	  <Control name="lb_rq" text="Date" />
-	  <Control name="lb_gsm" text="CompanyName" />
-	  <Control name="lb_ym" text="PageNumber" />
-	  <Control name="label1" text="Header" />
-	  <Control name="label2" text="Footer " />
-	  <Control name="label3" text="Content" />
-	  <Control name="label8" text="Drag" />
-	  <Control name="label9" text="SelectionModule" />
-	  <Control name="tabPage1" text="Header" />
-	  <Control name="tb_bgmc" text="ReportName" />
-	  <Control name="label13" text="ReportName" />
-	  <Control name="label12" text="SelectIcon" />
-	  <Control name="tabPage2" text="Footer" />
-	  <Control name="tb_gsm" text="CompanyName" />
-	  <Control name="label17" text="CompanyName" />
-	  <Control name="label11" text="SetUp>>" />
-	  <Control name="groupBox1" text="OperationRecord" />
-	  <Control name="lb_sm" text="Description:    (1) Check the measurement results at the data source.    (2) Hold the module and drag it into the report.   (3) Go to the right to set up the report. " />
-	  <Control name="btn_save" text="Save" />
-	  <Control name="btn_esc" text="Cancel" />
-	  <Control name="OTSReport_TemplateDesigner" text="TemplateDesign" />
-    </Controls>
- </Form>
  <Form>
     <Name>OTSReport_TemplateDesignerRM</Name>
     <Controls>
@@ -776,18 +729,6 @@
 	  <Control name="str23" text="nitrides" />
 	  <Control name="str24" text="sulfide" />
     </Controls>
- </Form>
-  <Form>
-    <Name>ElementContentGrid</Name>
-    <Controls>
-      <Control name="ToolStripMenuItem1" text="Copy the entire table" />
-	  <Control name="ToolStripMenuItem2" text="Replication Selection Area" />
-	  <Control name="ToolStripMenuItem3" text="Duplicate image" />
-	  <Control name="str1" text="No" />
-	  <Control name="str8" text="Name" />
-	  <Control name="str9" text="Content%" />
-	  <Control name="str10" text="ContainsSmall" />
-    </Controls>
  </Form>
  <Form>
     <Name>ParticlesSizeGrid</Name>
@@ -861,7 +802,6 @@
 	  <Control name="sscaptionname25" text="Results Overview" />
 	  <Control name="sscaptionname26" text="Sample Information" />
 	  <Control name="sscaptionname27" text="Particle Composition" />
-	  <Control name="sscaptionname28" text="Element Composition" />
 	  <Control name="sscaptionname29" text="Size Distribution" />
 	  <Control name="sscaptionname30" text="Average Composition" />
           <Control name="m_reportname1" text="Classification of Common Inclusions" />
@@ -870,9 +810,6 @@
 	  <Control name="m_reportname2" text="ParticleComposition" />
 	  <Control name="m_str_axisy2" text="ParticleNumber" />
 	  <Control name="str_operatonmodule2" text="ParticleCompositionMap" />
-	  <Control name="m_reportname3" text="ElementComposition" />
-	  <Control name="m_str_axisy3" text="ElementContent" />
-	  <Control name="str_operatonmodule3" text="Elemental Component Map" />
 	  <Control name="m_reportname4" text="Particle Distribution" />
 	  <Control name="m_str_axisy4" text="ParticleNumber" />
 	  <Control name="str_operatonmodule4" text="Particle Size Distribution Map" />

+ 0 - 63
Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -5,18 +5,9 @@
     <Name>OTSSystemManagerForms</Name>
     <Controls>
       <Control name="tabHardwareSet" text="硬件" />
-      <Control name="tabLicenseSet" text="通行证" />
       <Control name="tabLanguage" text="语言" />
       <Control name="rdb_ch" text="中文[ZH]" />
       <Control name="rdb_en" text="英文[EN]" />
-      <Control name="btnRemove" text="移除" />
-      <Control name="btnRequest" text="请求" />
-      <Control name="btnUpdate" text="激活" />
-      <Control name="lblExpireDate" text="有效期" />
-      <Control name="lblOTSProduct" text="OTS产品" />
-      <Control name="lblLHardwareID" text="硬件ID" />
-      <Control name="lblPassType" text="通行证类型" />
-      <Control name="lblLComupterName" text="计算机名称" />
       <Control name="btnEDSTest" text="EDS测试" />
       <Control name="btnSEMTest" text="SEM测试" />
       <Control name="lblHEDSController" text="EDS控制器" />
@@ -24,17 +15,6 @@
       <Control name="label1" text="Bruker版本" />
 	  <Control name="lblLanguage" text="语言" />
 	  <Control name="str1" text="请选择要设置的电镜类型!" />
-	   <Control name="message1" text="检查通行证不合法," />
-	  <Control name="message2" text="没有文件" />
-	  <Control name="message3" text="无效的文件" />
-	  <Control name="message4" text="电脑名称空" />
-	  <Control name="message5" text="硬件ID不匹配" />
-	  <Control name="message6" text="软件版本不匹配" />
-	  <Control name="message7" text="已过期" />
-	  <Control name="message8" text="快到期" />
-	  <Control name="message9" text="请先注册通行证!" />
-	  <Control name="message10" text="提示:当前注册信息已过期!" />
-	  <Control name="message11" text="是否删除通行证信息!" />
     </Controls>
   </Form>
 <Form>
@@ -431,33 +411,6 @@
 	  <Control name="RictBox45" text="提示" />
     </Controls>
  </Form>
-<Form>
-    <Name>OTSReport_TemplateDesigner</Name>
-    <Controls>
-      <Control name="lb_bbmc" text="报告名称" />
-	  <Control name="lb_rq" text="日期" />
-	  <Control name="lb_gsm" text="公司名" />
-	  <Control name="lb_ym" text="页码" />
-	  <Control name="label1" text="页眉" />
-	  <Control name="label2" text="页脚" />
-	  <Control name="label3" text="内容" />
-	  <Control name="label8" text="拖动" />
-	  <Control name="label9" text="选择模块" />
-	  <Control name="tabPage1" text="页眉" />
-	  <Control name="tb_bgmc" text="报告名称" />
-	  <Control name="label13" text="报告名称" />
-	  <Control name="label12" text="选择图标" />
-	  <Control name="tabPage2" text="页脚" />
-	  <Control name="tb_gsm" text="公司名" />
-	  <Control name="label17" text="公司名" />
-	  <Control name="label11" text="设置>>" />
-	  <Control name="groupBox1" text="操作记录" />
-	  <Control name="lb_sm" text="说明:\r\n    (1)在数据源处勾选测量结果\r\n    (2)按住模块拖动到报告内容中。\r\n    (3)再到右侧对报告进行设置。" />
-	  <Control name="btn_save" text="保存" />
-	  <Control name="btn_esc" text="取消" />
-	  <Control name="OTSReport_TemplateDesigner" text="模板设计" />
-    </Controls>
- </Form>
  <Form>
     <Name>OTSReport_TemplateDesignerRM</Name>
     <Controls>
@@ -773,18 +726,6 @@
 	  <Control name="str24" text="硫化物" />
     </Controls>
  </Form>
- <Form>
-    <Name>ElementContentGrid</Name>
-    <Controls>
-      <Control name="ToolStripMenuItem1" text="复制整个表" />
-	  <Control name="ToolStripMenuItem2" text="复制选择区域" />
-	  <Control name="ToolStripMenuItem3" text="恢复至初始状态" />
-	  <Control name="str1" text="序号" />
-	  <Control name="str8" text="元素名" />
-	  <Control name="str9" text="含量%" />
-	  <Control name="str10" text="含小颗粒" />
-    </Controls>
- </Form>
 <Form>
     <Name>ParticlesSizeGrid</Name>
     <Controls>
@@ -857,7 +798,6 @@
 	  <Control name="sscaptionname25" text="测量结果概况" />
 	  <Control name="sscaptionname26" text="样品测量信息" />
 	  <Control name="sscaptionname27" text="颗粒成分" />
-	  <Control name="sscaptionname28" text="元素成分" />
 	  <Control name="sscaptionname29" text="颗粒尺寸分布" />
 	  <Control name="sscaptionname30" text="平均元素成分" />
           <Control name="m_reportname1" text="常用夹杂物分类" />
@@ -866,9 +806,6 @@
 	  <Control name="m_reportname2" text="颗粒成份" />
 	  <Control name="m_str_axisy2" text="颗粒数" />
 	  <Control name="str_operatonmodule2" text="颗粒成份图" />
-	  <Control name="m_reportname3" text="元素成份" />
-	  <Control name="m_str_axisy3" text="元素含量" />
-	  <Control name="str_operatonmodule3" text="元素成份图" />
 	  <Control name="m_reportname4" text="颗粒尺寸分布" />
 	  <Control name="m_str_axisy4" text="颗粒数" />
 	  <Control name="str_operatonmodule4" text="颗粒尺寸分布图" />

+ 7 - 8
OTSCPP/OTSRptCalculate/Model/PropParam.h

@@ -58,14 +58,13 @@ namespace OTSMODEL {
 		MEASURE_INFO = 0,
 		PARTICALE_GENE_INFO = 1,
 		PARTICALE_COMP = 2,
-		ELEMENT_COMP = 3,
-		PARTICALE_SIZE_DISTRIBUTION =4,
-		AVE_ELEMENT_COMP = 5,
-		GB_Method1 = 6,
-		GB_Method2 = 7,
-		ASTM = 8,
-		DIN = 9,
-		MAX = 9
+		PARTICALE_SIZE_DISTRIBUTION = 3,
+		AVE_ELEMENT_COMP =4,
+		GB_Method1 = 5,
+		GB_Method2 = 6,
+		ASTM = 7,
+		DIN = 8,
+		MAX = 8
 	}CALCULATE_TABLE_TYPE;
 
 	

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

@@ -532,8 +532,8 @@ namespace OTSIncAReportGraph.Controls
                         case SIZE_CAL_METHOD_TYPE.CIRCLE:
                             diameter = Math.Sqrt(ls_dp.objParticleData.Area / 3.14159f) * 2f;
                             break;
-                        case SIZE_CAL_METHOD_TYPE.FERET:
-                            diameter = ls_dp.objParticleData.FERET;
+                        case SIZE_CAL_METHOD_TYPE.DFERET:
+                            diameter = ls_dp.objParticleData.DFERET;
                             break;
                         default:
                             diameter = 0;

+ 2 - 2
OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionSortImage.cs

@@ -1179,8 +1179,8 @@ namespace OTSIncAReportGraph.Controls
                         case SIZE_CAL_METHOD_TYPE.CIRCLE:
                             ls_dp.ParticleFL = Convert.ToString(Math.Sqrt(ls_dp.objParticleData.Area / 3.14159) * 2);
                             break;
-                        case SIZE_CAL_METHOD_TYPE.FERET:
-                            ls_dp.ParticleFL = ls_dp.objParticleData.FERET.ToString();
+                        case SIZE_CAL_METHOD_TYPE.DFERET:
+                            ls_dp.ParticleFL = ls_dp.objParticleData.DFERET.ToString();
                             break;
                         default:
                             break;

+ 3 - 3
OTSIncAReportApp/1-UI/Control_Grids/CompositionDistributionGrid.cs

@@ -172,10 +172,10 @@ namespace OTSIncAReportGrids
                                 }
                                 break;
                             case "FERET":
-                                avg += kv.Value[i].FERET;
-                                if (kv.Value[i].FERET > max)
+                                avg += kv.Value[i].DFERET;
+                                if (kv.Value[i].DFERET > max)
                                 {
-                                    max = kv.Value[i].FERET;
+                                    max = kv.Value[i].DFERET;
                                 }
                                 break;
                         }

+ 0 - 372
OTSIncAReportApp/1-UI/Control_Grids/ElementContentGrid.cs

@@ -1,372 +0,0 @@
-using OTSIncAReportApp.OTSSampleReportInfo;
-using OTSIncAReportApp.SysMgrTools;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Data;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace OTSIncAReportGrids
-{
-    /// <summary>
-    /// 元素含量表
-    /// </summary>
-    public partial class ElementContentGrid : UserControl
-    {
-        #region 设置变量
-        //设置模拟数据表
-        public DataTable m_dt = new DataTable();
-
-        //国际化
-        Language lan;
-        Hashtable table;
-
-        OTSIncAReportApp.frmReportApp m_ReportApp;
-
-        int gridwidth = 0;
-        #endregion
-
-        #region 自定义方法
-        /// <summary>
-        /// 绑定datagridview数据
-        /// </summary>
-        public void BindDataGridView(string path, int num, string filename)
-        {
-            OTSIncAReportApp.DataOperation.DataAccess.ParticleData particledata = new OTSIncAReportApp.DataOperation.DataAccess.ParticleData(path);
-            OTSGridView gridView = new OTSGridView();
-
-            List<string> colid = new List<string>() { "rowid", "ename", "percent" };
-            List<string> colname = new List<string>() { table["str1"].ToString(), table["str8"].ToString(), table["str9"].ToString() };
-
-            //创建Grid的列
-
-            for (int i = 0; i < colid.Count; i++)
-            {
-                gridView.Columns.Add(colid[i], colname[i]);
-            }
-
-            //设置grid默认值的样式,防止图像为空时有红x
-            for (int i = 0; i < gridView.Columns.Count; i++)
-            {
-                gridView.Columns[i].DefaultCellStyle.NullValue = null;
-            }
-
-            int sel = m_ReportApp.m_conditionChoose.m_SourceGridData.GetComboDownListIndexByItemName(OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE);
-            string filedAndParticle = "";
-            if (sel == 1)
-            {
-                List<OTSIncAReportApp.DataOperation.Model.Particle> selectParticles = m_ReportApp.GetSelectedParticles();
-                foreach (var item in selectParticles)
-                {
-                    filedAndParticle = filedAndParticle + "," + (item.FieldId.ToString() + "-" + item.ParticleId.ToString());
-                }
-                if (filedAndParticle != "")
-                {
-                    filedAndParticle = filedAndParticle + ",";
-                }
-
-
-                if (filedAndParticle != "")
-                {
-                    DataTable dt = particledata.GetElementForArea(filedAndParticle);
-                    double totalArea = 0;
-                    foreach (DataRow item in dt.Rows)
-                    {
-                        totalArea += Convert.ToDouble(item["earea"]);
-                    }
-                    for (int i = 0; i < dt.Rows.Count; i++)
-                    {
-                        int add_rowindex = gridView.Rows.Add();
-                        gridView.Rows[i].Cells[0].Value = (i + 1).ToString();
-                        gridView.Rows[i].Cells[1].Value = dt.Rows[i]["name"];
-                        double d = Convert.ToDouble(dt.Rows[i]["earea"]) / totalArea;
-                        gridView.Rows[i].Cells[2].Value = Math.Round(d, 6) * 100;
-                        gridView.Rows[i].Cells[1].Style.BackColor = Color.Azure;
-                        gridView.Rows[i].Cells[2].Style.BackColor = Color.Azure;
-                    }
-                }
-                else
-                {
-
-                }
-            }
-            else
-            {
-                Hashtable hashtable = new Hashtable();
-                DataTable dt = particledata.GetElementForArea(filedAndParticle);
-                double totalArea = 0;
-                foreach (DataRow item in dt.Rows)
-                {
-                    totalArea += Convert.ToDouble(item["earea"]);
-                    hashtable.Add(item["name"].ToString(), Convert.ToDouble(item["earea"]));
-                }
-                DataTable dt1 = particledata.GetSmallElementForArea();
-                foreach (DataRow item in dt1.Rows)
-                {
-                    totalArea += Convert.ToDouble(item["earea"]);
-                    if (hashtable.Contains(item["name"].ToString()))
-                    {
-                        double temp = Convert.ToDouble(item["earea"]) + Convert.ToDouble(hashtable[item["name"].ToString()]);
-                        hashtable[item["name"].ToString()] = temp;
-                    }
-                    else
-                    {
-                        hashtable.Add(item["name"].ToString(), Convert.ToDouble(item["earea"]));
-                    }
-                }
-
-                foreach (DictionaryEntry de in hashtable) //ht为一个Hashtable实例
-                {
-                    int add_rowindex = gridView.Rows.Add();
-                    gridView.Rows[add_rowindex].Cells[0].Value = (add_rowindex + 1).ToString();
-                    gridView.Rows[add_rowindex].Cells[1].Value = de.Key;
-                    double d = Convert.ToDouble(de.Value) / totalArea;
-                    gridView.Rows[add_rowindex].Cells[2].Value = Math.Round(d, 6) * 100;
-                    gridView.Rows[add_rowindex].Cells[1].Style.BackColor = Color.Azure;
-                    gridView.Rows[add_rowindex].Cells[2].Style.BackColor = Color.Azure;
-                }
-
-            }
-            gridView.Name = "gridView" + num.ToString();
-            SetDataGridViewStyle(gridView);
-            panel1.Controls.Add(gridView);
-            gridwidth = gridwidth + 1;
-        }
-
-        /// <summary>
-        /// 设置DataGridView样式
-        /// </summary>
-        private void SetDataGridViewStyle(OTSGridView gridView)
-        {
-            gridView.AllowUserToAddRows = false;
-            gridView.AllowUserToDeleteRows = false;
-            gridView.AllowUserToResizeRows = false;
-            gridView.BackgroundColor = System.Drawing.SystemColors.ButtonHighlight;
-            gridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
-            gridView.ContextMenuStrip = this.contextMenuStrip1;
-            gridView.Dock = System.Windows.Forms.DockStyle.Fill;
-            gridView.Location = new System.Drawing.Point(0, 0);
-            gridView.Margin = new System.Windows.Forms.Padding(2);
-            gridView.MergeColumnHeaderBackColor = System.Drawing.SystemColors.ButtonHighlight;
-            gridView.Name = "Gview_gz";
-            gridView.ReadOnly = true;
-            gridView.RowHeadersVisible = false;
-            gridView.RowHeadersWidth = 40;
-            gridView.RowTemplate.Height = 30;
-            gridView.Size = new System.Drawing.Size(667, 520);
-            gridView.TabIndex = 0;
-            gridView.SortCompare += new System.Windows.Forms.DataGridViewSortCompareEventHandler(this.Gview_gz_SortCompare);
-            gridView.Sorted += new System.EventHandler(this.Gview_gz_Sorted);
-
-            //用户不能调整标题的高度
-            gridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-
-            //用户不能调整 行高
-            gridView.AllowUserToResizeRows = false;
-
-            //改变行的高度;
-            //gridView.RowTemplate.Height = 20;
-
-            //点击选择整行
-            gridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect;
-
-            //居中显示
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            gridView.DefaultCellStyle = dataGridViewCellStyle1;
-            gridView.ColumnHeadersDefaultCellStyle.Alignment = DataGridViewContentAlignment.MiddleCenter;
-
-            //再次重覆禁用拖动表头高度,居然有效果了
-            gridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
-
-            //设置grid可以复制
-            gridView.ClipboardCopyMode = DataGridViewClipboardCopyMode.EnableAlwaysIncludeHeaderText;
-
-            //设置每列的宽度
-            gridView.Columns[0].Width = 40;//第一列序号的宽度设置一下吧,要不太丑
-            gridView.Columns[1].Width = 200;
-
-            //设置序号列不排序
-            gridView.Columns[0].SortMode = DataGridViewColumnSortMode.NotSortable;
-
-            //设置序号列不可以设置宽度
-            gridView.Columns[0].Resizable = DataGridViewTriState.False;
-
-        }
-        #endregion
-
-        #region 窗体初始化及加载
-        /// <summary>
-        /// 元素含量表,构造函数
-        /// </summary>
-        /// <param name="in_sec">传入,委托类对象</param>
-        /// <param name="in_Cotsreportprojfilemgrclr">传入,项目管理类对象</param>
-        public ElementContentGrid(OTSIncAReportApp.frmReportApp ReportApp)
-        {
-            m_ReportApp = ReportApp;
-
-            InitializeComponent();
-            //国际化
-            lan = new Language(this);
-            table = lan.GetNameTable(this.Name);
-        }
-        private void ElementContentGrid_Load(object sender, EventArgs e)
-        {
-            //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-            string sou = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
-            if (sou.Contains("+"))
-            {
-                for (int i = 0; i < sou.Split('+').Length; i++)
-                {
-                    OTSIncAReportApp.DataOperation.Model.ResultFile resultFile = m_ReportApp.m_rstDataMgr.ResultFilesList.Find(s => s.FileName == sou.Split('+')[i]);
-                    if (resultFile != null)
-                    {
-                        BindDataGridView(resultFile.FilePath, i, resultFile.FileName);
-                    }
-                }
-            }
-            else
-            {
-                BindDataGridView(m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FilePath, 0, m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FileName);
-            }
-        }
-        #endregion
-
-        #region 相关事件
-        private void ToolStripMenuItem1_Click(object sender, EventArgs e)
-        {
-            //复制整个表
-            CopyAll();
-        }
-
-        private void ToolStripMenuItem2_Click(object sender, EventArgs e)
-        {
-            //复制选择区域
-            CopySelected();
-        }
-
-        /// <summary>
-        /// 复制选择区域
-        /// </summary>
-        public void CopySelected()
-        {
-            foreach (var item in panel1.Controls)
-            {
-                if (item.GetType().ToString() == "OTSGridView")
-                {
-                    //复制选择区域
-                    object oo = ((OTSGridView)item).GetClipboardContent();
-                    Clipboard.SetDataObject(((OTSGridView)item).GetClipboardContent());
-                }
-            }
-        }
-
-        /// <summary>
-        /// 复制所有
-        /// </summary>
-        public void CopyAll()
-        {
-            foreach (var item in panel1.Controls)
-            {
-                if (item.GetType().ToString() == "OTSGridView")
-                {
-                    ((OTSGridView)item).SelectAll();
-                    Clipboard.SetDataObject(((OTSGridView)item).GetClipboardContent());
-                }
-            }
-        }
-        //恢复至初始状态
-        private void ToolStripMenuItem3_Click(object sender, EventArgs e)
-        {
-            foreach (var item in panel1.Controls)
-            {
-                if (item.GetType().ToString() == "OTSGridView")
-                {
-                    panel1.Controls.Remove((OTSGridView)item);
-
-                }
-            }
-            gridwidth = 0;
-
-            //int idx = m_ReportApp.m_DataMgrFun.GetPropIndexByPropItemName(m_ReportApp.SourceGridData.ConditionItemList, OTSIncAReportApp.OTSSampleReportInfo.OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE);
-            string sou = m_ReportApp.m_conditionChoose.m_SourceGridData.GetPropItemDisplayValueByPropItemName(OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE).ToString();
-            if (sou.Contains("+"))
-            {
-                for (int i = 0; i < sou.Split('+').Length; i++)
-                {
-                    OTSIncAReportApp.DataOperation.Model.ResultFile resultFile = m_ReportApp.m_rstDataMgr.ResultFilesList.Find(s => s.FileName == sou.Split('+')[i]);
-                    if (resultFile != null)
-                    {
-                        BindDataGridView(resultFile.FilePath, i, resultFile.FileName);
-                    }
-                }
-            }
-            else
-            {
-                BindDataGridView(m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FilePath, 0, m_ReportApp.m_rstDataMgr.ResultFilesList[m_ReportApp.m_rstDataMgr.GetWorkingResult()].FileName);
-            }
-        }
-
-        private void Gview_gz_SortCompare(object sender, DataGridViewSortCompareEventArgs e)
-        {
-            //排序中
-            if (((OTSGridView)sender).Rows[e.RowIndex1].Tag != null && ((OTSGridView)sender).Rows[e.RowIndex1].Tag.ToString() == "统计行")
-            {
-                //ROW1>ROW2  
-                e.SortResult = 1;
-                if (((OTSGridView)sender).SortOrder == SortOrder.Descending)
-                    e.SortResult = -1;
-                e.Handled = true;
-                return;
-            }
-
-            if (((OTSGridView)sender).Rows[e.RowIndex2].Tag != null && ((OTSGridView)sender).Rows[e.RowIndex2].Tag.ToString() == "统计行")
-            {
-                //ROW1<ROW2  
-                e.SortResult = -1;
-                if (((OTSGridView)sender).SortOrder == SortOrder.Descending)
-                    e.SortResult = 1;
-                e.Handled = true;
-                return;
-            }
-
-        }
-
-        private void Gview_gz_Sorted(object sender, EventArgs e)
-        {
-            //排序完成,重新设置序号
-            for (int i = 0; i < ((OTSGridView)sender).Rows.Count; i++)
-            {
-                if (((OTSGridView)sender).Rows[i].Tag != null && ((OTSGridView)sender).Rows[i].Tag.ToString() == "统计行")
-                { }
-                else
-                {
-                    ((OTSGridView)sender).Rows[i].Cells[0].Value = i.ToString();
-                }
-            }
-        }
-        #endregion
-
-        #region 获取向导出模块提供的DataTable和GridView对象
-        /// <summary>
-        /// 获取到该模块输出后形成的DataTable,和GridView
-        /// </summary>
-        /// <param name="out_dt"></param>
-        /// <param name="out_dg"></param>
-        public void GetDataTableAndGridView(out DataTable out_dt, out DataGridView out_dg)
-        {
-            out_dt = m_dt;
-            out_dg = null;
-            foreach (var item in panel1.Controls)
-            {
-                if (item.GetType().ToString() == "OTSGridView")
-                {
-                    out_dg = ((OTSGridView)item);
-                }
-            }
-        }
-        #endregion
-
-    }
-}

+ 0 - 133
OTSIncAReportApp/1-UI/Control_Grids/ElementContentGrid.designer.cs

@@ -1,133 +0,0 @@
-namespace OTSIncAReportGrids
-{
-    partial class ElementContentGrid
-    {
-        /// <summary> 
-        /// 必需的设计器变量。
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// 清理所有正在使用的资源。
-        /// </summary>
-        /// <param name="disposing">如果应释放托管资源,为 true;否则为 false。</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region 组件设计器生成的代码
-
-        /// <summary> 
-        /// 设计器支持所需的方法 - 不要修改
-        /// 使用代码编辑器修改此方法的内容。
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ElementContentGrid));
-            this.panel1 = new System.Windows.Forms.Panel();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
-            this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.ToolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.ToolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
-            this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
-            this.contextMenuStrip1.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // panel1
-            // 
-            this.panel1.AutoScroll = true;
-            this.panel1.Controls.Add(this.pictureBox1);
-            this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Location = new System.Drawing.Point(0, 0);
-            this.panel1.Margin = new System.Windows.Forms.Padding(2);
-            this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(667, 520);
-            this.panel1.TabIndex = 5;
-            // 
-            // pictureBox1
-            // 
-            this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.pictureBox1.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("pictureBox1.BackgroundImage")));
-            this.pictureBox1.Location = new System.Drawing.Point(497, 490);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(170, 30);
-            this.pictureBox1.TabIndex = 1;
-            this.pictureBox1.TabStop = false;
-            // 
-            // contextMenuStrip1
-            // 
-            this.contextMenuStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
-            this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.ToolStripMenuItem1,
-            this.ToolStripMenuItem2,
-            this.toolStripSeparator1,
-            this.ToolStripMenuItem3});
-            this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(215, 100);
-            // 
-            // ToolStripMenuItem1
-            // 
-            this.ToolStripMenuItem1.Image = global::OTSIncAReportApp.Properties.Resources.复制;
-            this.ToolStripMenuItem1.Name = "ToolStripMenuItem1";
-            this.ToolStripMenuItem1.Size = new System.Drawing.Size(214, 30);
-            this.ToolStripMenuItem1.Text = "复制整个表";
-            this.ToolStripMenuItem1.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
-            // 
-            // ToolStripMenuItem2
-            // 
-            this.ToolStripMenuItem2.Image = global::OTSIncAReportApp.Properties.Resources.复制全部;
-            this.ToolStripMenuItem2.Name = "ToolStripMenuItem2";
-            this.ToolStripMenuItem2.Size = new System.Drawing.Size(214, 30);
-            this.ToolStripMenuItem2.Text = "复制选择区域";
-            this.ToolStripMenuItem2.Click += new System.EventHandler(this.ToolStripMenuItem2_Click);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(211, 6);
-            // 
-            // ToolStripMenuItem3
-            // 
-            this.ToolStripMenuItem3.Image = global::OTSIncAReportApp.Properties.Resources.恢复;
-            this.ToolStripMenuItem3.Name = "ToolStripMenuItem3";
-            this.ToolStripMenuItem3.Size = new System.Drawing.Size(214, 30);
-            this.ToolStripMenuItem3.Text = "恢复至初始状态";
-            this.ToolStripMenuItem3.Click += new System.EventHandler(this.ToolStripMenuItem3_Click);
-            // 
-            // ElementContentGrid
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.SystemColors.ButtonHighlight;
-            this.Controls.Add(this.panel1);
-            this.Margin = new System.Windows.Forms.Padding(2);
-            this.Name = "ElementContentGrid";
-            this.Size = new System.Drawing.Size(667, 520);
-            this.Load += new System.EventHandler(this.ElementContentGrid_Load);
-            this.panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
-            this.contextMenuStrip1.ResumeLayout(false);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.ContextMenuStrip contextMenuStrip1;
-        private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem2;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-        private System.Windows.Forms.ToolStripMenuItem ToolStripMenuItem3;
-        private System.Windows.Forms.PictureBox pictureBox1;
-    }
-}

+ 0 - 156
OTSIncAReportApp/1-UI/Control_Grids/ElementContentGrid.resx

@@ -1,156 +0,0 @@
-<?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>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="pictureBox1.BackgroundImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        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
-        CzvA4fAHgW7crI7nKn8AAAAASUVORK5CYII=
-</value>
-  </data>
-  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>

+ 1 - 1
OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.cs

@@ -241,7 +241,7 @@ namespace OTSIncAReportGrids
                 dtUelect.Columns.Add("Element");
                 for(int i=0;i< selectParticles.Count;i++)
                 {
-                    dtUelect.Rows.Add(selectParticles[i].FieldId, selectParticles[i].ParticleId, selectParticles[i].AveGray, selectParticles[i].RectLeft, selectParticles[i].RectTop, selectParticles[i].RectWidth, selectParticles[i].RectHeight, selectParticles[i].Area, selectParticles[i].PosX, selectParticles[i].PosX, selectParticles[i].TypeId, /*selectParticles[i].ElementNum,*/ selectParticles[i].SegmentNum, selectParticles[i].SEMPosX, selectParticles[i].SEMPosY, selectParticles[i].ParticleId, selectParticles[i].DMAX, selectParticles[i].DMIN, selectParticles[i].DPERP, selectParticles[i].PERIMETER, selectParticles[i].ORIENTATION, selectParticles[i].DINSCR, selectParticles[i].DMEAN, selectParticles[i].DELONG, selectParticles[i].FERET, selectParticles[i].TypeName, selectParticles[i].TypeColor, "", "");
+                    dtUelect.Rows.Add(selectParticles[i].FieldId, selectParticles[i].ParticleId, selectParticles[i].AveGray, selectParticles[i].RectLeft, selectParticles[i].RectTop, selectParticles[i].RectWidth, selectParticles[i].RectHeight, selectParticles[i].Area, selectParticles[i].PosX, selectParticles[i].PosX, selectParticles[i].TypeId, /*selectParticles[i].ElementNum,*/ selectParticles[i].SegmentNum, selectParticles[i].SEMPosX, selectParticles[i].SEMPosY, selectParticles[i].ParticleId, selectParticles[i].DMAX, selectParticles[i].DMIN, selectParticles[i].DPERP, selectParticles[i].PERIMETER, selectParticles[i].ORIENTATION, selectParticles[i].DINSCR, selectParticles[i].DMEAN, selectParticles[i].DELONG, selectParticles[i].DFERET, selectParticles[i].TypeName, selectParticles[i].TypeColor, "", "");
                  }
                 particlesAll = new DataTable();
                 particlesAll = dtUelect.Copy();

+ 8 - 8
OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/OTSSampleReportInfo/OTSSampleReportInfo.cs

@@ -55,13 +55,13 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
         MEASURE_INFO = 0,
         PARTICALE_GENE_INFO = 1,
         PARTICALE_COMP = 2,
-        ELEMENT_COMP = 3,
-        PARTICALE_SIZE_DISTRIBUTION = 4,
-        AVE_ELEMENT_COMP = 5,
-        GB_Method1 = 6,
-        GB_Method2 = 7,
-        ASTM = 8,
-        DIN = 9
+        //ELEMENT_COMP = 3,
+        PARTICALE_SIZE_DISTRIBUTION = 3,
+        AVE_ELEMENT_COMP = 4,
+        GB_Method1 = 5,
+        GB_Method2 = 6,
+        ASTM = 7,
+        DIN = 8
 
     }
     public enum CALCULATE_CHART_TYPE
@@ -217,7 +217,7 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
     {
         DMAX = 0,
         DMIN = 1,
-        FERET = 2,
+        DFERET = 2,
         CIRCLE = 3
     };
     public enum GRAIN_SIZE_CLASS

+ 2 - 29
OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -103,7 +103,6 @@ namespace OTSIncAReportApp
             string surveyResults = resTable["sscaptionname25"].ToString();//测量结果概况
             string sampleMeasurementInformation = resTable["sscaptionname26"].ToString(); //样品测量信息
             string granularComponent= resTable["sscaptionname27"].ToString();//颗粒成分
-            string elementComposition= resTable["sscaptionname28"].ToString();//元素成分
             string particleSizeDistribution= resTable["sscaptionname29"].ToString();//颗粒尺寸分布
             string averageElementComposition= resTable["sscaptionname30"].ToString();//平均元素成分
             string ternaryPhaseDiagram= resTable["sscaptionname12"].ToString();//三元相图
@@ -153,13 +152,13 @@ namespace OTSIncAReportApp
             //计算方式
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.SIZE_CAL_METHOD_TYPE, dimensionCalculationMethod, OTS_ITEM_TYPES.COMBO, false, "image property calculation method", "CIRCLE", m_rstDataMgr.GetSizeCalMethodTypeList(), SIZE_CAL_METHOD_TYPE.CIRCLE);
             //数据表类型
-            List<string> list2 = new List<string>() { surveyResults, sampleMeasurementInformation, granularComponent, elementComposition, particleSizeDistribution, averageElementComposition };
+            List<string> list2 = new List<string>() { surveyResults, sampleMeasurementInformation, granularComponent, particleSizeDistribution, averageElementComposition };
             //string[] aa = m_ReportApp.Text.Split('-');
             List<string> listStd = new List<string>() { chineseStandard1, chineseStandard2, americanStandard, germanStandard };
             list2.AddRange(listStd);
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_TABLE_TYPE, dataTableType, OTS_ITEM_TYPES.COMBO, false, "Data table type", list2[0], list2, CALCULATE_TABLE_TYPE.MEASURE_INFO);
             // chart condition items
-            List<string> list22 = new List<string>() { commonClassification, granularComponent, elementComposition, particleSizeDistribution, ternaryPhaseDiagram , InclusionAreaRatio };
+            List<string> list22 = new List<string>() { commonClassification, granularComponent, particleSizeDistribution, ternaryPhaseDiagram , InclusionAreaRatio };
             AddGridData(OTS_REPORT_PROP_GRID_ITEMS.CALCULATE_CHART_TYPE, dataTableType, OTS_ITEM_TYPES.COMBO, false, "Data graph type", list22[0], list22, CALCULATE_CHART_TYPE.COMMON_FIVE);
             //三元相图模板
             List<string> trio_listname = m_rstDataMgr.GetTriTemplateNameList();
@@ -432,12 +431,6 @@ namespace OTSIncAReportApp
                     //list.Add(sampleData1);
                     list.Insert(1, sampleData1);
                 }
-                if ((int)sampleData3.itemVal == (int)CALCULATE_TABLE_TYPE.ELEMENT_COMP)
-                {
-                    var sampleData1 = m_CurrentConditions[OTS_REPORT_PROP_GRID_ITEMS.DATA_SOURCE_TYPE];
-                    //list.Add(sampleData1);
-                    list.Insert(1, sampleData1);
-                }
                 list.Add(sampleData3);
               
             }
@@ -672,13 +665,6 @@ namespace OTSIncAReportApp
                             m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_CompositionDistributionGrid);
                             m_ReportApp.m_TablesWindow.Activate();
                             break;
-                        case CALCULATE_TABLE_TYPE.ELEMENT_COMP:
-                            m_ReportApp.m_TablesWindow.Controls.Clear();
-                            m_ReportApp.im_ElementContentGrid = new ElementContentGrid(m_ReportApp);
-                            m_ReportApp.im_ElementContentGrid.Dock = DockStyle.Fill;
-                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ElementContentGrid);
-                            m_ReportApp.m_TablesWindow.Activate();
-                            break;
                         case CALCULATE_TABLE_TYPE.PARTICALE_SIZE_DISTRIBUTION://颗粒尺寸分布表
                             m_ReportApp.m_TablesWindow.Controls.Clear();
                             m_ReportApp.im_ParticlesSizeGrid = new ParticlesSizeGrid(m_ReportApp);
@@ -825,19 +811,6 @@ namespace OTSIncAReportApp
                             m_ReportApp.m_ChartsWindow.Controls.Add(m_ReportApp.im_EChart_ParticlesComposition);
                             m_ReportApp.m_ChartsWindow.Activate();
                             break;
-                        case CALCULATE_CHART_TYPE.ELEMENT_COMP:
-                            m_reportname = resTable["m_reportname3"].ToString();//元素成分
-                            m_str_AxisY = resTable["m_str_axisy3"].ToString();//元素含量
-                            str_operatonmodule = resTable["str_operatonmodule3"].ToString();//元素成分图
-
-                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.EChart_ParticlesComposition(m_ReportApp, "EComponent");
-                            m_ReportApp.im_EChart_ParticlesComposition.Dock = DockStyle.Fill;
-                            m_ReportApp.m_reportname = m_reportname;
-                            m_ReportApp.im_EChart_ParticlesComposition.m_str_AxisY = m_str_AxisY;
-                            m_ReportApp.type = "pie";
-                            m_ReportApp.m_ChartsWindow.Controls.Add(m_ReportApp.im_EChart_ParticlesComposition);
-                            m_ReportApp.m_ChartsWindow.Activate();
-                            break;
                         case CALCULATE_CHART_TYPE.PARTICALE_SIZE_DISTRIBUTION://颗粒尺寸分布图
                             m_reportname = resTable["m_reportname4"].ToString();//颗粒尺寸分布
                             m_str_AxisY = resTable["m_str_axisy4"].ToString();//颗粒数

+ 0 - 22
OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -116,11 +116,6 @@ namespace OTSIncAReportApp
         /// </summary>
         public OTSIncAReportGrids.ElementCompositionAvgGrid im_ElementCompositionAvgGrid = null;
 
-        /// <summary>
-        /// 元素含量表
-        /// </summary>
-        public OTSIncAReportGrids.ElementContentGrid im_ElementContentGrid = null;
-
         /// <summary>
         /// 颗粒尺寸表
         /// </summary>
@@ -392,7 +387,6 @@ namespace OTSIncAReportApp
             im_ParticlesGridDevidePage = null;
             im_CompositionDistributionGrid = null;
             im_ElementCompositionAvgGrid = null;
-            im_ElementContentGrid = null;
             im_ParticlesSizeGrid = null;
             im_ResultGrid = null;
         }
@@ -1067,14 +1061,6 @@ namespace OTSIncAReportApp
                             im_ElementCompositionAvgGrid.CopySelected();
                         }
                     }
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.ELEMENT_COMP)
-                    {
-                        if (im_ElementContentGrid != null)
-                        {
-                            //元素含量表
-                            im_ElementContentGrid.CopySelected();
-                        }
-                    }
                     if (DisType == (int)CALCULATE_TABLE_TYPE.PARTICALE_SIZE_DISTRIBUTION)
                     {
                         if (im_ParticlesSizeGrid != null)
@@ -1188,14 +1174,6 @@ namespace OTSIncAReportApp
                             im_ElementCompositionAvgGrid.CopyAll();
                         }
                     }
-                    if (DisType == (int)CALCULATE_TABLE_TYPE.ELEMENT_COMP)
-                    {
-                        if (im_ElementContentGrid != null)
-                        {
-                            //元素含量表
-                            im_ElementContentGrid.CopyAll();
-                        }
-                    }
                     if (DisType == (int)CALCULATE_TABLE_TYPE.PARTICALE_SIZE_DISTRIBUTION)
                     {
                         if (im_ParticlesSizeGrid != null)

+ 1 - 1
OTSIncAReportApp/2-CommonFunction/OTSDataMgrFunction/ResultDataMgr.cs

@@ -256,7 +256,7 @@ namespace OTSIncAReportApp.OTSDataMgrFunction
         /// <returns></returns>
         public List<string> GetSizeCalMethodTypeList()
         {
-            List<string> ret_list = new List<string>() { "DMAX", "DMIN", "CIRCLE", "FERET" };
+            List<string> ret_list = new List<string>() { "DMAX", "DMIN", "FERET", "CIRCLE" };
             return ret_list;
         }
         public List<string> ParticleRange()

+ 1 - 1
OTSIncAReportApp/3-ServiceCenter/DataOperation/Model/Particle.cs

@@ -104,7 +104,7 @@ namespace OTSIncAReportApp.DataOperation.Model
             get;
         }
 
-        public double FERET
+        public double DFERET
         {
             set;
             get;

+ 0 - 9
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -352,12 +352,6 @@
     <Compile Include="1-UI\Control_Grids\ElementCompositionAvgGrid.designer.cs">
       <DependentUpon>ElementCompositionAvgGrid.cs</DependentUpon>
     </Compile>
-    <Compile Include="1-UI\Control_Grids\ElementContentGrid.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="1-UI\Control_Grids\ElementContentGrid.designer.cs">
-      <DependentUpon>ElementContentGrid.cs</DependentUpon>
-    </Compile>
     <Compile Include="1-UI\Control_Grids\OTSIncAReportGridsFuncation\OTSReportGridsFun.cs" />
     <Compile Include="1-UI\Control_Grids\ParticlesSizeGrid.cs">
       <SubType>UserControl</SubType>
@@ -578,9 +572,6 @@
     <EmbeddedResource Include="1-UI\Control_Grids\ElementCompositionAvgGrid.resx">
       <DependentUpon>ElementCompositionAvgGrid.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="1-UI\Control_Grids\ElementContentGrid.resx">
-      <DependentUpon>ElementContentGrid.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="1-UI\Control_Grids\ParticlesSizeGrid.resx">
       <DependentUpon>ParticlesSizeGrid.cs</DependentUpon>
     </EmbeddedResource>