Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0

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

@@ -302,9 +302,8 @@
 	  <Control name="groupBox6" text="三元图模板设置" />
 	  <Control name="groupBox7" text="颗粒分析标准库设置" />
 	  <Control name="groupBox9" text="纳入指数计算" />
-	  <Control name="label22" text="比例因子" />
-	  <Control name="label1" text="显示元素" />
-	  <Control name="groupBox2" text="特征/夹杂物指数系数" />
+	  <Control name="label22" text="系数" />
+	  <Control name="groupBox2" text="特征/夹杂物指数" />
 	  <Control name="cb_EquivalentCircleDiameter" text="等效圆直径um" />
 	  <Control name="cb_FerretDiameter" text="费雷特直径um" />
 	  <Control name="cb_DiameterRatio" text="长短直径比" />
@@ -323,6 +322,7 @@
 	  <Control name="cb_ELONG" text="展开长度um" />
 	  <Control name="cb_ASPECT_ELONG" text="展开长宽比" />
 	  <Control name="cb_Orientation" text="朝向角度°" />
+	  <Control name="label1" text="特征/夹杂物指数=特征总面积/检测视场总面积*系数" />
     </Controls>
  </Form>
 <Form>

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

@@ -60,6 +60,7 @@ namespace OTSIncAReprotCharts
             this.label22 = new System.Windows.Forms.Label();
             this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
             this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.label1 = new System.Windows.Forms.Label();
             this.groupBox3.SuspendLayout();
             this.groupBox6.SuspendLayout();
             this.groupBox2.SuspendLayout();
@@ -313,8 +314,9 @@ namespace OTSIncAReprotCharts
             this.tb_blyz.Location = new System.Drawing.Point(125, 15);
             this.tb_blyz.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.tb_blyz.Name = "tb_blyz";
-            this.tb_blyz.Size = new System.Drawing.Size(375, 21);
+            this.tb_blyz.Size = new System.Drawing.Size(65, 21);
             this.tb_blyz.TabIndex = 1;
+            this.tb_blyz.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
             this.tb_blyz.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.tb_blyz_KeyPress);
             // 
             // label22
@@ -334,6 +336,7 @@ namespace OTSIncAReprotCharts
             // 
             // groupBox2
             // 
+            this.groupBox2.Controls.Add(this.label1);
             this.groupBox2.Controls.Add(this.tb_blyz);
             this.groupBox2.Controls.Add(this.label22);
             this.groupBox2.Location = new System.Drawing.Point(8, 124);
@@ -345,6 +348,15 @@ namespace OTSIncAReprotCharts
             this.groupBox2.TabStop = false;
             this.groupBox2.Text = "显示信息设置";
             // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.label1.Location = new System.Drawing.Point(215, 21);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(281, 12);
+            this.label1.TabIndex = 2;
+            this.label1.Text = "特征/夹杂物指数=特征总面积/检测视场总面积*系数";
+            // 
             // frmReportSysConfig
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -404,5 +416,6 @@ namespace OTSIncAReprotCharts
         public System.Windows.Forms.TextBox tb_PartiSizeFileFolder;
         private System.Windows.Forms.GroupBox groupBox2;
         private Button btn_PartSize;
+        private Label label1;
     }
 }

OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.Designer.cs

@@ -86,12 +86,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_fdbs = new DevExpress.XtraReports.UI.XRTableCell();
             this.dev_fdbs_text = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrPageBreak1 = new DevExpress.XtraReports.UI.XRPageBreak();
-            this.dev_ckbz_text_up = new DevExpress.XtraReports.UI.XRLabel();
-            this.dev_jcjgwj_text_up = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_bgsj_text_up = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_ypbh_text_up = new DevExpress.XtraReports.UI.XRLabel();
-            this.dev_ckbz_up = new DevExpress.XtraReports.UI.XRLabel();
-            this.dev_jcjgwj_up = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_bgsj_up = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_ypbh_up = new DevExpress.XtraReports.UI.XRLabel();
             this.dev_fbt = new DevExpress.XtraReports.UI.XRLabel();
@@ -182,12 +178,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrChart_ParticelSizeCalss,
             this.xrTable1,
             this.xrPageBreak1,
-            this.dev_ckbz_text_up,
-            this.dev_jcjgwj_text_up,
             this.dev_bgsj_text_up,
             this.dev_ypbh_text_up,
-            this.dev_ckbz_up,
-            this.dev_jcjgwj_up,
             this.dev_bgsj_up,
             this.dev_ypbh_up,
             this.dev_fbt,
