Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3

Bin/x64/Debug/Config/ProData/ReportTemplateConfig.xml

@@ -1,18 +1,17 @@
 <XmlConfig>
   <M_SY>
-    <str_tb_ZBT>清洁度分析报告</str_tb_ZBT>
-    <str_tb_FBT>XXX公司</str_tb_FBT>
+    <str_tb_ZBT>Inclusion Analysis </str_tb_ZBT>
+    <str_tb_FBT>马鞍山钢铁股份有限公司</str_tb_FBT>
     <str_tb_YPBH>0001</str_tb_YPBH>
-    <str_tb_CKBZ>
-    </str_tb_CKBZ>
+    <str_tb_CKBZ>GB/T30834-2014</str_tb_CKBZ>
     <b_ck_ypsm>True</b_ck_ypsm>
     <b_ck_jggk>True</b_ck_jggk>
   </M_SY>
   <M_YMYJ>
-    <str_tb_ymwb>清洁度分析报告</str_tb_ymwb>
+    <str_tb_ymwb>夹杂物分析报告</str_tb_ymwb>
     <str_tb_KHH>Copi0000123012</str_tb_KHH>
     <b_ck_ym>True</b_ck_ym>
-    <str_tb_yjwb>清洁度分析报告</str_tb_yjwb>
+    <str_tb_yjwb>夹杂物分析报告</str_tb_yjwb>
   </M_YMYJ>
   <M_KLFXJG>
     <b_ck_klcc_xsmk>True</b_ck_klcc_xsmk>
@@ -58,7 +57,7 @@
     <b_ck_syxt_xsmk>True</b_ck_syxt_xsmk>
     <index_cb_syxt_jsfs>0</index_cb_syxt_jsfs>
     <index_cb_syxt_klfw>0</index_cb_syxt_klfw>
-    <str_cb_syxt_mhxssl>3</str_cb_syxt_mhxssl>
+    <str_cb_syxt_mhxssl>2</str_cb_syxt_mhxssl>
     <list_lbv_syxt_mblb>
       <MB0>MgO.CaO.Al2O3</MB0>
       <MB1>CaO.S.Al2O3</MB1>

Bin/x64/Debug/Config/SysData/OTSProgMgrParam - 副本.pmf

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData RunMode="professional" Modes="professional,Plain" SysType="CleanlinessA" SysTypes="IncA,CleanlinessA">
+<XMLData RunMode="professional" Modes="professional,Plain" SysType="CleannessA" SysTypes="IncA,Cleanness">
   <Member RegName="GenParam" DefaultArea="100" DefaultSampleName="Sample" DefaultShape="0" MeasParamFileFolderName=".\Config\ProData\" MeasSwitch="true" PartSTDLibFolderName=".\Config\SysData\" PropertyDisplayMode="0" StdLibFileName="NoSTDDB" StdLibTypeIndex="0" SteelTechnology="0" UseSysSTD="true" />
   <Member RegName="ImageProcParam" m_autoBGRemoveType="0" m_BGRemoveType="1">
     <Member RegName="BGGray" end="255" start="150" />

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="0">
+<XMLData Modify="true" PathName=".\Config\SysData\OTSStage.stg" WorkingStageId="3">
   <Collection RegName="Stagelist">
     <Member strName="圆形九圆孔50mm">
       <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,50000,0" shape="0" />
@@ -41,5 +41,12 @@
         <Member HoleName="4" rectDomian="-25000,-25000,40000,0" shape="0" />
       </Collection>
     </Member>
+    <Member strName="Axia75">
+      <Member RegName="boundary" PolygonPoint="" rectDomian="0,0,75000,0" shape="0" />
+      <Member RegName="std" PolygonPoint="" rectDomian="0,31000,10,0" shape="0" />
+      <Collection RegName="Holes">
+        <Member HoleName="1" rectDomian="0,0,47000,0" shape="0" />
+      </Collection>
+    </Member>
   </Collection>
 </XMLData>

Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -964,7 +964,7 @@
 	  <Control name="label42" text="Refining" />
 	  <Control name="label19" text="UserLib" />
 	  <Control name="label18" text="SysLib" />
-	  <Control name="label40" text="чs" />
+	  <Control name="label40" text="μm" />
 	  <Control name="label16" text="Measurement" />
 	  <Control name="label15" text="Switch" />
 	  <Control name="label14" text="Name" />

Bin/x64/Debug/Resources/XMLData/AppResource_ZH.xml

@@ -961,7 +961,7 @@
 	  <Control name="label42" text="精炼工艺" />
 	  <Control name="label19" text="用户分析库编辑" />
 	  <Control name="label18" text="系统分析库文件夹" />
-	  <Control name="label40" text="чs" />
+	  <Control name="label40" text="μm" />
 	  <Control name="label16" text="测量参数文件夹" />
 	  <Control name="label15" text="执行开关" />
 	  <Control name="label14" text="样品名" />

OTSCPP/OTSClassifyEngine/ParticleEngine/ParticleSTDDB.cpp

@@ -226,12 +226,12 @@ namespace OTSClassifyEngine
 		stdItem->SetGrpID(grpid);
 
 		CString grpName;
