Explorar o código

move Periodic.cs to OTSCommon.csproj,rename all the properties and variables by its proper meaning.

gsp %!s(int64=2) %!d(string=hai) anos
pai
achega
2e403facbe
Modificáronse 23 ficheiros con 1877 adicións e 3564 borrados
  1. 1 0
      OTSCommon/OTSCommon.csproj
  2. 1691 0
      OTSCommon/Periodic.cs
  3. 3 3
      OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureDisplayResult.cs
  4. 1 1
      OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs
  5. 9 9
      OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/Control_XRayTable.cs
  6. 17 17
      OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.Designer.cs
  7. 61 61
      OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs
  8. 0 1
      OTSIncAMeasureApp/OTSIncAMeasureApp.csproj
  9. 13 13
      OTSIncAMeasureApp/OTSPeriodicTable/OTSPeriodicTableForm.cs
  10. 11 11
      OTSIncAMeasureApp/OTSPeriodicTable/OTSPeriodicTableForm_Small.cs
  11. 0 1700
      OTSIncAMeasureApp/OTSPeriodicTable/Periodic.cs
  12. 4 3
      OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs
  13. 2 1
      OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionSortImage.cs
  14. 10 9
      OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_XRayTable.cs
  15. 14 13
      OTSIncAReportApp/1-UI/Controls/OTSPeriodicTable/OTSPeriodicTableForm.cs
  16. 12 11
      OTSIncAReportApp/1-UI/Controls/OTSPeriodicTable/OTSPeriodicTableForm_Small.cs
  17. 0 1687
      OTSIncAReportApp/1-UI/Controls/OTSPeriodicTable/Periodic.cs
  18. 9 8
      OTSIncAReportApp/1-UI/OTSMgrInfo/Triangulation_Edit.cs
  19. 7 6
      OTSIncAReportApp/1-UI/OTSMgrInfo/Triangulation_Item.cs
  20. 4 3
      OTSIncAReportApp/1-UI/OTSMgrInfo/frmReportSysConfig.cs
  21. 2 1
      OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs
  22. 6 5
      OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs
  23. 0 1
      OTSIncAReportApp/OTSIncAReportApp.csproj

+ 1 - 0
OTSCommon/OTSCommon.csproj

@@ -152,6 +152,7 @@
     <Compile Include="Model\Segment.cs" />
     <Compile Include="Model\XRay.cs" />
     <Compile Include="ParticleData.cs" />
+    <Compile Include="Periodic.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SqLiteHelper.cs" />
     <Compile Include="SQliteManageClass.cs" />

+ 1691 - 0
OTSCommon/Periodic.cs

