修改文件名称

Bin/x64/Debug/Config/SysData/OTSProgMgrParam.pmf

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData RunMode="ProfessionalMode" SysType="IncA">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="OTS_TC_Axia_per" SteelTechnology="0" UseSysSTD="true" />
-  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="3:WaterShed" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
+  <Member RegName="ImageProcParam" AutoBGRemoveType="0:MIDDLE" BGRemoveType="0:AUTO" MatrixStep="50" OverlapParam="0" ParticleSelectionCondition="">
     <Member RegName="BGGray" end="60" start="0" />
     <Member RegName="IncArea" end="500" start="30" />
     <Member RegName="ParticleGray" end="255" start="0" />

Bin/x64/Debug/Config/SysData/OTSStage.stg

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="4">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="3">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0:ROUND" />

OTSIncAReportApp/1-UI/Control_ECharts/EChart_ParticlesComposition.Designer.cs → OTSIncAReportApp/1-UI/Control_DEVCharts/DEVChart_ParticlesComposition.Designer.cs

@@ -1,6 +1,6 @@
 namespace OTSIncAReportApp.Control_ECharts
 {
-    partial class EChart_ParticlesComposition
+    partial class DEVChart_ParticlesComposition
     {
         /// <summary> 
         /// 必需的设计器变量。

OTSIncAReportApp/1-UI/Control_ECharts/EChart_ParticlesComposition.cs → OTSIncAReportApp/1-UI/Control_DEVCharts/DEVChart_ParticlesComposition.cs

@@ -17,7 +17,7 @@ namespace OTSIncAReportApp.Control_ECharts
     /// <summary>
     /// 各图char相关模块
     /// </summary>
-    public partial class EChart_ParticlesComposition : UserControl
+    public partial class DEVChart_ParticlesComposition : UserControl
     {
         Hashtable table;
 
@@ -36,7 +36,7 @@ namespace OTSIncAReportApp.Control_ECharts
         #endregion
 
         #region 窗体加载及构造函数
-        public EChart_ParticlesComposition(frmReportApp ReportApp, string comsel)
+        public DEVChart_ParticlesComposition(frmReportApp ReportApp, string comsel)
         {
             ComSel = comsel;
             m_ReportApp = ReportApp;

OTSIncAReportApp/1-UI/Control_ECharts/EChart_Trianglediagram.Designer.cs → OTSIncAReportApp/1-UI/Control_DEVCharts/DEVChart_Trianglediagram.Designer.cs

@@ -1,6 +1,6 @@
 namespace OTSIncAReportApp.Control_ECharts
 {
-    partial class EChart_Trianglediagram
+    partial class DEVChart_Trianglediagram
     {
         /// <summary> 
         /// 必需的设计器变量。

OTSIncAReportApp/1-UI/Control_ECharts/EChart_Trianglediagram.cs → OTSIncAReportApp/1-UI/Control_DEVCharts/DEVChart_Trianglediagram.cs

@@ -16,7 +16,7 @@ namespace OTSIncAReportApp.Control_ECharts
     /// <summary>
     /// 三元相图EChart版
     /// </summary>
-    public partial class EChart_Trianglediagram : UserControl
+    public partial class DEVChart_Trianglediagram : UserControl
     {
         #region 变量定义
         public List<string> m_list_string_sizelevel; //图例中：颗粒粒级字符列表
@@ -44,7 +44,7 @@ namespace OTSIncAReportApp.Control_ECharts
         /// </summary>
         /// <param name="in_sec">传入,委托类对象</param>
         /// <param name="in_Cotsreportprojfilemgrclr">传入，项目管理类对象</param>
-        public EChart_Trianglediagram(frmReportApp ReportApp)
+        public DEVChart_Trianglediagram(frmReportApp ReportApp)
         {
             m_list_string_sizelevel = new List<string>();
             m_list_string_samplename = new List<string>();

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -964,7 +964,7 @@ namespace OTSIncAReportApp
                             m_str_AxisY = resTable["m_str_axisy1"].ToString();
                             str_operatonmodule = resTable["str_operatonmodule1"].ToString();
 
-                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.EChart_ParticlesComposition(m_ReportApp, "CommonlyUsedClassify");
+                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.DEVChart_ParticlesComposition(m_ReportApp, "CommonlyUsedClassify");
                             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;
@@ -977,7 +977,7 @@ namespace OTSIncAReportApp
                             m_str_AxisY = resTable["m_str_axisy2"].ToString();//颗粒数
                             str_operatonmodule = resTable["str_operatonmodule2"].ToString();//颗粒成分图
 
-                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.EChart_ParticlesComposition(m_ReportApp, "PComponent");
+                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.DEVChart_ParticlesComposition(m_ReportApp, "PComponent");
                             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;
@@ -990,7 +990,7 @@ namespace OTSIncAReportApp
                             m_str_AxisY = resTable["m_str_axisy4"].ToString();//颗粒数
                             str_operatonmodule = resTable["str_operatonmodule4"].ToString();//颗粒尺寸分布图
 
-                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.EChart_ParticlesComposition(m_ReportApp, "PSize");
+                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.DEVChart_ParticlesComposition(m_ReportApp, "PSize");
                             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;
@@ -1004,7 +1004,7 @@ namespace OTSIncAReportApp
 
                             str_operatonmodule = resTable["str_operatonmodule5"].ToString();
 
-                            m_ReportApp.im_EChart_Trianglediagram = new Control_ECharts.EChart_Trianglediagram(m_ReportApp);
+                            m_ReportApp.im_EChart_Trianglediagram = new Control_ECharts.DEVChart_Trianglediagram(m_ReportApp);
                             m_ReportApp.im_EChart_Trianglediagram.Template = "";
                             m_ReportApp.im_EChart_Trianglediagram.Dock = DockStyle.Fill;
                             m_ReportApp.m_ChartsWindow.Controls.Add(m_ReportApp.im_EChart_Trianglediagram);
@@ -1015,7 +1015,7 @@ namespace OTSIncAReportApp
                             m_reportname = resTable["incaareascale"].ToString();
                             m_str_AxisY = "平方微米";
 
-                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.EChart_ParticlesComposition(m_ReportApp, "InclusionareaRatio");
+                            m_ReportApp.im_EChart_ParticlesComposition = new Control_ECharts.DEVChart_ParticlesComposition(m_ReportApp, "InclusionareaRatio");
                             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;

OTSIncAReportApp/1-UI/frmReportApp.cs

@@ -140,12 +140,12 @@ namespace OTSIncAReportApp
         /// <summary>
         /// 颗粒成份图EChart
         /// </summary>
-        public Control_ECharts.EChart_ParticlesComposition im_EChart_ParticlesComposition = null;
+        public Control_ECharts.DEVChart_ParticlesComposition im_EChart_ParticlesComposition = null;
 
         /// <summary>
         /// 三元相图EChart
         /// </summary>
-        public Control_ECharts.EChart_Trianglediagram im_EChart_Trianglediagram = null;
+        public Control_ECharts.DEVChart_Trianglediagram im_EChart_Trianglediagram = null;
         /// <summary>
         /// 国标信息表方法一
         /// </summary>

OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -634,17 +634,17 @@
     <Compile Include="1-UI\Control_Grids\ParticlesGridDevidePage\ParticlesGridDevidePage.Designer.cs">
       <DependentUpon>ParticlesGridDevidePage.cs</DependentUpon>
     </Compile>
-    <Compile Include="1-UI\Control_ECharts\EChart_ParticlesComposition.cs">
+    <Compile Include="1-UI\Control_DEVCharts\DEVChart_ParticlesComposition.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="1-UI\Control_ECharts\EChart_ParticlesComposition.Designer.cs">
-      <DependentUpon>EChart_ParticlesComposition.cs</DependentUpon>
+    <Compile Include="1-UI\Control_DEVCharts\DEVChart_ParticlesComposition.Designer.cs">
+      <DependentUpon>DEVChart_ParticlesComposition.cs</DependentUpon>
     </Compile>
-    <Compile Include="1-UI\Control_ECharts\EChart_Trianglediagram.cs">
+    <Compile Include="1-UI\Control_DEVCharts\DEVChart_Trianglediagram.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="1-UI\Control_ECharts\EChart_Trianglediagram.Designer.cs">
-      <DependentUpon>EChart_Trianglediagram.cs</DependentUpon>
+    <Compile Include="1-UI\Control_DEVCharts\DEVChart_Trianglediagram.Designer.cs">
+      <DependentUpon>DEVChart_Trianglediagram.cs</DependentUpon>
     </Compile>
     <Compile Include="1-UI\Control_Graph\Controls\Control_DrawDistrbutionImageAndBSE.cs">
       <SubType>UserControl</SubType>
@@ -926,11 +926,11 @@
     <EmbeddedResource Include="1-UI\Control_Grids\ParticlesGridDevidePage\ParticlesGridDevidePage.resx">
       <DependentUpon>ParticlesGridDevidePage.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="1-UI\Control_ECharts\EChart_ParticlesComposition.resx">
-      <DependentUpon>EChart_ParticlesComposition.cs</DependentUpon>
+    <EmbeddedResource Include="1-UI\Control_DEVCharts\DEVChart_ParticlesComposition.resx">
+      <DependentUpon>DEVChart_ParticlesComposition.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="1-UI\Control_ECharts\EChart_Trianglediagram.resx">
-      <DependentUpon>EChart_Trianglediagram.cs</DependentUpon>
+    <EmbeddedResource Include="1-UI\Control_DEVCharts\DEVChart_Trianglediagram.resx">
+      <DependentUpon>DEVChart_Trianglediagram.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="1-UI\Control_Graph\Controls\Control_DrawDistrbutionImageAndBSE.resx">
       <DependentUpon>Control_DrawDistrbutionImageAndBSE.cs</DependentUpon>