-		nCol = (int)CParticleSTDTable::ColumnID::N_GroupId - (int)CParticleSTDTable::ColumnID::MIN+(int)CSTDGroupTable::ColumnID::S_NAME- (int)CSTDGroupTable::ColumnID::MIN;
+		nCol = (int)CParticleSTDTable::ColumnID::N_GroupId - (int)CParticleSTDTable::ColumnID::MIN+(int)CSTDGroupTable::ColumnID::S_NAME- (int)CSTDGroupTable::ColumnID::MIN+1;
 		grpName = a_query->GetColStringValue(nCol, _T(""));
 		stdItem->SetGrpName(grpName.GetString());
 
 		CString grpColor;
-		nCol = (int)CParticleSTDTable::ColumnID::N_GroupId - (int)CParticleSTDTable::ColumnID::MIN + (int)CSTDGroupTable::ColumnID::S_COLOR - (int)CSTDGroupTable::ColumnID::MIN;
+		nCol = (int)CParticleSTDTable::ColumnID::N_GroupId - (int)CParticleSTDTable::ColumnID::MIN + (int)CSTDGroupTable::ColumnID::S_COLOR - (int)CSTDGroupTable::ColumnID::MIN+1;
 		grpColor = a_query->GetColStringValue(nCol, _T(""));
 		if (grpColor.Left(1) != "#") sColor = "#" + grpColor;
 		stdItem->SetGrpColor(grpColor.GetString());

OTSCPP/OTSRptCalculate/DTL/IncADataTable.cpp

@@ -41,6 +41,11 @@ namespace OTSSQLITE
 		AddColumn(std::make_pair(_T("TypeColor"), ColumnType::ID::STRING));
 		AddColumn(std::make_pair(_T("SEMPosX"), ColumnType::ID::INT));
 		AddColumn(std::make_pair(_T("SEMPosY"), ColumnType::ID::INT));
+
+		AddColumn(std::make_pair(_T("GroupId"), ColumnType::ID::INT));
+		AddColumn(std::make_pair(_T("GroupName"), ColumnType::ID::STRING));
+		AddColumn(std::make_pair(_T("GroupColor"), ColumnType::ID::STRING));
+
 		ASSERT(GetColumnCount() == ((int)ColumnID::MAX - (int)ColumnID::MIN) + 1);
 
 		SetTableName(g_sIncAData);

OTSCPP/OTSRptCalculate/DTL/IncADataTable.h

@@ -21,8 +21,7 @@ namespace OTSSQLITE
 			F_AREA = 7,
 			N_POS_X = 8,
 			N_POS_Y = 9,
-			N_INCA_ID = 10,
-			/*N_ELEMENT_NUM = 11,*/
+			N_INCA_ID = 10,		
 			N_SEGMENT_NUM = 11,
 			N_FldPosX = 12,
 			N_FldPosY = 13,
@@ -40,7 +39,11 @@ namespace OTSSQLITE
 			S_COLOR=25,
 			N_SEMPOS_X = 26,
 			N_SEMPOS_Y = 27,
-			MAX = 27
+			N_GRPID = 28,
+			S_GRPNAME = 29,
+			S_GRPCOLOR = 30,
+			MAX = 30
+			
 		};
 
 	

OTSIncAMeasureApp/0-OTSModel/Measure/1-OTSInclution/SmplMeasureInclution.cs

@@ -250,16 +250,16 @@ namespace OTSModelSharp
             {
                 log.Info(" classify failed. " + e.Message);
             }
-            var partlist = curFldData.GetListAnalysisParticles();
-            var validPars = new List<COTSParticleClr>();
-            foreach (var p in partlist)
-            {
-                if (p.GetGrpId() > INVALIDPART_GROUPID)
-                {
-                    validPars.Add(p);
-                }
-            }
-            curFldData.SetListAnalysisParticles(validPars);
+            //var partlist = curFldData.GetListAnalysisParticles();
+            //var validPars = new List<COTSParticleClr>();
+            //foreach (var p in partlist)
+            //{
+            //    if (p.GetGrpId() > INVALIDPART_GROUPID)
+            //    {
+            //        validPars.Add(p);
+            //    }
+            //}
+            //curFldData.SetListAnalysisParticles(validPars);
         }
         public override void ClassifyMergedParticles(List<COTSParticleClr> mergedParts)
         {

OTSIncAMeasureApp/0-OTSModel/Measure/3-MeasureFlow/CSmplMeasure.cs

@@ -448,7 +448,7 @@ namespace OTSModelSharp
                 }
             }
             log.Info("Begin to move SEM stage to " + a_SEMpt.X + "," + a_SEMpt.Y);
-            Thread.Sleep(hardWareDelay);
+          
             // move SEM to the position (rotation 0)
             if (!pSEMController.MoveSEMToPoint(a_SEMpt, 0))
             {

OTSIncAMeasureApp/0-OTSModel/Measure/DBDataTransition/IncAFileMgr.cs

@@ -238,8 +238,6 @@ namespace OTSModelSharp
             m_generalInfoDB = GetGeneralInfoDB();
             m_generalInfoDB.UpdateTimeStampRow(m_generalInfoDB.GetTableItemNameTimeEnd(), "");
 
-            //int sta = Convert.ToInt32(msrStatus.GetStatus());
-            //m_generalInfoDB.UpdateIntegerRow(m_generalInfoDB.GetTableItemNameResultStatus(), sta, "");
             return true;
         }
         public void BeginTransaction()