@@ -0,0 +1,1691 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace OTSPeriodicTable
+{
+    /// <summary>
+    /// 元素周期表的基本信息的全局静态类
+    /// </summary>
+    public static class CListPeriodic
+    {
+        /// <summary>
+        /// 获取元素周期表全部元素List方法
+        /// </summary>
+        /// <returns></returns>
+        public static List<Periodic> GetListPeriodic()
+        {
+            List<Periodic> List_Periodic = new List<Periodic>();
+            Periodic ls_periodic = new Periodic();
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "1";
+            ls_periodic.EleWeight = "1.008";
+            ls_periodic.Symbol = "H";
+            ls_periodic.EnglishName = "Hydrogen";
+            ls_periodic.K_Peak = "";
+            ls_periodic.L_Peak = "";
+            ls_periodic.M_Peak = "";
+            ls_periodic.ChineseName = "氢";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "2";
+            ls_periodic.EleWeight = "4.003";
+            ls_periodic.Symbol = "He";
+            ls_periodic.EnglishName = "Helium";
+            ls_periodic.K_Peak = "";
+            ls_periodic.L_Peak = "";
+            ls_periodic.M_Peak = "";
+            ls_periodic.ChineseName = "氦";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "3";
+            ls_periodic.EleWeight = "6.941";
+            ls_periodic.Symbol = "Li";
+            ls_periodic.EnglishName = "Lithium";
+            ls_periodic.K_Peak = "";
+            ls_periodic.L_Peak = "";
+            ls_periodic.M_Peak = "";
+            ls_periodic.ChineseName = "锂";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "4";
+            ls_periodic.EleWeight = "9.012";
+            ls_periodic.Symbol = "Be";
+            ls_periodic.EnglishName = "Beryllium";
+            ls_periodic.K_Peak = "0.108";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "铍";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "5";
+            ls_periodic.EleWeight = "10.811";
+            ls_periodic.Symbol = "B";
+            ls_periodic.EnglishName = "Boron";
+            ls_periodic.K_Peak = "0.185";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "硼";
+            ls_periodic.Classfication = "img_rhombohedral";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "6";
+            ls_periodic.EleWeight = "12.011";
+            ls_periodic.Symbol = "C";
+            ls_periodic.EnglishName = "Carbon";
+            ls_periodic.K_Peak = "0.277";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "碳";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "7";
+            ls_periodic.EleWeight = "14.007";
+            ls_periodic.Symbol = "N";
+            ls_periodic.EnglishName = "Nitrogen";
+            ls_periodic.K_Peak = "0.392";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "氮";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "8";
+            ls_periodic.EleWeight = "15.999";
+            ls_periodic.Symbol = "O";
+            ls_periodic.EnglishName = "Oxygen";
+            ls_periodic.K_Peak = "0.523";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "氧";
+            ls_periodic.Classfication = "img_cubic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "9";
+            ls_periodic.EleWeight = "18.998";
+            ls_periodic.Symbol = "F";
+            ls_periodic.EnglishName = "Fluorine";
+            ls_periodic.K_Peak = "0.677";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "氟";
+            ls_periodic.Classfication = "img_cubic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "10";
+            ls_periodic.EleWeight = "20.180";
+            ls_periodic.Symbol = "Ne";
+            ls_periodic.EnglishName = "Neon";
+            ls_periodic.K_Peak = "0.848";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "氖";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "11";
+            ls_periodic.EleWeight = "22.990";
+            ls_periodic.Symbol = "Na";
+            ls_periodic.EnglishName = "Sodium";
+            ls_periodic.K_Peak = "1.040";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "钠";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "12";
+            ls_periodic.EleWeight = "24.305";
+            ls_periodic.Symbol = "Mg";
+            ls_periodic.EnglishName = "Magnesium";
+            ls_periodic.K_Peak = "1.254";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "镁";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "13";
+            ls_periodic.EleWeight = "26.982";
+            ls_periodic.Symbol = "Al";
+            ls_periodic.EnglishName = "Aluminum";
+            ls_periodic.K_Peak = "1.486";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "铝";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "14";
+            ls_periodic.EleWeight = "28.086";
+            ls_periodic.Symbol = "Si";
+            ls_periodic.EnglishName = "Silicon";
+            ls_periodic.K_Peak = "1.740";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "硅";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "15";
+            ls_periodic.EleWeight = "30.974";
+            ls_periodic.Symbol = "P";
+            ls_periodic.EnglishName = "Phosphorus";
+            ls_periodic.K_Peak = "2.013";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "磷";
+            ls_periodic.Classfication = "img_Monoclinic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "16";
+            ls_periodic.EleWeight = "32.066";
+            ls_periodic.Symbol = "S";
+            ls_periodic.EnglishName = "Sulfur";
+            ls_periodic.K_Peak = "2.307";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "硫";
+            ls_periodic.Classfication = "img_orthohombic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "17";
+            ls_periodic.EleWeight = "35.453";
+            ls_periodic.Symbol = "Cl";
+            ls_periodic.EnglishName = "Chlorine";
+            ls_periodic.K_Peak = "2.622";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "氯";
+            ls_periodic.Classfication = "img_orthohombic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "18";
+            ls_periodic.EleWeight = "39.948";
+            ls_periodic.Symbol = "Ar";
+            ls_periodic.EnglishName = "Argon";
+            ls_periodic.K_Peak = "2.957";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "氩";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "19";
+            ls_periodic.EleWeight = "39.098";
+            ls_periodic.Symbol = "K";
+            ls_periodic.EnglishName = "Potassium";
+            ls_periodic.K_Peak = "3.313";
+            ls_periodic.L_Peak = "-";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "钾";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "20";
+            ls_periodic.EleWeight = "40.08";
+            ls_periodic.Symbol = "Ca";
+            ls_periodic.EnglishName = "Calcium";
+            ls_periodic.K_Peak = "3.691";
+            ls_periodic.L_Peak = "0.341";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "钙";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "21";
+            ls_periodic.EleWeight = "44.956";
+            ls_periodic.Symbol = "Sc";
+            ls_periodic.EnglishName = "Scandium";
+            ls_periodic.K_Peak = "4.090";
+            ls_periodic.L_Peak = "0.395";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "钪";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "22";
+            ls_periodic.EleWeight = "47.88";
+            ls_periodic.Symbol = "Ti";
+            ls_periodic.EnglishName = "Titanium";
+            ls_periodic.K_Peak = "4.510";
+            ls_periodic.L_Peak = "0.452";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "钛";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "23";
+            ls_periodic.EleWeight = "50.942";
+            ls_periodic.Symbol = "V";
+            ls_periodic.EnglishName = "Vanadium";
+            ls_periodic.K_Peak = "4.952";
+            ls_periodic.L_Peak = "0.511";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "钒";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "24";
+            ls_periodic.EleWeight = "51.996";
+            ls_periodic.Symbol = "Cr";
+            ls_periodic.EnglishName = "Chromium";
+            ls_periodic.K_Peak = "5.414";
+            ls_periodic.L_Peak = "0.573";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "铬";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "25";
+            ls_periodic.EleWeight = "54.938";
+            ls_periodic.Symbol = "Mn";
+            ls_periodic.EnglishName = "Manganese";
+            ls_periodic.K_Peak = "5.898";
+            ls_periodic.L_Peak = "0.637";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "锰";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "26";
+            ls_periodic.EleWeight = "55.847";
+            ls_periodic.Symbol = "Fe";
+            ls_periodic.EnglishName = "Iron";
+            ls_periodic.K_Peak = "6.403";
+            ls_periodic.L_Peak = "0.705";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "铁";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "27";
+            ls_periodic.EleWeight = "58.933";
+            ls_periodic.Symbol = "Co";
+            ls_periodic.EnglishName = "Cobalt";
+            ls_periodic.K_Peak = "6.929";
+            ls_periodic.L_Peak = "0.776";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "钴";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "28";
+            ls_periodic.EleWeight = "58.70";
+            ls_periodic.Symbol = "Ni";
+            ls_periodic.EnglishName = "Nickel";
+            ls_periodic.K_Peak = "7.477";
+            ls_periodic.L_Peak = "0.851";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "镍";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "29";
+            ls_periodic.EleWeight = "63.546";
+            ls_periodic.Symbol = "Cu";
+            ls_periodic.EnglishName = "Copper";
+            ls_periodic.K_Peak = "8.040";
+            ls_periodic.L_Peak = "0.930";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "铜";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "30";
+            ls_periodic.EleWeight = "65.39";
+            ls_periodic.Symbol = "Zn";
+            ls_periodic.EnglishName = "Zinc";
+            ls_periodic.K_Peak = "8.637";
+            ls_periodic.L_Peak = "1.012";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "锌";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "31";
+            ls_periodic.EleWeight = "69.72";
+            ls_periodic.Symbol = "Ga";
+            ls_periodic.EnglishName = "Gallium";
+            ls_periodic.K_Peak = "9.250";
+            ls_periodic.L_Peak = "1.098";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "镓";
+            ls_periodic.Classfication = "img_orthohombic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "32";
+            ls_periodic.EleWeight = "72.61";
+            ls_periodic.Symbol = "Ge";
+            ls_periodic.EnglishName = "Germanium";
+            ls_periodic.K_Peak = "9.885";
+            ls_periodic.L_Peak = "1.188";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "锗";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "33";
+            ls_periodic.EleWeight = "74.922";
+            ls_periodic.Symbol = "As";
+            ls_periodic.EnglishName = "Arsenic";
+            ls_periodic.K_Peak = "10.542";
+            ls_periodic.L_Peak = "1.282";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "砷";
+            ls_periodic.Classfication = "img_rhombohedral";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "34";
+            ls_periodic.EleWeight = "78.96";
+            ls_periodic.Symbol = "Se";
+            ls_periodic.EnglishName = "Selenium";
+            ls_periodic.K_Peak = "11.220";
+            ls_periodic.L_Peak = "1.379";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "硒";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "35";
+            ls_periodic.EleWeight = "79Br904";
+            ls_periodic.Symbol = "Br";
+            ls_periodic.EnglishName = "Bromine";
+            ls_periodic.K_Peak = "11.922";
+            ls_periodic.L_Peak = "1.480";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "溴";
+            ls_periodic.Classfication = "img_orthohombic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "36";
+            ls_periodic.EleWeight = "83.80";
+            ls_periodic.Symbol = "Kr";
+            ls_periodic.EnglishName = "Krypton";
+            ls_periodic.K_Peak = "12.649";
+            ls_periodic.L_Peak = "1.586";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "氪";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "37";
+            ls_periodic.EleWeight = "85.468";
+            ls_periodic.Symbol = "Rb";
+            ls_periodic.EnglishName = "Rubidium";
+            ls_periodic.K_Peak = "13.393";
+            ls_periodic.L_Peak = "1.694";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "铷";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "38";
+            ls_periodic.EleWeight = "87.62";
+            ls_periodic.Symbol = "Sr";
+            ls_periodic.EnglishName = "Strontium";
+            ls_periodic.K_Peak = "14.163";
+            ls_periodic.L_Peak = "1.806";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "锶";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "39";
+            ls_periodic.EleWeight = "88.906";
+            ls_periodic.Symbol = "Y";
+            ls_periodic.EnglishName = "Yttrium";
+            ls_periodic.K_Peak = "14.955";
+            ls_periodic.L_Peak = "1.922";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "钇";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "40";
+            ls_periodic.EleWeight = "91.22";
+            ls_periodic.Symbol = "Zr";
+            ls_periodic.EnglishName = "Zirconium";
+            ls_periodic.K_Peak = "15.776";
+            ls_periodic.L_Peak = "2.042";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "锆";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "41";
+            ls_periodic.EleWeight = "92.906";
+            ls_periodic.Symbol = "Nb";
+            ls_periodic.EnglishName = "Niobium";
+            ls_periodic.K_Peak = "16.617";
+            ls_periodic.L_Peak = "2.166";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "铌";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "42";
+            ls_periodic.EleWeight = "95.94";
+            ls_periodic.Symbol = "Mo";
+            ls_periodic.EnglishName = "Molybdenum";
+            ls_periodic.K_Peak = "17.481";
+            ls_periodic.L_Peak = "2.293";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "钼";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "43";
+            ls_periodic.EleWeight = "(98)";
+            ls_periodic.Symbol = "Tc";
+            ls_periodic.EnglishName = "Technetium";
+            ls_periodic.K_Peak = "18.368";
+            ls_periodic.L_Peak = "2.424";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "锝";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "44";
+            ls_periodic.EleWeight = "101.07";
+            ls_periodic.Symbol = "Ru";
+            ls_periodic.EnglishName = "Ruthenium";
+            ls_periodic.K_Peak = "19.282";
+            ls_periodic.L_Peak = "2.558";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "钌";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "45";
+            ls_periodic.EleWeight = "102.906";
+            ls_periodic.Symbol = "Rh";
+            ls_periodic.EnglishName = "Rhodium";
+            ls_periodic.K_Peak = "20.217";
+            ls_periodic.L_Peak = "2.696";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "铑";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "46";
+            ls_periodic.EleWeight = "106.42";
+            ls_periodic.Symbol = "Pd";
+            ls_periodic.EnglishName = "Palladium";
+            ls_periodic.K_Peak = "21.180";
+            ls_periodic.L_Peak = "2.838";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "钯";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "47";
+            ls_periodic.EleWeight = "107.868";
+            ls_periodic.Symbol = "Ag";
+            ls_periodic.EnglishName = "Silver";
+            ls_periodic.K_Peak = "22.166";
+            ls_periodic.L_Peak = "2.984";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "银";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "48";
+            ls_periodic.EleWeight = "112.41";
+            ls_periodic.Symbol = "Cd";
+            ls_periodic.EnglishName = "Cadmium";
+            ls_periodic.K_Peak = "23.175";
+            ls_periodic.L_Peak = "3.133";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "镉";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "49";
+            ls_periodic.EleWeight = "114.82";
+            ls_periodic.Symbol = "In";
+            ls_periodic.EnglishName = "Indium";
+            ls_periodic.K_Peak = "24.209";
+            ls_periodic.L_Peak = "3.286";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "铟";
+            ls_periodic.Classfication = "img_teragonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "50";
+            ls_periodic.EleWeight = "118.71";
+            ls_periodic.Symbol = "Sn";
+            ls_periodic.EnglishName = "Tin";
+            ls_periodic.K_Peak = "25.272";
+            ls_periodic.L_Peak = "3.443";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "锡";
+            ls_periodic.Classfication = "img_teragonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "51";
+            ls_periodic.EleWeight = "121.76";
+            ls_periodic.Symbol = "Sb";
+            ls_periodic.EnglishName = "Antimony";
+            ls_periodic.K_Peak = "26.359";
+            ls_periodic.L_Peak = "3.604";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "锑";
+            ls_periodic.Classfication = "img_rhombohedral";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "52";
+            ls_periodic.EleWeight = "127.60";
+            ls_periodic.Symbol = "Te";
+            ls_periodic.EnglishName = "Tellurium";
+            ls_periodic.K_Peak = "27.471";
+            ls_periodic.L_Peak = "3.768";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "碲";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "53";
+            ls_periodic.EleWeight = "126.905";
+            ls_periodic.Symbol = "I";
+            ls_periodic.EnglishName = "Iodine";
+            ls_periodic.K_Peak = "28.615";
+            ls_periodic.L_Peak = "3.937";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "碘";
+            ls_periodic.Classfication = "img_orthohombic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "54";
+            ls_periodic.EleWeight = "131.29";
+            ls_periodic.Symbol = "Xe";
+            ls_periodic.EnglishName = "Xenon";
+            ls_periodic.K_Peak = "29.779";
+            ls_periodic.L_Peak = "4.109";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "氙";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "55";
+            ls_periodic.EleWeight = "132.905";
+            ls_periodic.Symbol = "Cs";
+            ls_periodic.EnglishName = "Cesium";
+            ls_periodic.K_Peak = "30.971";
+            ls_periodic.L_Peak = "4.286";
+            ls_periodic.M_Peak = "-";
+            ls_periodic.ChineseName = "铯";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "56";
+            ls_periodic.EleWeight = "137.33";
+            ls_periodic.Symbol = "Ba";
+            ls_periodic.EnglishName = "Barium";
+            ls_periodic.K_Peak = "32.196";
+            ls_periodic.L_Peak = "4.465";
+            ls_periodic.M_Peak = "0.779";
+            ls_periodic.ChineseName = "钡";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "57";
+            ls_periodic.EleWeight = "138.906";
+            ls_periodic.Symbol = "La";
+            ls_periodic.EnglishName = "Lanthanum";
+            ls_periodic.K_Peak = "33.441";
+            ls_periodic.L_Peak = "4.650";
+            ls_periodic.M_Peak = "0.833";
+            ls_periodic.ChineseName = "镧";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "72";
+            ls_periodic.EleWeight = "178.49";
+            ls_periodic.Symbol = "Hf";
+            ls_periodic.EnglishName = "Hafnium";
+            ls_periodic.K_Peak = "55.801";
+            ls_periodic.L_Peak = "7.898";
+            ls_periodic.M_Peak = "1.644";
+            ls_periodic.ChineseName = "铪";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "73";
+            ls_periodic.EleWeight = "180.948";
+            ls_periodic.Symbol = "Ta";
+            ls_periodic.EnglishName = "Tantalum";
+            ls_periodic.K_Peak = "57.450";
+            ls_periodic.L_Peak = "8.145";
+            ls_periodic.M_Peak = "1.709";
+            ls_periodic.ChineseName = "钽";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "74";
+            ls_periodic.EleWeight = "183.85";
+            ls_periodic.Symbol = "W";
+            ls_periodic.EnglishName = "Tungsten";
+            ls_periodic.K_Peak = "59.305";
+            ls_periodic.L_Peak = "8.396";
+            ls_periodic.M_Peak = "1.774";
+            ls_periodic.ChineseName = "钨";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "75";
+            ls_periodic.EleWeight = "186.207";
+            ls_periodic.Symbol = "Re";
+            ls_periodic.EnglishName = "Rhenium";
+            ls_periodic.K_Peak = "61.122";
+            ls_periodic.L_Peak = "8.651";
+            ls_periodic.M_Peak = "1.842";
+            ls_periodic.ChineseName = "铼";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "76";
+            ls_periodic.EleWeight = "190.2";
+            ls_periodic.Symbol = "Os";
+            ls_periodic.EnglishName = "Osmium";
+            ls_periodic.K_Peak = "62.989";
+            ls_periodic.L_Peak = "8.910";
+            ls_periodic.M_Peak = "1.910";
+            ls_periodic.ChineseName = "锇";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "77";
+            ls_periodic.EleWeight = "192.22";
+            ls_periodic.Symbol = "Ir";
+            ls_periodic.EnglishName = "Iridium";
+            ls_periodic.K_Peak = "64.906";
+            ls_periodic.L_Peak = "9.174";
+            ls_periodic.M_Peak = "1.978";
+            ls_periodic.ChineseName = "铱";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "78";
+            ls_periodic.EleWeight = "195.08";
+            ls_periodic.Symbol = "Pt";
+            ls_periodic.EnglishName = "Platinium";
+            ls_periodic.K_Peak = "66.834";
+            ls_periodic.L_Peak = "9.441";
+            ls_periodic.M_Peak = "2.048";
+            ls_periodic.ChineseName = "铂";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "79";
+            ls_periodic.EleWeight = "196.967";
+            ls_periodic.Symbol = "Au";
+            ls_periodic.EnglishName = "Gold";
+            ls_periodic.K_Peak = "68.804";
+            ls_periodic.L_Peak = "9.712";
+            ls_periodic.M_Peak = "2.120";
+            ls_periodic.ChineseName = "金";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "80";
+            ls_periodic.EleWeight = "200.59";
+            ls_periodic.Symbol = "Hg";
+            ls_periodic.EnglishName = "Mercury";
+            ls_periodic.K_Peak = "70.806";
+            ls_periodic.L_Peak = "9.987";
+            ls_periodic.M_Peak = "2.191";
+            ls_periodic.ChineseName = "汞";
+            ls_periodic.Classfication = "img_rhombohedral";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "81";
+            ls_periodic.EleWeight = "204.38";
+            ls_periodic.Symbol = "Tl";
+            ls_periodic.EnglishName = "Thallium";
+            ls_periodic.K_Peak = "72.869";
+            ls_periodic.L_Peak = "10.256";
+            ls_periodic.M_Peak = "2.268";
+            ls_periodic.ChineseName = "铊";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "82";
+            ls_periodic.EleWeight = "207.2";
+            ls_periodic.Symbol = "Pb";
+            ls_periodic.EnglishName = "Lead";
+            ls_periodic.K_Peak = "74.989";
+            ls_periodic.L_Peak = "10.550";
+            ls_periodic.M_Peak = "2.342";
+            ls_periodic.ChineseName = "铅";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "83";
+            ls_periodic.EleWeight = "208.980";
+            ls_periodic.Symbol = "Bi";
+            ls_periodic.EnglishName = "Bismuth";
+            ls_periodic.K_Peak = "77.091";
+            ls_periodic.L_Peak = "10.837";
+            ls_periodic.M_Peak = "2.419";
+            ls_periodic.ChineseName = "铋";
+            ls_periodic.Classfication = "img_rhombohedral";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "84";
+            ls_periodic.EleWeight = "(209)";
+            ls_periodic.Symbol = "Po";
+            ls_periodic.EnglishName = "Polonium";
+            ls_periodic.K_Peak = "79.272";
+            ls_periodic.L_Peak = "11.129";
+            ls_periodic.M_Peak = "2.505";
+            ls_periodic.ChineseName = "钋";
+            ls_periodic.Classfication = "img_Monoclinic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "85";
+            ls_periodic.EleWeight = "(210)";
+            ls_periodic.Symbol = "At";
+            ls_periodic.EnglishName = "Astatine";
+            ls_periodic.K_Peak = "81.513";
+            ls_periodic.L_Peak = "11.425";
+            ls_periodic.M_Peak = "2.585";
+            ls_periodic.ChineseName = "砹";
+            ls_periodic.Classfication = "";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "86";
+            ls_periodic.EleWeight = "(222)";
+            ls_periodic.Symbol = "Rn";
+            ls_periodic.EnglishName = "Radon";
+            ls_periodic.K_Peak = "83.771";
+            ls_periodic.L_Peak = "11.725";
+            ls_periodic.M_Peak = "2.665";
+            ls_periodic.ChineseName = "氡";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "87";
+            ls_periodic.EleWeight = "(223)";
+            ls_periodic.Symbol = "Fr";
+            ls_periodic.EnglishName = "Francium";
+            ls_periodic.K_Peak = "86.098";
+            ls_periodic.L_Peak = "12.029";
+            ls_periodic.M_Peak = "2.747";
+            ls_periodic.ChineseName = "钫";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "88";
+            ls_periodic.EleWeight = "226.025";
+            ls_periodic.Symbol = "Ra";
+            ls_periodic.EnglishName = "Radium";
+            ls_periodic.K_Peak = "88.480";
+            ls_periodic.L_Peak = "12.338";
+            ls_periodic.M_Peak = "2.830";
+            ls_periodic.ChineseName = "镭";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "89";
+            ls_periodic.EleWeight = "227.028";
+            ls_periodic.Symbol = "Ac";
+            ls_periodic.EnglishName = "Actinium";
+            ls_periodic.K_Peak = "90.880";
+            ls_periodic.L_Peak = "12.650";
+            ls_periodic.M_Peak = "2.915";
+            ls_periodic.ChineseName = "锕";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //最下方的28个元素
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "58";
+            ls_periodic.EleWeight = "140.12";
+            ls_periodic.Symbol = "Ce";
+            ls_periodic.EnglishName = "Cerium";
+            ls_periodic.K_Peak = "34.717";
+            ls_periodic.L_Peak = "4.839";
+            ls_periodic.M_Peak = "0.883";
+            ls_periodic.ChineseName = "铈";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "59";
+            ls_periodic.EleWeight = "140.908";
+            ls_periodic.Symbol = "Pr";
+            ls_periodic.EnglishName = "Praseodymium";
+            ls_periodic.K_Peak = "36.031";
+            ls_periodic.L_Peak = "5.033";
+            ls_periodic.M_Peak = "0.929";
+            ls_periodic.ChineseName = "镨";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "60";
+            ls_periodic.EleWeight = "144.24";
+            ls_periodic.Symbol = "Nd";
+            ls_periodic.EnglishName = "Neodymium";
+            ls_periodic.K_Peak = "37.358";
+            ls_periodic.L_Peak = "5.229";
+            ls_periodic.M_Peak = "0.978";
+            ls_periodic.ChineseName = "钕";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "61";
+            ls_periodic.EleWeight = "(145)";
+            ls_periodic.Symbol = "Pm";
+            ls_periodic.EnglishName = "Promethium";
+            ls_periodic.K_Peak = "38.725";
+            ls_periodic.L_Peak = "5.432";
+            ls_periodic.M_Peak = "1.032";
+            ls_periodic.ChineseName = "钷";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "62";
+            ls_periodic.EleWeight = "150.36";
+            ls_periodic.Symbol = "Sm";
+            ls_periodic.EnglishName = "Samarium";
+            ls_periodic.K_Peak = "40.118";
+            ls_periodic.L_Peak = "5.635";
+            ls_periodic.M_Peak = "1.081";
+            ls_periodic.ChineseName = "钐";
+            ls_periodic.Classfication = "img_rhombohedral";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "63";
+            ls_periodic.EleWeight = "151.97";
+            ls_periodic.Symbol = "Eu";
+            ls_periodic.EnglishName = "Europium";
+            ls_periodic.K_Peak = "41.534";
+            ls_periodic.L_Peak = "5.845";
+            ls_periodic.M_Peak = "1.137";
+            ls_periodic.ChineseName = "铕";
+            ls_periodic.Classfication = "img_cubicbodycentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "64";
+            ls_periodic.EleWeight = "157.25";
+            ls_periodic.Symbol = "Gd";
+            ls_periodic.EnglishName = "Gadolinium";
+            ls_periodic.K_Peak = "42.992";
+            ls_periodic.L_Peak = "6.056";
+            ls_periodic.M_Peak = "1.185";
+            ls_periodic.ChineseName = "铕";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "65";
+            ls_periodic.EleWeight = "158.925";
+            ls_periodic.Symbol = "Tb";
+            ls_periodic.EnglishName = "Terbium";
+            ls_periodic.K_Peak = "44.476";
+            ls_periodic.L_Peak = "6.272";
+            ls_periodic.M_Peak = "1.240";
+            ls_periodic.ChineseName = "铽";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "66";
+            ls_periodic.EleWeight = "162.50";
+            ls_periodic.Symbol = "Dy";
+            ls_periodic.EnglishName = "Dysprosium";
+            ls_periodic.K_Peak = "45.997";
+            ls_periodic.L_Peak = "6.494";
+            ls_periodic.M_Peak = "1.293";
+            ls_periodic.ChineseName = "镝";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "67";
+            ls_periodic.EleWeight = "164.930";
+            ls_periodic.Symbol = "Ho";
+            ls_periodic.EnglishName = "Holmium";
+            ls_periodic.K_Peak = "47.534";
+            ls_periodic.L_Peak = "6.719";
+            ls_periodic.M_Peak = "1.347";
+            ls_periodic.ChineseName = "钬";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "68";
+            ls_periodic.EleWeight = "167.26";
+            ls_periodic.Symbol = "Er";
+            ls_periodic.EnglishName = "Erbium";
+            ls_periodic.K_Peak = "49.100";
+            ls_periodic.L_Peak = "6.947";
+            ls_periodic.M_Peak = "1.405";
+            ls_periodic.ChineseName = "铒";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "69";
+            ls_periodic.EleWeight = "168.934";
+            ls_periodic.Symbol = "Tm";
+            ls_periodic.EnglishName = "Thulium";
+            ls_periodic.K_Peak = "50.730";
+            ls_periodic.L_Peak = "7.179";
+            ls_periodic.M_Peak = "1.462";
+            ls_periodic.ChineseName = "铥";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "70";
+            ls_periodic.EleWeight = "173.04";
+            ls_periodic.Symbol = "Yb";
+            ls_periodic.EnglishName = "Ytterbium";
+            ls_periodic.K_Peak = "52.362";
+            ls_periodic.L_Peak = "7.414";
+            ls_periodic.M_Peak = "1.521";
+            ls_periodic.ChineseName = "镱";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "71";
+            ls_periodic.EleWeight = "174.967";
+            ls_periodic.Symbol = "Lu";
+            ls_periodic.EnglishName = "Lutetium";
+            ls_periodic.K_Peak = "54.078";
+            ls_periodic.L_Peak = "7.654";
+            ls_periodic.M_Peak = "1.581";
+            ls_periodic.ChineseName = "镥";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "90";
+            ls_periodic.EleWeight = "232.038";
+            ls_periodic.Symbol = "Th";
+            ls_periodic.EnglishName = "Thorium";
+            ls_periodic.K_Peak = "93.382";
+            ls_periodic.L_Peak = "12.967";
+            ls_periodic.M_Peak = "2.991";
+            ls_periodic.ChineseName = "钍";
+            ls_periodic.Classfication = "img_cubicfacecentered";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "91";
+            ls_periodic.EleWeight = "231.036";
+            ls_periodic.Symbol = "Pa";
+            ls_periodic.EnglishName = "Protoactinium";
+            ls_periodic.K_Peak = "95.886";
+            ls_periodic.L_Peak = "13.288";
+            ls_periodic.M_Peak = "3.077";
+            ls_periodic.ChineseName = "镤";
+            ls_periodic.Classfication = "img_orthohombic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "92";
+            ls_periodic.EleWeight = "238.029";
+            ls_periodic.Symbol = "U";
+            ls_periodic.EnglishName = "Uranium";
+            ls_periodic.K_Peak = "98.434";
+            ls_periodic.L_Peak = "13.612";
+            ls_periodic.M_Peak = "3.165";
+            ls_periodic.ChineseName = "铀";
+            ls_periodic.Classfication = "img_orthohombic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "93";
+            ls_periodic.EleWeight = "237.048";
+            ls_periodic.Symbol = "Np";
+            ls_periodic.EnglishName = "Neptunium";
+            ls_periodic.K_Peak = "100.800";
+            ls_periodic.L_Peak = "13.941";
+            ls_periodic.M_Peak = "3.253";
+            ls_periodic.ChineseName = "镎";
+            ls_periodic.Classfication = "img_orthohombic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "94";
+            ls_periodic.EleWeight = "(244)";
+            ls_periodic.Symbol = "Pu";
+            ls_periodic.EnglishName = "Plutonium";
+            ls_periodic.K_Peak = "103.320";
+            ls_periodic.L_Peak = "14.275";
+            ls_periodic.M_Peak = "3.344";
+            ls_periodic.ChineseName = "钚";
+            ls_periodic.Classfication = "img_Monoclinic";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "95";
+            ls_periodic.EleWeight = "(243)";
+            ls_periodic.Symbol = "Am";
+            ls_periodic.EnglishName = "Americium";
+            ls_periodic.K_Peak = "105.970";
+            ls_periodic.L_Peak = "14.615";
+            ls_periodic.M_Peak = "3.435";
+            ls_periodic.ChineseName = "镅";
+            ls_periodic.Classfication = "img_Hexagonal";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "96";
+            ls_periodic.EleWeight = "(247)";
+            ls_periodic.Symbol = "Cm";
+            ls_periodic.EnglishName = "Curium";
+            ls_periodic.K_Peak = "108.737";
+            ls_periodic.L_Peak = "14.961";
+            ls_periodic.M_Peak = "3.539";
+            ls_periodic.ChineseName = "锔";
+            ls_periodic.Classfication = "";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "97";
+            ls_periodic.EleWeight = "(247)";
+            ls_periodic.Symbol = "Bk";
+            ls_periodic.EnglishName = "Berkelium";
+            ls_periodic.K_Peak = "111.676";
+            ls_periodic.L_Peak = "15.309";
+            ls_periodic.M_Peak = "3.634";
+            ls_periodic.ChineseName = "锫";
+            ls_periodic.Classfication = "";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "98";
+            ls_periodic.EleWeight = "(251)";
+            ls_periodic.Symbol = "Cf";
+            ls_periodic.EnglishName = "Californium";
+            ls_periodic.K_Peak = "114.778";
+            ls_periodic.L_Peak = "15.661";
+            ls_periodic.M_Peak = "3.731";
+            ls_periodic.ChineseName = "锎";
+            ls_periodic.Classfication = "";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "99";
+            ls_periodic.EleWeight = "(252)";
+            ls_periodic.Symbol = "Es";
+            ls_periodic.EnglishName = "Einsteinium";
+            ls_periodic.K_Peak = "-";
+            ls_periodic.L_Peak = "16.018";
+            ls_periodic.M_Peak = "3.829";
+            ls_periodic.ChineseName = "锿";
+            ls_periodic.Classfication = "";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "100";
+            ls_periodic.EleWeight = "(257)";
+            ls_periodic.Symbol = "Fm";
+            ls_periodic.EnglishName = "Fermium";
+            ls_periodic.K_Peak = "";
+            ls_periodic.L_Peak = "";
+            ls_periodic.M_Peak = "";
+            ls_periodic.ChineseName = "镄";
+            ls_periodic.Classfication = "";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "101";
+            ls_periodic.EleWeight = "(258)";
+            ls_periodic.Symbol = "Md";
+            ls_periodic.EnglishName = "Mendelevium";
+            ls_periodic.K_Peak = "";
+            ls_periodic.L_Peak = "";
+            ls_periodic.M_Peak = "";
+            ls_periodic.ChineseName = "钔";
+            ls_periodic.Classfication = "";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "102";
+            ls_periodic.EleWeight = "(259)";
+            ls_periodic.Symbol = "No";
+            ls_periodic.EnglishName = "Nobelium";
+            ls_periodic.K_Peak = "";
+            ls_periodic.L_Peak = "";
+            ls_periodic.M_Peak = "";
+            ls_periodic.ChineseName = "锘";
+            ls_periodic.Classfication = "";
+            List_Periodic.Add(ls_periodic);
+
+            //维护表-----------------------------
+            ls_periodic = new Periodic();
+            ls_periodic.Number = "103";
+            ls_periodic.EleWeight = "(260)";
+            ls_periodic.Symbol = "Lr";
+            ls_periodic.EnglishName = "Lawrencium";
+            ls_periodic.K_Peak = "";
+            ls_periodic.L_Peak = "";
+            ls_periodic.M_Peak = "";
+            ls_periodic.ChineseName = "铹";
+            ls_periodic.Classfication = "";
+            List_Periodic.Add(ls_periodic);
+
+            return List_Periodic;
+        }
+
+        /// <summary>
+        /// 根据传入的元素名判断,该元素是否存在于此元素表中
+        /// </summary>
+        /// <param name="in_list_periodic"></param>
+        /// <param name="str_ysm"></param>
+        /// <returns></returns>
+        public static bool ExistPeriodicByEleName( string str_ysm)
+        {
+            List<Periodic> in_list_periodic = GetListPeriodic();
+            for (int i = 0; i < in_list_periodic.Count(); i++)
+            {
+                if (str_ysm.ToUpper() == in_list_periodic[i].Symbol.ToUpper())
+                {
+                    return true;
+                }
+            }
+            return false;
+        }
+
+        /// <summary>
+        /// 根据传入的元素名,获得元素类对象
+        /// </summary>
+        /// <param name="in_list_periodic"></param>
+        /// <param name="str_ysm"></param>
+        /// <returns></returns>
+        public static Periodic GetPeriodicByEleName( string str_ysm)
+        {
+            List<Periodic> in_list_periodic = GetListPeriodic();
+            Periodic ls_p = new Periodic();
+            for (int i = 0; i < in_list_periodic.Count(); i++)
+            {
+                if (str_ysm.ToUpper() == in_list_periodic[i].Symbol.ToUpper())
+                {
+                    ls_p = in_list_periodic[i];
+                    break;
+                }
+            }
+            return ls_p;
+        }
+
+        /// <summary>
+        /// 根据传入的序号,获得元素类对象
+        /// </summary>
+        /// <param name="in_list_periodic"></param>
+        /// <param name="str_xh"></param>
+        /// <returns></returns>
+        public static Periodic GetPeriodicByNumber( string str_xh)
+        {
+            List<Periodic> in_list_periodic = GetListPeriodic();
+            Periodic ls_p = new Periodic();
+            for (int i = 0; i < in_list_periodic.Count(); i++)
+            {
+                if (str_xh.ToUpper() == in_list_periodic[i].Number.ToUpper())
+                {
+                    ls_p = in_list_periodic[i];
+                }
+            }
+            return ls_p;
+        }
+    }
+
+    //夹杂物结构类的子类,元素类
+    public class ElementRange
+    {
+        string _rangeid;
+        string _rangenum;
+        string _stdid;
+        string _rangestart;
+        string _rangeend;
+        string _atomnum;
+        string _percentage;
+        string _molarratio;
+
+        /// <summary>
+        /// id?
+        /// </summary>
+        public string RangeID
+        {
+            get { return _rangeid; }
+            set { _rangeid = value; }
+        }
+
+        /// <summary>
+        /// 数量?
+        /// </summary>
+        public string RangeNum
+        {
+            get { return _rangenum; }
+            set { _rangenum = value; }
+        }
+
+        /// <summary>
+        /// 夹杂物ID
+        /// </summary>
+        public string STDID
+        {
+            get { return _stdid; }
+            set { _stdid = value; }
+        }
+
+        /// <summary>
+        /// 起
+        /// </summary>
+        public string RangeStart
+        {
+            get { return _rangestart; }
+            set { _rangestart = value; }
+        }
+
+        /// <summary>
+        /// 止
+        /// </summary>
+        public string RangeEnd
+        {
+            get { return _rangeend; }
+            set { _rangeend = value; }
+        }
+
+        /// <summary>
+        /// 原子数
+        /// </summary>
+        public string AtomNum
+        {
+            get { return _atomnum; }
+            set { _atomnum = value; }
+        }
+
+        /// <summary>
+        /// 比例
+        /// </summary>
+        public string Percentage
+        {
+            get { return _percentage; }
+            set { _percentage = value; }
+        }
+
+        /// <summary>
+        /// 摩尔比
+        /// </summary>
+        public string MolarRatio
+        {
+            get { return _molarratio; }
+            set { _molarratio = value; }
+        }
+
+    }
+
+    //夹杂物结构类
+    public class IncALib
+    {
+        string _name;   //名称
+        string _incaid; //夹杂物ID
+        string _color;  //颜色
+        string _heightwidthratio;   //宽高比
+        string _graystart;  //起
+        string _grayend;    //止
+        string _rangeelementnum;//数量
+        List<ElementRange> m_list_elementrange;
+
+        /// <summary>
+        /// 构造函数
+        /// </summary>
+        public IncALib()
+        {
+            //m_list_periodic = new List<Periodic>();
+            m_list_elementrange = new List<ElementRange>();
+        }
+
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string Name
+        {
+            get { return _name; }
+            set { _name = value; }
+        }
+
+        /// <summary>
+        /// 夹杂物ID
+        /// </summary>
+        public string IncAId
+        {
+            get { return _incaid; }
+            set { _incaid = value; }
+        }
+
+        /// <summary>
+        /// 颜色
+        /// </summary>
+        public string Color
+        {
+            get { return _color; }
+            set { _color = value; }
+        }
+
+        /// <summary>
+        /// 宽高比
+        /// </summary>
+        public string HeightWidthRatio
+        {
+            get { return _heightwidthratio; }
+            set { _heightwidthratio = value; }
+        }
+
+        /// <summary>
+        /// 起
+        /// </summary>
+        public string GrayStart
+        {
+            get { return _graystart; }
+            set { _graystart = value; }
+        }
+
+        /// <summary>
+        /// 止
+        /// </summary>
+        public string GrayEnd
+        {
+            get { return _grayend; }
+            set { _grayend = value; }
+        }
+
+        /// <summary>
+        /// 元素数量
+        /// </summary>
+        public string RangeElementNum
+        {
+            get { return _rangeelementnum; }
+            set { _rangeelementnum = value; }
+        }
+
+        /// <summary>
+        /// 所包含的元素
+        /// </summary>
+        public List<ElementRange> List_ElementRange
+        {
+            get { return m_list_elementrange; }
+            set { m_list_elementrange = value; }
+        }
+    }
+
+
+    //元素包含信息结构
+    public class Periodic
+    {
+        string _xh;         //序号
+        string _yzzl;    //原子重量,因为有标记的重量带有()括号,所以这里先用字符串进行存储
+        string _fh;      //符号
+        string _zwysm;   //中文元素名
+        string _ywm;     //英文名 
+        string _sx1;     //属性1
+        string _sx2;     //属性2
+        string _sx3;     //属性3
+        string _fl;      //分类
+
+        /// <summary>
+        /// 序号
+        /// </summary>
+        public string Number
+        {
+            get { return _xh; }
+            set { _xh = value; }
+        }
+        /// <summary>
+        /// 原子重量
+        /// </summary>
+        public string EleWeight
+        {
+            get { return _yzzl; }
+            set { _yzzl = value; }
+        }
+        /// <summary>
+        /// 符号
+        /// </summary>
+        public string Symbol
+        {
+            get { return _fh; }
+            set { _fh = value; }
+        }
+        /// <summary>
+        /// 中文元素名
+        /// </summary>
+        public string ChineseName
+        {
+            get { return _zwysm; }
+            set { _zwysm = value; }
+        }
+        /// <summary>
+        /// 英文名
+        /// </summary>
+        public string EnglishName
+        {
+            get { return _ywm; }
+            set { _ywm = value; }
+        }
+        /// <summary>
+        /// K峰
+        /// </summary>
+        public string K_Peak
+        {
+            get { return _sx1; }
+            set { _sx1 = value; }
+        }
+        /// <summary>
+        /// L峰
+        /// </summary>
+        public string L_Peak
+        {
+            get { return _sx2; }
+            set { _sx2 = value; }
+        }
+        /// <summary>
+        /// 属性3
+        /// </summary>
+        public string M_Peak
+        {
+            get { return _sx3; }
+            set { _sx3 = value; }
+        }
+        /// <summary>
+        /// 分类
+        /// </summary>
+        public string Classfication
+        {
+            get { return _fl; }
+            set { _fl = value; }
+        }
+    }
+}