@@ -703,36 +695,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.xrPageBreak1.Name = "xrPageBreak1";
             this.xrPageBreak1.Visible = false;
             // 
-            // dev_ckbz_text_up
-            // 
-            this.dev_ckbz_text_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_ckbz_text_up.LocationFloat = new DevExpress.Utils.PointFloat(346.0419F, 664.1388F);
-            this.dev_ckbz_text_up.Multiline = true;
-            this.dev_ckbz_text_up.Name = "dev_ckbz_text_up";
-            this.dev_ckbz_text_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.dev_ckbz_text_up.SizeF = new System.Drawing.SizeF(314.3748F, 23F);
-            this.dev_ckbz_text_up.StylePriority.UseFont = false;
-            this.dev_ckbz_text_up.StylePriority.UseTextAlignment = false;
-            this.dev_ckbz_text_up.Text = "dev_ckbz_text_up";
-            this.dev_ckbz_text_up.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // dev_jcjgwj_text_up
-            // 
-            this.dev_jcjgwj_text_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_jcjgwj_text_up.LocationFloat = new DevExpress.Utils.PointFloat(346.0419F, 629.2175F);
-            this.dev_jcjgwj_text_up.Multiline = true;
-            this.dev_jcjgwj_text_up.Name = "dev_jcjgwj_text_up";
-            this.dev_jcjgwj_text_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.dev_jcjgwj_text_up.SizeF = new System.Drawing.SizeF(314.3748F, 23F);
-            this.dev_jcjgwj_text_up.StylePriority.UseFont = false;
-            this.dev_jcjgwj_text_up.StylePriority.UseTextAlignment = false;
-            this.dev_jcjgwj_text_up.Text = "dev_jcjgwj_text_up";
-            this.dev_jcjgwj_text_up.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
             // dev_bgsj_text_up
             // 
             this.dev_bgsj_text_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_bgsj_text_up.LocationFloat = new DevExpress.Utils.PointFloat(346.0419F, 594.2963F);
+            this.dev_bgsj_text_up.LocationFloat = new DevExpress.Utils.PointFloat(345.4168F, 644.2963F);
             this.dev_bgsj_text_up.Multiline = true;
             this.dev_bgsj_text_up.Name = "dev_bgsj_text_up";
             this.dev_bgsj_text_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -745,7 +711,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // dev_ypbh_text_up
             // 
             this.dev_ypbh_text_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_ypbh_text_up.LocationFloat = new DevExpress.Utils.PointFloat(346.0419F, 559.375F);
+            this.dev_ypbh_text_up.LocationFloat = new DevExpress.Utils.PointFloat(345.4168F, 609.375F);
             this.dev_ypbh_text_up.Multiline = true;
             this.dev_ypbh_text_up.Name = "dev_ypbh_text_up";
             this.dev_ypbh_text_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -755,36 +721,10 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             this.dev_ypbh_text_up.Text = "dev_ypbh_text_up";
             this.dev_ypbh_text_up.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
             // 
-            // dev_ckbz_up
-            // 
-            this.dev_ckbz_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_ckbz_up.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 664.139F);
-            this.dev_ckbz_up.Multiline = true;
-            this.dev_ckbz_up.Name = "dev_ckbz_up";
-            this.dev_ckbz_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.dev_ckbz_up.SizeF = new System.Drawing.SizeF(315.625F, 23F);
-            this.dev_ckbz_up.StylePriority.UseFont = false;
-            this.dev_ckbz_up.StylePriority.UseTextAlignment = false;
-            this.dev_ckbz_up.Text = "参考标准:";
-            this.dev_ckbz_up.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            // 
-            // dev_jcjgwj_up
-            // 
-            this.dev_jcjgwj_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_jcjgwj_up.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 629.2177F);
-            this.dev_jcjgwj_up.Multiline = true;
-            this.dev_jcjgwj_up.Name = "dev_jcjgwj_up";
-            this.dev_jcjgwj_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.dev_jcjgwj_up.SizeF = new System.Drawing.SizeF(315.625F, 23F);
-            this.dev_jcjgwj_up.StylePriority.UseFont = false;
-            this.dev_jcjgwj_up.StylePriority.UseTextAlignment = false;
-            this.dev_jcjgwj_up.Text = "检测结果文件:";
-            this.dev_jcjgwj_up.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight;
-            // 
             // dev_bgsj_up
             // 
             this.dev_bgsj_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_bgsj_up.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 594.2963F);