@@ -266,7 +264,6 @@ namespace OTSModelSharp
 
                 var cmd = m_IncADataDB.GegInsertingAnIncACmd(pParticle, m_FieldPos);
 
-                //var cmd = new KeyValuePair<string, SQLiteParameter[]>(sql1,null);
                 cmds.Add(cmd);
       
                 var featurecmd = m_SegmentDB.GetSavingFeatureCmd(pParticle);

OTSIncAMeasureApp/7-OTSProgMgrInfo/Stage/DlgStageEdit.cs

@@ -156,7 +156,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             label8.Enabled = false;
             tBoundaryHeight.Enabled = false;
             tBoundaryHeight.Text = "0";
-            label7.Text = "半径：";
+            label7.Text = "直径：";
         }
 
         private void radioButton_BoundarySquare_Click(object sender, EventArgs e)
@@ -171,7 +171,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             label9.Enabled = false;
             tStandardsampleHeight.Enabled = false;
             tStandardsampleHeight.Text = "0";
-            label10.Text = "半径：";
+            label10.Text = "直径：";
         }
 
         private void radioButton__StandardsampleSqare_Click(object sender, EventArgs e)
@@ -284,7 +284,7 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
             for(int i=0;i<dataGridView_Holes.Rows.Count;i++)
             {
                 strValue = "";
-                if(dataGridView_Holes.Rows[i].Cells[1].Value=="圆形")
+                if(dataGridView_Holes.Rows[i].Cells[1].Value.ToString()=="圆形")
                 {
                     strValue += "0";
                 }
@@ -315,12 +315,12 @@ namespace OTSMeasureApp._7_OTSProgMgrInfo.Stage
                 if (!pBoundary.DomainInDomain(pSTD))
                 {
                     MessageBox.Show("STD is over the boundary!");
-                    return ;
+                    return;
                 }
             }
             else
             {
-                return ;
+                return;
             }
 
             // hole has to be inside of the boundary and can't have common part with STD and each other

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

@@ -57,7 +57,11 @@ namespace OTSIncAReportApp.OTSSampleReportInfo
         PARTICALE_COMP = 2,
       
         PARTICALE_SIZE_DISTRIBUTION = 3,
-        AVE_ELEMENT_COMP = 4
+        AVE_ELEMENT_COMP = 4,
+        GB_Method1 = 5,
+        GB_Method2 =6,
+        ASTM = 7,
+        DIN = 8
     }
     public enum CALCULATE_CHART_TYPE
     {

OTSIncAReportApp/1-UI/OTSDisplaySourceGridData/frmReportConditionChoose.cs

@@ -679,7 +679,95 @@ namespace OTSIncAReportApp
                             m_ReportApp.im_ElementCompositionAvgGrid.Dock = DockStyle.Fill;
                             m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ElementCompositionAvgGrid);
                             m_ReportApp.m_TablesWindow.Activate();
-                            break;                        
+                            break;
+                        case CALCULATE_TABLE_TYPE.GB_Method1:
+                            //国标一
+                            string resultfile = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                                + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile);
+
+                            OTSCLRINTERFACE.CPropParamClr clr_prop = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
+                            clr_prop.SetDataSourceId(0);//
+                            clr_prop.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop.SetCalTableType((int)CALCULATE_TABLE_TYPE.GB_Method1);//国标1                    
+
+                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop);//
+
+                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.im_ChineseStandardABCDDS = new ChineseStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr);
+
+                            m_ReportApp.im_ChineseStandardABCDDS.Dock = DockStyle.Fill;
+                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ChineseStandardABCDDS);
+                            m_ReportApp.m_TablesWindow.Activate();
+
+
+                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath+"\\"
+                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "GB1");
+                            break;
+                        case CALCULATE_TABLE_TYPE.GB_Method2:
+                            //国标二
+                            string resultfile2 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                                 + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile2);
+
+                            OTSCLRINTERFACE.CPropParamClr clr_prop2 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
+                            clr_prop2.SetDataSourceId(0);//
+                            clr_prop2.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop2.SetCalTableType((int)CALCULATE_TABLE_TYPE.GB_Method2);//国标2  
+                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr2 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop2);//
+
+                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.im_NationalStandardMethodTwo = new NationalStandardMethodTwo(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr2);
+                            m_ReportApp.im_NationalStandardMethodTwo.Dock = DockStyle.Fill;
+                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_NationalStandardMethodTwo);
+                            m_ReportApp.m_TablesWindow.Activate();
+                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath + "\\"
+                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "GB2");
+                            break;
+                        case CALCULATE_TABLE_TYPE.ASTM:
+                            //美标
+                            string resultfile3 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                                + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile3);
+
+                            OTSCLRINTERFACE.CPropParamClr clr_prop3 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
+                            clr_prop3.SetDataSourceId(0);//
+                            clr_prop3.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop3.SetCalTableType((int)CALCULATE_TABLE_TYPE.ASTM);
+                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr3 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop3);
+
+                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.im_ASTMStandardABCDDS = new ASTMStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr3);
+                            m_ReportApp.im_ASTMStandardABCDDS.Dock = DockStyle.Fill;
+                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_ASTMStandardABCDDS);
+                            m_ReportApp.m_TablesWindow.Activate();
+                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath + "\\"
+                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "ASTM");
+                            break;
+                        case CALCULATE_TABLE_TYPE.DIN:
+                            //德标
+                            string resultfile4 = m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FilePath + "\\"
+                               + m_rstDataMgr.ResultFilesList[m_rstDataMgr.GetWorkingResult()].FileName;
+
+                            m_ReportApp.m_rstDataMgr.m_ReportMgr.AddASmplMsrResultMgr(resultfile4);
+
+                            OTSCLRINTERFACE.CPropParamClr clr_prop4 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GetPropertyParamTable();
+                            clr_prop4.SetDataSourceId(0);//
+                            clr_prop4.SetType((int)DisplayPicutureType.AnalyzeDataTable);//table
+                            clr_prop4.SetCalTableType((int)CALCULATE_TABLE_TYPE.DIN);
+                            List<OTSCLRINTERFACE.CGridDataClr> listGriddataclr4 = m_ReportApp.m_rstDataMgr.m_ReportMgr.GridDataTransfer(clr_prop4);
+
+                            m_ReportApp.m_TablesWindow.Controls.Clear();
+                            m_ReportApp.im_DINStandardABCDDS = new DINStandardABCDDS(m_ReportApp.m_rstDataMgr.m_ReportMgr, listGriddataclr4);
+                            m_ReportApp.im_DINStandardABCDDS.Dock = DockStyle.Fill;
+                            m_ReportApp.m_TablesWindow.Controls.Add(m_ReportApp.im_DINStandardABCDDS);
+                            m_ReportApp.m_TablesWindow.Activate();
+                            //OpenOTSINcAreportTemplateAPP(m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FilePath + "\\"
+                            //    + m_RstProp.m_ReportApp.m_DataMgrFun.resultFilesList[m_RstProp.m_ReportApp.m_DataMgrFun.WorkingResult].FileName, "DIN");
+                            break;
                     }
 
                     #endregion 第二页选项窗体，分析数据表