+ 3 - 3
OTSIncAMeasureApp/1-OTSMeasure/OTSMeasureDisplayResult.cs

@@ -167,7 +167,7 @@ namespace OTSMeasureApp
             //删除点标记
             m_MeasureApps.m_MessureStatuWindow.DelElementPointGDIObjects();
             //显示BSE图
-            m_MeasureApps.m_MessureStatuWindow.pbBSEImage.Show();
+            m_MeasureApps.m_MessureStatuWindow.picBox.Show();
   
             //显示BSE图
             m_MeasureApps.m_MessureStatuWindow.ShowImage(width, height, ImageData);
@@ -519,9 +519,9 @@ namespace OTSMeasureApp
                                     //图片高度
                                     int height = SMsrData.STMSampleRetData.BSEData.iBSEDataHeight;
                                     //显示状态中的BSE图像控件
-                                    if (!m_MeasureApp.m_MessureStatuWindow.pbBSEImage.Visible)
+                                    if (!m_MeasureApp.m_MessureStatuWindow.picBox.Visible)
                                     {
-                                        m_MeasureApp.m_MessureStatuWindow.pbBSEImage.Visible = true;
+                                        m_MeasureApp.m_MessureStatuWindow.picBox.Visible = true;
                                     }
                                     //调用测量状态TAB中窗体 显示BSE图片
                                     OTSMeasureStatusWindowFun(width, height, ImageData, m_MeasureApp);

+ 1 - 1
OTSIncAMeasureApp/4-OTSSamplespaceGraphicsPanel/OTSSamplespaceWindow.cs

@@ -783,7 +783,7 @@ namespace OTSMeasureApp
         
         public void HideMessureStatuWindowBSEImage(OTSIncAMeasureAppForm m_MeasureApps)
         {
-            m_MeasureApps.m_MessureStatuWindow.pbBSEImage.Hide();
+            m_MeasureApps.m_MessureStatuWindow.picBox.Hide();
         }
         #region 将测量状态进度窗口信息初始化
         public void InitMeasureStateInfo()

+ 9 - 9
OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/Control_XRayTable.cs

@@ -327,33 +327,33 @@ namespace OTSIncAGraph.Controls
             for (int i = 0; i < m_list_periodic.Count(); i++)
             {
                 //先对三个值进行转换,转出应有的值
-                if (m_list_periodic[i].SX1 != "" && m_list_periodic[i].SX1 != "-")
+                if (m_list_periodic[i].K_Peak != "" && m_list_periodic[i].K_Peak != "-")
                 {
-                    ls_f_sx1 = (float)Convert.ToDouble(m_list_periodic[i].SX1);
+                    ls_f_sx1 = (float)Convert.ToDouble(m_list_periodic[i].K_Peak);
                 }
-                if (m_list_periodic[i].SX2 != "" && m_list_periodic[i].SX2 != "-")
+                if (m_list_periodic[i].L_Peak != "" && m_list_periodic[i].L_Peak != "-")
                 {
-                    ls_f_sx2 = (float)Convert.ToDouble(m_list_periodic[i].SX2);
+                    ls_f_sx2 = (float)Convert.ToDouble(m_list_periodic[i].L_Peak);
                 }
-                if (m_list_periodic[i].SX3 != "" && m_list_periodic[i].SX3 != "-")
+                if (m_list_periodic[i].M_Peak != "" && m_list_periodic[i].M_Peak != "-")
                 {
-                    ls_f_sx3 = (float)Convert.ToDouble(m_list_periodic[i].SX3);
+                    ls_f_sx3 = (float)Convert.ToDouble(m_list_periodic[i].M_Peak);
                 }
 
                 //然后再对该值进行判断,如果在范围内,则判断为该元素
                 if (kml_value >= (ls_f_sx1 - f_rect) && kml_value < (ls_f_sx1 + f_rect))
                 {
-                    str_ret = m_list_periodic[i].FH;
+                    str_ret = m_list_periodic[i].Symbol;
                     break;
                 }
                 if (kml_value >= (ls_f_sx2 - f_rect) && kml_value < (ls_f_sx2 + f_rect))
                 {
-                    str_ret = m_list_periodic[i].FH;
+                    str_ret = m_list_periodic[i].Symbol ;
                     break;
                 }
                 if (kml_value >= (ls_f_sx3 - f_rect) && kml_value < (ls_f_sx3 + f_rect))
                 {
-                    str_ret = m_list_periodic[i].FH;
+                    str_ret = m_list_periodic[i].Symbol;
                     break;
                 }
             }

+ 17 - 17
OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.Designer.cs

@@ -33,7 +33,7 @@
             System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
             System.Windows.Forms.DataVisualization.Charting.Series series1 = new System.Windows.Forms.DataVisualization.Charting.Series();
             System.Windows.Forms.DataVisualization.Charting.Title title1 = new System.Windows.Forms.DataVisualization.Charting.Title();
-            this.pbBSEImage = new System.Windows.Forms.PictureBox();
+            this.picBox = new System.Windows.Forms.PictureBox();
             this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.SampleParaLock = new System.Windows.Forms.ToolStripMenuItem();
             this.ViewStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -49,25 +49,25 @@
             this.ExportScanInfoMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.myChart = new System.Windows.Forms.DataVisualization.Charting.Chart();
             this.panelXray = new System.Windows.Forms.Panel();
-            ((System.ComponentModel.ISupportInitialize)(this.pbBSEImage)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picBox)).BeginInit();
             this.contextMenuStrip1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.myChart)).BeginInit();
             this.SuspendLayout();
             // 
             // pbBSEImage
             // 
-            this.pbBSEImage.BackColor = System.Drawing.Color.Transparent;
-            this.pbBSEImage.Location = new System.Drawing.Point(0, 0);
-            this.pbBSEImage.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.pbBSEImage.Name = "pbBSEImage";
-            this.pbBSEImage.Size = new System.Drawing.Size(781, 453);
-            this.pbBSEImage.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
-            this.pbBSEImage.TabIndex = 0;
-            this.pbBSEImage.TabStop = false;
-            this.pbBSEImage.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint);
-            this.pbBSEImage.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseClick);
-            this.pbBSEImage.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
-            this.pbBSEImage.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseMove);
+            this.picBox.BackColor = System.Drawing.Color.Transparent;
+            this.picBox.Location = new System.Drawing.Point(0, 0);
+            this.picBox.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.picBox.Name = "pbBSEImage";
+            this.picBox.Size = new System.Drawing.Size(781, 453);
+            this.picBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.picBox.TabIndex = 0;
+            this.picBox.TabStop = false;
+            this.picBox.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint);
+            this.picBox.MouseClick += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseClick);
+            this.picBox.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown);
+            this.picBox.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseMove);
             // 
             // contextMenuStrip1
             // 
@@ -220,7 +220,7 @@
             this.CloseButton = false;
             this.CloseButtonVisible = false;
             this.Controls.Add(this.panelXray);
-            this.Controls.Add(this.pbBSEImage);
+            this.Controls.Add(this.picBox);
             this.Controls.Add(this.myChart);
             this.DockAreas = ((OTS.WinFormsUI.Docking.DockAreas)((OTS.WinFormsUI.Docking.DockAreas.DockTop | OTS.WinFormsUI.Docking.DockAreas.Document)));
             this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
@@ -229,7 +229,7 @@
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.Load += new System.EventHandler(this.OTSMeasureStatusWindow_Load);
             this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.OTSMeasureStatusWindow_MouseClick);
-            ((System.ComponentModel.ISupportInitialize)(this.pbBSEImage)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picBox)).EndInit();
             this.contextMenuStrip1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.myChart)).EndInit();
             this.ResumeLayout(false);
@@ -244,7 +244,7 @@
         private System.Windows.Forms.ToolStripMenuItem MenuItemLineScam;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-        public System.Windows.Forms.PictureBox pbBSEImage;
+        public System.Windows.Forms.PictureBox picBox;
         private System.Windows.Forms.ToolStripMenuItem AbandonGrayStripMenuItem;
         private System.Windows.Forms.ToolStripMenuItem ChangeDiffImageShow;
         private System.Windows.Forms.DataVisualization.Charting.Chart myChart;

+ 61 - 61
OTSIncAMeasureApp/5-OTSMeasureStatuImageFun/OTSMeasureStatusWindow.cs

@@ -155,19 +155,19 @@ namespace OTSMeasureApp
             try
             {
                 Bitmap bitmap = CImageHandler.ToGrayBitmap(bBseData, m_iWidth, m_iHeigh);
-                pbBSEImage.Image = bitmap;
+                picBox.Image = bitmap;
                 //设置Pictrue显示位置
-                pbBSEImage.Height = this.RestoreBounds.Height;
-                pbBSEImage.Width = this.RestoreBounds.Height * 4 / 3;
+                picBox.Height = this.RestoreBounds.Height;
+                picBox.Width = this.RestoreBounds.Height * 4 / 3;
                 //获取黄线坐标位置
-                Rectangle rectangle = GetPictureBoxZoomSize(pbBSEImage);
+                Rectangle rectangle = GetPictureBoxZoomSize(picBox);
                 m_GetBSEImageInitPoint = rectangle.Location;
                 pointStart.X = rectangle.X;
                 pointEnd.X = rectangle.X + rectangle.Width;
                 pointStart.Y = rectangle.Y + (rectangle.Height) / 2;
                 pointEnd.Y = rectangle.Y + (rectangle.Height) / 2;
-                pbBSEImage.Left = 0;
-                pbBSEImage.Top = 0;
+                picBox.Left = 0;
+                picBox.Top = 0;
             }
             catch (Exception ex)
             {
@@ -179,19 +179,19 @@ namespace OTSMeasureApp
             try
             {
 
-                pbBSEImage.Image = coloredImage;
+                picBox.Image = coloredImage;
                 //设置Pictrue显示位置
-                pbBSEImage.Height = this.RestoreBounds.Height;
-                pbBSEImage.Width = this.RestoreBounds.Height * 4 / 3;
+                picBox.Height = this.RestoreBounds.Height;
+                picBox.Width = this.RestoreBounds.Height * 4 / 3;
                 //获取黄线坐标位置
-                Rectangle rectangle = GetPictureBoxZoomSize(pbBSEImage);
+                Rectangle rectangle = GetPictureBoxZoomSize(picBox);
                 m_GetBSEImageInitPoint = rectangle.Location;
                 pointStart.X = rectangle.X;
                 pointEnd.X = rectangle.X + rectangle.Width;
                 pointStart.Y = rectangle.Y + (rectangle.Height) / 2;
                 pointEnd.Y = rectangle.Y + (rectangle.Height) / 2;
-                pbBSEImage.Left = 0;
-                pbBSEImage.Top = 0;
+                picBox.Left = 0;
+                picBox.Top = 0;
             }
             catch (Exception ex)
             {
@@ -225,8 +225,8 @@ namespace OTSMeasureApp
             try
             {
                 //创建位图
-                Rectangle rectangle = GetPictureBoxZoomSize(pbBSEImage);
-                double rate = (double)rectangle.Height / (double)pbBSEImage.Image.Height;
+                Rectangle rectangle = GetPictureBoxZoomSize(picBox);
+                double rate = (double)rectangle.Height / (double)picBox.Image.Height;
                 width = rectangle.Width;
                 height = rectangle.Height;
                 bitmap = new Bitmap(width, height);
@@ -251,7 +251,7 @@ namespace OTSMeasureApp
                     float pointY = 0;
                     for (int i = 0; i < Imagedata.Length; i++)
                     {
-                        pointX = (pbBSEImage.Width - rectangle.Width) / 2 + Convert.ToSingle(i * rate);
+                        pointX = (picBox.Width - rectangle.Width) / 2 + Convert.ToSingle(i * rate);
                         float imagei = (int)GrayLevel.Max - Convert.ToInt32(Imagedata[i]);
                         float imagerate = (Convert.ToSingle(Convert.ToDouble(rectangle.Height) / 510));
                         pointY = imagei * imagerate + (rectangle.Height) / 4;
@@ -361,7 +361,7 @@ namespace OTSMeasureApp
                     }
                     //显示单点扫描元素信息菜单
                     contextMenuStrip1.Items[(int)MeasureStateMenuType.PointScanElementMenuItem].Enabled = false;
-                    pbBSEImage.Hide();
+                    picBox.Hide();
                     return;
                 }
                 else
@@ -389,10 +389,10 @@ namespace OTSMeasureApp
                 m_CurrentMultiple = 0;
 
 
-                pbBSEImage.Height = this.RestoreBounds.Height;
+                picBox.Height = this.RestoreBounds.Height;
 
-                pbBSEImage.Left = 0;
-                pbBSEImage.Top = 0;
+                picBox.Left = 0;
+                picBox.Top = 0;
 
             }
             catch (Exception ex)
@@ -617,7 +617,7 @@ namespace OTSMeasureApp
             //用于线扫描曲线
             m_IsShowImageType = ImageType.BSEImage;
             m_imagetype = ImageType.BSEImage;
-            pbBSEImage.Show();
+            picBox.Show();
 
 
         }
@@ -760,7 +760,7 @@ namespace OTSMeasureApp
                 UpdateImageOrChart(m_imagetype);
 
                 myChart.Visible = false;
-                pbBSEImage.Show();
+                picBox.Show();
                 //切换显示至BSE图
                 contextMenuStrip1.Items[(int)MeasureStateMenuType.ChangeDiffImageShow].Enabled = true;
                 if (OTSCommon.Language.ReadDefaultLanguage() == "ZH")
