Merge branch 'release2.1' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.1

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

@@ -900,7 +900,7 @@
 	  <Control name="label_Auto" text="Auto" />
 	  <Control name="label_FrameEndMode" text="FrameEndMode" />
 	  <Control name="groupBox9" text="Standard library selection" />
-	  <Control name="label43" text="Standard Library:" />
+	  <Control name="label43" text="Background processing mode:" />
 	  <Control name="label44" text="Using X-ray" />
 	  <Control name="btnok" text="Sure" />
 	  <Control name="btncancel" text="Cancel" />

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

@@ -900,7 +900,7 @@
 	  <Control name="label_Auto" text="自动" />
 	  <Control name="label_FrameEndMode" text="帧结束模式" />
 	  <Control name="groupBox9" text="标准库选择" />
-	  <Control name="label43" text="标准库选择：" />
+	  <Control name="label43" text="背景处理方式" />
 	  <Control name="label44" text="是否使用X-ray" />
 	  <Control name="btnok" text="确  定" />
 	  <Control name="btncancel" text="取  消" />

OTSIncAReportApp/Control_Grids/ParticlesGridDevidePage.cs

@@ -531,7 +531,7 @@ namespace OTSIncAReportGrids
 
             ParticleData fielddata = new ParticleData(result.FilePath);
             DataTable particles = fielddata.GetInfoForPartucleDevidePage(PageIndex, pageSize, OrderFunction, condition);
-            PageSize = particles.Rows.Count;
+            //PageSize = particles.Rows.Count;
             if (particles == null)
             {
                 return;

OTSIncAReportApp/frmMeasureRstMgr.Designer.cs

@@ -69,7 +69,7 @@
             this.treeView1.DrawMode = System.Windows.Forms.TreeViewDrawMode.OwnerDrawAll;
             this.treeView1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.treeView1.Location = new System.Drawing.Point(0, 38);
-            this.treeView1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.treeView1.Margin = new System.Windows.Forms.Padding(4);
             this.treeView1.Name = "treeView1";
             this.treeView1.ShowLines = false;
             this.treeView1.ShowPlusMinus = false;
@@ -88,6 +88,7 @@
             this.button1.TabIndex = 7;
             this.button1.Text = "多选数据源+";
             this.button1.UseVisualStyleBackColor = true;
+            this.button1.Visible = false;
             // 
             // frmMeasureRstMgr
             // 
@@ -103,7 +104,7 @@
             | OTS.WinFormsUI.Docking.DockAreas.DockBottom)));
             this.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.Margin = new System.Windows.Forms.Padding(6);
             this.Name = "frmMeasureRstMgr";
             this.RightToLeftLayout = true;
             this.Text = "测量结果窗口";