OTSIncAReportApp/1-UI/OTSMgrInfo/frmReportSysConfig.Designer.cs

@@ -132,7 +132,7 @@ namespace OTSIncAReprotCharts
             this.comboBox6.FormattingEnabled = true;
             this.comboBox6.Location = new System.Drawing.Point(88, 128);
             this.comboBox6.Name = "comboBox6";
-            this.comboBox6.Size = new System.Drawing.Size(227, 20);
+            this.comboBox6.Size = new System.Drawing.Size(227, 23);
             this.comboBox6.TabIndex = 1;
             // 
             // comboBox5
@@ -140,7 +140,7 @@ namespace OTSIncAReprotCharts
             this.comboBox5.FormattingEnabled = true;
             this.comboBox5.Location = new System.Drawing.Point(88, 174);
             this.comboBox5.Name = "comboBox5";
-            this.comboBox5.Size = new System.Drawing.Size(227, 20);
+            this.comboBox5.Size = new System.Drawing.Size(227, 23);
             this.comboBox5.TabIndex = 1;
             // 
             // comboBox4
@@ -148,14 +148,14 @@ namespace OTSIncAReprotCharts
             this.comboBox4.FormattingEnabled = true;
             this.comboBox4.Location = new System.Drawing.Point(88, 223);
             this.comboBox4.Name = "comboBox4";
-            this.comboBox4.Size = new System.Drawing.Size(227, 20);
+            this.comboBox4.Size = new System.Drawing.Size(227, 23);
             this.comboBox4.TabIndex = 1;
             // 
             // textBox9
             // 
             this.textBox9.Location = new System.Drawing.Point(88, 81);
             this.textBox9.Name = "textBox9";
-            this.textBox9.Size = new System.Drawing.Size(227, 21);
+            this.textBox9.Size = new System.Drawing.Size(227, 25);
             this.textBox9.TabIndex = 1;
             // 
             // button18
@@ -199,21 +199,21 @@ namespace OTSIncAReprotCharts
             this.groupBox3.Controls.Add(this.btn_PartSize);
             this.groupBox3.Controls.Add(this.tb_PartiSizeFileFolder);
             this.groupBox3.Controls.Add(this.label4);
-            this.groupBox3.Location = new System.Drawing.Point(8, 8);
-            this.groupBox3.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox3.Location = new System.Drawing.Point(11, 10);
+            this.groupBox3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.groupBox3.Size = new System.Drawing.Size(501, 43);
+            this.groupBox3.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBox3.Size = new System.Drawing.Size(668, 54);
             this.groupBox3.TabIndex = 0;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "粒级设置";
             // 
             // btn_PartSize
             // 
-            this.btn_PartSize.Location = new System.Drawing.Point(463, 17);
-            this.btn_PartSize.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btn_PartSize.Location = new System.Drawing.Point(617, 21);
+            this.btn_PartSize.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btn_PartSize.Name = "btn_PartSize";
-            this.btn_PartSize.Size = new System.Drawing.Size(33, 19);
+            this.btn_PartSize.Size = new System.Drawing.Size(44, 24);
             this.btn_PartSize.TabIndex = 4;
             this.btn_PartSize.Text = "...";
             this.btn_PartSize.UseVisualStyleBackColor = true;