+            this.dev_bgsj_up.LocationFloat = new DevExpress.Utils.PointFloat(29.79177F, 644.2963F);
             this.dev_bgsj_up.Multiline = true;
             this.dev_bgsj_up.Name = "dev_bgsj_up";
             this.dev_bgsj_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -797,7 +737,7 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             // dev_ypbh_up
             // 
             this.dev_ypbh_up.Font = new System.Drawing.Font("宋体", 9.75F);
-            this.dev_ypbh_up.LocationFloat = new DevExpress.Utils.PointFloat(30.41687F, 559.375F);
+            this.dev_ypbh_up.LocationFloat = new DevExpress.Utils.PointFloat(29.79177F, 609.375F);
             this.dev_ypbh_up.Multiline = true;
             this.dev_ypbh_up.Name = "dev_ypbh_up";
             this.dev_ypbh_up.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
@@ -863,12 +803,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
         private DevExpress.XtraReports.UI.XRLabel dev_yj;
         private DevExpress.XtraReports.UI.XRLabel dev_zbt;
         private DevExpress.XtraReports.UI.XRLabel dev_fbt;
-        private DevExpress.XtraReports.UI.XRLabel dev_ckbz_text_up;
-        private DevExpress.XtraReports.UI.XRLabel dev_jcjgwj_text_up;
         private DevExpress.XtraReports.UI.XRLabel dev_bgsj_text_up;
         private DevExpress.XtraReports.UI.XRLabel dev_ypbh_text_up;
-        private DevExpress.XtraReports.UI.XRLabel dev_ckbz_up;
-        private DevExpress.XtraReports.UI.XRLabel dev_jcjgwj_up;
         private DevExpress.XtraReports.UI.XRLabel dev_bgsj_up;
         private DevExpress.XtraReports.UI.XRLabel dev_ypbh_up;
         private DevExpress.XtraReports.UI.XRLine xrLine1;

OTSIncAReportApp/1-UI/OTSReportExport/Template/DataTemplate.cs

@@ -87,8 +87,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             languageData = a_languageData.Copy();
             setXRLabelData(dev_ypbh_up, GetlanguageData(dev_ypbh_up.Name.ToString(), languageData));//样品编号（中间的）
             setXRLabelData(dev_bgsj_up, GetlanguageData(dev_bgsj_up.Name.ToString(), languageData));//报告时间（中间的）
-            setXRLabelData(dev_jcjgwj_up, GetlanguageData(dev_jcjgwj_up.Name.ToString(), languageData));//检测结果文件（中间的）
-            setXRLabelData(dev_ckbz_up, GetlanguageData(dev_ckbz_up.Name.ToString(), languageData));//参考标准（中间的）
+            //setXRLabelData(dev_jcjgwj_up, GetlanguageData(dev_jcjgwj_up.Name.ToString(), languageData));//检测结果文件（中间的）
+            //setXRLabelData(dev_ckbz_up, GetlanguageData(dev_ckbz_up.Name.ToString(), languageData));//参考标准（中间的）
             setXRLabelData(dev_ypsm, GetlanguageData(dev_ypsm.Name.ToString(), languageData));//表中样品说明
             setXRLabelData(dev_jcjgwj, GetlanguageData(dev_jcjgwj.Name.ToString(), languageData));//表中测量结果名称
             setXRLabelData(dev_cljggk, GetlanguageData(dev_cljggk.Name.ToString(), languageData));//表中测量结果概况
@@ -147,8 +147,8 @@ namespace OTSIncAReportApp._1_UI.OTSTemplateDesigner
             setXRLabelData(dev_fbt, TemplateClass.M_SY.str_tb_FBT.ToString());//副标题
             setXRLabelData(dev_ypbh_text_up, TemplateClass.M_SY.str_tb_YPBH.ToString());//样品编号
             setXRLabelData(dev_bgsj_text_up, DateTime.Now.ToShortDateString().ToString());//当前日期
-            setXRLabelData(dev_jcjgwj_text_up, data.Rows[0][1].ToString());//测量结果名称
-            setXRLabelData(dev_ckbz_text_up, TemplateClass.M_SY.str_tb_CKBZ.ToString());//参考标准
+            //setXRLabelData(dev_jcjgwj_text_up, data.Rows[0][1].ToString());//测量结果名称
+            //setXRLabelData(dev_ckbz_text_up, TemplateClass.M_SY.str_tb_CKBZ.ToString());//参考标准
             #endregion
         }