@@ -796,7 +796,7 @@ namespace OTSMeasureApp
             {
                 m_imagetype = ImageType.GrayLevelChart;
 
-                pbBSEImage.Hide();
+                picBox.Hide();
 
                 //切换显示至BSE图
                 contextMenuStrip1.Items[(int)MeasureStateMenuType.ChangeDiffImageShow].Enabled = true;
@@ -893,13 +893,13 @@ namespace OTSMeasureApp
 
             //添加鼠标点击事件
             myChart.MouseClick += new MouseEventHandler(this.LZMeasureStatusWindow_MouseClick);
-            pbBSEImage.MouseClick += new MouseEventHandler(HiddenXrayTablePanel_MouseClick);
+            picBox.MouseClick += new MouseEventHandler(HiddenXrayTablePanel_MouseClick);
 
             // 
             // pbBSEImage添加鼠标操作
             // 
-            this.pbBSEImage.MouseUp += new MouseEventHandler(this.pbBSEImage_MouseUp);
-            this.pbBSEImage.MouseDown += new MouseEventHandler(this.pbBSEImage_MouseDown);
+            this.picBox.MouseUp += new MouseEventHandler(this.pbBSEImage_MouseUp);
+            this.picBox.MouseDown += new MouseEventHandler(this.pbBSEImage_MouseDown);
 
             this.MouseUp += new MouseEventHandler(this.pbBSEImage_MouseUp);
             this.MouseDown += new MouseEventHandler(this.pbBSEImage_MouseDown);
@@ -1005,7 +1005,7 @@ namespace OTSMeasureApp
 
         private void panel1_Click(object sender, EventArgs e)
         {
-            pbBSEImage.Show();
+            picBox.Show();
         }
 
         private void contextMenuStrip1_Opened(object sender, EventArgs e)
@@ -1101,7 +1101,7 @@ namespace OTSMeasureApp
                     if (MenuItemLineScam.Checked)
                     {
                         IsShowGrayLevelLine = true;
-                        Rectangle rectangle = GetPictureBoxZoomSize(pbBSEImage);
+                        Rectangle rectangle = GetPictureBoxZoomSize(picBox);
                         if (pointStart.Equals(pointEnd))
 
                         {
@@ -1120,7 +1120,7 @@ namespace OTSMeasureApp
                         {
                             drawflag = 1;
                             //Y值
-                            double rate = (double)pbBSEImage.Image.Height / (double)rectangle.Height;
+                            double rate = (double)picBox.Image.Height / (double)rectangle.Height;
                             int YSize = Convert.ToInt32((rate * (double)pointStart.Y));
                             //显示线扫描 黄色线的曲线数据
                             GetLineImage(YSize, m_iWidth, ref Imagedata);
@@ -1192,12 +1192,12 @@ namespace OTSMeasureApp
             try
             {
                 //如果pictureBox1中没有图像 则return退出
-                if (pbBSEImage.Image == null)
+                if (picBox.Image == null)
                 {
                     return;
                 }
                 Control lCtrl = (sender as Control);
-                Rectangle rectangle = GetPictureBoxZoomSize(pbBSEImage);
+                Rectangle rectangle = GetPictureBoxZoomSize(picBox);
                 int startimageX = 0;
                 int startimageY = 0;
                 //处理灰度值
@@ -1213,17 +1213,17 @@ namespace OTSMeasureApp
                 double rateY = 0;
                 if (originalBseData != null)
                 {
-                    if ((pbBSEImage.Width - rectangle.Width) / 2 < e.X && e.X < (pbBSEImage.Width - rectangle.Width) / 2 + rectangle.Width)
+                    if ((picBox.Width - rectangle.Width) / 2 < e.X && e.X < (picBox.Width - rectangle.Width) / 2 + rectangle.Width)
                     {
-                        imageX = e.X - (pbBSEImage.Width - rectangle.Width) / 2;
+                        imageX = e.X - (picBox.Width - rectangle.Width) / 2;
                         rateX = (double)m_iWidth / (double)rectangle.Width;
                         startimageX = Convert.ToInt32(imageX * rateX);
                         m_MouseMoveImageX = startimageX;
 
                         if (MoveFlag)
                         {
-                            pbBSEImage.Left += Convert.ToInt32(e.X - xPos);//设置x坐标.
-                            pbBSEImage.Top += Convert.ToInt32(e.Y - yPos);//设置y坐标.
+                            picBox.Left += Convert.ToInt32(e.X - xPos);//设置x坐标.
+                            picBox.Top += Convert.ToInt32(e.Y - yPos);//设置y坐标.
                         }
                     }
                     else
@@ -1231,9 +1231,9 @@ namespace OTSMeasureApp
                         startimageX = 0;
                         m_MouseMoveImageX = -1;
                     }
-                    if ((pbBSEImage.Height - rectangle.Height) / 2 < e.Y && e.Y < (pbBSEImage.Height - rectangle.Height) / 2 + rectangle.Height)
+                    if ((picBox.Height - rectangle.Height) / 2 < e.Y && e.Y < (picBox.Height - rectangle.Height) / 2 + rectangle.Height)
                     {
-                        imageY = e.Y - (pbBSEImage.Height - rectangle.Height) / 2;
+                        imageY = e.Y - (picBox.Height - rectangle.Height) / 2;
                         rateY = (double)m_iHeight / (double)rectangle.Height;
                         startimageY = Convert.ToInt32(imageY * rateY);
                         m_MouseMoveImageY = startimageY;
@@ -1288,7 +1288,7 @@ namespace OTSMeasureApp
                 }
 
                 //Y值
-                double rate = (double)pbBSEImage.Image.Height / (double)rectangle.Height;
+                double rate = (double)picBox.Image.Height / (double)rectangle.Height;
                 int YSize = Convert.ToInt32((rate * (double)e.Y));
                 //显示线扫描 黄色线的曲线数据
                 GetLineImage(YSize, m_iWidth, ref Imagedata);
@@ -1333,7 +1333,7 @@ namespace OTSMeasureApp
                 pointStart = new Point(pointStart.X, e.Y);
                 pointEnd = new Point(pointEnd.X, e.Y);
 
-                pbBSEImage.Refresh();
+                picBox.Refresh();
             }
             catch (Exception ex)
             {
@@ -1416,7 +1416,7 @@ namespace OTSMeasureApp
                     }
                 }
 
-                pbBSEImage.Hide();
+                picBox.Hide();
 
                 //切换显示至BSE图
                 contextMenuStrip1.Items[(int)MeasureStateMenuType.ChangeDiffImageShow].Enabled = true;
@@ -1458,8 +1458,8 @@ namespace OTSMeasureApp
             {
                 if (e.Button == MouseButtons.Right && e.Clicks == 1)
                 {
-                    int XMenu = pbBSEImage.Left + e.Location.X;
-                    int YMenu = pbBSEImage.Top + e.Location.Y;
+                    int XMenu = picBox.Left + e.Location.X;
+                    int YMenu = picBox.Top + e.Location.Y;
                     Point mousePoint = new Point(XMenu, YMenu);
                     contextMenuStrip1.Show(PointToScreen(mousePoint));
                     //电镜位置信息
@@ -1504,7 +1504,7 @@ namespace OTSMeasureApp
                     m_imagetype = ImageType.BSEImage;
                     //在控件中显示图像
                     ShowImage(m_iWidth, m_iHeight, originalBseData);
-                    pbBSEImage.Show();
+                    picBox.Show();
                     //panel1.Visible = false;
                 }
             }
@@ -1528,7 +1528,7 @@ namespace OTSMeasureApp
                     m_imagetype = ImageType.RemoveBGImage;
                     ShowImage(m_iWidth, m_iHeight, removeBGBseData);
 
-                    pbBSEImage.Show();
+                    picBox.Show();
                 }
             }
             myChart.Visible = false;
@@ -1601,7 +1601,7 @@ namespace OTSMeasureApp
         public void SetMeasureStatusInit()
         {
 
-            pbBSEImage.Hide();
+            picBox.Hide();
             foreach (ToolStripItem item in contextMenuStrip1.Items)
             {
                 if (item != contextMenuStrip1.Items[(int)MeasureStateMenuType.ReadBSEPic])
@@ -1723,8 +1723,8 @@ namespace OTSMeasureApp
         #region 获取线扫描初始位置
         public void GetYSize()
         {
-            Rectangle rectangle = GetPictureBoxZoomSize(pbBSEImage);
-            double rate = (double)pbBSEImage.Image.Height / (double)rectangle.Height;
+            Rectangle rectangle = GetPictureBoxZoomSize(picBox);
+            double rate = (double)picBox.Image.Height / (double)rectangle.Height;
             YSize = Convert.ToInt32((rate * (double)pointStart.Y));
         }
         #endregion
@@ -1914,8 +1914,8 @@ namespace OTSMeasureApp
             }
             //保存Xray图片
             string ImgFilePath = startupPath + DateTime.Now.ToString("yyyyMMddHHmmssfff") + ".jpg";
-            Bitmap bseBM = new Bitmap(this.pbBSEImage.Width, this.pbBSEImage.Height);
-            this.pbBSEImage.DrawToBitmap(bseBM, new Rectangle(0, 0, this.pbBSEImage.Width, this.pbBSEImage.Height));
+            Bitmap bseBM = new Bitmap(this.picBox.Width, this.picBox.Height);
+            this.picBox.DrawToBitmap(bseBM, new Rectangle(0, 0, this.picBox.Width, this.picBox.Height));
             //保存图片
             bseBM.Save(ImgFilePath, System.Drawing.Imaging.ImageFormat.Jpeg);
             //释放资源
@@ -2084,8 +2084,8 @@ namespace OTSMeasureApp
         {
             if (MoveFlag)
             {
-                pbBSEImage.Left = Convert.ToInt32(e.X - xPos);//设置x坐标.
-                pbBSEImage.Top = Convert.ToInt32(e.Y - yPos);//设置y坐标.
+                picBox.Left = Convert.ToInt32(e.X - xPos);//设置x坐标.
+                picBox.Top = Convert.ToInt32(e.Y - yPos);//设置y坐标.
             }
         }
         //在picturebox鼠标缩放
@@ -2097,8 +2097,8 @@ namespace OTSMeasureApp
                 if (m_CurrentMultiple < m_MaxMultipleRange)
                 {
                     m_CurrentMultiple += Convert.ToSingle(m_Multiple.ToString("f2"));
-                    pbBSEImage.Width += Convert.ToInt32(m_iWidth * m_Multiple);
-                    pbBSEImage.Height += Convert.ToInt32(m_iHeight * m_Multiple);
+                    picBox.Width += Convert.ToInt32(m_iWidth * m_Multiple);
+                    picBox.Height += Convert.ToInt32(m_iHeight * m_Multiple);
                     WheelElementPointGDIObjects(e.Location, m_CurrentMultiple);
                 }
             }
@@ -2107,18 +2107,18 @@ namespace OTSMeasureApp
                 m_CurrentMultiple -= Convert.ToSingle(m_Multiple.ToString("f2"));
                 if (m_CurrentMultiple > 0)
                 {
-                    pbBSEImage.Width -= Convert.ToInt32(m_iWidth * m_Multiple);
-                    pbBSEImage.Height -= Convert.ToInt32(m_iHeight * m_Multiple);
+                    picBox.Width -= Convert.ToInt32(m_iWidth * m_Multiple);
+                    picBox.Height -= Convert.ToInt32(m_iHeight * m_Multiple);
                 }
                 else
                 {
                     m_CurrentMultiple = 0;
 
-                    pbBSEImage.Height = this.RestoreBounds.Height;
-                    pbBSEImage.Width = this.RestoreBounds.Height * 4 / 3;
-                    pbBSEImage.Left = 0;
-                    pbBSEImage.Top = 0;
-                    Rectangle rectangle = GetPictureBoxZoomSize(pbBSEImage);
+                    picBox.Height = this.RestoreBounds.Height;
+                    picBox.Width = this.RestoreBounds.Height * 4 / 3;
+                    picBox.Left = 0;
+                    picBox.Top = 0;
+                    Rectangle rectangle = GetPictureBoxZoomSize(picBox);
                     Point sizeChangePoint = rectangle.Location;
                     //修改窗体宽度后,设置单点采集的位置
                     if (m_ElementPointGDIObjects != null)
@@ -2161,7 +2161,7 @@ namespace OTSMeasureApp
             COTSSample cSample = m_MeasureAppForm.m_ProjParam.GetWorkSample();
             int start = cSample.GetMsrParams().GetImageProcessParam().GetBGGray().GetStart();
             int end = cSample.GetMsrParams().GetImageProcessParam().GetBGGray().GetEnd();
-            Image bInput = pbBSEImage.Image;
+            Image bInput = picBox.Image;
             List<ColorMap> colorMapTemp = new List<ColorMap>();
             for (int i = start; i <= end; i++)
             {
@@ -2185,7 +2185,7 @@ namespace OTSMeasureApp
             attr.SetRemapTable(colorMapTemp.ToArray());
             //从输入图像中截图至临时图像中
             g.DrawImage(bInput, ShowRect, 0, 0, DrawRect.Width, DrawRect.Height, GraphicsUnit.Pixel, attr);
-            pbBSEImage.Image = outBitmap;
+            picBox.Image = outBitmap;
         }
 
         private void OTSMeasureStatusWindow_MouseClick(object sender, MouseEventArgs e)

+ 0 - 1
OTSIncAMeasureApp/OTSIncAMeasureApp.csproj

@@ -441,7 +441,6 @@
     <Compile Include="OTSPeriodicTable\OTSPeriodicTableForm_Small.Designer.cs">
       <DependentUpon>OTSPeriodicTableForm_Small.cs</DependentUpon>
     </Compile>
-    <Compile Include="OTSPeriodicTable\Periodic.cs" />
     <Compile Include="OTSPeriodicTable\ThePeriodicTable.cs">
       <SubType>UserControl</SubType>
     </Compile>

+ 13 - 13
OTSIncAMeasureApp/OTSPeriodicTable/OTSPeriodicTableForm.cs

@@ -102,7 +102,7 @@ namespace OTSPeriodicTable
                                 {
                                     User_Element ue = (User_Element)uc3;
                                     //记录用户选择了的元素
-                                    if (ue.lb_fh.Text == m_List_Periodic[i].FH)
+                                    if (ue.lb_fh.Text == m_List_Periodic[i].Symbol)
                                     {
                                         //设置这个元素已经被选择
                                         ue.i_click = 2;
@@ -142,25 +142,25 @@ namespace OTSPeriodicTable
                                 {
                                     //aa++;
                                     Periodic pc = new Periodic();
-                                    pc.XH =ue.lb_xh.Text.ToString().Trim();        //序号
-                                    pc.YZZL = ue.lb_yzzl.Text.ToString().Trim();                     //元素重量
-                                    pc.FH = ue.lb_fh.Text.ToString().Trim();                         //符号
-                                    pc.ZWYSM = ue.zwysm.ToString().Trim();                      //中文元素名
-                                    pc.YWM = ue.lb_xh.Text.ToString().Trim();                         //英文名
+                                    pc.Number =ue.lb_xh.Text.ToString().Trim();        //序号
+                                    pc.EleWeight = ue.lb_yzzl.Text.ToString().Trim();                     //元素重量
+                                    pc.Symbol = ue.lb_fh.Text.ToString().Trim();                         //符号
+                                    pc.ChineseName = ue.zwysm.ToString().Trim();                      //中文元素名
+                                    pc.EnglishName = ue.lb_xh.Text.ToString().Trim();                         //英文名
                                     if ("-" != ue.lb_sx1.Text.ToString().Trim() && "" != ue.lb_sx1.Text.ToString().Trim())
-                                        pc.SX1 = ue.lb_sx1.Text.ToString().Trim();     //属性1
+                                        pc.K_Peak = ue.lb_sx1.Text.ToString().Trim();     //属性1
                                     else
-                                        pc.SX1 = "0";
+                                        pc.K_Peak = "0";
                                     if ("-" != ue.lb_sx2.Text.ToString().Trim() && "" != ue.lb_sx2.Text.ToString().Trim())
-                                        pc.SX2 = ue.lb_sx2.Text.ToString().Trim();     //属性2
+                                        pc.L_Peak = ue.lb_sx2.Text.ToString().Trim();     //属性2
                                     else
-                                        pc.SX2 = "0";
+                                        pc.L_Peak = "0";
                                     if ("-" != ue.lb_sx3.Text.ToString().Trim() && "" != ue.lb_sx3.Text.ToString().Trim())
-                                        pc.SX3 = ue.lb_sx3.Text.ToString().Trim();     //属性3
+                                        pc.M_Peak = ue.lb_sx3.Text.ToString().Trim();     //属性3
                                     else
-                                        pc.SX3 = "0";
+                                        pc.M_Peak = "0";
                                     if (null != ue.pictureBox1.Image.Tag)
-                                        pc.FL = ue.pictureBox1.Image.Tag.ToString();                         //分类
+                                        pc.Classfication = ue.pictureBox1.Image.Tag.ToString();                         //分类
 
                                     m_List_Periodic.Add(pc);
 

+ 11 - 11
OTSIncAMeasureApp/OTSPeriodicTable/OTSPeriodicTableForm_Small.cs

@@ -172,7 +172,7 @@ namespace OTSPeriodicTable
                                 {
                                     User_Element_Small ue = (User_Element_Small)uc3;
                                     //记录用户选择了的元素
-                                    if (ue.lb_fh.Text  == m_List_Periodic[i].FH)
+                                    if (ue.lb_fh.Text  == m_List_Periodic[i].Symbol)
                                     {
                                         //设置这个元素已经被选择
                                         ue.i_click = 2;
@@ -211,23 +211,23 @@ namespace OTSPeriodicTable
                                 if (ue.i_click == 2)
                                 {
                                     Periodic pc = new Periodic();
-                                    pc.XH = ue.lb_xh.Text.ToString().Trim();        //序号
-                                    pc.YZZL = ue.lb_yzzl.Text.ToString().Trim();                     //元素重量
-                                    pc.FH = ue.lb_fh.Text.ToString().Trim();                         //符号
-                                    pc.ZWYSM = ue.zwysm.ToString().Trim();                      //中文元素名
+                                    pc.Number = ue.lb_xh.Text.ToString().Trim();        //序号
+                                    pc.EleWeight = ue.lb_yzzl.Text.ToString().Trim();                     //元素重量
+                                    pc.Symbol = ue.lb_fh.Text.ToString().Trim();                         //符号
+                                    pc.ChineseName = ue.zwysm.ToString().Trim();                      //中文元素名
                                     //pc.YWM = ue.lb_xh.Text.ToString().Trim();                         //英文名
                                     if ("-" != ue.lb_sx1.Text.ToString().Trim() && "" != ue.lb_sx1.Text.ToString().Trim())
-                                        pc.SX1 = ue.lb_sx1.Text.ToString().Trim();     //属性1
+                                        pc.K_Peak = ue.lb_sx1.Text.ToString().Trim();     //属性1
                                     else
-                                        pc.SX1 = "0";
+                                        pc.K_Peak = "0";
                                     if ("-" != ue.lb_sx2.Text.ToString().Trim() && "" != ue.lb_sx2.Text.ToString().Trim())
-                                        pc.SX2 = ue.lb_sx2.Text.ToString().Trim();     //属性2
+                                        pc.L_Peak = ue.lb_sx2.Text.ToString().Trim();     //属性2
                                     else
-                                        pc.SX2 = "0";
+                                        pc.L_Peak = "0";
                                     if ("-" != ue.lb_sx3.Text.ToString().Trim() && "" != ue.lb_sx3.Text.ToString().Trim())
-                                        pc.SX3 = ue.lb_sx3.Text.ToString().Trim();     //属性3
+                                        pc.M_Peak = ue.lb_sx3.Text.ToString().Trim();     //属性3
                                     else
-                                        pc.SX3 = "0";
+                                        pc.M_Peak = "0";
 
                                     m_List_Periodic.Add(pc);
 

+ 0 - 1700
OTSIncAMeasureApp/OTSPeriodicTable/Periodic.cs

@@ -1,1700 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OTSPeriodicTable
-{
-    /// <summary>
-    /// 元素周期表的基本信息的全局静态类
-    /// </summary>
-    public static class CListPeriodic
-    {
-        /// <summary>
-        /// 获取元素周期表全部元素List方法
-        /// </summary>
-        /// <returns></returns>
-        public static List<Periodic> GetListPeriodic()
-        {
-            List<Periodic> List_Periodic = new List<Periodic>();
-            Periodic ls_periodic = new Periodic();
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "1";
-            ls_periodic.YZZL = "1.008";
-            ls_periodic.FH = "H";
-            ls_periodic.YWM = "Hydrogen";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "氢";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "2";
-            ls_periodic.YZZL = "4.003";
-            ls_periodic.FH = "He";
-            ls_periodic.YWM = "Helium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "氦";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "3";
-            ls_periodic.YZZL = "6.941";
-            ls_periodic.FH = "Li";
-            ls_periodic.YWM = "Lithium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "锂";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "4";
-            ls_periodic.YZZL = "9.012";
-            ls_periodic.FH = "Be";
-            ls_periodic.YWM = "Beryllium";
-            ls_periodic.SX1 = "0.108";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铍";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "5";
-            ls_periodic.YZZL = "10.811";
-            ls_periodic.FH = "B";
-            ls_periodic.YWM = "Boron";
-            ls_periodic.SX1 = "0.185";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "硼";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "6";
-            ls_periodic.YZZL = "12.011";
-            ls_periodic.FH = "C";
-            ls_periodic.YWM = "Carbon";
-            ls_periodic.SX1 = "0.277";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "碳";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "7";
-            ls_periodic.YZZL = "14.007";
-            ls_periodic.FH = "N";
-            ls_periodic.YWM = "Nitrogen";
-            ls_periodic.SX1 = "0.392";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氮";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "8";
-            ls_periodic.YZZL = "15.999";
-            ls_periodic.FH = "O";
-            ls_periodic.YWM = "Oxygen";
-            ls_periodic.SX1 = "0.523";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氧";
-            ls_periodic.FL = "img_cubic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "9";
-            ls_periodic.YZZL = "18.998";
-            ls_periodic.FH = "F";
-            ls_periodic.YWM = "Fluorine";
-            ls_periodic.SX1 = "0.677";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氟";
-            ls_periodic.FL = "img_cubic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "10";
-            ls_periodic.YZZL = "20.180";
-            ls_periodic.FH = "Ne";
-            ls_periodic.YWM = "Neon";
-            ls_periodic.SX1 = "0.848";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氖";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "11";
-            ls_periodic.YZZL = "22.990";
-            ls_periodic.FH = "Na";
-            ls_periodic.YWM = "Sodium";
-            ls_periodic.SX1 = "1.040";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钠";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "12";
-            ls_periodic.YZZL = "24.305";
-            ls_periodic.FH = "Mg";
-            ls_periodic.YWM = "Magnesium";
-            ls_periodic.SX1 = "1.254";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "镁";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "13";
-            ls_periodic.YZZL = "26.982";
-            ls_periodic.FH = "Al";
-            ls_periodic.YWM = "Aluminum";
-            ls_periodic.SX1 = "1.486";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铝";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "14";
-            ls_periodic.YZZL = "28.086";
-            ls_periodic.FH = "Si";
-            ls_periodic.YWM = "Silicon";
-            ls_periodic.SX1 = "1.740";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "硅";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "15";
-            ls_periodic.YZZL = "30.974";
-            ls_periodic.FH = "P";
-            ls_periodic.YWM = "Phosphorus";
-            ls_periodic.SX1 = "2.013";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "磷";
-            ls_periodic.FL = "img_Monoclinic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "16";
-            ls_periodic.YZZL = "32.066";
-            ls_periodic.FH = "S";
-            ls_periodic.YWM = "Sulfur";
-            ls_periodic.SX1 = "2.307";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "硫";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "17";
-            ls_periodic.YZZL = "35.453";
-            ls_periodic.FH = "Cl";
-            ls_periodic.YWM = "Chlorine";
-            ls_periodic.SX1 = "2.622";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氯";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "18";
-            ls_periodic.YZZL = "39.948";
-            ls_periodic.FH = "Ar";
-            ls_periodic.YWM = "Argon";
-            ls_periodic.SX1 = "2.957";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氩";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "19";
-            ls_periodic.YZZL = "39.098";
-            ls_periodic.FH = "K";
-            ls_periodic.YWM = "Potassium";
-            ls_periodic.SX1 = "3.313";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钾";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "20";
-            ls_periodic.YZZL = "40.08";
-            ls_periodic.FH = "Ca";
-            ls_periodic.YWM = "Calcium";
-            ls_periodic.SX1 = "3.691";
-            ls_periodic.SX2 = "0.341";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钙";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "21";
-            ls_periodic.YZZL = "44.956";
-            ls_periodic.FH = "Sc";
-            ls_periodic.YWM = "Scandium";
-            ls_periodic.SX1 = "4.090";
-            ls_periodic.SX2 = "0.395";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钪";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "22";
-            ls_periodic.YZZL = "47.88";
-            ls_periodic.FH = "Ti";
-            ls_periodic.YWM = "Titanium";
-            ls_periodic.SX1 = "4.510";
-            ls_periodic.SX2 = "0.452";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钛";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "23";
-            ls_periodic.YZZL = "50.942";
-            ls_periodic.FH = "V";
-            ls_periodic.YWM = "Vanadium";
-            ls_periodic.SX1 = "4.952";
-            ls_periodic.SX2 = "0.511";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钒";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "24";
-            ls_periodic.YZZL = "51.996";
-            ls_periodic.FH = "Cr";
-            ls_periodic.YWM = "Chromium";
-            ls_periodic.SX1 = "5.414";
-            ls_periodic.SX2 = "0.573";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铬";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "25";
-            ls_periodic.YZZL = "54.938";
-            ls_periodic.FH = "Mn";
-            ls_periodic.YWM = "Manganese";
-            ls_periodic.SX1 = "5.898";
-            ls_periodic.SX2 = "0.637";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锰";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "26";
-            ls_periodic.YZZL = "55.847";
-            ls_periodic.FH = "Fe";
-            ls_periodic.YWM = "Iron";
-            ls_periodic.SX1 = "6.403";
-            ls_periodic.SX2 = "0.705";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铁";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "27";
-            ls_periodic.YZZL = "58.933";
-            ls_periodic.FH = "Co";
-            ls_periodic.YWM = "Cobalt";
-            ls_periodic.SX1 = "6.929";
-            ls_periodic.SX2 = "0.776";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钴";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "28";
-            ls_periodic.YZZL = "58.70";
-            ls_periodic.FH = "Ni";
-            ls_periodic.YWM = "Nickel";
-            ls_periodic.SX1 = "7.477";
-            ls_periodic.SX2 = "0.851";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "镍";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "29";
-            ls_periodic.YZZL = "63.546";
-            ls_periodic.FH = "Cu";
-            ls_periodic.YWM = "Copper";
-            ls_periodic.SX1 = "8.040";
-            ls_periodic.SX2 = "0.930";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铜";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "30";
-            ls_periodic.YZZL = "65.39";
-            ls_periodic.FH = "Zn";
-            ls_periodic.YWM = "Zinc";
-            ls_periodic.SX1 = "8.637";
-            ls_periodic.SX2 = "1.012";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锌";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "31";
-            ls_periodic.YZZL = "69.72";
-            ls_periodic.FH = "Ga";
-            ls_periodic.YWM = "Gallium";
-            ls_periodic.SX1 = "9.250";
-            ls_periodic.SX2 = "1.098";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "镓";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "32";
-            ls_periodic.YZZL = "72.61";
-            ls_periodic.FH = "Ge";
-            ls_periodic.YWM = "Germanium";
-            ls_periodic.SX1 = "9.885";
-            ls_periodic.SX2 = "1.188";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锗";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "33";
-            ls_periodic.YZZL = "74.922";
-            ls_periodic.FH = "As";
-            ls_periodic.YWM = "Arsenic";
-            ls_periodic.SX1 = "10.542";
-            ls_periodic.SX2 = "1.282";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "砷";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "34";
-            ls_periodic.YZZL = "78.96";
-            ls_periodic.FH = "Se";
-            ls_periodic.YWM = "Selenium";
-            ls_periodic.SX1 = "11.220";
-            ls_periodic.SX2 = "1.379";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "硒";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "35";
-            ls_periodic.YZZL = "79Br904";
-            ls_periodic.FH = "Br";
-            ls_periodic.YWM = "Bromine";
-            ls_periodic.SX1 = "11.922";
-            ls_periodic.SX2 = "1.480";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "溴";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "36";
-            ls_periodic.YZZL = "83.80";
-            ls_periodic.FH = "Kr";
-            ls_periodic.YWM = "Krypton";
-            ls_periodic.SX1 = "12.649";
-            ls_periodic.SX2 = "1.586";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氪";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "37";
-            ls_periodic.YZZL = "85.468";
-            ls_periodic.FH = "Rb";
-            ls_periodic.YWM = "Rubidium";
-            ls_periodic.SX1 = "13.393";
-            ls_periodic.SX2 = "1.694";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铷";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "38";
-            ls_periodic.YZZL = "87.62";
-            ls_periodic.FH = "Sr";
-            ls_periodic.YWM = "Strontium";
-            ls_periodic.SX1 = "14.163";
-            ls_periodic.SX2 = "1.806";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锶";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "39";
-            ls_periodic.YZZL = "88.906";
-            ls_periodic.FH = "Y";
-            ls_periodic.YWM = "Yttrium";
-            ls_periodic.SX1 = "14.955";
-            ls_periodic.SX2 = "1.922";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钇";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "40";
-            ls_periodic.YZZL = "91.22";
-            ls_periodic.FH = "Zr";
-            ls_periodic.YWM = "Zirconium";
-            ls_periodic.SX1 = "15.776";
-            ls_periodic.SX2 = "2.042";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锆";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "41";
-            ls_periodic.YZZL = "92.906";
-            ls_periodic.FH = "Nb";
-            ls_periodic.YWM = "Niobium";
-            ls_periodic.SX1 = "16.617";
-            ls_periodic.SX2 = "2.166";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铌";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "42";
-            ls_periodic.YZZL = "95.94";
-            ls_periodic.FH = "Mo";
-            ls_periodic.YWM = "Molybdenum";
-            ls_periodic.SX1 = "17.481";
-            ls_periodic.SX2 = "2.293";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钼";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "43";
-            ls_periodic.YZZL = "(98)";
-            ls_periodic.FH = "Tc";
-            ls_periodic.YWM = "Technetium";
-            ls_periodic.SX1 = "18.368";
-            ls_periodic.SX2 = "2.424";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锝";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "44";
-            ls_periodic.YZZL = "101.07";
-            ls_periodic.FH = "Ru";
-            ls_periodic.YWM = "Ruthenium";
-            ls_periodic.SX1 = "19.282";
-            ls_periodic.SX2 = "2.558";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钌";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "45";
-            ls_periodic.YZZL = "102.906";
-            ls_periodic.FH = "Rh";
-            ls_periodic.YWM = "Rhodium";
-            ls_periodic.SX1 = "20.217";
-            ls_periodic.SX2 = "2.696";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铑";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "46";
-            ls_periodic.YZZL = "106.42";
-            ls_periodic.FH = "Pd";
-            ls_periodic.YWM = "Palladium";
-            ls_periodic.SX1 = "21.180";
-            ls_periodic.SX2 = "2.838";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钯";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "47";
-            ls_periodic.YZZL = "107.868";
-            ls_periodic.FH = "Ag";
-            ls_periodic.YWM = "Silver";
-            ls_periodic.SX1 = "22.166";
-            ls_periodic.SX2 = "2.984";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "银";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "48";
-            ls_periodic.YZZL = "112.41";
-            ls_periodic.FH = "Cd";
-            ls_periodic.YWM = "Cadmium";
-            ls_periodic.SX1 = "23.175";
-            ls_periodic.SX2 = "3.133";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "镉";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "49";
-            ls_periodic.YZZL = "114.82";
-            ls_periodic.FH = "In";
-            ls_periodic.YWM = "Indium";
-            ls_periodic.SX1 = "24.209";
-            ls_periodic.SX2 = "3.286";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铟";
-            ls_periodic.FL = "img_teragonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "50";
-            ls_periodic.YZZL = "118.71";
-            ls_periodic.FH = "Sn";
-            ls_periodic.YWM = "Tin";
-            ls_periodic.SX1 = "25.272";
-            ls_periodic.SX2 = "3.443";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锡";
-            ls_periodic.FL = "img_teragonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "51";
-            ls_periodic.YZZL = "121.76";
-            ls_periodic.FH = "Sb";
-            ls_periodic.YWM = "Antimony";
-            ls_periodic.SX1 = "26.359";
-            ls_periodic.SX2 = "3.604";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锑";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "52";
-            ls_periodic.YZZL = "127.60";
-            ls_periodic.FH = "Te";
-            ls_periodic.YWM = "Tellurium";
-            ls_periodic.SX1 = "27.471";
-            ls_periodic.SX2 = "3.768";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "碲";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "53";
-            ls_periodic.YZZL = "126.905";
-            ls_periodic.FH = "I";
-            ls_periodic.YWM = "Iodine";
-            ls_periodic.SX1 = "28.615";
-            ls_periodic.SX2 = "3.937";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "碘";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "54";
-            ls_periodic.YZZL = "131.29";
-            ls_periodic.FH = "Xe";
-            ls_periodic.YWM = "Xenon";
-            ls_periodic.SX1 = "29.779";
-            ls_periodic.SX2 = "4.109";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氙";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "55";
-            ls_periodic.YZZL = "132.905";
-            ls_periodic.FH = "Cs";
-            ls_periodic.YWM = "Cesium";
-            ls_periodic.SX1 = "30.971";
-            ls_periodic.SX2 = "4.286";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铯";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "56";
-            ls_periodic.YZZL = "137.33";
-            ls_periodic.FH = "Ba";
-            ls_periodic.YWM = "Barium";
-            ls_periodic.SX1 = "32.196";
-            ls_periodic.SX2 = "4.465";
-            ls_periodic.SX3 = "0.779";
-            ls_periodic.ZWYSM = "钡";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "57";
-            ls_periodic.YZZL = "138.906";
-            ls_periodic.FH = "La";
-            ls_periodic.YWM = "Lanthanum";
-            ls_periodic.SX1 = "33.441";
-            ls_periodic.SX2 = "4.650";
-            ls_periodic.SX3 = "0.833";
-            ls_periodic.ZWYSM = "镧";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "72";
-            ls_periodic.YZZL = "178.49";
-            ls_periodic.FH = "Hf";
-            ls_periodic.YWM = "Hafnium";
-            ls_periodic.SX1 = "55.801";
-            ls_periodic.SX2 = "7.898";
-            ls_periodic.SX3 = "1.644";
-            ls_periodic.ZWYSM = "铪";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "73";
-            ls_periodic.YZZL = "180.948";
-            ls_periodic.FH = "Ta";
-            ls_periodic.YWM = "Tantalum";
-            ls_periodic.SX1 = "57.450";
-            ls_periodic.SX2 = "8.145";
-            ls_periodic.SX3 = "1.709";
-            ls_periodic.ZWYSM = "钽";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "74";
-            ls_periodic.YZZL = "183.85";
-            ls_periodic.FH = "W";
-            ls_periodic.YWM = "Tungsten";
-            ls_periodic.SX1 = "59.305";
-            ls_periodic.SX2 = "8.396";
-            ls_periodic.SX3 = "1.774";
-            ls_periodic.ZWYSM = "钨";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "75";
-            ls_periodic.YZZL = "186.207";
-            ls_periodic.FH = "Re";
-            ls_periodic.YWM = "Rhenium";
-            ls_periodic.SX1 = "61.122";
-            ls_periodic.SX2 = "8.651";
-            ls_periodic.SX3 = "1.842";
-            ls_periodic.ZWYSM = "铼";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "76";
-            ls_periodic.YZZL = "190.2";
-            ls_periodic.FH = "Os";
-            ls_periodic.YWM = "Osmium";
-            ls_periodic.SX1 = "62.989";
-            ls_periodic.SX2 = "8.910";
-            ls_periodic.SX3 = "1.910";
-            ls_periodic.ZWYSM = "锇";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "77";
-            ls_periodic.YZZL = "192.22";
-            ls_periodic.FH = "Ir";
-            ls_periodic.YWM = "Iridium";
-            ls_periodic.SX1 = "64.906";
-            ls_periodic.SX2 = "9.174";
-            ls_periodic.SX3 = "1.978";
-            ls_periodic.ZWYSM = "铱";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "78";
-            ls_periodic.YZZL = "195.08";
-            ls_periodic.FH = "Pt";
-            ls_periodic.YWM = "Platinium";
-            ls_periodic.SX1 = "66.834";
-            ls_periodic.SX2 = "9.441";
-            ls_periodic.SX3 = "2.048";
-            ls_periodic.ZWYSM = "铂";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "79";
-            ls_periodic.YZZL = "196.967";
-            ls_periodic.FH = "Au";
-            ls_periodic.YWM = "Gold";
-            ls_periodic.SX1 = "68.804";
-            ls_periodic.SX2 = "9.712";
-            ls_periodic.SX3 = "2.120";
-            ls_periodic.ZWYSM = "金";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "80";
-            ls_periodic.YZZL = "200.59";
-            ls_periodic.FH = "Hg";
-            ls_periodic.YWM = "Mercury";
-            ls_periodic.SX1 = "70.806";
-            ls_periodic.SX2 = "9.987";
-            ls_periodic.SX3 = "2.191";
-            ls_periodic.ZWYSM = "汞";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "81";
-            ls_periodic.YZZL = "204.38";
-            ls_periodic.FH = "Tl";
-            ls_periodic.YWM = "Thallium";
-            ls_periodic.SX1 = "72.869";
-            ls_periodic.SX2 = "10.256";
-            ls_periodic.SX3 = "2.268";
-            ls_periodic.ZWYSM = "铊";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "82";
-            ls_periodic.YZZL = "207.2";
-            ls_periodic.FH = "Pb";
-            ls_periodic.YWM = "Lead";
-            ls_periodic.SX1 = "74.989";
-            ls_periodic.SX2 = "10.550";
-            ls_periodic.SX3 = "2.342";
-            ls_periodic.ZWYSM = "铅";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "83";
-            ls_periodic.YZZL = "208.980";
-            ls_periodic.FH = "Bi";
-            ls_periodic.YWM = "Bismuth";
-            ls_periodic.SX1 = "77.091";
-            ls_periodic.SX2 = "10.837";
-            ls_periodic.SX3 = "2.419";
-            ls_periodic.ZWYSM = "铋";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "84";
-            ls_periodic.YZZL = "(209)";
-            ls_periodic.FH = "Po";
-            ls_periodic.YWM = "Polonium";
-            ls_periodic.SX1 = "79.272";
-            ls_periodic.SX2 = "11.129";
-            ls_periodic.SX3 = "2.505";
-            ls_periodic.ZWYSM = "钋";
-            ls_periodic.FL = "img_Monoclinic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "85";
-            ls_periodic.YZZL = "(210)";
-            ls_periodic.FH = "At";
-            ls_periodic.YWM = "Astatine";
-            ls_periodic.SX1 = "81.513";
-            ls_periodic.SX2 = "11.425";
-            ls_periodic.SX3 = "2.585";
-            ls_periodic.ZWYSM = "砹";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "86";
-            ls_periodic.YZZL = "(222)";
-            ls_periodic.FH = "Rn";
-            ls_periodic.YWM = "Radon";
-            ls_periodic.SX1 = "83.771";
-            ls_periodic.SX2 = "11.725";
-            ls_periodic.SX3 = "2.665";
-            ls_periodic.ZWYSM = "氡";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "87";
-            ls_periodic.YZZL = "(223)";
-            ls_periodic.FH = "Fr";
-            ls_periodic.YWM = "Francium";
-            ls_periodic.SX1 = "86.098";
-            ls_periodic.SX2 = "12.029";
-            ls_periodic.SX3 = "2.747";
-            ls_periodic.ZWYSM = "钫";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "88";
-            ls_periodic.YZZL = "226.025";
-            ls_periodic.FH = "Ra";
-            ls_periodic.YWM = "Radium";
-            ls_periodic.SX1 = "88.480";
-            ls_periodic.SX2 = "12.338";
-            ls_periodic.SX3 = "2.830";
-            ls_periodic.ZWYSM = "镭";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "89";
-            ls_periodic.YZZL = "227.028";
-            ls_periodic.FH = "Ac";
-            ls_periodic.YWM = "Actinium";
-            ls_periodic.SX1 = "90.880";
-            ls_periodic.SX2 = "12.650";
-            ls_periodic.SX3 = "2.915";
-            ls_periodic.ZWYSM = "锕";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //最下方的28个元素
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "58";
-            ls_periodic.YZZL = "140.12";
-            ls_periodic.FH = "Ce";
-            ls_periodic.YWM = "Cerium";
-            ls_periodic.SX1 = "34.717";
-            ls_periodic.SX2 = "4.839";
-            ls_periodic.SX3 = "0.883";
-            ls_periodic.ZWYSM = "铈";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "59";
-            ls_periodic.YZZL = "140.908";
-            ls_periodic.FH = "Pr";
-            ls_periodic.YWM = "Praseodymium";
-            ls_periodic.SX1 = "36.031";
-            ls_periodic.SX2 = "5.033";
-            ls_periodic.SX3 = "0.929";
-            ls_periodic.ZWYSM = "镨";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "60";
-            ls_periodic.YZZL = "144.24";
-            ls_periodic.FH = "Nd";
-            ls_periodic.YWM = "Neodymium";
-            ls_periodic.SX1 = "37.358";
-            ls_periodic.SX2 = "5.229";
-            ls_periodic.SX3 = "0.978";
-            ls_periodic.ZWYSM = "钕";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "61";
-            ls_periodic.YZZL = "(145)";
-            ls_periodic.FH = "Pm";
-            ls_periodic.YWM = "Promethium";
-            ls_periodic.SX1 = "38.725";
-            ls_periodic.SX2 = "5.432";
-            ls_periodic.SX3 = "1.032";
-            ls_periodic.ZWYSM = "钷";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "62";
-            ls_periodic.YZZL = "150.36";
-            ls_periodic.FH = "Sm";
-            ls_periodic.YWM = "Samarium";
-            ls_periodic.SX1 = "40.118";
-            ls_periodic.SX2 = "5.635";
-            ls_periodic.SX3 = "1.081";
-            ls_periodic.ZWYSM = "钐";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "63";
-            ls_periodic.YZZL = "151.97";
-            ls_periodic.FH = "Eu";
-            ls_periodic.YWM = "Europium";
-            ls_periodic.SX1 = "41.534";
-            ls_periodic.SX2 = "5.845";
-            ls_periodic.SX3 = "1.137";
-            ls_periodic.ZWYSM = "铕";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "64";
-            ls_periodic.YZZL = "157.25";
-            ls_periodic.FH = "Gd";
-            ls_periodic.YWM = "Gadolinium";
-            ls_periodic.SX1 = "42.992";
-            ls_periodic.SX2 = "6.056";
-            ls_periodic.SX3 = "1.185";
-            ls_periodic.ZWYSM = "铕";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "65";
-            ls_periodic.YZZL = "158.925";
-            ls_periodic.FH = "Tb";
-            ls_periodic.YWM = "Terbium";
-            ls_periodic.SX1 = "44.476";
-            ls_periodic.SX2 = "6.272";
-            ls_periodic.SX3 = "1.240";
-            ls_periodic.ZWYSM = "铽";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "66";
-            ls_periodic.YZZL = "162.50";
-            ls_periodic.FH = "Dy";
-            ls_periodic.YWM = "Dysprosium";
-            ls_periodic.SX1 = "45.997";
-            ls_periodic.SX2 = "6.494";
-            ls_periodic.SX3 = "1.293";
-            ls_periodic.ZWYSM = "镝";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "67";
-            ls_periodic.YZZL = "164.930";
-            ls_periodic.FH = "Ho";
-            ls_periodic.YWM = "Holmium";
-            ls_periodic.SX1 = "47.534";
-            ls_periodic.SX2 = "6.719";
-            ls_periodic.SX3 = "1.347";
-            ls_periodic.ZWYSM = "钬";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "68";
-            ls_periodic.YZZL = "167.26";
-            ls_periodic.FH = "Er";
-            ls_periodic.YWM = "Erbium";
-            ls_periodic.SX1 = "49.100";
-            ls_periodic.SX2 = "6.947";
-            ls_periodic.SX3 = "1.405";
-            ls_periodic.ZWYSM = "铒";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "69";
-            ls_periodic.YZZL = "168.934";
-            ls_periodic.FH = "Tm";
-            ls_periodic.YWM = "Thulium";
-            ls_periodic.SX1 = "50.730";
-            ls_periodic.SX2 = "7.179";
-            ls_periodic.SX3 = "1.462";
-            ls_periodic.ZWYSM = "铥";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "70";
-            ls_periodic.YZZL = "173.04";
-            ls_periodic.FH = "Yb";
-            ls_periodic.YWM = "Ytterbium";
-            ls_periodic.SX1 = "52.362";
-            ls_periodic.SX2 = "7.414";
-            ls_periodic.SX3 = "1.521";
-            ls_periodic.ZWYSM = "镱";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "71";
-            ls_periodic.YZZL = "174.967";
-            ls_periodic.FH = "Lu";
-            ls_periodic.YWM = "Lutetium";
-            ls_periodic.SX1 = "54.078";
-            ls_periodic.SX2 = "7.654";
-            ls_periodic.SX3 = "1.581";
-            ls_periodic.ZWYSM = "镥";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "90";
-            ls_periodic.YZZL = "232.038";
-            ls_periodic.FH = "Th";
-            ls_periodic.YWM = "Thorium";
-            ls_periodic.SX1 = "93.382";
-            ls_periodic.SX2 = "12.967";
-            ls_periodic.SX3 = "2.991";
-            ls_periodic.ZWYSM = "钍";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "91";
-            ls_periodic.YZZL = "231.036";
-            ls_periodic.FH = "Pa";
-            ls_periodic.YWM = "Protoactinium";
-            ls_periodic.SX1 = "95.886";
-            ls_periodic.SX2 = "13.288";
-            ls_periodic.SX3 = "3.077";
-            ls_periodic.ZWYSM = "镤";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "92";
-            ls_periodic.YZZL = "238.029";
-            ls_periodic.FH = "U";
-            ls_periodic.YWM = "Uranium";
-            ls_periodic.SX1 = "98.434";
-            ls_periodic.SX2 = "13.612";
-            ls_periodic.SX3 = "3.165";
-            ls_periodic.ZWYSM = "铀";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "93";
-            ls_periodic.YZZL = "237.048";
-            ls_periodic.FH = "Np";
-            ls_periodic.YWM = "Neptunium";
-            ls_periodic.SX1 = "100.800";
-            ls_periodic.SX2 = "13.941";
-            ls_periodic.SX3 = "3.253";
-            ls_periodic.ZWYSM = "镎";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "94";
-            ls_periodic.YZZL = "(244)";
-            ls_periodic.FH = "Pu";
-            ls_periodic.YWM = "Plutonium";
-            ls_periodic.SX1 = "103.320";
-            ls_periodic.SX2 = "14.275";
-            ls_periodic.SX3 = "3.344";
-            ls_periodic.ZWYSM = "钚";
-            ls_periodic.FL = "img_Monoclinic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "95";
-            ls_periodic.YZZL = "(243)";
-            ls_periodic.FH = "Am";
-            ls_periodic.YWM = "Americium";
-            ls_periodic.SX1 = "105.970";
-            ls_periodic.SX2 = "14.615";
-            ls_periodic.SX3 = "3.435";
-            ls_periodic.ZWYSM = "镅";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "96";
-            ls_periodic.YZZL = "(247)";
-            ls_periodic.FH = "Cm";
-            ls_periodic.YWM = "Curium";
-            ls_periodic.SX1 = "108.737";
-            ls_periodic.SX2 = "14.961";
-            ls_periodic.SX3 = "3.539";
-            ls_periodic.ZWYSM = "锔";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "97";
-            ls_periodic.YZZL = "(247)";
-            ls_periodic.FH = "Bk";
-            ls_periodic.YWM = "Berkelium";
-            ls_periodic.SX1 = "111.676";
-            ls_periodic.SX2 = "15.309";
-            ls_periodic.SX3 = "3.634";
-            ls_periodic.ZWYSM = "锫";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "98";
-            ls_periodic.YZZL = "(251)";
-            ls_periodic.FH = "Cf";
-            ls_periodic.YWM = "Californium";
-            ls_periodic.SX1 = "114.778";
-            ls_periodic.SX2 = "15.661";
-            ls_periodic.SX3 = "3.731";
-            ls_periodic.ZWYSM = "锎";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "99";
-            ls_periodic.YZZL = "(252)";
-            ls_periodic.FH = "Es";
-            ls_periodic.YWM = "Einsteinium";
-            ls_periodic.SX1 = "-";
-            ls_periodic.SX2 = "16.018";
-            ls_periodic.SX3 = "3.829";
-            ls_periodic.ZWYSM = "锿";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "100";
-            ls_periodic.YZZL = "(257)";
-            ls_periodic.FH = "Fm";
-            ls_periodic.YWM = "Fermium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "镄";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "101";
-            ls_periodic.YZZL = "(258)";
-            ls_periodic.FH = "Md";
-            ls_periodic.YWM = "Mendelevium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "钔";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "102";
-            ls_periodic.YZZL = "(259)";
-            ls_periodic.FH = "No";
-            ls_periodic.YWM = "Nobelium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "锘";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "103";
-            ls_periodic.YZZL = "(260)";
-            ls_periodic.FH = "Lr";
-            ls_periodic.YWM = "Lawrencium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "铹";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            return List_Periodic;
-        }
-
-        /// <summary>
-        /// 根据传入的元素名判断,该元素是否存在于此元素表中
-        /// </summary>
-        /// <param name="in_list_periodic"></param>
-        /// <param name="str_ysm"></param>
-        /// <returns></returns>
-        public static bool ExistPeriodicByYsm(List<Periodic> in_list_periodic,string str_ysm)
-        {
-            for (int i = 0; i < in_list_periodic.Count(); i++)
-            {
-                if (str_ysm.ToUpper() == in_list_periodic[i].FH.ToUpper())
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// 根据传入的元素名,获得元素类对象
-        /// </summary>
-        /// <param name="in_list_periodic"></param>
-        /// <param name="str_ysm"></param>
-        /// <returns></returns>
-        public static Periodic GetPeriodicByYsm(List<Periodic> in_list_periodic, string str_ysm)
-        {
-            Periodic ls_p = new Periodic();
-            for (int i = 0; i < in_list_periodic.Count(); i++)
-            {
-                if (str_ysm.ToUpper() == in_list_periodic[i].FH.ToUpper())
-                {
-                    ls_p = in_list_periodic[i];
-                }
-            }
-            return ls_p;
-        }
-
-        /// <summary>
-        /// 根据传入的序号,获得元素类对象
-        /// </summary>
-        /// <param name="in_list_periodic"></param>
-        /// <param name="str_xh"></param>
-        /// <returns></returns>
-        public static Periodic GetPeriodicByXH(List<Periodic> in_list_periodic, string str_xh)
-        {
-            Periodic ls_p = new Periodic();
-            for (int i = 0; i < in_list_periodic.Count(); i++)
-            {
-                if (str_xh.ToUpper() == in_list_periodic[i].XH.ToUpper())
-                {
-                    ls_p = in_list_periodic[i];
-                }
-            }
-            return ls_p;
-        }
-    }
-
-    //夹杂物结构类的子类,元素类
-    public class ElementRange
-    {
-        string _rangeid;
-        string _rangenum;
-        string _stdid;
-        string _rangestart;
-        string _rangeend;
-        string _atomnum;
-        string _percentage;
-        string _molarratio;
-
-        /// <summary>
-        /// id?
-        /// </summary>
-        public string RangeID
-        {
-            get { return _rangeid; }
-            set { _rangeid = value; }
-        }
-        
-        /// <summary>
-        /// 数量?
-        /// </summary>
-        public string RangeNum
-        {
-            get { return _rangenum; }
-            set { _rangenum = value; }
-        }
-
-        /// <summary>
-        /// 夹杂物ID
-        /// </summary>
-        public string STDID
-        {
-            get { return _stdid; }
-            set { _stdid = value; }
-        }
-
-        /// <summary>
-        /// 起
-        /// </summary>
-        public string RangeStart
-        {
-            get { return _rangestart; }
-            set { _rangestart = value; }
-        }
-
-        /// <summary>
-        /// 止
-        /// </summary>
-        public string RangeEnd
-        {
-            get { return _rangeend; }
-            set { _rangeend = value; }
-        }
-
-        /// <summary>
-        /// 原子数
-        /// </summary>
-        public string AtomNum
-        {
-            get { return _atomnum; }
-            set { _atomnum = value; }
-        }
-
-        /// <summary>
-        /// 比例
-        /// </summary>
-        public string Percentage
-        {
-            get { return _percentage; }
-            set { _percentage = value; }
-        }
-
-        /// <summary>
-        /// 摩尔比
-        /// </summary>
-        public string MolarRatio
-        {
-            get { return _molarratio; }
-            set { _molarratio = value; }
-        }
-
-    }
-
-    //夹杂物结构类
-    public class IncALib
-    {
-        string _name;   //名称
-        string _incaid; //夹杂物ID
-        string _color;  //颜色
-        string _heightwidthratio;   //宽高比
-        string _graystart;  //起
-        string _grayend;    //止
-        string _rangeelementnum;//数量
-        //List<Periodic> m_list_periodic;//包含的元素
-        List<ElementRange> m_list_elementrange;
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        public IncALib()
-        {
-            //m_list_periodic = new List<Periodic>();
-            m_list_elementrange = new List<ElementRange>();
-        }
-
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string Name
-        {
-            get { return  _name; }
-            set { _name = value; }
-        }
-
-        /// <summary>
-        /// 夹杂物ID
-        /// </summary>
-        public string IncAId
-        {
-            get { return _incaid; }
-            set { _incaid = value; }
-        }
-
-        /// <summary>
-        /// 颜色
-        /// </summary>
-        public string Color
-        {
-            get { return _color; }
-            set { _color = value; }
-        }
-
-        /// <summary>
-        /// 宽高比
-        /// </summary>
-        public string HeightWidthRatio
-        {
-            get { return _heightwidthratio; }
-            set { _heightwidthratio = value; }
-        }
-
-        /// <summary>
-        /// 起
-        /// </summary>
-        public string GrayStart
-        {
-            get { return _graystart; }
-            set { _graystart = value; }
-        }
-
-        /// <summary>
-        /// 止
-        /// </summary>
-        public string GrayEnd
-        {
-            get { return _grayend; }
-            set { _grayend = value; }
-        }
-
-        /// <summary>
-        /// 元素数量
-        /// </summary>
-        public string RangeElementNum
-        {
-            get { return _rangeelementnum; }
-            set { _rangeelementnum = value; }
-        }
-
-        /// <summary>
-        /// 所包含的元素
-        /// </summary>
-        public List<ElementRange> List_ElementRange
-        {
-            get { return m_list_elementrange; }
-            set { m_list_elementrange = value; }
-        }
-
-        ///// <summary>
-        ///// 所包含的元素
-        ///// </summary>
-        //public List<Periodic> List_Periodic
-        //{
-        //    get { return m_list_periodic; }
-        //    set { m_list_periodic = value; }
-        //}
-    }
-
-
-    //元素包含信息结构
-    public class Periodic
-    {
-        string _xh;         //序号
-        string _yzzl;    //原子重量,因为有标记的重量带有()括号,所以这里先用字符串进行存储
-        string _fh;      //符号
-        string _zwysm;   //中文元素名
-        string _ywm;     //英文名 
-        string _sx1;     //属性1
-        string _sx2;     //属性2
-        string _sx3;     //属性3
-        string _fl;      //分类
-
-        /// <summary>
-        /// 序号
-        /// </summary>
-        public string XH
-        {
-            get { return _xh; }
-            set { _xh = value; }
-        }
-        /// <summary>
-        /// 原子重量
-        /// </summary>
-        public string YZZL
-        {
-            get { return _yzzl; }
-            set { _yzzl = value; }
-        }
-        /// <summary>
-        /// 符号
-        /// </summary>
-        public string FH
-        {
-            get { return _fh; }
-            set { _fh = value; }
-        }
-        /// <summary>
-        /// 中文元素名
-        /// </summary>
-        public string ZWYSM
-        {
-            get { return _zwysm; }
-            set { _zwysm = value; }
-        }
-        /// <summary>
-        /// 英文名
-        /// </summary>
-        public string YWM
-        {
-            get { return _ywm; }
-            set { _ywm = value; }
-        }
-        /// <summary>
-        /// 属性1
-        /// </summary>
-        public string SX1
-        {
-            get { return _sx1; }
-            set { _sx1 = value; }
-        }
-        /// <summary>
-        /// 属性2
-        /// </summary>
-        public string SX2
-        {
-            get { return _sx2; }
-            set { _sx2 = value; }
-        }
-        /// <summary>
-        /// 属性3
-        /// </summary>
-        public string SX3
-        {
-            get { return _sx3; }
-            set { _sx3 = value; }
-        }
-        /// <summary>
-        /// 分类
-        /// </summary>
-        public string FL
-        {
-            get { return _fl; }
-            set { _fl = value; }
-        }
-    }
-}

+ 4 - 3
OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_DrawDistrbutionImageAndBSE.cs

@@ -9,6 +9,7 @@ using OTSIncAReportGraph.Class;
 
 using OTSIncAReportGraph.OTSIncAReportGraphFuncation;
 using OTSIncAReportMailInterface;
+using OTSPeriodicTable;
 using OTSRptPeriodicTable;
 
 using System;
@@ -1302,15 +1303,15 @@ namespace OTSIncAReportGraph.Controls
                 ShowElementInfo ls_sei = new ShowElementInfo();
                 ls_sei.ElementName = list_celementchemistryclr[i].Name;
                 ls_sei.Percentage = list_celementchemistryclr[i].Percentage;
-                ls_sei.dKF = Convert.ToDouble(CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), ls_sei.ElementName).SX1);
+                ls_sei.dKF = Convert.ToDouble(CListPeriodic.GetPeriodicByEleName( ls_sei.ElementName).K_Peak);
                 double de_sx2 = 0;
-                if (CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), ls_sei.ElementName).SX2 == "" || CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), ls_sei.ElementName).SX2 == "-")
+                if (CListPeriodic.GetPeriodicByEleName(ls_sei.ElementName).L_Peak == "" || CListPeriodic.GetPeriodicByEleName( ls_sei.ElementName).L_Peak == "-")
                 {
                     de_sx2 = 0;
                 }
                 else
                 {
-                    de_sx2 = Convert.ToDouble(CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), ls_sei.ElementName).SX2);
+                    de_sx2 = Convert.ToDouble(CListPeriodic.GetPeriodicByEleName( ls_sei.ElementName).L_Peak);
                 }
                 ls_sei.dLF = de_sx2;
                 list_showelementinfo.Add(ls_sei);

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

@@ -17,6 +17,7 @@ using System.Drawing.Drawing2D;
 using System.Linq;
 using System.Threading;
 using System.Windows.Forms;
+using OTSPeriodicTable;
 
 namespace OTSIncAReportGraph.Controls
 {
@@ -976,7 +977,7 @@ namespace OTSIncAReportGraph.Controls
                 ShowElementInfo ls_sei = new ShowElementInfo();
                 ls_sei.ElementName = list_celementchemistryclr[i].Name;
                 ls_sei.Percentage = list_celementchemistryclr[i].Percentage;
-                ls_sei.dKF = Convert.ToDouble(CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), ls_sei.ElementName).SX1);
+                ls_sei.dKF = Convert.ToDouble(CListPeriodic.GetPeriodicByEleName(ls_sei.ElementName).K_Peak);
                 list_showelementinfo.Add(ls_sei);
             }
 