@@ -222,46 +222,45 @@ namespace OTSIncAReprotCharts
             // tb_PartiSizeFileFolder
             // 
             this.tb_PartiSizeFileFolder.Enabled = false;
-            this.tb_PartiSizeFileFolder.Location = new System.Drawing.Point(125, 17);
-            this.tb_PartiSizeFileFolder.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_PartiSizeFileFolder.Location = new System.Drawing.Point(167, 21);
+            this.tb_PartiSizeFileFolder.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tb_PartiSizeFileFolder.Name = "tb_PartiSizeFileFolder";
-            this.tb_PartiSizeFileFolder.Size = new System.Drawing.Size(336, 21);
+            this.tb_PartiSizeFileFolder.Size = new System.Drawing.Size(447, 25);
             this.tb_PartiSizeFileFolder.TabIndex = 3;
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(10, 21);
-            this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label4.Location = new System.Drawing.Point(13, 26);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(41, 12);
+            this.label4.Size = new System.Drawing.Size(52, 15);
             this.label4.TabIndex = 2;
             this.label4.Text = "文件夹";
             // 
             // tb_sjtmbwj
             // 
             this.tb_sjtmbwj.Enabled = false;
-            this.tb_sjtmbwj.Location = new System.Drawing.Point(125, 37);
-            this.tb_sjtmbwj.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_sjtmbwj.Location = new System.Drawing.Point(167, 46);
+            this.tb_sjtmbwj.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tb_sjtmbwj.Name = "tb_sjtmbwj";
-            this.tb_sjtmbwj.Size = new System.Drawing.Size(335, 21);
+            this.tb_sjtmbwj.Size = new System.Drawing.Size(445, 25);
             this.tb_sjtmbwj.TabIndex = 3;
             // 
             // tb_sjtmb
             // 
             this.tb_sjtmb.Enabled = false;
-            this.tb_sjtmb.Location = new System.Drawing.Point(125, 14);
-            this.tb_sjtmb.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_sjtmb.Location = new System.Drawing.Point(167, 18);
+            this.tb_sjtmb.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tb_sjtmb.Name = "tb_sjtmb";
-            this.tb_sjtmb.Size = new System.Drawing.Size(373, 21);
+            this.tb_sjtmb.Size = new System.Drawing.Size(496, 25);
             this.tb_sjtmb.TabIndex = 3;
             // 
             // btn_ybcsqx
             // 
-            this.btn_ybcsqx.Location = new System.Drawing.Point(444, 319);
-            this.btn_ybcsqx.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btn_ybcsqx.Location = new System.Drawing.Point(592, 399);
+            this.btn_ybcsqx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btn_ybcsqx.Name = "btn_ybcsqx";
-            this.btn_ybcsqx.Size = new System.Drawing.Size(67, 22);
+            this.btn_ybcsqx.Size = new System.Drawing.Size(89, 28);
             this.btn_ybcsqx.TabIndex = 76;
             this.btn_ybcsqx.Text = "取  消";
             this.btn_ybcsqx.UseVisualStyleBackColor = true;
@@ -269,10 +268,10 @@ namespace OTSIncAReprotCharts
             // 
             // btn_ybcsbc
             // 
-            this.btn_ybcsbc.Location = new System.Drawing.Point(351, 319);
-            this.btn_ybcsbc.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btn_ybcsbc.Location = new System.Drawing.Point(468, 399);
+            this.btn_ybcsbc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btn_ybcsbc.Name = "btn_ybcsbc";
-            this.btn_ybcsbc.Size = new System.Drawing.Size(67, 22);
+            this.btn_ybcsbc.Size = new System.Drawing.Size(89, 28);
             this.btn_ybcsbc.TabIndex = 77;
             this.btn_ybcsbc.Text = "确   定";
             this.btn_ybcsbc.UseVisualStyleBackColor = true;
@@ -280,10 +279,10 @@ namespace OTSIncAReprotCharts
             // 
             // btn_sjtmbwj
             // 
-            this.btn_sjtmbwj.Location = new System.Drawing.Point(463, 37);
-            this.btn_sjtmbwj.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btn_sjtmbwj.Location = new System.Drawing.Point(617, 46);
+            this.btn_sjtmbwj.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btn_sjtmbwj.Name = "btn_sjtmbwj";
-            this.btn_sjtmbwj.Size = new System.Drawing.Size(33, 19);
+            this.btn_sjtmbwj.Size = new System.Drawing.Size(44, 24);
             this.btn_sjtmbwj.TabIndex = 4;
             this.btn_sjtmbwj.Text = "...";
             this.btn_sjtmbwj.UseVisualStyleBackColor = true;
@@ -292,20 +291,18 @@ namespace OTSIncAReprotCharts
             // label17
             // 
             this.label17.AutoSize = true;
-            this.label17.Location = new System.Drawing.Point(10, 41);
-            this.label17.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label17.Location = new System.Drawing.Point(13, 51);
             this.label17.Name = "label17";
-            this.label17.Size = new System.Drawing.Size(29, 12);
+            this.label17.Size = new System.Drawing.Size(37, 15);
             this.label17.TabIndex = 2;
             this.label17.Text = "文件";
             // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(10, 19);
-            this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label5.Location = new System.Drawing.Point(13, 24);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(41, 12);
+            this.label5.Size = new System.Drawing.Size(52, 15);
             this.label5.TabIndex = 2;
             this.label5.Text = "文件夹";
             // 
@@ -316,31 +313,30 @@ namespace OTSIncAReprotCharts
             this.groupBox6.Controls.Add(this.tb_sjtmbwj);
             this.groupBox6.Controls.Add(this.btn_sjtmbwj);
             this.groupBox6.Controls.Add(this.label17);
-            this.groupBox6.Location = new System.Drawing.Point(8, 55);
-            this.groupBox6.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox6.Location = new System.Drawing.Point(11, 69);
+            this.groupBox6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox6.Name = "groupBox6";
-            this.groupBox6.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.groupBox6.Size = new System.Drawing.Size(501, 65);
+            this.groupBox6.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBox6.Size = new System.Drawing.Size(668, 81);
             this.groupBox6.TabIndex = 1;
             this.groupBox6.TabStop = false;
             this.groupBox6.Text = "三元相图模板设置";
             // 
             // tb_blyz
             // 
-            this.tb_blyz.Location = new System.Drawing.Point(125, 14);
-            this.tb_blyz.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_blyz.Location = new System.Drawing.Point(167, 18);
+            this.tb_blyz.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tb_blyz.Name = "tb_blyz";
-            this.tb_blyz.Size = new System.Drawing.Size(375, 21);
+            this.tb_blyz.Size = new System.Drawing.Size(499, 25);
             this.tb_blyz.TabIndex = 1;
             this.tb_blyz.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_blyz_KeyPress);
             // 
             // label22
             // 
             this.label22.AutoSize = true;
-            this.label22.Location = new System.Drawing.Point(10, 21);
-            this.label22.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label22.Location = new System.Drawing.Point(13, 26);
             this.label22.Name = "label22";
-            this.label22.Size = new System.Drawing.Size(53, 12);
+            this.label22.Size = new System.Drawing.Size(67, 15);
             this.label22.TabIndex = 0;
             this.label22.Text = "比例因子";
             // 
@@ -370,11 +366,11 @@ namespace OTSIncAReprotCharts
             this.groupBox2.Controls.Add(this.btn_xsys);
             this.groupBox2.Controls.Add(this.tb_blyz);
             this.groupBox2.Controls.Add(this.label22);
-            this.groupBox2.Location = new System.Drawing.Point(8, 124);
-            this.groupBox2.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.groupBox2.Location = new System.Drawing.Point(11, 155);
+            this.groupBox2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.groupBox2.Name = "groupBox2";
-            this.groupBox2.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
-            this.groupBox2.Size = new System.Drawing.Size(503, 190);
+            this.groupBox2.Padding = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.groupBox2.Size = new System.Drawing.Size(671, 238);
             this.groupBox2.TabIndex = 85;
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "显示信息设置";
@@ -382,10 +378,10 @@ namespace OTSIncAReprotCharts
             // cb_ELONG
             // 
             this.cb_ELONG.AutoSize = true;
-            this.cb_ELONG.Location = new System.Drawing.Point(324, 89);
-            this.cb_ELONG.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_ELONG.Location = new System.Drawing.Point(489, 114);
+            this.cb_ELONG.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_ELONG.Name = "cb_ELONG";
-            this.cb_ELONG.Size = new System.Drawing.Size(84, 16);
+            this.cb_ELONG.Size = new System.Drawing.Size(105, 19);
             this.cb_ELONG.TabIndex = 103;
             this.cb_ELONG.Text = "展开长度um";
             this.cb_ELONG.UseVisualStyleBackColor = true;
@@ -393,10 +389,10 @@ namespace OTSIncAReprotCharts
             // cb_PERI
             // 
             this.cb_PERI.AutoSize = true;
-            this.cb_PERI.Location = new System.Drawing.Point(185, 114);
-            this.cb_PERI.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_PERI.Location = new System.Drawing.Point(335, 144);
+            this.cb_PERI.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_PERI.Name = "cb_PERI";
-            this.cb_PERI.Size = new System.Drawing.Size(60, 16);
+            this.cb_PERI.Size = new System.Drawing.Size(75, 19);
             this.cb_PERI.TabIndex = 101;
             this.cb_PERI.Text = "周长um";
             this.cb_PERI.UseVisualStyleBackColor = true;
@@ -404,10 +400,10 @@ namespace OTSIncAReprotCharts
             // cb_EquivalentCircleDiameter
             // 
             this.cb_EquivalentCircleDiameter.AutoSize = true;
-            this.cb_EquivalentCircleDiameter.Location = new System.Drawing.Point(85, 139);
-            this.cb_EquivalentCircleDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_EquivalentCircleDiameter.Location = new System.Drawing.Point(166, 176);
+            this.cb_EquivalentCircleDiameter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_EquivalentCircleDiameter.Name = "cb_EquivalentCircleDiameter";
-            this.cb_EquivalentCircleDiameter.Size = new System.Drawing.Size(96, 16);
+            this.cb_EquivalentCircleDiameter.Size = new System.Drawing.Size(120, 19);
             this.cb_EquivalentCircleDiameter.TabIndex = 100;
             this.cb_EquivalentCircleDiameter.Text = "等效圆直径um";
             this.cb_EquivalentCircleDiameter.UseVisualStyleBackColor = true;