+ 10 - 9
OTSIncAReportApp/1-UI/Control_Graph/Controls/Control_XRayTable.cs

@@ -1,5 +1,6 @@
 using OTSIncAReportApp.SysMgrTools;
 using OTSIncAReportGraph.Class;
+using OTSPeriodicTable;
 using OTSRptPeriodicTable;
 using System;
 using System.Collections;
@@ -341,33 +342,33 @@ namespace OTSIncAReportGraph.Controls
             for (int i = 0; i < m_list_periodic.Count(); i++)
             {
                 //先对三个值进行转换,转出应有的值
-                if (m_list_periodic[i].SX1 != "" && m_list_periodic[i].SX1 != "-")
+                if (m_list_periodic[i].K_Peak != "" && m_list_periodic[i].K_Peak != "-")
                 {
-                    ls_f_sx1 = (float)Convert.ToDouble(m_list_periodic[i].SX1);
+                    ls_f_sx1 = (float)Convert.ToDouble(m_list_periodic[i].K_Peak);
                 }
-                if (m_list_periodic[i].SX2 != "" && m_list_periodic[i].SX2 != "-")
+                if (m_list_periodic[i].L_Peak != "" && m_list_periodic[i].L_Peak != "-")
                 {
-                    ls_f_sx2 = (float)Convert.ToDouble(m_list_periodic[i].SX2);
+                    ls_f_sx2 = (float)Convert.ToDouble(m_list_periodic[i].L_Peak);
                 }
-                if (m_list_periodic[i].SX3 != "" && m_list_periodic[i].SX3 != "-")
+                if (m_list_periodic[i].M_Peak != "" && m_list_periodic[i].M_Peak != "-")
                 {
-                    ls_f_sx3 = (float)Convert.ToDouble(m_list_periodic[i].SX3);
+                    ls_f_sx3 = (float)Convert.ToDouble(m_list_periodic[i].M_Peak);
                 }
 
                 //然后再对该值进行判断,如果在范围内,则判断为该元素
                 if (kml_value >= (ls_f_sx1 - f_rect) && kml_value < (ls_f_sx1 + f_rect))
                 {
-                    str_ret = m_list_periodic[i].FH;
+                    str_ret = m_list_periodic[i].Symbol;
                     break;
                 }
                 if (kml_value >= (ls_f_sx2 - f_rect) && kml_value < (ls_f_sx2 + f_rect))
                 {
-                    str_ret = m_list_periodic[i].FH;
+                    str_ret = m_list_periodic[i].Symbol;
                     break;
                 }
                 if (kml_value >= (ls_f_sx3 - f_rect) && kml_value < (ls_f_sx3 + f_rect))
                 {
-                    str_ret = m_list_periodic[i].FH;
+                    str_ret = m_list_periodic[i].Symbol;
                     break;
                 }
             }