@@ -415,10 +411,10 @@ namespace OTSIncAReprotCharts
             // cb_ASPECT_ELONG
             // 
             this.cb_ASPECT_ELONG.AutoSize = true;
-            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(326, 137);
-            this.cb_ASPECT_ELONG.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_ASPECT_ELONG.Location = new System.Drawing.Point(489, 176);
+            this.cb_ASPECT_ELONG.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_ASPECT_ELONG.Name = "cb_ASPECT_ELONG";
-            this.cb_ASPECT_ELONG.Size = new System.Drawing.Size(84, 16);
+            this.cb_ASPECT_ELONG.Size = new System.Drawing.Size(104, 19);
             this.cb_ASPECT_ELONG.TabIndex = 99;
             this.cb_ASPECT_ELONG.Text = "展开长宽比";
             this.cb_ASPECT_ELONG.UseVisualStyleBackColor = true;
@@ -426,10 +422,10 @@ namespace OTSIncAReprotCharts
             // cb_Orientation
             // 
             this.cb_Orientation.AutoSize = true;
-            this.cb_Orientation.Location = new System.Drawing.Point(185, 139);
-            this.cb_Orientation.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_Orientation.Location = new System.Drawing.Point(335, 176);
+            this.cb_Orientation.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_Orientation.Name = "cb_Orientation";
-            this.cb_Orientation.Size = new System.Drawing.Size(84, 16);
+            this.cb_Orientation.Size = new System.Drawing.Size(104, 19);
             this.cb_Orientation.TabIndex = 98;
             this.cb_Orientation.Text = "朝向角度°";
             this.cb_Orientation.UseVisualStyleBackColor = true;
@@ -437,10 +433,10 @@ namespace OTSIncAReprotCharts
             // cb_MEAN
             // 
             this.cb_MEAN.AutoSize = true;
-            this.cb_MEAN.Location = new System.Drawing.Point(85, 170);
-            this.cb_MEAN.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_MEAN.Location = new System.Drawing.Point(166, 207);
+            this.cb_MEAN.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_MEAN.Name = "cb_MEAN";
-            this.cb_MEAN.Size = new System.Drawing.Size(108, 16);
+            this.cb_MEAN.Size = new System.Drawing.Size(134, 19);
             this.cb_MEAN.TabIndex = 97;
             this.cb_MEAN.Text = "内接圆平均直径";
             this.cb_MEAN.UseVisualStyleBackColor = true;
@@ -448,10 +444,10 @@ namespace OTSIncAReprotCharts
             // cb_INSCR
             // 
             this.cb_INSCR.AutoSize = true;
-            this.cb_INSCR.Location = new System.Drawing.Point(326, 112);
-            this.cb_INSCR.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_INSCR.Location = new System.Drawing.Point(489, 144);
+            this.cb_INSCR.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_INSCR.Name = "cb_INSCR";
-            this.cb_INSCR.Size = new System.Drawing.Size(96, 16);
+            this.cb_INSCR.Size = new System.Drawing.Size(120, 19);
             this.cb_INSCR.TabIndex = 96;
             this.cb_INSCR.Text = "内接圆直径um";
             this.cb_INSCR.UseVisualStyleBackColor = true;
@@ -459,10 +455,10 @@ namespace OTSIncAReprotCharts
             // cb_PERP
             // 
             this.cb_PERP.AutoSize = true;
-            this.cb_PERP.Location = new System.Drawing.Point(324, 64);
-            this.cb_PERP.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_PERP.Location = new System.Drawing.Point(489, 84);
+            this.cb_PERP.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_PERP.Name = "cb_PERP";
-            this.cb_PERP.Size = new System.Drawing.Size(84, 16);
+            this.cb_PERP.Size = new System.Drawing.Size(105, 19);
             this.cb_PERP.TabIndex = 102;
             this.cb_PERP.Text = "正交直径um";
             this.cb_PERP.UseVisualStyleBackColor = true;
@@ -470,10 +466,10 @@ namespace OTSIncAReprotCharts
             // cb_FerretDiameter
             // 
             this.cb_FerretDiameter.AutoSize = true;
-            this.cb_FerretDiameter.Location = new System.Drawing.Point(185, 89);
-            this.cb_FerretDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_FerretDiameter.Location = new System.Drawing.Point(335, 114);
+            this.cb_FerretDiameter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_FerretDiameter.Name = "cb_FerretDiameter";
-            this.cb_FerretDiameter.Size = new System.Drawing.Size(96, 16);
+            this.cb_FerretDiameter.Size = new System.Drawing.Size(120, 19);
             this.cb_FerretDiameter.TabIndex = 95;
             this.cb_FerretDiameter.Text = "费雷特直径um";
             this.cb_FerretDiameter.UseVisualStyleBackColor = true;
@@ -481,10 +477,10 @@ namespace OTSIncAReprotCharts
             // cb_DiameterRatio
             // 
             this.cb_DiameterRatio.AutoSize = true;