+ 14 - 13
OTSIncAReportApp/1-UI/Controls/OTSPeriodicTable/OTSPeriodicTableForm.cs

@@ -1,4 +1,5 @@
 using OTSIncAReportApp.SysMgrTools;
+using OTSPeriodicTable;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -103,7 +104,7 @@ namespace OTSRptPeriodicTable
                                 {
                                     User_Element ue = (User_Element)uc3;
                                     //记录用户选择了的元素
-                                    if (ue.lb_fh.Text == m_List_Periodic[i].FH)
+                                    if (ue.lb_fh.Text == m_List_Periodic[i].Symbol)
                                     {
                                         //设置这个元素已经被选择
                                         ue.i_click = 2;
@@ -143,25 +144,25 @@ namespace OTSRptPeriodicTable
                                 {
                                     //aa++;
                                     Periodic pc = new Periodic();
-                                    pc.XH = ue.lb_xh.Text.ToString().Trim();        //序号
-                                    pc.YZZL = ue.lb_yzzl.Text.ToString().Trim();                     //元素重量
-                                    pc.FH = ue.lb_fh.Text.ToString().Trim();                         //符号
-                                    pc.ZWYSM = ue.zwysm.ToString().Trim();                      //中文元素名
-                                    pc.YWM = ue.lb_xh.Text.ToString().Trim();                         //英文名
+                                    pc.Number = ue.lb_xh.Text.ToString().Trim();        //序号
+                                    pc.EleWeight = ue.lb_yzzl.Text.ToString().Trim();                     //元素重量
+                                    pc.Symbol = ue.lb_fh.Text.ToString().Trim();                         //符号
+                                    pc.ChineseName = ue.zwysm.ToString().Trim();                      //中文元素名
+                                    pc.EnglishName = ue.lb_xh.Text.ToString().Trim();                         //英文名
                                     if ("-" != ue.lb_sx1.Text.ToString().Trim() && "" != ue.lb_sx1.Text.ToString().Trim())
-                                        pc.SX1 = ue.lb_sx1.Text.ToString().Trim();     //属性1
+                                        pc.K_Peak = ue.lb_sx1.Text.ToString().Trim();     //属性1
                                     else
-                                        pc.SX1 = "0";
+                                        pc.K_Peak = "0";
                                     if ("-" != ue.lb_sx2.Text.ToString().Trim() && "" != ue.lb_sx2.Text.ToString().Trim())
-                                        pc.SX2 = ue.lb_sx2.Text.ToString().Trim();     //属性2
+                                        pc.L_Peak = ue.lb_sx2.Text.ToString().Trim();     //属性2
                                     else
-                                        pc.SX2 = "0";
+                                        pc.L_Peak = "0";
                                     if ("-" != ue.lb_sx3.Text.ToString().Trim() && "" != ue.lb_sx3.Text.ToString().Trim())
-                                        pc.SX3 = ue.lb_sx3.Text.ToString().Trim();     //属性3
+                                        pc.M_Peak = ue.lb_sx3.Text.ToString().Trim();     //属性3
                                     else
-                                        pc.SX3 = "0";
+                                        pc.M_Peak = "0";
                                     if (null != ue.pictureBox1.Image.Tag)
-                                        pc.FL = ue.pictureBox1.Image.Tag.ToString();                         //分类
+                                        pc.Classfication = ue.pictureBox1.Image.Tag.ToString();                         //分类
 
                                     m_List_Periodic.Add(pc);
 

+ 12 - 11
OTSIncAReportApp/1-UI/Controls/OTSPeriodicTable/OTSPeriodicTableForm_Small.cs

@@ -1,4 +1,5 @@
 using OTSIncAReportApp.SysMgrTools;
+using OTSPeriodicTable;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -173,7 +174,7 @@ namespace OTSRptPeriodicTable
                                 {
                                     User_Element_Small ue = (User_Element_Small)uc3;
                                     //记录用户选择了的元素
-                                    if (ue.lb_fh.Text == m_List_Periodic[i].FH)
+                                    if (ue.lb_fh.Text == m_List_Periodic[i].Symbol)
                                     {
                                         //设置这个元素已经被选择
                                         ue.i_click = 2;
@@ -212,22 +213,22 @@ namespace OTSRptPeriodicTable
                                 if (ue.i_click == 2)
                                 {
                                     Periodic pc = new Periodic();
-                                    pc.XH = ue.lb_xh.Text.ToString().Trim();        //序号
-                                    pc.YZZL = ue.lb_yzzl.Text.ToString().Trim();                     //元素重量
-                                    pc.FH = ue.lb_fh.Text.ToString().Trim();                         //符号
-                                    pc.ZWYSM = ue.zwysm.ToString().Trim();                      //中文元素名
+                                    pc.Number = ue.lb_xh.Text.ToString().Trim();        //序号
+                                    pc.EleWeight = ue.lb_yzzl.Text.ToString().Trim();                     //元素重量
+                                    pc.Symbol = ue.lb_fh.Text.ToString().Trim();                         //符号
+                                    pc.ChineseName = ue.zwysm.ToString().Trim();                      //中文元素名
                                     if ("-" != ue.lb_sx1.Text.ToString().Trim() && "" != ue.lb_sx1.Text.ToString().Trim())
-                                        pc.SX1 = ue.lb_sx1.Text.ToString().Trim();     //属性1
+                                        pc.K_Peak = ue.lb_sx1.Text.ToString().Trim();     //属性1
                                     else
-                                        pc.SX1 = "0";
+                                        pc.K_Peak = "0";
                                     if ("-" != ue.lb_sx2.Text.ToString().Trim() && "" != ue.lb_sx2.Text.ToString().Trim())
-                                        pc.SX2 = ue.lb_sx2.Text.ToString().Trim();     //属性2
+                                        pc.L_Peak = ue.lb_sx2.Text.ToString().Trim();     //属性2
                                     else
-                                        pc.SX2 = "0";
+                                        pc.L_Peak = "0";
                                     if ("-" != ue.lb_sx3.Text.ToString().Trim() && "" != ue.lb_sx3.Text.ToString().Trim())
-                                        pc.SX3 = ue.lb_sx3.Text.ToString().Trim();     //属性3
+                                        pc.M_Peak = ue.lb_sx3.Text.ToString().Trim();     //属性3
                                     else
-                                        pc.SX3 = "0";
+                                        pc.M_Peak = "0";
 
                                     m_List_Periodic.Add(pc);
 

+ 0 - 1687
OTSIncAReportApp/1-UI/Controls/OTSPeriodicTable/Periodic.cs

@@ -1,1687 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace OTSRptPeriodicTable
-{
-    /// <summary>
-    /// 元素周期表的基本信息的全局静态类
-    /// </summary>
-    public static class CListPeriodic
-    {
-        /// <summary>
-        /// 获取元素周期表全部元素List方法
-        /// </summary>
-        /// <returns></returns>
-        public static List<Periodic> GetListPeriodic()
-        {
-            List<Periodic> List_Periodic = new List<Periodic>();
-            Periodic ls_periodic = new Periodic();
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "1";
-            ls_periodic.YZZL = "1.008";
-            ls_periodic.FH = "H";
-            ls_periodic.YWM = "Hydrogen";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "氢";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "2";
-            ls_periodic.YZZL = "4.003";
-            ls_periodic.FH = "He";
-            ls_periodic.YWM = "Helium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "氦";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "3";
-            ls_periodic.YZZL = "6.941";
-            ls_periodic.FH = "Li";
-            ls_periodic.YWM = "Lithium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "锂";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "4";
-            ls_periodic.YZZL = "9.012";
-            ls_periodic.FH = "Be";
-            ls_periodic.YWM = "Beryllium";
-            ls_periodic.SX1 = "0.108";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铍";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "5";
-            ls_periodic.YZZL = "10.811";
-            ls_periodic.FH = "B";
-            ls_periodic.YWM = "Boron";
-            ls_periodic.SX1 = "0.185";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "硼";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "6";
-            ls_periodic.YZZL = "12.011";
-            ls_periodic.FH = "C";
-            ls_periodic.YWM = "Carbon";
-            ls_periodic.SX1 = "0.277";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "碳";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "7";
-            ls_periodic.YZZL = "14.007";
-            ls_periodic.FH = "N";
-            ls_periodic.YWM = "Nitrogen";
-            ls_periodic.SX1 = "0.392";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氮";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "8";
-            ls_periodic.YZZL = "15.999";
-            ls_periodic.FH = "O";
-            ls_periodic.YWM = "Oxygen";
-            ls_periodic.SX1 = "0.523";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氧";
-            ls_periodic.FL = "img_cubic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "9";
-            ls_periodic.YZZL = "18.998";
-            ls_periodic.FH = "F";
-            ls_periodic.YWM = "Fluorine";
-            ls_periodic.SX1 = "0.677";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氟";
-            ls_periodic.FL = "img_cubic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "10";
-            ls_periodic.YZZL = "20.180";
-            ls_periodic.FH = "Ne";
-            ls_periodic.YWM = "Neon";
-            ls_periodic.SX1 = "0.848";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氖";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "11";
-            ls_periodic.YZZL = "22.990";
-            ls_periodic.FH = "Na";
-            ls_periodic.YWM = "Sodium";
-            ls_periodic.SX1 = "1.040";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钠";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "12";
-            ls_periodic.YZZL = "24.305";
-            ls_periodic.FH = "Mg";
-            ls_periodic.YWM = "Magnesium";
-            ls_periodic.SX1 = "1.254";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "镁";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "13";
-            ls_periodic.YZZL = "26.982";
-            ls_periodic.FH = "Al";
-            ls_periodic.YWM = "Aluminum";
-            ls_periodic.SX1 = "1.486";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铝";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "14";
-            ls_periodic.YZZL = "28.086";
-            ls_periodic.FH = "Si";
-            ls_periodic.YWM = "Silicon";
-            ls_periodic.SX1 = "1.740";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "硅";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "15";
-            ls_periodic.YZZL = "30.974";
-            ls_periodic.FH = "P";
-            ls_periodic.YWM = "Phosphorus";
-            ls_periodic.SX1 = "2.013";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "磷";
-            ls_periodic.FL = "img_Monoclinic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "16";
-            ls_periodic.YZZL = "32.066";
-            ls_periodic.FH = "S";
-            ls_periodic.YWM = "Sulfur";
-            ls_periodic.SX1 = "2.307";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "硫";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "17";
-            ls_periodic.YZZL = "35.453";
-            ls_periodic.FH = "Cl";
-            ls_periodic.YWM = "Chlorine";
-            ls_periodic.SX1 = "2.622";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氯";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "18";
-            ls_periodic.YZZL = "39.948";
-            ls_periodic.FH = "Ar";
-            ls_periodic.YWM = "Argon";
-            ls_periodic.SX1 = "2.957";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氩";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "19";
-            ls_periodic.YZZL = "39.098";
-            ls_periodic.FH = "K";
-            ls_periodic.YWM = "Potassium";
-            ls_periodic.SX1 = "3.313";
-            ls_periodic.SX2 = "-";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钾";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "20";
-            ls_periodic.YZZL = "40.08";
-            ls_periodic.FH = "Ca";
-            ls_periodic.YWM = "Calcium";
-            ls_periodic.SX1 = "3.691";
-            ls_periodic.SX2 = "0.341";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钙";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "21";
-            ls_periodic.YZZL = "44.956";
-            ls_periodic.FH = "Sc";
-            ls_periodic.YWM = "Scandium";
-            ls_periodic.SX1 = "4.090";
-            ls_periodic.SX2 = "0.395";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钪";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "22";
-            ls_periodic.YZZL = "47.88";
-            ls_periodic.FH = "Ti";
-            ls_periodic.YWM = "Titanium";
-            ls_periodic.SX1 = "4.510";
-            ls_periodic.SX2 = "0.452";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钛";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "23";
-            ls_periodic.YZZL = "50.942";
-            ls_periodic.FH = "V";
-            ls_periodic.YWM = "Vanadium";
-            ls_periodic.SX1 = "4.952";
-            ls_periodic.SX2 = "0.511";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钒";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "24";
-            ls_periodic.YZZL = "51.996";
-            ls_periodic.FH = "Cr";
-            ls_periodic.YWM = "Chromium";
-            ls_periodic.SX1 = "5.414";
-            ls_periodic.SX2 = "0.573";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铬";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "25";
-            ls_periodic.YZZL = "54.938";
-            ls_periodic.FH = "Mn";
-            ls_periodic.YWM = "Manganese";
-            ls_periodic.SX1 = "5.898";
-            ls_periodic.SX2 = "0.637";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锰";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "26";
-            ls_periodic.YZZL = "55.847";
-            ls_periodic.FH = "Fe";
-            ls_periodic.YWM = "Iron";
-            ls_periodic.SX1 = "6.403";
-            ls_periodic.SX2 = "0.705";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铁";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "27";
-            ls_periodic.YZZL = "58.933";
-            ls_periodic.FH = "Co";
-            ls_periodic.YWM = "Cobalt";
-            ls_periodic.SX1 = "6.929";
-            ls_periodic.SX2 = "0.776";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钴";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "28";
-            ls_periodic.YZZL = "58.70";
-            ls_periodic.FH = "Ni";
-            ls_periodic.YWM = "Nickel";
-            ls_periodic.SX1 = "7.477";
-            ls_periodic.SX2 = "0.851";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "镍";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "29";
-            ls_periodic.YZZL = "63.546";
-            ls_periodic.FH = "Cu";
-            ls_periodic.YWM = "Copper";
-            ls_periodic.SX1 = "8.040";
-            ls_periodic.SX2 = "0.930";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铜";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "30";
-            ls_periodic.YZZL = "65.39";
-            ls_periodic.FH = "Zn";
-            ls_periodic.YWM = "Zinc";
-            ls_periodic.SX1 = "8.637";
-            ls_periodic.SX2 = "1.012";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锌";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "31";
-            ls_periodic.YZZL = "69.72";
-            ls_periodic.FH = "Ga";
-            ls_periodic.YWM = "Gallium";
-            ls_periodic.SX1 = "9.250";
-            ls_periodic.SX2 = "1.098";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "镓";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "32";
-            ls_periodic.YZZL = "72.61";
-            ls_periodic.FH = "Ge";
-            ls_periodic.YWM = "Germanium";
-            ls_periodic.SX1 = "9.885";
-            ls_periodic.SX2 = "1.188";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锗";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "33";
-            ls_periodic.YZZL = "74.922";
-            ls_periodic.FH = "As";
-            ls_periodic.YWM = "Arsenic";
-            ls_periodic.SX1 = "10.542";
-            ls_periodic.SX2 = "1.282";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "砷";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "34";
-            ls_periodic.YZZL = "78.96";
-            ls_periodic.FH = "Se";
-            ls_periodic.YWM = "Selenium";
-            ls_periodic.SX1 = "11.220";
-            ls_periodic.SX2 = "1.379";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "硒";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "35";
-            ls_periodic.YZZL = "79Br904";
-            ls_periodic.FH = "Br";
-            ls_periodic.YWM = "Bromine";
-            ls_periodic.SX1 = "11.922";
-            ls_periodic.SX2 = "1.480";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "溴";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "36";
-            ls_periodic.YZZL = "83.80";
-            ls_periodic.FH = "Kr";
-            ls_periodic.YWM = "Krypton";
-            ls_periodic.SX1 = "12.649";
-            ls_periodic.SX2 = "1.586";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氪";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "37";
-            ls_periodic.YZZL = "85.468";
-            ls_periodic.FH = "Rb";
-            ls_periodic.YWM = "Rubidium";
-            ls_periodic.SX1 = "13.393";
-            ls_periodic.SX2 = "1.694";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铷";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "38";
-            ls_periodic.YZZL = "87.62";
-            ls_periodic.FH = "Sr";
-            ls_periodic.YWM = "Strontium";
-            ls_periodic.SX1 = "14.163";
-            ls_periodic.SX2 = "1.806";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锶";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "39";
-            ls_periodic.YZZL = "88.906";
-            ls_periodic.FH = "Y";
-            ls_periodic.YWM = "Yttrium";
-            ls_periodic.SX1 = "14.955";
-            ls_periodic.SX2 = "1.922";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钇";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "40";
-            ls_periodic.YZZL = "91.22";
-            ls_periodic.FH = "Zr";
-            ls_periodic.YWM = "Zirconium";
-            ls_periodic.SX1 = "15.776";
-            ls_periodic.SX2 = "2.042";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锆";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "41";
-            ls_periodic.YZZL = "92.906";
-            ls_periodic.FH = "Nb";
-            ls_periodic.YWM = "Niobium";
-            ls_periodic.SX1 = "16.617";
-            ls_periodic.SX2 = "2.166";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铌";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "42";
-            ls_periodic.YZZL = "95.94";
-            ls_periodic.FH = "Mo";
-            ls_periodic.YWM = "Molybdenum";
-            ls_periodic.SX1 = "17.481";
-            ls_periodic.SX2 = "2.293";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钼";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "43";
-            ls_periodic.YZZL = "(98)";
-            ls_periodic.FH = "Tc";
-            ls_periodic.YWM = "Technetium";
-            ls_periodic.SX1 = "18.368";
-            ls_periodic.SX2 = "2.424";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锝";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "44";
-            ls_periodic.YZZL = "101.07";
-            ls_periodic.FH = "Ru";
-            ls_periodic.YWM = "Ruthenium";
-            ls_periodic.SX1 = "19.282";
-            ls_periodic.SX2 = "2.558";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钌";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "45";
-            ls_periodic.YZZL = "102.906";
-            ls_periodic.FH = "Rh";
-            ls_periodic.YWM = "Rhodium";
-            ls_periodic.SX1 = "20.217";
-            ls_periodic.SX2 = "2.696";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铑";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "46";
-            ls_periodic.YZZL = "106.42";
-            ls_periodic.FH = "Pd";
-            ls_periodic.YWM = "Palladium";
-            ls_periodic.SX1 = "21.180";
-            ls_periodic.SX2 = "2.838";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "钯";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "47";
-            ls_periodic.YZZL = "107.868";
-            ls_periodic.FH = "Ag";
-            ls_periodic.YWM = "Silver";
-            ls_periodic.SX1 = "22.166";
-            ls_periodic.SX2 = "2.984";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "银";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "48";
-            ls_periodic.YZZL = "112.41";
-            ls_periodic.FH = "Cd";
-            ls_periodic.YWM = "Cadmium";
-            ls_periodic.SX1 = "23.175";
-            ls_periodic.SX2 = "3.133";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "镉";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "49";
-            ls_periodic.YZZL = "114.82";
-            ls_periodic.FH = "In";
-            ls_periodic.YWM = "Indium";
-            ls_periodic.SX1 = "24.209";
-            ls_periodic.SX2 = "3.286";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铟";
-            ls_periodic.FL = "img_teragonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "50";
-            ls_periodic.YZZL = "118.71";
-            ls_periodic.FH = "Sn";
-            ls_periodic.YWM = "Tin";
-            ls_periodic.SX1 = "25.272";
-            ls_periodic.SX2 = "3.443";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锡";
-            ls_periodic.FL = "img_teragonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "51";
-            ls_periodic.YZZL = "121.76";
-            ls_periodic.FH = "Sb";
-            ls_periodic.YWM = "Antimony";
-            ls_periodic.SX1 = "26.359";
-            ls_periodic.SX2 = "3.604";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "锑";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "52";
-            ls_periodic.YZZL = "127.60";
-            ls_periodic.FH = "Te";
-            ls_periodic.YWM = "Tellurium";
-            ls_periodic.SX1 = "27.471";
-            ls_periodic.SX2 = "3.768";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "碲";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "53";
-            ls_periodic.YZZL = "126.905";
-            ls_periodic.FH = "I";
-            ls_periodic.YWM = "Iodine";
-            ls_periodic.SX1 = "28.615";
-            ls_periodic.SX2 = "3.937";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "碘";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "54";
-            ls_periodic.YZZL = "131.29";
-            ls_periodic.FH = "Xe";
-            ls_periodic.YWM = "Xenon";
-            ls_periodic.SX1 = "29.779";
-            ls_periodic.SX2 = "4.109";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "氙";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "55";
-            ls_periodic.YZZL = "132.905";
-            ls_periodic.FH = "Cs";
-            ls_periodic.YWM = "Cesium";
-            ls_periodic.SX1 = "30.971";
-            ls_periodic.SX2 = "4.286";
-            ls_periodic.SX3 = "-";
-            ls_periodic.ZWYSM = "铯";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "56";
-            ls_periodic.YZZL = "137.33";
-            ls_periodic.FH = "Ba";
-            ls_periodic.YWM = "Barium";
-            ls_periodic.SX1 = "32.196";
-            ls_periodic.SX2 = "4.465";
-            ls_periodic.SX3 = "0.779";
-            ls_periodic.ZWYSM = "钡";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "57";
-            ls_periodic.YZZL = "138.906";
-            ls_periodic.FH = "La";
-            ls_periodic.YWM = "Lanthanum";
-            ls_periodic.SX1 = "33.441";
-            ls_periodic.SX2 = "4.650";
-            ls_periodic.SX3 = "0.833";
-            ls_periodic.ZWYSM = "镧";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "72";
-            ls_periodic.YZZL = "178.49";
-            ls_periodic.FH = "Hf";
-            ls_periodic.YWM = "Hafnium";
-            ls_periodic.SX1 = "55.801";
-            ls_periodic.SX2 = "7.898";
-            ls_periodic.SX3 = "1.644";
-            ls_periodic.ZWYSM = "铪";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "73";
-            ls_periodic.YZZL = "180.948";
-            ls_periodic.FH = "Ta";
-            ls_periodic.YWM = "Tantalum";
-            ls_periodic.SX1 = "57.450";
-            ls_periodic.SX2 = "8.145";
-            ls_periodic.SX3 = "1.709";
-            ls_periodic.ZWYSM = "钽";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "74";
-            ls_periodic.YZZL = "183.85";
-            ls_periodic.FH = "W";
-            ls_periodic.YWM = "Tungsten";
-            ls_periodic.SX1 = "59.305";
-            ls_periodic.SX2 = "8.396";
-            ls_periodic.SX3 = "1.774";
-            ls_periodic.ZWYSM = "钨";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "75";
-            ls_periodic.YZZL = "186.207";
-            ls_periodic.FH = "Re";
-            ls_periodic.YWM = "Rhenium";
-            ls_periodic.SX1 = "61.122";
-            ls_periodic.SX2 = "8.651";
-            ls_periodic.SX3 = "1.842";
-            ls_periodic.ZWYSM = "铼";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "76";
-            ls_periodic.YZZL = "190.2";
-            ls_periodic.FH = "Os";
-            ls_periodic.YWM = "Osmium";
-            ls_periodic.SX1 = "62.989";
-            ls_periodic.SX2 = "8.910";
-            ls_periodic.SX3 = "1.910";
-            ls_periodic.ZWYSM = "锇";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "77";
-            ls_periodic.YZZL = "192.22";
-            ls_periodic.FH = "Ir";
-            ls_periodic.YWM = "Iridium";
-            ls_periodic.SX1 = "64.906";
-            ls_periodic.SX2 = "9.174";
-            ls_periodic.SX3 = "1.978";
-            ls_periodic.ZWYSM = "铱";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "78";
-            ls_periodic.YZZL = "195.08";
-            ls_periodic.FH = "Pt";
-            ls_periodic.YWM = "Platinium";
-            ls_periodic.SX1 = "66.834";
-            ls_periodic.SX2 = "9.441";
-            ls_periodic.SX3 = "2.048";
-            ls_periodic.ZWYSM = "铂";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "79";
-            ls_periodic.YZZL = "196.967";
-            ls_periodic.FH = "Au";
-            ls_periodic.YWM = "Gold";
-            ls_periodic.SX1 = "68.804";
-            ls_periodic.SX2 = "9.712";
-            ls_periodic.SX3 = "2.120";
-            ls_periodic.ZWYSM = "金";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "80";
-            ls_periodic.YZZL = "200.59";
-            ls_periodic.FH = "Hg";
-            ls_periodic.YWM = "Mercury";
-            ls_periodic.SX1 = "70.806";
-            ls_periodic.SX2 = "9.987";
-            ls_periodic.SX3 = "2.191";
-            ls_periodic.ZWYSM = "汞";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "81";
-            ls_periodic.YZZL = "204.38";
-            ls_periodic.FH = "Tl";
-            ls_periodic.YWM = "Thallium";
-            ls_periodic.SX1 = "72.869";
-            ls_periodic.SX2 = "10.256";
-            ls_periodic.SX3 = "2.268";
-            ls_periodic.ZWYSM = "铊";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "82";
-            ls_periodic.YZZL = "207.2";
-            ls_periodic.FH = "Pb";
-            ls_periodic.YWM = "Lead";
-            ls_periodic.SX1 = "74.989";
-            ls_periodic.SX2 = "10.550";
-            ls_periodic.SX3 = "2.342";
-            ls_periodic.ZWYSM = "铅";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "83";
-            ls_periodic.YZZL = "208.980";
-            ls_periodic.FH = "Bi";
-            ls_periodic.YWM = "Bismuth";
-            ls_periodic.SX1 = "77.091";
-            ls_periodic.SX2 = "10.837";
-            ls_periodic.SX3 = "2.419";
-            ls_periodic.ZWYSM = "铋";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "84";
-            ls_periodic.YZZL = "(209)";
-            ls_periodic.FH = "Po";
-            ls_periodic.YWM = "Polonium";
-            ls_periodic.SX1 = "79.272";
-            ls_periodic.SX2 = "11.129";
-            ls_periodic.SX3 = "2.505";
-            ls_periodic.ZWYSM = "钋";
-            ls_periodic.FL = "img_Monoclinic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "85";
-            ls_periodic.YZZL = "(210)";
-            ls_periodic.FH = "At";
-            ls_periodic.YWM = "Astatine";
-            ls_periodic.SX1 = "81.513";
-            ls_periodic.SX2 = "11.425";
-            ls_periodic.SX3 = "2.585";
-            ls_periodic.ZWYSM = "砹";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "86";
-            ls_periodic.YZZL = "(222)";
-            ls_periodic.FH = "Rn";
-            ls_periodic.YWM = "Radon";
-            ls_periodic.SX1 = "83.771";
-            ls_periodic.SX2 = "11.725";
-            ls_periodic.SX3 = "2.665";
-            ls_periodic.ZWYSM = "氡";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "87";
-            ls_periodic.YZZL = "(223)";
-            ls_periodic.FH = "Fr";
-            ls_periodic.YWM = "Francium";
-            ls_periodic.SX1 = "86.098";
-            ls_periodic.SX2 = "12.029";
-            ls_periodic.SX3 = "2.747";
-            ls_periodic.ZWYSM = "钫";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "88";
-            ls_periodic.YZZL = "226.025";
-            ls_periodic.FH = "Ra";
-            ls_periodic.YWM = "Radium";
-            ls_periodic.SX1 = "88.480";
-            ls_periodic.SX2 = "12.338";
-            ls_periodic.SX3 = "2.830";
-            ls_periodic.ZWYSM = "镭";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "89";
-            ls_periodic.YZZL = "227.028";
-            ls_periodic.FH = "Ac";
-            ls_periodic.YWM = "Actinium";
-            ls_periodic.SX1 = "90.880";
-            ls_periodic.SX2 = "12.650";
-            ls_periodic.SX3 = "2.915";
-            ls_periodic.ZWYSM = "锕";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //最下方的28个元素
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "58";
-            ls_periodic.YZZL = "140.12";
-            ls_periodic.FH = "Ce";
-            ls_periodic.YWM = "Cerium";
-            ls_periodic.SX1 = "34.717";
-            ls_periodic.SX2 = "4.839";
-            ls_periodic.SX3 = "0.883";
-            ls_periodic.ZWYSM = "铈";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "59";
-            ls_periodic.YZZL = "140.908";
-            ls_periodic.FH = "Pr";
-            ls_periodic.YWM = "Praseodymium";
-            ls_periodic.SX1 = "36.031";
-            ls_periodic.SX2 = "5.033";
-            ls_periodic.SX3 = "0.929";
-            ls_periodic.ZWYSM = "镨";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "60";
-            ls_periodic.YZZL = "144.24";
-            ls_periodic.FH = "Nd";
-            ls_periodic.YWM = "Neodymium";
-            ls_periodic.SX1 = "37.358";
-            ls_periodic.SX2 = "5.229";
-            ls_periodic.SX3 = "0.978";
-            ls_periodic.ZWYSM = "钕";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "61";
-            ls_periodic.YZZL = "(145)";
-            ls_periodic.FH = "Pm";
-            ls_periodic.YWM = "Promethium";
-            ls_periodic.SX1 = "38.725";
-            ls_periodic.SX2 = "5.432";
-            ls_periodic.SX3 = "1.032";
-            ls_periodic.ZWYSM = "钷";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "62";
-            ls_periodic.YZZL = "150.36";
-            ls_periodic.FH = "Sm";
-            ls_periodic.YWM = "Samarium";
-            ls_periodic.SX1 = "40.118";
-            ls_periodic.SX2 = "5.635";
-            ls_periodic.SX3 = "1.081";
-            ls_periodic.ZWYSM = "钐";
-            ls_periodic.FL = "img_rhombohedral";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "63";
-            ls_periodic.YZZL = "151.97";
-            ls_periodic.FH = "Eu";
-            ls_periodic.YWM = "Europium";
-            ls_periodic.SX1 = "41.534";
-            ls_periodic.SX2 = "5.845";
-            ls_periodic.SX3 = "1.137";
-            ls_periodic.ZWYSM = "铕";
-            ls_periodic.FL = "img_cubicbodycentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "64";
-            ls_periodic.YZZL = "157.25";
-            ls_periodic.FH = "Gd";
-            ls_periodic.YWM = "Gadolinium";
-            ls_periodic.SX1 = "42.992";
-            ls_periodic.SX2 = "6.056";
-            ls_periodic.SX3 = "1.185";
-            ls_periodic.ZWYSM = "铕";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "65";
-            ls_periodic.YZZL = "158.925";
-            ls_periodic.FH = "Tb";
-            ls_periodic.YWM = "Terbium";
-            ls_periodic.SX1 = "44.476";
-            ls_periodic.SX2 = "6.272";
-            ls_periodic.SX3 = "1.240";
-            ls_periodic.ZWYSM = "铽";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "66";
-            ls_periodic.YZZL = "162.50";
-            ls_periodic.FH = "Dy";
-            ls_periodic.YWM = "Dysprosium";
-            ls_periodic.SX1 = "45.997";
-            ls_periodic.SX2 = "6.494";
-            ls_periodic.SX3 = "1.293";
-            ls_periodic.ZWYSM = "镝";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "67";
-            ls_periodic.YZZL = "164.930";
-            ls_periodic.FH = "Ho";
-            ls_periodic.YWM = "Holmium";
-            ls_periodic.SX1 = "47.534";
-            ls_periodic.SX2 = "6.719";
-            ls_periodic.SX3 = "1.347";
-            ls_periodic.ZWYSM = "钬";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "68";
-            ls_periodic.YZZL = "167.26";
-            ls_periodic.FH = "Er";
-            ls_periodic.YWM = "Erbium";
-            ls_periodic.SX1 = "49.100";
-            ls_periodic.SX2 = "6.947";
-            ls_periodic.SX3 = "1.405";
-            ls_periodic.ZWYSM = "铒";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "69";
-            ls_periodic.YZZL = "168.934";
-            ls_periodic.FH = "Tm";
-            ls_periodic.YWM = "Thulium";
-            ls_periodic.SX1 = "50.730";
-            ls_periodic.SX2 = "7.179";
-            ls_periodic.SX3 = "1.462";
-            ls_periodic.ZWYSM = "铥";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "70";
-            ls_periodic.YZZL = "173.04";
-            ls_periodic.FH = "Yb";
-            ls_periodic.YWM = "Ytterbium";
-            ls_periodic.SX1 = "52.362";
-            ls_periodic.SX2 = "7.414";
-            ls_periodic.SX3 = "1.521";
-            ls_periodic.ZWYSM = "镱";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "71";
-            ls_periodic.YZZL = "174.967";
-            ls_periodic.FH = "Lu";
-            ls_periodic.YWM = "Lutetium";
-            ls_periodic.SX1 = "54.078";
-            ls_periodic.SX2 = "7.654";
-            ls_periodic.SX3 = "1.581";
-            ls_periodic.ZWYSM = "镥";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "90";
-            ls_periodic.YZZL = "232.038";
-            ls_periodic.FH = "Th";
-            ls_periodic.YWM = "Thorium";
-            ls_periodic.SX1 = "93.382";
-            ls_periodic.SX2 = "12.967";
-            ls_periodic.SX3 = "2.991";
-            ls_periodic.ZWYSM = "钍";
-            ls_periodic.FL = "img_cubicfacecentered";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "91";
-            ls_periodic.YZZL = "231.036";
-            ls_periodic.FH = "Pa";
-            ls_periodic.YWM = "Protoactinium";
-            ls_periodic.SX1 = "95.886";
-            ls_periodic.SX2 = "13.288";
-            ls_periodic.SX3 = "3.077";
-            ls_periodic.ZWYSM = "镤";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "92";
-            ls_periodic.YZZL = "238.029";
-            ls_periodic.FH = "U";
-            ls_periodic.YWM = "Uranium";
-            ls_periodic.SX1 = "98.434";
-            ls_periodic.SX2 = "13.612";
-            ls_periodic.SX3 = "3.165";
-            ls_periodic.ZWYSM = "铀";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "93";
-            ls_periodic.YZZL = "237.048";
-            ls_periodic.FH = "Np";
-            ls_periodic.YWM = "Neptunium";
-            ls_periodic.SX1 = "100.800";
-            ls_periodic.SX2 = "13.941";
-            ls_periodic.SX3 = "3.253";
-            ls_periodic.ZWYSM = "镎";
-            ls_periodic.FL = "img_orthohombic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "94";
-            ls_periodic.YZZL = "(244)";
-            ls_periodic.FH = "Pu";
-            ls_periodic.YWM = "Plutonium";
-            ls_periodic.SX1 = "103.320";
-            ls_periodic.SX2 = "14.275";
-            ls_periodic.SX3 = "3.344";
-            ls_periodic.ZWYSM = "钚";
-            ls_periodic.FL = "img_Monoclinic";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "95";
-            ls_periodic.YZZL = "(243)";
-            ls_periodic.FH = "Am";
-            ls_periodic.YWM = "Americium";
-            ls_periodic.SX1 = "105.970";
-            ls_periodic.SX2 = "14.615";
-            ls_periodic.SX3 = "3.435";
-            ls_periodic.ZWYSM = "镅";
-            ls_periodic.FL = "img_Hexagonal";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "96";
-            ls_periodic.YZZL = "(247)";
-            ls_periodic.FH = "Cm";
-            ls_periodic.YWM = "Curium";
-            ls_periodic.SX1 = "108.737";
-            ls_periodic.SX2 = "14.961";
-            ls_periodic.SX3 = "3.539";
-            ls_periodic.ZWYSM = "锔";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "97";
-            ls_periodic.YZZL = "(247)";
-            ls_periodic.FH = "Bk";
-            ls_periodic.YWM = "Berkelium";
-            ls_periodic.SX1 = "111.676";
-            ls_periodic.SX2 = "15.309";
-            ls_periodic.SX3 = "3.634";
-            ls_periodic.ZWYSM = "锫";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "98";
-            ls_periodic.YZZL = "(251)";
-            ls_periodic.FH = "Cf";
-            ls_periodic.YWM = "Californium";
-            ls_periodic.SX1 = "114.778";
-            ls_periodic.SX2 = "15.661";
-            ls_periodic.SX3 = "3.731";
-            ls_periodic.ZWYSM = "锎";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "99";
-            ls_periodic.YZZL = "(252)";
-            ls_periodic.FH = "Es";
-            ls_periodic.YWM = "Einsteinium";
-            ls_periodic.SX1 = "-";
-            ls_periodic.SX2 = "16.018";
-            ls_periodic.SX3 = "3.829";
-            ls_periodic.ZWYSM = "锿";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "100";
-            ls_periodic.YZZL = "(257)";
-            ls_periodic.FH = "Fm";
-            ls_periodic.YWM = "Fermium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "镄";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "101";
-            ls_periodic.YZZL = "(258)";
-            ls_periodic.FH = "Md";
-            ls_periodic.YWM = "Mendelevium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "钔";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "102";
-            ls_periodic.YZZL = "(259)";
-            ls_periodic.FH = "No";
-            ls_periodic.YWM = "Nobelium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "锘";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            //维护表-----------------------------
-            ls_periodic = new Periodic();
-            ls_periodic.XH = "103";
-            ls_periodic.YZZL = "(260)";
-            ls_periodic.FH = "Lr";
-            ls_periodic.YWM = "Lawrencium";
-            ls_periodic.SX1 = "";
-            ls_periodic.SX2 = "";
-            ls_periodic.SX3 = "";
-            ls_periodic.ZWYSM = "铹";
-            ls_periodic.FL = "";
-            List_Periodic.Add(ls_periodic);
-
-            return List_Periodic;
-        }
-
-        /// <summary>
-        /// 根据传入的元素名判断,该元素是否存在于此元素表中
-        /// </summary>
-        /// <param name="in_list_periodic"></param>
-        /// <param name="str_ysm"></param>
-        /// <returns></returns>
-        public static bool ExistPeriodicByYsm(List<Periodic> in_list_periodic, string str_ysm)
-        {
-            for (int i = 0; i < in_list_periodic.Count(); i++)
-            {
-                if (str_ysm.ToUpper() == in_list_periodic[i].FH.ToUpper())
-                {
-                    return true;
-                }
-            }
-            return false;
-        }
-
-        /// <summary>
-        /// 根据传入的元素名,获得元素类对象
-        /// </summary>
-        /// <param name="in_list_periodic"></param>
-        /// <param name="str_ysm"></param>
-        /// <returns></returns>
-        public static Periodic GetPeriodicByYsm(List<Periodic> in_list_periodic, string str_ysm)
-        {
-            Periodic ls_p = new Periodic();
-            for (int i = 0; i < in_list_periodic.Count(); i++)
-            {
-                if (str_ysm.ToUpper() == in_list_periodic[i].FH.ToUpper())
-                {
-                    ls_p = in_list_periodic[i];
-                }
-            }
-            return ls_p;
-        }
-
-        /// <summary>
-        /// 根据传入的序号,获得元素类对象
-        /// </summary>
-        /// <param name="in_list_periodic"></param>
-        /// <param name="str_xh"></param>
-        /// <returns></returns>
-        public static Periodic GetPeriodicByXH(List<Periodic> in_list_periodic, string str_xh)
-        {
-            Periodic ls_p = new Periodic();
-            for (int i = 0; i < in_list_periodic.Count(); i++)
-            {
-                if (str_xh.ToUpper() == in_list_periodic[i].XH.ToUpper())
-                {
-                    ls_p = in_list_periodic[i];
-                }
-            }
-            return ls_p;
-        }
-    }
-
-    //夹杂物结构类的子类,元素类
-    public class ElementRange
-    {
-        string _rangeid;
-        string _rangenum;
-        string _stdid;
-        string _rangestart;
-        string _rangeend;
-        string _atomnum;
-        string _percentage;
-        string _molarratio;
-
-        /// <summary>
-        /// id?
-        /// </summary>
-        public string RangeID
-        {
-            get { return _rangeid; }
-            set { _rangeid = value; }
-        }
-
-        /// <summary>
-        /// 数量?
-        /// </summary>
-        public string RangeNum
-        {
-            get { return _rangenum; }
-            set { _rangenum = value; }
-        }
-
-        /// <summary>
-        /// 夹杂物ID
-        /// </summary>
-        public string STDID
-        {
-            get { return _stdid; }
-            set { _stdid = value; }
-        }
-
-        /// <summary>
-        /// 起
-        /// </summary>
-        public string RangeStart
-        {
-            get { return _rangestart; }
-            set { _rangestart = value; }
-        }
-
-        /// <summary>
-        /// 止
-        /// </summary>
-        public string RangeEnd
-        {
-            get { return _rangeend; }
-            set { _rangeend = value; }
-        }
-
-        /// <summary>
-        /// 原子数
-        /// </summary>
-        public string AtomNum
-        {
-            get { return _atomnum; }
-            set { _atomnum = value; }
-        }
-
-        /// <summary>
-        /// 比例
-        /// </summary>
-        public string Percentage
-        {
-            get { return _percentage; }
-            set { _percentage = value; }
-        }
-
-        /// <summary>
-        /// 摩尔比
-        /// </summary>
-        public string MolarRatio
-        {
-            get { return _molarratio; }
-            set { _molarratio = value; }
-        }
-
-    }
-
-    //夹杂物结构类
-    public class IncALib
-    {
-        string _name;   //名称
-        string _incaid; //夹杂物ID
-        string _color;  //颜色
-        string _heightwidthratio;   //宽高比
-        string _graystart;  //起
-        string _grayend;    //止
-        string _rangeelementnum;//数量
-        List<ElementRange> m_list_elementrange;
-
-        /// <summary>
-        /// 构造函数
-        /// </summary>
-        public IncALib()
-        {
-            //m_list_periodic = new List<Periodic>();
-            m_list_elementrange = new List<ElementRange>();
-        }
-
-        /// <summary>
-        /// 名称
-        /// </summary>
-        public string Name
-        {
-            get { return _name; }
-            set { _name = value; }
-        }
-
-        /// <summary>
-        /// 夹杂物ID
-        /// </summary>
-        public string IncAId
-        {
-            get { return _incaid; }
-            set { _incaid = value; }
-        }
-
-        /// <summary>
-        /// 颜色
-        /// </summary>
-        public string Color
-        {
-            get { return _color; }
-            set { _color = value; }
-        }
-
-        /// <summary>
-        /// 宽高比
-        /// </summary>
-        public string HeightWidthRatio
-        {
-            get { return _heightwidthratio; }
-            set { _heightwidthratio = value; }
-        }
-
-        /// <summary>
-        /// 起
-        /// </summary>
-        public string GrayStart
-        {
-            get { return _graystart; }
-            set { _graystart = value; }
-        }
-
-        /// <summary>
-        /// 止
-        /// </summary>
-        public string GrayEnd
-        {
-            get { return _grayend; }
-            set { _grayend = value; }
-        }
-
-        /// <summary>
-        /// 元素数量
-        /// </summary>
-        public string RangeElementNum
-        {
-            get { return _rangeelementnum; }
-            set { _rangeelementnum = value; }
-        }
-
-        /// <summary>
-        /// 所包含的元素
-        /// </summary>
-        public List<ElementRange> List_ElementRange
-        {
-            get { return m_list_elementrange; }
-            set { m_list_elementrange = value; }
-        }
-    }
-
-
-    //元素包含信息结构
-    public class Periodic
-    {
-        string _xh;         //序号
-        string _yzzl;    //原子重量,因为有标记的重量带有()括号,所以这里先用字符串进行存储
-        string _fh;      //符号
-        string _zwysm;   //中文元素名
-        string _ywm;     //英文名 
-        string _sx1;     //属性1
-        string _sx2;     //属性2
-        string _sx3;     //属性3
-        string _fl;      //分类
-
-        /// <summary>
-        /// 序号
-        /// </summary>
-        public string XH
-        {
-            get { return _xh; }
-            set { _xh = value; }
-        }
-        /// <summary>
-        /// 原子重量
-        /// </summary>
-        public string YZZL
-        {
-            get { return _yzzl; }
-            set { _yzzl = value; }
-        }
-        /// <summary>
-        /// 符号
-        /// </summary>
-        public string FH
-        {
-            get { return _fh; }
-            set { _fh = value; }
-        }
-        /// <summary>
-        /// 中文元素名
-        /// </summary>
-        public string ZWYSM
-        {
-            get { return _zwysm; }
-            set { _zwysm = value; }
-        }
-        /// <summary>
-        /// 英文名
-        /// </summary>
-        public string YWM
-        {
-            get { return _ywm; }
-            set { _ywm = value; }
-        }
-        /// <summary>
-        /// K峰
-        /// </summary>
-        public string SX1
-        {
-            get { return _sx1; }
-            set { _sx1 = value; }
-        }
-        /// <summary>
-        /// L峰
-        /// </summary>
-        public string SX2
-        {
-            get { return _sx2; }
-            set { _sx2 = value; }
-        }
-        /// <summary>
-        /// 属性3
-        /// </summary>
-        public string SX3
-        {
-            get { return _sx3; }
-            set { _sx3 = value; }
-        }
-        /// <summary>
-        /// 分类
-        /// </summary>
-        public string FL
-        {
-            get { return _fl; }
-            set { _fl = value; }
-        }
-    }
-}

+ 9 - 8
OTSIncAReportApp/1-UI/OTSMgrInfo/Triangulation_Edit.cs

@@ -1,4 +1,5 @@
 using OTSIncAReportApp._1_UI;
+using OTSPeriodicTable;
 using OTSRptPeriodicTable;
 using System;
 using System.Collections.Generic;
@@ -63,13 +64,13 @@ namespace OTSIncAReportApp.OTSMgrInfo
             cboElement1.Items.Clear();
             cboElement3.Items.Clear();
 
-            List<OTSRptPeriodicTable.Periodic> list_periodic = OTSRptPeriodicTable.CListPeriodic.GetListPeriodic();
+            List<Periodic> list_periodic =CListPeriodic.GetListPeriodic();
 
             //排序
-            List<OTSRptPeriodicTable.Periodic> list_sortperiodic = list_periodic.OrderBy(s => s.FH).ToList();
+            List<Periodic> list_sortperiodic = list_periodic.OrderBy(s => s.Symbol).ToList();
             for (int i = 0; i < list_sortperiodic.Count; i++)
             {
-                var va = list_sortperiodic[i].FH;
+                var va = list_sortperiodic[i].Symbol;
                 cboElement1.Items.Add(va);
                 cboElement3.Items.Add(va);
                 if (va == v1)
@@ -188,7 +189,7 @@ namespace OTSIncAReportApp.OTSMgrInfo
         private void btn_xsys_Click(object sender, EventArgs e)
         {
             //打开编辑元素列表窗体
-            OTSPeriodicTableForm_Small opts = new OTSPeriodicTableForm_Small();
+            OTSPeriodicTable.OTSPeriodicTableForm_Small opts = new OTSPeriodicTable.OTSPeriodicTableForm_Small();
 
             //获取需要显示的元素列表,并转换成元素周期表窗体可接受的格式,传入----------------------
             string str_xsys = txtElement2.Text.Trim();
@@ -206,8 +207,8 @@ namespace OTSIncAReportApp.OTSMgrInfo
             for (int i = 0; i < strs.Length; i++)
             {
                 string str_ysm = strs[i];
-                OTSRptPeriodicTable.Periodic ls_periodic = new OTSRptPeriodicTable.Periodic();
-                ls_periodic = OTSRptPeriodicTable.CListPeriodic.GetPeriodicByYsm(OTSRptPeriodicTable.CListPeriodic.GetListPeriodic(), str_ysm);
+                Periodic ls_periodic = new Periodic();
+                ls_periodic = CListPeriodic.GetPeriodicByEleName( str_ysm);
                 opts.m_List_Periodic.Add(ls_periodic);
             }
             //----------------------------------------------------------------------------------------
@@ -223,11 +224,11 @@ namespace OTSIncAReportApp.OTSMgrInfo
                 {
                     if (str_xsys == "")
                     {
-                        str_xsys = opts.m_List_Periodic[i].FH;
+                        str_xsys = opts.m_List_Periodic[i].Symbol;
                     }
                     else
                     {
-                        str_xsys = str_xsys + "," + opts.m_List_Periodic[i].FH;
+                        str_xsys = str_xsys + "," + opts.m_List_Periodic[i].Symbol;
                     }
                 }
             }

+ 7 - 6
OTSIncAReportApp/1-UI/OTSMgrInfo/Triangulation_Item.cs

@@ -1,4 +1,5 @@
-using System;
+using OTSPeriodicTable;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
@@ -132,14 +133,14 @@ namespace OTSIncAReportApp.OTSMgrInfo
             cbo_elementname.Items.Clear();
             cbo_elementnumber.Items.Clear();
 
-            List<OTSRptPeriodicTable.Periodic> list_periodic = OTSRptPeriodicTable.CListPeriodic.GetListPeriodic();
+            List<Periodic> list_periodic = CListPeriodic.GetListPeriodic();
 
             //排序
-            List<OTSRptPeriodicTable.Periodic> list_sortperiodic = list_periodic.OrderBy(s => s.FH).ToList();
+            List<Periodic> list_sortperiodic = list_periodic.OrderBy(s => s.Symbol).ToList();
 
-            foreach (OTSRptPeriodicTable.Periodic pc in list_sortperiodic)
+            foreach (Periodic pc in list_sortperiodic)
             {
-                cbo_elementname.Items.Add(pc.FH);
+                cbo_elementname.Items.Add(pc.Symbol);
             }
 
             for (int i = 1; i < 21; i++)
@@ -245,7 +246,7 @@ namespace OTSIncAReportApp.OTSMgrInfo
         private void button3_Click(object sender, EventArgs e)
         {
             //先校验,添加的元素是否是正确的元素周期表中的元素
-            if (false == OTSRptPeriodicTable.CListPeriodic.ExistPeriodicByYsm(OTSRptPeriodicTable.CListPeriodic.GetListPeriodic(), cbo_elementname.Text.Trim().ToUpper()))
+            if (false == CListPeriodic.ExistPeriodicByEleName(cbo_elementname.Text.Trim().ToUpper()))
             {
                 MessageBox.Show("输入的元素信息错误!", "Tip", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 cbo_elementname.Focus();

+ 4 - 3
OTSIncAReportApp/1-UI/OTSMgrInfo/frmReportSysConfig.cs

@@ -4,6 +4,7 @@ using OTSIncAReportApp.Controls;
 using OTSIncAReportApp.OTSDataMgrFunction;
 using OTSIncAReportApp.OTSMgrInfo;
 using OTSIncAReportApp.SysMgrTools;
+using OTSPeriodicTable;
 using OTSRptPeriodicTable;
 using System;
 using System.Collections.Generic;
@@ -328,7 +329,7 @@ namespace OTSIncAReprotCharts
         private void btn_xsys_Click(object sender, EventArgs e)
         {
             //打开编辑元素列表窗体
-            OTSPeriodicTableForm_Small opts = new OTSPeriodicTableForm_Small();
+            OTSPeriodicTable.OTSPeriodicTableForm_Small opts = new OTSPeriodicTable.OTSPeriodicTableForm_Small();
 
             //获取需要显示的元素列表,并转换成元素周期表窗体可接受的格式,传入----------------------
             string str_xsys = tb_xsys.Text.Trim();
@@ -347,7 +348,7 @@ namespace OTSIncAReprotCharts
             {
                 string str_ysm = strs[i];
                 Periodic ls_periodic = new Periodic();
-                ls_periodic = CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), str_ysm);
+                ls_periodic = CListPeriodic.GetPeriodicByEleName( str_ysm);
                 opts.m_List_Periodic.Add(ls_periodic);
             }
             //----------------------------------------------------------------------------------------
@@ -357,7 +358,7 @@ namespace OTSIncAReprotCharts
             List<string> PeriodicFH = new List<string>();
             for (int j = 0; j < opts.m_List_Periodic.Count; j++)
             {
-                PeriodicFH.Add(opts.m_List_Periodic[j].FH);
+                PeriodicFH.Add(opts.m_List_Periodic[j].Symbol);
             }
 
             PeriodicFH.Sort(delegate (string a, string b) { return ReturnsAtomicNumberByElementName(a).CompareTo(ReturnsAtomicNumberByElementName(b)); });//排序 从小到大原子序数

+ 2 - 1
OTSIncAReportApp/1-UI/OTSTemplateDesigner/Export_ReportTemplate.cs

@@ -17,6 +17,7 @@ using System.Xml;
 using static OTSIncAReportApp.OTSReport_Export;
 using OTSIncAReportApp.ReportTemplate;
 using OTSIncAReportApp.OTSSampleReportInfo;
+using OTSPeriodicTable;
 
 namespace OTSIncAReportApp.OTSTemplateDesigner
 {
@@ -773,7 +774,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 ShowElementInfo ls_sei = new ShowElementInfo();
                 ls_sei.ElementName = list_celementchemistryclr[i].Name;
                 ls_sei.Percentage = list_celementchemistryclr[i].Percentage;
-                ls_sei.dKF = Convert.ToDouble(CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), ls_sei.ElementName).SX1);
+                ls_sei.dKF = Convert.ToDouble(CListPeriodic.GetPeriodicByEleName(ls_sei.ElementName).K_Peak);
                 list_showelementinfo.Add(ls_sei);
             }
 

+ 6 - 5
OTSIncAReportApp/1-UI/OTSTemplateDesigner/OTSReport_TemplateDesignerRM.cs

@@ -1,5 +1,6 @@
 using OTSIncAReportApp.OTSSampleReportInfo;
 using OTSIncAReportApp.SysMgrTools;
+using OTSPeriodicTable;
 using OTSRptPeriodicTable;
 using System;
 using System.Collections.Generic;
@@ -849,7 +850,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             in_list_str.Clear();
 
             //打开编辑元素列表窗体
-            OTSPeriodicTableForm_Small opts = new OTSPeriodicTableForm_Small();
+            OTSPeriodicTable.OTSPeriodicTableForm_Small opts = new OTSPeriodicTable.OTSPeriodicTableForm_Small();
 
             //获取需要显示的元素列表,并转换成元素周期表窗体可接受的格式,传入----------------------
             string str_xsys = in_tb.Text.Trim();
@@ -868,7 +869,7 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
             {
                 string str_ysm = strs[i];
                 Periodic ls_periodic = new Periodic();
-                ls_periodic = CListPeriodic.GetPeriodicByYsm(CListPeriodic.GetListPeriodic(), str_ysm);
+                ls_periodic = CListPeriodic.GetPeriodicByEleName( str_ysm);
                 opts.m_List_Periodic.Add(ls_periodic);
             }
             //----------------------------------------------------------------------------------------
@@ -884,15 +885,15 @@ namespace OTSIncAReportApp.OTSTemplateDesigner
                 {
                     if (str_xsys == "")
                     {
-                        str_xsys = opts.m_List_Periodic[i].FH;
+                        str_xsys = opts.m_List_Periodic[i].Symbol;
                     }
                     else
                     {
-                        str_xsys = str_xsys + "," + opts.m_List_Periodic[i].FH;
+                        str_xsys = str_xsys + "," + opts.m_List_Periodic[i].Symbol;
                     }
 
                     //同时将元素保存到字符串列表中
-                    in_list_str.Add(opts.m_List_Periodic[i].FH);
+                    in_list_str.Add(opts.m_List_Periodic[i].Symbol);
                 }
 
             }

+ 0 - 1
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -579,7 +579,6 @@
     <Compile Include="1-UI\Controls\OTSPeriodicTable\OTSPeriodicTableForm_Small.Designer.cs">
       <DependentUpon>OTSPeriodicTableForm_Small.cs</DependentUpon>
     </Compile>
-    <Compile Include="1-UI\Controls\OTSPeriodicTable\Periodic.cs" />
     <Compile Include="1-UI\Controls\OTSPeriodicTable\ThePeriodicTable.cs">
       <SubType>UserControl</SubType>
     </Compile>