-            this.cb_DiameterRatio.Location = new System.Drawing.Point(85, 89);
-            this.cb_DiameterRatio.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_DiameterRatio.Location = new System.Drawing.Point(166, 113);
+            this.cb_DiameterRatio.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_DiameterRatio.Name = "cb_DiameterRatio";
-            this.cb_DiameterRatio.Size = new System.Drawing.Size(84, 16);
+            this.cb_DiameterRatio.Size = new System.Drawing.Size(104, 19);
             this.cb_DiameterRatio.TabIndex = 94;
             this.cb_DiameterRatio.Text = "长短直径比";
             this.cb_DiameterRatio.UseVisualStyleBackColor = true;
@@ -492,10 +488,10 @@ namespace OTSIncAReprotCharts
             // cb_MinDiameter
             // 
             this.cb_MinDiameter.AutoSize = true;
-            this.cb_MinDiameter.Location = new System.Drawing.Point(185, 66);
-            this.cb_MinDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_MinDiameter.Location = new System.Drawing.Point(335, 84);
+            this.cb_MinDiameter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_MinDiameter.Name = "cb_MinDiameter";
-            this.cb_MinDiameter.Size = new System.Drawing.Size(84, 16);
+            this.cb_MinDiameter.Size = new System.Drawing.Size(105, 19);
             this.cb_MinDiameter.TabIndex = 93;
             this.cb_MinDiameter.Text = "最短直径um";
             this.cb_MinDiameter.UseVisualStyleBackColor = true;
@@ -503,10 +499,10 @@ namespace OTSIncAReprotCharts
             // cb_MaxDiameter
             // 
             this.cb_MaxDiameter.AutoSize = true;
-            this.cb_MaxDiameter.Location = new System.Drawing.Point(85, 114);
-            this.cb_MaxDiameter.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_MaxDiameter.Location = new System.Drawing.Point(166, 144);
+            this.cb_MaxDiameter.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_MaxDiameter.Name = "cb_MaxDiameter";
-            this.cb_MaxDiameter.Size = new System.Drawing.Size(84, 16);
+            this.cb_MaxDiameter.Size = new System.Drawing.Size(105, 19);
             this.cb_MaxDiameter.TabIndex = 92;
             this.cb_MaxDiameter.Text = "最长直径um";
             this.cb_MaxDiameter.UseVisualStyleBackColor = true;
@@ -514,48 +510,46 @@ namespace OTSIncAReprotCharts
             // cb_Area
             // 
             this.cb_Area.AutoSize = true;
-            this.cb_Area.Location = new System.Drawing.Point(85, 66);
-            this.cb_Area.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.cb_Area.Location = new System.Drawing.Point(166, 84);
+            this.cb_Area.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.cb_Area.Name = "cb_Area";
-            this.cb_Area.Size = new System.Drawing.Size(66, 16);
+            this.cb_Area.Size = new System.Drawing.Size(83, 19);
             this.cb_Area.TabIndex = 91;
             this.cb_Area.Text = "面积um²";
             this.cb_Area.UseVisualStyleBackColor = true;
             // 
             // tb_xsys
             // 
-            this.tb_xsys.Location = new System.Drawing.Point(125, 40);
-            this.tb_xsys.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.tb_xsys.Location = new System.Drawing.Point(167, 50);
+            this.tb_xsys.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tb_xsys.Name = "tb_xsys";
-            this.tb_xsys.Size = new System.Drawing.Size(336, 21);
+            this.tb_xsys.Size = new System.Drawing.Size(447, 25);
             this.tb_xsys.TabIndex = 89;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(11, 43);
-            this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label1.Location = new System.Drawing.Point(15, 54);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(53, 12);
+            this.label1.Size = new System.Drawing.Size(67, 15);
             this.label1.TabIndex = 87;
             this.label1.Text = "显示元素";
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(11, 66);
-            this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.label2.Location = new System.Drawing.Point(15, 82);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(53, 12);
+            this.label2.Size = new System.Drawing.Size(67, 15);
             this.label2.TabIndex = 88;
             this.label2.Text = "显示类型";
             // 
             // btn_xsys
             // 
-            this.btn_xsys.Location = new System.Drawing.Point(466, 38);
-            this.btn_xsys.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.btn_xsys.Location = new System.Drawing.Point(621, 48);
+            this.btn_xsys.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btn_xsys.Name = "btn_xsys";
-            this.btn_xsys.Size = new System.Drawing.Size(33, 19);
+            this.btn_xsys.Size = new System.Drawing.Size(44, 24);
             this.btn_xsys.TabIndex = 90;
             this.btn_xsys.Text = "...";
             this.btn_xsys.UseVisualStyleBackColor = true;
@@ -563,9 +557,9 @@ namespace OTSIncAReprotCharts
             // 
             // frmReportSysConfig
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(521, 348);
+            this.ClientSize = new System.Drawing.Size(695, 435);
             this.Controls.Add(this.groupBox2);
             this.Controls.Add(this.groupBox6);
             this.Controls.Add(this.groupBox3);
@@ -573,7 +567,7 @@ namespace OTSIncAReprotCharts
             this.Controls.Add(this.btn_ybcsbc);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "frmReportSysConfig";